From 9306c4762f19409054e361d0c56bf90860060d6f Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Tue, 17 Apr 2018 16:57:59 +0800
Subject: [PATCH] [wiki] modification

---
 media/css/seahub.css                 | 10 +++++---
 seahub/templates/home_base.html      | 37 +++++++++++++++++++++-------
 seahub/templates/js/templates.html   |  6 ++++-
 seahub/templates/wiki/wiki.html      | 16 +++++++++---
 static/scripts/app/router.js         |  8 +++---
 static/scripts/app/views/side-nav.js |  1 +
 6 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index daa98a03db..6649aea450 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -3191,9 +3191,13 @@ button.sf-dropdown-toggle:focus {
     border-bottom:1px solid #e8e8e8;
 }
 #wiki-page-list {
-    line-height:1.8;
     margin-top:1.6em;
 }
+.wiki-page-list-item {
+    word-break:break-all;
+    line-height:1.6;
+    margin:3px 0;
+}
 .wiki-page-link,
 .wiki-page-link:hover {
    font-size:1.15em;
@@ -3202,11 +3206,11 @@ button.sf-dropdown-toggle:focus {
    margin-left:5px;
 }
 #wiki-area {
-    padding: 30px 0 0;
+    padding:30px 0 0;
 }
 #wiki-last-modified,
 #wiki-page-last-modified {
-    margin-top: 10px;
+    margin-top:40px;
     font-size:12px;
     color: #666;
 }
diff --git a/seahub/templates/home_base.html b/seahub/templates/home_base.html
index 7acce56c91..0060651824 100644
--- a/seahub/templates/home_base.html
+++ b/seahub/templates/home_base.html
@@ -53,17 +53,30 @@
                 <a href="{{ SITE_ROOT }}#invitations/"><span aria-hidden="true" class="sf2-icon-invite"></span>{% trans "Invite People" %}</a>
             </li>
             {% endif %}
-        </ul>
 
-        <h3 class="hd">{% trans "Share Admin" %}</h3>
-        <ul class="side-tabnav-tabs">
-            {% if user.permissions.can_add_repo %}
-            <li class="tab {% block cur_share_libs %}{% endblock %}"><a href="{{ SITE_ROOT }}#share-admin-libs/"><span class="sf2-icon-library" aria-hidden="true"></span>{% trans "Libraries" %}</a></li>
-            <li class="tab {% block cur_share_folders %}{% endblock %}"><a href="{{ SITE_ROOT }}#share-admin-folders/"><span class="sf2-icon-folder" aria-hidden="true"></span>{% trans "Folders" %}</a></li>
-            {% endif %}
-            <li class="tab {% block cur_share_links %}{% endblock %}"><a href="{{ SITE_ROOT }}#share-admin-share-links/"><span class="sf2-icon-link" aria-hidden="true"></span>{% trans "Links" %}</a></li>
+            <li class="tab" id="share-admin-nav">
+                <a href="#" class="ellipsis" title="{% trans "Share Admin" %}"><span class="toggle-icon icon-caret-left fright" aria-hidden="true"></span><span aria-hidden="true" class="sf2-icon-wrench"></span>{% trans "Share Admin" %}</a>
+                <ul class="hide">
+                    {% if user.permissions.can_add_repo %}
+                    <li>
+                        <a href="{{ SITE_ROOT }}#share-admin-libs/"><span aria-hidden="true" class="sharp">#</span>{% trans "Libraries" %}</a>
+                    </li>
+                    <li>
+                        <a href="{{ SITE_ROOT }}#share-admin-folders/"><span aria-hidden="true" class="sharp">#</span>{% trans "Folders" %}</a>
+                    </li>
+                    {% endif %}
+                    {% if user.permissions.can_generate_share_link %}
+                    <li>
+                        <a href="{{ SITE_ROOT }}#share-admin-share-links/"><span aria-hidden="true" class="sharp">#</span>{% trans "Links" %}</a>
+                    </li>
+                    {% elif user.permissions.can_generate_upload_link %}
+                    <li>
+                        <a href="{{ SITE_ROOT }}#share-admin-upload-links/"><span aria-hidden="true" class="sharp">#</span>{% trans "Links" %}</a>
+                    </li>
+                    {% endif %}
+                </ul>
+            </li>
         </ul>
-
         {% endblock %}
     </div>
 
@@ -100,5 +113,11 @@ $('#group-nav a:first').on('click', function() {
     $('#group-nav .grp-list').slideToggle();
     return false;
 });
+$('#share-admin-nav').on('click', 'a:first', function() {
+    var $shareAdmin = $('#share-admin-nav');
+    $('.toggle-icon', $shareAdmin).toggleClass('icon-caret-left icon-caret-down');
+    $('ul', $shareAdmin).slideToggle(250);
+    return false;
+});
 </script>
 {% endblock %}
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index b5f22ab18c..633a49884b 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -1401,8 +1401,12 @@
         {% endif %}
 
         <li class="tab" id="share-admin-nav">
-            <a href="#" class="ellipsis" title="{% trans "Share Admin" %}"><span class="toggle-icon icon-caret-left fright" aria-hidden="true"></span><span aria-hidden="true" class="sf2-icon-wrench"></span>{% trans "Share Admin" %}</a>
+            <a href="#" class="ellipsis" title="{% trans "Share Admin" %}"><span class="toggle-icon <% if (show_share_admin) { %> icon-caret-down <% } else { %> icon-caret-left <% } %> fright" aria-hidden="true"></span><span aria-hidden="true" class="sf2-icon-wrench"></span>{% trans "Share Admin" %}</a>
+            <% if (show_share_admin) { %>
+            <ul>
+            <% } else { %>
             <ul class="hide">
+            <% } %>
                 <% if (can_add_repo) { %>
                 <li class="<% if (cur_tab == 'share-admin-repos') { %>tab-cur<% } %>">
                     <a href="{{ SITE_ROOT }}#share-admin-libs/"><span aria-hidden="true" class="sharp">#</span>{% trans "Libraries" %}</a>
diff --git a/seahub/templates/wiki/wiki.html b/seahub/templates/wiki/wiki.html
index 9c5210532d..d6ac88bfd6 100644
--- a/seahub/templates/wiki/wiki.html
+++ b/seahub/templates/wiki/wiki.html
@@ -38,7 +38,7 @@
         <span class="loading-icon loading-tip"></span>
         <p class="error hide"></p>
         <div id="wiki-page" class="hide">
-            <h1 id="wiki-page-name" class="bold"></h1>
+            <!--h1 id="wiki-page-name" class="bold"></h1-->
             <div id="wiki-content"></div>
             <p id="wiki-page-last-modified"></p>
         </div>
@@ -109,7 +109,7 @@ function showCurrentPage() {
         success: function(data) { // { meta: {wiki page object}, content: string }
             $error.hide();
 
-            $('#wiki-page-name').html(HTMLescape(data.meta.name));
+            //$('#wiki-page-name').html(HTMLescape(data.meta.name));
 
             $('#wiki-content')
             .html(addAnchorsToHeaders(marked(data.content)))
@@ -152,6 +152,15 @@ function showCurrentPage() {
 showCurrentPage();
 
 // show page list
+var isHiDPI = function() {
+    var pixelRatio = window.devicePixelRatio ? window.devicePixelRatio : 1;
+    if (pixelRatio > 1) {
+        return true;
+    } else {
+        return false;
+    }
+};
+
 (function() {
     var $container = $('#wiki-pages-container');
     var $list = $('ul', $container);
@@ -165,6 +174,7 @@ showCurrentPage();
         success: function(data) {
             var str = '';
             var pages = data.data;
+            var icon_size = isHiDPI() ? 192 : 24;
             // sort by name
             pages.sort(function(a, b) {
                 // make 'home' as the first one
@@ -182,7 +192,7 @@ showCurrentPage();
                 }
             });
             $(pages).each(function(index, item) {
-                str += '<li><img src="{{MEDIA_URL}}img/file/24/txt.png" class="vam" /><a href="' + item.link + '" class="wiki-page-link vam">' + HTMLescape(item.name) + '</a></li>';
+                str += '<li class="wiki-page-list-item"><img src="{{MEDIA_URL}}img/file/' + icon_size + '/txt.png" width="24" class="vam" /><a href="' + item.link + '" class="wiki-page-link vam">' + HTMLescape(item.name) + '</a></li>';
             });
             $list.html($(str)).show();
         },
diff --git a/static/scripts/app/router.js b/static/scripts/app/router.js
index 98b3d32a2a..ad805bfd81 100644
--- a/static/scripts/app/router.js
+++ b/static/scripts/app/router.js
@@ -283,25 +283,25 @@ define([
         showShareAdminRepos: function() {
             this.switchCurrentView(this.shareAdminReposView);
             this.shareAdminReposView.show();
-            this.sideNavView.setCurTab('share-admin-repos');
+            this.sideNavView.setCurTab('share-admin-repos', {'show_share_admin': true});
         },
 
         showShareAdminFolders: function() {
             this.switchCurrentView(this.shareAdminFoldersView);
             this.shareAdminFoldersView.show();
-            this.sideNavView.setCurTab('share-admin-folders');
+            this.sideNavView.setCurTab('share-admin-folders', {'show_share_admin': true});
         },
 
         showShareAdminShareLinks: function() {
             this.switchCurrentView(this.shareAdminShareLinksView);
             this.shareAdminShareLinksView.show();
-            this.sideNavView.setCurTab('share-admin-links');
+            this.sideNavView.setCurTab('share-admin-links', {'show_share_admin': true});
         },
 
         showShareAdminUploadLinks: function() {
             this.switchCurrentView(this.shareAdminUploadLinksView);
             this.shareAdminUploadLinksView.show();
-            this.sideNavView.setCurTab('share-admin-links');
+            this.sideNavView.setCurTab('share-admin-links', {'show_share_admin': true});
         }
 
     });
diff --git a/static/scripts/app/views/side-nav.js b/static/scripts/app/views/side-nav.js
index 2d57fbd27f..9133b4355e 100644
--- a/static/scripts/app/views/side-nav.js
+++ b/static/scripts/app/views/side-nav.js
@@ -25,6 +25,7 @@ define([
                 'show_group_list': this.group_expanded, // when cur_tab is not 'group'
                 'groups': app.pageOptions.groups,
                 'mods_enabled': app.pageOptions.user_mods_enabled,
+                'show_share_admin': false, // show 'share admin' nav list or not
                 'can_add_repo': app.pageOptions.can_add_repo,
                 'can_generate_share_link': app.pageOptions.can_generate_share_link,
                 'can_generate_upload_link': app.pageOptions.can_generate_upload_link