diff --git a/module/company/js/edit.js b/module/company/js/edit.js index b0cf639d5f..cf373d1fea 100644 --- a/module/company/js/edit.js +++ b/module/company/js/edit.js @@ -1,2 +1 @@ -function setForm(){} function setOuterBox(){} diff --git a/module/convert/js/selectsource.js b/module/convert/js/selectsource.js index 43061492f9..e69de29bb2 100644 --- a/module/convert/js/selectsource.js +++ b/module/convert/js/selectsource.js @@ -1 +0,0 @@ -function setForm(){} diff --git a/module/convert/js/setconfig.js b/module/convert/js/setconfig.js index 43061492f9..e69de29bb2 100644 --- a/module/convert/js/setconfig.js +++ b/module/convert/js/setconfig.js @@ -1 +0,0 @@ -function setForm(){} diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index 2191437b76..7f7880602d 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -29,7 +29,7 @@ include '../../common/view/chosen.html.php'; #searchForm > table > tbody > tr > td {padding: 10px 15px; color: #838A9D;} #searchForm .form-actions {padding-bottom: 20px; padding-top: 0;} #searchForm .chosen-container[id^="field"] .chosen-drop {min-width: 140px;} -#searchForm [id^="valueBox"] .chosen-container .chosen-single {min-width: 140px;} +#searchForm [id^="valueBox"] .chosen-container .chosen-single {min-width: 100px;} #searchForm [id^="valueBox"] .chosen-container .chosen-drop {min-width: 300px;} #searchForm .chosen-container .chosen-drop ul.chosen-results li {white-space:normal} #searchForm input.date::-webkit-input-placeholder {color: #000000; opacity: 1;} diff --git a/module/task/js/create.js b/module/task/js/create.js index b43259b495..cd27e25ae8 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -176,7 +176,6 @@ $(document).ready(function() /* First unbind ajaxForm for form.*/ $("form[data-type='ajax']").unbind('submit'); - setForm(); /* Bind ajaxForm for form again. */ $('.form-ajax').ajaxForm( diff --git a/module/testcase/config.php b/module/testcase/config.php index e82ef75c58..c2bf8830ae 100644 --- a/module/testcase/config.php +++ b/module/testcase/config.php @@ -98,7 +98,7 @@ $config->testcase->datatable->fieldList['branch']['required'] = 'no'; $config->testcase->datatable->fieldList['type']['title'] = 'type'; $config->testcase->datatable->fieldList['type']['fixed'] = 'no'; -$config->testcase->datatable->fieldList['type']['width'] = '80'; +$config->testcase->datatable->fieldList['type']['width'] = '90'; $config->testcase->datatable->fieldList['type']['required'] = 'no'; $config->testcase->datatable->fieldList['stage']['title'] = 'stage'; @@ -204,6 +204,6 @@ $config->testcase->datatable->fieldList['stepNumber']['name'] = $lang->testc $config->testcase->datatable->fieldList['actions']['title'] = 'actions'; $config->testcase->datatable->fieldList['actions']['fixed'] = 'right'; -$config->testcase->datatable->fieldList['actions']['width'] = '150'; +$config->testcase->datatable->fieldList['actions']['width'] = '160'; $config->testcase->datatable->fieldList['actions']['required'] = 'yes'; $config->testcase->datatable->fieldList['actions']['sort'] = 'no'; diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js index 4db01eb8bf..8314bf1fb0 100644 --- a/module/testcase/js/browse.js +++ b/module/testcase/js/browse.js @@ -26,11 +26,9 @@ $(document).ready(function() if(browseType == 'bysearch') ajaxGetSearchForm(); if($('#caseList thead th.w-title').width() < 150) $('#caseList thead th.w-title').width(150); - setModal4List('runCase', 'caseList'); - if(flow == 'onlyTest') { - $('#modulemenu > .nav').append($('#featurebar > .submenu').html()); + $('#modulemenu > .nav').append($('#mainMenu > .pull-left.btn-toolbar').html()); toggleSearch(); $('.export').modalTrigger({width:650, type:'iframe', afterShown: setCheckedCookie}) diff --git a/module/testcase/js/create.js b/module/testcase/js/create.js index 6d7acd8042..2cc68c3f0c 100644 --- a/module/testcase/js/create.js +++ b/module/testcase/js/create.js @@ -138,7 +138,6 @@ $(function() /* First unbind ajaxForm for form.*/ $("form[data-type='ajax']").unbind('submit'); - setForm(); /* Bind ajaxForm for form again. */ $.ajaxForm("form[data-type='ajax']", function(response) diff --git a/module/testcase/model.php b/module/testcase/model.php index 6d8ec2835e..e98c2e274d 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1291,15 +1291,14 @@ class testcaseModel extends model $class = ''; if($id == 'status') $class .= $case->status; if($id == 'title') $class .= ' text-left'; - if($id == 'id') $class .= ' cell-id'; + if($id == 'actions')$class .= ' c-actions'; if($id == 'lastRunResult') $class .= $case->lastRunResult; echo ""; switch($id) { case 'id': - if($mode == 'table') echo " "; - echo $canView ? html::a($caseLink, sprintf('%03d', $case->id)) : sprintf('%03d', $case->id); + echo $mode == 'table' ? html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id))) : sprintf('%03d', $case->id); break; case 'pri': echo ""; @@ -1326,7 +1325,7 @@ class testcaseModel extends model case 'status': if($case->needconfirm) { - echo "({$this->lang->story->changed} "; + echo "({$this->lang->story->changed} "; echo html::a(helper::createLink('testcase', 'confirmStoryChange', "caseID=$case->id"), $this->lang->confirm, 'hiddenwin'); echo ")"; } @@ -1386,10 +1385,8 @@ class testcaseModel extends model echo $case->stepNumber; break; case 'actions': - common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $case, 'list', 'play', '', 'runCase iframe', false, "data-width='95%'"); - common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", $case, 'list', '', '', 'results iframe', '', "data-width='90%'"); - if($this->config->testcase->needReview or !empty($this->config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'list', 'review', '', 'iframe'); - common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); + echo "
"; + if($this->config->testcase->needReview or !empty($this->config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'list', 'glasses', '', 'iframe'); common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'list', 'copy'); if(common::hasPriv('testcase', 'delete', $case)) @@ -1397,8 +1394,12 @@ class testcaseModel extends model $deleteURL = helper::createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"batchForm\",confirmDelete)", '', '', "title='{$this->lang->testcase->delete}' class='btn-icon'"); } - + echo '
'; + common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $case, 'list', 'play', '', 'runCase iframe', false, "data-width='95%'"); + common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", $case, 'list', '', '', 'results iframe', '', "data-width='90%'"); + common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'bug', '', 'iframe', '', "data-width='90%'"); + break; } echo ''; diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 995a51de8d..c4f53efb2c 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -23,182 +23,176 @@ js::set('batchDelete', $lang->testcase->confirmBatchDelete); js::set('productID', $productID); js::set('branch', $branch); ?> -
- -
-
-
icons['product']);?>
-
- -
- tree->manage);?> -
+
+ -
-
- -
- moduleName . ucfirst($this->methodName); - $useDatatable = (isset($this->config->datatable->$datatableId->mode) and $this->config->datatable->$datatableId->mode == 'datatable'); - $vars = "productID=$productID&branch=$branch&browseType=$browseType¶m=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; - - if($useDatatable) include '../../common/view/datatable.html.php'; - if(!$useDatatable) include '../../common/view/tablesorter.html.php'; - $setting = $this->datatable->getSetting('testcase'); - $widths = $this->datatable->setFixedFieldWidth($setting); - $columns = 0; - ?> - ' id='caseList' data-checkable='true' data-fixed-left-width='' data-fixed-right-width='' data-custom-menu='true' data-checkbox-name='caseIDList[]'> - - - $value) - { - if($value->show) - { - $this->datatable->printHead($value, $orderBy, $vars); - $columns ++; - } - } - ?> - - - - - - $value) $this->testcase->printCell($value, $case, $users, $branches, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table');?> - - - - - - - - -
- -
- -
+
+
'>
+ + moduleName . ucfirst($this->methodName); + $useDatatable = (isset($this->config->datatable->$datatableId->mode) and $this->config->datatable->$datatableId->mode == 'datatable'); + $vars = "productID=$productID&branch=$branch&browseType=$browseType¶m=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; + + if($useDatatable) include '../../common/view/datatable.html.php'; + if(!$useDatatable) include '../../common/view/tablesorter.html.php'; + $setting = $this->datatable->getSetting('testcase'); + $widths = $this->datatable->setFixedFieldWidth($setting); + $columns = 0; + ?> + ' id='caseList' data-checkable='true' data-fixed-left-width='' data-fixed-right-width='' data-custom-menu='true' data-checkbox-name='caseIDList[]'> + + + $value) + { + if($value->show) + { + $this->datatable->printHead($value, $orderBy, $vars); + $columns ++; + } + } + ?> + + + + + + $value) $this->testcase->printCell($value, $case, $users, $branches, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table');?> + + + +
+ +
+
+
+
+ createLink('testcase', 'batchEdit', "productID=$productID&branch=$branch"); + $misc = common::hasPriv('testcase', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; + echo html::commonButton($lang->edit, $misc); + ?> + + +
+ session->currentProductType != 'normal'):?> +
+ + 10;?> + +
+
+ + + +
+ +
+ +
createLink('testcase', 'batchEdit', "productID=$productID&branch=$branch"); - $misc = common::hasPriv('testcase', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; - echo html::commonButton($lang->edit, $misc); + foreach($branches as $branchID => $branchName) + { + $actionLink = $this->createLink('testcase', 'batchChangeBranch', "branchID=$branchID"); + echo html::a('#', $branchName, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\" data-key='$branchID'"); + } ?> - -
- -
show();?>
-
-
+
+ + +
+ + 10;?> + +
+
+ + + +
+ +
+ +
+ $module) + { + $actionLink = $this->createLink('testcase', 'batchChangeModule', "moduleID=$moduleId"); + echo html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\" data-key='$moduleID'"); + } + ?> +
+
+
+ +
+ show('right', 'pagerjs');?> +
+ + +