diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 486cd369a3..5a7252c532 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -97,17 +97,17 @@ product]->type == 'normal') ? "disabled='disabled'" : '';?> - product], $bug->branch, "class='form-control picker-select' $disabled onchange='setBranchRelated(this.value, $bug->product, $bug->id)'");?> + product], $bug->branch, "class='form-control picker-select' data-drop-width='auto' $disabled onchange='setBranchRelated(this.value, $bug->product, $bug->id)'");?> - product][$bug->branch]) ? $modules[$bug->product][$bug->branch] : array(0 => '/'), $bug->module, "class='form-control picker-select'");?> - ' style='overflow:visible'>plan, "class='form-control picker-select'");?> - ' style='overflow:visible'>assignedTo, "class='form-control picker-select'");?> + product][$bug->branch]) ? $modules[$bug->product][$bug->branch] : array(0 => '/'), $bug->module, "class='form-control picker-select' data-drop-width='auto'");?> + ' style='overflow:visible'>plan, "class='form-control picker-select' data-drop-width='auto'");?> + ' style='overflow:visible'>assignedTo, "class='form-control picker-select' data-drop-width='auto'");?> ' style='overflow:visible'>deadline, "class='form-control form-date'");?> >os, 'class=form-control');?> >browser, 'class=form-control');?> >keywords, 'class=form-control');?> - ' style='overflow:visible'>resolvedBy, "class='form-control picker-select'");?> + ' style='overflow:visible'>resolvedBy, "class='form-control picker-select' data-drop-width='auto'");?> > diff --git a/module/execution/model.php b/module/execution/model.php index ed446ba683..58944cf0ab 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -3105,7 +3105,6 @@ class executionModel extends model if($currentTime > time() and !$todayTag) { $todayTag = $i + 1; - break; } if(!isset($sets[$current]) and $mode == 'noempty') diff --git a/module/kanban/css/editspace.css b/module/kanban/css/editspace.css index 392dd9943c..47dd3f8470 100644 --- a/module/kanban/css/editspace.css +++ b/module/kanban/css/editspace.css @@ -1,3 +1,3 @@ #mainContent {padding-left: 0px; height: 500px;} -#contactListMenu_chosen {float: left;} -#teamBox .input-group .input-group-btn {vertical-align: unset;} +#contactListMenu_chosen {vertical-align: unset;} +#teamBox .input-group .input-group-btn {vertical-align: top;} diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index 6fbc6f370a..7123e46208 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -102,7 +102,8 @@ .cardcolor {width:40px; height: 14px; float: left; margin-left: 5px; margin-right: 5px; margin-top: 2px; border-radius: 2px;} #cardcolormenu {padding:2px 2px; width: 100px;} -.position {margin-top: -6px;} +.region-header {margin-top: -6px;} +.region-header > .icon{padding: 6px; margin-left:2px;} .kanban-col[data-type=ADD] {display: none;} .kanban-col[data-type=EMPTY] {display: none;} .kanban-col {padding-right: 0px !important;} diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 078a789114..b38d8d87a3 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -1387,7 +1387,7 @@ $(function() $(this).toggleClass('icon-angle-top icon-angle-down'); $(this).parents('.region').find('.kanban').toggle(); hideKanbanAction(); - resetRegionHeight($(this).hasClass('icon-chevron-double-up') ? 'open' : 'close'); + resetRegionHeight($(this).hasClass('icon-angle-top') ? 'open' : 'close'); }); $('.region-header').on('click', '.action', hideKanbanAction); @@ -1700,6 +1700,7 @@ function resetRegionHeight(fold) { $('.region').css('height', regionHeaderHeight); } + } $(document).on('click', '.dropdown-menu', function() diff --git a/module/kanban/view/view.html.php b/module/kanban/view/view.html.php index 0ebf1e7543..4f9d97519b 100644 --- a/module/kanban/view/view.html.php +++ b/module/kanban/view/view.html.php @@ -57,7 +57,7 @@ $canCreateLane = commonModel::hasPriv('kanban', 'createLane');
- + - - + + source == 'meeting' or $story->source == 'researchreport') { $objects = $story->source == 'meeting' ? $meetings : $researchReports; - $html = html::select("sourceNote[$storyID]", $objects, $story->sourceNote, "class='form-control picker-select' id='sourceNote_$storyID'"); + $html = html::select("sourceNote[$storyID]", $objects, $story->sourceNote, "class='form-control picker-select' data-drop-width='auto' id='sourceNote_$storyID'"); } else { @@ -118,7 +118,7 @@ foreach(explode(',', $showFields) as $field) - + status == 'closed'):?> - - + + @@ -134,9 +134,9 @@ js::set('dittoNotice', $dittoNotice); - - - + + +
'> product]->type == 'normal' ? "disabled='disabled'" : '';?> product]->type == 'normal') $branchTagOption[$story->product] = array();?> - product], $story->branch, "class='form-control picker-select' onchange='loadBranches($story->product, this.value, $storyID);' $disabled");?> + product], $story->branch, "class='form-control picker-select' data-drop-width='auto' onchange='loadBranches($story->product, this.value, $storyID);' $disabled");?> '> - id, array(0 => '/')), $story->module, "class='form-control picker-select'");?> + id, array(0 => '/')), $story->module, "class='form-control picker-select' data-drop-width='auto'");?> '> - product][$story->branch]) ? array('' => '') + $plans[$story->product][$story->branch] : '', $story->plan, "class='form-control picker-select'");?> + product][$story->branch]) ? array('' => '') + $plans[$story->product][$story->branch] : '', $story->plan, "class='form-control picker-select' data-drop-width='auto'");?>
@@ -100,15 +100,15 @@ foreach(explode(',', $showFields) as $field)
>estimate, "class='form-control'"); ?>story->categoryList, $story->category, 'class=form-control picker-select');?>story->categoryList, $story->category, 'class="form-control picker-select" data-drop-width="auto"');?> >pri, 'class=form-control');?>'>assignedTo, "class='form-control picker-select'");?>>source, "class='form-control picker-select' id='source_$storyID'");?>'>assignedTo, "class='form-control picker-select' data-drop-width='auto'");?>>source, "class='form-control picker-select' data-drop-width='auto' id='source_$storyID'");?> ' data-id="sourceNote;?>"> processStatus('story', $story);?> >stage, 'class="form-control"' . ($story->status == 'draft' ? ' disabled="disabled"' : ''));?>'>closedBy, "class='form-control" . ($story->status == 'closed' ? " picker-select'" : "' disabled='disabled'"));?>'>closedBy, "class='form-control" . ($story->status == 'closed' ? " picker-select' data-drop-width='auto'" : "' disabled='disabled'"));?> > diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index 12694d28a3..67e01fe081 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -124,8 +124,8 @@ js::set('dittoNotice', $dittoNotice); ' style='overflow:visible'>module, "class='form-control picker-select'")?>' style='overflow:visible'>assignedTo, "class='form-control picker-select' {$disableAssignedTo}");?>' style='overflow:visible'>module, "class='form-control picker-select' data-drop-width='auto'")?>' style='overflow:visible'>assignedTo, "class='form-control picker-select' data-drop-width='auto' {$disableAssignedTo}");?> type, "class='form-control'");?> >status, "class='form-control' {$disableHour}");?> >estStarted) ? '' : $tasks[$taskID]->estStarted, "class='form-control text-center form-date'");?>>estimate, "class='form-control text-center' {$disableHour}");?> > >left, "class='form-control text-center' {$disableHour}");?>' style='overflow:visible'>finishedBy, "class='form-control picker-select'");?>' style='overflow:visible'>canceledBy, "class='form-control picker-select'");?>' style='overflow:visible'>closedBy, "class='form-control picker-select'");?>' style='overflow:visible'>finishedBy, "class='form-control picker-select' data-drop-width='auto'");?>' style='overflow:visible'>canceledBy, "class='form-control picker-select' data-drop-width='auto'");?>' style='overflow:visible'>closedBy, "class='form-control picker-select' data-drop-width='auto'");?> >