From 60ec826bd9e108fb8e9ebb9d1ee3f1bca6c17132 Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 18 Sep 2018 17:02:34 +0800 Subject: [PATCH 1/5] * refactor codes. --- module/block/css/dashboard.css | 1 - module/block/view/dynamic.html.php | 5 ++--- module/common/view/tablesorter.html.php | 7 ++++--- www/theme/default/style.css | 10 ---------- www/theme/zui/css/min.css | 6 +++--- 5 files changed, 9 insertions(+), 20 deletions(-) diff --git a/module/block/css/dashboard.css b/module/block/css/dashboard.css index 8e8bda694d..f579959db6 100644 --- a/module/block/css/dashboard.css +++ b/module/block/css/dashboard.css @@ -7,7 +7,6 @@ body{padding-bottom: 20px;} #dashboard .panel-body.has-table {padding-top: 0;} #dashboard .panel-move-handler {position: absolute; top: 0; left: 0; right: 50px; height: 40px; z-index: 10; cursor: move;} #dashboard .panel-heading {cursor: move; padding-right: 75px;} -#dashboard .panel.table-scrolled .table-header-fixed {border-bottom: 1px solid #e5e5e5;} @media (min-width: 992px) { #dashboard > .row {display: table; width: 100%; margin: 0;} diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php index 976703d0d5..3ffac884c6 100644 --- a/module/block/view/dynamic.html.php +++ b/module/block/view/dynamic.html.php @@ -2,13 +2,12 @@
block->emptyTip;?>
- +
tree->name}'")?>
tree->short}'")?>
- +
branch);?>
@@ -98,7 +98,7 @@
tree->short}'");?>
- +
branch);?> @@ -108,12 +108,12 @@ - session->taskList ? html::linkButton($this->lang->goback, $this->session->taskList, '', '', 'btn btn-wide') : html::backButton('', '', 'btn btn-wide'); echo html::hidden('parentModuleID', $currentModuleID); echo html::hidden('maxOrder', $maxOrder); - ?> + ?> @@ -147,7 +147,7 @@ $(function() if(item.nodeType) $li.addClass('tree-item-' + item.nodeType); return true; }, - actions: + actions: { sort: { diff --git a/module/webhook/view/browse.html.php b/module/webhook/view/browse.html.php index 508378752e..d15f6d307d 100644 --- a/module/webhook/view/browse.html.php +++ b/module/webhook/view/browse.html.php @@ -39,7 +39,7 @@ if(common::hasPriv('webhook', 'delete')) { $deleteURL = $this->createLink('webhook', 'delete', "webhookID=$id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '', '', "title='{$lang->webhook->delete}' class='btn'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '', '', "title='{$lang->webhook->delete}' class='btn'"); } ?> From 946dd1d9ce0871252e227f422c131a6099cc129f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Wed, 19 Sep 2018 07:52:35 +0800 Subject: [PATCH 5/5] * Fix task#4854. --- module/common/lang/en.php | 2 +- module/common/lang/zh-cn.php | 2 +- module/extension/view/erase.html.php | 2 +- module/task/view/recordestimate.html.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index b9f6edc4db..75fda120d2 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -569,7 +569,7 @@ $lang->icons['batchCreate'] = 'plus-sign'; $lang->icons['batchEdit'] = 'edit-sign'; $lang->icons['batchClose'] = 'off'; $lang->icons['edit'] = 'edit'; -$lang->icons['delete'] = 'trash'; +$lang->icons['delete'] = 'close'; $lang->icons['copy'] = 'copy'; $lang->icons['report'] = 'bar-chart'; $lang->icons['export'] = 'export'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index edf79c3ac3..d9f1889bc4 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -569,7 +569,7 @@ $lang->icons['batchCreate'] = 'plus-sign'; $lang->icons['batchEdit'] = 'edit-sign'; $lang->icons['batchClose'] = 'off'; $lang->icons['edit'] = 'edit'; -$lang->icons['delete'] = 'trash'; +$lang->icons['delete'] = 'close'; $lang->icons['copy'] = 'copy'; $lang->icons['report'] = 'bar-chart'; $lang->icons['export'] = 'export'; diff --git a/module/extension/view/erase.html.php b/module/extension/view/erase.html.php index cc8cd28905..c5852376b8 100644 --- a/module/extension/view/erase.html.php +++ b/module/extension/view/erase.html.php @@ -17,7 +17,7 @@

icons['extension']);?> - extension->erase;?> + extension->erase;?>

diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php index 8e04259c75..881f923a35 100644 --- a/module/task/view/recordestimate.html.php +++ b/module/task/view/recordestimate.html.php @@ -62,7 +62,7 @@ if($task->status == 'wait' or $task->status == 'pause' or $task->status == 'doing') { common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true); - common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'trash', 'hiddenwin', 'showinonlybody'); + common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'close', 'hiddenwin', 'showinonlybody'); } ?>