diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 0c8a7e3727..9da580c8fd 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -78,7 +78,7 @@ todo->statusList[$todo->status];?> status != 'done') echo html::a(helper::createLink('todo', 'assignto', "todoID=$todo->id"), '', '', "data-toggle='assigntoModal' class='btn-icon'"); + if($todo->status != 'done') common::printIcon('todo', 'assignto', "todoID=$todo->id", $todo, 'list', 'hand-right', '', "btn-icon", '', "data-toggle='assigntoModal'", $lang->todo->assignTo); if($todo->status == 'done') common::printIcon('todo', 'activate', "id=$todo->id", $todo, 'list', 'magic', 'hiddenwin'); if($todo->status != 'done') common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'list', 'ok-sign', 'hiddenwin'); if($todo->status == 'done') common::printIcon('todo', 'close', "id=$todo->id", $todo, 'list', 'off', 'hiddenwin'); diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index 57ba214bed..15ac996e08 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -13,7 +13,7 @@ $lang->todo->common = '待办'; $lang->todo->index = "待办一览"; $lang->todo->create = "新增"; $lang->todo->createCycle = "创建周期待办"; -$lang->todo->assignTo = "指派"; +$lang->todo->assignTo = "指派给"; $lang->todo->activate = "激活"; $lang->todo->batchCreate = "批量添加"; $lang->todo->edit = "编辑"; diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index 019111ad7d..4ff5808fc0 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -66,6 +66,16 @@ todo->beginAndEnd;?> begin])) echo $times[$todo->begin]; if(isset($times[$todo->end])) echo ' ~ ' . $times[$todo->end];?> + assignedTo)):?> + + todo->assignTo;?> + assignedTo;?> + + + todo->assignTo . $lang->todo->date;?> + assignedDate;?> + + cycle):?> @@ -108,7 +118,6 @@ account == $app->user->account) { - //if($todo->status != 'done') echo html::a($this->createLink('todo', 'assignTo', "todoID=$todo->id"), " " . $lang->todo->assignTo, '', "class='btn showinonlybody'"); if($todo->status != 'closed') echo html::a($this->createLink('todo', 'edit', "todoID=$todo->id"), " " . $lang->todo->edit, '', "class='btn showinonlybody'"); if($todo->status == 'done' || $todo->status == 'closed') echo html::a($this->createLink('todo', 'activate', "todoID=$todo->id"), " " . $lang->todo->activate, 'hiddenwin', "class='btn showinonlybody'"); if($todo->status == 'done') echo html::a($this->createLink('todo', 'close', "todoID=$todo->id"), " " . $lang->todo->close, 'hiddenwin', "class='btn showinonlybody'");