From ab4d9a1f2c7de6a82679a7a0436e867d14128e6e Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 9 May 2018 15:18:45 +0800 Subject: [PATCH] * fix error and adjust for ux. --- db/update9.8.1.sql | 3 --- module/block/lang/zh-tw.php | 20 -------------------- module/common/lang/zh-tw.php | 3 --- module/company/view/edit.html.php | 2 ++ module/doc/view/browse.html.php | 8 -------- module/extension/lang/zh-tw.php | 6 ------ module/group/view/managemember.html.php | 1 - module/product/view/browse.html.php | 2 +- module/product/view/close.html.php | 4 +++- module/project/lang/zh-tw.php | 3 --- module/project/view/activate.html.php | 4 +++- module/project/view/close.html.php | 4 +++- module/project/view/putoff.html.php | 4 +++- module/project/view/start.html.php | 4 +++- module/project/view/suspend.html.php | 4 +++- module/project/view/task.html.php | 4 ++-- module/story/view/activate.html.php | 2 ++ module/story/view/close.html.php | 2 ++ module/story/view/linkstory.html.php | 2 ++ module/task/css/batchcreate.css | 1 - module/task/view/activate.html.php | 2 ++ module/task/view/assignto.html.php | 2 ++ module/task/view/cancel.html.php | 2 ++ module/task/view/close.html.php | 2 ++ module/task/view/finish.html.php | 2 ++ module/task/view/pause.html.php | 2 ++ module/task/view/recordestimate.html.php | 2 ++ module/task/view/start.html.php | 2 ++ module/user/js/common.js | 2 +- www/js/my.full.js | 4 ++-- 30 files changed, 48 insertions(+), 57 deletions(-) diff --git a/db/update9.8.1.sql b/db/update9.8.1.sql index e7a898c015..71d0ea7a40 100644 --- a/db/update9.8.1.sql +++ b/db/update9.8.1.sql @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= ALTER TABLE `zt_user` CHANGE `realname` `realname` varchar(100) COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `password`; ALTER TABLE `zt_project` CHANGE `openedDate` `openedDate` datetime NOT NULL, CHANGE `closedDate` `closedDate` datetime NOT NULL, CHANGE `canceledDate` `canceledDate` datetime NOT NULL; ->>>>>>> f6289cc53c13786e3242f8792030e7752898794f diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index ff18c5c478..742513b496 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -143,7 +143,6 @@ $lang->block->default['full']['my']['2']['title'] = '最新動態'; $lang->block->default['full']['my']['2']['block'] = 'dynamic'; $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; -<<<<<<< HEAD $lang->block->default['full']['my']['3']['title'] = '流程圖'; $lang->block->default['full']['my']['3']['block'] = 'flowchart'; $lang->block->default['full']['my']['3']['grid'] = 8; @@ -163,25 +162,6 @@ $lang->block->default['full']['my']['9'] = $lang->block->default['product']['2'] $lang->block->default['full']['my']['9']['source'] = 'product'; $lang->block->default['full']['my']['10'] = $lang->block->default['qa']['2']; $lang->block->default['full']['my']['10']['source'] = 'qa'; -======= -$lang->block->default['full']['my']['3'] = $lang->block->default['project']['1']; -$lang->block->default['full']['my']['3']['source'] = 'project'; -$lang->block->default['full']['my']['4']['title'] = '我的待辦'; -$lang->block->default['full']['my']['4']['block'] = 'list'; -$lang->block->default['full']['my']['4']['grid'] = 4; -$lang->block->default['full']['my']['4']['source'] = 'todo'; -$lang->block->default['full']['my']['4']['params']['num'] = '20'; -$lang->block->default['full']['my']['5']['title'] = '指派給我'; -$lang->block->default['full']['my']['5']['block'] = 'assigntome'; -$lang->block->default['full']['my']['5']['grid'] = 8; -$lang->block->default['full']['my']['5']['source'] = ''; -$lang->block->default['full']['my']['6'] = $lang->block->default['product']['2']; -$lang->block->default['full']['my']['6']['source'] = 'product'; -$lang->block->default['full']['my']['7'] = $lang->block->default['product']['1']; -$lang->block->default['full']['my']['7']['source'] = 'product'; -$lang->block->default['full']['my']['8'] = $lang->block->default['qa']['2']; -$lang->block->default['full']['my']['8']['source'] = 'qa'; ->>>>>>> zentaopms_9.8 $lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; $lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 227ecb1e6b..50cd70d326 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -80,11 +80,8 @@ $lang->tutorial = '新手教程'; $lang->changeLog = '修改日誌'; $lang->manual = '手冊'; $lang->customMenu = '自定義導航'; -<<<<<<< HEAD $lang->customField = '自定義表單項'; -======= $lang->lineNumber = '行號'; ->>>>>>> zentaopms_9.8 $lang->tutorialConfirm = '檢測到你尚未退出新手教程模式，是否現在退出？'; $lang->preShortcutKey = '[快捷鍵:←]'; diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php index c3306144e4..6247d04b89 100644 --- a/module/company/view/edit.html.php +++ b/module/company/view/edit.html.php @@ -15,7 +15,9 @@

name;?> + arrow . $lang->company->edit;?> +

diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index cd2052d470..e0d72e0729 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -11,12 +11,8 @@ */ ?> -<<<<<<< HEAD - doc->confirmDelete)?> @@ -26,11 +22,7 @@ var browseType = '';
from == 'doc'):?> -<<<<<<< HEAD -
-======= ->>>>>>> a4e6189f518dcb49e98ef2c70757ec0ed757aea0 cookie->browseType == 'bygrid'):?> diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php index 10cb1fef13..e6ef1fea70 100644 --- a/module/extension/lang/zh-tw.php +++ b/module/extension/lang/zh-tw.php @@ -105,15 +105,9 @@ $lang->extension->errorDownloadPathNotWritable = '插件下載存儲路徑extension->errorPackageFileExists = '下載路徑已經有一個名為的%s附件。
重新%s，請點擊此連結
'; $lang->extension->errorDownloadFailed = '下載失敗，請重新下載。如果多次重試還不行，請嘗試手工下載，然後通過上傳功能上傳。'; $lang->extension->errorMd5Checking = '下載檔案不完整，請重新下載。如果多次重試還不行，請嘗試手工下載，然後通過上傳功能上傳。'; -<<<<<<< HEAD $lang->extension->errorExtracted = '包檔案 %s 解壓縮失敗，可能不是一個有效的zip檔案。錯誤信息如下：
%s'; $lang->extension->errorCheckIncompatible = '該插件與禪道版本不兼容，%s後可能無法使用。
您可以選擇 強制%s 或者 取消
'; $lang->extension->errorFileConflicted = '有以下檔案衝突：
%s
您可以選擇 覆蓋 或者 取消
'; -======= -$lang->extension->errorExtracted = '包檔案:"%s"解壓縮失敗，可能不是一個有效的zip檔案。錯誤信息如下:"%s"'; -$lang->extension->errorCheckIncompatible = '該插件與禪道版本不兼容，%s後可能無法使用。

您可以選擇 強制%s 或者 取消

'; -$lang->extension->errorFileConflicted = '有以下檔案衝突：
%s

您可以選擇 覆蓋 或者 取消

'; ->>>>>>> zentaopms_9.8 $lang->extension->errorPackageNotFound = '包檔案 %s 沒有找到，可能是因為自動下載失敗。您可以嘗試再次下載。'; $lang->extension->errorTargetPathNotWritable = '目標路徑 %s 不可寫。'; $lang->extension->errorTargetPathNotExists = '目標路徑 %s 不存在。'; diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php index 651159c4b4..5848d5a63a 100644 --- a/module/group/view/managemember.html.php +++ b/module/group/view/managemember.html.php @@ -16,7 +16,6 @@

id;?> name;?> - arrow . $lang->group->manageMember;?>

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 134d58036f..0f63a525bb 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -56,7 +56,7 @@
-
    +
diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css index c83a3cae9b..57346b1598 100644 --- a/module/task/css/batchcreate.css +++ b/module/task/css/batchcreate.css @@ -21,4 +21,3 @@ #importLines {white-space: nowrap; background: repeat-y url("data:image/png;base64,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"); background-position: 0 6px; padding-left: 30px; line-height: 20px;} .main-header .pull-left {max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} ->>>>>>> zentaopms_9.8 diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php index 065ae3bae6..60c77e8f00 100644 --- a/module/task/view/activate.html.php +++ b/module/task/view/activate.html.php @@ -18,7 +18,9 @@

id;?> name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?> + arrow . $lang->task->activate;?> +

diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php index 010f4dc74a..e27d8247df 100644 --- a/module/task/view/assignto.html.php +++ b/module/task/view/assignto.html.php @@ -26,7 +26,9 @@

id;?> name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?> + arrow . (empty($task->team) ? $lang->task->assign : $lang->task->transfer);?> +

diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php index f49100f823..97abc71a19 100644 --- a/module/task/view/cancel.html.php +++ b/module/task/view/cancel.html.php @@ -18,7 +18,9 @@

id;?> name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?> + arrow . $lang->task->cancel;?> + diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php index f5d6bf407a..0fd65e0239 100644 --- a/module/task/view/close.html.php +++ b/module/task/view/close.html.php @@ -18,7 +18,9 @@

id;?> name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?> + arrow . $lang->task->close;?> +

diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php index accda21484..d878cc1f5e 100644 --- a/module/task/view/finish.html.php +++ b/module/task/view/finish.html.php @@ -27,7 +27,9 @@

id;?> name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?> + arrow . $lang->task->finish;?> + diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php index b8861d551e..991561e496 100644 --- a/module/task/view/pause.html.php +++ b/module/task/view/pause.html.php @@ -18,7 +18,9 @@

id;?> name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?> + arrow . $lang->task->pause;?> + diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php index a7b015fa37..f574012cb4 100644 --- a/module/task/view/recordestimate.html.php +++ b/module/task/view/recordestimate.html.php @@ -29,7 +29,9 @@

id;?> name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?> + arrow . $lang->task->logEfforts;?> + diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php index 1f38d3bb92..edd705219a 100644 --- a/module/task/view/start.html.php +++ b/module/task/view/start.html.php @@ -31,7 +31,9 @@

id;?> name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?> + arrow . $lang->task->start;?> + diff --git a/module/user/js/common.js b/module/user/js/common.js index a688eb1fa3..35bfda6565 100644 --- a/module/user/js/common.js +++ b/module/user/js/common.js @@ -8,7 +8,7 @@ */ $(document).ready(function() { - $('#dataform').submit(function() + $('#verifyPassword').closest('form').find('#submit').click(function() { var password = $('input#verifyPassword').val(); var rand = $('input#verifyRand').val(); diff --git a/www/js/my.full.js b/www/js/my.full.js index 77f2f9899b..9a86f1c32e 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -684,7 +684,7 @@ function toggleSearch() ( function() { - if(browseType == 'bymodule') + if(typeof(browseType) == 'undefined' || browseType == 'bymodule') { $('#bymoduleTab').removeClass('btn-active-text'); } @@ -698,7 +698,7 @@ function toggleSearch() }, function() { - if(browseType == 'bymodule') + if(typeof(browseType) == 'undefined' || browseType == 'bymodule') { $('#bymoduleTab').addClass('btn-active-text'); }