diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index bccfa8086b..fb52f028b6 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -28,14 +28,14 @@
task->status;?> |
$groupTasks):?>
@@ -45,49 +45,49 @@
|
assignedTo == $app->user->account ? 'style=color:red' : '';?>
- assignedTo == $app->user->account ? 'style=color:red' : '';?>
- createLink('task','view',"taskID=$task->id");
- $totalEstimate += $task->estimate;
- $totalConsumed += $task->consumed;
- $totalLeft += $task->left;
+ createLink('task','view',"taskID=$task->id"); ?>
+ estimate;
+ $totalConsumed += $task->consumed;
+ $totalLeft += $task->left;
- $groupEstimate += $task->estimate;
- $groupConsumed += $task->consumed;
- $groupLeft += $task->left;
+ $groupEstimate += $task->estimate;
+ $groupConsumed += $task->consumed;
+ $groupLeft += $task->left;
- if($task->status == 'wait')
- {
- $statusWait++;
- $groupWait++;
- }
- elseif($task->status == 'doing')
- {
- $statusDoing++;
- $groupDoing++;
- }
- elseif($task->status == 'done')
- {
- $statusDone++;
- $groupDone++;
- }
- else
- {
- $statusCancel++;
- $groupCancel++;
- }
- $groupSum = count($groupTasks);
- $taskSum += count($tasks);
- ?>
+ if($task->status == 'wait')
+ {
+ $statusWait++;
+ $groupWait++;
+ }
+ elseif($task->status == 'doing')
+ {
+ $statusDoing++;
+ $groupDoing++;
+ }
+ elseif($task->status == 'done')
+ {
+ $statusDone++;
+ $groupDone++;
+ }
+ else
+ {
+ $statusCancel++;
+ $groupCancel++;
+ }
+ $groupSum = count($groupTasks);
+ $taskSum += count($tasks);
+ ?>
|
id . $lang->colon; if(common::hasPriv('task', 'view')) echo html::a($this->createLink('task', 'view', "task=$task->id"), $task->name); else echo $task->name;?> |
@@ -106,12 +106,8 @@
- | project->taskSummaryAll, $groupSum, $groupWait,$groupDoing,$groupDone,$groupCancel,$groupEstimate,$groupConsumed,$groupLeft);?> |
-
-
+ | project->taskSummaryAll, $groupSum, $groupWait,$groupDoing,$groupDone,$groupCancel,$groupEstimate,$groupConsumed,$groupLeft);?> |
+
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index a9a7b29650..dc29d50ef8 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -116,7 +116,7 @@ $lang->story->legendProjectAndTask = 'Project & task';
$lang->story->legendLinkStories = 'Related story';
$lang->story->legendChildStories = 'Child story';
$lang->story->legendSpec = 'Spec';
-$lang->story->legendVerify = 'Verified standard';
+$lang->story->legendVerify = 'Verify standard';
$lang->story->legendHistory = 'History';
$lang->story->legendVersion = 'Versions';
$lang->story->legendMisc = 'Misc';