diff --git a/module/bug/view/browsedata.html.php b/module/bug/view/browsedata.html.php index 9b1f63ff34..e41d249dde 100644 --- a/module/bug/view/browsedata.html.php +++ b/module/bug/view/browsedata.html.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ ?> - +
@@ -46,7 +46,7 @@ id");?> - diff --git a/module/bug/view/linkbugs.html.php b/module/bug/view/linkbugs.html.php index 88fac43337..caa7b26cdb 100644 --- a/module/bug/view/linkbugs.html.php +++ b/module/bug/view/linkbugs.html.php @@ -21,7 +21,7 @@
-
idAB);?>
+ id));?>
+
@@ -39,7 +39,7 @@ createLink('bug', 'view', "bugID=$bug2Link->id");?> - diff --git a/module/build/css/view.css b/module/build/css/view.css index 5b8cf025f8..82742a2161 100644 --- a/module/build/css/view.css +++ b/module/build/css/view.css @@ -8,4 +8,4 @@ .tabs .tab-content .tab-pane #querybox{margin:0px; border-left:1px solid #ddd; border-right:1px solid #ddd;} .tabs .tab-content .tab-pane #querybox form {padding-left:0px;} -.table-actions {padding-left: 8px;} +.table-actions {padding-left: 5px;} diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php index b52fad3445..8f6c4ed780 100644 --- a/module/build/view/linkbug.html.php +++ b/module/build/view/linkbug.html.php @@ -13,7 +13,7 @@
id}&browseType=$browseType¶m=$param");?>'> -
+ id));?>
+
@@ -29,8 +29,8 @@ bugs},", ",$bug->id,") !== false) continue;?> - diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index 07bcc2dd52..185c22f385 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -13,7 +13,7 @@
id}&browseType=$browseType¶m=$param");?>'> -
 productplan->unlinkedBugs;?>
- status == 'resolved' or $bug->status == 'closed') echo "checked";?> /> + + status == 'resolved' or $bug->status == 'closed') echo "checked";?> /> createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?> bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri)?>
+
@@ -31,8 +31,8 @@ stories},", ",{$story->id},") !== false) continue; ?> - diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index cb48826a6c..40aa7f315a 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -56,7 +56,7 @@ id}")?>' id='linkedStoriesForm'> -
 productplan->unlinkedStories;?>
- stage == 'developed' or $story->status == 'closed') echo 'checked';?> /> + + stage == 'developed' or $story->status == 'closed') echo 'checked';?> /> createLink('story', 'view', "storyID=$story->id"), $story->id);?> story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri)?>
+
@@ -73,9 +73,9 @@ $story):?> createLink('story', 'view', "storyID=$story->id", '', true);?> - @@ -115,7 +115,7 @@ id");?>" id='linkedBugsForm'> -
idAB;?>
+ - + id);?>
+
@@ -132,9 +132,9 @@ createLink('bug', 'view', "bugID=$bug->id", '', true);?> - diff --git a/module/common/view/datatable.html.php b/module/common/view/datatable.html.php index baeae690b2..4a62b5a4fc 100644 --- a/module/common/view/datatable.html.php +++ b/module/common/view/datatable.html.php @@ -50,7 +50,14 @@ $(document).ready(function() scrollPos : 'out', tableClass : 'tablesorter', storage : false, - selectable : {clickBehavior: 'multi'}, + selectable : + { + clickBehavior: 'multi', + startDrag: function(e) + { + if(!this.multiKey && !$(e.target).closest('td[data-index="0"]').length) return false; + } + }, ready: function() { if(!this.$table) return; diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php index c5cef28368..e796d95dd1 100644 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -33,7 +33,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
' method='post' id='userListForm'> -
idAB;?>
+ - + id);?> title, '', "class='preview'");?>
+
recTotal}&recPerPage={$pager->recPerPage}";?> @@ -58,7 +58,7 @@ js::set('confirmDelete', $lang->user->confirmDelete); ?> -
+ account'> "; printf('%03d', $user->id); diff --git a/module/mail/view/browse.html.php b/module/mail/view/browse.html.php index 62fc846f44..4bfa8f64c2 100644 --- a/module/mail/view/browse.html.php +++ b/module/mail/view/browse.html.php @@ -16,7 +16,7 @@ ' target='hiddenwin' id='mailForm'>
- +
recTotal}&recPerPage={$pager->recPerPage}"; ?> @@ -34,7 +34,7 @@ - diff --git a/module/mail/view/sendclouduser.html.php b/module/mail/view/sendclouduser.html.php index 4008adaffb..5011b01424 100644 --- a/module/mail/view/sendclouduser.html.php +++ b/module/mail/view/sendclouduser.html.php @@ -19,7 +19,7 @@
mail->unsyncUser?>
-
+ id?>
+
@@ -31,7 +31,7 @@ $user):?> email and isset($members[$user->email])) continue;?> - @@ -62,7 +62,7 @@
mail->syncedUser?>
-
user->account;?>
+ account?>
+
@@ -74,7 +74,7 @@ $user):?> email) or !isset($members[$user->email])) continue;?> - diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index c91d132192..d5dddb1b11 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -22,7 +22,7 @@ '> -
user->account;?>
+ account?>
+
@@ -42,7 +42,7 @@ - diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 76910d12ac..ab5c606c40 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -22,7 +22,7 @@ -
+ createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id), '_blank');?>
+
@@ -46,7 +46,7 @@ $story):?> createLink('story', 'view', "id=$story->id");?> -
+ diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index 8ad7d267e2..c6aa3391d4 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -24,7 +24,7 @@ - +
@@ -48,7 +48,7 @@ - diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index 3685badb9c..0df822fa10 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -23,7 +23,7 @@ -
+ createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?>
+
app->loadLang('testtask'); @@ -49,7 +49,7 @@ ?> - @@ -90,7 +90,7 @@ if($canBatchEdit) { $actionLink = $this->createLink('testcase', 'batchEdit'); - echo html::submitButton(" " . $lang->edit, "onclick=setFormAction('$actionLink')"); + echo html::submitButton(" " . $lang->edit, "onclick=setFormAction('$actionLink')"); } if($canBatchRun) { diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index d039c7bea0..96cd9268b8 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -45,7 +45,7 @@ -
+ createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?>
+
@@ -63,7 +63,7 @@ -
+ diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index f50cf696d0..f1cf762c1b 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -36,7 +36,7 @@ ' id='productsForm'> - +
recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> @@ -60,7 +60,7 @@ - diff --git a/module/product/view/browsedata.html.php b/module/product/view/browsedata.html.php index 49972337c3..ae403166fb 100644 --- a/module/product/view/browsedata.html.php +++ b/module/product/view/browsedata.html.php @@ -11,7 +11,7 @@ */ ?> -
+ @@ -92,7 +92,7 @@ recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->product->updateOrder, '' , "class='btn'");?> -
show();?>
+ show();?>
+
@@ -38,7 +38,7 @@ $canView = common::hasPriv('story', 'view'); ?> - diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css index 06b242098c..2f7d135f5a 100644 --- a/module/productplan/css/view.css +++ b/module/productplan/css/view.css @@ -20,3 +20,5 @@ input[type=checkbox].ml-10px{margin-left:10px;} .dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;} .dropdown-list > li > a:hover, .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;} + +.table-actions {padding-left: 5px;} diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 1a3eba4517..b7bdf1cfa6 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -39,7 +39,7 @@ id&branch=$branch")?>'> -
idAB);?>
+ id)): sprintf('%03d', $story->id);?>
+
recTotal}&recPerPage={$pager->recPerPage}"; ?> @@ -57,7 +57,7 @@ - diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 3bb2661e0e..7418e70624 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -17,7 +17,7 @@ include '../../common/view/tablesorter.html.php';
id&browseType=$browseType¶m=$param&orderBy=$orderBy")?>'> -
+ id;?>
+
@@ -36,8 +36,8 @@ include '../../common/view/tablesorter.html.php'; if($bug->plan and helper::diffDate($plans[$bug->plan], helper::today()) > 0) continue; ?> - @@ -53,7 +53,7 @@ include '../../common/view/tablesorter.html.php';
 productplan->unlinkedBugs;?>
- + + createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?> bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri)?> "; + echo "
"; echo html::selectButton() . html::submitButton($lang->productplan->linkBug); echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=$orderBy"), $lang->goback, '', "class='btn'"); echo '
'; diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index 70040d9673..601487fd47 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -17,7 +17,7 @@ include '../../common/view/tablesorter.html.php';
id&browseType=$browseType¶m=$param&orderBy=$orderBy")?>'> - +
@@ -37,8 +37,8 @@ include '../../common/view/tablesorter.html.php'; id])) continue; ?> - @@ -58,7 +58,7 @@ include '../../common/view/tablesorter.html.php';
 productplan->unlinkedStories;?>
- + + createLink('story', 'view', "storyID=$story->id"), $story->id);?> story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri)?> "; + echo "
"; echo html::selectButton() . html::submitButton($lang->story->linkStory); echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=$orderBy"), $lang->goback, '', "class='btn'"); echo '
'; diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 6435ac0f3f..37f13f3514 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -65,7 +65,7 @@ id&orderBy=$orderBy");?>"> - +
id}&type=story&orderBy=%s&link=$link¶m=$param"; ?> @@ -93,9 +93,9 @@ $totalEstimate += $story->estimate; ?> - @@ -307,7 +307,7 @@ id&orderBy=$orderBy");?>"> -
+ - + id));?>
+
id}&type=bug&orderBy=%s&link=$link¶m=$param"; ?> @@ -324,9 +324,9 @@ - diff --git a/module/project/css/bug.css b/module/project/css/bug.css index c48171968a..06c119139c 100644 --- a/module/project/css/bug.css +++ b/module/project/css/bug.css @@ -1,4 +1,8 @@ -.assign-menu {min-width: 150px; overflow: hidden; max-height: 305px} -.assign-menu.with-search {padding-bottom: 34px;} -.assign-menu > .assign-search {padding: 0; position: absolute; z-index: 0; bottom: 0; left: 0; right: 0} -.assign-menu > .assign-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666} +.assign-menu.dropdown-menu.with-search {padding: 0; min-width: 150px; overflow: hidden; max-height: 302px;} +.assign-menu.dropdown-menu > .assign-search .input-group {width:100%;} +.assign-menu.dropdown-menu > .assign-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666} +.assign-menu.dropdown-menu > .assign-search .form-control {border: none!important; box-shadow: none!important; border-top: 1px solid #ddd!important;} +.dropdown-list {display: block; padding: 0; max-height: 270px; overflow-y: auto; margin: 0;} +.dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;} +.dropdown-list > li > a:hover, +.dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;} diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php index 40d1f1a7ab..c751a80672 100644 --- a/module/project/view/all.html.php +++ b/module/project/view/all.html.php @@ -28,7 +28,7 @@ '> -
+ - + createLink('bug', 'view', "bugID=$bug->id"), sprintf("%03d", $bug->id));?>
+
recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> @@ -52,7 +52,7 @@ - diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index 6f4602ab48..b171dc6336 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -22,7 +22,7 @@ -
+ @@ -91,7 +91,7 @@ recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->project->updateOrder, '', "class='btn'");?> -
show();?>
+ show();?>
+
id}&orderBy=%s&build=$buildID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?> @@ -40,7 +40,7 @@ - @@ -82,16 +82,17 @@ echo '
'; echo ''; - echo '
'; } } ?> diff --git a/module/project/view/importbug.html.php b/module/project/view/importbug.html.php index daf7ef0e7b..c0c9ec3ffa 100755 --- a/module/project/view/importbug.html.php +++ b/module/project/view/importbug.html.php @@ -12,10 +12,8 @@ ?> -
@@ -26,7 +24,7 @@ var browseType = '';
-
+ createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id), '_blank');?>
+
@@ -42,7 +40,7 @@ var browseType = ''; - @@ -50,9 +48,9 @@ var browseType = ''; - - - + + + diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php index 8149672412..66cf2346a8 100644 --- a/module/project/view/importtask.html.php +++ b/module/project/view/importtask.html.php @@ -23,16 +23,16 @@ createLink('project', 'importTask', $params), "" . $lang->project->containDoing, '', "class='btn'"); + echo html::a($this->createLink('project', 'importTask', $params), " " . $lang->project->containDoing, '', "class='btn'"); ?> -
idAB;?>
+ id]", '');?> id) . html::hidden("id[$bug->id]", $bug->id);?> bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> id", $bug->title, '', "class='preview'", true, true);?> bug->statusList[$bug->status];?>id]", $lang->task->priList, 3, "class='input-sm form-control'");?>id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='input-sm form-control chosen'");?>id]", '', 'size=4 class="input-sm form-control"');?>id]", $lang->task->priList, 3, "class='input-sm form-control'");?>id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='input-sm form-control chosen'");?>id]", '', 'size=4 class="input-sm form-control"');?>
+
@@ -50,12 +50,10 @@ assignedTo == $app->user->account ? 'style=color:red' : '';?> - - - diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php index 9325fa805c..3e432c447b 100644 --- a/module/project/view/linkstory.html.php +++ b/module/project/view/linkstory.html.php @@ -21,7 +21,7 @@
-
idAB;?>
- - id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?> + + + id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?> project], 2);?> task->priList, $task->pri, $task->pri)?>'>pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?> id", $task->name)) echo $task->name;?>
+
@@ -43,7 +43,7 @@ id])) continue;?> createLink('story', 'view', "storyID=$story->id");?> -
idAB;?>
+ id]", $story->product);?> id));?> @@ -66,7 +66,6 @@
' class='text-left'>
- " . $lang->project->whyNoStories . '
'; diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index ae862fc9da..e7014441ed 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -51,7 +51,7 @@
- +
id}&orderBy=%s&type=$type¶m=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?> @@ -79,7 +79,7 @@ $totalEstimate += $story->estimate; ?> -
+ diff --git a/module/project/view/taskdata.html.php b/module/project/view/taskdata.html.php index eea1d406da..af434a324b 100644 --- a/module/project/view/taskdata.html.php +++ b/module/project/view/taskdata.html.php @@ -11,7 +11,7 @@ */ ?> - +
@@ -44,7 +44,7 @@ assignedTo == $app->user->account ? 'style=color:red' : ''; ?> - diff --git a/module/release/css/view.css b/module/release/css/view.css index 625f892373..f791e86b18 100644 --- a/module/release/css/view.css +++ b/module/release/css/view.css @@ -4,3 +4,5 @@ .tabs .tab-content{padding:0px; border:0px;} .tabs .tab-content .tab-pane #querybox{margin:0px; border-left:1px solid #ddd; border-right:1px solid #ddd;} .tabs .tab-content .tab-pane #querybox form{padding-left:0px;} + +.table-actions {padding-left: 5px;} diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php index 97d1e7aaf8..c6fd55fd73 100644 --- a/module/release/view/linkbug.html.php +++ b/module/release/view/linkbug.html.php @@ -17,7 +17,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm'; ?>
'> id&browseType=$browseType¶m=$param&type=$type")?>'> -
idAB);?>
+ id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?>
+
@@ -33,8 +33,8 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm'; id,") !== false) continue;?> - @@ -50,7 +50,7 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
 productplan->unlinkedBugs;?>
- status == 'resolved' or $bug->status == 'closed') echo "checked";?> /> + + status == 'resolved' or $bug->status == 'closed') echo "checked";?> /> createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?> bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri)?> "; + echo "
"; echo html::selectButton() . html::submitButton($lang->release->linkBug); echo html::a(inlink('view', "releaseID=$release->id&type=$type"), $lang->goback, '', "class='btn'"); echo '
'; diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php index 59b96cd06e..9a25faa22c 100644 --- a/module/release/view/linkstory.html.php +++ b/module/release/view/linkstory.html.php @@ -13,7 +13,7 @@
id&browseType=$browseType¶m=$param")?>'> - +
@@ -31,7 +31,7 @@ stories},", ",{$story->id},") !== false) continue; ?> - @@ -50,7 +50,7 @@
 productplan->unlinkedStories;?>
+ stage == 'developed' or $story->status == 'closed') echo 'checked';?> /> createLink('story', 'view', "storyID=$story->id"), $story->id);?> "; + echo "
"; echo html::selectButton() . html::submitButton($lang->story->linkStory); echo html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->goback, '', "class='btn'"); echo '
'; diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index b9270b1d99..bc34cb218a 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -78,7 +78,7 @@ id");?>" id='linkedStoriesForm'> - +
@@ -95,9 +95,9 @@ $story):?> createLink('story', 'view', "storyID=$story->id", '', true);?> - @@ -121,7 +121,7 @@
idAB;?>
+ - + id);?>
-
+
release->batchUnlink);?>
release->finishStories, $countStories);?>
@@ -137,7 +137,7 @@ id");?>" id='linkedBugsForm'> - +
@@ -154,9 +154,9 @@ createLink('bug', 'view', "bugID=$bug->id", '', true);?> - @@ -180,7 +180,7 @@
idAB;?>
+ - + id);?>
-
+
release->batchUnlink);?>
release->resolvedBugs, $countBugs);?>
@@ -196,7 +196,7 @@ id&type=leftBug");?>" id='linkedBugsForm'> - +
@@ -212,9 +212,9 @@ createLink('bug', 'view', "bugID=$bug->id", '', true);?> - @@ -237,7 +237,7 @@
idAB;?>
+ - + id);?>
-
+
release->batchUnlink);?> release->createdBugs, $countLeftBugs);?> diff --git a/module/story/view/linkstory.html.php b/module/story/view/linkstory.html.php index 9d77400cf2..9fa77c4cf6 100644 --- a/module/story/view/linkstory.html.php +++ b/module/story/view/linkstory.html.php @@ -21,7 +21,7 @@
- +
@@ -39,7 +39,7 @@ createLink('story', 'view', "storyID=$story2Link->id");?> - diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php index 3c189c45b5..e7f9522f95 100644 --- a/module/story/view/zerocase.html.php +++ b/module/story/view/zerocase.html.php @@ -14,7 +14,7 @@
-
+ id));?>
+
@@ -38,7 +38,7 @@ $canView = common::hasPriv('story', 'view'); ?> - @@ -67,7 +67,7 @@
+ id)); else printf('%03d', $story->id);?>
-
+
thead > tr > th {border-top: 1px solid #ddd;} +.table > thead > tr > th:first-child, +.table > tbody > tr > td:first-child {border-left: 1px solid #ddd} +.table > thead > tr > th:last-child, +.table > tbody > tr > td:last-child {border-right: 1px solid #ddd} +.table tfoot td {border-bottom: none} +.table-actions {float: none; padding: 10px 0 0 0;} +.table-actions .checkbox.btn {padding: 6px 11px;} diff --git a/module/testcase/css/linkcases.css b/module/testcase/css/linkcases.css index f17eaedec1..963893f9a1 100644 --- a/module/testcase/css/linkcases.css +++ b/module/testcase/css/linkcases.css @@ -1 +1,2 @@ #linkCasesForm {min-height: 300px} +.table-actions {padding-left: 0} diff --git a/module/testcase/view/browsedata.html.php b/module/testcase/view/browsedata.html.php index df6347f7b9..3d36b06b6c 100644 --- a/module/testcase/view/browsedata.html.php +++ b/module/testcase/view/browsedata.html.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ ?> - +
@@ -35,7 +35,7 @@ id");?> - diff --git a/module/testcase/view/createbug.html.php b/module/testcase/view/createbug.html.php index 45027ed89b..cb876dc6b9 100644 --- a/module/testcase/view/createbug.html.php +++ b/module/testcase/view/createbug.html.php @@ -12,7 +12,7 @@ ?> ' target='_parent' method='post'> -
idAB);?>
+ id));?>
+
@@ -26,7 +26,7 @@ stepResults as $stepID => $stepResult):?> - @@ -40,9 +40,7 @@ - +
testcase->stepID;?>
+
-
-
diff --git a/module/testcase/view/linkcases.html.php b/module/testcase/view/linkcases.html.php index c2e7b93757..2c22774fc5 100644 --- a/module/testcase/view/linkcases.html.php +++ b/module/testcase/view/linkcases.html.php @@ -22,7 +22,7 @@
- +
@@ -38,7 +38,7 @@ - @@ -53,7 +53,7 @@ -
+ createLink('testcase', 'view', "testcaseID=$case2Link->id"), sprintf('%03d', $case2Link->id));?>
+
diff --git a/module/testtask/view/casesdata.html.php b/module/testtask/view/casesdata.html.php index 6e07ec410b..190686f5e6 100644 --- a/module/testtask/view/casesdata.html.php +++ b/module/testtask/view/casesdata.html.php @@ -11,7 +11,7 @@ */ ?> id&browseType=$browseType¶m=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?> - +
@@ -35,7 +35,7 @@ -
idAB);?>
+ diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php index 95c92a3c24..c748294ade 100644 --- a/module/testtask/view/linkcase.html.php +++ b/module/testtask/view/linkcase.html.php @@ -34,7 +34,7 @@
- +
@@ -52,7 +52,7 @@ - @@ -78,7 +78,7 @@ diff --git a/www/js/my.full.js b/www/js/my.full.js index 8af432d01f..76f724ccf9 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -655,7 +655,24 @@ function setComment() */ function checkTable($table) { - $table = $table || $('.tablesorter:not(.table-datatable)'); + $(document).off('change.checktable').on('change.checktable', '.rows-selector:checkbox', function() + { + var $checkbox = $(this); + var $datatable = $checkbox.closest('.datatable'); + if($datatable.length) { + var $checkAll = $datatable.find('.check-all.check-btn:first').trigger('click'); + $checkbox.prop('checked', $checkAll.hasClass('checked')) + return; + } + var scope = $checkbox.data('scope'); + var $target = scope ? $('#' + scope) : $checkbox.closest('.table'); + var isChecked = $checkbox.prop('checked'); + $target.find('tbody > tr').toggleClass('active', isChecked).find('td :checkbox').prop('checked', isChecked); + }); + + $table = $table || $('.table-selectable'); + + if(!$table.length) return; var checkRow = function(checked) { @@ -679,6 +696,8 @@ function checkTable($table) } }; + var isSelectableTable = $table.hasClass('table-selectable'); + $table.selectable( { selector: 'tbody > tr', @@ -699,6 +718,10 @@ function checkTable($table) }); }, clickBehavior: 'multi', + startDrag: function(e) + { + if(!this.multiKey && isSelectableTable && !$(e.target).closest('.cell-id').length) return false; + }, select: function(e) { checkRow.call(e.target, true); @@ -708,21 +731,6 @@ function checkTable($table) checkRow.call(e.target, false); } }).on('click', 'tbody > tr :checkbox', function(e){checkRow.call(this); e.stopPropagation();}).on('click mousedown mousemove mouseup', 'tbody a,tbody select,tbody input', function(e) {e.stopPropagation();}); - - $(document).off('change.checktable').on('change.checktable', '.rows-selector:checkbox', function() - { - var $checkbox = $(this); - var $datatable = $checkbox.closest('.datatable'); - if($datatable.length) { - var $checkAll = $datatable.find('.check-all.check-btn:first').trigger('click'); - $checkbox.prop('checked', $checkAll.hasClass('checked')) - return; - } - var scope = $checkbox.data('scope'); - var $target = scope ? $('#' + scope) : $checkbox.closest('.table'); - var isChecked = $checkbox.prop('checked'); - $target.find('tbody > tr').toggleClass('active', isChecked).find('td :checkbox').prop('checked', isChecked); - }); } /** @@ -1300,7 +1308,7 @@ function setModal4List(triggerClass, replaceID, callback, width) } catch(err){} - if($list.is('.tablesorter:not(.table-datatable)')) checkTable($list); + if($list.is('.table-selectable:not(.table-datatable)')) checkTable($list); else $list.find('tbody tr:not(.active-disabled) td').click(function(){$(this).closest('tr').toggleClass('active');}); if($.isFunction(callback)) callback(); @@ -1433,7 +1441,7 @@ function fixedTfootAction(formID) if($(formID).find('table:last').find('tfoot').size() == 0) return false; fixTfootInit(); - $(window).scroll(fixTfoot);//Fix table foot when scrolling. + $(window).scroll(fixTfoot).resize(fixTfoot);//Fix table foot when scrolling. $('.side-handle').click(function(){setTimeout(fixTfootInit, 300);});//Fix table foot if module tree is hidden or displayed. var $table, $tfoot, $inputGroup, tableWidth, tableOffset, hasFixed; diff --git a/www/theme/default/style.css b/www/theme/default/style.css index a22e4a7738..bbb64bf87a 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -117,6 +117,7 @@ hr.small {margin: 10px 0} .table caption {padding: 8px 20px; border: 1px solid #DDD; border-bottom: 0; background: #fafafa;} .table.table-condensed caption {padding: 6px 15px;} +.table td.td-has-control {padding: 2px 4px;} /* Datepicker */ .datepicker-wrapper {position: relative; cursor: pointer;} @@ -161,7 +162,9 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c /* priority icons. */ .pri1,.pri0,.pri2,.pri3,.pri4,.pri5,.pri6,.pri{display:inline-block;width: 18px;height: 18px;font-size: 12px;line-height: 14px;font-weight: bold; text-align: center; color: #ccc; -moz-border-radius:50%; -webkit-border-radius:50%; border-radius:50%;border: 2px solid #ccc; font-family: arial, helvetica, clean, sans-serif; background-color: #fff} -.pri:before, .pri0:before{content: '?'} +.pri0 {font-size: 0} +.pri0:before {font-size: 12px} +.pri:before, .pri0:before{content: '?';} .pri1{border-color: #d71319;color: #d71319;} .pri2{border-color: #EA644A;color: #EA644A;} .pri3{border-color: #BD7B46;color: #BD7B46;} @@ -546,8 +549,6 @@ body {color:#141414; padding-bottom: 40px;} .outer .table thead tr th.text-left {text-align: left;} .outer .table tbody td {vertical-align: middle;} .outer .table th {vertical-align: middle;} -.outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 10px} -.outer .table tr > th:last-child, .outer .table tr > td:last-child {padding-right: 10px} .outer .table.table-form tr > th:last-child, .outer .table.table-form tr > td:last-child {padding-right: 5px} .outer .table.table-form.table-fixed tr > th:last-child, .outer .table.table-form.table-fixed tr > td:last-child {padding-right: 15px} .outer .table tbody > tr:last-child td {border-bottom: 1px solid #e5e5e5;} @@ -567,11 +568,14 @@ body {color:#141414; padding-bottom: 40px;} .outer .table tfoot .chosen-container-single .chosen-single abbr {top: 4px;} .table-actions {float: left;} .table-actions > .checkbox {float: left; margin: 0} -.table-actions > .btn-group, .table-actions > .btn, .table-actions > .input-group, .table-actions > .text {float: left; margin-right: 6px;} +.table-actions > .btn-group, .table-actions > .btn, .table-actions > .input-group, .table-actions > .text {float: left; margin-right: 5px;} .table-actions > .text {line-height: 24px; color: #808080} .table-actions > .text strong {color: #333} .outer .table tfoot .pager {margin: -3px 0;} +.table .cell-id {text-align: left; padding-left: 12px!important;} +.datatable .table > tbody > tr > td.check-btn, .datatable .table > thead > tr > th.check-btn {padding-left: 12px!important; padding-right: 0; text-align: left;} + /* color of a when visited */ .outer .table tbody td > a:visited, #crumbs > a:visited, .side > a:visited {color: #551A8B} @@ -598,7 +602,7 @@ body {color:#141414; padding-bottom: 40px;} .outer .main ul.list-unstyled li {padding: 2px 0} .outer .main .table tr > th:first-child, .outer .main .table tr > td:first-child {padding-left: 0;} -.outer .main-side > fieldset {padding: 5px 20px 10px 10px;} +.outer .main-side > fieldset {padding: 5px 0px 10px 10px;} .outer .main-side > fieldset > .table {border: none} .outer .main .tabs {margin-bottom: 15px;} @@ -612,8 +616,9 @@ body {color:#141414; padding-bottom: 40px;} .outer.with-side #featurebar, .outer.with-side #titlebar {margin-bottom: 20px;} .outer.with-side .main, .outer.with-side .side + form, .outer.with-side .main, .outer.with-side .side + table {margin-left: 212px; margin-right: 0;} .outer.with-side.with-transition .main, .outer.with-side.with-transition .side + form, .outer.with-side.with-transition .main, .outer.with-side.with-transition .side + table {transition: all 0.3s;} -.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.with-side .table tr > th:first-child, .outer.with-side .table tr > td:first-child {padding-left: 5px} +.outer.with-side .table tr > th:first-child, .outer.with-side .table tr > td:first-child .table-actions {padding-left: 0;} +.outer.with-side .table tr > th:last-child, .outer.with-side .table tr > td:last-child {padding-right: 5px} .outer .side {width: 192px; position: absolute; left: 20px;} .outer .side-body {overflow: hidden;} .outer .side-body .panel {min-width: 180px;} @@ -645,7 +650,7 @@ body {color:#141414; padding-bottom: 40px;} .pager > .dropdown > a, .pager > i, .pager > a {display: inline-block; position: relative; padding: 5px; min-width: 25px; text-align: center; margin-left: -5px;} .pager .dropdown > a:hover, .pager > a:hover {background: #e5e5e5;} .pager .dropdown-menu {margin-top: 0; width: 212px; margin-left: -5px; padding: 0;} -.pager .dropdown-menu > li {display: block; float: left; width: 70px; border-right: 1px dotted #ddd; border-bottom: 1px dotted #ddd} +.pager .dropdown-menu > li {display: block; float: left; width: 70px; border-right: 1px dotted #ddd; border-bottom: 1px dotted #ddd;} #_pageID, #goto {display: none} /* modal */
 testtask->unlinkedCases;?> (recTotal;?>)
+ createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?>
-
+
show();?>