From 2f535bf4cf5b57cb265dfd804211d7a8e64f33a4 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Thu, 28 Apr 2016 10:10:58 +0800
Subject: [PATCH]  * change dashboard UI.

---
 module/block/css/dashboard.css       | 7 +++++--
 module/block/js/dashboard.js         | 2 +-
 module/block/lang/zh-cn.php          | 4 ++--
 module/block/view/dashboard.html.php | 3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/module/block/css/dashboard.css b/module/block/css/dashboard.css
index d4396bf718..94c2ceba63 100644
--- a/module/block/css/dashboard.css
+++ b/module/block/css/dashboard.css
@@ -20,9 +20,12 @@ body {background: #fafafa;}
 .dashboard .panel-dragging-shadow {position: absolute;}
 .dashboard-empty-message {text-align: center; margin-top: 100px;}
 .dashboard-empty-message > h5 {margin-bottom: 20px;}
+.dashboard-actions {text-align: right; margin-top: -10px; margin-right: 10px; margin-bottom: 10px;}
+.dashboard-actions > a {display: inline-block; width: 20px; height: 20px; text-align: center; color: #999; border: 1px solid #999; line-height: 20px; background: #999; color: #fff}
+.dashboard-actions > a:hover {background: #2e6dad; border-color: #2e6dad}
 
-.outer {background-color: #fafafa}
-.outer > .dashboard {margin-left: -10px; margin-right: -10px;}
+#wrap .outer {background-color: #fafafa;}
+#wrap .outer > .dashboard {margin-left: -10px; margin-right: -10px;}
 
 /* panel style */
 .panel-block .table th {background-color: #fafafa}
diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js
index b906ecca47..8ff63ed654 100644
--- a/module/block/js/dashboard.js
+++ b/module/block/js/dashboard.js
@@ -120,7 +120,7 @@ $(function()
         afterRefresh      : initTableHeader
     });
 
-    $dashboard.find('ul.dashboard-actions').addClass('hide').children('li').addClass('right').appendTo($('#modulemenu > .nav'));
+    // $dashboard.find('ul.dashboard-actions').addClass('hide').children('li').addClass('right').appendTo($('#modulemenu > .nav'));
     $dashboard.find('[data-toggle=tooltip]').tooltip({container: 'body'});
 
     checkEmpty();
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 5e29d3df06..da7d38c78b 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -242,8 +242,8 @@ $lang->block->modules['common'] = new stdclass();
 $lang->block->modules['common']->moreLinkList = new stdclass();
 $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|';
 
-$lang->block->flowchart = array();
-$lang->block->flowchart[] = array('管理员', '维护公司', '添加用户', '维护权限');
+$lang->block->flowchart   = array();
+$lang->block->flowchart[] = array('管理员',   '维护公司', '添加用户', '维护权限');
 $lang->block->flowchart[] = array('产品经理', '创建产品', '维护模块', '维护计划', '维护需求', '创建发布');
 $lang->block->flowchart[] = array('项目经理', '创建项目', '维护团队', '关联产品', '关联需求', '分解任务');
 $lang->block->flowchart[] = array('研发人员', '领取任务和Bug', '更新状态', '完成任务和Bug');
diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php
index b31c6c4315..c1ea4dc3a3 100644
--- a/module/block/view/dashboard.html.php
+++ b/module/block/view/dashboard.html.php
@@ -17,7 +17,7 @@ if(isset($pageCSS)) css::internal($pageCSS);
 ?>
 <?php include '../../common/view/sparkline.html.php';?>
 <div class='dashboard dashboard-draggable' id='dashboard' data-confirm-remove-block='<?php  echo $lang->block->confirmRemoveBlock;?>'>
-  <ul class='dashboard-actions hide'><li><a href='<?php echo $this->createLink("block", "admin", "id=0&module=$module"); ?>' data-toggle='modal' data-type='ajax' data-width='600'><i class='icon icon-list-alt'></i> <?php echo $lang->block->createBlock?></a></li></ul>
+  <div class='dashboard-actions'><a href='<?php echo $this->createLink("block", "admin", "id=0&module=$module"); ?>' data-toggle='modal' data-type='ajax' data-width='600'><i class='icon icon-plus' title='<?php echo $lang->block->createBlock?>' data-toggle='tooltip' data-placement='left'></i></a></div>
   <div class='dashboard-empty-message hide'>
     <h5 class='text-success'><?php echo $lang->block->emptyMessage ?></h5>
     <a href='<?php echo $this->createLink("block", "admin", "id=0&module=$module"); ?>' data-toggle='modal' data-type='ajax' data-width='600' class='btn btn-primary'><i class='icon icon-plus'></i> <?php echo $lang->block->createBlock?></a>
@@ -47,6 +47,7 @@ if(isset($pageCSS)) css::internal($pageCSS);
     </div>
     <?php endforeach;?>
   </div>
+
 </div>
 <script>
 config.ordersSaved = '<?php echo $lang->block->ordersSaved; ?>';