From 134cef775abb6e34f3c32a840386e53079149d92 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Sat, 7 May 2016 14:15:39 +0800
Subject: [PATCH 1/5] Add nav footer

---
 media/css/seahub.css                    | 20 +++++++++++++++++---
 seahub/templates/base_for_backbone.html | 14 +++++++-------
 seahub/templates/js/templates.html      |  5 +++++
 seahub/templates/nav_footer.html        |  4 ++++
 static/scripts/app/router.js            |  3 ++-
 static/scripts/app/views/side-nav.js    |  1 -
 6 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 seahub/templates/nav_footer.html

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 9cea000d70..fb22193052 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -708,7 +708,7 @@ textarea:-moz-placeholder {/* for FF */
         top:52px;
         bottom:0;
         z-index:1;
-        padding:20px;
+        padding:0;
         overflow:hidden;
         border-right:1px solid #eee;
     }
@@ -722,7 +722,6 @@ textarea:-moz-placeholder {/* for FF */
         top:0;
         bottom:0;
         z-index:1;
-        padding:20px;
         overflow:hidden;
         border-right:1px solid #eee;
         box-shadow:0 0 4px #ccc;
@@ -735,6 +734,21 @@ textarea:-moz-placeholder {/* for FF */
     -webkit-transition: all 0.3s ease;
     -moz-transition: all 0.3s ease;
     transition: all 0.3s ease;
+    display: flex;
+    flex-direction: column;
+}
+.side-nav-con {
+    overflow-y:auto;
+    padding:20px;
+}
+.side-nav-footer {
+    padding: 12px 20px 16px;
+    background: #f8f8f8;
+    border-top:1px solid #eee;
+}
+.side-nav-footer a {
+    color:#333;
+    font-weight: normal;
 }
 .side-tabnav .hd {
     margin-bottom:0.5em;
@@ -1184,7 +1198,7 @@ textarea:-moz-placeholder {/* for FF */
     border-radius:4px;
     zoom:1;
 }
-.ui-menu .ui-menu-item a.ui-state-hover { 
+.ui-menu .ui-menu-item a.ui-state-hover {
     border-color:#fbcb09;
     background: #fdf5ce;
     color: #c77405;
diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html
index 2593d039a7..8b722f0f98 100644
--- a/seahub/templates/base_for_backbone.html
+++ b/seahub/templates/base_for_backbone.html
@@ -75,15 +75,15 @@
         </div>
 
         <div id="main" class="clear container-fluid top-padding">
-            <div class="row">
-                <div class="side-tabnav col-md-3 hide" id="side-nav" role="navigation"></div>
+            <div class="row main-content hide">
+                <div class="side-tabnav col-md-3" id="side-nav" role="navigation"></div>
                 <div id="right-panel" class="col-md-9 col-md-offset-3">
                     {% block right_panel %}{% endblock %}
                 </div>
-                <div id="main-panel" class="clear w100 ovhd">
-                    <div id="initial-loading-view">
-                        <span class="loading-icon loading-tip"></span>
-                    </div>
+            </div>
+            <div class="row initial-loading">
+                <div id="initial-loading-view" class="clear w100 ovhd">
+                    <span class="loading-icon loading-tip"></span>
                 </div>
             </div>
 
@@ -108,7 +108,7 @@
         </div>
 
         {% include 'js/templates.html' %}
-</div><!-- wrapper -->
+    </div><!-- wrapper -->
 
 <script type="text/javascript">
 var app = {
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index c0cbf7cdf4..d12e543526 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -606,6 +606,7 @@
 </script>
 
 <script type="text/template" id="side-nav-tmpl">
+    <div class="side-nav-con">
     <a href="#" title="{% trans "Close" %}" aria-label="{% trans "Close" %}" class="sf2-icon-x1 sf-popover-close op-icon hidden-md-up js-close-side-nav fright"></a>
     <h3 class="hd">{% trans "Files" %}</h3>
     <ul class="side-tabnav-tabs">
@@ -704,6 +705,10 @@
             <a href="{{ SITE_ROOT }}share/links/"><span aria-hidden="true" class="sf2-icon-link"></span>{% trans "Links" %}</a>
         </li>
     </ul>
+    </div>
+    <div class="side-nav-footer ovhd" role="contentinfo">
+        {% include 'nav_footer.html' %}
+    </div>
 </script>
 
 <script type="text/template" id="myhome-mods-enable-form-tmpl">
diff --git a/seahub/templates/nav_footer.html b/seahub/templates/nav_footer.html
new file mode 100644
index 0000000000..0bfe731f54
--- /dev/null
+++ b/seahub/templates/nav_footer.html
@@ -0,0 +1,4 @@
+{% load i18n %}
+<a href="{{SITE_ROOT}}help/" target="_blank">{% trans "Help" %}</a>
+<a href="{{SITE_ROOT}}help/" target="_blank">{% trans "About" %}</a>
+<a href="{% url 'download_client' %}" class="fright"><span aria-hidden="true" class="sf2-icon-monitor"></span> Clients</a>
diff --git a/static/scripts/app/router.js b/static/scripts/app/router.js
index 7c89d9a89b..6e79cbae03 100644
--- a/static/scripts/app/router.js
+++ b/static/scripts/app/router.js
@@ -43,7 +43,8 @@ define([
         },
 
         initialize: function() {
-            $('#initial-loading-view').hide();
+            $('.initial-loading').hide();
+            $('.main-content').show();
 
             Common.prepareApiCsrf();
             Common.initLocale();
diff --git a/static/scripts/app/views/side-nav.js b/static/scripts/app/views/side-nav.js
index 221f645fde..5eafe8e73e 100644
--- a/static/scripts/app/views/side-nav.js
+++ b/static/scripts/app/views/side-nav.js
@@ -28,7 +28,6 @@ define([
                 'can_add_repo': app.pageOptions.can_add_repo,
             };
             this.render();
-            this.$el.show();
             var _this = this;
             $('#js-toggle-side-nav').click(function() {
                 _this.show();

From 0c6e50818efb653eabc42bdbf98a8d907d78bc61 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Sat, 7 May 2016 17:01:31 +0800
Subject: [PATCH 2/5] Add about dialog

---
 media/css/seahub.css                 | 14 ++++++++++----
 seahub/templates/nav_footer.html     |  9 ++++++++-
 static/scripts/app/views/side-nav.js |  9 ++++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index fb22193052..b86e4c08a7 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -727,9 +727,6 @@ textarea:-moz-placeholder {/* for FF */
         box-shadow:0 0 4px #ccc;
     }
 }
-.side-tabnav:hover {
-    overflow-y:auto;
-}
 .side-tabnav {
     -webkit-transition: all 0.3s ease;
     -moz-transition: all 0.3s ease;
@@ -738,8 +735,12 @@ textarea:-moz-placeholder {/* for FF */
     flex-direction: column;
 }
 .side-nav-con {
-    overflow-y:auto;
+    overflow:hidden;
     padding:20px;
+    flex-grow: 1;
+}
+.side-nav-con:hover {
+    overflow-y:auto;
 }
 .side-nav-footer {
     padding: 12px 20px 16px;
@@ -749,6 +750,7 @@ textarea:-moz-placeholder {/* for FF */
 .side-nav-footer a {
     color:#333;
     font-weight: normal;
+    margin-right:0.25rem;
 }
 .side-tabnav .hd {
     margin-bottom:0.5em;
@@ -3556,3 +3558,7 @@ img.thumbnail {
 #link-audit-form .get-code-btn {
     margin-bottom:20px;
 }
+/* about dialog */
+.about-content {
+    width: 300px;
+}
diff --git a/seahub/templates/nav_footer.html b/seahub/templates/nav_footer.html
index 0bfe731f54..95efc8a92a 100644
--- a/seahub/templates/nav_footer.html
+++ b/seahub/templates/nav_footer.html
@@ -1,4 +1,11 @@
 {% load i18n %}
 <a href="{{SITE_ROOT}}help/" target="_blank">{% trans "Help" %}</a>
-<a href="{{SITE_ROOT}}help/" target="_blank">{% trans "About" %}</a>
+<a href="#" class="js-about">{% trans "About" %}</a>
 <a href="{% url 'download_client' %}" class="fright"><span aria-hidden="true" class="sf2-icon-monitor"></span> Clients</a>
+
+<div class="about-content hide">
+    <h3>{% trans "About" %}</h3>
+    <p>{% trans "Server Version: " %}{{ seafile_version }}</p>
+    <p>© 2016 {% trans "Seafile" %}</p>
+    <p><a href="http://seafile.com/en/about/" target="_blank">{% trans "About Us" %}</a></p>
+</div>
diff --git a/static/scripts/app/views/side-nav.js b/static/scripts/app/views/side-nav.js
index 5eafe8e73e..8d077751bb 100644
--- a/static/scripts/app/views/side-nav.js
+++ b/static/scripts/app/views/side-nav.js
@@ -49,7 +49,8 @@ define([
             'click #group-nav a:first': 'toggleGroupList',
             'click #enable-mods': 'enableMods',
             'click .js-close-side-nav': 'closeNav',
-            'click li > a': 'visitLink'
+            'click li > a': 'visitLink',
+            'click .js-about': 'showAbout'
         },
 
         toggleGroupList: function() {
@@ -175,6 +176,12 @@ define([
             return true;
         },
 
+        showAbout: function() {
+            var $about = this.$('.about-content');
+            $about.modal();
+            return false;
+        }
+
     });
 
     return sideNavView;

From 72a4cde6f7bcbf46cc78b9a4278086ce1011be6f Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Thu, 12 May 2016 20:28:39 +0800
Subject: [PATCH 3/5] fixed 'side-nav' for pages; fixed 'help'

---
 media/css/seahub.css                          | 21 ++++++++++++-------
 seahub/group/templates/group/group_base.html  |  2 +-
 seahub/help/templates/help/help_base.html     | 13 ++++++------
 .../templates/profile/set_profile.html        |  2 +-
 seahub/templates/base_for_backbone.html       | 11 +++++-----
 seahub/templates/home_base.html               |  2 +-
 seahub/templates/nav_footer.html              |  2 +-
 seahub/templates/sysadmin/base.html           |  2 +-
 .../templates/sysadmin/sysadmin_backbone.html |  2 +-
 9 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index b86e4c08a7..bc2557c0ef 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -703,18 +703,18 @@ textarea:-moz-placeholder {/* for FF */
 }
 /* Hide for mobile, show later */
 @media (min-width: 768px) {
-    .side-tabnav {
+    .side-nav {
         position:fixed;
         top:52px;
         bottom:0;
         z-index:1;
-        padding:0;
+        padding:20px;
         overflow:hidden;
         border-right:1px solid #eee;
     }
 }
 @media (max-width: 767px) {
-    .side-tabnav {
+    .side-nav {
         background: #f8f8f8;
         width:300px;
         position:fixed;
@@ -722,22 +722,29 @@ textarea:-moz-placeholder {/* for FF */
         top:0;
         bottom:0;
         z-index:1;
+        padding:20px;
         overflow:hidden;
         border-right:1px solid #eee;
         box-shadow:0 0 4px #ccc;
     }
 }
-.side-tabnav {
+.side-nav:hover {
+    overflow-y:auto;
+}
+.side-nav {
     -webkit-transition: all 0.3s ease;
     -moz-transition: all 0.3s ease;
     transition: all 0.3s ease;
-    display: flex;
-    flex-direction: column;
+}
+.home-side-nav {
+    display:flex;
+    flex-direction:column;
+    padding:0;
 }
 .side-nav-con {
     overflow:hidden;
     padding:20px;
-    flex-grow: 1;
+    flex-grow:1;
 }
 .side-nav-con:hover {
     overflow-y:auto;
diff --git a/seahub/group/templates/group/group_base.html b/seahub/group/templates/group/group_base.html
index 2ad383cf45..0d6579301d 100644
--- a/seahub/group/templates/group/group_base.html
+++ b/seahub/group/templates/group/group_base.html
@@ -6,7 +6,7 @@
 
 {% block main_content %}
 
-<div class="side-tabnav col-md-3">
+<div class="side-tabnav side-nav col-md-3">
 {% block left_panel %}
     <div class="hd w100 ovhd">
         <h3>
diff --git a/seahub/help/templates/help/help_base.html b/seahub/help/templates/help/help_base.html
index 738e6cca4f..278fab3dd3 100644
--- a/seahub/help/templates/help/help_base.html
+++ b/seahub/help/templates/help/help_base.html
@@ -1,9 +1,10 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block cur_help %}cur{% endblock %}
-{% block left_panel %}
-<div class="side-textnav">
+{% block main_content %}
+<div class="row">
+
+<div class="side-textnav col-md-3 side-nav">
 	<h3 class="hd">{% trans "Client" context "help" %}</h2>
     <ul class="side-textnav-tabs">
 		<li class="tab {%block install %}{% endblock %}"><a href="{{ SITE_ROOT }}help/install/">{% trans "Install and Sync Files" %}</a></li>
@@ -18,10 +19,10 @@
 		<li class="tab {%block view_enc %}{% endblock %}"><a href="{{ SITE_ROOT }}help/view_encrypted/">{% trans "Viewing an encrypted library" %}</a></li>
 	</ul>
 </div>
-{% endblock %}
 
-{% block right_panel %}
-<div class="help-con article">{% block help_con %}{% endblock %}</div>
+<div class="help-con article col-md-9 col-md-offset-3" id="right-panel">{% block help_con %}{% endblock %}</div>
+
+</div>
 {% endblock %}
 
 {% block extra_script %}
diff --git a/seahub/profile/templates/profile/set_profile.html b/seahub/profile/templates/profile/set_profile.html
index 65ec6c1eb5..731297447b 100644
--- a/seahub/profile/templates/profile/set_profile.html
+++ b/seahub/profile/templates/profile/set_profile.html
@@ -7,7 +7,7 @@
 {% block main_content %}
 <div class="row">
 
-<div class="side-tabnav side-textnav col-md-3" id="side-nav" role="navigation">
+<div class="side-nav side-textnav col-md-3" id="side-nav" role="navigation">
     <ul class="side-textnav-tabs">
         <li class="tab"><a href="#user-basic-info">{% trans "Profile" %}</a></li>
         <li class="tab"><a href="#lang-setting">{% trans "Language" %}</a></li>
diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html
index 8b722f0f98..7d2c3adef6 100644
--- a/seahub/templates/base_for_backbone.html
+++ b/seahub/templates/base_for_backbone.html
@@ -75,17 +75,16 @@
         </div>
 
         <div id="main" class="clear container-fluid top-padding">
+            <div class="row initial-loading">
+                <span class="loading-icon loading-tip"></span>
+            </div>
+
             <div class="row main-content hide">
-                <div class="side-tabnav col-md-3" id="side-nav" role="navigation"></div>
+                <div class="side-nav side-tabnav home-side-nav col-md-3" id="side-nav" role="navigation"></div>
                 <div id="right-panel" class="col-md-9 col-md-offset-3">
                     {% block right_panel %}{% endblock %}
                 </div>
             </div>
-            <div class="row initial-loading">
-                <div id="initial-loading-view" class="clear w100 ovhd">
-                    <span class="loading-icon loading-tip"></span>
-                </div>
-            </div>
 
             <div id="confirm-popup" class="hide">
                 <div id="confirm-con"></div>
diff --git a/seahub/templates/home_base.html b/seahub/templates/home_base.html
index 1b5abc6cbb..71663a4d5c 100644
--- a/seahub/templates/home_base.html
+++ b/seahub/templates/home_base.html
@@ -3,7 +3,7 @@
 
 {% block main_content %}
 <div class="row">
-    <div id="side-nav" class="side-tabnav col-md-3" >
+    <div id="side-nav" class="side-nav side-tabnav col-md-3" >
         {% block left_panel %}
         <h3 class="hd">{% trans "Files" %}</h3>
         <ul class="side-tabnav-tabs">
diff --git a/seahub/templates/nav_footer.html b/seahub/templates/nav_footer.html
index 95efc8a92a..b7248468d6 100644
--- a/seahub/templates/nav_footer.html
+++ b/seahub/templates/nav_footer.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <a href="{{SITE_ROOT}}help/" target="_blank">{% trans "Help" %}</a>
 <a href="#" class="js-about">{% trans "About" %}</a>
-<a href="{% url 'download_client' %}" class="fright"><span aria-hidden="true" class="sf2-icon-monitor"></span> Clients</a>
+<a href="{% url 'download_client' %}" class="fright"><span aria-hidden="true" class="sf2-icon-monitor vam"></span> <span class="vam">{% trans "Clients" %}</span></a>
 
 <div class="about-content hide">
     <h3>{% trans "About" %}</h3>
diff --git a/seahub/templates/sysadmin/base.html b/seahub/templates/sysadmin/base.html
index 03165921ed..88742e047d 100644
--- a/seahub/templates/sysadmin/base.html
+++ b/seahub/templates/sysadmin/base.html
@@ -7,7 +7,7 @@
 
 {% block main_content %}
 <div class="row">
-    <div id="side-nav" class="side-tabnav col-md-3">
+    <div id="side-nav" class="side-nav side-tabnav col-md-3">
         {% block left_panel %}
         <h3 class="hd">{% trans "System Admin" %}</h3>
         <ul class="side-tabnav-tabs">
diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html
index f748a6e495..711a662bca 100644
--- a/seahub/templates/sysadmin/sysadmin_backbone.html
+++ b/seahub/templates/sysadmin/sysadmin_backbone.html
@@ -58,7 +58,7 @@
 
         <div id="main" class="clear container-fluid top-padding">
             <div class="row">
-                <div class="side-tabnav col-md-3 hide" id="side-nav" role="navigation"></div>
+                <div class="side-nav side-tabnav col-md-3 hide" id="side-nav" role="navigation"></div>
                 <div id="right-panel" class="col-md-9 col-md-offset-3">
                     {% block right_panel %}{% endblock %}
                 </div>

From c51b340effa9f6fdccd8794bd8ed460684bef90e Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Fri, 13 May 2016 10:18:28 +0800
Subject: [PATCH 4/5] rm pub_base.html

---
 seahub/templates/pub_base.html | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 seahub/templates/pub_base.html

diff --git a/seahub/templates/pub_base.html b/seahub/templates/pub_base.html
deleted file mode 100644
index 54a8a83639..0000000000
--- a/seahub/templates/pub_base.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "base.html" %}
-{% load seahub_tags i18n %}
-{% load url from future %}
-
-{% block sub_title %}{% trans "Organization" %} - {% endblock %}
-{% block cur_pubinfo %}cur{% endblock %}
-
-{% block left_panel %}
-<div class="side-tabnav">
-    <h3 class="hd">{% trans "Organization" %}</h3>
-    <ul class="side-tabnav-tabs">
-        <li class="tab {% block cur_lib %}{% endblock %}"><a href="{{ SITE_ROOT }}#org/"><span class="sf2-icon-library"></span>{% trans "Libraries" %}</a></li>
-        <li class="tab {% block cur_user %}{% endblock %}"><a href="{% url 'pubuser' %}"><span class="sf2-icon-user"></span>{% trans "Members" %}</a></li>
-    </ul>
-</div>
-{% endblock %}

From 5a0e8f315d68a5c3d239a0d5a9a8a12a4116dfc5 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Fri, 13 May 2016 11:10:18 +0800
Subject: [PATCH 5/5] fixed 'help'; rm footer.html

---
 media/css/seahub.css         |  4 ++--
 seahub/templates/footer.html | 23 -----------------------
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 seahub/templates/footer.html

diff --git a/media/css/seahub.css b/media/css/seahub.css
index bc2557c0ef..f50b4f125a 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -2949,9 +2949,9 @@ button.sf-dropdown-toggle:focus {
     margin:0 3px 0 0;
 }
 .help-con {
-	padding:0 0 0 30px;
+	padding:20px;
 }
-#right-panel .help-con .hd {
+#right-panel.help-con .hd {
     font-weight:normal;
     margin-bottom:15px;
 }
diff --git a/seahub/templates/footer.html b/seahub/templates/footer.html
deleted file mode 100644
index ff44f2de4d..0000000000
--- a/seahub/templates/footer.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% load i18n %}
-<div id="footer" role="contentinfo" class="ovhd">
-  <div class="items fleft">
-    <div class="item">
-      <h4>{% trans "Documents" %}</h4>
-      <ul>
-        <li><a href="http://seafile.com/{% if LANGUAGE_CODE != 'zh-cn' %}en/{% endif %}home/" target="_blank">{% trans "Introduction" %}</a></li>
-	<li><a href="{{SITE_ROOT}}help/" target="_blank">{% trans "Help" %}</a></li>
-      </ul>
-    </div>
-    <div class="item">
-      <h4>{% trans "Client" %}</h4>
-      <ul>
-        <li><a href="{% url 'download_client' %}">{% trans "Seafile for Windows, Mac and Linux" %}</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="other-info fright">
-    <p>{% trans "Server Version: " %}{{ seafile_version }}</p>
-    <p>© 2016 {% trans "Seafile" %}</p>
-    <p><a href="http://seafile.com/{% if LANGUAGE_CODE != 'zh-cn' %}en/{% endif %}about/" target="_blank">{% trans "About Us" %}</a></p>
-  </div>
-</div>