haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-20 10:20:42 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1746 from haiwen/logout

Browse Source 
[header] added 'log out' icon
This commit is contained in:
Daniel Pan
2017-08-08 12:24:57 +08:00
committed by GitHub
parent 87a52538be 15455fd45c
commit 0505d1054d
8 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/css/seahub.css
View File

@@ -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;

BIN
media/css/sf_font2/seafile-font2.eot
View File

Binary file not shown.

1
media/css/sf_font2/seafile-font2.svg
View File

@@ -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>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
media/css/sf_font2/seafile-font2.ttf
View File

Binary file not shown.

BIN
media/css/sf_font2/seafile-font2.woff
View File

Binary file not shown.

3
seahub/base/context_processors.py
View File

@@ -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,
}

3
seahub/settings.py
View File

@@ -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 = ['*']

32
seahub/templates/base_for_backbone.html
View File

@@ -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>