diff --git a/module/common/model.php b/module/common/model.php
index 81d1e84a7c..95cf32bdbc 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -245,7 +245,7 @@ class commonModel extends model
if(!$isGuest)
{
echo '';
- echo "";
+ echo "";
echo "" . strtoupper($app->user->account{0}) . "
\n";
echo '' . (empty($app->user->realname) ? $app->user->account : $app->user->realname) . '
';
if(isset($lang->user->roleList[$app->user->role])) echo '' . $lang->user->roleList[$app->user->role] . '
';
diff --git a/module/file/view/printfiles.html.php b/module/file/view/printfiles.html.php
index 461d935016..77c10861e9 100644
--- a/module/file/view/printfiles.html.php
+++ b/module/file/view/printfiles.html.php
@@ -83,7 +83,7 @@ $sessionString .= session_name() . '=' . session_id();
echo "";
common::printLink('file', 'edit', "fileID=$file->id", "", '', "class='edit btn-icon' title='{$lang->file->edit}'");
- if(common::hasPriv('file', 'delete')) echo html::a('###', "", '', "class='btn-icon' onclick='deleteFile($file->id)' title='$lang->delete'");
+ if(common::hasPriv('file', 'delete')) echo html::a('###', "", '', "class='btn-icon' onclick='deleteFile($file->id)' title='$lang->delete'");
echo '';
echo '';
}
diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php
index f3b01cf063..492676ba9b 100644
--- a/module/project/view/importtask.html.php
+++ b/module/project/view/importtask.html.php
@@ -54,12 +54,17 @@
id);?>
project], 2);?> |
- task->priList, $task->pri, $task->pri)?>'>pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?> |
+ pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?> |
id", $task->name)) echo $task->name;?> |
>assignedToRealName;?> |
left;?> |
delay)) echo 'delayed';?>>deadline, 0, 4) > 0) echo $task->deadline;?> |
- status;?> >task->statusList[$task->status];?> |
+
+
+
+ task->statusList[$task->status];?>
+
+ |
storyID)
diff --git a/www/js/zui/min.js b/www/js/zui/min.js
index f0604bf1a9..c059479ff9 100644
--- a/www/js/zui/min.js
+++ b/www/js/zui/min.js
@@ -74,5 +74,5 @@ function(){var t,e,i,s,n,o={}.hasOwnProperty,a=function(t,e){function i(){this.c
* Original idea by:
* Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
*/
-function(t){function e(e){if("string"==typeof e.data){var i=e.handler,s=e.data.toLowerCase().split(" ");e.handler=function(e){if(this===e.target||!/textarea|select/i.test(e.target.nodeName)&&"text"!==e.target.type){var n="keypress"!==e.type&&t.hotkeys.specialKeys[e.which],o=String.fromCharCode(e.which).toLowerCase(),a="",r={};e.altKey&&"alt"!==n&&(a+="alt+"),e.ctrlKey&&"ctrl"!==n&&(a+="ctrl+"),e.metaKey&&!e.ctrlKey&&"meta"!==n&&(a+="meta+"),e.shiftKey&&"shift"!==n&&(a+="shift+"),n?r[a+n]=!0:(r[a+o]=!0,r[a+t.hotkeys.shiftNums[o]]=!0,"shift+"===a&&(r[t.hotkeys.shiftNums[o]]=!0));for(var l=0,h=s.length;l","/":"?","\\":"|"}},t.each(["keydown","keyup","keypress"],function(){t.event.special[this]={add:e}})}(jQuery),function(t){"use strict";function e(e,i){if(e===!1)return e;if(!e)return i;e===!0?e={add:!0,"delete":!0,edit:!0,sort:!0}:"string"==typeof e&&(e=e.split(","));var s;return t.isArray(e)&&(s={},t.each(e,function(e,i){t.isPlainObject(i)?s[i.action]=i:s[i]=!0}),e=s),t.isPlainObject(e)&&(s={},t.each(e,function(e,i){i?s[e]=t.extend({type:e},a[e],t.isPlainObject(i)?i:null):s[e]=!1}),e=s),i?t.extend(!0,{},i,e):e}function i(e,i,s){return i=i||e.type,t(s||e.template).addClass("tree-action").attr(t.extend({"data-type":i,title:e.title||""},e.attr)).data("action",e)}var s="zui.tree",n=0,o=function(e,i){this.name=s,this.$=t(e),this.getOptions(i),this._init()},a={sort:{template:''},add:{template:''},edit:{template:''},"delete":{template:''}};o.DEFAULTS={animate:null,initialState:"normal",toggleTemplate:''},o.prototype.add=function(e,i,s,n,o){var a,r=t(e),l=this.options;if(r.is("li")?(a=r.children("ul"),a.length||(a=t(""),r.append(a),this._initList(a,r))):a=r,a){var h=this;t.isArray(i)||(i=[i]),t.each(i,function(e,i){var s=t("").data(i).appendTo(a);void 0!==i.id&&s.attr("data-id",i.id);var n=l.itemWrapper?t(l.itemWrapper===!0?'':l.itemWrapper).appendTo(s):s;if(i.html)n.html(i.html);else if(t.isFunction(h.options.itemCreator)){var o=h.options.itemCreator(s,i);o!==!0&&o!==!1&&n.html(o)}else i.url?n.append(t("",{href:i.url}).text(i.title||i.name)):n.append(t("").text(i.title||i.name));h._initItem(s,i.idx||e,a,i),i.children&&i.children.length&&h.add(s,i.children)}),this._initList(a),s&&!a.hasClass("tree")&&h.expand(a.parent("li"),n,o)}},o.prototype.reload=function(e){var i=this;e&&(i.$.empty(),i.add(i.$,e)),i.isPreserve&&i.store.time&&i.$.find("li:not(.tree-action-item)").each(function(){var e=t(this);i[i.store[e.data("id")]?"expand":"collapse"](e,!0,!0)})},o.prototype._initList=function(s,n,o,a){var r=this;s.hasClass("tree")?(o=0,n=null):(n=(n||s.closest("li")).addClass("has-list"),n.find(".list-toggle").length||n.prepend(this.options.toggleTemplate),o=o||n.data("idx"));var l=s.attr("data-idx",o||0).children("li:not(.tree-action-item)").each(function(e){r._initItem(t(this),e+1,s)});1!==l.length||l.find("ul").length||l.addClass("tree-single-item"),a=a||(n?n.data():null);var h=e(a?a.actions:null,this.actions);if(h){if(h.add&&h.add.templateInList!==!1){var c=s.children("li.tree-action-item");c.length?c.detach().appendTo(s):t('').append(i(h.add,"add",h.add.templateInList)).appendTo(s)}h.sort&&s.sortable(t.extend({dragCssClass:"tree-drag-holder",trigger:".sort-handler",selector:"li:not(.tree-action-item)",finish:function(t){r.callEvent("action",{action:h.sort,$list:s,target:t.target,item:a})}},h.sort.options,t.isPlainObject(this.options.sortable)?this.options.sortable:null))}n&&(n.hasClass("open")||a&&a.open)&&n.addClass("open in")},o.prototype._initItem=function(s,n,o,a){if(void 0===n){var r=s.prev("li");n=r.length?r.data("idx")+1:1}if(o=o||s.closest("ul"),s.attr("data-idx",n).removeClass("tree-single-item"),!s.data("id")){var l=n;o.hasClass("tree")||(l=o.parent("li").data("id")+"-"+l),s.attr("data-id",l)}a=a||s.data();var h=e(a.actions,this.actions);if(h){var c=s.find(".tree-actions");c.length||(c=t('').appendTo(this.options.itemWrapper?s.find(".tree-item-wrapper"):s),t.each(h,function(t,e){e&&c.append(i(e,t))}))}var d=s.children("ul");d.length&&this._initList(d,s,n,a)},o.prototype._init=function(){var i=this.options,o=this;this.actions=e(i.actions),this.$.addClass("tree"),i.animate&&this.$.addClass("tree-animate"),this._initList(this.$);var a=i.initialState,r=t.zui&&t.zui.store&&t.zui.store.enable;r&&(this.selector=s+"::"+(i.name||"")+"#"+(this.$.attr("id")||n++),this.store=t.zui.store[i.name?"get":"pageGet"](this.selector,{})),"preserve"===a&&(r?this.isPreserve=!0:this.options.initialState=a="normal"),this.reload(i.data),r&&(this.isPreserve=!0),"expand"===a?this.expand():"collapse"===a&&this.collapse(),this.$.on("click",'.list-toggle,a[href="#"],.tree-toggle',function(e){var i=t(this),s=i.parent("li");o.callEvent("hit",{target:s,item:s.data()}),o.toggle(s),i.is("a")&&e.preventDefault()}).on("click",".tree-action",function(){var e=t(this),i=e.data();if(i.action&&(i=i.action),"sort"!==i.type){var s=e.closest("li:not(.tree-action-item)");o.callEvent("action",{action:i,target:this,$item:s,item:s.data()})}})},o.prototype.preserve=function(e,i,s){if(this.isPreserve)if(e)i=i||e.data("id"),s=void 0===s&&e.hasClass("open"),s?this.store[i]=s:delete this.store[i],this.store.time=(new Date).getTime(),t.zui.store[this.options.name?"set":"pageSet"](this.selector,this.store);else{var n=this;this.store={},this.$.find("li").each(function(){n.preserve(t(this))})}},o.prototype.expand=function(t,e,i){t?(t.addClass("open"),!e&&this.options.animate?setTimeout(function(){t.addClass("in")},10):t.addClass("in")):t=this.$.find("li.has-list").addClass("open in"),i||this.preserve(t),this.callEvent("expand",t,this)},o.prototype.show=function(e,i,s){var n=this;e.each(function(){var e=t(this);if(n.expand(e,i,s),e)for(var o=e.parent("ul");o&&o.length&&!o.hasClass("tree");){var a=o.parent("li");a.length?(n.expand(a,i,s),o=a.parent("ul")):o=!1}})},o.prototype.collapse=function(t,e,i){t?!e&&this.options.animate?(t.removeClass("in"),setTimeout(function(){t.removeClass("open")},300)):t.removeClass("open in"):t=this.$.find("li.has-list").removeClass("open in"),i||this.preserve(t),this.callEvent("collapse",t,this)},o.prototype.toggle=function(t){var e=t&&t.hasClass("open")||t===!1||void 0===t&&this.$.find("li.has-list.open").length;this[e?"collapse":"expand"](t)},o.prototype.getOptions=function(e){this.options=t.extend({},o.DEFAULTS,this.$.data(),e),null===this.options.animate&&this.$.hasClass("tree-animate")&&(this.options.animate=!0)},o.prototype.toData=function(e,i){t.isFunction(e)&&(i=e,e=null),e=e||this.$;var s=this;return e.children("li:not(.tree-action-item)").map(function(){var e=t(this),n=e.data();delete n["zui.droppable"];var o=e.children("ul");return o.length&&(n.children=s.toData(o)),t.isFunction(i)?i(n,e):n}).get()},o.prototype.callEvent=function(e,i){var s;return t.isFunction(this.options[e])&&(s=this.options[e](i,this)),this.$.trigger(t.Event(e+"."+this.name,i)),s},t.fn.tree=function(e,i){return this.each(function(){var n=t(this),a=n.data(s),r="object"==typeof e&&e;a||n.data(s,a=new o(this,r)),"string"==typeof e&&a[e](i)})},t.fn.tree.Constructor=o,t(function(){t('[data-ride="tree"]').tree()})}(jQuery),function(t){"use strict";var e="zui.colorPicker",i='',s={zh_cn:{errorTip:"不是有效的颜色值"},zh_tw:{errorTip:"不是有效的顏色值"},en:{errorTip:"Not a valid color value"}},n=function(i,s){this.name=e,this.$=t(i),this.getOptions(s),this.init()};n.DEFAULTS={colors:["#00BCD4","#388E3C","#3280fc","#3F51B5","#9C27B0","#795548","#F57C00","#F44336","#E91E63"],pullMenuRight:!0,wrapper:"btn-wrapper",tileSize:30,lineCount:5,optional:!0,tooltip:"top",icon:"caret-down",updateBtn:"auto"},n.prototype.init=function(){var e=this,s=e.options,n=e.$,o=n.parent(),a=!1;o.hasClass("colorpicker")?e.$picker=o:(e.$picker=t(s.template||i),a=!0),e.$picker.addClass(s.wrapper).find(".cp-title").toggle(void 0!==s.title).text(s.title),e.$menu=e.$picker.find(".dropdown-menu").toggleClass("pull-right",s.pullMenuRight),e.$btn=e.$picker.find(".btn.dropdown-toggle"),e.$btn.find(".ic").addClass("icon-"+s.icon),s.btnTip&&e.$picker.attr("data-toggle","tooltip").tooltip({title:s.btnTip,placement:s.tooltip,container:"body"}),n.attr("data-provide",null),a&&n.after(e.$picker),e.colors={},t.each(s.colors,function(i,s){if(t.zui.Color.isColor(s)){var n=new t.zui.Color(s);e.colors[n.toCssStr()]=n}}),e.updateColors(),e.$picker.on("click",".cp-tile",function(){e.setValue(t(this).data("color"))});var r=function(){var i=n.val(),o=t.zui.Color.isColor(i);n.parent().toggleClass("has-error",!(o||s.optional&&""===i)),o?e.setValue(i,!0):s.optional&&""===i?n.tooltip("hide"):n.is(":focus")||n.tooltip("show",s.errorTip)};n.is("input:not([type=hidden])")?(s.tooltip&&n.attr("data-toggle","tooltip").tooltip({trigger:"manual",placement:s.tooltip,tipClass:"tooltip-danger",container:"body"}),n.on("keyup paste input change",r)):n.appendTo(e.$picker),r()},n.prototype.addColor=function(e){e instanceof t.zui.Color||(e=new t.zui.Color(e));var i=e.toCssStr(),s=this.options;this.colors[i]||(this.colors[i]=e);var n=t('',{titile:e}).data("color",e).css({color:e.contrast().toCssStr(),background:i,"border-color":e.luma()>.43?"#ccc":"transparent"}).attr("data-color",i);this.$menu.append(t("").css({width:s.tileSize,height:s.tileSize}).append(n)),s.optional&&this.$menu.find(".cp-tile.empty").parent().detach().appendTo(this.$menu)},n.prototype.updateColors=function(e){var i=(this.$picker,this.$menu.children("li:not(.heading)").remove()),s=this.options,e=e||this.colors,n=this,o=0;if(t.each(e,function(t,e){n.addColor(e),o++}),s.optional){var a=t('').css({width:s.tileSize,height:s.tileSize});this.$menu.append(a),o++}i.css("width",Math.min(o,s.lineCount)*s.tileSize+6)},n.prototype.setValue=function(e,i){var s=this,n=s.options,o=s.$btn;s.$menu.find(".cp-tile.active").removeClass("active");var a="",r=n.updateBtn;if("auto"===r){var l=o.find(".color-bar");r=!l.length||function(t){l.css("background",t||"")}}if(e){var h=new t.zui.Color(e);a=h.toCssStr().toLowerCase(),r&&(t.isFunction(r)?r(a,o,s):o.css({background:a,color:h.contrast().toCssStr(),borderColor:h.luma()>.43?"#ccc":a})),s.colors[a]||s.addColor(h),i||s.$.val().toLowerCase()===a||s.$.val(a).trigger("change"),s.$menu.find('.cp-tile[data-color="'+a+'"]').addClass("active"),s.$.tooltip("hide"),s.$.trigger("colorchange",h)}else r&&(t.isFunction(r)?r(null,o,s):o.attr("style",null)),i||""===s.$.val()||s.$.val(a).trigger("change"),n.optional&&s.$.tooltip("hide"),s.$menu.find(".cp-tile.empty").addClass("active"),s.$.trigger("colorchange",null);n.updateBorder&&t(n.updateBorder).css("border-color",a),n.updateBackground&&t(n.updateBackground).css("background-color",a),n.updateColor&&t(n.updateColor).css("color",a),n.updateText&&t(n.updateText).text(a)},n.prototype.getOptions=function(e){var i=t.extend({},n.DEFAULTS,this.$.data(),e);"string"==typeof i.colors&&(i.colors=i.colors.split(","));var o=(i.lang||t.zui.clientLang()).toLowerCase();i.errorTip||(i.errorTip=s[o].errorTip),t.fn.tooltip||(i.btnTip=!1),this.options=i},t.fn.colorPicker=function(i){return this.each(function(){var s=t(this),o=s.data(e),a="object"==typeof i&&i;o||s.data(e,o=new n(this,a)),"string"==typeof i&&o[i]()})},t.fn.colorPicker.Constructor=n,t(function(){t('[data-provide="colorpicker"]').colorPicker()})}(jQuery),function(t,e){function i(t){return t===e&&(t=s+=1),n[t%n.length]}var s=0,n=["#00a9fc","#ff5d5d","#fdc137","#00da88","#7ec5ff","#8666b8","#bd7b46","#ff9100","#ff3d00","#f57f17","#00e5ff","#00b0ff","#2979ff","#3d5afe","#651fff","#d500f9","#f50057","#ff1744"];jQuery.fn.tableChart=function(){t(this).each(function(){var e=t(this),s=e.data(),n=s.chart||"pie",o=t(s.target);if(o.length){var a=null;if("pie"===n){s=t.extend({scaleShowLabels:!0,scaleLabel:"<%=label%>: <%=value%>"},s);var r=[],l=e.find("tbody > tr").each(function(e){var s=t(this),n=i();s.attr("data-id",e).find(".chart-color-dot").css("background",n),r.push({label:s.find(".chart-label").text(),value:parseInt(s.find(".chart-value").text()),color:n,id:e})});r.length>1?s.scaleLabelPlacement="outside":1===r.length&&(s.scaleLabelPlacement="inside",r.push({label:"",value:r[0].value/2e3,color:"#fff",showLabel:!1})),a=o.pieChart(r,s),o.on("mousemove",function(t){var e=a.getSegmentsAtEvent(t);l.removeClass("active"),e.length&&l.filter('[data-id="'+e[0].id+'"]').addClass("active")})}else if("bar"===n){var h=i(),c=[],d={label:e.find("thead .chart-label").text(),color:h,data:[]},l=e.find("tbody > tr").each(function(e){var i=t(this);c.push(i.find(".chart-label").text()),d.data.push(parseInt(i.find(".chart-value").text())),i.find(".chart-color-dot").css("background",h)}),r={labels:c,datasets:[d]};c.length&&(s.barValueSpacing=5),a=o.barChart(r,s)}else if("line"===n){var h=i(),c=[],d={label:e.find("thead .chart-label").text(),color:h,data:[]},l=e.find("tbody > tr").each(function(e){var i=t(this);c.push(i.find(".chart-label").text()),d.data.push(parseInt(i.find(".chart-value").text())),i.find(".chart-color-dot").css("background",h)}),r={labels:c,datasets:[d]};c.length&&(s.barValueSpacing=5),a=o.lineChart(r,s)}null!==a&&e.data("zui.chart",a)}})};var o=function(i,s){var n=t(i),o=n.is("canvas")?n:n.find("canvas"),a=t.extend({value:0,color:"#006af1",backColor:"#E9F2FB",doughnut:!0,doughnutSize:85,width:20,height:20,showTip:!1,name:"",tipTemplate:"<%=value%>%",animation:"auto",realValue:parseFloat(n.find(".progress-value").text())},s,n.data()),r=o.length;r||(o=t(" |