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 081d65245c..66fd52b3cf 100644 Binary files a/media/css/sf_font2/seafile-font2.eot and b/media/css/sf_font2/seafile-font2.eot differ 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 @@ + diff --git a/media/css/sf_font2/seafile-font2.ttf b/media/css/sf_font2/seafile-font2.ttf index d7286e852c..117c4061a3 100644 Binary files a/media/css/sf_font2/seafile-font2.ttf and b/media/css/sf_font2/seafile-font2.ttf differ diff --git a/media/css/sf_font2/seafile-font2.woff b/media/css/sf_font2/seafile-font2.woff index 6741f5ebbd..e9ec7bfaae 100644 Binary files a/media/css/sf_font2/seafile-font2.woff and b/media/css/sf_font2/seafile-font2.woff differ 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_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 @@
- {% if has_file_search %} - {% include 'snippets/search_form.html' %} - {% endif %} + {% if has_file_search %} + {% include 'snippets/search_form.html' %} + {% endif %} - + - + {% if show_logout_icon %} + + {% endif %} + +