From: Attila-Mihaly Balazs Date: Sat, 4 Jan 2014 11:09:35 +0000 (+0200) Subject: Remove ADMIN_MEDIA_PREFIX since it has been deprecated in Django 1.4 X-Git-Tag: live~28^2~5 X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/ee224eb2acc8f8d6ef4af6c083060a4403f45cd9?hp=dcacc3b4c2ba2f550806a2d22b183f6fac4f63ff Remove ADMIN_MEDIA_PREFIX since it has been deprecated in Django 1.4 --- diff --git a/forum/settings/__init__.py b/forum/settings/__init__.py index 1458599..4120d2b 100644 --- a/forum/settings/__init__.py +++ b/forum/settings/__init__.py @@ -27,7 +27,6 @@ APP_BASE_URL = djsettings.APP_BASE_URL FORCE_SCRIPT_NAME = djsettings.FORCE_SCRIPT_NAME OSQA_SKIN = djsettings.OSQA_DEFAULT_SKIN LANGUAGE_CODE = djsettings.LANGUAGE_CODE -ADMIN_MEDIA_PREFIX = djsettings.ADMIN_MEDIA_PREFIX ONLINE_USERS = Setting('ONLINE_USERS', {}) diff --git a/forum/skins/default/templates/osqaadmin/djstyle_base.html b/forum/skins/default/templates/osqaadmin/djstyle_base.html index bc7c12a..32a87bc 100644 --- a/forum/skins/default/templates/osqaadmin/djstyle_base.html +++ b/forum/skins/default/templates/osqaadmin/djstyle_base.html @@ -1,4 +1,4 @@ -{% load extra_tags extra_filters i18n %} +{% load extra_tags extra_filters i18n admin_static %} @@ -6,10 +6,10 @@ - - - - + + + + - + - + {% endblock %} {% block subtitle %} @@ -271,7 +270,7 @@ {% csrf_token %}
- + {% if text %} @@ -515,4 +514,4 @@ {{ nodes.paginator.page_numbers }}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/settings.py b/settings.py index 1bb2e75..0c0495a 100644 --- a/settings.py +++ b/settings.py @@ -4,7 +4,6 @@ import sys SITE_ID = 1 -ADMIN_MEDIA_PREFIX = '/admin_media/' SECRET_KEY = 'a;::qCl1mfh?avagttOJ;8f5Rr54d,9qy7;o15M2cYO75?OQo51u3LnQ;!8N.:,7' CACHE_MAX_KEY_LENGTH = 235