diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css index 406bc0ef7e..4c51f2e6b5 100644 --- a/module/bug/css/browse.css +++ b/module/bug/css/browse.css @@ -4,3 +4,8 @@ .confirm0 {color:gray; font-size:9px} .confirm1 {color:green; font-size:9px} .red{color:red;} + +.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} diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js index b0d47891e5..4dc58de983 100644 --- a/module/bug/js/browse.js +++ b/module/bug/js/browse.js @@ -3,4 +3,18 @@ $(document).ready(function() $('#' + browseType + 'Tab').addClass('active'); $('#module' + moduleID).addClass('active'); if(browseType == 'bysearch') ajaxGetSearchForm(); + + $('.assign-search').click(function(e) + { + e.stopPropagation(); + return false; + }).on('keyup change paste', 'input', function() + { + var val = $(this).val().toLowerCase(); + $('.assign-menu > .option').each(function() + { + var $option = $(this); + $option.toggleClass('hide', $option.text().toLowerCase().indexOf(val) < 0 && $option.data('key').toLowerCase().indexOf(val) < 0); + }); + }); }); diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 8f8ed62caf..013c9dc5b9 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -226,24 +226,27 @@ js::set('moduleID', $moduleID); } } echo ''; + $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo'); + if($canBatchAssignTo && count($bugs)) + { + $withSearch = count($memberPairs) > 10; + $actionLink = $this->createLink('bug', 'batchAssignTo', "productID={$productID}&type=product"); + echo html::select('assignedTo', $memberPairs, '', 'class="hidden"'); + echo ""; + } ?> - createLink('bug', 'batchAssignTo', "productID={$productID}&type=product"); - echo "
"; - echo html::select('assignedTo', $memberPairs, '', 'class="form-control chosen"'); - echo ""; - echo html::a("javascript:setFormAction(\"$actionLink\")", $lang->bug->assignTo); - echo '
'; - } - } - ?>
show();?>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index dd3279f8c6..e37072f048 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -133,7 +133,7 @@ bug->status;?> - bug->statusList[$bug->status];?> + bug->statusList[$bug->status];?> bug->activatedCount;?> diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php index 99ea76c2ce..0862f2fd2c 100644 --- a/module/build/view/create.html.php +++ b/module/build/view/create.html.php @@ -102,7 +102,7 @@ status == 'resolved' or $bug->status == 'closed') echo "checked";?>> id);?> title, '', "class='preview iframe'");?> - bug->statusList[$bug->status];?> + >bug->statusList[$bug->status];?> status == 'resolved' or $bug->status == 'closed') ? substr($users[$bug->resolvedBy], 2) : html::select('resolvedBy[]', $users, $this->app->user->account, "class='w-70px'");?> diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php index 61d7a76138..e6941f90dc 100644 --- a/module/build/view/edit.html.php +++ b/module/build/view/edit.html.php @@ -96,7 +96,7 @@ bugs . ',', ',' . $bug->id . ',') !== false) echo 'checked';?>> id);?> title, '', "class='preview iframe'");?> - bug->statusList[$bug->status];?> + bug->statusList[$bug->status];?> status == 'resolved' or $bug->status == 'closed') ? substr($users[$bug->resolvedBy], 2) : html::select('resolvedBy[]', $users, $this->app->user->account, "class='w-70px'");?> diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index a578642522..9086197c82 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -101,7 +101,7 @@ id);?> title, '', "class='preview'");?> - bug->statusList[$bug->status];?> + bug->statusList[$bug->status];?> openedBy];?> openedDate, 5, 11)?> resolvedBy];?> diff --git a/module/common/view/datepicker.html.php b/module/common/view/datepicker.html.php index d4c84d08a8..29c949932e 100755 --- a/module/common/view/datepicker.html.php +++ b/module/common/view/datepicker.html.php @@ -15,6 +15,11 @@ $(function() return $(this).each(function() { var $this = $(this); + if($this.offset().top + 200 > $(document.body).height()) + { + $this.attr('data-picker-position', 'top-right'); + } + if($this.val() == '0000-00-00') { $this.focus(function(){if($this.val() == '0000-00-00') $this.val('')}).blur(function(){if($this.val() == '') $this.val('0000-00-00')}); diff --git a/module/my/view/blockprojects.html.php b/module/my/view/blockprojects.html.php index 3acbed4e58..091b83c3f9 100644 --- a/module/my/view/blockprojects.html.php +++ b/module/my/view/blockprojects.html.php @@ -25,7 +25,7 @@ createLink('project', 'task', 'project=' . $project->id), $project->name, '', "title=$project->name");?> end;?> - project->statusList[$project->status];?> + project->statusList[$project->status];?> hours->totalEstimate;?> hours->totalConsumed;?> hours->totalLeft;?> diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index 69adbd94ec..d4d7f926b9 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -45,7 +45,7 @@ build == 'trunk' ? print('Trunk') : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?> begin?> end?> - testtask->statusList[$task->status];?> + testtask->statusList[$task->status];?> id", 'play', 'list', 'smile'); diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index 1f36d5afb3..a5fbe2a599 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -83,7 +83,7 @@ product->status;?> - product->statusList[$product->status];?> + product->statusList[$product->status];?> product->acl;?> diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 046ce37501..cb891b6175 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -51,7 +51,7 @@ createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?> assignedTo];?> - bug->statusList[$bug->status];?> + bug->statusList[$bug->status];?> @@ -93,7 +93,7 @@ createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?> assignedTo];?> - bug->statusList[$bug->status];?> + bug->statusList[$bug->status];?> openedBy];?> assignedTo];?> estimate;?> - story->statusList[$story->status];?> + story->statusList[$story->status];?> story->stageList[$story->stage];?> @@ -98,7 +98,7 @@ openedBy];?> assignedTo];?> estimate;?> - story->statusList[$story->status];?> + story->statusList[$story->status];?> story->stageList[$story->stage];?> openedBy];?> assignedTo];?> estimate;?> - story->statusList[$story->status];?> + story->statusList[$story->status];?> story->stageList[$story->stage];?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?> assignedTo];?> - bug->statusList[$bug->status];?> + bug->statusList[$bug->status];?> '; bug->severityList, $bug->severity, $bug->severity)?>'>bug->severityList, $bug->severity, $bug->severity)?> bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> id", $bug->title, '', "class='preview'", true, true);?> - bug->statusList[$bug->status];?> + 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"');?> diff --git a/module/release/view/ajaxgetstoriesandbugs.html.php b/module/release/view/ajaxgetstoriesandbugs.html.php index e3cd282504..7d3772b4c0 100644 --- a/module/release/view/ajaxgetstoriesandbugs.html.php +++ b/module/release/view/ajaxgetstoriesandbugs.html.php @@ -18,7 +18,7 @@ stage == 'developed' or $story->status == 'closed') echo 'checked';?>> id);?> title, '', "class='preview'");?> - story->statusList[$story->status];?> + story->statusList[$story->status];?> story->stageList[$story->stage];?> @@ -43,7 +43,7 @@ status == 'closed' or $bug->status == 'resolved') echo "checked"; ?>> id);?> title, '', "class='preview'");?> - bug->statusList[$bug->status];?> + bug->statusList[$bug->status];?> diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 59c0a8c77a..707da7b98f 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -139,7 +139,7 @@ id);?> title, '', "class='preview'");?> - bug->statusList[$bug->status];?> + bug->statusList[$bug->status];?> openedBy];?> openedDate, 5, 11)?> resolvedBy];?> diff --git a/module/story/view/affected.html.php b/module/story/view/affected.html.php index da271c5444..331ef30788 100644 --- a/module/story/view/affected.html.php +++ b/module/story/view/affected.html.php @@ -26,7 +26,7 @@ id;?> createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?> assignedTo];?> - task->statusList[$task->status];?> + task->statusList[$task->status];?> consumed;?> left;?> @@ -54,7 +54,7 @@ id;?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank');?> - bug->statusList[$bug->status];?> + bug->statusList[$bug->status];?> openedBy];?> resolvedBy];?> bug->resolutionList[$bug->resolution];?> @@ -80,7 +80,7 @@ id;?> createLink('testcase', 'view', "caseID=$case->id"), $case->title, '_blank');?> - testcase->statusList[$case->status];?> + testcase->statusList[$case->status];?> openedBy];?> lastEditedBy];?> diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 3196a24ae0..67757eb9e5 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -138,7 +138,7 @@ story->status;?> - story->statusList[$story->status];?> + story->statusList[$story->status];?> story->stage;?> diff --git a/module/task/css/recordestimate.css b/module/task/css/recordestimate.css index 6670fd79cc..e69de29bb2 100644 --- a/module/task/css/recordestimate.css +++ b/module/task/css/recordestimate.css @@ -1 +0,0 @@ -body {padding-bottom: 140px !important;} diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php index a25d342f7c..53a8ecbf06 100644 --- a/module/testtask/view/linkcase.html.php +++ b/module/testtask/view/linkcase.html.php @@ -70,7 +70,7 @@ testcase->typeList[$case->type];?> openedBy];?> - testcase->statusList[$case->status];?> + testcase->statusList[$case->status];?> diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php index f4df241a10..02056dea76 100644 --- a/module/testtask/view/view.html.php +++ b/module/testtask/view/view.html.php @@ -97,7 +97,7 @@ testtask->status;?> - testtask->statusList[$task->status];?> + testtask->statusList[$task->status];?> diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index 254b53e017..12955dd51e 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -46,7 +46,7 @@ todo->status;?> - todo->statusList[$todo->status];?> + todo->statusList[$todo->status];?> todo->type;?> diff --git a/module/user/view/project.html.php b/module/user/view/project.html.php index 84e57ffb06..30f7cc02b8 100644 --- a/module/user/view/project.html.php +++ b/module/user/view/project.html.php @@ -36,7 +36,7 @@ name);?> begin;?> end;?> - project->statusList[$project->status];?> + project->statusList[$project->status];?> role;?> join;?> hours;?> diff --git a/module/user/view/testtask.html.php b/module/user/view/testtask.html.php index ddc39cc762..751abdfdae 100755 --- a/module/user/view/testtask.html.php +++ b/module/user/view/testtask.html.php @@ -43,7 +43,7 @@ build == 'trunk' ? print('Trunk') : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?> begin?> end?> - testtask->statusList[$task->status];?> + testtask->statusList[$task->status];?> diff --git a/www/js/jquery/chosen/min.css b/www/js/jquery/chosen/min.css index 186840b332..7c5ecd6d8b 100644 --- a/www/js/jquery/chosen/min.css +++ b/www/js/jquery/chosen/min.css @@ -1,6 +1,6 @@ /*! - * ZUI - v1.2.0 - 2014-11-18 + * ZUI - v1.2.0 - 2014-11-25 * http://zui.sexy * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2014 cnezsoft.com; Licensed MIT - */.chosen-container{position:relative;display:inline-block;font-size:13px;vertical-align:middle;zoom:1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;*display:inline}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:#fff;border:1px solid #cbcbcb;border:1px solid rgba(0,0,0,.15);border-top:0;-webkit-box-shadow:0 4px 5px rgba(0,0,0,.15);box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container .chosen-drop.chosen-drop-size-limited{border-top:1px solid rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container-single .chosen-single{display:block;width:100%;height:32px;padding:5px 8px;overflow:hidden;line-height:1.53846154;color:#222;text-decoration:none;white-space:nowrap;vertical-align:middle;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.chosen-container-single .chosen-default{color:gray}.chosen-container-single .chosen-single>span{display:block;margin-right:26px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:7px;right:24px;display:block;width:19.5px;height:19.5px;font-size:19.5px;font-weight:700;line-height:19.5px;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.chosen-container-single .chosen-single abbr:before{content:'×'}.chosen-container-single .chosen-single abbr:hover,.chosen-container-single .chosen-single abbr:focus{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;height:100%;padding:5px 8px}.chosen-container-single .chosen-single div b{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #333;border-right:4px solid transparent;border-bottom:0 dotted;border-left:4px solid transparent}.chosen-container-single .chosen-search{position:relative;z-index:1010;padding:3px 4px;margin:0;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{width:100%;height:auto;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:2px 26px 2px 8px;margin:1px 0;font-size:12px;line-height:1.5;background-color:#fff;border:1px solid #ccc;border-radius:4px;outline:0}.chosen-container-single .chosen-search input[type=text]:focus{border-color:#145ccd}.chosen-container-single .chosen-search:before{position:absolute;top:8px;right:10px;display:block;font-family:ZenIcon;color:gray;content:"\e603"}.chosen-container-single .chosen-drop{margin-top:-1px;-webkit-background-clip:padding-box;background-clip:padding-box;border-radius:0 0 4px 4px}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{position:relative;max-height:240px;padding:0;margin:0;overflow-x:hidden;overflow-y:auto;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;padding:5px 10px;margin:0;line-height:15px;list-style:none;-webkit-transition:background-color .3s cubic-bezier(.175,.885,.32,1);-o-transition:background-color .3s cubic-bezier(.175,.885,.32,1);transition:background-color .3s cubic-bezier(.175,.885,.32,1);-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{color:#fff;background-color:#3280fc}.chosen-container .chosen-results li.no-results{display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;width:100%;min-height:32px;min-height:30px \0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin:0;overflow:hidden;cursor:text;background-color:#fff;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.chosen-container-multi .chosen-choices:before,.chosen-container-multi .chosen-choices:after{display:table;content:" "}.chosen-container-multi .chosen-choices:after{clear:both}.chosen-container-multi .chosen-choices li{display:block;float:left;padding:0 6px;margin:5px 0 0 6px;list-style:none}.chosen-container-multi .chosen-choices li.search-field{padding:0;margin-bottom:4px;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{height:20px;font-size:100%;color:gray;background:transparent!important;border:0!important;border-radius:0;outline:0;-webkit-box-shadow:none;box-shadow:none}.chosen-container-multi .chosen-choices li.search-field .default{color:#999}.chosen-container-multi .chosen-choices li.search-choice{position:relative;padding:3px 20px 3px 5px;line-height:12px;cursor:default;background-color:#f1f1f1;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ddd;border-radius:3px;-webkit-box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);-webkit-transition:all .5s cubic-bezier(.175,.885,.32,1);-o-transition:all .5s cubic-bezier(.175,.885,.32,1);transition:all .5s cubic-bezier(.175,.885,.32,1)}.chosen-container-multi .chosen-choices li.search-choice:hover{background-color:#fff;border-color:#c4c4c4;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 0 rgba(0,0,0,.1)}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:-1px;right:0;display:block;width:19.5px;height:19.5px;font-size:15.6px;font-weight:700;line-height:19.5px;color:#000;text-align:center;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{content:'×'}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover,.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:focus{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;color:#666;background-color:#e4e4e4;border:1px solid #ccc}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{padding:0;margin:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border-color:#145ccd;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(20,92,205,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(20,92,205,.6)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #cbcbcb;border:1px solid rgba(0,0,0,.15);border-bottom-right-radius:0;border-bottom-left-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.chosen-container-active.chosen-with-drop .chosen-single div{background:0 0;border-left:none}.chosen-container-active.chosen-with-drop .chosen-single div b{content:"";border-top:0 dotted;border-bottom:4px solid #333}.chosen-container-active .chosen-choices{border-color:#145ccd;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(20,92,205,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(20,92,205,.6)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#111!important}.chosen-disabled{cursor:default;opacity:.5!important}.chosen-disabled .chosen-single{cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default} \ No newline at end of file + */.chosen-container{position:relative;display:inline-block;font-size:14px;vertical-align:middle;zoom:1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;*display:inline}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:#fff;border:1px solid #cbcbcb;border:1px solid rgba(0,0,0,.15);border-top:0;-webkit-box-shadow:0 4px 5px rgba(0,0,0,.15);box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container .chosen-drop.chosen-drop-size-limited{border-top:1px solid rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container-single .chosen-single{display:block;width:100%;height:34px;padding:6px 10px;overflow:hidden;line-height:1.42857143;color:#222;text-decoration:none;white-space:nowrap;vertical-align:middle;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border-radius:2px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.chosen-container-single .chosen-default{color:gray}.chosen-container-single .chosen-single>span{display:block;margin-right:26px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:7px;right:24px;display:block;width:21px;height:21px;font-size:21px;font-weight:700;line-height:21px;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.chosen-container-single .chosen-single abbr:before{content:'×'}.chosen-container-single .chosen-single abbr:hover,.chosen-container-single .chosen-single abbr:focus{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;height:100%;padding:6px 10px}.chosen-container-single .chosen-single div b{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #141414;border-right:4px solid transparent;border-bottom:0 dotted;border-left:4px solid transparent}.chosen-container-single .chosen-search{position:relative;z-index:1010;padding:3px 4px;margin:0;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{width:100%;height:auto;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:5px 26px 5px 10px;margin:1px 0;font-size:12px;line-height:1.5;background-color:#fff;border:1px solid #ccc;border-radius:2px;outline:0}.chosen-container-single .chosen-search input[type=text]:focus{border-color:#4d90fe}.chosen-container-single .chosen-search:before{position:absolute;top:8px;right:10px;display:block;font-family:ZenIcon;color:gray;content:"\e603"}.chosen-container-single .chosen-drop{margin-top:-1px;-webkit-background-clip:padding-box;background-clip:padding-box;border-radius:0 0 2px 2px}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{position:relative;max-height:240px;padding:0;margin:0;overflow-x:hidden;overflow-y:auto;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;padding:5px 10px;margin:0;line-height:15px;list-style:none;-webkit-transition:background-color .3s cubic-bezier(.175,.885,.32,1);-o-transition:background-color .3s cubic-bezier(.175,.885,.32,1);transition:background-color .3s cubic-bezier(.175,.885,.32,1);-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{color:#1a4f85;background-color:#ddd}.chosen-container .chosen-results li.no-results{display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;width:100%;min-height:34px;min-height:32px \0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin:0;overflow:hidden;cursor:text;background-color:#fff;border:1px solid #ccc;border-radius:2px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.chosen-container-multi .chosen-choices:before,.chosen-container-multi .chosen-choices:after{display:table;content:" "}.chosen-container-multi .chosen-choices:after{clear:both}.chosen-container-multi .chosen-choices li{display:block;float:left;padding:0 6px;margin:5px 0 0 6px;list-style:none}.chosen-container-multi .chosen-choices li.search-field{padding:0;margin-bottom:4px;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{height:20px;font-size:100%;color:gray;background:transparent!important;border:0!important;border-radius:0;outline:0;-webkit-box-shadow:none;box-shadow:none}.chosen-container-multi .chosen-choices li.search-field .default{color:#999}.chosen-container-multi .chosen-choices li.search-choice{position:relative;padding:3px 20px 3px 5px;line-height:12px;cursor:default;background-color:#f1f1f1;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ddd;border-radius:0;-webkit-box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);-webkit-transition:all .5s cubic-bezier(.175,.885,.32,1);-o-transition:all .5s cubic-bezier(.175,.885,.32,1);transition:all .5s cubic-bezier(.175,.885,.32,1)}.chosen-container-multi .chosen-choices li.search-choice:hover{background-color:#fff;border-color:#c4c4c4;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 0 rgba(0,0,0,.1)}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:-1px;right:0;display:block;width:21px;height:21px;font-size:16.8px;font-weight:700;line-height:21px;color:#000;text-align:center;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{content:'×'}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover,.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:focus{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;color:#666;background-color:#e4e4e4;border:1px solid #ccc}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{padding:0;margin:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border-color:#4d90fe;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(77,144,254,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(77,144,254,.6)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #cbcbcb;border:1px solid rgba(0,0,0,.15);border-bottom-right-radius:0;border-bottom-left-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.chosen-container-active.chosen-with-drop .chosen-single div{background:0 0;border-left:none}.chosen-container-active.chosen-with-drop .chosen-single div b{content:"";border-top:0 dotted;border-bottom:4px solid #141414}.chosen-container-active .chosen-choices{border-color:#4d90fe;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(77,144,254,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(77,144,254,.6)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#111!important}.chosen-disabled{cursor:default;opacity:.5!important}.chosen-disabled .chosen-single{cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default} \ No newline at end of file diff --git a/www/js/jquery/chosen/min.js b/www/js/jquery/chosen/min.js index b0633f5b69..be1a6f89a3 100644 --- a/www/js/jquery/chosen/min.js +++ b/www/js/jquery/chosen/min.js @@ -1,5 +1,5 @@ /*! - * ZUI - v1.2.0 - 2014-11-18 + * ZUI - v1.2.0 - 2014-11-25 * http://zui.sexy * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2014 cnezsoft.com; Licensed MIT diff --git a/www/theme/default/style.css b/www/theme/default/style.css index acce9c69c0..7af3dc41e3 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -443,6 +443,14 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} .outer > .alert {border: none; margin: 0} .outer > .alert + #featurebar {border-top: 1px solid #ddd;} +#featurebar .nav > li > .chosen-container-single {top: -2px;} +#featurebar .nav > li .chosen-drop {font-size: 13px} +#featurebar .nav > li .chosen-single {height: 30px; padding: 3px 10px;} +#featurebar .nav > li .chosen-single abbr {top: 4px;} +#featurebar .nav > li .chosen-single div {top: -2px;} +#featurebar .nav > li.active .chosen-single {border-color: #009900} +#featurebar .nav > li.active > .chosen-container-single.chosen-with-drop .chosen-single {border-color: #ddd} + /* sub featurebar */ .sub-featurebar {border-bottom: 1px solid #ddd; padding: 5px 10px; margin: -20px -20px 20px;} .sub-featurebar > .nav > li {float: left;}