From 7b890d9a036262de5828cc9a3b87c2dcd0d45011 Mon Sep 17 00:00:00 2001 From: Catouse Date: Thu, 17 May 2018 15:40:11 +0800 Subject: [PATCH 01/99] * refactor codes. --- module/my/view/managecontacts.html.php | 2 +- module/my/view/todo.html.php | 2 +- module/project/js/tree.js | 1 + module/task/view/view.html.php | 4 ++-- module/todo/view/assignto.html.php | 8 ++++---- www/js/zui/min.js | 4 ++-- www/theme/zui/css/min.css | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/module/my/view/managecontacts.html.php b/module/my/view/managecontacts.html.php index 6c703f7487..6f8507d621 100644 --- a/module/my/view/managecontacts.html.php +++ b/module/my/view/managecontacts.html.php @@ -86,7 +86,7 @@ id, $disabled)):?> - + delete, 'hiddenwin', "class='btn btn-danger'");?> diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index c783037dff..29ee4f2322 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -86,7 +86,7 @@ todo->statusList[$todo->status];?> 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', 'assignto', "todoID=$todo->id", $todo, 'list', 'hand-right', '', "btn-icon", '', "data-toggle='assigntoModal' data-width='500'", $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', 'checked', 'hiddenwin'); if($todo->status == 'done') common::printIcon('todo', 'close', "id=$todo->id", $todo, 'list', 'off', 'hiddenwin'); diff --git a/module/project/js/tree.js b/module/project/js/tree.js index 4e8f461880..42ca6e3b16 100644 --- a/module/project/js/tree.js +++ b/module/project/js/tree.js @@ -69,6 +69,7 @@ $(function() isItemLoading = false; $itemContent.find('.text-limit').textLimit(); $itemContent.find('.histories').histories(); + $itemContent.find('.iframe').modalTrigger(); }, error: function() { diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 6917fa691f..eb5350a9c2 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -20,8 +20,8 @@
id?> - parent)) echo '' . $this->lang->task->childrenAB . '';?> - team)) echo '' . $this->lang->task->multipleAB . '';?> + parent)) echo '' . $this->lang->task->childrenAB . '';?> + team)) echo '' . $this->lang->task->multipleAB . '';?> parentName) ? $task->parentName . '/' : '';?>name;?> deleted):?> diff --git a/module/todo/view/assignto.html.php b/module/todo/view/assignto.html.php index 23721e8ac1..d76f61999e 100755 --- a/module/todo/view/assignto.html.php +++ b/module/todo/view/assignto.html.php @@ -11,18 +11,18 @@ */ ?>