From 2a8be0b06f80b5d7e9e9bba4e1fd452cb5c33c8b Mon Sep 17 00:00:00 2001 From: andresgz Date: Thu, 2 Jun 2016 16:23:06 -0400 Subject: [PATCH] #342 Add settings to common.py and add tags to base template --- .../config/settings/common.py | 12 +++++++++++ .../config/settings/production.py | 6 ------ .../templates/base.html | 20 ++++++------------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/common.py index 3668b4274..bfe0a76d7 100644 --- a/{{cookiecutter.project_slug}}/config/settings/common.py +++ b/{{cookiecutter.project_slug}}/config/settings/common.py @@ -185,6 +185,8 @@ STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.AppDirectoriesFinder', ) +# 'compressor.finders.CompressorFinder', + # MEDIA CONFIGURATION # ------------------------------------------------------------------------------ # See: https://docs.djangoproject.com/en/dev/ref/settings/#media-root @@ -233,6 +235,16 @@ BROKER_URL = env('CELERY_BROKER_URL', default='django://') ########## END CELERY {% endif %} +# django-compressor +# ------------------------------------------------------------------------------ +{% if cookiecutter.use_compressor == 'y'-%} +INSTALLED_APPS += ("compressor", ) + +STATICFILES_FINDERS += ("compressor.finders.CompressorFinder", ) + +{%- endif %} + + # Location of root django.contrib.admin URL, use {% raw %}{% url 'admin:index' %}{% endraw %} ADMIN_URL = r'^admin/' diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 8004901ac..145593c90 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -171,12 +171,6 @@ NEW_RELIC_LICENSE_KEY = env('NEW_RELIC_LICENSE_KEY') NEW_RELIC_APP_NAME = env('NEW_RELIC_APP_NAME') {%- endif %} -# django-compressor -# ------------------------------------------------------------------------------ -{% if cookiecutter.use_compressor == 'y'-%} -INSTALLED_APPS += ("compressor", ) -{%- endif %} - # TEMPLATE CONFIGURATION # ------------------------------------------------------------------------------ # See: diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html index 692cb49ef..9c7f7dcbb 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html @@ -1,4 +1,4 @@ -{% raw %}{% load staticfiles i18n {% endraw %}{% if cookiecutter.use_compressor == "y" %}compressor{% endif %}{% raw %}%} +{% raw %}{% load staticfiles i18n {% endraw %}{% if cookiecutter.use_compressor == "y" %}compress{% endif %}{% raw %}%} @@ -18,15 +18,10 @@ - {% endraw%}{% if cookiecutter.use_compressor == "y" %} - {% compress css %} - {% endif %}{% raw %} + {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress css %}{% endraw %}{% endif %}{% raw %} - {% endraw%}{% if cookiecutter.use_compressor == "y" %} - {% endcompress %} - {% endif %}{% raw %} - + {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %} {% endblock %} {% endraw %}{% if cookiecutter.use_angular == "y" %}{% raw %}{% block angular %} @@ -110,13 +105,10 @@ - {% endraw%}{% if cookiecutter.use_compressor == "y" %} - {% compress js %} - {% endif %}{% raw %} + {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %} - {% endraw%}{% if cookiecutter.use_compressor == "y" %} - {% endcompress %} - {% endif %}{% raw %} + {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %} + {% endblock javascript %}