my->changePassword;?>

@@ -18,7 +23,7 @@
- + diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 7364631108..57b8645478 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -64,9 +64,10 @@ if(count($plans) != 1) { echo "
"; - echo html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch"), "", '_blank', "class='btn' data-toggle='tooltip' title='{$lang->productplan->create}'"); - echo '  '; - echo html::a("javascript:loadProductPlans($productID)", "", '', "class='btn' data-toggle='tooltip' title='{$lang->refresh}'"); + echo html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch"), "", '_blank', "class='btn btn-icon' data-toggle='tooltip' title='{$lang->productplan->create}'"); + echo '
'; + echo "
"; + echo html::a("javascript:loadProductPlans($productID)", "", '', "class='btn btn-icon' data-toggle='tooltip' title='{$lang->refresh}'"); echo '
'; } ?> diff --git a/www/js/my.full.js b/www/js/my.full.js index b8b71efacd..1854bbc05f 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -504,7 +504,7 @@ function ajaxGetContacts(obj) $inputgroup = $(obj).closest('.input-group'); $inputgroup.find('.input-group-btn').remove(); $inputgroup.append(contacts); - $inputgroup.find('select:last').chosen(defaultChosenOptions); + $inputgroup.find('select:last').chosen(defaultChosenOptions).fixInputGroup(); }); } diff --git a/www/js/zui/min.js b/www/js/zui/min.js index 2bb1bd06e2..d09dc7634c 100644 --- a/www/js/zui/min.js +++ b/www/js/zui/min.js @@ -1,5 +1,5 @@ /*! - * ZUI: Zentao template - v1.8.1 - 2018-05-25 + * ZUI: Zentao template - v1.8.1 - 2018-05-28 * http://zui.sexy * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2018 cnezsoft.com; Licensed MIT @@ -16,7 +16,7 @@ function(t,e,i){"$:nomunge";function n(){s=e[r](function(){o.each(function(){var * Copyright 2006, 2014 Klaus Hartl * Released under the MIT license */ -function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t("object"==typeof exports?require("jquery"):jQuery)}(function(t){function e(t){return r.raw?t:encodeURIComponent(t)}function i(t){return r.raw?t:decodeURIComponent(t)}function n(t){return e(r.json?JSON.stringify(t):String(t))}function s(t){0===t.indexOf('"')&&(t=t.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return t=decodeURIComponent(t.replace(a," ")),r.json?JSON.parse(t):t}catch(e){}}function o(e,i){var n=r.raw?e:s(e);return t.isFunction(i)?i(n):n}var a=/\+/g,r=t.cookie=function(s,a,l){if(void 0!==a&&!t.isFunction(a)){if(l=t.extend({},r.defaults,l),"number"==typeof l.expires){var h=l.expires,c=l.expires=new Date;c.setTime(+c+864e5*h)}return document.cookie=[e(s),"=",n(a),l.expires?"; expires="+l.expires.toUTCString():"",l.path?"; path="+l.path:"",l.domain?"; domain="+l.domain:"",l.secure?"; secure":""].join("")}for(var d=s?void 0:{},u=document.cookie?document.cookie.split("; "):[],p=0,f=u.length;p=0;t--)delete this.page[i[t]];this.set(o,this.page)}},a.prototype.pageRemove=function(t){"undefined"!=typeof this.page[t]&&(this.page[t]=null,this.pageSave())},a.prototype.pageClear=function(){this.page={},this.pageSave()},a.prototype.pageGet=function(t,e){var i=this.page[t];return void 0===e||null!==i&&void 0!==i?i:e},a.prototype.pageSet=function(t,i){e.isPlainObject(t)?e.extend(!0,this.page,t):this.page[this.serialize(t)]=i,this.pageSave()},a.prototype.check=function(){if(!this.enable&&!this.slience)throw new Error("Browser not support localStorage or enable status been set true.");return this.enable},a.prototype.length=function(){return this.check()?i.getLength?i.getLength():i.length:0},a.prototype.removeItem=function(t){return i.removeItem(t),this},a.prototype.remove=function(t){return this.removeItem(t)},a.prototype.getItem=function(t){return i.getItem(t)},a.prototype.get=function(t,e){var i=this.deserialize(this.getItem(t));return"undefined"!=typeof i&&null!==i||"undefined"==typeof e?i:e},a.prototype.key=function(t){return i.key(t)},a.prototype.setItem=function(t,e){return i.setItem(t,e),this},a.prototype.set=function(t,e){return void 0===e?this.remove(t):(this.setItem(t,this.serialize(e)),this)},a.prototype.clear=function(){return i.clear(),this},a.prototype.forEach=function(t){for(var e=this.length(),n=e-1;n>=0;n--){var s=i.key(n);t(s,this.get(s))}return this},a.prototype.getAll=function(){var t={};return this.forEach(function(e,i){t[e]=i}),t},a.prototype.serialize=function(t){return"string"==typeof t?t:JSON.stringify(t)},a.prototype.deserialize=function(t){if("string"==typeof t)try{return JSON.parse(t)}catch(e){return t||void 0}},e.zui({store:new a})}(window,jQuery),function(t){"use strict";var e="zui.searchBox",i=function(e,n){var s=this;s.name=name,s.$=t(e),s.options=n=t.extend({},i.DEFAULTS,s.$.data(),n);var o=s.$.is(n.inputSelector)?s.$:s.$.find(n.inputSelector);if(o.length){var a=function(){s.changeTimer&&(clearTimeout(s.changeTimer),s.changeTimer=null)},r=function(){a();var t=s.getSearch();if(t!==s.lastValue){var e=""===t;o.toggleClass("empty",e),s.$.callComEvent(s,"onSearchChange",[t,e]),s.lastValue=t}};s.$input=o=o.first(),o.on(n.listenEvent,function(t){s.changeTimer=setTimeout(function(){r()},n.changeDelay)}).on("focus",function(t){o.addClass("focus"),s.$.callComEvent(s,"onFocus",[t])}).on("blur",function(t){o.removeClass("focus"),s.$.callComEvent(s,"onBlur",[t])}).on("keydown",function(t){var e=0,i=t.which;27===i&&n.escToClear?(this.setSearch("",!0),r(),e=1):13===i&&n.onPressEnter&&(r(),s.$.callComEvent(s,"onPressEnter",[t]));var o=s.$.callComEvent(s,"onKeyDown",[t]);o===!1&&(e=1),e&&t.preventDefault()}),s.$.on("click",".search-clear-btn",function(t){s.setSearch("",!0),r(),s.focus(),t.preventDefault()}),r()}else console.error("ZUI: search box init error, cannot find search box input element.")};i.DEFAULTS={inputSelector:'input[type="search"],input[type="text"]',listenEvent:"change input paste",changeDelay:500},i.prototype.getSearch=function(){return this.$input&&t.trim(this.$input.val())},i.prototype.setSearch=function(t,e){var i=this.$input;i&&(i.val(t),e||i.trigger("change"))},i.prototype.focus=function(){this.$input&&this.$input.focus()},t.fn.searchBox=function(n){return this.each(function(){var s=t(this),o=s.data(e),a="object"==typeof n&&n;o||s.data(e,o=new i(this,a)),"string"==typeof n&&o[n]()})},i.NAME=e,t.fn.searchBox.Constructor=i}(jQuery),function(t,e){"use strict";var i="zui.draggable",n={container:"body",move:!0},s=0,o=function(e,i){var o=this;o.$=t(e),o.id=s++,o.options=t.extend({},n,o.$.data(),i),o.init()};o.DEFAULTS=n,o.NAME=i,o.prototype.init=function(){var n,s,o,a,r,l=this,h=l.$,c="before",d="drag",u="finish",p="."+i+"."+l.id,f="mousedown"+p,g="mouseup"+p,m="mousemove"+p,v=l.options,y=v.selector,b=v.handle,w=h,x=t.isFunction(v.move),C=function(t){var e=t.pageX,i=t.pageY;r=!0;var s={left:e-o.x,top:i-o.y};w.removeClass("drag-ready").addClass("dragging"),v.move&&(x?v.move(s,w):w.css(s)),v[d]&&v[d]({event:t,element:w,startOffset:o,pos:s,offset:{x:e-n.x,y:i-n.y},smallOffset:{x:e-a.x,y:i-a.y}}),a.x=e,a.y=i,v.stopPropagation&&t.stopPropagation()},_=function(i){if(t(e).off(p),!r)return void w.removeClass("drag-ready");var s={left:i.pageX-o.x,top:i.pageY-o.y};w.removeClass("drag-ready dragging"),v.move&&(x?v.move(s,w):w.css(s)),v[u]&&v[u]({event:i,element:w,startOffset:o,pos:s,offset:{x:i.pageX-n.x,y:i.pageY-n.y},smallOffset:{x:i.pageX-a.x,y:i.pageY-a.y}}),i.preventDefault(),v.stopPropagation&&i.stopPropagation()},k=function(i){var l=t.zui.getMouseButtonCode(v.mouseButton);if(!(l>-1&&i.button!==l)){var h=t(this);if(y&&(w=b?h.closest(y):h),v[c]){var d=v[c]({event:i,element:w});if(d===!1)return}var u=t(v.container),p=w.offset();s=u.offset(),n={x:i.pageX,y:i.pageY},o={x:i.pageX-p.left+s.left,y:i.pageY-p.top+s.top},a=t.extend({},n),r=!1,w.addClass("drag-ready"),i.preventDefault(),v.stopPropagation&&i.stopPropagation(),t(e).on(m,C).on(g,_)}};b?h.on(f,b,k):y?h.on(f,y,k):h.on(f,k)},o.prototype.destroy=function(){var n="."+i+"."+this.id;this.$.off(n),t(e).off(n),this.$.data(i,null)},t.fn.draggable=function(e){return this.each(function(){var n=t(this),s=n.data(i),a="object"==typeof e&&e;s||n.data(i,s=new o(this,a)),"string"==typeof e&&s[e]()})},t.fn.draggable.Constructor=o}(jQuery,document),function(t,e,i){"use strict";var n="zui.droppable",s={target:".droppable-target",deviation:5,sensorOffsetX:0,sensorOffsetY:0},o=0,a=function(e,i){var n=this;n.id=o++,n.$=t(e),n.options=t.extend({},s,n.$.data(),i),n.init()};a.DEFAULTS=s,a.NAME=n,a.prototype.trigger=function(e,i){return t.zui.callEvent(this.options[e],i,this)},a.prototype.init=function(){var s,o,a,r,l,h,c,d,u,p,f,g,m,v=this,y=v.$,b=v.options,w=b.deviation,x="."+n+"."+v.id,C="mousedown"+x,_="mouseup"+x,k="mousemove"+x,T=b.selector,S=b.handle,D=b.flex,M=b.container,P=b.canMoveHere,F=y,L=!1,z=M?t(b.container).first():T?y:t("body"),$=function(e){if(L&&(f={left:e.pageX,top:e.pageY},!(i.abs(f.left-d.left)o&&f.top>a&&f.left-1&&i.button!==n)){var f=t(this);T&&(F=S?f.closest(T):f),F.hasClass("drag-shadow")||b.before&&b.before({event:i,element:F})===!1||(L=!0,s=t.isFunction(b.target)?b.target(F,y):z.find(b.target),o=null,a=null,r=!1,l=!0,h=null,c=F.offset(),u=z.offset(),d={left:i.pageX,top:i.pageY},g=t.extend({},d),p={left:d.left-c.left,top:d.top-c.top},F.addClass("drag-from"),t(e).on(k,$).on(_,E),m=setTimeout(function(){t(e).on(C,E)},10),i.preventDefault())}};S?y.on(C,S,I):T?y.on(C,T,I):y.on(C,I)},a.prototype.destroy=function(){var i="."+n+"."+this.id;this.$.off(i),t(e).off(i),this.$.data(n,null)},a.prototype.reset=function(){this.destroy(),this.init()},t.fn.droppable=function(e){return this.each(function(){var i=t(this),s=i.data(n),o="object"==typeof e&&e;s||i.data(n,s=new a(this,o)),"string"==typeof e&&s[e]()})},t.fn.droppable.Constructor=a}(jQuery,document,Math),+function(t,e){"use strict";function i(e,i,o){return this.each(function(){var a=t(this),r=a.data(n),l=t.extend({},s.DEFAULTS,a.data(),"object"==typeof e&&e);r||a.data(n,r=new s(this,l)),"string"==typeof e?r[e](i,o):l.show&&r.show(i,o)})}var n="zui.modal",s=function(i,s){var o=this;o.options=s,o.$body=t(document.body),o.$element=t(i),o.$backdrop=o.isShown=null,o.scrollbarWidth=0,s.moveable===e&&(o.options.moveable=o.$element.hasClass("modal-moveable")),s.remote&&o.$element.find(".modal-content").load(s.remote,function(){o.$element.trigger("loaded."+n)})};s.VERSION="3.2.0",s.TRANSITION_DURATION=300,s.BACKDROP_TRANSITION_DURATION=150,s.DEFAULTS={backdrop:!0,keyboard:!0,show:!0,position:"fit"};var o=function(e,i){var n=t(window);i.left=Math.max(0,Math.min(i.left,n.width()-e.outerWidth())),i.top=Math.max(0,Math.min(i.top,n.height()-e.outerHeight())),e.css(i)};s.prototype.toggle=function(t,e){return this.isShown?this.hide():this.show(t,e)},s.prototype.ajustPosition=function(i){var s=this,a=s.options;if(i===e&&(i=a.position),i!==e){t.isFunction(i)&&(i=i(s));var r=s.$element.find(".modal-dialog"),l=Math.max(0,(t(window).height()-r.outerHeight())/2);if("fit"===i?i={top:Math.floor(2*l/3)}:"center"===i?i={top:l}:t.isPlainObject(i)||(i={top:i}),r.hasClass("modal-moveable")){var h=null,c=a.rememberPos;c&&(c===!0?h=s.$element.data("modal-pos"):t.zui.store&&(h=t.zui.store.pageGet(n+".rememberPos."+c))),i=t.extend(i,{left:Math.max(0,(t(window).width()-r.outerWidth())/2)},h),"inside"===a.moveable?o(r,i):r.css(i)}else r.css(i)}},s.prototype.setMoveale=function(){t.fn.draggable||console.error("Moveable modal requires draggable.js.");var e=this,i=e.options,s=e.$element.find(".modal-dialog").removeClass("modal-dragged");s.toggleClass("modal-moveable",!!i.moveable),e.$element.data("modal-moveable-setup")||s.draggable({container:e.$element,handle:".modal-header",before:function(){var t=s.css("margin-top");t&&"0px"!==t&&s.css("top",t).css("margin-top","").addClass("modal-dragged")},finish:function(s){var o=i.rememberPos;o&&(e.$element.data("modal-pos",s.pos),t.zui.store&&o!==!0&&t.zui.store.pageSet(n+".rememberPos."+o,s.pos))},move:"inside"!==i.moveable||function(t){o(s,t)}})},s.prototype.show=function(e,i){var o=this,a=t.Event("show."+n,{relatedTarget:e});o.$element.trigger(a),o.isShown||a.isDefaultPrevented()||(o.isShown=!0,o.options.moveable&&o.setMoveale(),o.checkScrollbar(),o.options.backdrop!==!1&&(o.$body.addClass("modal-open"),o.setScrollbar()),o.escape(),o.$element.on("click.dismiss."+n,'[data-dismiss="modal"]',function(t){o.hide(),t.stopPropagation()}),o.backdrop(function(){var a=t.support.transition&&o.$element.hasClass("fade");o.$element.parent().length||o.$element.appendTo(o.$body),o.$element.show().scrollTop(0),a&&o.$element[0].offsetWidth,o.$element.addClass("in").attr("aria-hidden",!1),o.ajustPosition(i),o.enforceFocus();var r=t.Event("shown."+n,{relatedTarget:e});a?o.$element.find(".modal-dialog").one("bsTransitionEnd",function(){o.$element.trigger("focus").trigger(r)}).emulateTransitionEnd(s.TRANSITION_DURATION):o.$element.trigger("focus").trigger(r)}))},s.prototype.hide=function(e){e&&e.preventDefault();var i=this;e=t.Event("hide."+n),i.$element.trigger(e),i.isShown&&!e.isDefaultPrevented()&&(i.isShown=!1,i.options.backdrop!==!1&&(i.$body.removeClass("modal-open"),i.resetScrollbar()),i.escape(),t(document).off("focusin."+n),i.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss."+n),t.support.transition&&i.$element.hasClass("fade")?i.$element.one("bsTransitionEnd",t.proxy(i.hideModal,i)).emulateTransitionEnd(s.TRANSITION_DURATION):i.hideModal())},s.prototype.enforceFocus=function(){t(document).off("focusin."+n).on("focusin."+n,t.proxy(function(t){this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")},this))},s.prototype.escape=function(){this.isShown&&this.options.keyboard?t(document).on("keydown.dismiss."+n,t.proxy(function(i){if(27==i.which){var s=t.Event("escaping."+n),o=this.$element.triggerHandler(s,"esc");if(o!=e&&!o)return;this.hide()}},this)):this.isShown||t(document).off("keydown.dismiss."+n)},s.prototype.hideModal=function(){var t=this;this.$element.hide(),this.backdrop(function(){t.$element.trigger("hidden."+n)})},s.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},s.prototype.backdrop=function(e){var i=this,o=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var a=t.support.transition&&o;if(this.$backdrop=t('
user->account;?>user->account;?> account . html::hidden('account',$user->account);?>