diff --git a/module/bug/css/customfields.css b/module/bug/css/customfields.css index c85159f6a6..e8d59f0718 100644 --- a/module/bug/css/customfields.css +++ b/module/bug/css/customfields.css @@ -1,4 +1,3 @@ -body{background:white; overflow:hidden;} -.btn-group .btn{display: block;width: 60px;text-align: center; padding: 4px; margin-bottom:2px;} -.btn-group .btn:hover{z-index: 9999;} -.btn-group .btn i{line-height: 21px;} +select.form-control {min-height: 200px; height: auto;} +.table-form > tbody > tr > td .btn + .btn {margin-left: 0;} +form {padding: 20px 10%;} diff --git a/module/bug/js/batchcreate.js b/module/bug/js/batchcreate.js index 0a61812bff..e21135b8e5 100644 --- a/module/bug/js/batchcreate.js +++ b/module/bug/js/batchcreate.js @@ -1,6 +1,6 @@ $(function() { - $(".chosenBox select").chosen({no_results_text: noResultsMatch}); + $(".chosenBox select").chosen(defaultChosenOptions); }) /** diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index ba56e970c7..5f0a24fba2 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -12,34 +12,44 @@ ?> -
- - - - - - - - - - - - - - +
+
+ icons['bug']);?> + icons['batchCreate']);?> bug->common . $lang->colon . $lang->bug->batchCreate;?> +
+
- bug->batchCreate; $i++):?> + +
bug->project . $lang->colon . $lang->bug->batchCreate;?>
idAB;?> bug->module;?> bug->project;?>bug->openedBuild;?> bug->title;?> bug->steps;?> typeAB;?> bug->severity;?> bug->os;?> bug->browser;?>
+ + + + + + + + + + + + + + + bug->batchCreate; $i++):?> - - + + - - - - - + + + + + diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 2e6672d9ac..800180aa2d 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -11,20 +11,28 @@ */ ?> -"> -
idAB;?> bug->module;?> bug->project;?>bug->openedBuild;?>bug->title;?> bug->steps;?> typeAB;?> bug->severity;?> bug->os;?> bug->browser;?>
bug->typeList, '');?>bug->severityList, '');?>bug->osList, '');?>bug->browserList, '');?> +
+ + 		bug->typeList, '', "class='form-control'");?>bug->severityList, '', "class='form-control'");?>bug->osList, '', "class='form-control'");?>bug->browserList, '', "class='form-control'");?>
- - - - - - - - - - - - +
+
+ icons['bug']);?> + icons['batchEdit']);?> bug->common . $lang->colon . $lang->bug->batchEdit;?> +
+
+ +"> +
bug->common . $lang->colon . $lang->bug->batchEdit;?>
idAB;?>bug->type;?>bug->severityAB;?>bug->pri;?> bug->title;?>bug->assignedTo;?>bug->status;?>bug->resolvedByAB;?>bug->resolutionAB;?>
+ + + + + + + + + + + + + bug->statusList, $bugs[$bugID]->status, 'class=form-control');?> diff --git a/module/bug/view/browse.custom.html.php b/module/bug/view/browse.custom.html.php index afafc99882..06bc8895d4 100644 --- a/module/bug/view/browse.custom.html.php +++ b/module/bug/view/browse.custom.html.php @@ -1,152 +1,137 @@ -
idAB;?>bug->type;?>bug->severityAB;?>bug->pri;?>bug->title;?>bug->assignedTo;?>bug->status;?>bug->resolvedByAB;?>bug->resolutionAB;?>
resolvedBy, 'class=form-control');?> -
lang->bug->resolutionList, $bugs[$bugID]->resolution, "class=w-80px onchange=setDuplicate(this.value,$bugID)");?>
-
' resolution != 'duplicate') echo "style='display:none'";?>>bug->duplicateBug}'");?>
+ + + + + +
+ lang->bug->resolutionList, $bugs[$bugID]->resolution, "class=form-control onchange=setDuplicate(this.value,$bugID)");?> + ' resolution != 'duplicate') echo "style='display:none'";?>> + bug->duplicateBug}'");?> +
- - - - + + +
- -
-
- -
tree->manage);?>
-
- - 		- '> - - recTotal}&recPerPage={$pager->recPerPage}"; ?> - - - - - - - - - - - id");?> - - - - - - - - - - - - - - -
bug->$fieldName);?>actions;?>
- - - - $fieldName); - } - elseif(preg_match('/assignedTo|by/i', $fieldName)) - { - echo $users[$bug->$fieldName]; - } - elseif(preg_match('/^(severity|pri|resolution|os|type|browse|status|confirmed)$/i', $fieldName)) - { - $key = $fieldName . 'List'; - $list = $lang->bug->$key; - echo $list[$bug->$fieldName]; - } - else - { - echo !($bug->$fieldName == '0') ? $bug->$fieldName : ''; - } - ?> - - id"; - common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true); - common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true); - common::printIcon('bug', 'edit', $params, $bug, 'list'); - ?> - -
- -
+
+ +
icons['product']);?>
+
+ +
+ tree->manage);?> +
+
+
+
+ '> + + recTotal}&recPerPage={$pager->recPerPage}"; ?> + + + + + + + + + + + id");?> + + + + + + + + + + + + + - - -
bug->$fieldName);?>actions;?>
+ + + + $fieldName); + } + elseif(preg_match('/assignedTo|by/i', $fieldName)) + { + echo $users[$bug->$fieldName]; + } + elseif(preg_match('/^(severity|pri|resolution|os|type|browse|status|confirmed)$/i', $fieldName)) + { + $key = $fieldName . 'List'; + $list = $lang->bug->$key; + echo $list[$bug->$fieldName]; + } + else + { + echo !($bug->$fieldName == '0') ? $bug->$fieldName : ''; + } + ?> + + id"; + common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true); + common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe text-danger', true); + common::printIcon('bug', 'edit', $params, $bug, 'list'); + ?> + +
+ +
+
+ +
+
createLink('bug', 'batchEdit', "productID=$productID"); $misc = common::hasPriv('bug', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; - echo "
"; echo html::commonButton($lang->edit, $misc); - echo ""; - echo "
"; - ?> + ?> + +
    + createLink('bug', 'batchConfirm'); + $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'"; + echo "
  • " . html::a('#', $lang->bug->confirmBug, '', $misc) . "
    • "; + + $actionLink = $this->createLink('bug', 'batchClose'); + $misc = common::hasPriv('bug', 'batchClose') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'"; + echo "
  • " . html::a('#', $lang->bug->close, '', $misc) . "
    • "; + + $misc = common::hasPriv('bug', 'batchResolve') ? "id='resolveItem'" : $class; + echo "
  • " . html::a('#', $lang->bug->resolve, '', $misc); + echo "
      "; + unset($lang->bug->resolutionList['']); + unset($lang->bug->resolutionList['duplicate']); + foreach($lang->bug->resolutionList as $key => $resolution) + { + $actionLink = $this->createLink('bug', 'batchResolve', "resolution=$key"); + if($key == 'fixed') + { + echo "
    • "; + echo html::a('#', $resolution, '', "id='fixedItem'"); + echo "
        "; + unset($builds['']); + foreach($builds as $key => $build) + { + $actionLink = $this->createLink('bug', 'batchResolve', "resolution=fixed&resolvedBuild=$key"); + echo "
      • "; + echo html::a('#', $build, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\""); + echo "
        • "; + } + echo '
      • '; + } + else + { + echo "
    • "; + echo html::a('#', $resolution, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\""); + echo "
      • "; + } + } + echo "
    • "; + ?> +
- -
show();?>
-
- -
- - - - - - + +
show();?>
+
+ diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 86b458ded3..1f5301df9b 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -13,8 +13,6 @@ " . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs¶m=0"), $lang->bug->longLifeBugs) . ""; echo "
  • " . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs¶m=0"), $lang->bug->postponedBugs) . "
    • "; echo "
  • " . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm¶m=0"), $lang->bug->needConfirm) . "
    • "; - echo "
  •  {$lang->bug->byQuery}
    • "; + echo "
  •  {$lang->bug->byQuery}
    • "; ?>
    '>
    diff --git a/module/bug/view/customfields.html.php b/module/bug/view/customfields.html.php index f033227f81..f4e55fc063 100644 --- a/module/bug/view/customfields.html.php +++ b/module/bug/view/customfields.html.php @@ -12,34 +12,38 @@ ?> -
    - - - - - - - - +
    +
    + icons['bug']);?> + bug->customFields;?> + icons['customFields']);?> +
    +
    + +
    bug->customFields;?>
    bug->lblAllFields;?>bug->lblCustomFields;?>
    + + + + - - - + - +
    bug->lblAllFields;?>bug->lblCustomFields;?>
    - - + + + - - - bug->restoreDefault;?> + + + + bug->restoreDefault;?>
    diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index ba66eee559..01888c96b1 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -418,7 +418,10 @@ $lang->icons['plan'] = 'flag'; $lang->icons['dynamic'] = 'volume-up'; $lang->icons['build'] = 'tag'; $lang->icons['test'] = 'check'; +$lang->icons['testtask']= 'check'; $lang->icons['team'] = 'group'; +$lang->icons['usecase'] = 'usecase'; +$lang->icons['result'] = 'flag-checkered'; $lang->icons['create'] = 'plus'; $lang->icons['batchCreate'] = 'plus-sign'; @@ -429,9 +432,11 @@ $lang->icons['delete'] = 'remove'; $lang->icons['copy'] = 'copy'; $lang->icons['report'] = 'bar-chart'; $lang->icons['export'] = 'download-alt'; +$lang->icons['import'] = 'upload-alt'; $lang->icons['finish'] = 'ok-sign'; $lang->icons['resolve'] = 'ok-sign'; $lang->icons['start'] = 'play'; +$lang->icons['run'] = 'play'; $lang->icons['assign'] = 'hand-right'; $lang->icons['assignTo'] = 'hand-right'; $lang->icons['change'] = 'random'; diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php index 6388e8a111..7625eab2ba 100644 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -77,7 +77,7 @@ js::set('confirmDelete', $lang->user->confirmDelete); if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete')) { $deleteURL = $this->createLink('user', 'delete', "userID=$user->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"userList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->user->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"userList\",confirmDelete)", '', '', "title='{$lang->user->delete}'"); } if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60) { diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index d03d378e9e..c08fc1e2d0 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -28,7 +28,7 @@ var browseType = ''; echo "" . html::select('account', $users, $account, 'onchange=changeUser(this.value)') . ''; echo "" . html::select('product', $products, $product, 'onchange=changeProduct(this.value)') . ''; echo "" . html::select('project', $projects, $project, 'onchange=changeProject(this.value)') . ''; - echo "" . html::a('#', ' ' . $lang->action->dynamic->search, '', 'class="link-icon"') . ""; + echo "" . html::a('#', ' ' . $lang->action->dynamic->search) . ""; ?>
    '>
    diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index c95c7fdf64..cacd2bb39a 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -46,7 +46,7 @@ if(common::hasPriv('group', 'delete')) { $deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"groupList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->group->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"groupList\",confirmDelete)", '', '', "title='{$lang->group->delete}'"); } ?> diff --git a/module/group/view/create.html.php b/module/group/view/create.html.php index b5781020c8..20c3abed62 100644 --- a/module/group/view/create.html.php +++ b/module/group/view/create.html.php @@ -16,7 +16,7 @@ group->create;?> group->name;?> - + group->desc;?> diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index 653a6f5175..351ea1785f 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -55,7 +55,7 @@ if(common::hasPriv('testtask', 'delete')) { $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testtask->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "title='{$lang->testtask->delete}'"); } ?> diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index a956fca79d..f15db20b47 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -101,7 +101,7 @@ if(common::hasPriv('productplan', 'unlinkStory')) { $unlinkURL = $this->createLink('productplan', 'unlinkStory', "storyID=$story->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='link-icon' title='{$lang->productplan->unlinkStory}'"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "title='{$lang->productplan->unlinkStory}'"); } ?> diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index c4aa9fed74..f37d143869 100644 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -102,7 +102,7 @@ project->manageProducts;?> - project->linkProduct}' multiple");?> + project->linkProduct}' multiple");?> project->desc;?> diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php index b0b07d7433..5f3a34afd9 100644 --- a/module/task/view/assignto.html.php +++ b/module/task/view/assignto.html.php @@ -14,7 +14,7 @@
    - icons['task']) . ' #' . $task->id;;?> + icons['task']) . ' #' . $task->id;?> createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?> task->assign;?> icons['assign']);?>
    diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css index b6bbabea69..a83175e923 100644 --- a/module/testcase/css/browse.css +++ b/module/testcase/css/browse.css @@ -1 +1 @@ -.w-220px{width:220px} \ No newline at end of file +.w-220px{width:220px} diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js index 169104dce4..7d39c45bb3 100644 --- a/module/testcase/js/browse.js +++ b/module/testcase/js/browse.js @@ -2,7 +2,6 @@ function browseBySearch(active) { $('#querybox').removeClass('hidden'); - $('.side').addClass('hidden'); $('.divider').addClass('hidden'); $('#' + active + 'Tab').removeClass('active'); $('#bysearchTab').addClass('active'); @@ -11,13 +10,7 @@ function browseBySearch(active) $(document).ready(function() { - setModal4List('runCase', 'caseList', function(){$(".results").colorbox({width:1024, height:550, iframe:true, transition:'none'});}, 1024); $('#' + browseType + 'Tab').addClass('active'); $('#module' + moduleID).addClass('active'); if(browseType == 'bysearch') ajaxGetSearchForm(); }); - -$(document).ready(function() -{ - $(".results").colorbox({width:1024, height:550, iframe:true, transition:'none'}); -}) diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index 446378b9ca..8d2bd5e533 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -29,10 +29,10 @@ testcase->priList, $cases[$caseID]->pri, 'class=form-control');?> testcase->statusList, $cases[$caseID]->status, 'class=form-control');?> - module, "class='form-control'");?> + module, "class='form-control'");?> title, 'class=form-control'); echo "*";?> testcase->typeList, $cases[$caseID]->type, 'class=form-control');?> - testcase->stageList, $cases[$caseID]->stage, "class='select-1 chosen' multiple data-placeholder='{$lang->testcase->stage}'");?> + testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?> diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 3f6914c138..4a9e4099d9 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -14,160 +14,150 @@ include '../../common/view/header.html.php'; include '../../common/view/datepicker.html.php'; include '../../common/view/treeview.html.php'; -include '../../common/view/colorize.html.php'; -include '../../common/view/dropmenu.html.php'; js::set('browseType', $browseType); js::set('moduleID' , $moduleID); js::set('confirmDelete', $lang->testcase->confirmDelete); ?> -
    -
    +
    icons['usecase']);?>
    +
      " . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->testcase->allCases) . ""; - echo "" . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=needconfirm¶m=0"), $lang->testcase->needConfirm) . ""; - echo " {$lang->testcase->bySearch} "; + echo "
    • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->testcase->allCases) . "
      • "; + echo "
    • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=needconfirm¶m=0"), $lang->testcase->needConfirm) . "
      • "; + echo "
    •  {$lang->testcase->bySearch}
      • "; ?> -
    -
    - '; - echo html::a("#", "" . $lang->export, '', "id='exportAction' onclick=\"toggleSubMenu(this.id,'bottom',0)\""); - echo ''; - - common::printIcon('testcase', 'batchCreate', "productID=$productID&moduleID=$moduleID"); - common::printIcon('testcase', 'create', "productID=$productID&moduleID=$moduleID"); - ?> -
    -
    - +
    +
    + +
    + +
    +
    '>
    +
    + +
    icons['product']);?>
    +
    + +
    + tree->manage);?> + tree->fix, 'hiddenwin');?> +
    +
    +
    +
    +
    + + recTotal}&recPerPage={$pager->recPerPage}"; ?> + + + + + + + + + + + + + + + + + + + + + + id");?> + + + + + + + + + + + + + + + + + + + + + + + +
    idAB);?> priAB);?> testcase->title);?> testcase->story);?>actions;?> typeAB);?> openedByAB);?> testtask->lastRunAccount);?> testtask->lastRunTime);?> testtask->lastRunResult);?>statusAB);?>actions;?>
    + + id));?> + pri?>'>pri?>title);?>createLink('story', 'view', "storyID=$case->story"), $case->storyTitle, '_blank');?>testcase->confirmStoryChange = $lang->confirm; common::printIcon('testcase', 'confirmStoryChange', "caseID=$case->id", '', 'list', '', 'hiddenwin');?>testcase->typeList[$case->type];?>openedBy];?>lastRunner];?>lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?>lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?>testcase->statusList[$case->status];?> + id&version=$case->version", '', 'list', 'play', '', 'runCase iframe'); + common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', 'flag-checkered', '', 'results iframe'); + common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); + common::printIcon('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'list', 'copy'); + if(common::hasPriv('testcase', 'delete')) + { + $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "title='{$lang->testcase->delete}' class='btn-icon'"); + } + + common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'bug'); + ?> +
    + +
    +
    + +
    +
    + createLink('testcase', 'batchEdit', "productID=$productID"); + $misc = common::hasPriv('testcase', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; + echo html::commonButton($lang->edit, $misc); + ?> + + +
    +
    + +
    show();?>
    +
    +
    +
    diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index 6f84cd7c03..a2ff30a810 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -81,11 +81,11 @@ - + - + @@ -98,7 +98,7 @@ - + diff --git a/module/testcase/view/import.html.php b/module/testcase/view/import.html.php index b8624ba30b..00c7543f75 100755 --- a/module/testcase/view/import.html.php +++ b/module/testcase/view/import.html.php @@ -1,14 +1,19 @@ - -
    testcase->product;?>
    testcase->module;?>
    testcase->story;?>
    testcase->stage;?>testcase->stageList, $case->stage, "class='select-1' multiple='multiple'");?>testcase->stageList, $case->stage, "class='form-control' multiple='multiple'");?>
    testcase->pri;?>
    - - - - -
    testcase->import?>
    - - charsets[$this->cookie->lang], 'utf-8');?> - -
    - +
    +
    + + + + + + +
    + + + charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?> + + +
    +
    +
    diff --git a/module/testtask/css/runcase.css b/module/testtask/css/runcase.css index 4aaa11317c..3423c8566b 100644 --- a/module/testtask/css/runcase.css +++ b/module/testtask/css/runcase.css @@ -1,2 +1 @@ -body{background:white} -tr, td, th {border:1px solid #eee} +.outer > #titlebar {display: none} diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index 885d8bb45a..0813977d09 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -13,24 +13,28 @@ testtask->confirmDelete)?> - - +
    +
    icons['testtask']);?> testtask->browse;?>
    +
    + +
    +
    + + +
    -
    testtask->browse;?>
    -
    -
    recTotal}&recPerPage={$pager->recPerPage}"; ?> - - - - - - - - - - - + + + + + + + + + + + @@ -45,14 +49,14 @@ diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index ec08e3649b..476973ff4a 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -25,7 +25,7 @@ var moduleID = ''; echo "" . $lang->testtask->byModule . " "; echo "" . html::a($this->inlink('cases', "taskID=$taskID&browseType=all¶m=0"), $lang->testtask->allCases) . ""; echo "" . html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome¶m=0"), $lang->testtask->assignedToMe) . ""; - echo " {$lang->testcase->bySearch} "; + echo " {$lang->testcase->bySearch} "; ?>
    @@ -94,7 +94,7 @@ var moduleID = ''; if(common::hasPriv('testtask', 'unlinkCase')) { $unlinkURL = $this->createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"caseList\",confirmUnlink)", '', '', "class='link-icon' title='{$lang->testtask->unlinkCase}'"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"caseList\",confirmUnlink)", '', '', "title='{$lang->testtask->unlinkCase}'"); } common::printIcon('testcase', 'createBug', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", $run, 'list', 'createBug'); diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php index 12e5fca77c..03fe162ef1 100644 --- a/module/testtask/view/results.html.php +++ b/module/testtask/view/results.html.php @@ -11,42 +11,57 @@ */ ?> -

    CASE#id. $lang->colon . $case->title;?>

    -
    - testcase->precondition;?> - precondition;?> -
    - -
    idAB);?> testtask->name);?> testtask->project);?> testtask->build);?>testtask->owner);?>testtask->begin);?>testtask->end);?>statusAB);?>actions;?>
    idAB);?> testtask->name);?> testtask->project);?> testtask->build);?>testtask->owner);?>testtask->begin);?>testtask->end);?>statusAB);?>actions;?>
    testtask->statusList[$task->status];?> id", '', 'list'); - common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list'); + common::printIcon('testtask', 'cases', "taskID=$task->id", '', 'list', 'smile'); + common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list', 'link'); common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list'); if(common::hasPriv('testtask', 'delete')) { $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testtask->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn-icon'"); } ?>
    - - - - - - - - - stepResults as $key => $stepResult): - ?> - - - - - - - - - - - - - - -
    -
    RESULT#id . ' ' . $result->date . ' ' . $users[$result->lastRunner] . ' ' . $lang->testtask->runCase . ':'. " " . $lang->testcase->resultList[$result->caseResult] . '';?>
    -
    testtask->build . $lang->colon . $build;?>
    -
    testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>testcase->result;?>testcase->real;?>
    a-center'>testcase->resultList[$stepResult['result']];?>
    - +
    +
    +
    + icons['usecase']) . ' #' . $case->id;?> + title;?> + testtask->results . ' ' . html::icon($lang->icons['result']);?> +
    +
    + +
    +
    + testcase->precondition;?> + precondition;?> +
    + + + + + + + + + + + + + + + stepResults as $key => $stepResult): + ?> + + + + + + + + + + + + + + +
    +
    RESULT#id . ' ' . $result->date . ' ' . $users[$result->lastRunner] . ' ' . $lang->testtask->runCase . ':'. " " . $lang->testcase->resultList[$result->caseResult] . '';?>
    +
    testtask->build . $lang->colon . $build;?>
    +
    testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>testcase->result;?>testcase->real;?>
    text-center'>testcase->resultList[$stepResult['result']];?>
    + +
    + diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php index 5c14cc2532..190ec778c7 100644 --- a/module/testtask/view/runcase.html.php +++ b/module/testtask/view/runcase.html.php @@ -11,53 +11,63 @@ */ ?> -
    - - - - - - - - - - - - - case->steps as $key => $step):?> - expect ? 'pass' : 'n/a';?> - - - - - - - - - - - -
    CASE#case->id. $lang->colon . $run->case->title;?>
    testcase->precondition;?>
    case->precondition;?>
    testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>testcase->result;?>testcase->real;?>
    desc);?>expect);?>id]", $lang->testcase->resultList, $defaultResult);?>id]", '', "rows=2 class='form-control'");?>
    - testtask->pre, inlink('runCase', "runID={$preCase['runID']}&caseID={$preCase['caseID']}&version={$preCase['version']}")); - if(empty($run->case->steps)) - { - echo html::submitButton($lang->testtask->pass, "onclick=$('#result').val('pass')"); - echo html::submitButton($lang->testtask->fail, "onclick=$('#result').val('fail')"); - } - else - { - echo html::submitButton(); - echo html::submitButton($lang->testtask->pass, "onclick=$('#passall').val(1)"); - } - echo html::hidden('case', $run->case->id); - echo html::hidden('version', $run->case->currentVersion); - if($run->case->steps) echo html::hidden('passall', 0); - if($nextCase) echo html::linkButton($lang->testtask->next, inlink('runCase', "runID={$nextCase['runID']}&caseID={$nextCase['caseID']}&version={$nextCase['version']}")); - if(!$run->case->steps) echo html::hidden('result', ''); - ?> -
    -
    +
    +
    + icons['usecase']) . ' #' . $run->case->id;?> + case->title;?> + testtask->runCase;?> icons['run']);?> +
    +
    +
    +
    + + + + + + + + + + + + + + case->steps as $key => $step):?> + expect ? 'pass' : 'n/a';?> + + + + + + + + + + + +
    testcase->precondition;?> case->precondition;?>
    testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>testcase->result;?>testcase->real;?>
    desc);?>expect);?>id]", $lang->testcase->resultList, $defaultResult, "class='form-control'");?>id]", '', "rows=2 class='form-control'");?>
    + testtask->pre, inlink('runCase', "runID={$preCase['runID']}&caseID={$preCase['caseID']}&version={$preCase['version']}")); + if(empty($run->case->steps)) + { + echo html::submitButton($lang->testtask->pass, "onclick=$('#result').val('pass')", 'btn-success'); + echo html::submitButton($lang->testtask->fail, "onclick=$('#result').val('fail')", 'btn-danger'); + } + else + { + echo html::submitButton(); + echo html::submitButton($lang->testtask->pass, "onclick=$('#passall').val(1)"); + } + if($nextCase) echo html::linkButton($lang->testtask->next, inlink('runCase', "runID={$nextCase['runID']}&caseID={$nextCase['caseID']}&version={$nextCase['version']}")); + if($run->case->steps) echo html::hidden('passall', 0); + if(!$run->case->steps) echo html::hidden('result', ''); + echo html::hidden('case', $run->case->id); + echo html::hidden('version', $run->case->currentVersion); + ?> +
    +
    +
    case; include './results.html.php'; diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php index 4659451c4a..c2ee32eea1 100755 --- a/module/todo/view/batchcreate.html.php +++ b/module/todo/view/batchcreate.html.php @@ -29,13 +29,13 @@ todo->batchCreate; $i++):?> - todo->typeList, '', "onchange=loadList(this.value,$i+1) class='select-1'");?> + todo->typeList, '', "onchange=loadList(this.value,$i+1) class='form-control'");?> todo->priList, $pri, 'class=form-control');?>
    - + id . html::hidden("todoIDList[$todo->id]", $todo->id);?> id]", $todo->date, "class='text-2 date'");?> - id]", $lang->todo->typeList, $todo->type, "onchange=loadList(this.value,$todo->id) class='select-1'");?> + id]", $lang->todo->typeList, $todo->type, "onchange=loadList(this.value,$todo->id) class='form-control'");?> id]", $lang->todo->priList, $todo->pri, 'class=form-control');?> diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php index ff97d09de3..5a255017d3 100644 --- a/module/todo/view/edit.html.php +++ b/module/todo/view/edit.html.php @@ -34,7 +34,7 @@
    type != 'custom' ? 'readonly' : ''; - echo html::input('name', $todo->name, "$readType class=text-1"); + echo html::input('name', $todo->name, "$readType class=form-control"); ?>
    diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index eba62902c2..0dbd8f76ad 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -36,7 +36,7 @@ 0 ? 'ditto' : $deptID, "class='form-control'");?> - user->roleList, $i > 0 ? 'ditto' : '', "class='select-1' onchange='changeGroup(this.value, $i)'");?> + user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?> 0 ? 'ditto' : '', "class='form-control'");?> user->genderList, 'm');?> diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 4d497413d0..bdce0a37f1 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -473,7 +473,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} .outer.with-side .table tr > th:first-child, .outer.with-side .table tr > td:first-child {padding-left: 8px} .outer.with-side .table tr > th:last-child, .outer.with-side .table tr > td:last-child {padding-right: 8px} .outer .side {width: 180px; position: absolute; left: 20px; background: #fafafa; border: 1px solid #ddd; transition: all 0.3s;} -.outer .side > header {padding: 5px 15px; line-height: 20px; border-bottom: 1px solid #ddd; background: #f1f1f1} +.outer .side > header {padding: 5px 10px; line-height: 20px; border-bottom: 1px solid #ddd; background: #f1f1f1} .outer .side-body {padding: 10px;} .outer .side .side-handle {position: absolute; right: 5px; top: 4px; width: 22px; line-height: 18px; border: 1px solid #ddd; background: #e5e5e5; border-radius: 2px; color: #666; transition: all 0.3s;} .outer .side .side-handle:hover {background: #fff; color: #333} @@ -501,7 +501,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} .modal.with-titlebar .modal-header .close {position: absolute; right: 15px; top: 20px} .body-modal {padding-bottom: 0; overflow: hidden;} .body-modal .outer > form, .body-modal .outer > .container > form {margin: 10px 15px 20px} -.body-modal .outer > .main, .body-modal .outer > .container > .main{padding: 10px 20px; margin: 0} +.body-modal .outer > .main, .body-modal .outer > .container > .main, .body-modal > .main {padding: 10px 20px; margin: 0} .body-modal > form {padding-bottom: 15px;} .body-modal .outer > .container {padding: 0}