From c0a9d8eb613df7b4c1a01a03349b217e1273db48 Mon Sep 17 00:00:00 2001 From: liugang Date: Wed, 16 May 2018 15:06:01 +0800 Subject: [PATCH 1/4] * Adjust style. --- module/file/view/printfiles.html.php | 2 +- module/project/view/importtask.html.php | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) 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) From 9a7263b4274946b606e8625eb3e6cb938f3e61d5 Mon Sep 17 00:00:00 2001 From: Catouse Date: Wed, 16 May 2018 15:08:45 +0800 Subject: [PATCH 2/4] * update zui files. --- www/js/zui/min.js | 2 +- www/theme/zui/css/min.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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("