Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2018-05-22 14:19:10 +08:00
parent 2924e223ff 83d7c1430c
commit 5e65a861bb
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/css/grouptask.css
+2
View File
@@ -12,3 +12,5 @@
.segment + .segment > .segment-value {padding-left: 10px;}
.segment-title {color: #828A9D; font-size: 12px;}
.segment-value {font-weight: bold;}
.group-menu > .dropdown > .dropdown-menu{right: 0; width: 100%;}
module/project/lang/en.php
+1 -1
View File
@@ -178,7 +178,7 @@ $lang->project->groupFilter['story']['all'] = $lang->project->all;
$lang->project->groupFilter['story']['linked'] = 'Task Linked to Story';
$lang->project->groupFilter['pri']['all'] = $lang->project->all;
$lang->project->groupFilter['pri']['noset'] = 'Not set';
$lang->project->groupFilter['assignedTo']['undone'] = 'Pending';
$lang->project->groupFilter['assignedTo']['undone'] = 'Unfinished';
$lang->project->groupFilter['assignedTo']['all'] = $lang->project->all;
$lang->project->byQuery = 'Search';
module/project/view/grouptask.html.php
+5 -2
View File
@@ -76,7 +76,10 @@
<tr class="divider">
<th class="c-side text-left has-btn group-menu">
<div class="dropdown">
<a href="" data-toggle="dropdown" class="btn text-left btn-block btn-link"><?php echo zget($lang->project->groups, $groupBy, null);?> <i class="icon icon-caret-down hl-primary text-primary pull-right"></i></a>
<a href="" data-toggle="dropdown" class="btn text-left btn-block btn-link clearfix">
<span class='pull-left'><?php echo zget($lang->project->groups, $groupBy, null);?></span>
<i class="icon icon-caret-down hl-primary text-primary pull-right"></i>
</a>
<ul class="dropdown-menu">
<?php foreach($lang->project->groups as $key => $value):?>
<?php
@@ -152,7 +155,7 @@
<?php endif;?>
<td class='c-id-sm'><?php echo $task->id;?></td>
<td class="c-pri"><span class='label-pri <?php echo 'label-pri-' . $task->pri?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
<td class="c-name">
<td class="c-name" title="<?php echo $task->name;?>">
<?php
if(!empty($task->team)) echo '<span class="label label-light label-badge">' . $lang->task->multipleAB . '</span> ';
if(!empty($task->parent)) echo '<span class="label label-light label-badge">' . $lang->task->childrenAB . '</span> ';