From 9e1acb9c15e065b8054f904d52b7142f01ff7c69 Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 1 Apr 2014 11:34:36 +0800 Subject: [PATCH] * ajusted views of module 'testcase' & 'testtask'. --- module/bug/view/batchedit.html.php | 2 +- module/common/lang/zh-cn.php | 4 + module/testcase/css/common.css | 2 +- module/testcase/css/edit.css | 2 - module/testcase/js/batchcreate.js | 2 +- module/testcase/js/common.js | 20 +-- module/testcase/lang/zh-cn.php | 1 + module/testcase/view/batchcreate.html.php | 38 +++-- module/testcase/view/batchedit.html.php | 34 ++-- module/testcase/view/create.html.php | 197 ++++++++++++---------- module/testcase/view/edit.html.php | 145 +++++++++------- module/testcase/view/view.html.php | 152 +++++++++-------- module/testtask/css/batchrun.css | 3 + module/testtask/lang/zh-cn.php | 1 + module/testtask/view/batchrun.html.php | 44 ++--- module/testtask/view/browse.html.php | 2 - module/testtask/view/view.html.php | 53 +++--- www/theme/default/style.css | 7 +- 18 files changed, 397 insertions(+), 312 deletions(-) create mode 100644 module/testtask/css/batchrun.css diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 800180aa2d..38900f72e9 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -67,7 +67,7 @@ -
+
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 01888c96b1..ed3cd47d92 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -421,8 +421,10 @@ $lang->icons['test'] = 'check'; $lang->icons['testtask']= 'check'; $lang->icons['team'] = 'group'; $lang->icons['usecase'] = 'usecase'; +$lang->icons['testcase']= 'smile'; $lang->icons['result'] = 'flag-checkered'; +$lang->icons['results'] = 'flag-checkered'; $lang->icons['create'] = 'plus'; $lang->icons['batchCreate'] = 'plus-sign'; $lang->icons['batchEdit'] = 'edit-sign'; @@ -437,6 +439,8 @@ $lang->icons['finish'] = 'ok-sign'; $lang->icons['resolve'] = 'ok-sign'; $lang->icons['start'] = 'play'; $lang->icons['run'] = 'play'; +$lang->icons['runCase'] = 'play'; +$lang->icons['batchRun'] = 'play-sign'; $lang->icons['assign'] = 'hand-right'; $lang->icons['assignTo'] = 'hand-right'; $lang->icons['change'] = 'random'; diff --git a/module/testcase/css/common.css b/module/testcase/css/common.css index d6c1a2a325..ff84b3c44a 100644 --- a/module/testcase/css/common.css +++ b/module/testcase/css/common.css @@ -1,3 +1,3 @@ -#story {width:90%} .delbutton{font-size:12px; color:red; width:80px; padding:0} .addbutton{font-size:12px; color:darkgreen; width:80px; padding:0} +.table-form > tbody > tr > td .btn-group-vertical > .btn {margin-left: 0; padding: 2px 8px} diff --git a/module/testcase/css/edit.css b/module/testcase/css/edit.css index 598c766d47..e69de29bb2 100644 --- a/module/testcase/css/edit.css +++ b/module/testcase/css/edit.css @@ -1,2 +0,0 @@ -select.select-1,#module,#story {width:230px} -.text-1 {width:220px} diff --git a/module/testcase/js/batchcreate.js b/module/testcase/js/batchcreate.js index b4b06fed73..362f538b92 100755 --- a/module/testcase/js/batchcreate.js +++ b/module/testcase/js/batchcreate.js @@ -2,7 +2,7 @@ $(document).ready(function() { for(var i = 0; i < testcaseBatchCreateNum; i++) { - $("#story" + i).chosen({no_results_text: noResultsMatch}).bind('liszt:showing_dropdown', function() + $("#story" + i).chosen(defaultChosenOptions).bind('liszt:showing_dropdown', function() { index = $(this).attr('id').substring(5); module = $('#module' + index).val(); diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js index 25a5c62c18..17e85d413a 100644 --- a/module/testcase/js/common.js +++ b/module/testcase/js/common.js @@ -51,8 +51,8 @@ function setStories() { if(!stories) stories = ''; $('#story').replaceWith(stories); - $('#story_chzn').remove(); - $("#story").chosen({no_results_text: ''}); + $('#story_chosen').remove(); + $("#story").chosen(defaultChosenOptions); }); } @@ -107,14 +107,14 @@ function createRow() if(newRowID == 0) newRowID = $('.stepID').size(); newRowID ++; var newRow = ""; - newRow += ""; - newRow += ""; - newRow += ""; - newRow += ""; - newRow += "
"; - newRow += "
"; - newRow += "
"; - newRow += ""; + newRow += ""; + newRow += ""; + newRow += ""; + newRow += "
"; + newRow += ""; + newRow += ""; + newRow += ""; + newRow += "
"; return newRow; } diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index b428c1c622..0a07bcecec 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -60,6 +60,7 @@ $lang->testcase->view = "用例详情"; $lang->testcase->edit = "编辑"; $lang->testcase->batchEdit = "批量编辑 "; $lang->testcase->delete = "删除"; +$lang->testcase->deleted = "已删除"; $lang->testcase->browse = "用例列表"; $lang->testcase->import = "导入"; $lang->testcase->importID = "行号"; diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index 7c75705242..38bc5b3f03 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -14,25 +14,37 @@ testcase->batchCreate);?> -
- - - - - - - {$lang->testcase->story}";?> - - +
+
+ icons['testcase']);?> + icons['batchCreate']);?> testcase->batchCreate;?> + + icons['story']) . '#' . $story->id . ' ' . $story->title ?> + +
+
+ + +
testcase->batchCreate; if($story) echo "{$lang->colon}STORY#{$story->id} $story->title";?>
idAB;?>testcase->module;?>testcase->type;?>testcase->title;?>
+ + + + + + {$lang->testcase->story}";?> + + + + testcase->batchCreate; $i++):?> testcase->same; if($i != 0) $currentModuleID = 'same';?> testcase->typeList['same'] = $lang->testcase->same; $type = ($i == 0 ? 'feature' : 'same');?> - - - + + + diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index 8d2bd5e533..2d62e25db2 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -11,18 +11,26 @@ */ ?> - -
idAB;?>testcase->module;?>testcase->type;?>testcase->title;?>
testcase->typeList, $type, "class=select-1");?>testcase->typeList, $type, "class=form-control");?>
- - - - - - - - - - +
+
+ icons['testcase']);?> + icons['batchEdit']);?> testcase->common . $lang->colon . $lang->testcase->batchEdit;?> +
+
+ +
testcase->common . $lang->colon . $lang->testcase->batchEdit;?>
idAB;?>priAB;?>statusAB;?>testcase->module;?>testcase->title;?>testcase->type;?>testcase->stage;?>
+ + + + + + + + + + + + tree->getOptionMenu($cases[$caseID]->product, $viewType = 'case', $startModuleID = 0); ?> @@ -36,7 +44,7 @@ - +
idAB;?>priAB;?>statusAB;?>testcase->module;?>testcase->title;?>testcase->type;?>testcase->stage;?>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index 182a940e6e..31fb19adb3 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -16,97 +16,114 @@ testcase->deleteStep);?> testcase->insertBefore);?> testcase->insertAfter);?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
testcase->create;?>
testcase->lblProductAndModule;?> - - - createLink('tree', 'browse', "rootID=$productID&view=case"), $lang->tree->manage, '_blank'); - echo html::a("javascript:loadProductModules($productID)", $lang->refresh); - } - ?> - -
testcase->type;?>testcase->typeList, $type, "class='form-control'");?>
testcase->stage;?>testcase->stageList, $stage, "class='form-control' multiple='multiple'");?>
testcase->pri;?>testcase->priList, $pri, "class='form-control'");?>
testcase->lblStory;?> -
- - - - createLink('story', 'view', "storyID=$storyID"), $lang->preview, '', "class='iframe' id='preview'");?> - -
-
testcase->title;?>
testcase->precondition;?>
testcase->steps;?> - - - - - - - - $step) +
+
+
+ icons['testcase']);?> + icons['create']);?> testcase->create;?> +
+
+ +
testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>actions;?>
+ + + + "; - echo ''; - echo ''; - echo ""; - echo ''; + echo ""; + echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case"), $lang->tree->manage, '_blank'); + echo '  '; + echo html::a("javascript:loadProductModules($productID)", $lang->refresh); + echo ''; } ?> -
testcase->lblProductAndModule;?> + + +
+ "; - echo "
$stepID' . html::textarea('steps[]', $step->desc, "rows='3' class='w-p100'") . '' . html::textarea('expects[]', $step->expect, "rows='3' class='w-p100'") . '"; - echo "
"; - echo "
"; - echo "
"; - echo "
-
testcase->keywords;?>
testcase->files;?>fetch('file', 'buildform');?>
-
+ + + + + testcase->type;?> + testcase->typeList, $type, "class='form-control'");?> + + + testcase->stage;?> + testcase->stageList, $stage, "class='form-control chosen' multiple='multiple'");?> + + + testcase->pri;?> + testcase->priList, $pri, "class='form-control'");?> + + + testcase->lblStory;?> + +
+ + + + + + createLink('story', 'view', "storyID=$storyID"), $lang->preview, '', "class='btn iframe' id='preview'");?> + + +
+ + + + testcase->title;?> + + + + testcase->precondition;?> + + + + testcase->steps;?> + + + + + + + + + + + $step) + { + $stepID += 1; + echo ""; + echo ""; + echo ''; + echo ''; + echo ""; + echo ''; + } + ?> +
testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>actions;?>
$stepID' . html::textarea('steps[]', $step->desc, "rows='3' class='form-control'") . '' . html::textarea('expects[]', $step->expect, "rows='3' class='form-control'") . '
"; + echo ""; + echo ""; + echo ""; + echo "
+ + + + testcase->keywords;?> + + + + testcase->files;?> + fetch('file', 'buildform');?> + + + + + + + diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index a2ff30a810..b74394cc76 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -16,121 +16,136 @@ testcase->deleteStep);?> testcase->insertBefore);?> testcase->insertAfter);?> -
+
-
- CASE #id . $lang->colon;?> - title, 'class=form-control');?> +
+ icons['testcase']) . ' #' . $case->id;?> + createLink('testcase', 'view', "caseID=$case->id"), $case->title);?> + icons['edit']) . ' ' . $lang->case->edit;?> +
+
+ save)?>
-
- - - - - - - -
+
+
+
+
+ title, 'class="form-control" placeholder="' . $lang->case->title . '"');?> +
testcase->precondition;?> - precondition, "rows='4' class='w-p100'");?> +
precondition, "rows='4' class='form-control'");?>
+
+
+ testcase->steps;?> +
+ + + + + + + + + + steps as $stepID => $step) + { + $stepID += 1; + echo ""; + echo ""; + echo ''; + echo ''; + echo ""; + echo ''; + } + ?> +
testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>actions;?>
$stepID' . html::textarea('steps[]', $step->desc, "rows='3' class='form-control'") . '' . html::textarea('expects[]', $step->expect, "rows='3' class='form-control'") . '
"; + echo ""; + echo " "; + echo " "; + echo "
+
- - - - - - - - steps as $stepID => $step) - { - $stepID += 1; - echo ""; - echo ""; - echo ''; - echo ''; - echo ""; - echo ''; - } - ?> -
testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>actions;?>
$stepID' . html::textarea('steps[]', $step->desc, "rows='3' class='w-p100'") . '' . html::textarea('expects[]', $step->expect, "rows='3' class='w-p100'") . '"; - echo "
"; - echo "
"; - echo "
"; - echo "
-
testcase->legendComment;?> - +
testcase->legendAttatch;?> - fetch('file', 'buildform', 'filecount=2');?> +
fetch('file', 'buildform', 'filecount=2');?>
- -
+
- "' /> + "' />
- -
+ + +
+
testcase->legendBasicInfo;?> - +
- + - - + + - + + - - + - + - - + - + - + - +
testcase->product;?>testcase->product;?>
testcase->module;?>testcase->module;?> +
+ +
+
testcase->story;?>testcase->story;?>
story, 'class=form-control');?>
-
testcase->type;?>testcase->typeList, $case->type, 'class=form-control');?> + testcase->type;?>testcase->typeList, $case->type, 'class=form-control');?>
testcase->stage;?>testcase->stageList, $case->stage, "class='form-control' multiple='multiple'");?>testcase->stageList, $case->stage, "class='form-control chosen' multiple='multiple'");?>
testcase->pri;?>testcase->priList, $case->pri, 'class=form-control');?> + testcase->pri;?>testcase->priList, $case->pri, 'class=form-control');?>
testcase->status;?>testcase->status;?> testcase->statusList, $case->status, 'class=form-control');?>
testcase->keywords;?>testcase->keywords;?> keywords, 'class=form-control');?>
testcase->linkCase;?>testcase->linkCase;?> linkCase, 'class=form-control');?>
testcase->legendOpenAndEdit;?> - +
- + + - +
testcase->openedBy;?>testcase->openedBy;?> openedBy] . $lang->at . $case->openedDate;?>
testcase->lblLastEdited;?>testcase->lblLastEdited;?> lastEditedBy) echo $users[$case->lastEditedBy] . $lang->at . $case->lastEditedDate;?>
-
+
+ + +
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 6493679f34..9f6058776b 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -11,26 +11,30 @@ */ ?> -
-
deleted) echo "class='deleted'";?>> - CASE #id . ' ' . $case->title;?> +
+ icons['testcase']) . ' #' . $case->id;?> + title;?> + deleted):?> + case->deleted;?> + version > 1):?> - + + +
    version; $i >= 1; $i --) { - $class = $i == $version ? "class='blue'" : "class='gray'"; - echo html::a(inlink('view', "caseID=$case->id&version=$i"), '#' . $i, '', "$class"); + $class = $i == $version ? " class='active'" : ''; + echo '' . html::a(inlink('view', "caseID=$case->id&version=$i"), '#' . $i) . ''; } - echo ")"; ?> - - +
+ +
-
+
session->caseList != false ? $app->session->caseList : $this->createLink('testcase', 'browse', "productID=$case->product"); $actionLinks = ''; @@ -38,19 +42,23 @@ { ob_start(); + echo "
"; common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->currentVersion", '', 'button', '', '', 'runCase'); common::printIcon('testtask', 'results', "runID=0&caseID=$case->id&version=$case->version", '', 'button', '', '', 'results'); - if($case->lastRunResult == 'fail') common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", '', 'button', 'createBug'); + if($case->lastRunResult == 'fail') common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", '', 'button', 'bug'); + echo '
'; - common::printDivider(); + echo "
"; common::printIcon('testcase', 'edit',"caseID=$case->id"); common::printCommentIcon('testcase'); common::printIcon('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase¶m=$case->id", '', 'button', 'copy'); common::printIcon('testcase', 'delete', "caseID=$case->id", '', 'button', '', 'hiddenwin'); + echo '
'; - common::printDivider(); + echo "
"; common::printRPN($browseLink, $preAndNext); + echo '
'; $actionLinks = ob_get_contents(); ob_clean(); @@ -64,56 +72,60 @@
- - - - -
+
+
+
testcase->precondition;?> precondition);?>
- - - - - - - steps as $stepID => $step) - { - $stepID += 1; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>
$stepID" . nl2br($step->desc) . "" . nl2br($step->expect) . "
+
+ testcase->stepDesc;?> + + + + + + + + + steps as $stepID => $step) + { + $stepID += 1; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?> +
testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>
$stepID" . nl2br($step->desc) . "" . nl2br($step->expect) . "
+
fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?> -
- -
+
+ + + +
+
testcase->legendBasicInfo;?> - +
- + - + - + - + - + - + - + - + - + - + - +
testcase->product;?>testcase->product;?> product", $productName)) echo $productName;?>
testcase->module;?>testcase->module;?>
testcase->story;?>testcase->story;?> storyTitle)) echo html::a($this->createLink('story', 'view', "storyID=$case->story"), "#$case->story:$case->storyTitle"); @@ -146,11 +158,11 @@
testcase->type;?>testcase->type;?> testcase->typeList[$case->type];?>
testcase->stage;?>testcase->stage;?> stage) @@ -166,11 +178,11 @@
testcase->pri;?>testcase->pri;?> pri;?>
testcase->status;?>testcase->status;?> testcase->statusList[$case->status]; @@ -184,19 +196,19 @@
app->loadLang('testtask')->testtask->lastRunTime;?>app->loadLang('testtask')->testtask->lastRunTime;?> lastRunDate)) echo $case->lastRunDate;?>
app->loadLang('testtask')->testtask->lastRunResult;?>app->loadLang('testtask')->testtask->lastRunResult;?> lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?>
testcase->keywords;?>testcase->keywords;?> keywords;?>
testcase->linkCase;?>testcase->linkCase;?> linkCaseTitles)) @@ -214,13 +226,13 @@
testcase->legendLinkBugs;?> - +
- + - + - -
testcase->fromBug;?>testcase->fromBug;?> fromBug) echo html::a($this->createLink('bug', 'view', "bugID=$case->fromBug"), $case->fromBugTitle);?>
testcase->toBug;?>testcase->toBug;?> toBugs as $bugID => $bugTitle) @@ -235,18 +247,18 @@
testcase->legendOpenAndEdit;?> - +
- + - +
testcase->openedBy;?>testcase->openedBy;?> openedBy] . $lang->at . $case->openedDate;?>
testcase->lblLastEdited;?>testcase->lblLastEdited;?> lastEditedBy) echo $users[$case->lastEditedBy] . $lang->at . $case->lastEditedDate;?>
-
+ + + diff --git a/module/testtask/css/batchrun.css b/module/testtask/css/batchrun.css new file mode 100644 index 0000000000..5b651342ed --- /dev/null +++ b/module/testtask/css/batchrun.css @@ -0,0 +1,3 @@ +.table-bordered {border: none} +.table-bordered thead th {border-top: none} +.table-form > tbody > tr > th, .table-form > tbody > tr > td {border-bottom: 1px solid #ddd} diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 28759b3f58..c908599bb0 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -12,6 +12,7 @@ $lang->testtask->index = "测试任务首页"; $lang->testtask->create = "提交测试"; $lang->testtask->delete = "删除测试任务"; +$lang->testtask->deleted = "已删除"; $lang->testtask->view = "详情"; $lang->testtask->edit = "编辑测试任务"; $lang->testtask->browse = "待测列表"; diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php index f49390a332..5d19e75e79 100644 --- a/module/testtask/view/batchrun.html.php +++ b/module/testtask/view/batchrun.html.php @@ -11,31 +11,33 @@ */ ?> - app->loadLang('testcase'); unset($this->lang->testcase->resultList['n/a']); ?> +
+
+ icons['testtask']);?> + icons['batchRun']);?> testtask->common . $lang->colon . $lang->testtask->batchRun;?> +
+
+
- - - - - - - - - - +
testtask->common . $lang->colon . $lang->testtask->batchRun;?>
idAB;?> priAB;?>testcase->module;?> testcase->title;?> testcase->result?> testcase->stepDesc . '/' . $lang->testcase->stepExpect?>
+ + + + + + + + + + loadModel('tree')->getOptionMenu($cases[$caseID]->product, $viewType = 'case', $startModuleID = 0);?> - - + + - - - + + + diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index 0813977d09..e512c8bd35 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -19,8 +19,6 @@ - -
idAB;?> priAB;?>testcase->module;?> testcase->title;?> testcase->result?> testcase->stepDesc . '/' . $lang->testcase->stepExpect?>
version)?> testcase->priList[$cases[$caseID]->pri]?>module] . "'>" . $moduleOptionMenu[$cases[$caseID]->module] . ""?>title}'>{$cases[$caseID]->title}"?>module] . "'>" . $moduleOptionMenu[$cases[$caseID]->module] . ""?>title}'>{$cases[$caseID]->title}"?> lang->testcase->resultList, 'pass', "onclick='showAction(this.value,\".action$caseID\")'")?> @@ -43,9 +45,9 @@ table .table-1 td{border:0px;} $step):?>
desc'>" . $i . "、" . $step->desc . ''?>expect'>" . $lang->testcase->stepExpect . "：" . $step->expect . ''?>desc'>" . $i . "、" . $step->desc . ''?>expect'>" . $lang->testcase->stepExpect . "：" . $step->expect . ''?>
recTotal}&recPerPage={$pager->recPerPage}"; ?> diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php index a41ccb166c..f4617d2beb 100644 --- a/module/testtask/view/view.html.php +++ b/module/testtask/view/view.html.php @@ -13,8 +13,14 @@
-
deleted) echo "class='deleted'";?>>TESTTASK #id . ' ' . $task->name;?>
-
+
+ icons['testtask']) . ' #' . $task->id;?> + name;?> + deleted):?> + task->deleted;?> + +
+
session->testtaskList ? $this->session->testtaskList : $this->createLink('testtask', 'browse', "productID=$task->product"); $actionLinks = ''; @@ -22,45 +28,50 @@ { ob_start(); + echo "
"; common::printIcon('testtask', 'start', "taskID=$task->id", $task); - common::printIcon('testtask', 'close', "taskID=$task->id", $task); - common::printIcon('testtask', 'cases', "taskID=$task->id", $task); - common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task); + common::printIcon('testtask', 'close', "taskID=$task->id", $task, 'button', '', '', 'text-danger'); + common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'button', 'smile'); + common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'button', 'link'); + echo '
'; - common::printDivider(); + echo "
"; common::printIcon('testtask', 'edit', "taskID=$task->id"); common::printIcon('testtask', 'delete', "taskID=$task->id", '', 'button', '', 'hiddenwin'); + echo '
'; $actionLinks = ob_get_contents(); ob_clean(); echo $actionLinks; } + echo "
"; common::printRPN($browseLink); + echo '
'; ?>
- -
- - - - - -
+
+
+
testtask->legendDesc;?> -
desc;?>
+
desc;?>
testtask->legendReport;?> -
report;?>
+
report;?>
-
-
+
+ + +
+
testtask->legendBasicInfo;?> - +
- + @@ -93,7 +104,7 @@
testtask->project;?>testtask->project;?> createLink('project', 'story', "projectID=$task->project"), $task->projectName);?>
-
+ + + diff --git a/www/theme/default/style.css b/www/theme/default/style.css index bdce0a37f1..495a6e3d16 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -46,7 +46,7 @@ tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: righ .table td .input[type="radio"], .table td input[type="checkbox"] {margin-top: 2px} .table-fixed {table-layout: fixed;} .table-fixed th, .table-fixed td {overflow:hidden; white-space:nowrap;} -.table-fixed tfoot > tr > th, .table-fixed tfoot > tr > td {overflow: visible;} +.table-fixed tfoot > tr > th, .table-fixed tfoot > tr > td, .table-fixed .nofixed{overflow: visible;} /* Tables sorters */ .tablesorter thead tr div {padding:0; margin:0} @@ -218,6 +218,9 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable /* Table condensed */ .table-condensed th, .table-condensed td {padding: 6px 5px;} +/* chosen container in input group */ +.input-group > .chosen-container {display: table-cell;} + /* Condensed form */ .form-condensed .table-form {margin-bottom: 0;} .form-condensed .table-form td, .form-condensed .table-form th {padding: 5px; font-size: 12px;} @@ -226,7 +229,7 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable .form-condensed fieldset.fieldset-primary {background-color: transparent; padding: 0; margin-top: 0;} .form-condensed fieldset .table-form {margin-bottom: 0;} .form-condensed fieldset.collapsed, .form-condensed fieldset.fieldset-pure.collapsed {padding: 1px!important; background: #eee!important} -.form-condensed fieldset.collapsed .table-form, .form-condensed fieldset.collapsed .article-content, .form-condensed fieldset.collapsed .form-group {display: none} +.form-condensed fieldset.collapsed .table-form, .form-condensed fieldset.collapsed .article-content, .form-condensed fieldset.collapsed .form-group, .form-condensed fieldset.collapsed #historyItem {display: none} .form-condensed legend {font-size: 12px; font-weight: bold; border:0px solid red; padding: 5px; position: absolute; top: -25px; left: 0; cursor: pointer; line-height: 14px; vertical-align: top; color: #666} .form-condensed .fieldset-pure legend{top: -20px} .form-condensed legend:before {font-family: ZenIcon; content: '\e6b8'; font-size: 14px; color: #999; display: inline-block; margin-right: 4px; -webkit-font-smoothing: antialiased;}