From 9141bb13d790fa22e25be5bdc5025ccbfbca2603 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Mon, 22 Feb 2016 15:03:44 +0800
Subject: [PATCH]  * fix style of tree menu.

---
 module/common/view/treeview.html.php |  7 -------
 module/custom/view/flow.html.php     |  6 +++++-
 module/dept/css/browse.css           |  2 ++
 module/dept/model.php                |  2 +-
 module/editor/model.php              |  2 +-
 module/editor/view/extend.html.php   |  1 -
 module/mail/view/sendcloud.html.php  |  2 +-
 module/project/model.php             |  2 +-
 module/tree/model.php                | 10 +++++-----
 www/js/my.full.js                    |  3 +++
 www/theme/default/style.css          | 14 +++-----------
 11 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/module/common/view/treeview.html.php b/module/common/view/treeview.html.php
index 8a9543cfd0..7d690ff1e0 100755
--- a/module/common/view/treeview.html.php
+++ b/module/common/view/treeview.html.php
@@ -1,9 +1,2 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
 <?php
-if($config->debug)
-{
-    css::import($defaultTheme . 'treeview.css');
-    js::import($jsRoot . 'jquery/treeview/min.js');
-}
-?>
-<script language='javascript'>$(function() { $(".tree").treeview({ persist: "cookie", collapsed: true, unique: false}) })</script>
diff --git a/module/custom/view/flow.html.php b/module/custom/view/flow.html.php
index 4fb7356188..f57277b674 100644
--- a/module/custom/view/flow.html.php
+++ b/module/custom/view/flow.html.php
@@ -35,8 +35,12 @@
         <td class='w-300px'><?php echo html::radio('productproject', $lang->custom->productproject->relation, isset($config->custom->productproject) ? $config->custom->productproject : '0_0');?></td>
         <td><?php echo html::submitButton()?></td>
       </tr>
+      <tr>
+        <td colspan='3' class='pd-0'>
+          <div class='alert alert-info alert-block'><strong><?php echo $lang->custom->productproject->notice?></strong></div>
+        </td>
+      </tr>
     </table>
-    <div class='alert alert-info'><strong><?php echo $lang->custom->productproject->notice?></strong></div>
   </form>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/dept/css/browse.css b/module/dept/css/browse.css
index ec776dedf3..8bd5357e69 100644
--- a/module/dept/css/browse.css
+++ b/module/dept/css/browse.css
@@ -1,2 +1,4 @@
 .table.table-form {width: auto;}
 .table-form > tbody > tr > td .form-control + .form-control {margin-top: 5px;}
+
+.tree-lines li.has-list.open > ul:after {bottom: 20px;}
diff --git a/module/dept/model.php b/module/dept/model.php
index 1b2ac1b401..005e2aaff5 100644
--- a/module/dept/model.php
+++ b/module/dept/model.php
@@ -146,7 +146,7 @@ class deptModel extends model
             $deptMenu[$dept->parent] .= "</li>\n"; 
         }
 
-        $lastMenu = "<ul class='tree'>" . @array_pop($deptMenu) . "</ul>\n";
+        $lastMenu = "<ul class='tree tree-lines'>" . @array_pop($deptMenu) . "</ul>\n";
         return $lastMenu; 
     }
 
diff --git a/module/editor/model.php b/module/editor/model.php
index d94829bde4..1a07be820a 100644
--- a/module/editor/model.php
+++ b/module/editor/model.php
@@ -199,7 +199,7 @@ class editorModel extends model
     public function printTree($files, $isRoot = true)
     {
         if(empty($files) or !is_array($files)) return false;
-        $tree = $isRoot ? "<ul id='extendTree' class='tree treeview'>\n" : "<ul>\n";
+        $tree = $isRoot ? "<ul id='extendTree' class='tree tree-lines'>\n" : "<ul>\n";
         if($isRoot)
         {
             $module = basename(dirname(key($files)));
diff --git a/module/editor/view/extend.html.php b/module/editor/view/extend.html.php
index 9d49518e85..d25223f85e 100644
--- a/module/editor/view/extend.html.php
+++ b/module/editor/view/extend.html.php
@@ -21,7 +21,6 @@
 <script>
 $(function()
 {
-    $("#extendTree").treeview();
     $('.hitarea').click(function()
     {
         var $this  = $(this);
diff --git a/module/mail/view/sendcloud.html.php b/module/mail/view/sendcloud.html.php
index 318eb89498..b666006b98 100755
--- a/module/mail/view/sendcloud.html.php
+++ b/module/mail/view/sendcloud.html.php
@@ -51,6 +51,6 @@ include '../../common/view/header.html.php';
        </tr>
     </table>
   </form>
-  <div class='alert alert-info'><?php printf($lang->mail->sendCloudHelp, common::hasPriv('mail', 'sendcloudUser') ? inlink('sendcloudUser') : '#')?></div>
+  <div class='alert alert-info alert-block'><?php printf($lang->mail->sendCloudHelp, common::hasPriv('mail', 'sendcloudUser') ? inlink('sendcloudUser') : '#')?></div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/model.php b/module/project/model.php
index 2e7adbbb12..a104e54519 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -137,7 +137,7 @@ class projectModel extends model
     {
         $products     = $this->loadModel('product')->getPairs('nocode');
         $productGroup = $this->getProductGroupList();
-        $projectTree  = "<ul class='tree'>";
+        $projectTree  = "<ul class='tree tree-lines'>";
         foreach($productGroup as $productID => $projects)
         {
             if(!isset($products[$productID]) and $productID != '')  continue;
diff --git a/module/tree/model.php b/module/tree/model.php
index d43ece02c7..ac6f7256c6 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -306,7 +306,7 @@ class treeModel extends model
         }
 
         if(!$firstBranch) $lastMenu .= '</li></ul>';
-        $lastMenu = "<ul class='tree'>$lastMenu</ul>\n";
+        $lastMenu = "<ul class='tree tree-lines'>$lastMenu</ul>\n";
         return $lastMenu; 
     }
 
@@ -339,7 +339,7 @@ class treeModel extends model
         }
 
         /* createdVersion > 4.1. */
-        $menu = "<ul class='tree'>";
+        $menu = "<ul class='tree tree-lines'>";
 
         /* Set the start module. */
         $startModulePath = '';
@@ -427,7 +427,7 @@ class treeModel extends model
     public function getProjectStoryTreeMenu($rootID, $startModule = 0, $userFunc)
     {
         $extra['projectID'] = $rootID;
-        $menu = "<ul class='tree'>";
+        $menu = "<ul class='tree tree-lines'>";
         $startModulePath = '';
         if($startModule > 0)
         {
@@ -600,7 +600,7 @@ class treeModel extends model
      */
     public function getProductDocTreeMenu()
     {
-        $menu     = "<ul class='tree'>";
+        $menu     = "<ul class='tree tree-lines'>";
         $products = $this->loadModel('product')->getPairs('nocode');
 
         $productModules = $this->getTreeMenu(0, 'productdoc', 0, array('treeModel', 'createDocLink'), 'product');
@@ -641,7 +641,7 @@ class treeModel extends model
      */
     public function getProjectDocTreeMenu()
     {
-        $menu     = "<ul class='tree'>";
+        $menu     = "<ul class='tree tree-lines'>";
         $products = $this->loadModel('product')->getPairs('nocode');
         $projects = $this->loadModel('project')->getProductGroupList();
 
diff --git a/www/js/my.full.js b/www/js/my.full.js
index a051a3b0d9..2bdf0e99dc 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -1460,6 +1460,9 @@ $(document).ready(function()
 
     fixStyle();
 
+    // Init tree menu
+    $('.tree').tree();
+
     $(window).resize(saveWindowSize);   // When window resized, call it again.
 
     if(needPing) setTimeout('setPing()', 1000 * 60 * 10);  // After 10 minutes, begin ping.
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 7664a50626..e21c57c06b 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -473,7 +473,6 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 .sub-featurebar > .nav > li.active > a {color: #333; font-weight: bold;}
 
 #featurebar.with-sub > .nav > li.active > a {border: 1px solid #ddd; position: relative; border-bottom: none; background: #fff; padding: 2px 15px 5px}
-.treeview li > a.active { font-weight:bold;}
 
 /* Title bar. */
 #titlebar {margin: -20px -20px 20px; background: #F8FAFE; border-bottom: 1px solid #e5e5e5; min-height: 46px; min-height: 20px\0; padding: 13px 20px; vertical-align: bottom; position: relative;}
@@ -638,16 +637,9 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 .modal-loading .loader{position: absolute; display: block; text-align: center; font-size: 56px; color: #fff; top: 35%; width: 100%}
 
 /* Tree menu. */
-.tree {padding: 0; margin: 0;}
-.tree li,.tree ul {margin: 0; padding: 0; display: block; position: relative;}
-.tree > li {margin-right: 20px; font-weight: 400; padding-bottom: 6px;}
-.tree > li > ul li {padding: 6px 5px 0 15px; margin: 0;}
-.tree li:before {display: inline-block; margin-right: 6px; position: relative; top: 0; left: 0; content: ' '; width: 8px; height: 8px; background: #f1f1f1; border: 1px solid #ccc; border-radius: 2px}
-.tree > li ul {border-left: 1px dotted #aaa; margin-left: 3px; font-weight: normal;}
-.tree > li ul > li:before {margin-right: 4px;}
-.tree > li ul > li:hover:before {content: ' ';}
-.tree > li ul > li:after {position: absolute; display: block; content: ""; width: 15px; left: -1px; top: 16px; height: 20px; border-top: 1px dotted #aaa;}
-.tree > li > ul li:last-child:after {border-left: 1px solid #fff;}
+.tree-lines li.has-list.open > ul:after {bottom: 13px;}
+.tree li:before {width: 8px; height: 8px; background: #f1f1f1; border: 1px solid #ccc; border-radius: 2px; top: 7px;left: 6px;}
+.tree-lines ul>li:after {width: 15px}
 
 /* Select all and select reverse. */
 #allchecker, #reversechecker {padding-right: 5px;padding-left: 5px;}