From 9e19e3fc859ecd4cc86ccfc5806edc30b0875a90 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Wed, 19 Sep 2018 14:58:48 +0800 Subject: [PATCH 1/6] * Remove label-dot which in list page. --- module/block/view/bugblock.html.php | 1 - module/block/view/caseblock.html.php | 4 ---- module/block/view/projectblock.html.php | 4 ++-- module/block/view/releaseblock.html.php | 1 - module/block/view/storyblock.html.php | 2 -- module/block/view/taskblock.html.php | 1 - module/bug/model.php | 9 +++------ module/build/view/linkbug.html.php | 1 - module/build/view/linkstory.html.php | 1 - module/build/view/view.html.php | 3 --- module/my/view/bug.html.php | 11 +++-------- module/my/view/project.html.php | 4 ++-- module/my/view/story.html.php | 2 +- module/my/view/task.html.php | 7 +------ module/productplan/view/linkbug.html.php | 1 - module/productplan/view/linkstory.html.php | 1 - module/project/view/all.html.php | 1 - module/project/view/bug.html.php | 12 ++++-------- module/project/view/importbug.html.php | 2 +- module/project/view/importtask.html.php | 1 - module/project/view/story.html.php | 1 - module/project/view/testtask.html.php | 1 - module/release/view/linkbug.html.php | 1 - module/release/view/linkstory.html.php | 2 +- module/release/view/view.html.php | 2 +- module/story/view/affected.html.php | 3 --- module/story/view/zerocase.html.php | 2 +- module/testcase/css/browse.css | 5 +++-- module/testcase/model.php | 5 ++++- module/testcase/view/groupcase.html.php | 2 +- module/testreport/view/blockbugs.html.php | 1 - module/testreport/view/blockcases.html.php | 1 - module/testreport/view/blocklegacybugs.html.php | 1 - module/testreport/view/blockstories.html.php | 1 - module/testtask/css/cases.css | 3 +++ module/testtask/model.php | 4 +++- module/testtask/view/browse.html.php | 1 - module/testtask/view/cases.html.php | 2 +- 38 files changed, 35 insertions(+), 72 deletions(-) diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php index b86ca2ceb6..2f0f3182f2 100644 --- a/module/block/view/bugblock.html.php +++ b/module/block/view/bugblock.html.php @@ -51,7 +51,6 @@ title?> - bug->statusList, $bug->status);?> diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php index 5ec526c4a9..f7d0f2cfe8 100644 --- a/module/block/view/caseblock.html.php +++ b/module/block/view/caseblock.html.php @@ -19,11 +19,8 @@ .block-cases.block-sm .c-status{text-align:center} .block-cases.block-sm .c-status .status-text{display:none;} .case-status-normal {color: #a6aab8;} - .case-status-normal > .label-dot {background-color: #006af1;} .case-status-blocked { color: #a6aab8; } - .case-status-blocked > .label-dot { background-color: #00da88; } .case-status-investigate {color: #a6aab8;} - .case-status-investigate > .label-dot {background-color: #006af1;} '> @@ -58,7 +55,6 @@ diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index 4bde5cbc78..624f7d82e4 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -44,9 +44,9 @@ diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php index ed8f608b55..95ceab0272 100644 --- a/module/block/view/releaseblock.html.php +++ b/module/block/view/releaseblock.html.php @@ -47,7 +47,6 @@ diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index 8dfd9dd520..82230d6762 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -21,7 +21,6 @@ .block-stories .c-stage {width: 80px;} .block-stories.block-sm .estimate, .block-stories.block-sm .c-stage, -.block-stories.block-sm .c-status .label-dot {display: none;} .block-stories.block-sm .c-status {text-align: center;}
@@ -59,7 +58,6 @@
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index 8464175d38..166fac91ea 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -51,7 +51,6 @@ diff --git a/module/bug/model.php b/module/bug/model.php index 1e79d1ea14..bf86210976 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2527,7 +2527,7 @@ class bugModel extends model echo zget($this->lang->bug->typeList, $bug->type); break; case 'status': - echo ""; + echo ""; echo zget($this->lang->bug->statusList, $bug->status); echo ''; break; @@ -2584,13 +2584,9 @@ class bugModel extends model } break; case 'assignedTo': - $btnTextClass = ''; - $assignedToText = !empty($bug->assignedTo) ? zget($users, $bug->assignedTo) : $this->lang->bug->noAssigned; $btnTextClass = 'text-primary'; if($bug->assignedTo == $account) $btnTextClass = 'text-red'; - $btnClass = $assignedToText == 'closed' ? ' disabled' : ''; - - echo html::a(helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true), " {$assignedToText}", '', "class='iframe btn btn-sm btn-icon-left{$btnClass}'"); + echo "" . zget($users, $bug->assignedTo) . ""; break; case 'assignedDate': echo substr($bug->assignedDate, 5, 11); @@ -2624,6 +2620,7 @@ class bugModel extends model break; case 'actions': $params = "bugID=$bug->id"; + common::printIcon('bug', 'assignTo', $params, $bug, 'list', '', '', 'iframe', true); common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true); common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true); common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true); diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php index 33677b5ec9..97c7facb52 100644 --- a/module/build/view/linkbug.html.php +++ b/module/build/view/linkbug.html.php @@ -49,7 +49,6 @@ diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index 5fc2fdfd23..62c4170087 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -52,7 +52,6 @@ diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index cd456490c9..cfbc47445c 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -127,7 +127,6 @@ tbody tr td:first-child input{display:none;} @@ -199,7 +198,6 @@ tbody tr td:first-child input{display:none;} @@ -260,7 +258,6 @@ tbody tr td:first-child input{display:none;} diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index fb5d5016c6..baede6784f 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -50,7 +50,7 @@ - + @@ -70,19 +70,14 @@ - diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index c5f801b2bd..2d79637307 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -75,7 +75,7 @@ - + - + diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 3381a10f34..9d192eeee2 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -48,7 +48,6 @@ diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index 2efb220ace..c8add41e12 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -55,7 +55,6 @@ diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php index a3a2747101..ef110b8f5e 100644 --- a/module/project/view/all.html.php +++ b/module/project/view/all.html.php @@ -80,7 +80,6 @@ diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index 551094af79..0afcb5c675 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -59,7 +59,7 @@ - + @@ -77,19 +77,15 @@ - + diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php index 19f7bcf252..b5ac6772e0 100644 --- a/module/project/view/importtask.html.php +++ b/module/project/view/importtask.html.php @@ -61,7 +61,6 @@ diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index 2790f044eb..b36b9a29ac 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -158,7 +158,6 @@ diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php index 806234617d..4e47417528 100644 --- a/module/project/view/testtask.html.php +++ b/module/project/view/testtask.html.php @@ -93,7 +93,6 @@ diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php index dcf28182d8..82d5ecfdf8 100644 --- a/module/release/view/linkbug.html.php +++ b/module/release/view/linkbug.html.php @@ -52,7 +52,6 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm'; diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php index 80ec3ef12b..df35719df9 100644 --- a/module/release/view/linkstory.html.php +++ b/module/release/view/linkstory.html.php @@ -54,7 +54,7 @@ - + diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index a3d81a973f..456d46c463 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -252,7 +252,7 @@ - + @@ -61,7 +60,6 @@ @@ -92,7 +90,6 @@ diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php index f63f1a3671..7fb3a467b8 100644 --- a/module/story/view/zerocase.html.php +++ b/module/story/view/zerocase.html.php @@ -62,7 +62,7 @@ - + diff --git a/module/testreport/view/blockcases.html.php b/module/testreport/view/blockcases.html.php index 2360790f06..a5a88786d8 100644 --- a/module/testreport/view/blockcases.html.php +++ b/module/testreport/view/blockcases.html.php @@ -27,7 +27,6 @@ diff --git a/module/testreport/view/blocklegacybugs.html.php b/module/testreport/view/blocklegacybugs.html.php index 54fba035a8..7b92f93b38 100644 --- a/module/testreport/view/blocklegacybugs.html.php +++ b/module/testreport/view/blocklegacybugs.html.php @@ -23,7 +23,6 @@ diff --git a/module/testreport/view/blockstories.html.php b/module/testreport/view/blockstories.html.php index 7ea1d07b68..e379df47dd 100644 --- a/module/testreport/view/blockstories.html.php +++ b/module/testreport/view/blockstories.html.php @@ -24,7 +24,6 @@ diff --git a/module/testtask/css/cases.css b/module/testtask/css/cases.css index f940a61cc4..6b5fb7d32c 100644 --- a/module/testtask/css/cases.css +++ b/module/testtask/css/cases.css @@ -9,3 +9,6 @@ tbody > tr > td .icon-bug {margin-left: -8px;} .table-footer .table-actions .input-group #assignedTo_chosen .chosen-single{height:28px;padding:3px 6px} .table-footer .table-actions .input-group #assignedTo_chosen .chosen-single span{font-size:12px;} .table-footer .table-actions .input-group #assignedTo_chosen .chosen-single div{line-height:10px;} + +.fail .result-fail, .blocked .result-blocked{color:#f00;} +.pass .result-pass{color:green;} diff --git a/module/testtask/model.php b/module/testtask/model.php index 1224346a67..ba68c03fcc 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1249,7 +1249,8 @@ class testtaskModel extends model break; case 'lastRunResult': $lastRunResultText = $run->lastRunResult ? zget($this->lang->testcase->resultList, $run->lastRunResult, $run->lastRunResult) : $this->lang->testcase->unexecuted; - echo html::a(helper::createLink('testtask', 'results', "id={$run->id}", '', true), "{$lastRunResultText}", '', "class='iframe btn btn-icon-left'"); + $class = 'result-' . $run->lastRunResult; + echo "" . $lastRunResultText . ""; break; case 'story': if($run->story and $run->storyTitle) echo html::a(helper::createLink('story', 'view', "storyID=$run->story"), $run->storyTitle); @@ -1272,6 +1273,7 @@ class testtaskModel extends model common::printIcon('testcase', 'createBug', "product=$run->product&branch=$run->branch&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$task->id", $run, 'list', 'bug', '', 'iframe', '', "data-width='90%'"); echo ""; + common::printIcon('testtask', 'results', "id=$run->id", $run, 'list', '', '', 'iframe', '', "data-width='90%'"); common::printIcon('testtask', 'runCase', "id=$run->id", $run, 'list', '', '', 'runCase iframe', false, "data-width='95%'"); if(common::hasPriv('testtask', 'unlinkCase', $run)) diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index e3a5f0038c..dac000dee6 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -93,7 +93,6 @@ $status = $this->session->testTaskVersionStatus; diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 38cdd1af52..e6f66560f6 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -45,7 +45,7 @@ if(!$useDatatable) include '../../common/view/tablesorter.html.php'; $config->testcase->datatable->defaultField = $config->testtask->datatable->defaultField; - $config->testcase->datatable->fieldList['actions']['width'] = '90'; + $config->testcase->datatable->fieldList['actions']['width'] = '120'; $setting = $this->datatable->getSetting('testtask'); $widths = $this->datatable->setFixedFieldWidth($setting); From d91291455bd86b1313c767ce4ebdb718f70396ad Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Wed, 19 Sep 2018 15:04:04 +0800 Subject: [PATCH 2/6] * Fix float action button on actions column. --- module/testtask/model.php | 2 -- module/testtask/view/cases.html.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/module/testtask/model.php b/module/testtask/model.php index ba68c03fcc..55f708789f 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1269,9 +1269,7 @@ class testtaskModel extends model echo $run->stepNumber; break; case 'actions': - echo "
"; common::printIcon('testcase', 'createBug', "product=$run->product&branch=$run->branch&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$task->id", $run, 'list', 'bug', '', 'iframe', '', "data-width='90%'"); - echo "
"; common::printIcon('testtask', 'results', "id=$run->id", $run, 'list', '', '', 'iframe', '', "data-width='90%'"); common::printIcon('testtask', 'runCase', "id=$run->id", $run, 'list', '', '', 'runCase iframe', false, "data-width='95%'"); diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index e6f66560f6..a151123ff6 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -45,7 +45,7 @@ if(!$useDatatable) include '../../common/view/tablesorter.html.php'; $config->testcase->datatable->defaultField = $config->testtask->datatable->defaultField; - $config->testcase->datatable->fieldList['actions']['width'] = '120'; + $config->testcase->datatable->fieldList['actions']['width'] = '140'; $setting = $this->datatable->getSetting('testtask'); $widths = $this->datatable->setFixedFieldWidth($setting); From 2fa7eb9e835964c446e3568da678d35b0e499a46 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Wed, 19 Sep 2018 15:12:59 +0800 Subject: [PATCH 3/6] * Finish task #4863. --- module/company/view/dynamic.html.php | 4 +++- module/my/view/dynamic.html.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index 31c239cb25..e38566940c 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -57,9 +57,11 @@ time?> actor) . ' ' . $action->actionLabel;?> + action != 'login' and $action->action != 'logout'):?> objectLabel;?> - objectID;?> objectLink, $action->objectName);?> + objectID;?> + diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php index 2aa5380bb9..2a1cbb7bc8 100644 --- a/module/my/view/dynamic.html.php +++ b/module/my/view/dynamic.html.php @@ -54,9 +54,11 @@ time?> user->realname . ' ' . $action->actionLabel;?> + action != 'login' and $action->action != 'logout'):?> objectLabel;?> - objectID;?> objectLink, $action->objectName);?> + objectID;?> + From fbeef27821136be1eb414f905e0601dbeecfb058 Mon Sep 17 00:00:00 2001 From: Yagami Date: Wed, 19 Sep 2018 15:16:18 +0800 Subject: [PATCH 4/6] * Finish task #4790. --- module/bug/view/view.html.php | 2 +- module/productplan/view/view.html.php | 2 +- module/release/view/view.html.php | 2 +- module/story/view/view.html.php | 2 +- module/task/view/view.html.php | 2 +- module/testcase/view/view.html.php | 2 +- module/testsuite/view/view.html.php | 2 +- module/tree/view/browse.html.php | 2 +- www/theme/default/style.css | 5 ++++- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 2919fd5470..b6ec4fe393 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -16,7 +16,7 @@ - testcase->forceNotReview()):?> - - - - - - - - - - - From 1148ff0f7cbd0db69609e9b7a85c1deec790a1d8 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 19 Sep 2018 16:00:38 +0800 Subject: [PATCH 6/6] * finish task #4892. --- lib/front/front.class.php | 2 +- module/admin/view/bind.html.php | 2 +- module/admin/view/certifyztemail.html.php | 2 +- module/admin/view/certifyztmobile.html.php | 2 +- module/admin/view/register.html.php | 4 +- module/admin/view/safe.html.php | 2 +- module/admin/view/sso.html.php | 2 +- module/admin/view/ztcompany.html.php | 2 +- module/api/view/debug.html.php | 4 +- module/backup/view/change.html.php | 2 +- module/block/lang/en.php | 2 - module/block/lang/zh-cn.php | 2 - module/branch/view/manage.html.php | 2 +- module/bug/view/activate.html.php | 2 +- module/bug/view/assignto.html.php | 2 +- module/bug/view/batchactivate.html.php | 2 +- module/bug/view/batchcreate.html.php | 2 +- module/bug/view/batchedit.html.php | 2 +- module/bug/view/close.html.php | 2 +- module/bug/view/confirmbug.html.php | 2 +- module/bug/view/create.html.php | 4 +- module/bug/view/edit.html.php | 2 +- module/bug/view/resolve.html.php | 2 +- module/build/view/create.html.php | 2 +- module/build/view/edit.html.php | 2 +- module/common/lang/menuOrder.php | 17 ++-- module/common/view/action.html.php | 2 +- module/company/view/edit.html.php | 2 +- module/cron/view/create.html.php | 2 +- module/cron/view/edit.html.php | 2 +- module/custom/view/flow.html.php | 2 +- module/custom/view/required.html.php | 2 +- module/custom/view/score.html.php | 2 +- module/custom/view/set.html.php | 12 +-- module/custom/view/working.html.php | 2 +- module/dept/view/browse.html.php | 2 +- module/dept/view/edit.html.php | 2 +- module/doc/view/create.html.php | 2 +- module/doc/view/createlib.html.php | 2 +- module/doc/view/edit.html.php | 2 +- module/doc/view/editlib.html.php | 2 +- module/doc/view/objectlibs.html.php | 2 +- module/doc/view/objectlibsbylist.html.php | 2 +- module/editor/view/edit.html.php | 2 +- module/editor/view/newpage.html.php | 2 +- module/entry/view/create.html.php | 2 +- module/entry/view/edit.html.php | 2 +- module/extension/view/upload.html.php | 2 +- module/file/view/export.html.php | 2 +- module/group/view/copy.html.php | 2 +- module/group/view/create.html.php | 2 +- module/group/view/edit.html.php | 2 +- module/group/view/managemember.html.php | 2 +- module/group/view/manageview.html.php | 2 +- module/group/view/privbygroup.html.php | 2 +- module/group/view/privbymodule.html.php | 2 +- module/mail/view/browse.html.php | 4 +- module/mail/view/detect.html.php | 2 +- module/mail/view/test.html.php | 2 +- module/mail/view/ztcloud.html.php | 2 +- module/message/view/setting.html.php | 2 +- module/my/view/changepassword.html.php | 2 +- module/my/view/editprofile.html.php | 2 +- module/my/view/managecontacts.html.php | 2 +- module/product/view/batchedit.html.php | 2 +- module/product/view/close.html.php | 2 +- module/product/view/create.html.php | 2 +- module/product/view/edit.html.php | 2 +- module/productplan/view/batchedit.html.php | 2 +- module/productplan/view/create.html.php | 2 +- module/productplan/view/edit.html.php | 2 +- module/project/view/activate.html.php | 2 +- .../project/view/ajaxkanbansetting.html.php | 2 +- module/project/view/batchedit.html.php | 2 +- module/project/view/close.html.php | 2 +- module/project/view/create.html.php | 2 +- module/project/view/edit.html.php | 2 +- module/project/view/fixfirst.html.php | 2 +- module/project/view/managemembers.html.php | 2 +- module/project/view/manageproducts.html.php | 2 +- module/project/view/printkanban.html.php | 2 +- module/project/view/putoff.html.php | 2 +- module/project/view/start.html.php | 2 +- module/project/view/suspend.html.php | 2 +- module/release/view/create.html.php | 2 +- module/release/view/edit.html.php | 2 +- module/release/view/export.html.php | 2 +- module/search/view/savequery.html.php | 2 +- module/story/view/batchclose.html.php | 2 +- module/story/view/batchcreate.html.php | 2 +- module/story/view/batchedit.html.php | 2 +- module/story/view/change.html.php | 2 +- module/story/view/close.html.php | 2 +- module/story/view/create.html.php | 2 +- module/story/view/edit.html.php | 2 +- module/story/view/review.html.php | 2 +- module/task/view/assignto.html.php | 2 +- module/task/view/batchcreate.html.php | 2 +- module/task/view/batchedit.html.php | 2 +- module/task/view/create.html.php | 2 +- module/task/view/edit.html.php | 2 +- module/task/view/editestimate.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/testcase/view/batchcreate.html.php | 2 +- module/testcase/view/batchedit.html.php | 2 +- module/testcase/view/create.html.php | 2 +- module/testcase/view/edit.html.php | 2 +- module/testcase/view/exporttemplet.html.php | 2 +- module/testcase/view/showimport.html.php | 2 +- module/testreport/view/create.html.php | 2 +- module/testreport/view/edit.html.php | 2 +- .../testsuite/view/batchcreatecase.html.php | 2 +- module/testsuite/view/create.html.php | 2 +- module/testsuite/view/createcase.html.php | 2 +- module/testsuite/view/createlib.html.php | 2 +- module/testsuite/view/showimport.html.php | 2 +- module/testtask/view/activate.html.php | 2 +- module/testtask/view/batchrun.html.php | 2 +- module/testtask/view/block.html.php | 2 +- module/testtask/view/close.html.php | 2 +- module/testtask/view/create.html.php | 2 +- module/testtask/view/edit.html.php | 2 +- module/testtask/view/runcase.html.php | 2 +- module/testtask/view/start.html.php | 2 +- module/todo/view/assignto.html.php | 2 +- module/todo/view/batchcreate.html.php | 2 +- module/todo/view/batchedit.html.php | 2 +- module/todo/view/create.html.php | 2 +- module/todo/view/edit.html.php | 2 +- module/todo/view/view.html.php | 2 +- module/tree/view/browse.html.php | 2 +- module/tree/view/browsetask.html.php | 2 +- module/user/control.php | 2 +- module/user/view/batchcreate.html.php | 2 +- module/user/view/batchedit.html.php | 2 +- module/user/view/create.html.php | 2 +- module/user/view/delete.html.php | 2 +- module/user/view/edit.html.php | 2 +- module/user/view/managecontacts.html.php | 89 ------------------- module/webhook/view/create.html.php | 2 +- module/webhook/view/edit.html.php | 2 +- 144 files changed, 157 insertions(+), 251 deletions(-) delete mode 100644 module/user/view/managecontacts.html.php diff --git a/lib/front/front.class.php b/lib/front/front.class.php index b0a8954b3d..aedb358f9b 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -87,7 +87,7 @@ class html extends baseHTML * @access public * @return string the submit button tag. */ - public static function submitButton($label = '', $misc = '', $class = 'btn btn-primary') + public static function submitButton($label = '', $misc = '', $class = 'btn btn-wide btn-primary') { return parent::submitButton($label, $class, $misc); } diff --git a/module/admin/view/bind.html.php b/module/admin/view/bind.html.php index 31f6273a58..65b264cde1 100644 --- a/module/admin/view/bind.html.php +++ b/module/admin/view/bind.html.php @@ -36,7 +36,7 @@ diff --git a/module/admin/view/certifyztemail.html.php b/module/admin/view/certifyztemail.html.php index dba72af3c3..6f4ddf0cc3 100644 --- a/module/admin/view/certifyztemail.html.php +++ b/module/admin/view/certifyztemail.html.php @@ -28,7 +28,7 @@ - +
- testcase->statusList, $case->status);?> delay)):?> - project->delayed;?> + project->delayed;?> - project->statusList, $project->status, '');?> + project->statusList, $project->status, '');?> hours->totalEstimate;?>date?> - release->statusList, $release->status);?> - story->statusList, $story->status);?> - task->statusList, $task->status);?> status == 'resolved' or $bug->status == 'closed') ? $users[$bug->resolvedBy] : html::select("resolvedBy[{$bug->id}]", $users, $this->app->user->account, "class='form-control chosen'");?> - bug->statusList[$bug->status];?> estimate;?> - story->statusList[$story->status];?> estimate;?> - story->statusList[$story->status];?> title, '', "class='iframe' data-width='1000'");?> - bug->statusList[$bug->status];?> title, '', "class='iframe' data-width='1000'");?> - bug->statusList[$bug->status];?> bug->assignedTo);?> bug->resolvedByAB);?> bug->resolutionAB);?> actions;?> actions;?>
bug->typeList, $bug->type, '');?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?> openedBy);?> - assignedTo) ? zget($users, $bug->assignedTo) : $this->lang->bug->noAssigned; - $btnTextClass = 'text-red'; - $btnClass = $assignedToText == 'closed' ? ' disabled' : ''; - echo html::a(helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true), " {$assignedToText}", '', "class='iframe btn btn-sm btn-icon-left{$btnClass}'"); - ?> + " . zget($users, $bug->assignedTo) . "";?> resolvedBy);?> bug->resolutionList, $bug->resolution);?> id"; + common::printIcon('bug', 'assignTo', $params, $bug, 'list', '', '', 'iframe', true); common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true); common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true); common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true); diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index 72ccdf3df1..b9dedc2dd8 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -56,9 +56,9 @@ end;?> delay)):?> - project->delayed;?> + project->delayed;?> - project->statusList, $project->status, '');?> + project->statusList, $project->status, '');?> role;?>planTitle;?> openedBy];?> estimate;?> story->statusList, $story->status);?> story->statusList, $story->status);?> story->stageList, $story->stage);?> createLink('task', 'view', "taskID=$task->id"), $task->name, null, "style='color: $task->color'");?> openedBy);?> - " . zget($users, $task->assignedTo) . ""; - ?> - " . zget($users, $task->assignedTo) . "";?> finishedBy);?> estimate;?> consumed;?>assignedTo];?> - bug->statusList[$bug->status];?> estimate;?> - story->statusList[$story->status];?> end;?> - project->statusList, $project->status);?> assignedToAB);?> bug->resolvedBy);?> bug->resolutionAB);?>actions;?>actions;?>
createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?> openedBy, $bug->openedBy);?> - assignedTo, $bug->assignedTo);?> - id";?> assignedTo == $this->app->user->account ? 'text-red' : 'text-primary';?> - - createLink('bug', 'assignTo', $params, '', 'true'), " $assignedTo", '', "class='iframe btn btn-icon-left btn-sm'");?> - - - + " . zget($users, $bug->assignedTo, $bug->assignedTo) . "";?> resolvedBy, $bug->resolvedBy);?> bug->resolutionList[$bug->resolution];?> id"; + common::printIcon('bug', 'assignTo', $params, $bug, 'list', '', '', 'iframe', true); if($bug->status == 'active') common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true); if($bug->status == 'active') common::printIcon('bug', 'resolve', $params, $bug, 'list', 'check', '', 'iframe', true); if($bug->status != 'active') common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true); diff --git a/module/project/view/importbug.html.php b/module/project/view/importbug.html.php index d133b1b3c4..544a1963b9 100755 --- a/module/project/view/importbug.html.php +++ b/module/project/view/importbug.html.php @@ -59,7 +59,7 @@ var browseType = ''; bug->severityList, $bug->severity, $bug->severity)?>'>bug->severityList, $bug->severity, $bug->severity)?> pri;?>' title='bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> id", $bug->title, '', "class='preview'", true, true);?> bug->statusList[$bug->status];?>bug->statusList[$bug->status];?> id]", $lang->task->priList, 3, "class='form-control chosen'");?> id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='form-control chosen'");?> id]", '', 'size=4 class="form-control" autocomplete="off"');?>delay)) echo 'delayed';?>>deadline, 0, 4) > 0) echo $task->deadline;?> - task->statusList[$task->status];?> estimate;?> - story->statusList, $story->status);?> end?> - testtask->statusList[$task->status];?> resolvedBy];?> - bug->statusList[$bug->status];?> openedBy);?> assignedTo);?> estimate;?> story->statusList, $story->status);?>story->statusList, $story->status);?> story->stageList, $story->stage);?>
title, '', "class='preview'");?> bug->statusList, $bug->status);?> bug->statusList, $bug->status);?> openedBy);?> openedDate?> diff --git a/module/story/view/affected.html.php b/module/story/view/affected.html.php index a12cd00639..73226d96f7 100644 --- a/module/story/view/affected.html.php +++ b/module/story/view/affected.html.php @@ -28,7 +28,6 @@ assignedTo];?> - task->statusList[$task->status];?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank');?> - bug->statusList[$bug->status];?> createLink('testcase', 'view', "caseID=$case->id"), $case->title, '_blank');?> - testcase->statusList[$case->status];?> openedBy];?> assignedTo];?> estimate;?> story->statusList, $story->status);?>story->statusList, $story->status);?> story->stageList, $story->stage);?> li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;} .pl-5px{padding-left:5px;} -.fail a, .fail a .icon{color:#f00 !important} -.blocked a, .blocked a .icon{color:#f00 !important} + +.fail .result-fail, .blocked .result-blocked{color:#f00;} +.pass .result-pass{color:green;} tbody > tr > td > .btn-icon {margin-right: 3px;} tbody > tr > td .icon-bug {margin-left: -8px;} diff --git a/module/testcase/model.php b/module/testcase/model.php index 7a79e53186..25ae9930fc 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1419,8 +1419,10 @@ class testcaseModel extends model if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate)); break; case 'lastRunResult': + $class = 'result-' . $case->lastRunResult; $lastRunResultText = $case->lastRunResult ? zget($this->lang->testcase->resultList, $case->lastRunResult, $case->lastRunResult) : $this->lang->testcase->unexecuted; - echo html::a(helper::createLink('testtask', 'results', "runID=0&caseID=$case->id", '', true), " {$lastRunResultText}", '', "class='iframe btn btn-icon-left btn-sm'"); + echo "" . $lastRunResultText . ""; + //html::a(helper::createLink('testtask', 'results', "runID=0&caseID=$case->id", '', true), " {$lastRunResultText}", '', "class='iframe btn btn-icon-left btn-sm'"); break; case 'bugs': echo (common::hasPriv('testcase', 'bugs') and $case->bugs) ? html::a(helper::createLink('testcase', 'bugs', "runID=0&caseID={$case->id}"), $case->bugs, '', "class='iframe'") : $case->bugs; @@ -1438,6 +1440,7 @@ class testcaseModel extends model break; } + common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", $case, 'list', '', '', 'iframe', true); common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $case, 'list', 'play', '', 'runCase iframe', false, "data-width='95%'"); common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); if($this->config->testcase->needReview or !empty($this->config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'list', 'glasses', '', 'iframe'); diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php index aae89651ca..0c6ddc612d 100644 --- a/module/testcase/view/groupcase.html.php +++ b/module/testcase/view/groupcase.html.php @@ -82,7 +82,7 @@ } else { - echo ""; + echo ""; echo $lang->testcase->statusList[$case->status]; echo ''; } diff --git a/module/testreport/view/blockbugs.html.php b/module/testreport/view/blockbugs.html.php index 61221c39e0..52703a22c6 100644 --- a/module/testreport/view/blockbugs.html.php +++ b/module/testreport/view/blockbugs.html.php @@ -23,7 +23,6 @@ resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?> - bug->statusList, $bug->status);?> testcase->resultList, $case->lastRunResult);?> - testtask->statusList, $case->status);?> resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?> - bug->statusList, $bug->status);?> estimate?> - story->statusList, $story->status);?> end?> - testtask->statusList[$task->status];?>
testcase->title;?> -
- -
- -
    -
  • testcase->colorTag;?>
    • -
- +
+
+ +
+ +
    +
  • testcase->colorTag;?>
    • +
+ +
+ + testcase->pri;?> + testcase->priList as $priKey => $priValue) + { + if(!empty($priKey) and (string)$priKey != (string)$priValue) + { + $hasCustomPri = true; + break; + } + } + $priList = $lang->testcase->priList; + if(end($priList)) + { + unset($priList[0]); + $priList[0] = ''; + } + ?> + + + +
+ +
+ +
+
+ + + testcase->forceNotReview()):?> + testcase->forceNotReview, '', "id='forceNotReview0'");?> +
testcase->forceNotReview, '', "id='forceNotReview0'");?>
testcase->pri;?> - testcase->priList as $priKey => $priValue) - { - if(!empty($priKey) and (string)$priKey != (string)$priValue) - { - $hasCustomPri = true; - break; - } - } - $priList = $lang->testcase->priList; - if(end($priList)) - { - unset($priList[0]); - $priList[0] = ''; - } - ?> - - - - - -
testcase->precondition;?>
diff --git a/module/admin/view/certifyztmobile.html.php b/module/admin/view/certifyztmobile.html.php index 235bc8b385..bfb96d57b0 100644 --- a/module/admin/view/certifyztmobile.html.php +++ b/module/admin/view/certifyztmobile.html.php @@ -28,7 +28,7 @@ - + diff --git a/module/admin/view/register.html.php b/module/admin/view/register.html.php index d88ed6e073..5e0a6f1013 100644 --- a/module/admin/view/register.html.php +++ b/module/admin/view/register.html.php @@ -84,7 +84,7 @@ - admin->register->submit, '', 'btn btn-wide btn-primary') . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?> + admin->register->submit) . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?> @@ -109,7 +109,7 @@ - + diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php index 13c482958a..daf91360a1 100644 --- a/module/admin/view/safe.html.php +++ b/module/admin/view/safe.html.php @@ -48,7 +48,7 @@ - + diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php index 527210003f..7bf3469cc5 100644 --- a/module/admin/view/sso.html.php +++ b/module/admin/view/sso.html.php @@ -42,7 +42,7 @@ - + diff --git a/module/admin/view/ztcompany.html.php b/module/admin/view/ztcompany.html.php index 5f922f6e64..8b4fda9dc9 100644 --- a/module/admin/view/ztcompany.html.php +++ b/module/admin/view/ztcompany.html.php @@ -25,7 +25,7 @@ - + diff --git a/module/api/view/debug.html.php b/module/api/view/debug.html.php index 51cc2bd6d0..a0c2a7f61a 100644 --- a/module/api/view/debug.html.php +++ b/module/api/view/debug.html.php @@ -25,12 +25,12 @@ - api->submit, '', 'btn btn-primary btn-wide')?> + api->submit)?> - api->noParam . html::submitButton($lang->api->submit, '', 'btn btn-primary btn-wide');?> + api->noParam . html::submitButton($lang->api->submit);?> post) echo "

{$lang->api->post}

"?> diff --git a/module/backup/view/change.html.php b/module/backup/view/change.html.php index a15eca7ea5..07d352dddc 100644 --- a/module/backup/view/change.html.php +++ b/module/backup/view/change.html.php @@ -24,7 +24,7 @@ day;?> - + diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 92206bd748..000c403a40 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -68,7 +68,6 @@ $lang->block->default['product']['1']['grid'] = 8; $lang->block->default['product']['1']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['1']['params']['type'] = 'all'; -$lang->block->default['product']['1']['params']['num'] = 5; $lang->block->default['product']['2']['title'] = $lang->productCommon . ' Overview'; $lang->block->default['product']['2']['block'] = 'overview'; @@ -95,7 +94,6 @@ $lang->block->default['project']['1']['grid'] = 8; $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc'; $lang->block->default['project']['1']['params']['type'] = 'all'; -$lang->block->default['project']['1']['params']['num'] = 5; $lang->block->default['project']['2']['title'] = $lang->projectCommon . ' Overview'; $lang->block->default['project']['2']['block'] = 'overview'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index a6d6472d6b..e52a7cb2b4 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -68,7 +68,6 @@ $lang->block->default['product']['1']['grid'] = 8; $lang->block->default['product']['1']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['1']['params']['type'] = 'all'; -$lang->block->default['product']['1']['params']['num'] = 5; $lang->block->default['product']['2']['title'] = $lang->productCommon . '总览'; $lang->block->default['product']['2']['block'] = 'overview'; @@ -95,7 +94,6 @@ $lang->block->default['project']['1']['grid'] = 8; $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc'; $lang->block->default['project']['1']['params']['type'] = 'all'; -$lang->block->default['project']['1']['params']['num'] = 5; $lang->block->default['project']['2']['title'] = $lang->projectCommon . '总览'; $lang->block->default['project']['2']['block'] = 'overview'; diff --git a/module/branch/view/manage.html.php b/module/branch/view/manage.html.php index f9dfd7a25d..c58c2ae73a 100644 --- a/module/branch/view/manage.html.php +++ b/module/branch/view/manage.html.php @@ -47,7 +47,7 @@ - + diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php index 540cab2360..2c0dd95469 100644 --- a/module/bug/view/activate.html.php +++ b/module/bug/view/activate.html.php @@ -43,7 +43,7 @@ fetch('file', 'buildform');?> - goback, $this->session->bugList, 'self', '', 'btn btn-wide');?> + goback, $this->session->bugList, 'self', '', 'btn btn-wide');?> diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php index 817b2beff8..9d9e1866c8 100644 --- a/module/bug/view/assignto.html.php +++ b/module/bug/view/assignto.html.php @@ -43,7 +43,7 @@ js::set('page', 'assignedto'); - goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?> + goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?> diff --git a/module/bug/view/batchactivate.html.php b/module/bug/view/batchactivate.html.php index 3beb63991d..5090cf657d 100644 --- a/module/bug/view/batchactivate.html.php +++ b/module/bug/view/batchactivate.html.php @@ -38,7 +38,7 @@ - + diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index c1c1a10455..eaa4aa6245 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -163,7 +163,7 @@ - + diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 0d704acb8d..60d10b004b 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -141,7 +141,7 @@ - + diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php index a3c08842f8..86e05df53d 100644 --- a/module/bug/view/close.html.php +++ b/module/bug/view/close.html.php @@ -31,7 +31,7 @@ - goback, $this->session->bugList, 'self', '', 'btn btn-wide');?> + goback, $this->session->bugList, 'self', '', 'btn btn-wide');?> diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php index 499a170e70..7d1660e89c 100755 --- a/module/bug/view/confirmbug.html.php +++ b/module/bug/view/confirmbug.html.php @@ -54,7 +54,7 @@ js::set('page', 'confirmbug'); - goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?> + goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?> diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index e21cac8787..6891a31a90 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -298,7 +298,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate); - + @@ -322,7 +322,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate); $lang->public))?> - + diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 4d377a4b99..b83dd94114 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -70,7 +70,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
lastEditedDate); - echo html::submitButton('', '', 'btn btn-wide btn-primary'); + echo html::submitButton(); $browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product"); echo html::linkButton($lang->goback, $browseLink, 'self', '', "btn btn-wide"); ?> diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php index e9237afc6b..243ae23315 100644 --- a/module/bug/view/resolve.html.php +++ b/module/bug/view/resolve.html.php @@ -82,7 +82,7 @@ js::set('productID' , $bug->product); - goback, $this->session->bugList, 'self', '', 'btn btn-wide');?> + goback, $this->session->bugList, 'self', '', 'btn btn-wide');?> diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php index 60265f81b7..8bbc06695f 100644 --- a/module/build/view/create.html.php +++ b/module/build/view/create.html.php @@ -74,7 +74,7 @@ - + diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php index b0fc8a106c..f5c0cd0afd 100644 --- a/module/build/view/edit.html.php +++ b/module/build/view/edit.html.php @@ -68,7 +68,7 @@ - + global->flow != 'onlyTest' ? html::hidden('project', $build->project) : '';?> diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 3fdbb29b0a..738543af1d 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -89,15 +89,14 @@ $lang->report->menuOrder[15] = 'test'; $lang->report->menuOrder[20] = 'staff'; /* company menu order. */ -$lang->company->menuOrder[5] = 'name'; -$lang->company->menuOrder[10] = 'browseUser'; -$lang->company->menuOrder[15] = 'dept'; -$lang->company->menuOrder[20] = 'browseGroup'; -$lang->company->menuOrder[25] = 'dynamic'; -$lang->company->menuOrder[30] = 'view'; -$lang->company->menuOrder[35] = 'addGroup'; -$lang->company->menuOrder[40] = 'batchAddUser'; -$lang->company->menuOrder[45] = 'addUser'; +$lang->company->menuOrder[5] = 'browseUser'; +$lang->company->menuOrder[10] = 'dept'; +$lang->company->menuOrder[15] = 'browseGroup'; +$lang->company->menuOrder[20] = 'dynamic'; +$lang->company->menuOrder[25] = 'view'; +$lang->company->menuOrder[30] = 'addGroup'; +$lang->company->menuOrder[35] = 'batchAddUser'; +$lang->company->menuOrder[40] = 'addUser'; $lang->dept->menuOrder = $lang->company->menuOrder; $lang->group->menuOrder = $lang->company->menuOrder; $lang->user->menuOrder = $lang->company->menuOrder; diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php index a796ef5066..abc975a995 100755 --- a/module/common/view/action.html.php +++ b/module/common/view/action.html.php @@ -74,7 +74,7 @@ comment), "rows='8' autofocus='autofocus'");?>
- save, '', 'btn btn-primary btn-wide');?> + save);?> close, '', 'btn btn-wide btn-hide-form');?>
diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php index 1cf75634a5..30d99d63ac 100644 --- a/module/company/view/edit.html.php +++ b/module/company/view/edit.html.php @@ -54,7 +54,7 @@ company->guest;?> company->guestOptions, $company->guest);?> - + diff --git a/module/cron/view/create.html.php b/module/cron/view/create.html.php index 4298fdebb7..965b41813d 100644 --- a/module/cron/view/create.html.php +++ b/module/cron/view/create.html.php @@ -59,7 +59,7 @@ cron->typeList, 'system', "class='form-control'")?> - + diff --git a/module/cron/view/edit.html.php b/module/cron/view/edit.html.php index 5ada99942e..262fff2d71 100644 --- a/module/cron/view/edit.html.php +++ b/module/cron/view/edit.html.php @@ -59,7 +59,7 @@ cron->typeList, $cron->type, "class='form-control'")?> - + diff --git a/module/custom/view/flow.html.php b/module/custom/view/flow.html.php index 9e9fb217b2..d825b45823 100644 --- a/module/custom/view/flow.html.php +++ b/module/custom/view/flow.html.php @@ -28,7 +28,7 @@ - +
custom->productProject->notice?>
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php index 031cbf4b68..1c54fae597 100644 --- a/module/custom/view/required.html.php +++ b/module/custom/view/required.html.php @@ -57,7 +57,7 @@ - + custom->restore, 'hiddenwin', "class='btn btn-wide'");?> diff --git a/module/custom/view/score.html.php b/module/custom/view/score.html.php index 30e89f4732..60c32c319f 100644 --- a/module/custom/view/score.html.php +++ b/module/custom/view/score.html.php @@ -30,7 +30,7 @@ - + " . $lang->custom->scoreReset, '', ' id="scoreRefresh" class="btn btn-wide iframe" data-width="480"', true, true);?> diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 3cb46a3e05..023baa73d8 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -71,7 +71,7 @@ EOT; - + @@ -86,7 +86,7 @@ EOT; custom->weekendList, $weekend);?> - + @@ -99,7 +99,7 @@ EOT; day?> - +
custom->notice->longlife;?>
@@ -110,7 +110,7 @@ EOT; - + @@ -121,7 +121,7 @@ EOT; - + @@ -151,7 +151,7 @@ EOT; $lang->custom->currentLang, 'all' => $lang->custom->allLang); echo html::radio('lang', $appliedTo, $lang2Set); - echo html::submitButton('', '', 'btn btn-primary btn-wide'); + echo html::submitButton(); if(common::hasPriv('custom', 'restore')) echo html::linkButton($lang->custom->restore, inlink('restore', "module=$module&field=$field"), 'hiddenwin', '', 'btn btn-wide'); ?> diff --git a/module/custom/view/working.html.php b/module/custom/view/working.html.php index 12ed80c467..52c08d0833 100644 --- a/module/custom/view/working.html.php +++ b/module/custom/view/working.html.php @@ -28,7 +28,7 @@ - + diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php index 5409952a5f..a018855d52 100644 --- a/module/dept/view/browse.html.php +++ b/module/dept/view/browse.html.php @@ -65,7 +65,7 @@ - + diff --git a/module/dept/view/edit.html.php b/module/dept/view/edit.html.php index b020116598..11dae74392 100644 --- a/module/dept/view/edit.html.php +++ b/module/dept/view/edit.html.php @@ -37,7 +37,7 @@ $jsRoot = $webRoot . "js/"; - + diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index fc8b8433ed..8d44f21480 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -77,7 +77,7 @@ - + diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php index 85984a1e37..cf124b1aa6 100644 --- a/module/doc/view/createlib.html.php +++ b/module/doc/view/createlib.html.php @@ -55,7 +55,7 @@ - + diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php index 37335c47ff..9b8dc0920c 100644 --- a/module/doc/view/edit.html.php +++ b/module/doc/view/edit.html.php @@ -76,7 +76,7 @@ editedDate); - echo html::submitButton('', '', 'btn btn-wide btn-primary'); + echo html::submitButton(); echo html::backButton('', '', 'btn btn-wide'); ?> diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php index 68cfc8afad..540ba84c69 100644 --- a/module/doc/view/editlib.html.php +++ b/module/doc/view/editlib.html.php @@ -56,7 +56,7 @@ - + diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php index 41c57d24cd..ad1ca23575 100644 --- a/module/doc/view/objectlibs.html.php +++ b/module/doc/view/objectlibs.html.php @@ -46,7 +46,7 @@
- save);?>   + save, '', 'btn btn-primary');?>   cancel, '', "btn close-dropdown");?>
diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php index 9dc663cb61..774a5c3242 100644 --- a/module/doc/view/objectlibsbylist.html.php +++ b/module/doc/view/objectlibsbylist.html.php @@ -26,7 +26,7 @@
- save);?>   + save, '', 'btn btn-primary');?>   cancel, '', "btn close-dropdown");?>
diff --git a/module/editor/view/edit.html.php b/module/editor/view/edit.html.php index e488d3dd34..a1819706a4 100644 --- a/module/editor/view/edit.html.php +++ b/module/editor/view/edit.html.php @@ -72,7 +72,7 @@ - + diff --git a/module/editor/view/newpage.html.php b/module/editor/view/newpage.html.php index f7cc850077..d3abfe84f0 100644 --- a/module/editor/view/newpage.html.php +++ b/module/editor/view/newpage.html.php @@ -30,7 +30,7 @@ ?> - + diff --git a/module/entry/view/create.html.php b/module/entry/view/create.html.php index 8fb3dac71b..ec38dc4f00 100644 --- a/module/entry/view/create.html.php +++ b/module/entry/view/create.html.php @@ -60,7 +60,7 @@ - + entry->help, $lang->entry->help, '_blank', "class='help'");?> diff --git a/module/entry/view/edit.html.php b/module/entry/view/edit.html.php index c4211a126d..8214d64e38 100644 --- a/module/entry/view/edit.html.php +++ b/module/entry/view/edit.html.php @@ -58,7 +58,7 @@ - + entry->help, $lang->entry->help, '_blank', "class='help'");?> diff --git a/module/extension/view/upload.html.php b/module/extension/view/upload.html.php index d9339c2ff7..eba523a3ee 100644 --- a/module/extension/view/upload.html.php +++ b/module/extension/view/upload.html.php @@ -28,7 +28,7 @@
- extension->install);?> + extension->install, '', 'btn btn-primary');?>
diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index 6d8d633746..dd94d5819a 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -214,7 +214,7 @@ if($isCustomExport) - export, "onclick='setDownloading();' ");?> + export, "onclick='setDownloading();'", 'btn btn-primary');?> diff --git a/module/group/view/copy.html.php b/module/group/view/copy.html.php index d4cbedb224..edd282bf93 100644 --- a/module/group/view/copy.html.php +++ b/module/group/view/copy.html.php @@ -30,7 +30,7 @@ group->copyOptions, '', '', 'inline');?> - + diff --git a/module/group/view/create.html.php b/module/group/view/create.html.php index c766d5acd7..0ba1284af7 100644 --- a/module/group/view/create.html.php +++ b/module/group/view/create.html.php @@ -26,7 +26,7 @@ - + diff --git a/module/group/view/edit.html.php b/module/group/view/edit.html.php index 2959ed8c82..76230b7d27 100644 --- a/module/group/view/edit.html.php +++ b/module/group/view/edit.html.php @@ -30,7 +30,7 @@ desc, "rows='5' class='form-control'");?> - + diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php index ac5f431cd6..e2d2d13be4 100644 --- a/module/group/view/managemember.html.php +++ b/module/group/view/managemember.html.php @@ -61,7 +61,7 @@ goback, $this->createLink('group', 'browse')); echo html::hidden('foo'); // Just a var, to make sure $_POST is not empty. ?> diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index 94a4514216..fff0b33ad5 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -69,7 +69,7 @@ - + diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index d590b774f1..37499211ff 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -37,7 +37,7 @@ - + diff --git a/module/group/view/privbymodule.html.php b/module/group/view/privbymodule.html.php index 4bb1eb8343..988964d16a 100644 --- a/module/group/view/privbymodule.html.php +++ b/module/group/view/privbymodule.html.php @@ -41,7 +41,7 @@ - + diff --git a/module/mail/view/browse.html.php b/module/mail/view/browse.html.php index 9fb4ac0876..853589abc8 100644 --- a/module/mail/view/browse.html.php +++ b/module/mail/view/browse.html.php @@ -45,8 +45,8 @@
- id?>
+ id?> toList, $queue->toList)?> subject?> @@ -69,7 +69,7 @@
- delete);?> + delete, '', 'btn btn-primary');?>
show('right', 'pagerjs');?>
diff --git a/module/mail/view/detect.html.php b/module/mail/view/detect.html.php index c55cd09369..f4297433ee 100755 --- a/module/mail/view/detect.html.php +++ b/module/mail/view/detect.html.php @@ -21,7 +21,7 @@
- +
mail->inputFromEmail; ?>mail->nextStep);?>
mail->inputFromEmail; ?>mail->nextStep, '', 'btn btn-primary');?>
diff --git a/module/mail/view/test.html.php b/module/mail/view/test.html.php index ab96ef6d81..7e06279357 100755 --- a/module/mail/view/test.html.php +++ b/module/mail/view/test.html.php @@ -32,7 +32,7 @@ user->account, "class='form-control chosen'");?> mail->test); + echo html::submitButton($lang->mail->test, '', 'btn btn-primary'); $mta = $config->mail->mta; echo html::linkButton($lang->mail->edit, inlink(($mta == 'sendcloud' or $mta == 'ztcloud') ? $mta : 'edit')); ?> diff --git a/module/mail/view/ztcloud.html.php b/module/mail/view/ztcloud.html.php index d9638ef771..1e8e1cf2a5 100644 --- a/module/mail/view/ztcloud.html.php +++ b/module/mail/view/ztcloud.html.php @@ -61,7 +61,7 @@ - + mail->turnon and $mailExist) echo html::a(inlink('test'), $lang->mail->test, '', "class='btn btn-wide'"); echo html::a(inlink('reset'), $lang->mail->reset, '', "class='btn btn-wide'"); diff --git a/module/message/view/setting.html.php b/module/message/view/setting.html.php index b810cbca09..29a43166c2 100644 --- a/module/message/view/setting.html.php +++ b/module/message/view/setting.html.php @@ -70,7 +70,7 @@ - + diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php index d8cb9b08ca..d1524d4245 100755 --- a/module/my/view/changepassword.html.php +++ b/module/my/view/changepassword.html.php @@ -44,7 +44,7 @@ - + app->user->modifyPasswordReason)):?> diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php index b240520ae8..fb4174f40b 100644 --- a/module/my/view/editprofile.html.php +++ b/module/my/view/editprofile.html.php @@ -103,7 +103,7 @@ -
+
diff --git a/module/my/view/managecontacts.html.php b/module/my/view/managecontacts.html.php index 87caa429db..5edcaa0200 100644 --- a/module/my/view/managecontacts.html.php +++ b/module/my/view/managecontacts.html.php @@ -87,7 +87,7 @@ - + delete, 'hiddenwin', "class='btn btn-danger btn-wide'");?> diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php index 27414124b7..76ea6ec578 100755 --- a/module/product/view/batchedit.html.php +++ b/module/product/view/batchedit.html.php @@ -72,7 +72,7 @@ - + diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php index 3468b675d5..455bbafa3b 100644 --- a/module/product/view/close.html.php +++ b/module/product/view/close.html.php @@ -30,7 +30,7 @@ - + goback, $this->session->taskList, 'self', '', 'btn btn-wide');?> diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index 48be3b9cb8..3d4b019b88 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -83,7 +83,7 @@ - + diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index c3c0e25eda..db23def9eb 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -72,7 +72,7 @@ - + diff --git a/module/productplan/view/batchedit.html.php b/module/productplan/view/batchedit.html.php index bce1af1aa6..8cdf142c9b 100644 --- a/module/productplan/view/batchedit.html.php +++ b/module/productplan/view/batchedit.html.php @@ -41,7 +41,7 @@ - + diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php index c719c39ecf..a8516d6eb2 100644 --- a/module/productplan/view/create.html.php +++ b/module/productplan/view/create.html.php @@ -58,7 +58,7 @@ - + id);?> diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php index 93a7f79ec3..1a74dcc452 100644 --- a/module/productplan/view/edit.html.php +++ b/module/productplan/view/edit.html.php @@ -58,7 +58,7 @@ - + id);?> diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php index a15b910500..d0b060eef4 100644 --- a/module/project/view/activate.html.php +++ b/module/project/view/activate.html.php @@ -54,7 +54,7 @@ - goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> + goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> diff --git a/module/project/view/ajaxkanbansetting.html.php b/module/project/view/ajaxkanbansetting.html.php index 840108c7ab..e129cedb95 100644 --- a/module/project/view/ajaxkanbansetting.html.php +++ b/module/project/view/ajaxkanbansetting.html.php @@ -51,7 +51,7 @@ form {padding: 30px 0 40px;} project->resetKanban, 'hiddenwin', "class='btn btn-wide'"); ?> diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php index 8204fff288..4ee6c63ff4 100755 --- a/module/project/view/batchedit.html.php +++ b/module/project/view/batchedit.html.php @@ -85,7 +85,7 @@ - + diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php index 103c339838..2228de3515 100644 --- a/module/project/view/close.html.php +++ b/module/project/view/close.html.php @@ -30,7 +30,7 @@ - goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> + goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 8626ff7d83..8e9b719b68 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -146,7 +146,7 @@ - + diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index fed8fc47c2..b0dcacdc50 100644 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -158,7 +158,7 @@ project->whitelist;?> whitelist, '', '', 'inline');?> - + diff --git a/module/project/view/fixfirst.html.php b/module/project/view/fixfirst.html.php index 7a08e8a1fc..6fdd201263 100644 --- a/module/project/view/fixfirst.html.php +++ b/module/project/view/fixfirst.html.php @@ -28,7 +28,7 @@ - + diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php index 781da07c51..2b26262539 100644 --- a/module/project/view/managemembers.html.php +++ b/module/project/view/managemembers.html.php @@ -120,7 +120,7 @@ - + diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php index 6032a29e04..22db1b9d5b 100644 --- a/module/project/view/manageproducts.html.php +++ b/module/project/view/manageproducts.html.php @@ -67,7 +67,7 @@
- +
diff --git a/module/project/view/printkanban.html.php b/module/project/view/printkanban.html.php index 32b7c4b9f3..ac7155754c 100644 --- a/module/project/view/printkanban.html.php +++ b/module/project/view/printkanban.html.php @@ -23,7 +23,7 @@ printKanban->content?>: printKanban->typeList, 'all')?> -     printKanban->print, '', 'btn btn-primary btn-wide')?> +     printKanban->print)?> diff --git a/module/project/view/putoff.html.php b/module/project/view/putoff.html.php index ff867cb6c4..6c75d43bef 100644 --- a/module/project/view/putoff.html.php +++ b/module/project/view/putoff.html.php @@ -60,7 +60,7 @@ - goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> + goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> diff --git a/module/project/view/start.html.php b/module/project/view/start.html.php index c23420c91b..ac42243ae7 100644 --- a/module/project/view/start.html.php +++ b/module/project/view/start.html.php @@ -30,7 +30,7 @@ - project->start, '', 'btn btn-wide btn-primary') . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> + project->start) . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php index 1ff7ef3de1..36e153eccf 100644 --- a/module/project/view/suspend.html.php +++ b/module/project/view/suspend.html.php @@ -29,7 +29,7 @@ - goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> + goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php index f0df364ff9..675023a349 100644 --- a/module/release/view/create.html.php +++ b/module/release/view/create.html.php @@ -49,7 +49,7 @@ - + diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php index eae4e9b862..ae554fea9b 100644 --- a/module/release/view/edit.html.php +++ b/module/release/view/edit.html.php @@ -57,7 +57,7 @@ - + product);?> diff --git a/module/release/view/export.html.php b/module/release/view/export.html.php index a376f13d02..c05272db22 100755 --- a/module/release/view/export.html.php +++ b/module/release/view/export.html.php @@ -47,7 +47,7 @@ function closeWindow() release->exportTypeList, 'all', "class='form-control'")?> - export);?> + export, '', 'btn btn-primary');?> diff --git a/module/search/view/savequery.html.php b/module/search/view/savequery.html.php index a67fe72fd7..022d739264 100644 --- a/module/search/view/savequery.html.php +++ b/module/search/view/savequery.html.php @@ -22,7 +22,7 @@ - + diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php index 86119015ff..79641ba775 100755 --- a/module/story/view/batchclose.html.php +++ b/module/story/view/batchclose.html.php @@ -55,7 +55,7 @@ - + diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index 4f8be42358..3578dcd2f2 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -93,7 +93,7 @@ - save, '', 'btn btn-wide btn-primary');?> + save);?> diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index b7bd55aa80..874d03a4c2 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -149,7 +149,7 @@ foreach(explode(',', $showFields) as $field) - + diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php index 55e4c50009..b2827f799d 100644 --- a/module/story/view/change.html.php +++ b/module/story/view/change.html.php @@ -64,7 +64,7 @@ lastEditedDate); - echo html::submitButton('', '', 'btn btn-wide btn-primary'); + echo html::submitButton(); echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide'); ?> diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php index 0cf69f5622..79fb67156e 100644 --- a/module/story/view/close.html.php +++ b/module/story/view/close.html.php @@ -42,7 +42,7 @@ - + goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');?> diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 05d40aba3a..482d5da51a 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -192,7 +192,7 @@ - + diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index bf4381b52a..59b1672f7f 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -52,7 +52,7 @@
lastEditedDate); - echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary'); + echo html::submitButton($lang->save); echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide'); ?>
diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php index 3e01190381..469749a8b6 100644 --- a/module/story/view/review.html.php +++ b/module/story/view/review.html.php @@ -70,7 +70,7 @@ var assignedTo = 'lastEditedBy ? print($story->lastEditedBy) : pri - + goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');?> diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php index 5ac212ac9a..bdce3dc209 100644 --- a/module/task/view/assignto.html.php +++ b/module/task/view/assignto.html.php @@ -49,7 +49,7 @@ - + goback, $this->session->taskList);?> diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 766cb9b177..b8804ee2dd 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -137,7 +137,7 @@ - + diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index a1344549ac..acd31269dd 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -117,7 +117,7 @@ - + diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index f04d952eea..a17f63411d 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -166,7 +166,7 @@ - + diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index daa18c8c67..b72323359a 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -76,7 +76,7 @@
lastEditedDate);?> consumed);?> - +
diff --git a/module/task/view/editestimate.html.php b/module/task/view/editestimate.html.php index 5d1bce5342..c148d7541b 100644 --- a/module/task/view/editestimate.html.php +++ b/module/task/view/editestimate.html.php @@ -38,7 +38,7 @@ work, "class=form-control");?> - + diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php index 517640881f..191232c1b1 100644 --- a/module/task/view/finish.html.php +++ b/module/task/view/finish.html.php @@ -70,7 +70,7 @@ - task->finish, '', 'btn btn-wide btn-primary');?> + task->finish);?> goback, $this->session->taskList, 'self', '', 'btn btn-wide');?> diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php index 6405443768..ea74b5b45f 100644 --- a/module/task/view/pause.html.php +++ b/module/task/view/pause.html.php @@ -40,7 +40,7 @@ - + goback, $this->session->taskList, 'self', '', 'btn btn-wide');?> diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php index 881f923a35..ec2db89ed9 100644 --- a/module/task/view/recordestimate.html.php +++ b/module/task/view/recordestimate.html.php @@ -93,7 +93,7 @@ - + diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php index 2749c2a643..bcd5298021 100644 --- a/module/task/view/start.html.php +++ b/module/task/view/start.html.php @@ -67,7 +67,7 @@ - task->start, '', 'btn btn-wide btn-primary');?> + task->start);?> goback, $this->session->taskList, 'self', '', 'btn btn-wide');?> diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index a3ec7526bc..692ea92b82 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -105,7 +105,7 @@ - + diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index 9843c6b897..74ca1e4da0 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -115,7 +115,7 @@ - + diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index be05db82cf..ba80084562 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -216,7 +216,7 @@ - + diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index 018f340aab..16478f6e1e 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -123,7 +123,7 @@
lastEditedDate);?> - + createLink('testcase', 'browse', "productID=$productID");?>"' />
diff --git a/module/testcase/view/exporttemplet.html.php b/module/testcase/view/exporttemplet.html.php index 6928d72afb..82c833ca84 100644 --- a/module/testcase/view/exporttemplet.html.php +++ b/module/testcase/view/exporttemplet.html.php @@ -39,7 +39,7 @@ function closeWindow() charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?> - + diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php index fda6f8f7bf..d66f910e16 100644 --- a/module/testcase/view/showimport.html.php +++ b/module/testcase/view/showimport.html.php @@ -105,7 +105,7 @@ } else { - echo html::submitButton('', '', 'btn btn-primary btn-wide'); + echo html::submitButton(); } echo '   ' . html::backButton('', '', 'btn btn-wide'); ?> diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php index 2847237173..b53d19b599 100644 --- a/module/testreport/view/create.html.php +++ b/module/testreport/view/create.html.php @@ -86,7 +86,7 @@ - + diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php index 69e11fcbb3..d464a6d427 100644 --- a/module/testreport/view/edit.html.php +++ b/module/testreport/view/edit.html.php @@ -83,7 +83,7 @@ - + diff --git a/module/testsuite/view/batchcreatecase.html.php b/module/testsuite/view/batchcreatecase.html.php index 06f7045cfe..c84cb32cc6 100644 --- a/module/testsuite/view/batchcreatecase.html.php +++ b/module/testsuite/view/batchcreatecase.html.php @@ -68,7 +68,7 @@ - + diff --git a/module/testsuite/view/create.html.php b/module/testsuite/view/create.html.php index 16b93e3194..525a35b68c 100644 --- a/module/testsuite/view/create.html.php +++ b/module/testsuite/view/create.html.php @@ -34,7 +34,7 @@ - + diff --git a/module/testsuite/view/createcase.html.php b/module/testsuite/view/createcase.html.php index 1cf10c239a..4dcdd87e53 100644 --- a/module/testsuite/view/createcase.html.php +++ b/module/testsuite/view/createcase.html.php @@ -191,7 +191,7 @@ - + diff --git a/module/testsuite/view/createlib.html.php b/module/testsuite/view/createlib.html.php index 23ac52d5f2..b1f7cad134 100644 --- a/module/testsuite/view/createlib.html.php +++ b/module/testsuite/view/createlib.html.php @@ -29,7 +29,7 @@ - + diff --git a/module/testsuite/view/showimport.html.php b/module/testsuite/view/showimport.html.php index 703ae36083..8a581602ac 100644 --- a/module/testsuite/view/showimport.html.php +++ b/module/testsuite/view/showimport.html.php @@ -91,7 +91,7 @@ } else { - echo html::submitButton('', '', 'btn btn-primary btn-wide'); + echo html::submitButton(); } echo '   ' . html::backButton('', '', 'btn btn-wide') ?> diff --git a/module/testtask/view/activate.html.php b/module/testtask/view/activate.html.php index 2ff9764cfa..8157604ec6 100644 --- a/module/testtask/view/activate.html.php +++ b/module/testtask/view/activate.html.php @@ -28,7 +28,7 @@ - goback, $this->session->taskList, 'self', '', 'btn btn-wide');?> + goback, $this->session->taskList, 'self', '', 'btn btn-wide');?> diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php index b419ceb4d3..b0b9434887 100644 --- a/module/testtask/view/batchrun.html.php +++ b/module/testtask/view/batchrun.html.php @@ -67,7 +67,7 @@ - + diff --git a/module/testtask/view/block.html.php b/module/testtask/view/block.html.php index f9a06d046a..d42967e7c5 100644 --- a/module/testtask/view/block.html.php +++ b/module/testtask/view/block.html.php @@ -29,7 +29,7 @@ - goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> + goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> diff --git a/module/testtask/view/close.html.php b/module/testtask/view/close.html.php index ba9f974c1c..c29a561252 100644 --- a/module/testtask/view/close.html.php +++ b/module/testtask/view/close.html.php @@ -37,7 +37,7 @@ - goback, $this->session->taskList, 'self', '', 'btn btn-wide');?> + goback, $this->session->taskList, 'self', '', 'btn btn-wide');?> diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php index f4cfbd634f..31e326aade 100644 --- a/module/testtask/view/create.html.php +++ b/module/testtask/view/create.html.php @@ -88,7 +88,7 @@ - + diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php index c218000c12..3453491c58 100644 --- a/module/testtask/view/edit.html.php +++ b/module/testtask/view/edit.html.php @@ -81,7 +81,7 @@ - + diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php index 6e74c5ef9a..1e275c404d 100644 --- a/module/testtask/view/runcase.html.php +++ b/module/testtask/view/runcase.html.php @@ -84,7 +84,7 @@ testtask->pre, '', "id='pre' class='btn btn-wide'"); - echo html::submitButton('', '', 'btn btn-wide btn-primary'); + echo html::submitButton(); if($nextCase) echo ' ' . html::a(inlink('runCase', "runID={$nextCase['runID']}&caseID={$nextCase['caseID']}&version={$nextCase['version']}"), $lang->testtask->next, '', "id='next' class='btn btn-wide'"); echo html::hidden('case', $run->case->id); echo html::hidden('version', $run->case->currentVersion); diff --git a/module/testtask/view/start.html.php b/module/testtask/view/start.html.php index fa5c883846..2e7a72f121 100644 --- a/module/testtask/view/start.html.php +++ b/module/testtask/view/start.html.php @@ -31,7 +31,7 @@ - + goback, $this->session->taskList, 'self', '', 'btn btn-wide');?> diff --git a/module/todo/view/assignto.html.php b/module/todo/view/assignto.html.php index 6b8387140c..c517ebd17e 100755 --- a/module/todo/view/assignto.html.php +++ b/module/todo/view/assignto.html.php @@ -60,7 +60,7 @@ - + diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php index f5ecee5189..5dc44ee6e1 100755 --- a/module/todo/view/batchcreate.html.php +++ b/module/todo/view/batchcreate.html.php @@ -83,7 +83,7 @@ - '> + '>
- +
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index 2f9d4295ba..61b2a42fce 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -179,7 +179,7 @@
id")?>' target='hiddenwin'>
-
+
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 93c2cdbab7..2b01691ee6 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -141,7 +141,7 @@ - + session->{$viewType . 'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}, 'self', '', 'btn btn-wide') : html::backButton('', '', 'btn btn-wide');?> diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php index 1c7d679371..df0e7f58bf 100644 --- a/module/tree/view/browsetask.html.php +++ b/module/tree/view/browsetask.html.php @@ -109,7 +109,7 @@ session->taskList ? html::linkButton($this->lang->goback, $this->session->taskList, '', '', 'btn btn-wide') : html::backButton('', '', 'btn btn-wide'); echo html::hidden('parentModuleID', $currentModuleID); echo html::hidden('maxOrder', $maxOrder); diff --git a/module/user/control.php b/module/user/control.php index dde17035b2..38e8ae28f2 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -957,7 +957,7 @@ class user extends control $users = $this->user->getPairs('noletter, noclosed'); $html = "
"; $html .= html::select('assignedTo', $users, $assignedTo); - $html .= html::submitButton(); + $html .= html::submitButton('', '', 'btn btn-primary'); $html .= '
'; echo $html; } diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index a916d7cbdf..4faabb836a 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -103,7 +103,7 @@ - save, '', 'btn btn-wide btn-primary');?> + save);?> diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php index 83bf2cc90f..6bd8e19ff2 100644 --- a/module/user/view/batchedit.html.php +++ b/module/user/view/batchedit.html.php @@ -95,7 +95,7 @@ - save, '', 'btn btn-wide btn-primary');?> + save);?> diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index f38ad94f21..74105c44d3 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -84,7 +84,7 @@ - + diff --git a/module/user/view/delete.html.php b/module/user/view/delete.html.php index f42bcde2ae..ca59141c3b 100644 --- a/module/user/view/delete.html.php +++ b/module/user/view/delete.html.php @@ -29,7 +29,7 @@ - delete, '', 'btn btn-wide btn-primary');?> + delete);?> diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index 5d705a5196..e283b52974 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -116,7 +116,7 @@ - + diff --git a/module/user/view/managecontacts.html.php b/module/user/view/managecontacts.html.php deleted file mode 100644 index 2e3df08bbd..0000000000 --- a/module/user/view/managecontacts.html.php +++ /dev/null @@ -1,89 +0,0 @@ - - * @package user - * @version $Id$ - * @link http://www.zentao.net - */ -?> - -
-
- icons['company']);?> - user->contacts->manage;?> -
-
-
-
-
-
- user->contacts->contactsList;?> -
-
    - $listName) echo html::a(inlink('managecontacts', "listID=$id"), $listName, '', "class='list-group-item'"); - ?> -
-
-
-
-
-
-
- user->contacts->manage;?> -
- delete, 'hiddenwin', "class='btn btn-danger'");?> -
-
-
- - - - - - - - - - -
user->contacts->selectedUsers;?> - view->users as $account => $realname) - { - echo "
$realname
"; - } - ?> -
user->contacts->selectList) : print($lang->user->contacts->listName);?> - "; - if($lists) - { - echo "" . $lang->user->contacts->appendToList . ''; - echo html::select('list2Append', array('' => '') + $lists, '', "class='form-control'"); - } - echo ""; - if($lists) echo $lang->user->contacts->or; - echo $lang->user->contacts->createList; - echo ''; - echo html::input('newList', '', "class='form-control' autocomplete='off'"); - echo ''; - } - else - { - echo html::input('listName', $list->listName, "class='form-control' autocomplete='off'"); - echo html::hidden('listID', $list->id); - } - ?> -
-
-
-
-
-
- diff --git a/module/webhook/view/create.html.php b/module/webhook/view/create.html.php index cf5e319afd..459dd3b74f 100644 --- a/module/webhook/view/create.html.php +++ b/module/webhook/view/create.html.php @@ -71,7 +71,7 @@ - + diff --git a/module/webhook/view/edit.html.php b/module/webhook/view/edit.html.php index 3e80b11187..bef5c270d0 100644 --- a/module/webhook/view/edit.html.php +++ b/module/webhook/view/edit.html.php @@ -74,7 +74,7 @@ - +