-
+ diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index fd69f9558a..37c1f81c8b 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -22,7 +22,7 @@ - +
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 352ce2b912..68d5969d66 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -189,7 +189,7 @@ if($task->needConfirm) { echo "({$lang->story->changed} "; - echo html::a($this->createLink('task', 'confirmStoryChange', "taskID=$task->id"), $lang->confirm, 'hiddenwin'); + echo html::a($this->createLink('task', 'confirmStoryChange', "taskID=$task->id"), $lang->confirm, 'hiddenwin', "class='btn btn-mini btn-info'"); echo ")"; } ?> diff --git a/module/testcase/model.php b/module/testcase/model.php index 59a40cc6cb..06e3ca5f75 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1333,18 +1333,7 @@ class testcaseModel extends model echo "$stages"; break; case 'status': - if($case->needconfirm) - { - echo "({$this->lang->story->changed} "; - echo html::a(helper::createLink('testcase', 'confirmStoryChange', "caseID=$case->id"), $this->lang->confirm, 'hiddenwin'); - echo ")"; - } - else - { - echo ""; - echo $this->lang->testcase->statusList[$case->status]; - echo ''; - } + $case->needconfirm ? print(" {$this->lang->story->changed}") : print("{$this->lang->testcase->statusList[$case->status]}"); break; case 'story': static $stories = array(); diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index ca3c8522b1..259b60b8a7 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -177,8 +177,8 @@ echo $lang->testcase->statusList[$case->status]; if($case->version > $case->currentVersion and $from == 'testtask') { - echo " ({$lang->testcase->changed} "; - echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id"), $lang->confirm, 'hiddenwin'); + echo "({$lang->testcase->changed} "; + echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id"), $lang->confirm, 'hiddenwin', "class='btn btn-mini btn-info'"); echo ")"; } ?> From 3ece122648e2f2c9de5db596d76e8af1e7ee40c9 Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 25 May 2018 10:03:58 +0800 Subject: [PATCH 2/8] * Adjust space between btn. --- module/group/view/managemember.html.php | 2 +- module/group/view/manageview.html.php | 2 +- module/group/view/privbygroup.html.php | 4 ++-- module/group/view/privbymodule.html.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php index 14b83a9f80..acfc3526be 100644 --- a/module/group/view/managemember.html.php +++ b/module/group/view/managemember.html.php @@ -59,7 +59,7 @@ - - - - - +
task->type;?>
+ goback, $this->createLink('group', 'browse')); diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index 46da81db24..2a6ffa35a4 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -63,7 +63,7 @@
+ diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 0d36b15c26..d590b774f1 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -36,7 +36,7 @@
+ @@ -120,7 +120,7 @@ - + diff --git a/module/group/view/privbymodule.html.php b/module/group/view/privbymodule.html.php index 091d7a8c4d..4bb1eb8343 100644 --- a/module/group/view/privbymodule.html.php +++ b/module/group/view/privbymodule.html.php @@ -40,7 +40,7 @@
+ From 37e5c9188a2e3a6bf6419bec81520fce26106cfe Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 25 May 2018 10:05:48 +0800 Subject: [PATCH 3/8] * code for task #4229. --- module/group/lang/en.php | 2 +- module/group/lang/zh-cn.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/group/lang/en.php b/module/group/lang/en.php index a97a718211..e08c3966d1 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -19,7 +19,7 @@ $lang->group->manageView = 'View'; $lang->group->managePriv = 'Batch Assign Privileges'; $lang->group->managePrivByGroup = 'Privilege'; $lang->group->managePrivByModule = 'Module Privileges'; -$lang->group->byModuleTips = '(Press Shift/Control to Multi-select)'; +$lang->group->byModuleTips = '(Press Shift/Ctrl to Multi-select)'; $lang->group->manageMember = 'Member'; $lang->group->confirmDelete = 'Do you want to delete this User Group?'; $lang->group->successSaved = 'Saved!'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index d95bbdc9f8..625b6d8da3 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -19,7 +19,7 @@ $lang->group->manageView = '视图维护'; $lang->group->managePriv = '权限维护'; $lang->group->managePrivByGroup = '权限维护'; $lang->group->managePrivByModule = '按模块分配权限'; -$lang->group->byModuleTips = '（可以按住Shift或者Control键进行多选）'; +$lang->group->byModuleTips = '（可以按住Shift或者Ctrl键进行多选）'; $lang->group->manageMember = '成员维护'; $lang->group->confirmDelete = '您确定删除该用户分组吗？'; $lang->group->successSaved = '成功保存'; From f43b35783637789fac09b012b8e1e5067ad448c7 Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 25 May 2018 10:13:33 +0800 Subject: [PATCH 4/8] * Adjust space between btn. --- module/my/view/changepassword.html.php | 2 +- module/my/view/editprofile.html.php | 2 +- module/my/view/managecontacts.html.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php index d9dffbb74f..d26b45e9ab 100755 --- a/module/my/view/changepassword.html.php +++ b/module/my/view/changepassword.html.php @@ -39,7 +39,7 @@
app->user->modifyPasswordReason)):?> diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php index 38f949e214..b240520ae8 100644 --- a/module/my/view/editprofile.html.php +++ b/module/my/view/editprofile.html.php @@ -103,7 +103,7 @@ -
+