diff --git a/module/my/css/task.css b/module/my/css/task.css
index bb99a08527..91e377162c 100644
--- a/module/my/css/task.css
+++ b/module/my/css/task.css
@@ -28,7 +28,7 @@ html[lang="en"] .c-user-short {width: 88px;}
[lang^=de] #taskTable .c-date {width: 78px;}
[lang^=de] #taskTable .assigned-title {width: 123px !important;}
[lang^=de] #taskTable .c-user {width: 118px;}
-[lang^=de] #taskTable .c-hours {width: 86px;}
+[lang^=de] #taskTable .estimate, [lang^=de] #taskTable .consumed {width: 86px;}
[lang^=de] #taskTable .c-user-short {width: 75px;}
[lang^=fr] #taskTable .c-name {width: 120px;}
[lang^=fr] #taskTable .c-project {width: 100px;}
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 289ab3f422..cae4c91b9a 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -67,28 +67,28 @@
idAB);?>
-
task->pri;?>>priAB);?> |
task->name);?> |
+ task->pri;?>>priAB);?> |
+ statusAB);?> |
systemMode == 'new'):?>
my->projects);?> |
task->execution);?> |
my->executions);?> |
-
- openedByAB);?> |
-
- task->deadlineAB);?> |
task->assignedTo);?> |
-
- task->finishedBy);?> |
-
+ task->deadlineAB);?> |
task->estimateAB);?> |
task->consumedAB);?> |
task->leftAB);?> |
- statusAB);?> |
+
+ task->openedByAB);?> |
+
+
+ task->finishedByAB);?> |
+
actions;?> |
@@ -105,7 +105,6 @@
id);?>
- pri;?>' title='task->priList, $task->pri);?>'>task->priList, $task->pri);?> |
' title='name?>'>
team)) echo '' . $this->lang->task->multipleAB . ' ';?>
children)) echo '';?>
|
+ pri;?>' title='task->priList, $task->pri);?>'>task->priList, $task->pri);?> |
+
+ storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
+ {$this->lang->my->storyChanged}") : print(" " . $this->processStatus('task', $task) . "");?>
+ |
systemMode == 'new'):?>
execution]->name) ? $projects[$task->execution]->name : '';?>
execution]->id) ? $projects[$task->execution]->id : 0;?>
@@ -130,23 +134,19 @@
createLink('execution', 'task', "executionID=$task->execution"), $task->executionName, '');?> |
-
- openedBy);?> |
-
- deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?> |
task->printAssignedHtml($task, $users);?> |
+ deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?> |
+ estimate, 1) . $lang->execution->workHourUnit;?> |
+ consumed, 1) . $lang->execution->workHourUnit;?> |
+ left, 1) . $lang->execution->workHourUnit;?> |
+
+ openedBy);?> |
+
finishedBy);?> |
- estimate, 1) . $lang->execution->workHourUnit;?> |
- consumed, 1) . $lang->execution->workHourUnit;?> |
- left, 1) . $lang->execution->workHourUnit;?> |
-
- storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
- {$this->lang->my->storyChanged}") : print(" " . $this->processStatus('task', $task) . "");?>
- |
id);?>
|
- pri;?>' title='task->priList, $child->pri);?>'>task->priList, $child->pri);?> |
parent > 0) echo '' . $this->lang->task->childrenAB . ' ';?>
createLink('task', 'view', "taskID=$child->id", '', '', $child->project), $child->name, null, "style='color: $child->color'");?>
|
+ pri;?>' title='task->priList, $child->pri);?>'>task->priList, $child->pri);?> |
+
+ storyStatus) and $child->storyStatus == 'active' and $child->latestStoryVersion > $child->storyVersion and !in_array($child->status, array('cancel', 'closed')));?>
+ {$this->lang->my->storyChanged}") : print(" " . $this->processStatus('task', $child) . "");?>
+ |
systemMode == 'new'):?>
execution]->name) ? $projects[$child->execution]->name : '';?>
execution]->id) ? $projects[$child->execution]->id : 0;?>
@@ -207,23 +211,19 @@
createLink('execution', 'task', "executionID=$child->project"), $child->executionName, '');?> |
-
- openedBy);?> |
-
- deadline, 0, 4) > 0) echo substr($child->deadline, 5, 6);?> |
task->printAssignedHtml($child, $users);?> |
+ deadline, 0, 4) > 0) echo substr($child->deadline, 5, 6);?> |
+ estimate, 1) . ' ' . $lang->execution->workHourUnit;?> |
+ consumed, 1) . ' ' . $lang->execution->workHourUnit;?> |
+ left, 1) . ' ' . $lang->execution->workHourUnit;?> |
+
+ openedBy);?> |
+
finishedBy);?> |
- estimate, 1) . ' ' . $lang->execution->workHourUnit;?> |
- consumed, 1) . ' ' . $lang->execution->workHourUnit;?> |
- left, 1) . ' ' . $lang->execution->workHourUnit;?> |
-
- storyStatus) and $child->storyStatus == 'active' and $child->latestStoryVersion > $child->storyVersion and !in_array($child->status, array('cancel', 'closed')));?>
- {$this->lang->my->storyChanged}") : print(" " . $this->processStatus('task', $child) . "");?>
- |
task->assignedTo = 'Zuständiger';
$lang->task->assignedToAB = 'Zuständiger';
$lang->task->assignedDate = 'Zugewisen am';
$lang->task->openedBy = 'Ersteller';
+$lang->task->openedByAB = 'Created';
$lang->task->openedDate = 'Erstellt am';
$lang->task->openedDateAB = 'Hinzufügen';
$lang->task->finishedBy = 'Abgeschlossen';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 571fcd261e..ba1f6b3d72 100755
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -116,6 +116,7 @@ $lang->task->assignedTo = 'AssignTo';
$lang->task->assignedToAB = 'AssignedTo';
$lang->task->assignedDate = 'AssignedDate';
$lang->task->openedBy = 'CreatedBy';
+$lang->task->openedByAB = 'Created';
$lang->task->openedDate = 'CreatedDate';
$lang->task->openedDateAB = 'CreatedOn';
$lang->task->finishedBy = 'FinishedBy';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index baa3e29cd1..75732a008f 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -116,6 +116,7 @@ $lang->task->assignedTo = 'Affectée à';
$lang->task->assignedToAB = 'Assigné à';
$lang->task->assignedDate = 'Date Assign.';
$lang->task->openedBy = 'Créé par';
+$lang->task->openedByAB = 'Créer';
$lang->task->openedDate = 'Date création';
$lang->task->openedDateAB = 'Date création';
$lang->task->finishedBy = 'Terminé par';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index fd840a99fa..fa9bfbae82 100755
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -116,6 +116,7 @@ $lang->task->assignedTo = '指派给';
$lang->task->assignedToAB = '指派给';
$lang->task->assignedDate = '指派日期';
$lang->task->openedBy = '由谁创建';
+$lang->task->openedByAB = '创建者';
$lang->task->openedDate = '创建日期';
$lang->task->openedDateAB = '创建';
$lang->task->finishedBy = '由谁完成';
|