From 314190a3dedae55da7fcc36e23a2d5cb345ec480 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 15 Nov 2016 15:52:29 +0800
Subject: [PATCH]  * finish task #2796.

---
 module/doc/view/ajaxgetdropmenu.html.php     | 17 -----------------
 module/doc/view/ajaxgetmatcheditems.html.php | 11 -----------
 module/doc/view/browse.html.php              | 18 ++++++++----------
 module/doc/view/browsebymenu.html.php        | 19 +++++++++----------
 module/doc/view/browsebytree.html.php        | 20 +++++++++++++-------
 5 files changed, 30 insertions(+), 55 deletions(-)
 delete mode 100644 module/doc/view/ajaxgetdropmenu.html.php
 delete mode 100644 module/doc/view/ajaxgetmatcheditems.html.php

diff --git a/module/doc/view/ajaxgetdropmenu.html.php b/module/doc/view/ajaxgetdropmenu.html.php
deleted file mode 100644
index 781aa85945..0000000000
--- a/module/doc/view/ajaxgetdropmenu.html.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php js::set('libID', $libID);?>
-<?php js::set('module', $module);?>
-<?php js::set('method', $method);?>
-<?php js::set('extra', $extra);?>
-<input type='text' class='form-control' id='search' value='' placeholder='<?php echo $this->app->loadLang('search')->search->common;?>'/>
-<div id='searchResult'>
-  <div id='defaultMenu' class='search-list'>
-    <ul>
-    <?php
-    foreach($libs as $libID => $libName)
-    {
-        echo "<li>" . html::a(sprintf($link, $libID), "<i class='icon-cube'></i> " . $libName, '', "class='text-important'"). "</li>";
-    }
-    ?>
-    </ul>
-  </div>
-</div>
diff --git a/module/doc/view/ajaxgetmatcheditems.html.php b/module/doc/view/ajaxgetmatcheditems.html.php
deleted file mode 100644
index da914d1f8c..0000000000
--- a/module/doc/view/ajaxgetmatcheditems.html.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class='search-list'>
-  <ul>
-  <?php if(!$libs) echo "<li class='no-result-tip'>" . sprintf($lang->doc->noMatched, $keywords) . '</li>';?>
-  <?php
-  foreach($libs as $lib)
-  {
-      echo "<li>" . html::a(sprintf($link, $lib->id), "<i class='icon-cube'></i> " . $lib->name, ''). "</li>";
-  }
-  ?>
-  </ul>
-</div>
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 56d6d49c50..b33cf8e5de 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -26,21 +26,19 @@ var browseType = '<?php echo $browseType;?>';
 <?php else:?>
 <div id='featurebar'>
   <ul class='nav'>
-    <li>
-      <div class="dropdown">
-        <a href="###" class="dropdown-toggle" data-toggle="dropdown"><i class='icon icon-list'></i> <?php echo $lang->doc->browseTypeList['list']?> <span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          <li><?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-list'></i> {$lang->doc->browseTypeList['list']}");?></li>
-          <li><?php echo html::a('javascript:setBrowseType("bymenu")', "<i class='icon icon-th'></i> {$lang->doc->browseTypeList['menu']}");?></li>
-          <li><?php echo html::a('javascript:setBrowseType("bytree")', "<i class='icon icon-branch'></i> {$lang->doc->browseTypeList['tree']}");?></li>
-        </ul>
-      </div>
-    </li>
     <li id='allTab'><?php echo html::a(inlink('browse', "libID=$libID&browseType=all&param=0&orderBy=$orderBy&from=$from"), $lang->doc->allDoc)?></li>
     <li id='openedbymeTab'><?php echo html::a(inlink('browse', "libID=$libID&browseType=openedByMe&param=0&orderBy=$orderBy&from=$from"), $lang->doc->openedByMe)?></li>
     <li id='bysearchTab'><a href='#'><i class='icon-search icon'></i>&nbsp;<?php echo $lang->doc->searchDoc;?></a></li>
   </ul>
   <div class='actions'>
+    <div class="btn-group">
+      <button type="button" class="btn dropdown-toggle" data-toggle="dropdown"><i class='icon icon-list'></i> <?php echo $lang->doc->browseTypeList['list']?> <span class="caret"></span></button>
+      <ul class="dropdown-menu" role="menu">
+        <li><?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-list'></i> {$lang->doc->browseTypeList['list']}");?></li>
+        <li><?php echo html::a('javascript:setBrowseType("bymenu")', "<i class='icon icon-th'></i> {$lang->doc->browseTypeList['menu']}");?></li>
+        <li><?php echo html::a('javascript:setBrowseType("bytree")', "<i class='icon icon-branch'></i> {$lang->doc->browseTypeList['tree']}");?></li>
+      </ul>
+    </div>
     <div class="btn-group">
       <button type="button" class="btn dropdown-toggle" data-toggle="dropdown"><i class='icon icon-cog'></i> <?php echo $lang->actions?> <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
diff --git a/module/doc/view/browsebymenu.html.php b/module/doc/view/browsebymenu.html.php
index 40521d84cc..7bd2de3bf5 100644
--- a/module/doc/view/browsebymenu.html.php
+++ b/module/doc/view/browsebymenu.html.php
@@ -24,21 +24,20 @@
 </style>
 <div id='featurebar'>
   <ul class='nav'>
-    <li>
-      <div class="dropdown">
-        <a href="###" class="dropdown-toggle" data-toggle="dropdown"><i class='icon icon-th'></i> <?php echo $lang->doc->browseTypeList['menu']?> <span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          <li><?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-list'></i> {$lang->doc->browseTypeList['list']}");?></li>
-          <li><?php echo html::a('javascript:setBrowseType("bymenu")', "<i class='icon icon-th'></i> {$lang->doc->browseTypeList['menu']}");?></li>
-          <li><?php echo html::a('javascript:setBrowseType("bytree")', "<i class='icon icon-branch'></i> {$lang->doc->browseTypeList['tree']}");?></li>
-        </ul>
-      </div>
-    </li>
     <li <?php if($orderBy == 'addedDate_desc') echo "class='active'";?>><?php echo html::a(inlink('browse', "libID=$libID&browseType=$browseType&param=$param&orderBy=addedDate_desc&from=$from"), $lang->doc->orderByOpen)?></li>
     <li <?php if($orderBy == 'editedDate_desc') echo "class='active'";?>><?php echo html::a(inlink('browse', "libID=$libID&browseType=$browseType&param=$param&orderBy=editedDate_desc&from=$from"), $lang->doc->orderByEdit)?></li>
     <li id='bysearchTab'><a href='#'><i class='icon-search icon'></i>&nbsp;<?php echo $lang->doc->searchDoc;?></a></li>
   </ul>
   <div class='actions'>
+    <?php echo html::backButton("<i class='icon-level-up icon-large icon-rotate-270'></i> {$lang->goback}");?>
+    <div class="btn-group">
+      <button type="button" class="btn dropdown-toggle" data-toggle="dropdown"><i class='icon icon-th'></i> <?php echo $lang->doc->browseTypeList['menu']?> <span class="caret"></span></button>
+      <ul class="dropdown-menu" role="menu">
+        <li><?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-list'></i> {$lang->doc->browseTypeList['list']}");?></li>
+        <li><?php echo html::a('javascript:setBrowseType("bymenu")', "<i class='icon icon-th'></i> {$lang->doc->browseTypeList['menu']}");?></li>
+        <li><?php echo html::a('javascript:setBrowseType("bytree")', "<i class='icon icon-branch'></i> {$lang->doc->browseTypeList['tree']}");?></li>
+      </ul>
+    </div>
     <div class="btn-group">
       <button type="button" class="btn dropdown-toggle" data-toggle="dropdown"><i class='icon icon-cog'></i> <?php echo $lang->actions?> <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
diff --git a/module/doc/view/browsebytree.html.php b/module/doc/view/browsebytree.html.php
index 9700a21c13..428f7ea2f7 100644
--- a/module/doc/view/browsebytree.html.php
+++ b/module/doc/view/browsebytree.html.php
@@ -31,19 +31,18 @@
 #docTree.tree ul > li.item-type-doc > .tree-item-wrapper > a {cursor: pointer;}
 </style>
 <div id='featurebar'>
-<ul class='nav'>
-<li>
-    <div class="dropdown">
-      <a href="###" class="dropdown-toggle" data-toggle="dropdown"><i class='icon icon-branch'></i> <?php echo $lang->doc->browseTypeList['tree']?> <span class="caret"></span></a>
+  <ul class='nav'>
+    <li><a href='javascript:history.go(-1);'><?php echo $lang->goback?></a></li>
+  </ul>
+  <div class='actions'>
+    <div class="btn-group">
+      <button type="button" class="btn dropdown-toggle" data-toggle="dropdown"><i class='icon icon-branch'></i> <?php echo $lang->doc->browseTypeList['tree']?> <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
         <li><?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-list'></i> {$lang->doc->browseTypeList['list']}");?></li>
         <li><?php echo html::a('javascript:setBrowseType("bymenu")', "<i class='icon icon-th'></i> {$lang->doc->browseTypeList['menu']}");?></li>
         <li><?php echo html::a('javascript:setBrowseType("bytree")', "<i class='icon icon-branch'></i> {$lang->doc->browseTypeList['tree']}");?></li>
       </ul>
     </div>
-</li>
-</ul>
-  <div class='actions'>
     <div class="btn-group">
       <button type="button" class="btn dropdown-toggle" data-toggle="dropdown"><i class='icon icon-cog'></i> <?php echo $lang->actions?> <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
@@ -61,7 +60,12 @@
 <div class='main'>
   <div class='panel'>
     <div class='panel-body'>
+      <?php if($tree):?>
       <ul id='docTree' class='tree-lines'></ul>
+      <?php else:;?>
+      <?php echo $lang->pager->noRecord?>
+      <?php if(common::hasPriv('doc', 'create')) echo html::a(inlink('create', "libID=$libID&moduleID=$moduleID"), $lang->doc->create)?>
+      <?php endif;?>
     </div>
   </div>
 </div>
@@ -71,6 +75,7 @@ var libID = <?php echo $libID?>;
 $(function()
 {
     var data = $.parseJSON('<?php echo helper::jsonEncode4Parse($tree, JSON_HEX_QUOT | JSON_HEX_APOS);?>');
+    <?php if($tree):?>
     var $tree = $('#docTree');
     $tree.tree(
     {
@@ -103,5 +108,6 @@ $(function()
     {
         tree.show($('.item-type-doc').parent().parent());
     }
+    <?php endif;?>
 });
 </script>