diff --git a/base/context_processors.py b/base/context_processors.py
index 48ae60f113..1e62a28a95 100644
--- a/base/context_processors.py
+++ b/base/context_processors.py
@@ -6,7 +6,7 @@ and returns a dictionary to add to the context.
These are referenced from the setting TEMPLATE_CONTEXT_PROCESSORS and used by
RequestContext.
"""
-from settings import SEAFILE_VERSION, SEAHUB_TITLE, SITE_NAME, SITE_BASE
+from settings import SEAFILE_VERSION, SITE_TITLE, SITE_NAME, SITE_BASE
try:
from settings import BUSINESS_MODE
except ImportError:
@@ -28,7 +28,7 @@ def base(request):
return {
'seafile_version': SEAFILE_VERSION,
- 'seahub_title': SEAHUB_TITLE,
+ 'site_title': SITE_TITLE,
'business_mode': BUSINESS_MODE,
'cloud_mode': request.cloud_mode,
'org': org,
diff --git a/settings.py b/settings.py
index 3e597132a0..4dbf5bb8d6 100644
--- a/settings.py
+++ b/settings.py
@@ -192,10 +192,6 @@ CACHES = {
MAX_UPLOAD_FILE_SIZE = 100 * 1024 * 1024 # 100 MB
MAX_UPLOAD_FILE_NAME_LEN = 256
-# Base url and name used in email sending
-SITE_BASE = 'http://seafile.com'
-SITE_NAME = 'Seafile'
-
# Set to True when user will be activaed after registration,
# and no email sending
ACTIVATE_AFTER_REGISTRATION = True
@@ -213,9 +209,12 @@ CCNET_APPLET_ROOT = "http://localhost:13420"
# Account initial password, for password resetting.
INIT_PASSWD = '123456'
-SEAHUB_TITLE = 'Private Seafile'
+# browser tab title
+SITE_TITLE = 'Private Seafile'
-USE_SUBDOMAIN = False
+# Base url and name used in email sending
+SITE_BASE = 'http://seafile.com'
+SITE_NAME = 'Seafile'
try:
import local_settings
@@ -239,7 +238,7 @@ else:
LOGIN_URL = SITE_ROOT + 'accounts/login'
-USER_TOTAL_SPACE = 5 * pow(2,30)
-
SEAFILE_VERSION = '1.2.0'
+USE_SUBDOMAIN = False
+
diff --git a/templates/base.html b/templates/base.html
index f31769e8ad..8b29c3e500 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -4,7 +4,7 @@
-{% if org %}{{ org.org_name }} - {% endif %}{{ seahub_title }}
+{% if org %}{{ org.org_name }} - {% endif %}{{ site_title }}