diff --git a/module/block/css/dashboard.css b/module/block/css/dashboard.css index 284e5d4188..bc86f93ece 100644 --- a/module/block/css/dashboard.css +++ b/module/block/css/dashboard.css @@ -3,7 +3,6 @@ #dashboard .panel-actions.nav > li > .btn {padding: 0 5px; line-height: 24px; margin: 3px; color: #3C4353;} #dashboard .panel-actions.nav .icon-more {font-size: 14px;} #dashboard .panel-body {max-height: 400px; overflow: auto;} -#dashboard .panel-actions {padding-top: 7px;} #dashboard .panel-move-handler {position: absolute; top: 0; left: 0; right: 50px; height: 40px; z-index: 10; cursor: move;} #dashboard .panel-heading {cursor: move;} #dashboard .panel.table-scrolled .table-header-fixed {border-bottom: 1px solid #ddd; box-shadow: 0 1px 1px rgba(0,0,0,.05), 0 2px 4px 0 rgba(0,0,0,0.025);} diff --git a/module/bug/js/batchcreate.js b/module/bug/js/batchcreate.js index eb3c063969..91cfc514d4 100644 --- a/module/bug/js/batchcreate.js +++ b/module/bug/js/batchcreate.js @@ -1,8 +1,9 @@ $(function() { - $(".chosenBox select").chosen(defaultChosenOptions); removeDitto();//Remove 'ditto' in first row. - if($('#batchCreateForm table thead tr th.c-title').width() < 150) $('#batchCreateForm table thead tr th.c-title').width(150); + + var $titleCol = $('#batchCreateForm table thead tr th.c-title'); + if($titleCol.width() < 150) $titleCol.width(150); }) /** diff --git a/module/bug/js/common.js b/module/bug/js/common.js index 0dfe01be23..9e565e87a2 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -1,13 +1,14 @@ $(function() { - $('#subNavbar a[data-toggle=dropdown]').parent().addClass('dropdown dropdown-hover'); + var page = window.page || ''; + var flow = window.flow; - if(typeof page == 'undefined') page = ''; + $('#subNavbar a[data-toggle=dropdown]').parent().addClass('dropdown dropdown-hover'); if(page == 'create') { - productID = $('#product').val(); - moduleID = $('#module').val(); - assignedto = $('#assignedTo').val(); + var productID = $('#product').val(); + var moduleID = $('#module').val(); + var assignedto = $('#assignedTo').val(); changeProductConfirmed = true; oldStoryID = $('#story').val() || 0; oldProjectID = 0; @@ -23,7 +24,7 @@ $(function() $("#story, #task, #mailto").chosen(defaultChosenOptions); } - if(flow != 'full') + if(window.flow != 'full') { $('.querybox-toggle').click(function() { diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index 502f6b7b32..d908ec85fa 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -19,7 +19,7 @@
@@ -138,7 +138,7 @@| %s | -' style='overflow:visible'> | +' style='overflow:visible'> | - | ' style='overflow:visible'> | -+ | ' style='overflow:visible'> | +
|
'> | '> | -' style='overflow:visible'> bug->typeList, $type, "class='form-control'");?> | -' style='overflow:visible'> bug->priList, '', "class='form-control'");?> | -' style='overflow:visible'>bug->severityList, '', "class='form-control'");?> | -' style='overflow:visible'> bug->osList, $os, "class='form-control'");?> | -' style='overflow:visible'> bug->browserList, $browser, "class='form-control'");?> | +' style='overflow:visible'> bug->typeList, $type, "class='form-control chosen'");?> | +' style='overflow:visible'> bug->priList, '', "class='form-control chosen'");?> | +' style='overflow:visible'>bug->severityList, '', "class='form-control chosen'");?> | +' style='overflow:visible'> bug->osList, $os, "class='form-control chosen'");?> | +' style='overflow:visible'> bug->browserList, $browser, "class='form-control chosen'");?> | '> |
| %s | -+ |
-
- testcase->colorTag}' data-update-text='#title\\[%s\\]'");?>
- |
+
- testcase->typeList, $type, "class=form-control");?> | -testcase->priList, $pri, "class=form-control");?> | +testcase->typeList, $type, "class='form-control chosen'");?> | +testcase->priList, $pri, "class=form-control chosen");?> | - | testcase->stageList, '', "class='form-control' multiple");?> | +testcase->stageList, '', "class='form-control chosen' multiple");?> |