diff --git a/module/block/control.php b/module/block/control.php index 04298fd39c..30d6d87727 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -337,7 +337,7 @@ class block extends control } elseif($block->block == 'assigntome') { - $html = $this->fetch('block', 'printAssignToMeBlock'); + $html = $this->fetch('block', 'printAssignToMeBlock', 'longBlock=' . $this->block->isLongBlock($block)); } elseif($block->block == 'welcome') { @@ -701,7 +701,7 @@ class block extends control * @access public * @return void */ - public function printAssignToMeBlock() + public function printAssignToMeBlock($longBlock = true) { if(common::hasPriv('todo', 'view')) $hasViewPriv['todo'] = true; if(common::hasPriv('story', 'view')) $hasViewPriv['story'] = true; @@ -771,6 +771,7 @@ class block extends control } $this->view->hasViewPriv = $hasViewPriv; + $this->view->longBlock = $longBlock; $this->display(); } diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php index f26d5859bc..9c96a60894 100644 --- a/module/block/view/bugblock.html.php +++ b/module/block/view/bugblock.html.php @@ -11,16 +11,16 @@ */ ?>
- +
'> + - + - - - - + + + @@ -29,16 +29,16 @@ $viewLink = $this->createLink('bug', 'view', "bugID={$bug->id}"); ?> > + - + - - - - + + diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php index 69fde24086..f2bb6ae47d 100644 --- a/module/block/view/buildblock.html.php +++ b/module/block/view/buildblock.html.php @@ -10,25 +10,27 @@ * @link http://www.ranzhi.org */ ?> -
idAB?> idAB?>priAB?> priAB?> bug->title;?>bug->severityAB?>'>bug->statusAB;?>bug->severityAB?>bug->title;?>bug->statusAB;?>
id;?> id;?>bug->priList, $bug->pri, $bug->pri)?> bug->priList, $bug->pri, $bug->pri)?>title?>bug->severityList, $bug->severity, $bug->severity)?> - + title?> + - bug->statusList, $bug->status);?> + bug->statusList, $bug->status);?>
+
- - - - - - + + + + + + - - get->entry}'" : ''; - $viewLink = $this->createLink('build', 'view', "buildID={$build->id}"); - ?> - > - - - - - - + + + get->entry}'" : ''; + $viewLink = $this->createLink('build', 'view', "buildID={$build->id}"); + ?> + > + + + + + + +
idAB?> build->product;?> build->name;?>build->date;?>
idAB?> build->product;?> build->name;?>build->date;?>
id;?>productName?>name?>date?>
id;?>productName?>name?>date?>
diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 8344b7416e..8d472a632b 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -24,7 +24,7 @@ $useGuest = $this->app->user->account == 'guest'; block->closed) and strpos(",{$config->block->closed},", ",{$block->source}|{$block->block},") !== false) continue;?>
-
block == 'list') ? 'todoes' : $block->block;?> params->color)) echo 'panel-' . $block->params->color;?>' id='blockid?>' data-id='id?>' data-name='title?>'> +
params->color;?>' id='blockid?>' data-id='id?>' data-name='title?>'> block != 'welcome' and $block->block != 'flowchart');?>
@@ -64,7 +64,7 @@ $useGuest = $this->app->user->account == 'guest'; block->closed) and strpos(",{$config->block->closed},", ",{$block->source}|{$block->block},") !== false) continue;?>
-
block == 'list') ? 'todoes' : $block->block;?> params->color)) echo 'panel-' . $block->params->color;?>' id='blockid?>' data-id='id?>' data-name='title?>'> +
params->color;?>' id='blockid?>' data-id='id?>' data-name='title?>'> block != 'welcome' and $block->block != 'flowchart');?>
diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php index b2eb2e59a9..3e8661b5e4 100644 --- a/module/block/view/productblock.html.php +++ b/module/block/view/productblock.html.php @@ -11,50 +11,34 @@ */ ?>
- +
- - - - - + + + + - + - - - - - - - - - + + get->entry}'" : "class='text-center'"; + $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : ""; $viewLink = $this->createLink('product', 'browse', 'productID=' . $product->id); ?> > - - - - + + + - + - - - - - - - - - + + diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index 06c7a580eb..f6b6638315 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -11,20 +11,20 @@ */ ?>
-
product->name;?>story->statusList['changed'];?>
product->name;?>product->plans;?>product->releases;?> product->plans;?>product->currentProject;?> product->releases;?>product->currentProject;?>story->statusList['active'];?>product->bugs;?>bug->unResolved;?>story->statusList['active'];?>bug->unResolved;?>
name?>stories['changed']?>name?>plans?>releases?> plans?>id, '');?> releases?>id, '');?>stories['active']?>bugs?>unResolved?>stories['active']?>unResolved?>
+
'> - - - - - - - - - - - - + + + + + + + + + + + + > - story->priList, $story->pri, $story->pri);?> + story->priList, $story->pri, $story->pri);?> - + - - + diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index 0392fa15a2..0f7c27649d 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -11,19 +11,17 @@ */ ?>
-
idAB?>priAB?>story->title;?>story->estimateAB;?>statusAB;?>story->stageAB;?>
idAB?>priAB?>story->title;?>story->estimateAB;?>statusAB;?>story->stageAB;?>
id;?> title?> estimate?>estimate?> - story->statusList, $story->status);?> + + + story->statusList, $story->status);?> + story->stageList, $story->stage, $story->stage);?> + + story->stageList, $story->stage, $story->stage);?> + +
+
'> + + + - + + - - - - - - - + @@ -32,19 +30,17 @@ $viewLink = $this->createLink('task', 'view', "taskID={$task->id}"); ?> > + + + - + + - - - - - - - diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 7badbae89e..8083b5dc71 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -10,45 +10,47 @@ * @link http://www.ranzhi.org */ ?> -
-
-
-
-
-
todo->lblClickCreate;?>
-
+
+
+
+
+
+
+
todo->lblClickCreate;?>
+
+
+
- +
- diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index d5dddb1b11..876534ad60 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -48,7 +48,7 @@
- + diff --git a/www/js/zui/min.js b/www/js/zui/min.js index ece6c25b85..9ab1587467 100644 --- a/www/js/zui/min.js +++ b/www/js/zui/min.js @@ -1,5 +1,5 @@ /*! - * ZUI: Zentao template - v1.8.1 - 2018-01-22 + * ZUI: Zentao template - v1.8.1 - 2018-01-30 * http://zui.sexy * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2018 cnezsoft.com; Licensed MIT @@ -9013,6 +9013,1717 @@ /// ----- ZUI change end ----- +/* ======================================================================== + * Datetimepicker: bootstrap-datetimepicker.js + * http://www.malot.fr/bootstrap-datetimepicker + * + * ZUI: The file has been changed in ZUI. It will not keep update with the + * official version in the future. + * http://zui.sexy + * ======================================================================== + * Copyright 2012 Stefan Petre + * Improvements by Andrew Rowls + * Improvements by Sébastien Malot + * Improvements by Yun Lai + * Improvement by CuGBabyBeaR @ 2013-09-12 + * Project URL : http://www.malot.fr/bootstrap-datetimepicker + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== + * Improvement in ZUI: + * 1. Determine client language and apply setting automatically. + * 2. New option for 'pickerPosition': + * - 'auto-left'; + * - 'auto-right'. + * ======================================================================== */ + + +/*! + * Datetimepicker for Bootstrap + * Copyright 2012 Stefan Petre + * Licensed under the Apache License v2.0 + */ + +! function($) { + + function UTCDate() { + return new Date(Date.UTC.apply(Date, arguments)); + } + + function UTCToday() { + var today = new Date(); + return UTCDate(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate(), today.getUTCHours(), today.getUTCMinutes(), today.getUTCSeconds(), 0); + } + + // Picker object + + var Datetimepicker = function(element, options) { + var that = this; + + this.element = $(element); + + this.language = (options.language || this.element.data('date-language') || ($.zui && $.zui.clientLang ? $.zui.clientLang().replace('_', '-') : "zh-cn")).toLowerCase(); + this.language = this.language in dates ? this.language : "en"; + this.isRTL = dates[this.language].rtl || false; + this.formatType = options.formatType || this.element.data('format-type') || 'standard'; + this.format = DPGlobal.parseFormat(options.format || this.element.data('date-format') || dates[this.language].format || DPGlobal.getDefaultFormat(this.formatType, 'input'), this.formatType); + this.isInline = false; + this.isVisible = false; + this.isInput = this.element.is('input'); + + this.component = this.element.is('.date') ? this.element.find('.input-group-addon .icon-th, .input-group-addon .icon-time, .input-group-addon .icon-calendar').parent() : false; + this.componentReset = this.element.is('.date') ? this.element.find('.input-group-addon .icon-remove').parent() : false; + this.hasInput = this.component && this.element.find('input').length; + if(this.component && this.component.length === 0) { + this.component = false; + } + this.linkField = options.linkField || this.element.data('link-field') || false; + this.linkFormat = DPGlobal.parseFormat(options.linkFormat || this.element.data('link-format') || DPGlobal.getDefaultFormat(this.formatType, 'link'), this.formatType); + this.minuteStep = options.minuteStep || this.element.data('minute-step') || 5; + this.pickerPosition = options.pickerPosition || this.element.data('picker-position') || 'bottom-right'; + this.showMeridian = options.showMeridian || this.element.data('show-meridian') || false; + this.initialDate = options.initialDate || new Date(); + this.pickerClass = options.eleClass; + this.pickerId = options.eleId; + + this._attachEvents(); + + this.formatViewType = "datetime"; + if('formatViewType' in options) { + this.formatViewType = options.formatViewType; + } else if('formatViewType' in this.element.data()) { + this.formatViewType = this.element.data('formatViewType'); + } + + this.minView = 0; + if('minView' in options) { + this.minView = options.minView; + } else if('minView' in this.element.data()) { + this.minView = this.element.data('min-view'); + } + this.minView = DPGlobal.convertViewMode(this.minView); + + this.maxView = DPGlobal.modes.length - 1; + if('maxView' in options) { + this.maxView = options.maxView; + } else if('maxView' in this.element.data()) { + this.maxView = this.element.data('max-view'); + } + this.maxView = DPGlobal.convertViewMode(this.maxView); + + this.wheelViewModeNavigation = false; + if('wheelViewModeNavigation' in options) { + this.wheelViewModeNavigation = options.wheelViewModeNavigation; + } else if('wheelViewModeNavigation' in this.element.data()) { + this.wheelViewModeNavigation = this.element.data('view-mode-wheel-navigation'); + } + + this.wheelViewModeNavigationInverseDirection = false; + + if('wheelViewModeNavigationInverseDirection' in options) { + this.wheelViewModeNavigationInverseDirection = options.wheelViewModeNavigationInverseDirection; + } else if('wheelViewModeNavigationInverseDirection' in this.element.data()) { + this.wheelViewModeNavigationInverseDirection = this.element.data('view-mode-wheel-navigation-inverse-dir'); + } + + this.wheelViewModeNavigationDelay = 100; + if('wheelViewModeNavigationDelay' in options) { + this.wheelViewModeNavigationDelay = options.wheelViewModeNavigationDelay; + } else if('wheelViewModeNavigationDelay' in this.element.data()) { + this.wheelViewModeNavigationDelay = this.element.data('view-mode-wheel-navigation-delay'); + } + + this.startViewMode = 2; + if('startView' in options) { + this.startViewMode = options.startView; + } else if('startView' in this.element.data()) { + this.startViewMode = this.element.data('start-view'); + } + this.startViewMode = DPGlobal.convertViewMode(this.startViewMode); + this.viewMode = this.startViewMode; + + this.viewSelect = this.minView; + if('viewSelect' in options) { + this.viewSelect = options.viewSelect; + } else if('viewSelect' in this.element.data()) { + this.viewSelect = this.element.data('view-select'); + } + this.viewSelect = DPGlobal.convertViewMode(this.viewSelect); + + this.forceParse = true; + if('forceParse' in options) { + this.forceParse = options.forceParse; + } else if('dateForceParse' in this.element.data()) { + this.forceParse = this.element.data('date-force-parse'); + } + + this.picker = $(DPGlobal.template) + .appendTo(this.isInline ? this.element : 'body') + .on({ + click: $.proxy(this.click, this), + mousedown: $.proxy(this.mousedown, this) + }); + + if(this.wheelViewModeNavigation) { + if($.fn.mousewheel) { + this.picker.on({ + mousewheel: $.proxy(this.mousewheel, this) + }); + } else { + console.log("Mouse Wheel event is not supported. Please include the jQuery Mouse Wheel plugin before enabling this option"); + } + } + + if(this.isInline) { + this.picker.addClass('datetimepicker-inline'); + } else { + this.picker.addClass('datetimepicker-dropdown-' + this.pickerPosition + ' dropdown-menu'); + } + if(this.isRTL) { + this.picker.addClass('datetimepicker-rtl'); + this.picker.find('.prev span, .next span') + .toggleClass('icon-arrow-left icon-arrow-right');; + + } + $(document).on('mousedown', function(e) { + // Clicked outside the datetimepicker, hide it + if($(e.target).closest('.datetimepicker').length === 0) { + that.hide(); + } + }); + + this.autoclose = false; + if('autoclose' in options) { + this.autoclose = options.autoclose; + } else if('dateAutoclose' in this.element.data()) { + this.autoclose = this.element.data('date-autoclose'); + } + + this.keyboardNavigation = true; + if('keyboardNavigation' in options) { + this.keyboardNavigation = options.keyboardNavigation; + } else if('dateKeyboardNavigation' in this.element.data()) { + this.keyboardNavigation = this.element.data('date-keyboard-navigation'); + } + + this.todayBtn = (options.todayBtn || this.element.data('date-today-btn') || false); + this.todayHighlight = (options.todayHighlight || this.element.data('date-today-highlight') || false); + + this.weekStart = ((options.weekStart || this.element.data('date-weekstart') || dates[this.language].weekStart || 0) % 7); + this.weekEnd = ((this.weekStart + 6) % 7); + this.startDate = -Infinity; + this.endDate = Infinity; + this.daysOfWeekDisabled = []; + this.setStartDate(options.startDate || this.element.data('date-startdate')); + this.setEndDate(options.endDate || this.element.data('date-enddate')); + this.setDaysOfWeekDisabled(options.daysOfWeekDisabled || this.element.data('date-days-of-week-disabled')); + this.fillDow(); + this.fillMonths(); + this.update(); + this.showMode(); + + if(this.isInline) { + this.show(); + } + }; + + Datetimepicker.prototype = { + constructor: Datetimepicker, + + _events: [], + _attachEvents: function() { + this._detachEvents(); + if(this.isInput) { // single input + this._events = [ + [this.element, { + focus: $.proxy(this.show, this), + keyup: $.proxy(this.update, this), + keydown: $.proxy(this.keydown, this) + }] + ]; + } else if(this.component && this.hasInput) { // component: input + button + this._events = [ + // For components that are not readonly, allow keyboard nav + [this.element.find('input'), { + focus: $.proxy(this.show, this), + keyup: $.proxy(this.update, this), + keydown: $.proxy(this.keydown, this) + }], + [this.component, { + click: $.proxy(this.show, this) + }] + ]; + if(this.componentReset) { + this._events.push([ + this.componentReset, { + click: $.proxy(this.reset, this) + } + ]); + } + } else if(this.element.is('div')) { // inline datetimepicker + this.isInline = true; + } else { + this._events = [ + [this.element, { + click: $.proxy(this.show, this) + }] + ]; + } + for(var i = 0, el, ev; i < this._events.length; i++) { + el = this._events[i][0]; + ev = this._events[i][1]; + el.on(ev); + } + }, + + _detachEvents: function() { + for(var i = 0, el, ev; i < this._events.length; i++) { + el = this._events[i][0]; + ev = this._events[i][1]; + el.off(ev); + } + this._events = []; + }, + + show: function(e) { + this.picker.show(); + this.height = this.component ? this.component.outerHeight() : this.element.outerHeight(); + if(this.forceParse) { + this.update(); + } + this.place(); + $(window).on('resize', $.proxy(this.place, this)); + if(e) { + e.stopPropagation(); + e.preventDefault(); + } + this.isVisible = true; + this.element.trigger({ + type: 'show', + date: this.date + }); + }, + + hide: function(e) { + if(!this.isVisible) return; + if(this.isInline) return; + this.picker.hide(); + $(window).off('resize', this.place); + this.viewMode = this.startViewMode; + this.showMode(); + if(!this.isInput) { + $(document).off('mousedown', this.hide); + } + + if( + this.forceParse && + ( + this.isInput && this.element.val() || + this.hasInput && this.element.find('input').val() + ) + ) + this.setValue(); + this.isVisible = false; + this.element.trigger({ + type: 'hide', + date: this.date + }); + }, + + remove: function() { + this._detachEvents(); + this.picker.remove(); + delete this.picker; + delete this.element.data().datetimepicker; + }, + + getDate: function() { + var d = this.getUTCDate(); + return new Date(d.getTime() + (d.getTimezoneOffset() * 60000)); + }, + + getUTCDate: function() { + return this.date; + }, + + setDate: function(d) { + this.setUTCDate(new Date(d.getTime() - (d.getTimezoneOffset() * 60000))); + }, + + setUTCDate: function(d) { + if(d >= this.startDate && d <= this.endDate) { + this.date = d; + this.setValue(); + this.viewDate = this.date; + this.fill(); + } else { + this.element.trigger({ + type: 'outOfRange', + date: d, + startDate: this.startDate, + endDate: this.endDate + }); + } + }, + + setFormat: function(format) { + this.format = DPGlobal.parseFormat(format, this.formatType); + var element; + if(this.isInput) { + element = this.element; + } else if(this.component) { + element = this.element.find('input'); + } + if(element && element.val()) { + this.setValue(); + } + }, + + setValue: function() { + var formatted = this.getFormattedDate(); + if(!this.isInput) { + if(this.component) { + this.element.find('input').val(formatted); + } + this.element.data('date', formatted); + } else { + this.element.val(formatted); + } + if(this.linkField) { + $('#' + this.linkField).val(this.getFormattedDate(this.linkFormat)); + } + }, + + getFormattedDate: function(format) { + if(format == undefined) format = this.format; + return DPGlobal.formatDate(this.date, format, this.language, this.formatType); + }, + + setStartDate: function(startDate) { + this.startDate = startDate || -Infinity; + if(this.startDate !== -Infinity) { + this.startDate = DPGlobal.parseDate(this.startDate, this.format, this.language, this.formatType); + } + this.update(); + this.updateNavArrows(); + }, + + setEndDate: function(endDate) { + this.endDate = endDate || Infinity; + if(this.endDate !== Infinity) { + this.endDate = DPGlobal.parseDate(this.endDate, this.format, this.language, this.formatType); + } + this.update(); + this.updateNavArrows(); + }, + + setDaysOfWeekDisabled: function(daysOfWeekDisabled) { + this.daysOfWeekDisabled = daysOfWeekDisabled || []; + if(!$.isArray(this.daysOfWeekDisabled)) { + this.daysOfWeekDisabled = this.daysOfWeekDisabled.split(/,\s*/); + } + this.daysOfWeekDisabled = $.map(this.daysOfWeekDisabled, function(d) { + return parseInt(d, 10); + }); + this.update(); + this.updateNavArrows(); + }, + + place: function() { + if(this.isInline) return; + + var index_highest = 0; + $('div').each(function() { + var index_current = parseInt($(this).css("zIndex"), 10); + if(index_current > index_highest) { + index_highest = index_current; + } + }); + var zIndex = index_highest + 10; + + var offset, top, left; + if(this.component) { + offset = this.component.offset(); + left = offset.left; + if(this.pickerPosition === 'bottom-left' || this.pickerPosition === 'top-left' || this.pickerPosition === 'auto-left') { + left += this.component.outerWidth() - this.picker.outerWidth(); + } + } else { + offset = this.element.offset(); + left = offset.left; + } + + var isAutoPosition = this.pickerPosition.indexOf('auto-') === 0; + var realPickerPosition = isAutoPosition ? (((offset.top + this.picker.outerHeight() > $(window).height() + $(window).scrollTop()) ? 'top' : 'bottom') + (this.pickerPosition.lastIndexOf('-left') === 0 ? '-left' : '-right')) : this.pickerPosition; + + if(realPickerPosition === 'top-left' || realPickerPosition === 'top-right') { + top = offset.top - this.picker.outerHeight(); + } else { + top = offset.top + this.height; + } + this.picker.css({ + top: top, + left: left, + zIndex: zIndex + }).attr('class', 'datetimepicker dropdown-menu datetimepicker-dropdown-' + realPickerPosition); + if(this.pickerClass) this.picker.addClass(this.pickerClass); + if(this.pickerId) this.picker.attr('id', this.pickerId); + }, + + update: function() { + var date, fromArgs = false; + if(arguments && arguments.length && (typeof arguments[0] === 'string' || arguments[0] instanceof Date)) { + date = arguments[0]; + fromArgs = true; + } else { + date = this.element.data('date') || (this.isInput ? this.element.val() : this.element.find('input').val()) || this.initialDate; + if(typeof date == 'string' || date instanceof String) { + date = date.replace(/^\s+|\s+$/g, ''); + } + } + + if(!date) { + date = new Date(); + fromArgs = false; + } + + this.date = DPGlobal.parseDate(date, this.format, this.language, this.formatType); + + if(fromArgs) this.setValue(); + + if(this.date < this.startDate) { + this.viewDate = new Date(this.startDate); + } else if(this.date > this.endDate) { + this.viewDate = new Date(this.endDate); + } else { + this.viewDate = new Date(this.date); + } + this.fill(); + }, + + fillDow: function() { + var dowCnt = this.weekStart, + html = ''; + while(dowCnt < this.weekStart + 7) { + html += ''; + } + html += ''; + this.picker.find('.datetimepicker-days thead').append(html); + }, + + fillMonths: function() { + var html = '', + i = 0; + while(i < 12) { + html += '' + dates[this.language].monthsShort[i++] + ''; + } + this.picker.find('.datetimepicker-months td').html(html); + }, + + fill: function() { + if(this.date == null || this.viewDate == null) { + return; + } + var d = new Date(this.viewDate), + year = d.getUTCFullYear(), + month = d.getUTCMonth(), + dayMonth = d.getUTCDate(), + hours = d.getUTCHours(), + minutes = d.getUTCMinutes(), + startYear = this.startDate !== -Infinity ? this.startDate.getUTCFullYear() : -Infinity, + startMonth = this.startDate !== -Infinity ? this.startDate.getUTCMonth() : -Infinity, + endYear = this.endDate !== Infinity ? this.endDate.getUTCFullYear() : Infinity, + endMonth = this.endDate !== Infinity ? this.endDate.getUTCMonth() : Infinity, + currentDate = (new UTCDate(this.date.getUTCFullYear(), this.date.getUTCMonth(), this.date.getUTCDate())).valueOf(), + today = new Date(); + this.picker.find('.datetimepicker-days thead th:eq(1)') + .text(dates[this.language].months[month] + ' ' + year); + if(this.formatViewType == "time") { + var hourConverted = hours % 12 ? hours % 12 : 12; + var hoursDisplay = (hourConverted < 10 ? '0' : '') + hourConverted; + var minutesDisplay = (minutes < 10 ? '0' : '') + minutes; + var meridianDisplay = dates[this.language].meridiem[hours < 12 ? 0 : 1]; + this.picker.find('.datetimepicker-hours thead th:eq(1)') + .text(hoursDisplay + ':' + minutesDisplay + ' ' + meridianDisplay.toUpperCase()); + this.picker.find('.datetimepicker-minutes thead th:eq(1)') + .text(hoursDisplay + ':' + minutesDisplay + ' ' + meridianDisplay.toUpperCase()); + } else { + this.picker.find('.datetimepicker-hours thead th:eq(1)') + .text(dayMonth + ' ' + dates[this.language].months[month] + ' ' + year); + this.picker.find('.datetimepicker-minutes thead th:eq(1)') + .text(dayMonth + ' ' + dates[this.language].months[month] + ' ' + year); + } + this.picker.find('tfoot th.today') + .text(dates[this.language].today) + .toggle(this.todayBtn !== false); + this.updateNavArrows(); + this.fillMonths(); + /*var prevMonth = UTCDate(year, month, 0,0,0,0,0); + prevMonth.setUTCDate(prevMonth.getDate() - (prevMonth.getUTCDay() - this.weekStart + 7)%7);*/ + var prevMonth = UTCDate(year, month - 1, 28, 0, 0, 0, 0), + day = DPGlobal.getDaysInMonth(prevMonth.getUTCFullYear(), prevMonth.getUTCMonth()); + prevMonth.setUTCDate(day); + prevMonth.setUTCDate(day - (prevMonth.getUTCDay() - this.weekStart + 7) % 7); + var nextMonth = new Date(prevMonth); + nextMonth.setUTCDate(nextMonth.getUTCDate() + 42); + nextMonth = nextMonth.valueOf(); + var html = []; + var clsName; + while(prevMonth.valueOf() < nextMonth) { + if(prevMonth.getUTCDay() == this.weekStart) { + html.push(''); + } + clsName = ''; + if(prevMonth.getUTCFullYear() < year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() < month)) { + clsName += ' old'; + } else if(prevMonth.getUTCFullYear() > year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() > month)) { + clsName += ' new'; + } + // Compare internal UTC date with local today, not UTC today + if(this.todayHighlight && + prevMonth.getUTCFullYear() == today.getFullYear() && + prevMonth.getUTCMonth() == today.getMonth() && + prevMonth.getUTCDate() == today.getDate()) { + clsName += ' today'; + } + if(prevMonth.valueOf() == currentDate) { + clsName += ' active'; + } + if((prevMonth.valueOf() + 86400000) <= this.startDate || prevMonth.valueOf() > this.endDate || + $.inArray(prevMonth.getUTCDay(), this.daysOfWeekDisabled) !== -1) { + clsName += ' disabled'; + } + html.push(''); + if(prevMonth.getUTCDay() == this.weekEnd) { + html.push(''); + } + prevMonth.setUTCDate(prevMonth.getUTCDate() + 1); + } + this.picker.find('.datetimepicker-days tbody').empty().append(html.join('')); + + html = []; + var txt = '', + meridian = '', + meridianOld = ''; + for(var i = 0; i < 24; i++) { + var actual = UTCDate(year, month, dayMonth, i); + clsName = ''; + // We want the previous hour for the startDate + if((actual.valueOf() + 3600000) <= this.startDate || actual.valueOf() > this.endDate) { + clsName += ' disabled'; + } else if(hours == i) { + clsName += ' active'; + } + if(this.showMeridian && dates[this.language].meridiem.length == 2) { + meridian = (i < 12 ? dates[this.language].meridiem[0] : dates[this.language].meridiem[1]); + if(meridian != meridianOld) { + if(meridianOld != '') { + html.push(''); + } + html.push('
' + meridian.toUpperCase() + ''); + } + meridianOld = meridian; + txt = (i % 12 ? i % 12 : 12); + html.push('' + txt + ''); + if(i == 23) { + html.push('
'); + } + } else { + txt = i + ':00'; + html.push('' + txt + ''); + } + } + this.picker.find('.datetimepicker-hours td').html(html.join('')); + + html = []; + txt = '', meridian = '', meridianOld = ''; + for(var i = 0; i < 60; i += this.minuteStep) { + var actual = UTCDate(year, month, dayMonth, hours, i, 0); + clsName = ''; + if(actual.valueOf() < this.startDate || actual.valueOf() > this.endDate) { + clsName += ' disabled'; + } else if(Math.floor(minutes / this.minuteStep) == Math.floor(i / this.minuteStep)) { + clsName += ' active'; + } + if(this.showMeridian && dates[this.language].meridiem.length == 2) { + meridian = (hours < 12 ? dates[this.language].meridiem[0] : dates[this.language].meridiem[1]); + if(meridian != meridianOld) { + if(meridianOld != '') { + html.push(''); + } + html.push('
' + meridian.toUpperCase() + ''); + } + meridianOld = meridian; + txt = (hours % 12 ? hours % 12 : 12); + //html.push(''+txt+''); + html.push('' + txt + ':' + (i < 10 ? '0' + i : i) + ''); + if(i == 59) { + html.push('
'); + } + } else { + txt = i + ':00'; + //html.push(''+txt+''); + html.push('' + hours + ':' + (i < 10 ? '0' + i : i) + ''); + } + } + this.picker.find('.datetimepicker-minutes td').html(html.join('')); + + var currentYear = this.date.getUTCFullYear(); + var months = this.picker.find('.datetimepicker-months') + .find('th:eq(1)') + .text(year) + .end() + .find('span').removeClass('active'); + if(currentYear == year) { + months.eq(this.date.getUTCMonth()).addClass('active'); + } + if(year < startYear || year > endYear) { + months.addClass('disabled'); + } + if(year == startYear) { + months.slice(0, startMonth).addClass('disabled'); + } + if(year == endYear) { + months.slice(endMonth + 1).addClass('disabled'); + } + + html = ''; + year = parseInt(year / 10, 10) * 10; + var yearCont = this.picker.find('.datetimepicker-years') + .find('th:eq(1)') + .text(year + '-' + (year + 9)) + .end() + .find('td'); + year -= 1; + for(var i = -1; i < 11; i++) { + html += '' + year + ''; + year += 1; + } + yearCont.html(html); + this.place(); + }, + + updateNavArrows: function() { + var d = new Date(this.viewDate), + year = d.getUTCFullYear(), + month = d.getUTCMonth(), + day = d.getUTCDate(), + hour = d.getUTCHours(); + switch(this.viewMode) { + case 0: + if(this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear() && month <= this.startDate.getUTCMonth() && day <= this.startDate.getUTCDate() && hour <= this.startDate.getUTCHours()) { + this.picker.find('.prev').css({ + visibility: 'hidden' + }); + } else { + this.picker.find('.prev').css({ + visibility: 'visible' + }); + } + if(this.endDate !== Infinity && year >= this.endDate.getUTCFullYear() && month >= this.endDate.getUTCMonth() && day >= this.endDate.getUTCDate() && hour >= this.endDate.getUTCHours()) { + this.picker.find('.next').css({ + visibility: 'hidden' + }); + } else { + this.picker.find('.next').css({ + visibility: 'visible' + }); + } + break; + case 1: + if(this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear() && month <= this.startDate.getUTCMonth() && day <= this.startDate.getUTCDate()) { + this.picker.find('.prev').css({ + visibility: 'hidden' + }); + } else { + this.picker.find('.prev').css({ + visibility: 'visible' + }); + } + if(this.endDate !== Infinity && year >= this.endDate.getUTCFullYear() && month >= this.endDate.getUTCMonth() && day >= this.endDate.getUTCDate()) { + this.picker.find('.next').css({ + visibility: 'hidden' + }); + } else { + this.picker.find('.next').css({ + visibility: 'visible' + }); + } + break; + case 2: + if(this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear() && month <= this.startDate.getUTCMonth()) { + this.picker.find('.prev').css({ + visibility: 'hidden' + }); + } else { + this.picker.find('.prev').css({ + visibility: 'visible' + }); + } + if(this.endDate !== Infinity && year >= this.endDate.getUTCFullYear() && month >= this.endDate.getUTCMonth()) { + this.picker.find('.next').css({ + visibility: 'hidden' + }); + } else { + this.picker.find('.next').css({ + visibility: 'visible' + }); + } + break; + case 3: + case 4: + if(this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()) { + this.picker.find('.prev').css({ + visibility: 'hidden' + }); + } else { + this.picker.find('.prev').css({ + visibility: 'visible' + }); + } + if(this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()) { + this.picker.find('.next').css({ + visibility: 'hidden' + }); + } else { + this.picker.find('.next').css({ + visibility: 'visible' + }); + } + break; + } + }, + + mousewheel: function(e) { + + e.preventDefault(); + e.stopPropagation(); + + if(this.wheelPause) { + return; + } + + this.wheelPause = true; + + var originalEvent = e.originalEvent; + + var delta = originalEvent.wheelDelta; + + var mode = delta > 0 ? 1 : (delta === 0) ? 0 : -1; + + if(this.wheelViewModeNavigationInverseDirection) { + mode = -mode; + } + + this.showMode(mode); + + setTimeout($.proxy(function() { + + this.wheelPause = false + + }, this), this.wheelViewModeNavigationDelay); + + }, + + click: function(e) { + e.stopPropagation(); + e.preventDefault(); + var target = $(e.target).closest('span, td, th, legend'); + if(target.length == 1) { + if(target.is('.disabled')) { + this.element.trigger({ + type: 'outOfRange', + date: this.viewDate, + startDate: this.startDate, + endDate: this.endDate + }); + return; + } + switch(target[0].nodeName.toLowerCase()) { + case 'th': + switch(target[0].className) { + case 'switch': + this.showMode(1); + break; + case 'prev': + case 'next': + var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1); + switch(this.viewMode) { + case 0: + this.viewDate = this.moveHour(this.viewDate, dir); + break; + case 1: + this.viewDate = this.moveDate(this.viewDate, dir); + break; + case 2: + this.viewDate = this.moveMonth(this.viewDate, dir); + break; + case 3: + case 4: + this.viewDate = this.moveYear(this.viewDate, dir); + break; + } + this.fill(); + break; + case 'today': + var date = new Date(); + date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), 0); + + // Respect startDate and endDate. + if(date < this.startDate) date = this.startDate; + else if(date > this.endDate) date = this.endDate; + + this.viewMode = this.startViewMode; + this.showMode(0); + this._setDate(date); + this.fill(); + if(this.autoclose) { + this.hide(); + } + break; + } + break; + case 'span': + if(!target.is('.disabled')) { + var year = this.viewDate.getUTCFullYear(), + month = this.viewDate.getUTCMonth(), + day = this.viewDate.getUTCDate(), + hours = this.viewDate.getUTCHours(), + minutes = this.viewDate.getUTCMinutes(), + seconds = this.viewDate.getUTCSeconds(); + + if(target.is('.month')) { + this.viewDate.setUTCDate(1); + month = target.parent().find('span').index(target); + day = this.viewDate.getUTCDate(); + this.viewDate.setUTCMonth(month); + this.element.trigger({ + type: 'changeMonth', + date: this.viewDate + }); + if(this.viewSelect >= 3) { + this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0)); + } + } else if(target.is('.year')) { + this.viewDate.setUTCDate(1); + year = parseInt(target.text(), 10) || 0; + this.viewDate.setUTCFullYear(year); + this.element.trigger({ + type: 'changeYear', + date: this.viewDate + }); + if(this.viewSelect >= 4) { + this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0)); + } + } else if(target.is('.hour')) { + hours = parseInt(target.text(), 10) || 0; + if(target.hasClass('hour_am') || target.hasClass('hour_pm')) { + if(hours == 12 && target.hasClass('hour_am')) { + hours = 0; + } else if(hours != 12 && target.hasClass('hour_pm')) { + hours += 12; + } + } + this.viewDate.setUTCHours(hours); + this.element.trigger({ + type: 'changeHour', + date: this.viewDate + }); + if(this.viewSelect >= 1) { + this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0)); + } + } else if(target.is('.minute')) { + minutes = parseInt(target.text().substr(target.text().indexOf(':') + 1), 10) || 0; + this.viewDate.setUTCMinutes(minutes); + this.element.trigger({ + type: 'changeMinute', + date: this.viewDate + }); + if(this.viewSelect >= 0) { + this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0)); + } + } + if(this.viewMode != 0) { + var oldViewMode = this.viewMode; + this.showMode(-1); + this.fill(); + if(oldViewMode == this.viewMode && this.autoclose) { + this.hide(); + } + } else { + this.fill(); + if(this.autoclose) { + this.hide(); + } + } + } + break; + case 'td': + if(target.is('.day') && !target.is('.disabled')) { + var day = parseInt(target.text(), 10) || 1; + var year = this.viewDate.getUTCFullYear(), + month = this.viewDate.getUTCMonth(), + hours = this.viewDate.getUTCHours(), + minutes = this.viewDate.getUTCMinutes(), + seconds = this.viewDate.getUTCSeconds(); + if(target.is('.old')) { + if(month === 0) { + month = 11; + year -= 1; + } else { + month -= 1; + } + } else if(target.is('.new')) { + if(month == 11) { + month = 0; + year += 1; + } else { + month += 1; + } + } + this.viewDate.setUTCFullYear(year); + this.viewDate.setUTCMonth(month, day); + this.element.trigger({ + type: 'changeDay', + date: this.viewDate + }); + if(this.viewSelect >= 2) { + this._setDate(UTCDate(year, month, day, hours, minutes, seconds, 0)); + } + } + var oldViewMode = this.viewMode; + this.showMode(-1); + this.fill(); + if(oldViewMode == this.viewMode && this.autoclose) { + this.hide(); + } + break; + } + } + }, + + _setDate: function(date, which) { + if(!which || which == 'date') + this.date = date; + if(!which || which == 'view') + this.viewDate = date; + this.fill(); + this.setValue(); + var element; + if(this.isInput) { + element = this.element; + } else if(this.component) { + element = this.element.find('input'); + } + if(element) { + element.change(); + if(this.autoclose && (!which || which == 'date')) { + //this.hide(); + } + } + this.element.trigger({ + type: 'changeDate', + date: this.date + }); + if(date === null) { + this.date = this.viewDate; + } + }, + + moveMinute: function(date, dir) { + if(!dir) return date; + var new_date = new Date(date.valueOf()); + //dir = dir > 0 ? 1 : -1; + new_date.setUTCMinutes(new_date.getUTCMinutes() + (dir * this.minuteStep)); + return new_date; + }, + + moveHour: function(date, dir) { + if(!dir) return date; + var new_date = new Date(date.valueOf()); + //dir = dir > 0 ? 1 : -1; + new_date.setUTCHours(new_date.getUTCHours() + dir); + return new_date; + }, + + moveDate: function(date, dir) { + if(!dir) return date; + var new_date = new Date(date.valueOf()); + //dir = dir > 0 ? 1 : -1; + new_date.setUTCDate(new_date.getUTCDate() + dir); + return new_date; + }, + + moveMonth: function(date, dir) { + if(!dir) return date; + var new_date = new Date(date.valueOf()), + day = new_date.getUTCDate(), + month = new_date.getUTCMonth(), + mag = Math.abs(dir), + new_month, test; + dir = dir > 0 ? 1 : -1; + if(mag == 1) { + test = dir == -1 + // If going back one month, make sure month is not current month + // (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02) + ? function() { + return new_date.getUTCMonth() == month; + } + // If going forward one month, make sure month is as expected + // (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02) + : function() { + return new_date.getUTCMonth() != new_month; + }; + new_month = month + dir; + new_date.setUTCMonth(new_month); + // Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11 + if(new_month < 0 || new_month > 11) + new_month = (new_month + 12) % 12; + } else { + // For magnitudes >1, move one month at a time... + for(var i = 0; i < mag; i++) + // ...which might decrease the day (eg, Jan 31 to Feb 28, etc)... + new_date = this.moveMonth(new_date, dir); + // ...then reset the day, keeping it in the new month + new_month = new_date.getUTCMonth(); + new_date.setUTCDate(day); + test = function() { + return new_month != new_date.getUTCMonth(); + }; + } + // Common date-resetting loop -- if date is beyond end of month, make it + // end of month + while(test()) { + new_date.setUTCDate(--day); + new_date.setUTCMonth(new_month); + } + return new_date; + }, + + moveYear: function(date, dir) { + return this.moveMonth(date, dir * 12); + }, + + dateWithinRange: function(date) { + return date >= this.startDate && date <= this.endDate; + }, + + keydown: function(e) { + if(this.picker.is(':not(:visible)')) { + if(e.keyCode == 27) // allow escape to hide and re-show picker + this.show(); + return; + } + var dateChanged = false, + dir, day, month, + newDate, newViewDate; + switch(e.keyCode) { + case 27: // escape + this.hide(); + e.preventDefault(); + break; + case 37: // left + case 39: // right + if(!this.keyboardNavigation) break; + dir = e.keyCode == 37 ? -1 : 1; + viewMode = this.viewMode; + if(e.ctrlKey) { + viewMode += 2; + } else if(e.shiftKey) { + viewMode += 1; + } + if(viewMode == 4) { + newDate = this.moveYear(this.date, dir); + newViewDate = this.moveYear(this.viewDate, dir); + } else if(viewMode == 3) { + newDate = this.moveMonth(this.date, dir); + newViewDate = this.moveMonth(this.viewDate, dir); + } else if(viewMode == 2) { + newDate = this.moveDate(this.date, dir); + newViewDate = this.moveDate(this.viewDate, dir); + } else if(viewMode == 1) { + newDate = this.moveHour(this.date, dir); + newViewDate = this.moveHour(this.viewDate, dir); + } else if(viewMode == 0) { + newDate = this.moveMinute(this.date, dir); + newViewDate = this.moveMinute(this.viewDate, dir); + } + if(this.dateWithinRange(newDate)) { + this.date = newDate; + this.viewDate = newViewDate; + this.setValue(); + this.update(); + e.preventDefault(); + dateChanged = true; + } + break; + case 38: // up + case 40: // down + if(!this.keyboardNavigation) break; + dir = e.keyCode == 38 ? -1 : 1; + viewMode = this.viewMode; + if(e.ctrlKey) { + viewMode += 2; + } else if(e.shiftKey) { + viewMode += 1; + } + if(viewMode == 4) { + newDate = this.moveYear(this.date, dir); + newViewDate = this.moveYear(this.viewDate, dir); + } else if(viewMode == 3) { + newDate = this.moveMonth(this.date, dir); + newViewDate = this.moveMonth(this.viewDate, dir); + } else if(viewMode == 2) { + newDate = this.moveDate(this.date, dir * 7); + newViewDate = this.moveDate(this.viewDate, dir * 7); + } else if(viewMode == 1) { + if(this.showMeridian) { + newDate = this.moveHour(this.date, dir * 6); + newViewDate = this.moveHour(this.viewDate, dir * 6); + } else { + newDate = this.moveHour(this.date, dir * 4); + newViewDate = this.moveHour(this.viewDate, dir * 4); + } + } else if(viewMode == 0) { + newDate = this.moveMinute(this.date, dir * 4); + newViewDate = this.moveMinute(this.viewDate, dir * 4); + } + if(this.dateWithinRange(newDate)) { + this.date = newDate; + this.viewDate = newViewDate; + this.setValue(); + this.update(); + e.preventDefault(); + dateChanged = true; + } + break; + case 13: // enter + if(this.viewMode != 0) { + var oldViewMode = this.viewMode; + this.showMode(-1); + this.fill(); + if(oldViewMode == this.viewMode && this.autoclose) { + this.hide(); + } + } else { + this.fill(); + if(this.autoclose) { + this.hide(); + } + } + e.preventDefault(); + break; + case 9: // tab + this.hide(); + break; + } + if(dateChanged) { + var element; + if(this.isInput) { + element = this.element; + } else if(this.component) { + element = this.element.find('input'); + } + if(element) { + element.change(); + } + this.element.trigger({ + type: 'changeDate', + date: this.date + }); + } + }, + + showMode: function(dir) { + if(dir) { + var newViewMode = Math.max(0, Math.min(DPGlobal.modes.length - 1, this.viewMode + dir)); + if(newViewMode >= this.minView && newViewMode <= this.maxView) { + this.element.trigger({ + type: 'changeMode', + date: this.viewDate, + oldViewMode: this.viewMode, + newViewMode: newViewMode + }); + + this.viewMode = newViewMode; + } + } + /* + vitalets: fixing bug of very special conditions: + jquery 1.7.1 + webkit + show inline datetimepicker in bootstrap popover. + Method show() does not set display css correctly and datetimepicker is not shown. + Changed to .css('display', 'block') solve the problem. + See https://github.com/vitalets/x-editable/issues/37 + + In jquery 1.7.2+ everything works fine. + */ + //this.picker.find('>div').hide().filter('.datetimepicker-'+DPGlobal.modes[this.viewMode].clsName).show(); + this.picker.find('>div').hide().filter('.datetimepicker-' + DPGlobal.modes[this.viewMode].clsName).css('display', 'block'); + this.updateNavArrows(); + }, + + reset: function(e) { + this._setDate(null, 'date'); + } + }; + + $.fn.datetimepicker = function(option) { + var args = Array.apply(null, arguments); + args.shift(); + return this.each(function() { + var $this = $(this), + data = $this.data('datetimepicker'), + options = typeof option == 'object' && option; + if(!data) { + $this.data('datetimepicker', (data = new Datetimepicker(this, $.extend({}, $.fn.datetimepicker.defaults, $this.data(), options)))); + } + if(typeof option == 'string' && typeof data[option] == 'function') { + data[option].apply(data, args); + } + }); + }; + + $.fn.datetimepicker.defaults = { + pickerPosition: 'auto-right' + }; + $.fn.datetimepicker.Constructor = Datetimepicker; + var dates = $.fn.datetimepicker.dates = { + en: { + days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"], + daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], + daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"], + months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], + monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], + meridiem: ["am", "pm"], + suffix: ["st", "nd", "rd", "th"], + today: "Today" + } + }; + + dates['zh-cn'] = { + days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"], + daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"], + daysMin: ["日", "一", "二", "三", "四", "五", "六", "日"], + months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + today: "今日", + suffix: [], + meridiem: [] + }; + dates['zh-tw'] = { + days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"], + daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"], + daysMin: ["日", "一", "二", "三", "四", "五", "六", "日"], + months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + today: "今天", + suffix: [], + meridiem: ["上午", "下午"] + }; + + var DPGlobal = { + modes: [{ + clsName: 'minutes', + navFnc: 'Hours', + navStep: 1 + }, { + clsName: 'hours', + navFnc: 'Date', + navStep: 1 + }, { + clsName: 'days', + navFnc: 'Month', + navStep: 1 + }, { + clsName: 'months', + navFnc: 'FullYear', + navStep: 1 + }, { + clsName: 'years', + navFnc: 'FullYear', + navStep: 10 + }], + isLeapYear: function(year) { + return(((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0)) + }, + getDaysInMonth: function(year, month) { + return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month] + }, + getDefaultFormat: function(type, field) { + if(type == "standard") { + if(field == 'input') + return 'yyyy-mm-dd hh:ii'; + else + return 'yyyy-mm-dd hh:ii:ss'; + } else if(type == "php") { + if(field == 'input') + return 'Y-m-d H:i'; + else + return 'Y-m-d H:i:s'; + } else { + throw new Error("Invalid format type."); + } + }, + validParts: function(type) { + if(type == "standard") { + return /hh?|HH?|p|P|ii?|ss?|dd?|DD?|mm?|MM?|yy(?:yy)?/g; + } else if(type == "php") { + return /[dDjlNwzFmMnStyYaABgGhHis]/g; + } else { + throw new Error("Invalid format type."); + } + }, + nonpunctuation: /[^ -\/:-@\[-`{-~\t\n\rTZ]+/g, + parseFormat: function(format, type) { + // IE treats \0 as a string end in inputs (truncating the value), + // so it's a bad format delimiter, anyway + var separators = format.replace(this.validParts(type), '\0').split('\0'), + parts = format.match(this.validParts(type)); + if(!separators || !separators.length || !parts || parts.length == 0) { + throw new Error("Invalid date format."); + } + return { + separators: separators, + parts: parts + }; + }, + parseDate: function(date, format, language, type) { + if(date instanceof Date) { + var dateUTC = new Date(date.valueOf() - date.getTimezoneOffset() * 60000); + dateUTC.setMilliseconds(0); + return dateUTC; + } + if(/^\d{4}\-\d{1,2}\-\d{1,2}$/.test(date)) { + format = this.parseFormat('yyyy-mm-dd', type); + } + if(/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}$/.test(date)) { + format = this.parseFormat('yyyy-mm-dd hh:ii', type); + } + if(/^\d{4}\-\d{1,2}\-\d{1,2}[T ]\d{1,2}\:\d{1,2}\:\d{1,2}[Z]{0,1}$/.test(date)) { + format = this.parseFormat('yyyy-mm-dd hh:ii:ss', type); + } + if(/^[-+]\d+[dmwy]([\s,]+[-+]\d+[dmwy])*$/.test(date)) { + var part_re = /([-+]\d+)([dmwy])/, + parts = date.match(/([-+]\d+)([dmwy])/g), + part, dir; + date = new Date(); + for(var i = 0; i < parts.length; i++) { + part = part_re.exec(parts[i]); + dir = parseInt(part[1]); + switch(part[2]) { + case 'd': + date.setUTCDate(date.getUTCDate() + dir); + break; + case 'm': + date = Datetimepicker.prototype.moveMonth.call(Datetimepicker.prototype, date, dir); + break; + case 'w': + date.setUTCDate(date.getUTCDate() + dir * 7); + break; + case 'y': + date = Datetimepicker.prototype.moveYear.call(Datetimepicker.prototype, date, dir); + break; + } + } + return UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds(), 0); + } + var parts = date && date.match(this.nonpunctuation) || [], + date = new Date(0, 0, 0, 0, 0, 0, 0), + parsed = {}, + setters_order = ['hh', 'h', 'ii', 'i', 'ss', 's', 'yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'D', 'DD', 'd', 'dd', 'H', 'HH', 'p', 'P'], + setters_map = { + hh: function(d, v) { + return d.setUTCHours(v); + }, + h: function(d, v) { + return d.setUTCHours(v); + }, + HH: function(d, v) { + return d.setUTCHours(v == 12 ? 0 : v); + }, + H: function(d, v) { + return d.setUTCHours(v == 12 ? 0 : v); + }, + ii: function(d, v) { + return d.setUTCMinutes(v); + }, + i: function(d, v) { + return d.setUTCMinutes(v); + }, + ss: function(d, v) { + return d.setUTCSeconds(v); + }, + s: function(d, v) { + return d.setUTCSeconds(v); + }, + yyyy: function(d, v) { + return d.setUTCFullYear(v); + }, + yy: function(d, v) { + return d.setUTCFullYear(2000 + v); + }, + m: function(d, v) { + v -= 1; + while(v < 0) v += 12; + v %= 12; + d.setUTCMonth(v); + while(d.getUTCMonth() != v) + d.setUTCDate(d.getUTCDate() - 1); + return d; + }, + d: function(d, v) { + return d.setUTCDate(v); + }, + p: function(d, v) { + return d.setUTCHours(v == 1 ? d.getUTCHours() + 12 : d.getUTCHours()); + } + }, + val, filtered, part; + setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m']; + setters_map['dd'] = setters_map['d']; + setters_map['P'] = setters_map['p']; + date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds()); + if(parts.length == format.parts.length) { + for(var i = 0, cnt = format.parts.length; i < cnt; i++) { + val = parseInt(parts[i], 10); + part = format.parts[i]; + if(isNaN(val)) { + switch(part) { + case 'MM': + filtered = $(dates[language].months).filter(function() { + var m = this.slice(0, parts[i].length), + p = parts[i].slice(0, m.length); + return m == p; + }); + val = $.inArray(filtered[0], dates[language].months) + 1; + break; + case 'M': + filtered = $(dates[language].monthsShort).filter(function() { + var m = this.slice(0, parts[i].length), + p = parts[i].slice(0, m.length); + return m == p; + }); + val = $.inArray(filtered[0], dates[language].monthsShort) + 1; + break; + case 'p': + case 'P': + val = $.inArray(parts[i].toLowerCase(), dates[language].meridiem); + break; + } + } + parsed[part] = val; + } + for(var i = 0, s; i < setters_order.length; i++) { + s = setters_order[i]; + if(s in parsed && !isNaN(parsed[s])) + setters_map[s](date, parsed[s]) + } + } + return date; + }, + formatDate: function(date, format, language, type) { + if(date == null) { + return ''; + } + var val; + if(type == 'standard') { + val = { + // year + yy: date.getUTCFullYear().toString().substring(2), + yyyy: date.getUTCFullYear(), + // month + m: date.getUTCMonth() + 1, + M: dates[language].monthsShort[date.getUTCMonth()], + MM: dates[language].months[date.getUTCMonth()], + // day + d: date.getUTCDate(), + D: dates[language].daysShort[date.getUTCDay()], + DD: dates[language].days[date.getUTCDay()], + p: (dates[language].meridiem.length == 2 ? dates[language].meridiem[date.getUTCHours() < 12 ? 0 : 1] : ''), + // hour + h: date.getUTCHours(), + // minute + i: date.getUTCMinutes(), + // second + s: date.getUTCSeconds() + }; + + if(dates[language].meridiem.length == 2) { + val.H = (val.h % 12 == 0 ? 12 : val.h % 12); + } else { + val.H = val.h; + } + val.HH = (val.H < 10 ? '0' : '') + val.H; + val.P = val.p.toUpperCase(); + val.hh = (val.h < 10 ? '0' : '') + val.h; + val.ii = (val.i < 10 ? '0' : '') + val.i; + val.ss = (val.s < 10 ? '0' : '') + val.s; + val.dd = (val.d < 10 ? '0' : '') + val.d; + val.mm = (val.m < 10 ? '0' : '') + val.m; + } else if(type == 'php') { + // php format + val = { + // year + y: date.getUTCFullYear().toString().substring(2), + Y: date.getUTCFullYear(), + // month + F: dates[language].months[date.getUTCMonth()], + M: dates[language].monthsShort[date.getUTCMonth()], + n: date.getUTCMonth() + 1, + t: DPGlobal.getDaysInMonth(date.getUTCFullYear(), date.getUTCMonth()), + // day + j: date.getUTCDate(), + l: dates[language].days[date.getUTCDay()], + D: dates[language].daysShort[date.getUTCDay()], + w: date.getUTCDay(), // 0 -> 6 + N: (date.getUTCDay() == 0 ? 7 : date.getUTCDay()), // 1 -> 7 + S: (date.getUTCDate() % 10 <= dates[language].suffix.length ? dates[language].suffix[date.getUTCDate() % 10 - 1] : ''), + // hour + a: (dates[language].meridiem.length == 2 ? dates[language].meridiem[date.getUTCHours() < 12 ? 0 : 1] : ''), + g: (date.getUTCHours() % 12 == 0 ? 12 : date.getUTCHours() % 12), + G: date.getUTCHours(), + // minute + i: date.getUTCMinutes(), + // second + s: date.getUTCSeconds() + }; + val.m = (val.n < 10 ? '0' : '') + val.n; + val.d = (val.j < 10 ? '0' : '') + val.j; + val.A = val.a.toString().toUpperCase(); + val.h = (val.g < 10 ? '0' : '') + val.g; + val.H = (val.G < 10 ? '0' : '') + val.G; + val.i = (val.i < 10 ? '0' : '') + val.i; + val.s = (val.s < 10 ? '0' : '') + val.s; + } else { + throw new Error("Invalid format type."); + } + var date = [], + seps = $.extend([], format.separators); + for(var i = 0, cnt = format.parts.length; i < cnt; i++) { + if(seps.length) { + date.push(seps.shift()); + } + date.push(val[format.parts[i]]); + } + if(seps.length) { + date.push(seps.shift()); + } + return date.join(''); + }, + convertViewMode: function(viewMode) { + switch(viewMode) { + case 4: + case 'decade': + viewMode = 4; + break; + case 3: + case 'year': + viewMode = 3; + break; + case 2: + case 'month': + viewMode = 2; + break; + case 1: + case 'day': + viewMode = 1; + break; + case 0: + case 'hour': + viewMode = 0; + break; + } + + return viewMode; + }, + headTemplate: '' + + '' + + '' + + '' + + '' + + '' + + '', + contTemplate: '', + footTemplate: '' + }; + DPGlobal.template = '
' + + '
' + + '
idAB?>priAB?> task->name;?> idAB?>task->estimateAB;?>task->deadline;?> priAB?> task->name;?>task->estimateAB;?>task->deadline;?>statusAB;?>statusAB;?>
id;?>task->priList, $task->pri, $task->pri)?>name?> id;?>estimate?>deadline, 0, 4) > 0) echo $task->deadline;?> task->priList, $task->pri, $task->pri)?>name?>estimate?>'>deadline, 0, 4) > 0) echo $task->deadline;?> - + + - task->statusList, $task->status);?> + task->statusList, $task->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)?>bug->typeList[$bug->type]?>bug->typeList, $bug->type, '');?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?> openedBy];?> assignedTo];?>
' + dates[this.language].daysMin[(dowCnt++) % 7] + '
' + prevMonth.getUTCDate() + '
' + + DPGlobal.headTemplate + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '
' + + '
' + + '
' + + '' + + DPGlobal.headTemplate + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '
' + + '
' + + '
' + + '' + + DPGlobal.headTemplate + + '' + + DPGlobal.footTemplate + + '
' + + '
' + + '
' + + '' + + DPGlobal.headTemplate + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '
' + + '
' + + '
' + + '' + + DPGlobal.headTemplate + + DPGlobal.contTemplate + + DPGlobal.footTemplate + + '
' + + '
' + + '
'; + $.fn.datetimepicker.DPGlobal = DPGlobal; + + /* DATETIMEPICKER NO CONFLICT + * =================== */ + + $.fn.datetimepicker.noConflict = function() { + $.fn.datetimepicker = old; + return this; + }; + + /* DATETIMEPICKER DATA-API + * ================== */ + + $(document).on( + 'focus.datetimepicker.data-api click.datetimepicker.data-api', + '[data-provide="datetimepicker"]', + function(e) { + var $this = $(this); + if($this.data('datetimepicker')) return; + e.preventDefault(); + // component click requires us to explicitly show it + $this.datetimepicker('show'); + } + ); + $(function() { + $('[data-provide="datetimepicker-inline"]').datetimepicker(); + }); + +}(window.jQuery); + + (function($) { jQuery.fn.sparkline = function(setting) { @@ -9083,3 +10794,146 @@ }); }(jQuery)); +(function ($) { + $(function () { + $.fn.fixedDate = 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('').datetimepicker('update'); + }).blur(function () { + if ($this.val() == '') $this.val('0000-00-00') + }); + } + }); + }; + + var options = { + language: $('html').attr('lang'), + weekStart: 1, + todayBtn: 1, + autoclose: 1, + todayHighlight: 1, + startView: 2, + forceParse: 0, + showMeridian: 1, + format: 'yyyy-mm-dd hh:ii', + startDate: '1970-1-1' + }; + + $('.form-datetime').fixedDate().datetimepicker(options); + $('.form-date').fixedDate().datetimepicker($.extend(options, { minView: 2, format: 'yyyy-mm-dd' })); + $('.form-time').fixedDate().datetimepicker($.extend(options, { startView: 1, minView: 0, maxView: 1, format: 'hh:ii' })); + + $('.datepicker-wrapper').click(function () { + $(this).find('.form-date, .form-datetime, .form-time').datetimepicker('show').focus(); + }); + + window.datepickerOptions = options; + }); +}(jQuery)); + + +(function($) { + + var convertTimeToNum = function(timeStr) { + var number = 0; + if (timeStr) { + var valArr = timeStr.split(':'); + number += parseInt(valArr[0]) * 60; + number += parseInt(valArr[1]); + } + return number; + }; + + var convertNumToTime = function(number) { + number = number%(24*60); + var hour = Math.floor(number/60); + var min = number%60; + if (hour < 10) hour = '0' + hour; + if (min < 10) min = '0' + min; + return hour + ':' + min; + }; + + var initTimeSelect = function($select) { + var now = new Date(); + var nowHour = now.getHours(); + var nowMin = Math.floor(now.getMinutes()/10)*10 + 10; + for(var i = 0; i < 24; ++i) { + var hour = (i + nowHour)%24; + if (hour < 6) continue; + for (var j = 0; j < 6; ++j) { + var itemTime = convertNumToTime(hour*60+j*10 + nowMin); + $select.append(''); + } + } + if (!$select.val()) { + time = convertTimeToNum(now.format('hh:mm')); + time = time - (time%10) + 10; + $select.val(convertNumToTime(time)); + } + }; + + // Todoes block + $.fn.blockTodoes = function() { + return $(this).each(function() { + var $block = $(this); + var $form = $block.find('form'); + var $titleInput = $form.find('[name="title"]'); + var $startInput = $form.find('[name="start"]'); + var $endInput = $form.find('[name="end"]'); + var toggleForm = function(toggle) { + if (toggle === undefined) { + toggle = !$block.hasClass('show-form'); + } + $block.toggleClass('show-form', toggle); + if (toggle) { + setTimeout(function() {$titleInput.focus();}, 50); + } + }; + + var updateEndInput = function() { + var startVal = $startInput.val(); + $block.find('.hide-empty-start').toggleClass('hide', !startVal); + if (startVal) { + $endInput.val(convertNumToTime(convertTimeToNum(startVal) + 30)); + } + }; + + $block.on('click', '.todo-form-trigger', function() { + toggleForm($(this).data('trigger')); + }); + $startInput.on('change', updateEndInput); + updateEndInput(); + initTimeSelect($startInput); + initTimeSelect($endInput); + }); + }; + $(function() { + $('.block-todoes').blockTodoes(); + }); + + // Searchbox + var $searchTypeMenu = $('#searchTypeMenu'); + var $searchType = $('#searchType'); + var updateSearchType = function(type) { + if (!type) { + type = $searchType.val(); + } + type = type || 'bug'; + $searchTypeMenu.find('li.selected').removeClass('selected'); + var $typeItem = $searchTypeMenu.find('a[data-value="' + type + '"]'); + var typeText = $typeItem.text(); + $typeItem.parent().addClass('selected'); + $('#searchTypeName').text(typeText); + }; + updateSearchType(); + $searchTypeMenu.on('click', 'a[data-value]', function() { + updateSearchType($(this).data('value')); + }); +}(jQuery)); diff --git a/www/theme/zui/css/min.css b/www/theme/zui/css/min.css index 8c5f6bacc1..0a9abf8074 100644 --- a/www/theme/zui/css/min.css +++ b/www/theme/zui/css/min.css @@ -1,5 +1,5 @@ /*! - * ZUI: Zentao template - v1.8.1 - 2018-01-27 + * ZUI: Zentao template - v1.8.1 - 2018-01-30 * http://zui.sexy * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2018 cnezsoft.com; Licensed MIT @@ -196,6 +196,8 @@ table { .container-fixed-xs:after, .row:before, .row:after, +.dl-inline:before, +.dl-inline:after, .dl-horizontal dd:before, .dl-horizontal dd:after, .btn-toolbar:before, @@ -224,10 +226,8 @@ table { #userMenu:after, .btn-group-vertical > .btn-group-vertical:before, .btn-group-vertical > .btn-group-vertical:after { - /* 1 */ display: table; content: " "; - /* 2 */ } .clearfix:after, .container:after, @@ -237,6 +237,7 @@ table { .container-fixed-sm:after, .container-fixed-xs:after, .row:after, +.dl-inline:after, .dl-horizontal dd:after, .btn-toolbar:after, .btn-group-vertical > .btn-group:after, @@ -297,6 +298,9 @@ table { .no-padding { padding: 0!important; } +.no-margin { + margin: 0!important; + } .visible-xs, .inline.visible-xs, .inline-block.visible-xs, @@ -1706,26 +1710,6 @@ dt { dd { margin-left: 0; } -.dl-inline:before, -.dl-inline:after { - /* 1 */ - display: table; - content: " "; - /* 2 */ - } -.dl-inline:after { - clear: both; - } -.dl-inline:before, -.dl-inline:after { - /* 1 */ - display: table; - content: " "; - /* 2 */ - } -.dl-inline:after { - clear: both; - } .dl-inline dt { display: inline-block; } @@ -1986,7 +1970,6 @@ fieldset[disabled] .btn { } .btn { color: #3c4353; - text-shadow: 0 1px 0 #fff; background-color: #f2f2f2; border-color: #bfbfbf; } @@ -2030,7 +2013,6 @@ fieldset[disabled] .btn.active { } .btn-primary { color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, .2); background-color: #006af1; border-color: #005fd8; } @@ -2074,7 +2056,6 @@ fieldset[disabled] .btn-primary.active { } .btn-warning { color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, .2); background-color: #fdc137; border-color: #fdb91e; } @@ -2118,7 +2099,6 @@ fieldset[disabled] .btn-warning.active { } .btn-danger { color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, .2); background-color: #ff5d5d; border-color: #ff4343; } @@ -2162,7 +2142,6 @@ fieldset[disabled] .btn-danger.active { } .btn-success { color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, .2); background-color: #00da88; border-color: #00c178; } @@ -2206,7 +2185,6 @@ fieldset[disabled] .btn-success.active { } .btn-info { color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, .2); background-color: #7ec5ff; border-color: #64baff; } @@ -3461,6 +3439,7 @@ th { transition: background .2s cubic-bezier(.175, .885, .32, 1); } .table > thead > tr > th { + font-weight: normal; color: #a6aab8; vertical-align: bottom; background-color: transparent; @@ -5998,7 +5977,7 @@ tbody.collapse.in { border-left-color: #fff; } .dropdown-submenu > a { - min-width: 160px; + min-width: 100px; } .dropdown-submenu > .dropdown-menu.pull-left { left: -100%; @@ -6562,6 +6541,245 @@ body.article-content { .tree-menu > li.open + li > a { border-top-color: #cbd0db; } +/*! + * Datetimepicker for Bootstrap + * Copyright 2012 Stefan Petre + * Licensed under the Apache License v2.0 + */ +.datetimepicker { + padding: 4px; + margin-top: 1px; + white-space: normal; + border-radius: 4px; + + direction: ltr; + } +.datetimepicker.datetimepicker-rtl { + direction: rtl; + } +.datetimepicker.datetimepicker-rtl table tr td span { + float: right; + } +.datetimepicker > div { + display: none; + } +.datetimepicker.minutes div.datetimepicker-minutes { + display: block; + } +.datetimepicker.hours div.datetimepicker-hours { + display: block; + } +.datetimepicker.days div.datetimepicker-days { + display: block; + } +.datetimepicker.months div.datetimepicker-months { + display: block; + } +.datetimepicker.years div.datetimepicker-years { + display: block; + } +.datetimepicker table { + margin: 0; + } +.datetimepicker table tr td.minute:hover { + cursor: pointer; + background: #eee; + } +.datetimepicker table tr td.hour:hover { + cursor: pointer; + background: #eee; + } +.datetimepicker table tr td.day:hover { + cursor: pointer; + background: #eee; + } +.datetimepicker table tr td span { + display: block; + float: left; + width: 23%; + height: 54px; + margin: 1%; + line-height: 54px; + cursor: pointer; + border-radius: 4px; + } +.datetimepicker table tr td span:hover { + background: #eee; + } +.datetimepicker table tr td span.old { + color: #999; + } +.datetimepicker .datetimepicker-hours span { + height: 26px; + line-height: 26px; + } +.datetimepicker .datetimepicker-minutes span { + height: 26px; + line-height: 26px; + } +.datetimepicker th.switch { + width: 145px; + } +.datetimepicker-inline { + width: 220px; + } +.datetimepicker-dropdown, +.datetimepicker-dropdown-left { + top: 0; + left: 0; + } +[class*="datetimepicker-dropdown"]:before { + position: absolute; + display: inline-block; + content: ''; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: rgba(0, 0, 0, .2); + border-left: 7px solid transparent; + } +[class*="datetimepicker-dropdown"]:after { + position: absolute; + display: inline-block; + content: ''; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + border-left: 6px solid transparent; + } +[class*="datetimepicker-dropdown-top"]:before { + display: inline-block; + content: ''; + border-top: 7px solid #ccc; + border-top-color: rgba(0, 0, 0, .2); + border-right: 7px solid transparent; + border-bottom: 0; + border-left: 7px solid transparent; + } +[class*="datetimepicker-dropdown-top"]:after { + display: inline-block; + content: ''; + border-top: 6px solid #fff; + border-right: 6px solid transparent; + border-bottom: 0; + border-left: 6px solid transparent; + } +.datetimepicker-dropdown-bottom-left:before { + top: -7px; + right: 6px; + } +.datetimepicker-dropdown-bottom-left:after { + top: -6px; + right: 7px; + } +.datetimepicker-dropdown-bottom-right:before { + top: -7px; + left: 6px; + } +.datetimepicker-dropdown-bottom-right:after { + top: -6px; + left: 7px; + } +.datetimepicker-dropdown-top-left:before { + right: 6px; + bottom: -7px; + } +.datetimepicker-dropdown-top-left:after { + right: 7px; + bottom: -6px; + } +.datetimepicker-dropdown-top-right:before { + bottom: -7px; + left: 6px; + } +.datetimepicker-dropdown-top-right:after { + bottom: -6px; + left: 7px; + } +.datetimepicker td, +.datetimepicker th { + width: 22px; + height: 20px; + padding: 3px 0; + text-align: center; + border: none; + border-radius: 4px; + } +.table-striped .datetimepicker td, +.table-striped .datetimepicker th { + background-color: transparent; + } +.datetimepicker td.old, +.datetimepicker td.new { + color: #999; + } +.datetimepicker td.disabled, +.datetimepicker td.disabled:hover { + color: #999; + cursor: default; + background: none; + } +.datetimepicker td.day.today { + color: #fff; + background-color: #fdc137; + border-color: #fdc137; + border-color: rgba(0, 0, 0, .1) rgba(0, 0, 0, .1) rgba(0, 0, 0, .25); + } +.datetimepicker td.day.active { + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, .25); + background-color: #006af1; + border-color: #0054be; + border-color: rgba(0, 0, 0, .1) rgba(0, 0, 0, .1) rgba(0, 0, 0, .25); + } +.datetimepicker td.day.active:hover { + background-color: #0054be; + } +.datetimepicker td.day.today:hover, +.datetimepicker td.day.today.active:hover { + background-color: #fcb105; + } +.datetimepicker .datetimepicker-hours td span.hour_am, +.datetimepicker .datetimepicker-hours td span.hour_pm { + width: 14.6%; + } +.datetimepicker .datetimepicker-hours fieldset legend, +.datetimepicker .datetimepicker-minutes fieldset legend { + margin-bottom: inherit; + line-height: 30px; + } +.datetimepicker td span.disabled, +.datetimepicker td span.disabled:hover { + color: #999; + cursor: default; + background: none; + } +.datetimepicker td span.active, +.datetimepicker td span.active:hover, +.datetimepicker td span.active.disabled, +.datetimepicker td span.active.disabled:hover { + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, .25); + background-color: #006af1; + border-color: #0054be; + border-color: rgba(0, 0, 0, .1) rgba(0, 0, 0, .1) rgba(0, 0, 0, .25); + } +.datetimepicker thead tr:first-child th, +.datetimepicker tfoot tr:first-child th { + cursor: pointer; + } +.datetimepicker thead tr:first-child th:hover, +.datetimepicker tfoot tr:first-child th:hover { + background: #eee; + } +.input-group.date > .input-group-addon { + border-left: none; + } +.input-append.date .add-on i, +.input-prepend.date .add-on i, +.input-group.date .input-group-addon span { + width: 14px; + height: 14px; + cursor: pointer; + } .container, .container-fluid, .container-fixed { @@ -6571,6 +6789,11 @@ body { padding-bottom: 40px; background-color: #f6f6f6; } +.layer { + border-radius: 4px; + -webkit-box-shadow: 0 0 20px 0 #bdc9d8; + box-shadow: 0 0 20px 0 #bdc9d8; + } @font-face { font-family: ZentaoIcon; font-style: normal; @@ -6792,6 +7015,9 @@ a .icon-spin { .icon-delay:before { content: "\e91c"; } +.icon-calendar:before { + content: "\e91c"; + } .icon-pause:before { content: "\e91d"; } @@ -6921,6 +7147,18 @@ a .icon-spin { .icon-star:before { content: "\e947"; } +.icon-ellipsis-v:before { + content: "\e5d4"; + } +.icon-arrow-right2:before { + content: "\e952"; + } +.icon-arrow-left:before { + content: "\e953"; + } +.icon-arrow-right3:before { + content: "\e954"; + } .icon-file-empty:before { content: "\e948"; } @@ -6951,13 +7189,13 @@ a .icon-spin { .icon-file-excel:before { content: "\e951"; } -.icon-ellipsis-v:before { - content: "\e5d4"; - } -.btn { +.btn-default { background: #fff; border-color: #d9e0e7; } +.btn-wide { + min-width: 120px; + } .label-outline.label-danger { color: #ff5d5d; background-color: #ffe5e0; @@ -6968,7 +7206,10 @@ a .icon-spin { top: -1px; width: 8px; height: 8px; - margin-right: 5px; + } +.label-dot + .status-text { + display: inline-block; + margin-left: 5px; } .project-status-delayed { color: #ff5d5d; @@ -7026,6 +7267,115 @@ a .icon-spin { color: #fff; background: #c4dfff; } +.label-level { + position: relative; + display: inline-block; + width: 24px; + height: 20px; + text-align: center; + } +.label-level:before { + position: absolute; + top: -3px; + left: 0; + z-index: 0; + font-family: ZentaoIcon; + font-size: 18px; + font-size: 24px; + font-style: normal; + font-weight: normal; + font-variant: normal; + line-height: 1; + color: #f0f2f5; + text-transform: none; + content: "\e902"; + + speak: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } +.label-level:after { + position: relative; + top: 1px; + z-index: 1; + display: inline-block; + font-size: 12px; + line-height: 18px; + color: #fff; + content: attr(data-level); + } +.label-level[data-level="1"]:before { + color: #f65f28; + } +.label-level[data-level="2"]:before { + color: #f86e29; + } +.label-level[data-level="3"]:before { + color: #f77036; + } +.label-level[data-level="4"]:before { + color: #f7824c; + } +.label-level[data-level="5"]:before { + color: #fe9527; + } +.label-level[data-level="6"]:before { + color: #fea429; + } +.task-status-wait { + color: #a6aab8; + } +.task-status-wait > .label-dot { + background-color: #7ec5ff; + } +.task-status-doing { + color: #a6aab8; + } +.task-status-doing > .label-dot { + background-color: #006af1; + } +.task-status-done { + color: #a6aab8; + } +.task-status-done > .label-dot { + background-color: #00da88; + } +.story-status-draft { + color: #7ec5ff; + } +.story-status-draft > .label-dot { + background-color: #7ec5ff; + } +.story-status-active { + color: #a6aab8; + } +.story-status-active > .label-dot { + background-color: #006af1; + } +.story-status-changed { + color: #ff5d5d; + } +.story-status-changed > .label-dot { + background-color: #ff5d5d; + } +.story-status-closed { + color: #a6aab8; + } +.bug-status-active { + color: #a6aab8; + } +.bug-status-active > .label-dot { + background-color: #006af1; + } +.bug-status-resolved { + color: #a6aab8; + } +.bug-status-resolved > .label-dot { + background-color: #00da88; + } +.bug-status-closed { + color: #a6aab8; + } .panel { position: relative; margin-bottom: 20px; @@ -7205,6 +7555,16 @@ a .icon-spin { width: 5px; height: 5px; } +.form-horizontal .form-group > label { + padding-right: 0; + } +form label { + font-weight: normal; + color: #838a9d; + } +.form-group .btn + .btn { + margin-left: 5px; + } #mainHeader { min-height: 66px; color: #fff; @@ -7283,18 +7643,28 @@ a .icon-spin { #extraNav { text-align: right; } -#extraNav a { +#extraNav > li { display: inline-block; + float: none; + text-align: left; + } +#extraNav > li > a { + display: block; + padding: 0; color: #fff; opacity: .75; } -#extraNav a + a { - margin-left: 10px; - } -#extraNav a:hover { +#extraNav > li > a:hover { text-decoration: unset; + background-color: rgba(0, 0, 0, .1); opacity: 1; } +#extraNav > li.open > a { + background-color: rgba(0, 0, 0, .1); + } +#extraNav > li + li { + margin-left: 10px; + } #userMenu { margin-top: 5px; } @@ -7306,7 +7676,7 @@ a .icon-spin { right: 0; width: 24px; height: 24px; - line-height: 24px; + line-height: 26px; color: #fff; opacity: .75; } @@ -7314,10 +7684,82 @@ a .icon-spin { color: #fff!important; background-color: #006af1; } -#searchInput { - width: 120px; +#searchbox .input-control-label-left { + position: absolute; + top: 0; + width: 70px; height: 24px; - padding: 2px 8px; + padding: 0; + overflow: visible; + line-height: 24px; + border-right: 1px solid rgba(0, 0, 0, .1); + border-radius: 12px 0 0 12px; + opacity: 1; + } +#searchbox .input-control-label-left > a { + display: block; + padding: 0 10px 0 5px; + color: rgba(0, 0, 0, .35); + text-align: center; + } +#searchbox .input-control-label-left > a > .caret { + position: absolute; + top: 10px; + right: 3px; + } +#searchbox .input-control-label-left:hover { + background: rgba(0, 0, 0, .1); + } +#searchbox .input-control-label-left:hover > a { + text-decoration: initial; + } +#searchbox .input-control-label-left .dropdown-menu { + width: 212px; + padding: 0; + overflow: hidden; + } +#searchbox .input-control-label-left .dropdown-menu > li { + display: block; + float: left; + width: 105px; + font-size: 12px; + } +#searchbox .input-control-label-left .dropdown-menu > li > a { + position: relative; + z-index: 0; + margin: -1px 0 0 -1px; + border: 1px dotted #eee; + } +#searchbox .input-control-label-left .dropdown-menu > li > a:hover { + z-index: 5; + border-color: transparent; + } +#searchbox .input-control-label-left .dropdown-menu > li.selected { + background-color: #e9f2fb; + } +#searchbox .input-control-label-left .dropdown-menu > li.selected > :before { + position: absolute; + top: 5px; + right: 5px; + display: block; + font-family: ZentaoIcon; + font-size: 18px; + font-style: normal; + font-weight: normal; + font-variant: normal; + line-height: 1; + color: #00da88; + text-transform: none; + content: "\e92b"; + + speak: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } +#searchInput { + width: 150px; + height: 24px; + padding: 2px 20px 2px 75px; background: rgba(255, 255, 255, .2); border-color: transparent; border-radius: 12px; @@ -7334,6 +7776,22 @@ a .icon-spin { #searchInput:focus + .input-control-icon-right { color: #006af1; } +#searchInput::-webkit-input-placeholder { + font-size: 12px; + color: rgba(0, 0, 0, .35); + } +#searchInput::-moz-placeholder { + font-size: 12px; + color: rgba(0, 0, 0, .35); + } +#searchInput:-ms-input-placeholder { + font-size: 12px; + color: rgba(0, 0, 0, .35); + } +#searchInput::placeholder { + font-size: 12px; + color: rgba(0, 0, 0, .35); + } #userNav { float: right; margin: 0 -6px 0 10px; @@ -7360,6 +7818,19 @@ a .icon-spin { #userNav > li.open > a { background-color: rgba(0, 0, 0, .1); } +#userNav .dropdown-menu { + width: 120px; + } +#userNav .dropdown-menu > li > a > .icon { + position: absolute; + top: 10px; + right: 5px; + display: block; + width: 20px; + height: 20px; + line-height: 20px; + text-align: center; + } #subHeader { min-height: 54px; background: #fff; @@ -7534,19 +8005,89 @@ a .icon-spin { } .block-projects .c-spark { width: 120px; + } +.block-projects td.c-spark { padding: 0; } .block-stories .c-id { + width: 55px; color: #a6aab8; } .block-stories .c-pri { + width: 45px; text-align: center; } -.block-stories .c-status { +.block-stories .c-estimate { + width: 55px; color: #a6aab8; } -.block-todoes { - margin-top: 10px; +.block-stories .c-status { + width: 80px; + } +.block-stories .c-stage { + width: 80px; + color: #a6aab8; + } +.block-stories.block-sm .estimate, +.block-stories.block-sm .c-stage, +.block-stories.block-sm .c-status .status-text { + display: none; + } +.block-stories.block-sm .c-status { + text-align: center; + } +.block-tasks .c-id { + width: 55px; + color: #a6aab8; + } +.block-tasks .c-pri { + width: 45px; + text-align: center; + } +.block-tasks .c-estimate { + width: 55px; + color: #a6aab8; + } +.block-tasks .c-deadline { + width: 95px; + color: #a6aab8; + } +.block-tasks .c-status { + width: 80px; + } +.block-tasks.block-sm .estimate, +.block-tasks.block-sm .c-deadline, +.block-tasks.block-sm .c-status .status-text { + display: none; + } +.block-tasks.block-sm .c-status { + text-align: center; + } +.block-bugs .c-id { + width: 55px; + color: #a6aab8; + } +.block-bugs .c-level { + width: 50px; + text-align: center; + } +.block-bugs .c-pri { + width: 35px; + text-align: center; + } +.block-bugs .c-deadline { + width: 95px; + color: #a6aab8; + } +.block-bugs .c-status { + width: 80px; + } +.block-bugs.block-sm .c-pri, +.block-bugs.block-sm .c-status .status-text { + display: none; + } +.block-bugs.block-sm .c-status { + text-align: center; } .block-todoes .panel-body { position: relative; @@ -7554,9 +8095,10 @@ a .icon-spin { } .block-todoes .todoes-input { position: absolute; - top: 0; - right: 20px; - left: 20px; + top: -20px; + right: 0; + left: 0; + padding: 20px; } .block-todoes .todoes-input .form-control::-webkit-input-placeholder { font-size: 12px; @@ -7580,12 +8122,16 @@ a .icon-spin { } .block-todoes .todoes { padding-left: 0; + margin: 0 -10px; } .block-todoes .todoes > li { position: relative; - padding: 5px 0 5px 25px; + padding: 5px 10px 5px 35px; list-style: none; } +.block-todoes .todoes > li:hover { + background-color: #e9f2fb; + } .block-todoes .todo-title { display: block; padding: 5px; @@ -7608,13 +8154,14 @@ a .icon-spin { .block-todoes .todo-check { position: absolute; top: 10px; - left: 0; + left: 10px; display: block; width: 20px; height: 20px; font-size: 20px; color: transparent; cursor: pointer; + background: #fff; border: 2px solid #eee; border-radius: 50%; } @@ -7623,8 +8170,71 @@ a .icon-spin { } .block-todoes .active > .todo-check { color: #00da88; + background: transparent; border: none; } +.block-todoes .todoes-form { + position: absolute; + top: -51px; + right: 0; + left: 0; + z-index: 10; + padding: 20px; + visibility: hidden; + background: #fff; + -webkit-box-shadow: 0 0 20px 0 #bdc9d8; + box-shadow: 0 0 20px 0 #bdc9d8; + opacity: 0; + -webkit-transition: .4s cubic-bezier(.175, .885, .32, 1); + -o-transition: .4s cubic-bezier(.175, .885, .32, 1); + transition: .4s cubic-bezier(.175, .885, .32, 1); + -webkit-transition-property: opacity, visibility; + -o-transition-property: opacity, visibility; + transition-property: opacity, visibility; + } +.block-todoes .todoes-form .form-group > label { + padding-left: 0; + } +.block-todoes .todoes-form .form-group > label.text-center { + text-align: center!important; + } +.block-todoes .todoes-form > .form-group:last-child { + margin-bottom: 0; + } +.block-todoes .todoes-form > h3 { + padding: 0 20px 15px; + margin: 0 -20px 15px; + font-size: 16px; + line-height: 20px; + border-bottom: 1px solid #eee; + } +.block-todoes.show-form .todoes-form { + visibility: visible; + opacity: 1; + } +.block-products .c-plans { + width: 70px; + color: #a6aab8; + text-align: center; + } +.block-products .c-publishs { + width: 70px; + color: #a6aab8; + text-align: center; + } +.block-products .c-stories { + width: 80px; + color: #a6aab8; + text-align: center; + } +.block-products .c-bugs { + width: 90px; + color: #a6aab8; + text-align: center; + } +.block-products.block-sm .c-project { + display: none; + } #footer { position: fixed; right: 0; @@ -7664,3 +8274,11 @@ a .icon-spin { #poweredBy a:hover .icon-zentao { color: #006af1; } +#test:before, +#test:after { + display: table; + content: " "; + } +#test:after { + clear: both; + } diff --git a/www/theme/zui/fonts/ZentaoIcon.eot b/www/theme/zui/fonts/ZentaoIcon.eot index 7f84879156..539316ba66 100644 Binary files a/www/theme/zui/fonts/ZentaoIcon.eot and b/www/theme/zui/fonts/ZentaoIcon.eot differ diff --git a/www/theme/zui/fonts/ZentaoIcon.svg b/www/theme/zui/fonts/ZentaoIcon.svg index a074ee7b2b..397a462fbf 100644 --- a/www/theme/zui/fonts/ZentaoIcon.svg +++ b/www/theme/zui/fonts/ZentaoIcon.svg @@ -36,7 +36,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -90,4 +90,7 @@ + + + \ No newline at end of file diff --git a/www/theme/zui/fonts/ZentaoIcon.ttf b/www/theme/zui/fonts/ZentaoIcon.ttf index 6f47e53bf3..2c7b7e1750 100644 Binary files a/www/theme/zui/fonts/ZentaoIcon.ttf and b/www/theme/zui/fonts/ZentaoIcon.ttf differ diff --git a/www/theme/zui/fonts/ZentaoIcon.woff b/www/theme/zui/fonts/ZentaoIcon.woff index 70867fc467..8831349668 100644 Binary files a/www/theme/zui/fonts/ZentaoIcon.woff and b/www/theme/zui/fonts/ZentaoIcon.woff differ