From 5a13fda71d68c6ec7c6e90be17941cce2210d9a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A1=BA=E5=BC=BA?= <ysq9207@126.com>
Date: Wed, 26 Dec 2018 16:27:15 +0800
Subject: [PATCH] wiki-list-improve (#2721)

---
 frontend/src/app.js               |  3 +--
 frontend/src/pages/wikis/wikis.js | 25 ++++++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app.js b/frontend/src/app.js
index e84f3d3842..37ac640a6d 100644
--- a/frontend/src/app.js
+++ b/frontend/src/app.js
@@ -42,7 +42,6 @@ const ShareAdminLibrariesWrapper = MainContentWrapper(ShareAdminLibraries);
 const ShareAdminFoldersWrapper = MainContentWrapper(ShareAdminFolders);
 const ShareAdminShareLinksWrapper = MainContentWrapper(ShareAdminShareLinks);
 const ShareAdminUploadLinksWrapper = MainContentWrapper(ShareAdminUploadLinks);
-const WikisWrapper = MainContentWrapper(Wikis);
 
 class App extends Component {
 
@@ -217,7 +216,7 @@ class App extends Component {
               onTabNavClick={this.tabItemClick}
               onGroupChanged={this.onGroupChanged}
               />
-            <WikisWrapper path={siteRoot + 'wikis'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick}/>
+            <Wikis path={siteRoot + 'wikis'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick}/>
             <PublicSharedView path={siteRoot + 'org/'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} onTabNavClick={this.tabItemClick}/>
           </Router>
         </MainPanel>
diff --git a/frontend/src/pages/wikis/wikis.js b/frontend/src/pages/wikis/wikis.js
index f1ba596abd..3b49f40c1c 100644
--- a/frontend/src/pages/wikis/wikis.js
+++ b/frontend/src/pages/wikis/wikis.js
@@ -4,6 +4,7 @@ import { seafileAPI } from '../../utils/seafile-api';
 import { gettext, loginUrl } from '../../utils/constants';
 import toaster from '../../components/toast';
 import ModalPortal from '../../components/modal-portal';
+import CommonToolbar from '../../components/toolbar/common-toolbar';
 import NewWikiDialog from '../../components/dialog/new-wiki-dialog';
 import WikiSelectDialog from '../../components/dialog/wiki-select-dialog';
 import WikiListView from '../../components/wiki-list-view/wiki-list-view';
@@ -118,14 +119,11 @@ class Wikis extends Component {
   render() {
     return (
       <Fragment>
-        <div className="main-panel-center">
-          <div className="cur-view-container" id="wikis">
-            <div className="cur-view-path">
-              <div className="path-container">
-                <h3 className="sf-heading">{gettext('Wikis')}</h3>
-              </div>
-              <div className="path-toolbar">
-                <Dropdown tag="div" className="btn btn-secondary operation-item" style={{marginTop: '-0.25rem'}} isOpen={this.state.isShowAddWikiMenu} toggle={this.onMenuToggle}>
+        <div className="main-panel-north">
+          <div className="cur-view-toolbar border-left-show">
+            <span className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none" title="Side Nav Menu" onClick={this.props.onShowSidePanel}></span>
+            <div className="operation">
+                <Dropdown tag="div" className="btn btn-secondary operation-item" isOpen={this.state.isShowAddWikiMenu} toggle={this.onMenuToggle}>
                   <DropdownToggle 
                     tag="i" 
                     className="fa fa-plus-square op-icon" 
@@ -134,13 +132,22 @@ class Wikis extends Component {
                     aria-expanded={this.state.isShowAddWikiMenu}
                     onClick={this.clickMenuToggle}
                   >
-                    {' '}{gettext('Add Wiki')}
+                    {' '}<span className="btn-secondary">{gettext('Add Wiki')}</span>
                   </DropdownToggle>
                   <DropdownMenu>
                     <DropdownItem onClick={this.onCreateToggle}>{gettext('New Wiki')}</DropdownItem>
                     <DropdownItem onClick={this.onSelectToggle}>{gettext('Choose a library as Wiki')}</DropdownItem>
                   </DropdownMenu>
                 </Dropdown>
+            </div>
+          </div>
+          <CommonToolbar onSearchedClick={this.props.onSearchedClick} />
+        </div>
+        <div className="main-panel-center">
+          <div className="cur-view-container" id="wikis">
+            <div className="cur-view-path">
+              <div className="path-container">
+                <h3 className="sf-heading">{gettext('Wikis')}</h3>
               </div>
             </div>
             <div className="cur-view-content">