From 52799cf5b85b9c62ba63406ee173ad41e4c2304c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 10 May 2018 11:18:09 +0800 Subject: [PATCH] * finish task #3978. --- module/product/view/project.html.php | 84 +++++++++--------- module/project/view/bug.html.php | 15 ++-- module/project/view/managemembers.html.php | 2 +- module/project/view/manageproducts.html.php | 89 +++++++++---------- module/project/view/team.html.php | 94 +++++++++++---------- module/release/view/browse.html.php | 2 +- module/story/view/batchcreate.html.php | 6 +- module/task/model.php | 11 +-- www/theme/default/style.css | 1 + 9 files changed, 155 insertions(+), 149 deletions(-) diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index b246ceb8f8..c36948814b 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -16,47 +16,49 @@ product->project;?> -
- - - - - - - - - - - - - - - - - - - - - - delay)):?> - - - - - - - - + + + + +
project->name;?>project->code;?>project->end;?>project->status;?>project->totalEstimate;?>project->totalConsumed;?>project->totalLeft;?>project->progress;?>project->burn;?>
createLink('project', 'task', 'project=' . $project->id), $project->name, '_parent');?>code;?>end;?>project->delayed;?>project->statusList[$project->status];?>hours->totalEstimate;?>hours->totalConsumed;?>hours->totalLeft;?> -
-
- hours->progress;?>% +
+
+ + + + + + + + + + + + + + + + + + + + + + delay)):?> + + + + + + + + - - - - -
project->name;?>project->code;?>project->end;?>project->status;?>project->totalEstimate;?>project->totalConsumed;?>project->totalLeft;?>project->progress;?>project->burn;?>
createLink('project', 'task', 'project=' . $project->id), $project->name, '_parent');?>code;?>end;?>project->delayed;?>project->statusList[$project->status];?>hours->totalEstimate;?>hours->totalConsumed;?>hours->totalLeft;?> +
+
+ hours->progress;?>% +
- - 		burns);?>'>
+
burns);?>'>
+
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index 11715e1556..73233a043d 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -25,7 +25,7 @@ id", " " . $lang->bug->create, '', "class='btn btn-primary'");?> -
+
@@ -45,7 +45,7 @@ - + @@ -65,10 +65,15 @@ - diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php index f626034c85..ce9991b627 100644 --- a/module/project/view/managemembers.html.php +++ b/module/project/view/managemembers.html.php @@ -27,7 +27,7 @@ -
+
priAB);?> bug->title);?> openedByAB);?>assignedToAB);?> assignedToAB);?> bug->resolvedBy);?> bug->resolutionAB);?> actions;?>pri?>'>bug->priList, $bug->pri, $bug->pri)?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?> openedBy, $bug->openedBy);?> + + assignedTo, $bug->assignedTo);?> id";?> - - assignedTo, $bug->assignedTo);?> + assignTo == $this->app->user->account ? 'text-red' ? 'text-primary';?> + + createLink('bug', 'assignTo', $params, '', 'true'), " $assignedTo", '', "class='iframe btn btn-icon-left'");?> + + + resolvedBy, $bug->resolvedBy);?> bug->resolutionList[$bug->resolution];?>
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php index 63554426aa..96bcf59e91 100644 --- a/module/project/view/manageproducts.html.php +++ b/module/project/view/manageproducts.html.php @@ -16,53 +16,54 @@ project->manageProducts;?> -
-
- -
-
project->linkedProducts;?>
-
- $productName):?> - - -
'> - - branch, "class='form-control chosen'"); - } - ?> +
+
+ +
+
project->linkedProducts;?>
+
+ $productName):?> + + +
'> + + branch, "class='form-control chosen'"); + } + ?> +
+ + +
- - -
-
-
-
project->unlinkedProducts;?>
-
- $productName):?> -
'> - - +
+
project->unlinkedProducts;?>
+
+ $productName):?> +
'> + + +
+
-
-
-
- - -
- +
+ + +
+ +
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php index 43cefdffe4..900981e28c 100644 --- a/module/project/view/team.html.php +++ b/module/project/view/team.html.php @@ -30,52 +30,54 @@ ?>
-
-
- - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + +
team->account;?>team->role;?>team->join;?>team->days;?>team->hours;?>team->totalHours;?>team->limited;?>actions;?>
- account", $member->realname)) print $member->realname; - $memberHours = $member->days * $member->hours; - $totalHours += $memberHours; - ?> - role;?>join, 2);?>days . $lang->project->day;?>hours . $lang->project->workHour;?>project->workHour;?>team->limitedList[$member->limited];?> - createLink('project', 'unlinkMember', "projectID=$project->id&account=$member->account&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '', '', "class='btn btn-link' title='{$lang->project->unlinkMember}'"); - } +
+
+ + + + + + + + + + + + + + + + + + - - - -
team->account;?>team->role;?>team->join;?>team->days;?>team->hours;?>team->totalHours;?>team->limited;?>actions;?>
+ account", $member->realname)) print $member->realname; + $memberHours = $member->days * $member->hours; + $totalHours += $memberHours; ?> -
-
-
team->totalHours . '：' . "$totalHours{$lang->project->workHour}";?>
- +
role;?>join, 2);?>days . $lang->project->day;?>hours . $lang->project->workHour;?>project->workHour;?>team->limitedList[$member->limited];?> + createLink('project', 'unlinkMember', "projectID=$project->id&account=$member->account&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '', '', "class='btn btn-link' title='{$lang->project->unlinkMember}'"); + } + ?> +
+
+
team->totalHours . '：' . "$totalHours{$lang->project->workHour}";?>
+
+
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 2acd69f1ec..bbbffc1fa9 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -25,7 +25,7 @@
- +
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index 3428e9cd31..8924168820 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -15,6 +15,7 @@

story->batchCreate;?>

+ createLink('custom', 'ajaxSaveCustomFields', 'module=story§ion=custom&key=batchCreateFields')?>
@@ -45,10 +46,7 @@
- + diff --git a/module/task/model.php b/module/task/model.php index e349c666d8..d4781968c6 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2317,13 +2317,10 @@ class taskModel extends model break; case 'assignedTo': $btnTextClass = ''; - $assignedToText = $task->assignedTo; - if (empty($assignedToText)) - { - $btnTextClass = 'text-primary'; - $assignedToText = $this->lang->task->noAssigned; - } - else if ($assignedToText == $account) $btnTextClass = 'text-red'; + $assignedToText = zget($users, $task->assignedTo); + $btnTextClass = 'text-primary'; + if(empty($task->assignedTo)) $assignedToText = $this->lang->task->noAssigned; + if($task->assignedTo == $account) $btnTextClass = 'text-red'; $btnClass = $assignedToText == 'closed' ? ' disabled' : ''; echo html::a(helper::createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", '', true), "{$assignedToText}", '', "class='iframe btn btn-icon-left{$btnClass}'"); diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 7bd3e22ac2..338101f705 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -8,3 +8,4 @@ * @version $Id: style.css 1454 2009-10-23 01:45:26Z wwccss $ * @link http://www.zentao.net */ +th.required:after{position: relative; right: 10px;}
release->id;?>'>product->branch;?> story->module;?> '>story->plan;?> - story->title;?> - - story->title;?> '>story->spec;?> '>story->source;?> '>story->verify;?>