From 073e4b5d28ae8a2ddab58aff5ba222b64fd5407d Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Mon, 7 Aug 2017 13:56:25 +0800
Subject: [PATCH 1/3] [header] added 'log out' icon

---
 media/css/seahub.css                          |   7 ++++
 media/css/sf_font2/seafile-font2.eot          | Bin 8944 -> 9088 bytes
 media/css/sf_font2/seafile-font2.svg          |   1 +
 media/css/sf_font2/seafile-font2.ttf          | Bin 8760 -> 8904 bytes
 media/css/sf_font2/seafile-font2.woff         | Bin 5940 -> 6060 bytes
 seahub/base/context_processors.py             |   3 +-
 seahub/settings.py                            |   3 ++
 seahub/templates/base.html                    |   3 ++
 seahub/templates/base_for_backbone.html       |  32 ++++++++++--------
 .../templates/sysadmin/sysadmin_backbone.html |  14 +++++---
 10 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 3ee825e7bb..b52e1ddc67 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -189,6 +189,7 @@
 .sf2-icon-unlock:before { content: "\e02d"; }
 .sf2-icon-admin-log:before { content: "\e02e"; }
 .sf2-icon-info:before { content: "\e02f"; }
+.sf2-icon-logout:before { content: "\e030"; }
 
 /******* tags **********/
 body,
@@ -1814,6 +1815,12 @@ button.sf-dropdown-toggle:focus {
     text-decoration:underline;
 }
 /* top-bar */
+#logout-icon {
+    margin:10px 0 0 25px;
+    font-size:22px;
+    line-height:1;
+    color:#999;
+}
 #notifications {
     position:relative;
     margin:10px 0 0 25px;
diff --git a/media/css/sf_font2/seafile-font2.eot b/media/css/sf_font2/seafile-font2.eot
index 081d65245cef1e1950a47bf01d297008dc5503a1..66fd52b3cf47486a4c9bdcd6ec18b321efb62c76 100644
GIT binary patch
delta 652
zcmYjOL1+_E5Pg5M*`&?>rdEkGO}oh!lGrvRCQCMzU_DriASx)ui<C9C36hvVTT~1t
zU<F&W()@!Wh&KhPV9h}fo(hUoZ>1s>L~nu~^q}Cu)=3Cb_`}S5Z)X0?|35~nWA<u4
z@OH^=%EKAw=F*}0%)OUYKwk#n8#_FD1Qry+w+Q=BoQlSycaGfz*crm(nSxb%<FI`N
zBtLP>S!=qqy$u`X&ynuT=C4fs-8CBk<P^|7mz%WCt5?V0i6N#{h-J?xtCTNhtjE5G
zKEU>#@P&ePxrA%@Njg=*f6*#Tdgm8u&fZtVy)G4}XY{RoG?7NPNLyf(MYie83{SYz
zzu=OH05+a3eEjdF1}p6*>_k%*Yiy7i;x{|XV&b%PJ?bHiCU2Ur*%Np~sL|aA84KhU
z@~lz+IVKd_C6=g{ZEhxR%M-G?3e>;Lth*w?gF&{=HqeDIO%@6!HRf?MB{;(R^`MbV
zm>!1`3hK%pPuxuICD35w?EV1v@}r!Nmk-=^xLl43=N+n1%jIf@+QIqAO1Zqkx^||u
zcedZ)Tvd%+EoZ1I=Lc=&=VkG&HyjFMv9*Q_j`db-hYNpNu>#Hl;y_;@bQ0;ts&X4G
z=*5dxY^P1Wv|<HbW*49Odc=dib9NIEq=cdkwV9DrBp%yuqNR0;tahA1)HR)+_k%Vi
dv3Nc0FGvn0U(6O~XT%d-V+paQ_qcX^&_Dath9v+1

delta 519
zcmYjNJxmi}7=FI*zB{Y6I+&6auD!E0BvP6qCzi%QU=X{Qn6!jg5|m4AVW90P5@jGI
zVNj!qkZ)^9T%4RtIw^6G!4Sg20B(lC-I9P)1H9K<jKiDvd7k%qf4*-e+ZtC}aUip<
z4vA<uUsxY|Q#4MW0dXCGp1nJM4>Qn!>uuuZgS=&1@9)0?*hAuz#fsx@ZEJr3Zj$zC
z)>&}R&Y+P0nCgMq`K9vOuK^VhgFpmxCFjXyzVS`=Gov1)j?d((&ew`gW9kEKRCbBa
zRh*YDmT^S&3~{sSR7zhGKf^$jrm$_dw(xwbJlX(abQM1VBNs&>AC5l0I(&j4Cjr=h
zn%eu9xu^1L!~^J*<qk`-Tk<cPW|o}btCnY_%R8ZWW&$6HdDC?Wyr!&CW?uiHB{k(m
zv#wlW@~v>1Ex{skG1gnVi8a4hAcO-Ss|cd)V+|p8!<#EElG5GT=wXga=<{_2ISl()
zkmsw9RdnIEk2Q3&fc$PG<!vK(!G?_#((;|rFKj!NmYYUhj+iDr@sU|>{xB<?LEcFi
N%$8G$p5T9fa}J#mV^IJA

diff --git a/media/css/sf_font2/seafile-font2.svg b/media/css/sf_font2/seafile-font2.svg
index d405f2936a..aa671de611 100644
--- a/media/css/sf_font2/seafile-font2.svg
+++ b/media/css/sf_font2/seafile-font2.svg
@@ -55,4 +55,5 @@
 <glyph glyph-name="unlock" unicode="&#57389;" d="M405 337l-241 0 0 53c0 17 11 28 26 28l141 0c10 0 19-8 19-19l0-19 45 0 0 55c0 17-11 28-26 28l-232 0c-11 0-20-9-20-19l0-109-10 0c-7 0-11-4-11-11l0-264c0-5 4-11 11-11l298 0c7 0 11 6 11 11l0 264c2 9-4 13-11 13z m-72-102c0-5-4-7-7-7l-34 0c-4 0-6-4-6-6l0-58c0-4-4-6-7-6l-34 0c-4 0-6 4-6 6l0 56c0 4-4 6-6 6l-39 0c-4 0-6 4-6 7l0 34c0 4 4 6 6 6l126 0c4 0 11 0 11-2 2-2 2-4 2-4z"/>
 <glyph glyph-name="fixed02" unicode="&#57390;" d="M345 213c-2 0-4 0-5 0-11-73-64-131-133-145 23-5 64-5 136-5 147 0 167 0 167 43 2 60-73 107-165 107z m0 238c-40 0-74-29-82-69 48-30 78-85 78-146 0 0 0-2 0-2 2 0 2 0 4 0 53 0 83 82 83 130 0 47-37 87-83 87z m-314-151c-9-20-14-42-14-64 0-86 68-156 152-156 84 0 152 70 152 156 0 85-68 155-152 155-9 0-17 0-26-2l-3-48c8 2 19 4 27 4 58 0 106-50 106-109 0-60-48-110-106-110-58 0-106 50-106 110 0 13 4 29 9 40l15-8c9-5 16 0 16 8l5 105c0 10-5 13-14 8l-83-56c-9-5-9-14 0-19z m133-3c-5 0-9-3-9-9l0-68 55-56c3-4 5-4 2 2l-28 54c0 26 0 68 0 68 0 6-3 9-8 9z"/>
 <glyph glyph-name="info" unicode="&#57391;" d="M256 21c-130 0-235 105-235 235 0 130 105 235 235 235 130 0 235-105 235-235 0-130-105-235-235-235z m-21 278l0-171 42 0 0 171z m21 42c12 0 21 10 21 22 0 11-9 21-21 21-12 0-21-10-21-21 0-12 9-22 21-22z"/>
+<glyph glyph-name="logout" unicode="&#57392;" d="M410 274l-42 42c-7 7-7 19 0 26 7 7 19 7 26 0l73-73c7-7 7-19 0-26l-73-73c-7-7-19-7-26 0-7 7-7 19 0 26l42 42-151 0c-10 0-18 8-18 18 0 10 8 18 18 18z m-24 133c7-7 7-19 0-26-8-7-19-7-26 0-69 69-181 69-250 0-69-69-69-181 0-250 69-69 181-69 250 0 7 7 18 7 26 0 7-7 7-19 0-26-84-83-219-83-302 0-83 83-83 219 0 302 83 83 218 83 302 0z"/>
 </font></defs></svg>
diff --git a/media/css/sf_font2/seafile-font2.ttf b/media/css/sf_font2/seafile-font2.ttf
index d7286e852c5a21cf067ede9ac6d2e42b811219a3..117c4061a3772ccdc6b028e35abae6fe74ee11d4 100644
GIT binary patch
delta 735
zcmYjPOK1~O6g_WdGO5YDL`#V_<kO~-#%O3shNMD2AZ<jjwV)I?Qihmhl*9zu(u$!e
zSV4nS$Sf2Q1Q)ugV9mlVT!|IIf{PLe>OyyJUAPdj^-emVFf;d@bKkpj&%1AP{QX1~
z3;@RpL`<jC7bX`UY_0&Iby9t&$0yRzAQQh!yyx8cf%w3^v$p|uk@!resFmN@#qWU7
zL)v;?n=9|_Q6+>{Dc_MVT+jVEw9pGkLqPYcp4BcZH)cLi?hCz1UC&lE>6Boj&0QoM
z)r<2>j%kTDuouM3g;GX)=6mb|#BJhNi`r5d%lJWgDu|wIS~2Urv(^XrUz4^~F3rt{
zc8^iBL25wQZJQ&5pF1)qXWhd;;S^{a(0pEN?MI>3s<RQM8l&tI8#ErVn*$!okcIZ^
zYgYiC5;G6V2MINbGDQX|_I1#h5*Asa@m6p%qbbfx${V1eO02soz=Pv#hc(fO2({NA
zP6nCB&E)VH>kEa|WFqCU%l+Yy+~tX<l81?yYMeccaxXu_>GAUDeY?|XuX65E)Vi+M
zRmH{m*hZzY!8-q6<~ZoM#kr!WdR<o)h4WFd^0Hzi{E=z|YnBa(CcR@}8=UxMVHuqD
znii!4q<GurO)S8HsHM~Wz_5iSTJy@nHgfsR!ZN(fhB;*E*5q&n1wt|7lfP(7A%-Di
zDsVzf#fFUKK$XGx9SG6E2ZA|)#T%=^qA)2JO8L^lJpG@Ji*Az8?$1T+NLw?xhy;Bl
U;`_5S$AayVCm+rDZ?Lu2UpkP6ivR!s

delta 564
zcmYLGPe>GT6#m|CXD8jwtwV;|?(A+!5;TlWvU$*g(DhO#DN#YxWV_D6(Jck_AO;=k
zmh`)c5JYt75W!w5@ZzOC2(k3<BGI9H1bLI}n`xkdAMbtN`~AN6zBi5GH$y8B0ByLB
z1jfqciHi&QKlgy6S+d!Yq2V%a!32uC#Dz=aj_W+W@DPxz#8)N*ueRARe*&sN?&Xv>
zSKHg85{kcBZ<(52s;++PO#((A&<Vfd-Py0!H(1-|Dfxb7#WT(;UXVj1y8U2&F*RnS
ziC+`XOwUewYuBH0n8X&bA9#y3EaMmJ{ltYCFQ~jd_O%_zv4J#dvvc#C)pKir#evmM
zWR3=}jko7+9vIj`TJah1`L5mk7nR+7B7<^TpOqWp=yiGEgaulNPBu~io)d+O%EG`S
zMw3xMvG0x^RSWg^DkJ)1!mIZi(y2Fc$9qm-HGXSwy<g%yi8OZO+(esn>y%aOxr~8O
z-)N<37v9Br5{L04&P{Yli+*Jt(Sdb)p9>c@O8S#^GUd8<$##2Bok3hasQdDxqV%@P
v)7Fc8wVo*iYJ@}c6aF3*_0JG>L|ljyR1|jS(jqSOimkzCAHw*5TXyp=`ul7}

diff --git a/media/css/sf_font2/seafile-font2.woff b/media/css/sf_font2/seafile-font2.woff
index 6741f5ebbd6985497803f9367c741f13d6c0c593..e9ec7bfaae0c817217fcfb7e6f63b82eb02e3f61 100644
GIT binary patch
delta 5978
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
EA5`ac{r~^~

delta 5857
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

diff --git a/seahub/base/context_processors.py b/seahub/base/context_processors.py
index 62af02de23..c604ec7b1a 100644
--- a/seahub/base/context_processors.py
+++ b/seahub/base/context_processors.py
@@ -18,7 +18,7 @@ from seahub.settings import SEAFILE_VERSION, SITE_TITLE, SITE_NAME, \
     MAX_FILE_NAME, BRANDING_CSS, LOGO_PATH, LOGO_WIDTH, LOGO_HEIGHT,\
     SHOW_REPO_DOWNLOAD_BUTTON, SITE_ROOT, ENABLE_GUEST_INVITATION, \
     FAVICON_PATH, ENABLE_THUMBNAIL, THUMBNAIL_SIZE_FOR_ORIGINAL, \
-    MEDIA_ROOT
+    MEDIA_ROOT, SHOW_LOGOUT_ICON
 
 try:
     from seahub.settings import SEACLOUD_MODE
@@ -112,5 +112,6 @@ def base(request):
         'thumbnail_size_for_original': THUMBNAIL_SIZE_FOR_ORIGINAL,
         'enable_guest_invitation': ENABLE_GUEST_INVITATION,
         'enable_terms_and_conditions': dj_settings.ENABLE_TERMS_AND_CONDITIONS,
+        'show_logout_icon': SHOW_LOGOUT_ICON,
         'is_pro': True if is_pro_version() else False,
         }
diff --git a/seahub/settings.py b/seahub/settings.py
index c4f50eb163..e02b2af862 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -438,6 +438,9 @@ SERVE_STATIC = True
 # Enable or disable registration on web.
 ENABLE_SIGNUP = False
 
+# show 'log out' icon in top-bar or not.
+SHOW_LOGOUT_ICON = False
+
 # For security consideration, please set to match the host/domain of your site, e.g., ALLOWED_HOSTS = ['.example.com'].
 # Please refer https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts for details.
 ALLOWED_HOSTS = ['*']
diff --git a/seahub/templates/base.html b/seahub/templates/base.html
index 1a2a3516e7..9275478c74 100644
--- a/seahub/templates/base.html
+++ b/seahub/templates/base.html
@@ -50,6 +50,9 @@
                     {% include 'snippets/search_form.html' %}
                 {% endif %}
 
+                {% if show_logout_icon %}
+                <a id="logout-icon" href="{{ SITE_ROOT }}accounts/logout/" class="no-deco fleft" title="{% trans "Log out" %}" aria-label="{% trans "Log out" %}"><span class="sf2-icon-logout"></span></a>
+                {% endif %}
 
                 <div id="account" class="fright">
                     <a id="my-info" href="#" class="no-deco" aria-label="{% trans "View profile and more" %}">
diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html
index d8047dddb3..59bc45dc46 100644
--- a/seahub/templates/base_for_backbone.html
+++ b/seahub/templates/base_for_backbone.html
@@ -50,22 +50,26 @@
                 <button class="sf2-icon-list-view side-nav-toggle hidden-md-up" title="{% trans "Side Nav Menu" %}" id="js-toggle-side-nav" aria-label="{% trans "Side Nav Menu" %}"></button>
 
                 <div class="fright">
-                {% if has_file_search %}
-                    {% include 'snippets/search_form.html' %}
-                {% endif %}
+                    {% if has_file_search %}
+                        {% include 'snippets/search_form.html' %}
+                    {% endif %}
 
-                <div id="notifications" class="fleft">
-                    <a href="#" class="no-deco" id="notice-icon" title="{% trans "Notifications" %}" aria-label="{% trans "Notifications" %}">
-                        <span class="sf2-icon-bell"></span>
-                        <span class="num hide">0</span>
-                    </a>
-                </div>
+                    <div id="notifications" class="fleft">
+                        <a href="#" class="no-deco" id="notice-icon" title="{% trans "Notifications" %}" aria-label="{% trans "Notifications" %}">
+                            <span class="sf2-icon-bell"></span>
+                            <span class="num hide">0</span>
+                        </a>
+                    </div>
 
-                <div id="account" class="fright">
-                    <a id="my-info" href="#" class="no-deco" aria-label="{% trans "View profile and more" %}">
-                        {% avatar request.user 36 %} <span class="icon-caret-down vam"></span>
-                    </a>
-                </div>
+                    {% if show_logout_icon %}
+                    <a id="logout-icon" href="{{ SITE_ROOT }}accounts/logout/" class="no-deco fleft" title="{% trans "Log out" %}" aria-label="{% trans "Log out" %}"><span class="sf2-icon-logout"></span></a>
+                    {% endif %}
+
+                    <div id="account" class="fright">
+                        <a id="my-info" href="#" class="no-deco" aria-label="{% trans "View profile and more" %}">
+                            {% avatar request.user 36 %} <span class="icon-caret-down vam"></span>
+                        </a>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html
index a858248281..4c4b22a564 100644
--- a/seahub/templates/sysadmin/sysadmin_backbone.html
+++ b/seahub/templates/sysadmin/sysadmin_backbone.html
@@ -44,10 +44,16 @@
                 </a>
                 <button class="sf2-icon-list-view side-nav-toggle hidden-md-up" title="{% trans "Side Nav Menu" %}" id="js-toggle-side-nav"     aria-label="{% trans "Side Nav Menu" %}"></button>
 
-                <div id="account" class="fright">
-                    <a id="my-info" href="#" class="no-deco" aria-label="{% trans "View profile and more" %}">
-                        {% avatar request.user 36 %} <span class="icon-caret-down vam"></span>
-                    </a>
+                <div class="fright">
+                    {% if show_logout_icon %}
+                    <a id="logout-icon" href="{{ SITE_ROOT }}accounts/logout/" class="no-deco fleft" title="{% trans "Log out" %}" aria-label="{% trans "Log out" %}"><span class="sf2-icon-logout"></span></a>
+                    {% endif %}
+
+                    <div id="account" class="fright">
+                        <a id="my-info" href="#" class="no-deco" aria-label="{% trans "View profile and more" %}">
+                            {% avatar request.user 36 %} <span class="icon-caret-down vam"></span>
+                        </a>
+                    </div>
                 </div>
             </div>
         </div>

From 23d4c2dd1e3768c61d15ae753874390356a95e01 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Mon, 7 Aug 2017 18:15:51 +0800
Subject: [PATCH 2/3] [system admin] removed 'log out' icon

---
 seahub/templates/sysadmin/sysadmin_backbone.html | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html
index 4c4b22a564..a858248281 100644
--- a/seahub/templates/sysadmin/sysadmin_backbone.html
+++ b/seahub/templates/sysadmin/sysadmin_backbone.html
@@ -44,16 +44,10 @@
                 </a>
                 <button class="sf2-icon-list-view side-nav-toggle hidden-md-up" title="{% trans "Side Nav Menu" %}" id="js-toggle-side-nav"     aria-label="{% trans "Side Nav Menu" %}"></button>
 
-                <div class="fright">
-                    {% if show_logout_icon %}
-                    <a id="logout-icon" href="{{ SITE_ROOT }}accounts/logout/" class="no-deco fleft" title="{% trans "Log out" %}" aria-label="{% trans "Log out" %}"><span class="sf2-icon-logout"></span></a>
-                    {% endif %}
-
-                    <div id="account" class="fright">
-                        <a id="my-info" href="#" class="no-deco" aria-label="{% trans "View profile and more" %}">
-                            {% avatar request.user 36 %} <span class="icon-caret-down vam"></span>
-                        </a>
-                    </div>
+                <div id="account" class="fright">
+                    <a id="my-info" href="#" class="no-deco" aria-label="{% trans "View profile and more" %}">
+                        {% avatar request.user 36 %} <span class="icon-caret-down vam"></span>
+                    </a>
                 </div>
             </div>
         </div>

From 15455fd45c61a003a73d799dd6a1e87173803e95 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Mon, 7 Aug 2017 18:29:05 +0800
Subject: [PATCH 3/3] [base.html] removed 'log out' icon

---
 seahub/templates/base.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/seahub/templates/base.html b/seahub/templates/base.html
index 9275478c74..1a2a3516e7 100644
--- a/seahub/templates/base.html
+++ b/seahub/templates/base.html
@@ -50,9 +50,6 @@
                     {% include 'snippets/search_form.html' %}
                 {% endif %}
 
-                {% if show_logout_icon %}
-                <a id="logout-icon" href="{{ SITE_ROOT }}accounts/logout/" class="no-deco fleft" title="{% trans "Log out" %}" aria-label="{% trans "Log out" %}"><span class="sf2-icon-logout"></span></a>
-                {% endif %}
 
                 <div id="account" class="fright">
                     <a id="my-info" href="#" class="no-deco" aria-label="{% trans "View profile and more" %}">