From 100e264ec977d207e287e03b11b0941f5a69b0fd Mon Sep 17 00:00:00 2001 From: zhengxie Date: Tue, 5 Jan 2016 12:07:58 +0800 Subject: [PATCH 01/13] Enable LOGIN_URL to be configured --- seahub/settings.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/seahub/settings.py b/seahub/settings.py index 67b22a1997..d6b4251451 100644 --- a/seahub/settings.py +++ b/seahub/settings.py @@ -217,8 +217,8 @@ CONSTANCE_DATABASE_CACHE_BACKEND = 'default' AUTHENTICATION_BACKENDS = ( 'seahub.base.accounts.AuthBackend', ) - LOGIN_REDIRECT_URL = '/profile/' +LOGIN_URL = SITE_ROOT + 'accounts/login' ACCOUNT_ACTIVATION_DAYS = 7 @@ -608,10 +608,6 @@ if 'win32' in sys.platform: fp.write("%d\n" % os.getpid()) fp.close() -# Put here after loading other settings files if `SITE_ROOT` is modified in -# other settings files. -LOGIN_URL = SITE_ROOT + 'accounts/login' - INNER_FILE_SERVER_ROOT = 'http://127.0.0.1:' + FILE_SERVER_PORT CONSTANCE_CONFIG = { From 94b6818475df8359449ae1ff2116d709d9ecdf0e Mon Sep 17 00:00:00 2001 From: zhengxie Date: Fri, 15 Jan 2016 13:50:33 +0800 Subject: [PATCH 02/13] Add trans context in "Organization" string --- seahub/templates/base_for_backbone.html | 2 +- seahub/templates/libraries.html | 2 +- seahub/templates/myhome_base.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html index bad051c583..e68eabaca1 100644 --- a/seahub/templates/base_for_backbone.html +++ b/seahub/templates/base_for_backbone.html @@ -65,7 +65,7 @@ {% if user.permissions.can_view_org %} {% endif %} diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html index e58eca6e9d..616b10449e 100644 --- a/seahub/templates/libraries.html +++ b/seahub/templates/libraries.html @@ -16,7 +16,7 @@
-

{% trans "Organization" %}

+

{% trans "Organization" context "This is a label in navigation, meaning the public area for all registered users to share libraries." %}

  • {% trans "Libraries" %}
  • {% trans "Members" %}
  • diff --git a/seahub/templates/myhome_base.html b/seahub/templates/myhome_base.html index 4bdff041e8..b5ce127baa 100644 --- a/seahub/templates/myhome_base.html +++ b/seahub/templates/myhome_base.html @@ -10,7 +10,7 @@ {% if user.permissions.can_view_org %} {% endif %}