diff --git a/module/block/control.php b/module/block/control.php index 4e82ae038d..5d11d0c390 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1015,7 +1015,7 @@ class block extends control } foreach($openedBugs as $buildBugs) { - foreach($buildsBugs as $bugID => $bug) $bugIDList[$bugID] = $bugID; + foreach($buildBugs as $bugID => $bug) $bugIDList[$bugID] = $bugID; } $today = date(DT_DATE1); diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php index 7f10a17a22..d862501391 100644 --- a/module/build/view/linkbug.html.php +++ b/module/build/view/linkbug.html.php @@ -18,8 +18,8 @@ - - + - + - + bugs},", ",$bug->id,") !== false) continue;?> product != $bug->product) continue; ?> - - + - + @@ -57,7 +62,7 @@
- build->linkBug);?> + build->linkBug, '', 'btn');?>
id}&type=bug"), $lang->goback, '', "class='btn'");?> @@ -68,6 +73,5 @@ $(function() { ajaxGetSearchForm('#bugs .linkBox #querybox'); - setModal(); }) diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index 658e8025b2..00d7db45d1 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -18,8 +18,8 @@
+
@@ -28,26 +28,31 @@ idAB;?>
priAB;?> bug->title;?>bug->title;?> openedByAB;?> bug->resolvedBy;?> statusAB;?>
+ id => sprintf('%03d', $bug->id)), ($bug->status == 'resolved' or $bug->status == 'closed') ? $bug->id : '');?> bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri)?>bug->priList, $bug->pri, $bug->pri)?> createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> openedBy];?> 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];?> + + + bug->statusList[$bug->status];?> + +
- - + - + - - + + - + - + stories},", ",{$story->id},") !== false) continue; ?> product != $story->product) continue; ?> - - + - - - - - + + + + + @@ -61,7 +66,7 @@
- build->linkStory);?> + build->linkStory, '', 'btn');?>
id}&type=story"), $lang->goback, '', "class='btn'");?> @@ -72,6 +77,5 @@ $(function() { ajaxGetSearchForm('#stories .linkBox #querybox'); - setModal(); }) diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 7661341db1..17f5f22958 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -91,8 +91,8 @@ tbody tr td:first-child input{display:none;} id}&type=story&link=$link¶m=$param&orderBy=%s";?> - - + - + - + $story):?> createLink('story', 'view', "storyID=$story->id", '', true);?> - - + - - + + - - + - - - + + + - + createLink('bug', 'view', "bugID=$bug->id", '', true);?> - - + - + @@ -215,7 +224,7 @@ tbody tr td:first-child input{display:none;}
- build->batchUnlink);?> + build->batchUnlink, '', 'btn');?>
build->resolvedBugs, $countBugs);?>
@@ -227,25 +236,32 @@ tbody tr td:first-child input{display:none;}
+
@@ -27,31 +27,36 @@ idAB;?>
priAB;?> priAB;?> story->title;?> openedByAB;?> assignedToAB;?> openedByAB;?> assignedToAB;?> story->estimateAB;?>statusAB;?>statusAB;?> story->stageAB;?>
+ id => sprintf('%03d', $story->id)), ($story->stage == 'developed' or $story->status == 'closed') ? $story->id : '');?> story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri)?>story->priList, $story->pri, $story->pri)?> createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?>openedBy];?>assignedTo];?>estimate;?>story->statusList[$story->status];?>story->stageList[$story->stage];?>openedBy];?>assignedTo];?>estimate;?> + + + story->statusList[$story->status];?> + + story->stageList[$story->stage];?>
+
@@ -102,29 +102,34 @@ tbody tr td:first-child input{display:none;}
priAB);?> story->title);?> openedByAB);?> openedByAB);?> story->estimateAB);?> statusAB);?> story->stageAB);?> actions?>
+ id => sprintf('%03d', $story->id)));?> id);?> story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?>story->priList, $story->pri, $story->pri);?> title, '', "class='preview'");?> openedBy];?>estimate;?>story->statusList[$story->status];?>estimate;?> + + + story->statusList[$story->status];?> + + story->stageList[$story->stage];?>
- build->batchUnlink);?> + build->batchUnlink, '', 'btn');?>
build->finishStories, $countStories);?>
@@ -162,8 +167,8 @@ tbody tr td:first-child input{display:none;} id}&type=bug&link=$link¶m=$param&orderBy=%s";?>
+
@@ -173,26 +178,30 @@ tbody tr td:first-child input{display:none;}
bug->title);?> bug->status);?> openedByAB);?> bug->openedDateAB);?> bug->resolvedByAB);?> openedByAB);?> bug->openedDateAB);?> bug->resolvedByAB);?> bug->resolvedDateAB);?> actions?>
+
- id => sprintf('%03d', $bug->id)));?> id);?> title, '', "class='preview'");?>bug->statusList[$bug->status];?> + + + bug->statusList[$bug->status];?> + + openedBy];?> openedDate, 5, 11)?> resolvedBy];?>
id}&type=newbug&link=$link¶m=$param&orderBy=%s";?> - - + + - - - + + + - + createLink('bug', 'view', "bugID=$bug->id", '', true);?> - - - + + + - + diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 6368b1d7a0..a7c99af48e 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -18,8 +18,8 @@
idAB);?>
idAB);?> bug->severityAB);?> bug->title);?> bug->status);?> openedByAB);?> bug->openedDateAB);?> bug->resolvedByAB);?> openedByAB);?> bug->openedDateAB);?> bug->resolvedByAB);?> bug->resolvedDateAB);?>
id);?>bug->severityList, $bug->severity, $bug->severity);?>
id);?> + + title, '', "class='preview'");?>bug->statusList[$bug->status];?> + + + bug->statusList[$bug->status];?> + + openedBy];?> openedDate, 5, 11)?> resolvedBy];?>
- - + - - - - + + + + - + id])) continue;?> - - - + + - + @@ -56,7 +61,7 @@
- productplan->linkBug);?> + productplan->linkBug, '', 'btn');?>
id&type=bug&orderBy=$orderBy"), $lang->goback, '', "class='btn'");?> diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index 693f372b61..322daf3d3b 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -18,8 +18,8 @@
+
@@ -27,26 +27,31 @@ idAB;?>
priAB;?>bug->title;?>openedByAB;?>bug->assignedToAB;?>priAB;?>bug->title;?>openedByAB;?>bug->assignedToAB;?> bug->status;?>
+ id => sprintf('%03d', $bug->id)));?> bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri)?>createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?>bug->priList, $bug->pri, $bug->pri)?>createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> openedBy];?> assignedTo];?>bug->statusList[$bug->status];?> + + + bug->statusList[$bug->status];?> + +
- - + - + - - - + + + - + - + id])) continue;?> - - + - + @@ -64,7 +69,7 @@
- productplan->linkStory);?> + productplan->linkStory, '', 'btn');?>
id&type=story&orderBy=$orderBy"), $lang->goback, '', "class='btn'");?> diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index fdd6cbf124..5c7f89d709 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -77,22 +77,22 @@ id&orderBy=$orderBy");?>">
+
@@ -27,33 +27,38 @@ idAB;?>
priAB;?>priAB;?> story->plan;?> story->module;?>story->title;?>openedByAB;?>assignedToAB;?>story->title;?>openedByAB;?>assignedToAB;?> story->estimateAB;?> statusAB;?>story->stageAB;?>story->stageAB;?>
+ id => sprintf('%03d', $story->id)));?> pri;?>'>story->priList, $story->pri, $story->pri)?> planTitle;?> module];?>createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?>createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> openedBy);?> assignedTo);?> estimate;?> story->statusList[$story->status];?> + + + story->statusList[$story->status];?> + + story->stageList[$story->stage];?>
id}&type=story&orderBy=%s&link=$link¶m=$param"; + $canBatchAction = $canBatchUnlink or $canBatchClose or $canBatchEdit or $canBatchReview or $canBatchChangeBranch or $canBatchChangeModule or $canBatchChangePlan or $canBatchChangeStage or $canBatchAssignTo; + $vars = "planID={$plan->id}&type=story&orderBy=%s&link=$link¶m=$param"; ?> - - + - - - - + + + + - + @@ -124,7 +124,7 @@ $totalEstimate += $story->estimate; ?> - - - + + - + @@ -338,8 +343,8 @@ id}&type=bug&orderBy=%s&link=$link¶m=$param"; ?> - - + - - - + + + - + - - - + + - + @@ -388,7 +398,7 @@
- productplan->batchUnlink);?> + productplan->batchUnlink, '', 'btn');?>
productplan->bugSummary, count($planBugs));?>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index d825727c9e..dd4f27280c 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -138,7 +138,10 @@ - +
+
@@ -104,17 +104,17 @@
productplan->updateOrder);?> priAB);?>story->module);?> story->title);?> openedByAB);?> assignedToAB);?>story->module);?>story->title);?> openedByAB);?> assignedToAB);?> story->estimateAB);?> statusAB);?> story->stageAB);?> actions?>
+ id => sprintf('%03d', $story->id)));?> @@ -133,19 +133,24 @@ pri;?>'>story->priList, $story->pri, $story->pri);?>module, '');?>title);?>module, '');?>title);?> openedBy);?> assignedTo);?> estimate;?> story->statusList[$story->status];?> + + + story->statusList[$story->status];?> + + story->stageList[$story->stage];?> createLink('productplan', 'unlinkStory', "story=$story->id&plan=$plan->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='btn-icon' title='{$lang->productplan->unlinkStory}'"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='btn' title='{$lang->productplan->unlinkStory}'"); } ?>
+
@@ -348,34 +353,39 @@ idAB);?>
priAB);?> bug->title);?> openedByAB);?> bug->assignedToAB);?>bug->title);?> openedByAB);?> bug->assignedToAB);?> bug->status);?> actions?>
+ id => sprintf('%03d', $bug->id)));?> id);?> bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri);?>createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?>bug->priList, $bug->pri, $bug->pri);?>createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy);?> assignedTo);?> bug->statusList[$bug->status];?> + + + bug->statusList[$bug->status];?> + + createLink('productplan', 'unlinkBug', "story=$bug->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"bugList\",confirmUnlinkBug)", '', '', "class='btn-icon' title='{$lang->productplan->unlinkBug}'"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"bugList\",confirmUnlinkBug)", '', '', "class='btn' title='{$lang->productplan->unlinkBug}'"); } ?>
+ + +
diff --git a/module/release/css/view.css b/module/release/css/view.css index 3e9f7ed286..2055583f78 100644 --- a/module/release/css/view.css +++ b/module/release/css/view.css @@ -6,7 +6,8 @@ .checkbox.btn{margin-top:0px} #unlinkStoryList, #unlinkBugList, #unlinkLeftBugList{border:1px solid #ddd;} -.table-footer .text{line-height:30px;} +.table-footer .text {line-height:30px;} +.table-footer .btn-toolbar {margin-right: 10px;} #releaseInfo > div {padding-top: 15px;} diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 4ee4bd8d3d..2e1d1396cc 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -57,11 +57,11 @@ id&type=story&link=true"), ' ', '', "class='btn' title='{$lang->release->linkStory}'"); - if(common::hasPriv('release', 'linkBug') and $this->config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ', '', "class='btn' title='{$lang->release->linkBug}'"); + if(common::hasPriv('release', 'linkBug') and $this->config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ', '', "class='btn' title='{$lang->release->linkBug}'"); if(common::hasPriv('release', 'changeStatus', $release)) { $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; - echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"), ' ', 'hiddenwin', "class='btn' title='{$lang->release->changeStatusList[$changedStatus]}'"); + echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"), ' ', 'hiddenwin', "class='btn' title='{$lang->release->changeStatusList[$changedStatus]}'"); } common::printIcon('release', 'edit', "release=$release->id", $release, 'list'); if(common::hasPriv('release', 'delete', $release)) diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php index 2f56ce571a..6ead0b5852 100644 --- a/module/release/view/linkbug.html.php +++ b/module/release/view/linkbug.html.php @@ -22,8 +22,8 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm'; - - + - - - - + + + + - + id,") !== false) continue;?> - - + - + @@ -60,7 +65,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
- release->linkBug);?> + release->linkBug, '', 'btn');?>
id&type=$type"), $lang->goback, '', "class='btn'");?> @@ -71,6 +76,5 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm'; $(function() { ajaxGetSearchForm('# .linkBox #queryBox') - setModal(); }) diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php index 007604a022..79be1429f4 100644 --- a/module/release/view/linkstory.html.php +++ b/module/release/view/linkstory.html.php @@ -18,8 +18,8 @@
+
@@ -31,26 +31,31 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm'; idAB;?>
priAB;?> bug->title;?>openedByAB;?>bug->resolvedBy;?>priAB;?>bug->title;?>openedByAB;?>bug->resolvedBy;?> statusAB;?>
- id => sprintf('%03d', $bug->id)), ($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') ? $bud->id : '');?> + + id => sprintf('%03d', $bug->id)), ($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') ? $bug->id : '');?> bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri)?>bug->priList, $bug->pri, $bug->pri)?> createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> openedBy];?> resolvedBy];?>bug->statusList[$bug->status];?> + + + bug->statusList[$bug->status];?> + +
- - + - - - - - - - + + + + + + + - + stories},", ",{$story->id},") !== false) continue; ?> product != $story->product) continue; ?> - - + @@ -65,7 +65,7 @@
- release->linkStory);?> + release->linkStory, '', 'btn');?>
id&type=story"), $lang->goback, '', "class='btn'");?> @@ -76,6 +76,5 @@ $(function() { ajaxGetSearchForm('#stories .linkBox #queryBox'); - setModal(); }) diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index e2062da3a4..9936b4ca5d 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -30,14 +30,14 @@ deleted) { - if(common::hasPriv('release', 'changeStatus', $release)) - { - $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; - echo html::a(inlink('changeStatus', "releaseID=$release->id&type=$changedStatus"), ' ' . $lang->release->changeStatusList[$changedStatus], 'hiddenwin', "class='btn btn-link'"); - } if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), ' ' . $lang->release->linkStory, '', "class='btn btn-link'"); if(common::hasPriv('release', 'linkBug') and $this->config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ' . $lang->release->linkBug, '', "class='btn btn-link'"); + if(common::hasPriv('release', 'changeStatus', $release)) + { + $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; + echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"), ' ', 'hiddenwin', "class='btn btn-link' title='{$lang->release->changeStatusList[$changedStatus]}'"); + } common::printIcon('release', 'edit', "releaseID=$release->id", $release); common::printIcon('release', 'delete', "releaseID=$release->id", $release, 'button', '', 'hiddenwin'); } @@ -71,8 +71,8 @@ id}&type=story&link=$link¶m=$param&orderBy=%s";?> - - + - + - + - + $story):?> createLink('story', 'view', "storyID=$story->id", '', true);?> - @@ -142,8 +142,8 @@ id}&type=bug&link=$link¶m=$param&orderBy=%s";?> - - + - + createLink('bug', 'view', "bugID=$bug->id", '', true);?> - @@ -213,8 +213,8 @@ id}&type=leftBug&link=$link¶m=$param&orderBy=%s";?> - - + - + - + createLink('bug', 'view', "bugID=$bug->id", '', true);?> - - + - + diff --git a/module/story/css/common.css b/module/story/css/common.css index cbf7b115fe..38a52555c8 100644 --- a/module/story/css/common.css +++ b/module/story/css/common.css @@ -1,5 +1,6 @@ .linkbox{height:180px; overflow-y:auto} -.tab-pane .table-borderless {border: 1px solid #ddd!important} +.tab-pane h6 {margin: 0px; padding: 10px;} +.tab-pane h6, .tab-pane table {border: 1px solid #ddd; border-top: none;} .tab-pane .table-data.table-borderless {border: none!important} .input-group .control-product + .chosen-container-single .chosen-single {border-radius: 2px 0 0 2px; border-right-width: 0; padding-right: 1px;} diff --git a/module/story/view/affected.html.php b/module/story/view/affected.html.php index 048dcbe10b..2c5e58f214 100644 --- a/module/story/view/affected.html.php +++ b/module/story/view/affected.html.php @@ -7,17 +7,17 @@
projects as $projectID => $project):?> -
icons['project'], 'icon');?> name ?>   teams[$projectID] as $member) echo zget($users, $member->account, $member->account) . ' ';?>
-
+
@@ -27,22 +27,22 @@ idAB;?>
priAB;?> story->title;?> openedByAB;?> assignedToAB;?> story->estimateAB;?>statusAB;?>story->stageAB;?>priAB;?>story->title;?> openedByAB;?> assignedToAB;?> story->estimateAB;?>statusAB;?>story->stageAB;?>
+
stage == 'developed' or $story->status == 'closed') echo 'checked';?> /> @@ -55,7 +55,7 @@
assignedTo);?> estimate;?> story->statusList, $story->status);?>story->stageList, $story->stage);?>story->stageList, $story->stage);?>
+
@@ -80,20 +80,20 @@ idAB);?>
priAB);?> priAB);?> story->title);?> openedByAB);?> openedByAB);?> story->estimateAB);?> statusAB);?> story->stageAB);?> actions?>
+
@@ -113,7 +113,7 @@ if(common::hasPriv('release', 'unlinkStory')) { $unlinkURL = $this->createLink('release', 'unlinkStory', "releaseID=$release->id&story=$story->id"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='btn-icon' title='{$lang->release->unlinkStory}'"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='btn' title='{$lang->release->unlinkStory}'"); } ?>
+
@@ -160,11 +160,11 @@
actions;?>
+
@@ -184,7 +184,7 @@ if(common::hasPriv('release', 'unlinkBug')) { $unlinkURL = $this->createLink('release', 'unlinkBug', "releaseID=$release->id&bug=$bug->id"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"bugList\",confirmUnlinkBug)", '', '', "class='btn-icon' title='{$lang->release->unlinkBug}'"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"bugList\",confirmUnlinkBug)", '', '', "class='btn' title='{$lang->release->unlinkBug}'"); } ?>
+
@@ -225,16 +225,16 @@
bug->severityAB);?> bug->title);?> bug->status);?> openedByAB);?> openedByAB);?> bug->openedDateAB);?> actions;?>
+
@@ -243,9 +243,11 @@ id);?>
bug->severityList, $bug->severity, $bug->severity);?> + + title, '', "class='preview'");?> bug->statusList, $bug->status);?> bug->statusList, $bug->status);?> openedBy);?> openedDate?> @@ -253,7 +255,7 @@ if(common::hasPriv('release', 'unlinkBug')) { $unlinkURL = $this->createLink('release', 'unlinkBug', "releaseID=$release->id&bug=$bug->id&type=leftBug"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"leftBugList\",confirmUnlinkBug)", '', '', "class='btn-icon' title='{$lang->release->unlinkBug}'"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"leftBugList\",confirmUnlinkBug)", '', '', "class='btn' title='{$lang->release->unlinkBug}'"); } ?>
+
name ?>   teams[$projectID] as $member) echo zget($users, $member->account, $member->account) . ' ';?>
+
- - - - - - - - + + + + + + + + tasks[$projectID])):?> @@ -26,7 +26,12 @@ - + @@ -37,16 +42,16 @@
-
task->id;?>task->name;?>task->assignedTo;?>task->status;?>task->consumed;?>task->left;?>
task->id;?>task->name;?>task->assignedTo;?>task->status;?>task->consumed;?>task->left;?>
id;?> createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?> assignedTo];?>task->statusList[$task->status];?> + + + task->statusList[$task->status];?> + + consumed;?> left;?>
+
- - - - - - - - + + + + + + + + @@ -54,10 +59,15 @@ - + - + @@ -65,14 +75,14 @@
bug->id;?>bug->title;?>bug->status;?>bug->openedBy;?>bug->resolvedBy;?>bug->resolution;?>bug->lastEditedBy;?>
idAB;?>bug->title;?>statusAB;?>bug->openedBy;?>bug->resolvedBy;?>bug->resolution;?>bug->lastEditedBy;?>
id;?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank');?>bug->statusList[$bug->status];?> + + + bug->statusList[$bug->status];?> + + openedBy];?> resolvedBy];?>bug->resolutionList[$bug->resolution];?>bug->resolutionList[$bug->resolution];?> lastEditedBy];?>
- +
- - - - - - + + + + + + @@ -80,7 +90,12 @@ - + diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php index fc0b518496..c2636c5783 100644 --- a/module/story/view/change.html.php +++ b/module/story/view/change.html.php @@ -60,12 +60,13 @@ - +
testcase->id;?>testcase->title;?>testcase->status;?>testcase->openedBy;?>testcase->lastEditedBy;?>
idAB;?>testcase->title;?>statusAB;?>testcase->openedBy;?>testcase->lastEditedBy;?>
id;?> createLink('testcase', 'view', "caseID=$case->id"), $case->title, '_blank');?>testcase->statusList[$case->status];?> + + + testcase->statusList[$case->status];?> + + openedBy];?> lastEditedBy];?>
- lastEditedDate); - echo html::submitButton('', '', 'btn btn-wide btn-primary'); - echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), '', '', 'btn btn-wide'); - ?> + + lastEditedDate); + echo html::submitButton('', '', 'btn btn-wide btn-primary'); + echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide'); + ?>
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index abccaf47a4..0fc65ae712 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -24,6 +24,7 @@
+ createLink('custom', 'ajaxSaveCustomFields', 'module=testcase§ion=custom&key=batchCreateFields')?>
@@ -55,10 +56,7 @@ '>product->branch;?> '>testcase->module;?> '> testcase->story;?> - - testcase->title;?> - - + testcase->title;?> testcase->type;?> '>testcase->pri;?> '>testcase->precondition;?> diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index e734e65ed7..7ebc03510a 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -178,7 +178,10 @@ type)) $step->type = 'step';?> - +
+ type === 'group') echo ' checked' ?>> + +
@@ -210,11 +213,8 @@ - save, '', 'btn btn-wide btn-primary'); - echo '   '; - echo html::backButton($lang->goback, '', 'btn btn-wide'); - ?> + + diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index 9780871b11..395c219f78 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -113,8 +113,8 @@
lastEditedDate);?> - - createLink('testcase', 'browse', "productID=$productID");?>"' /> + + createLink('testcase', 'browse', "productID=$productID");?>"' />
diff --git a/module/testreport/css/common.css b/module/testreport/css/common.css index 91ebe030e6..cce95976f3 100644 --- a/module/testreport/css/common.css +++ b/module/testreport/css/common.css @@ -2,10 +2,5 @@ .main #stories{margin-bottom:10px} .main .table-report{border:0px;} -.detail-title -{ - background:#f1f1f1; - padding:8px 10px; - border: none; - border-bottom: 1px solid #ddd; -} +.detail > table {border: 1px solid #ddd;} +.detail-title {background:#f1f1f1; padding:8px 10px; border: none;} diff --git a/module/testreport/css/view.css b/module/testreport/css/view.css index 3ac466dc33..3358b2df0b 100644 --- a/module/testreport/css/view.css +++ b/module/testreport/css/view.css @@ -2,3 +2,5 @@ .main .nav-tabs{padding-left:20px; padding-top:10px;} .main .tab-content{border:0px;} .tab-content #builds tr:last-child td, .tab-content #cases tr:last-child td,.tab-content #bugs tr:last-child td,.tab-content #legacyBugs tr:last-child td{border-bottom:0px;} +.tab-pane > table {border: 1px solid #ddd;} +.tab-pane > table:first-child {border-top: none;} diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php index f31f24e28b..684eddb812 100644 --- a/module/testreport/view/create.html.php +++ b/module/testreport/view/create.html.php @@ -18,7 +18,6 @@

testreport->create;?>

-
diff --git a/module/testsuite/view/batchcreatecase.html.php b/module/testsuite/view/batchcreatecase.html.php index ce55a6934f..f75c2635de 100644 --- a/module/testsuite/view/batchcreatecase.html.php +++ b/module/testsuite/view/batchcreatecase.html.php @@ -23,7 +23,7 @@ - + @@ -44,7 +44,7 @@ $type = $i == 0 ? 'feature' : 'ditto'; $pri = $i == 0 ? 3 : 'ditto'; ?> - + -
idAB;?> testcase->module;?> testcase->title;?>
diff --git a/module/testsuite/view/createcase.html.php b/module/testsuite/view/createcase.html.php index 28f7188030..62c15b5e69 100644 --- a/module/testsuite/view/createcase.html.php +++ b/module/testsuite/view/createcase.html.php @@ -190,12 +190,9 @@
- save, '', 'btn btn-wide btn-primary'); - echo '   '; - echo html::backButton($lang->goback, '', 'btn btn-wide'); - ?> + + +