diff --git a/.gitignore b/.gitignore index d56383c788..132df919ca 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ pylintrc .DS_Store *.mo media/assets +media/CACHE media/avatars/* !media/avatars/default-non-register.jpg !media/avatars/default.png diff --git a/requirements.txt b/requirements.txt index 43ab9149e8..3edf0b0e04 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ six Pillow>=2.6.1,<3.0.0 Django>=1.5.8,<1.6 Djblets==0.6.14 +django-compressor==1.4 diff --git a/seahub/group/templates/group/group_info.html b/seahub/group/templates/group/group_info.html index cc13686683..dc74184671 100644 --- a/seahub/group/templates/group/group_info.html +++ b/seahub/group/templates/group/group_info.html @@ -5,9 +5,6 @@ {% block sub_title %}{{group.group_name}} - {% endblock %} {% block extra_style %} - - - {% endblock %} {% block main_panel %} diff --git a/seahub/settings.py b/seahub/settings.py index 8533cf9b9f..5cb0cff176 100644 --- a/seahub/settings.py +++ b/seahub/settings.py @@ -90,6 +90,7 @@ STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', # 'django.contrib.staticfiles.finders.DefaultStorageFinder', + 'compressor.finders.CompressorFinder', ) # Make this unique, and don't share it with anybody. @@ -183,6 +184,7 @@ INSTALLED_APPS = ( 'registration', 'captcha', + 'compressor', 'seahub.api2', 'seahub.avatar', @@ -409,6 +411,12 @@ SHARE_ACCESS_PASSWD_TIMEOUT = 60 * 60 SEAFILE_VERSION = '4.1.2' +# Compress static files(css, js) +COMPRESS_URL = MEDIA_URL +COMPRESS_ROOT = MEDIA_ROOT +COMPRESS_DEBUG_TOGGLE = 'nocompress' +COMPRESS_CSS_HASHING_METHOD = 'content' + ################### # Image Thumbnail # ################### diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html index aba1f512f1..03d84bfab1 100644 --- a/seahub/templates/base_for_backbone.html +++ b/seahub/templates/base_for_backbone.html @@ -1,6 +1,6 @@ -{% load seahub_tags avatar_tags group_avatar_tags i18n %} -{% load url from future %} - +{% load staticfiles i18n %} +{% load compress %} +{% load seahub_tags avatar_tags group_avatar_tags %}
@@ -11,7 +11,14 @@ + +{% compress css %} + + + +{% endcompress %} + {% block extra_style %}{% endblock %} {% if branding_css != '' %}{% endif %} diff --git a/seahub/templates/myhome.html b/seahub/templates/myhome.html index 7c0437c8cc..4968c09ce6 100644 --- a/seahub/templates/myhome.html +++ b/seahub/templates/myhome.html @@ -5,9 +5,6 @@ {% block sub_title %}{% trans "Libraries" %} - {% endblock %} {% block extra_style %} - - -