From 18223853aaa7f8d4fb99af0c2227316af341de29 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Wed, 16 May 2018 11:01:29 +0800
Subject: [PATCH]  * improve UI of tree/browse view.

---
 module/tree/css/common.css           |  2 ++
 module/tree/view/browse.html.php     | 13 ++++++++-----
 module/tree/view/browsetask.html.php |  6 +++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/module/tree/css/common.css b/module/tree/css/common.css
index 16ed45f934..8b54da3dd7 100644
--- a/module/tree/css/common.css
+++ b/module/tree/css/common.css
@@ -12,3 +12,5 @@
 .col-module .chosen-container-single .chosen-single {border-radius: 2px 0 0 2px; border-right-width: 0; padding-right: 1px;}
 .col-module .chosen-container-active .chosen-single {border-right-width: 1px; padding-right: 0;}
 .col-shorts .chosen-container-single .chosen-single {border-radius: 0 2px 2px 0;}
+
+#modulesTree li {padding-left: 20px;}
\ No newline at end of file
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 1a98572f2a..f8f11bf108 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -33,7 +33,7 @@
         <div class="panel-title"><?php echo $title;?></div>
       </div>
       <div class="panel-body">
-        <ul class='tree-lines' id='modulesTree' data-name='tree-<?php echo $viewType;?>'></ul>
+        <ul id='modulesTree' data-name='tree-<?php echo $viewType;?>'></ul>
       </div>
     </div>
   </div>
@@ -50,10 +50,10 @@
       </div>
       <div class="panel-body">
         <form id='childrenForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "root=$rootID&viewType=$viewType");?>'>
-          <table class='table table-form'>
+          <table class='table table-form table-auto'>
             <tr>
               <?php if($viewType != 'line'):?>
-              <td class="text-middle text-nowrap text-right with-padding">
+              <td class="text-middle text-right with-padding">
                 <?php
                 echo html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType"), empty($root->name) ? '' : $root->name) . "<i class='icon icon-angle-right muted'></i>";
                 foreach($parentModules as $module)
@@ -143,10 +143,12 @@
 $(function()
 {
     var data = $.parseJSON('<?php echo helper::jsonEncode4Parse($tree);?>');
-    var options = {
+    var options =
+    {
         initialState: 'preserve',
         data: data,
-        sortable: {
+        sortable: 
+        {
             lazy: true,
             nested: true,
             canMoveHere: function($ele, $target)
@@ -234,6 +236,7 @@ $(function()
     var $tree = $('#modulesTree').tree(options);
 
     var tree = $tree.data('zui.tree');
+    console.log('tree', tree, options);
     if(<?php echo $currentModuleID ?>)
     if(0)
     {
diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php
index 75c2c9d2b0..dd2e56366a 100644
--- a/module/tree/view/browsetask.html.php
+++ b/module/tree/view/browsetask.html.php
@@ -29,7 +29,7 @@
         <div class='panel-title'><?php echo $title;?></div>
       </div>
       <div class='panel-body'>
-        <ul class='tree-lines' id='modulesTree' data-name='tree-task'></ul>
+        <ul id='modulesTree' data-name='tree-task'></ul>
       </div>
     </div>
   </div>
@@ -40,9 +40,9 @@
           <div class='panel-title'><?php echo $lang->tree->manageTaskChild;?></div>
         </div>
         <div class='panel-body'>
-          <table class='table table-form'>
+          <table class='table table-form table-auto'>
             <tr>
-              <td class="text-middle text-nowrap text-right with-padding">
+              <td class="text-middle text-right with-padding">
                 <?php
                 echo html::a($this->createLink('tree', 'browsetask', "root={$root->id}&productID=$productID&viewType=task"), $root->name) . "<i class='icon icon-angle-right muted'></i>";
                 foreach($parentModules as $module)