Merge branch 'refs/heads/develop' into feature/CMS-304-template-changes

HISTORY

@@ -2,6 +2,11 @@ Changelog for django-filer
 ==========================
 
 
+next
+----
+* Remove `FILER_STATICMEDIA_PREFIX` and use `staticfiles` for static files.
+
+
 0.9.12 (2015-07-28)
 -------------------
 

docs/settings.rst

@@ -19,18 +19,6 @@ Should newly uploaded files have permission checking disabled (be public) by def
 
 Defaults to ``True`` (new files have permission checking disable, are public)
 
-.. _FILER_STATICMEDIA_PREFIX:
-
-``FILER_STATICMEDIA_PREFIX``
-----------------------------
-
-The prefix for static media where filer will look for bundled javascript, css
-and images.
-
-Defaults to ``<STATIC_URL>/filer/`` if ``STATIC_URL`` is defined. Otherwise
-falls back to ``<MEDIA_URL>/filer/``. It is the URL where the ``static/filer/`` 
-directory should be served.
-
 .. _FILER_STORAGES:
 
 ``FILER_STORAGES``
@@ -143,4 +131,4 @@ Defaults to ``False``
 Defines the dotted path to a custom Image model; please include the model name.
 Example: 'my.app.models.CustomImage'
 
-Defaults to ``False``
+Defaults to ``False``

filer/admin/folderadmin.py

@@ -41,7 +41,7 @@
                                admin_each_context)
 from filer.models import (Folder, FolderRoot, UnfiledImages, File, tools,
                           ImagesWithMissingData, FolderPermission, Image)
-from filer.settings import FILER_STATICMEDIA_PREFIX, FILER_PAGINATE_BY
+from filer.settings import FILER_PAGINATE_BY
 from filer.thumbnail_processors import normalize_subject_location
 from filer.utils.compatibility import get_delete_permission
 from filer.utils.filer_easy_thumbnails import FilerActionThumbnailer
@@ -328,7 +328,7 @@ def directory_listing(self, request, folder_id=None, viewtype=None):
 
         if order_by is None or len(order_by) == 0:
             folder_files.sort()
-        
+
         items = folder_children + folder_files
         items_permissions = [(item, {'change': self.has_change_permission(request, item)}) for item in items]
         paginator = Paginator(items_permissions, FILER_PAGINATE_BY)

filer/admin/imageadmin.py

@@ -1,7 +1,8 @@
 #-*- coding: utf-8 -*-
 from django import forms
 from django.utils.translation import ugettext as _
-from filer import settings as filer_settings
+from django.contrib.staticfiles.templatetags.staticfiles import static
+
 from filer.admin.fileadmin import FileAdmin
 from filer.models import Image
 
@@ -32,8 +33,8 @@ class Media:
             #'all': (settings.MEDIA_URL + 'filer/css/focal_point.css',)
         }
         js = (
-            filer_settings.FILER_STATICMEDIA_PREFIX + 'js/raphael.js',
-            filer_settings.FILER_STATICMEDIA_PREFIX + 'js/focal_point.js',
+            static('filer/js/raphael.js'),
+            static('filer/js/focal_point.js'),
         )
 
 

filer/fields/file.py

@@ -4,6 +4,7 @@
 from django import forms
 from django.contrib.admin.widgets import ForeignKeyRawIdWidget
 from django.contrib.admin.sites import site
+from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.template.loader import render_to_string
@@ -55,17 +56,13 @@ def render(self, name, value, attrs=None):
         # ForeignKeyRawIdWidget adds
         hidden_input = super(ForeignKeyRawIdWidget, self).render(
                                                             name, value, attrs)
-        filer_static_prefix = filer_settings.FILER_STATICMEDIA_PREFIX
-        if not filer_static_prefix[-1] == '/':
-            filer_static_prefix += '/'
         context = {
             'hidden_input': hidden_input,
             'lookup_url': '%s%s' % (related_url, lookup_url),
             'thumb_id': css_id_thumbnail_img,
             'span_id': css_id_description_txt,
             'object': obj,
             'lookup_name': name,
-            'filer_static_prefix': filer_static_prefix,
             'clear_id': '%s_clear' % css_id,
             'id': css_id,
         }
@@ -86,8 +83,8 @@ def obj_for_value(self, value):
 
     class Media:
         js = (
-            filer_settings.FILER_STATICMEDIA_PREFIX + 'js/popup_handling.js',
-            filer_settings.FILER_STATICMEDIA_PREFIX + 'js/widget.js',
+            static('filer/js/popup_handling.js'),
+            static('filer/js/widget.js'),
         )
 
 

filer/fields/folder.py

@@ -6,14 +6,14 @@
 from django.conf import settings
 from django.contrib.admin.widgets import ForeignKeyRawIdWidget
 from django.contrib.admin.sites import site
+from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.safestring import mark_safe
 from filer.utils.compatibility import truncate_words
 from filer.utils.model_label import get_model_label
 from django.utils.translation import ugettext as _
 from filer.models import Folder
-from filer.settings import FILER_STATICMEDIA_PREFIX
 
 
 class AdminFolderWidget(ForeignKeyRawIdWidget):
@@ -62,7 +62,7 @@ def render(self, name, value, attrs=None):
             'object': obj,
             'clear_id': '%s_clear' % css_id,
             'descid': css_id_description_txt,
-            'noimg': '%sicons/nofile_32x32.png' % FILER_STATICMEDIA_PREFIX,
+            'noimg': 'filer/icons/nofile_32x32.png',
             'foldid': css_id_folder,
             'id': css_id,
             }
@@ -82,7 +82,7 @@ def obj_for_value(self, value):
         return obj
 
     class Media:
-        js = (FILER_STATICMEDIA_PREFIX + 'js/popup_handling.js',)
+        js = (static('filer/js/popup_handling.js'), )
 
 
 class AdminFolderFormField(forms.ModelChoiceField):

filer/models/mixins.py

@@ -1,5 +1,7 @@
 #-*- coding: utf-8 -*-
-from filer.settings import FILER_ADMIN_ICON_SIZES, FILER_STATICMEDIA_PREFIX
+from django.contrib.staticfiles.templatetags.staticfiles import static
+
+from filer.settings import FILER_ADMIN_ICON_SIZES
 
 
 class IconsMixin(object):
@@ -12,6 +14,5 @@ def icons(self):
         r = {}
         if getattr(self, '_icon', False):
             for size in FILER_ADMIN_ICON_SIZES:
-                r[size] = "%sicons/%s_%sx%s.png" % (
-                            FILER_STATICMEDIA_PREFIX, self._icon, size, size)
+                r[size] = static("filer/icons/%s_%sx%s.png" % (self._icon, size, size))
         return r

filer/settings.py

@@ -23,9 +23,6 @@
 FILER_IS_PUBLIC_DEFAULT = getattr(settings, 'FILER_IS_PUBLIC_DEFAULT', True)
 
 FILER_PAGINATE_BY = getattr(settings, 'FILER_PAGINATE_BY', 20)
-FILER_STATICMEDIA_PREFIX = getattr(settings, 'FILER_STATICMEDIA_PREFIX', None)
-if not FILER_STATICMEDIA_PREFIX:
-    FILER_STATICMEDIA_PREFIX = (getattr(settings, 'STATIC_URL', None) or settings.MEDIA_URL) + 'filer/'
 
 FILER_ADMIN_ICON_SIZES = getattr(settings,"FILER_ADMIN_ICON_SIZES",(
     '16', '32', '48', '64',

filer/templates/admin/filer/base_site.html

@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
-{% load i18n filermedia %}
+{% load i18n staticfiles %}
 
 {% block extrastyle %}{{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% filer_staticmedia_prefix %}css/admin_style.css" />
+<link rel="stylesheet" type="text/css" href="{% static "filer/css/admin_style.css" %}" />
 {% endblock %}

filer/templates/admin/filer/change_form.html

@@ -1,5 +1,5 @@
 {% extends "admin/change_form.html" %}
-{% load i18n admin_modify filermedia %}
+{% load i18n admin_modify staticfiles %}
 
 {% block extrahead %}{{ block.super }}
 {% endblock %}
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block extrastyle %}{{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% filer_staticmedia_prefix %}css/admin_style.css" />
+<link rel="stylesheet" type="text/css" href="{% static "filer/css/admin_style.css" %}" />
 {% endblock %}
 
 {% block coltype %}colMS{% endblock %}

filer/templates/admin/filer/delete_confirmation.html

@@ -1,9 +1,9 @@
 {% extends "admin/delete_confirmation.html" %}
-{% load i18n filermedia %}
+{% load i18n staticfiles %}
 {% load url from future %}
 
 {% block extrastyle %}{{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% filer_staticmedia_prefix %}css/admin_style.css" />
+    <link rel="stylesheet" type="text/css" href="{% static "filer/css/admin_style.css" %}"/>
 {% endblock %}
 
 {% block breadcrumbs %}

filer/templates/admin/filer/folder/change_form.html

@@ -1,5 +1,5 @@
 {% extends "admin/change_form.html" %}
-{% load i18n admin_modify filermedia %}
+{% load i18n admin_modify staticfiles %}
 {% load url from future %}
 
 {% block breadcrumbs %}
@@ -32,7 +32,7 @@
 {% block sidebar %}{% if not is_popup %}
 <div id="content-related">
     <div id="navcontainer">
-        <img src="{% filer_staticmedia_prefix %}icons/plainfolder_128x128.png" alt="{% trans "Folder Icon" %}" />
+        <img src="{% static "icons/plainfolder_128x128.png" %}" alt="{% trans "Folder Icon" %}" />
     </div>
 </div>
 {% endif %}{% endblock %}

filer/templates/admin/filer/folder/choose_copy_destination.html

@@ -1,11 +1,11 @@
 {% extends "admin/base_site.html" %}
-{% load i18n filer_admin_tags %}
+{% load i18n staticfiles %}
 
 {% block breadcrumbs %}
 {% include "admin/filer/breadcrumbs.html" %}
 {% endblock %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_css_base %}forms.css" />{% endblock %}
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static 'admin/css/forms.css' %}" />{% endblock %}
 
 {% block content %}
 {% if perms_lacking %}

filer/templates/admin/filer/folder/choose_images_resize_options.html

@@ -1,11 +1,11 @@
 {% extends "admin/base_site.html" %}
-{% load i18n filer_admin_tags %}
+{% load i18n staticfiles %}
 
 {% block breadcrumbs %}
 {% include "admin/filer/breadcrumbs.html" %}
 {% endblock %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_css_base %}forms.css" />{% endblock %}
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static 'admin/css/forms.css' %}" />{% endblock %}
 
 {% block content %}
 {% if perms_lacking %}

filer/templates/admin/filer/folder/choose_move_destination.html

@@ -1,11 +1,11 @@
 {% extends "admin/base_site.html" %}
-{% load i18n filer_admin_tags %}
+{% load i18n staticfiles %}
 
 {% block breadcrumbs %}
 {% include "admin/filer/breadcrumbs.html" %}
 {% endblock %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_css_base %}forms.css" />{% endblock %}
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static 'admin/css/forms.css' %}" />{% endblock %}
 
 {% block content %}
 {% if perms_lacking %}

filer/templates/admin/filer/folder/choose_rename_format.html

@@ -1,11 +1,11 @@
 {% extends "admin/base_site.html" %}
-{% load i18n filer_admin_tags %}
+{% load i18n static %}
 
 {% block breadcrumbs %}
 {% include "admin/filer/breadcrumbs.html" %}
 {% endblock %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_css_base %}forms.css" />{% endblock %}
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static 'admin/css/forms.css' %}" />{% endblock %}
 
 {% block content %}
 {% if perms_lacking %}

filer/templates/admin/filer/folder/directory_listing.html

@@ -1,16 +1,16 @@
 {% extends "admin/filer/base_site.html" %}
-{% load filer_admin_tags filermedia i18n %}
+{% load i18n staticfiles filer_admin_tags %}
 {% load url from future %}
 
 {% block extrahead %}{{ block.super }}
 {# upload stuff #}
 {{ media.js }}
-<script type="text/javascript" src="{% admin_js_base %}jquery.min.js"></script>
-<script type="text/javascript" src="{% filer_staticmedia_prefix %}js/jquery.cookie.js"></script>
-<script type="text/javascript" src="{% filer_staticmedia_prefix %}js/fileuploader.js"></script>
-<script type="text/javascript" src="{% filer_staticmedia_prefix %}js/retina.js"></script>
-<script type="text/javascript" src="{% admin_js_base %}admin/RelatedObjectLookups.js"></script>
-<script type="text/javascript" src="{% filer_staticmedia_prefix %}js/popup_handling.js"></script>
+<script type="text/javascript" src="{% static "admin/js/jquery.min.js" %}"></script>
+<script type="text/javascript" src="{% static "filer/js/jquery.cookie.js" %}"></script>
+<script type="text/javascript" src="{% static "filer/js/fileuploader.js" %}"></script>
+<script type="text/javascript" src="{% static "filer/js/retina.js" %}"></script>
+<script type="text/javascript" src="{% static "admin/js/admin/RelatedObjectLookups.js" %}"></script>
+<script type="text/javascript" src="{% static "filer/js/popup_handling.js" %}"></script>
 {% if action_form %}{% if actions_on_top or actions_on_bottom %}
 <script type="text/javascript">
 (function($) {
@@ -27,7 +27,7 @@
 
 
 {% block extrastyle %}{{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% admin_css_base %}changelists.css" />
+<link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
 {{ media.css }}
 {% if action_form %}
   {% url 'admin:jsi18n' as jsi18nurl %}

filer/templates/admin/filer/folder/directory_table.html

@@ -1,5 +1,5 @@
 {% load i18n l10n %}
-{% load admin_list filermedia filer_tags %}
+{% load admin_list filer_tags staticfiles %}
 {% load url from future %}
 <div id="changelist-wrapper">
     <div id="toolbartable">
@@ -43,7 +43,7 @@
                 <tr class="{% cycle rowcolors %}">
                     <td>{% if is_popup and not select_folder %}<a class="insertlink insertlinkButton" href="" onclick="opener.dismissRelatedImageLookupPopup(window, {{ file.id|unlocalize }}, '{{ file.icons.48|escapejs }}', '{{ file.label|escapejs }}'); return false;" title="{% trans "Select this file" %}">&nbsp;</a>{% else %}{% if action_form and not is_popup %}<input type="checkbox" class="action-select" value="file-{{ item.pk }}" name="_selected_action" />{% endif %}{% endif %}</td>
                     <!-- FileIcon -->
-                    <td class="transpTiling">{% if item_perms.change %}<a href="{{ file.get_admin_url_path }}{% if is_popup %}?_popup=1{% if select_folder %}&select_folder=1{% endif %}{% endif %}" title="{% blocktrans with file.label as item_label %}Change '{{ item_label }}' details{% endblocktrans %}">{% endif %}<img src="{% if file.icons.48 %}{{ file.icons.48 }}{% else %}{% filer_staticmedia_prefix %}icons/missingfile_48x48.png{% endif %}" alt="{{ file.default_alt_text }}" />{% if item_perms.change %}</a>{% endif %}</td>
+                    <td class="transpTiling">{% if item_perms.change %}<a href="{{ file.get_admin_url_path }}{% if is_popup %}?_popup=1{% if select_folder %}&select_folder=1{% endif %}{% endif %}" title="{% blocktrans with file.label as item_label %}Change '{{ item_label }}' details{% endblocktrans %}">{% endif %}<img src="{% if file.icons.48 %}{{ file.icons.48 }}{% else %}{% static "icons/missingfile_48x48.png" %}{% endif %}" alt="{{ file.default_alt_text }}" />{% if item_perms.change %}</a>{% endif %}</td>
                     <!-- Filename/Dimensions -->
                     <td>
                         <div><strong>{% if item_perms.change %}<a href="{{ file.get_admin_url_path }}{% if is_popup %}?_popup=1{% if select_folder %}&select_folder=1{% endif %}{% endif %}" title="{% blocktrans with file.label as item_label %}Change '{{ item_label }}' details{% endblocktrans %}">{% endif %}{{ file.label }}{% if item_perms.change %}</a>{% endif %}</strong></div>

filer/templates/admin/filer/tools/search_form.html

@@ -1,10 +1,9 @@
-{% load filermedia filer_admin_tags %}
-{% load i18n %}
+{% load i18n staticfiles %}
 <div id="toolbar">
     <div style="float: left;">
         <form id="changelist-search" action="." method="get">
             <div>
-                <label for="searchbar"><img src="{% admin_icon_base %}icon_searchbox.png" alt="{% trans "Search" %}" /></label>
+                <label for="searchbar"><img src="{% static "admin/img/icon_searchbox.png" %}" alt="{% trans "Search" %}" /></label>
                 {% if is_popup %}
                     <input type="hidden" name="_popup" value="1" />
                     {% if select_folder %}<input type="hidden" name="select_folder" value="1" />{% endif %}

filer/templates/admin/filer/tools/upload_button_js.html

@@ -1,4 +1,4 @@
-{% load i18n admin_modify filermedia %}
+{% load i18n admin_modify staticfiles %}
 {% load url from future %}
 
 <script type="text/javascript">
@@ -22,7 +22,7 @@
             var file = responseJSON;
             if (file.error) {
                 var html = '\
-                <td class="thumbnail"><img style="width: 32px;height: 32px;" src="{% filer_staticmedia_prefix %}/icons/missingfile_32x32.png" alt="{% filter escapejs %}{% trans "file missing" %}{% endfilter %}" /></td>\
+                <td class="thumbnail"><img style="width: 32px;height: 32px;" src="{% static "static/icons/missingfile_32x32.png" %}" alt="{% filter escapejs %}{% trans "file missing" %}{% endfilter %}" /></td>\
                 <td class="label">' + file.error + '</td>\
                 <td class="buttons"></td>';
             } else {

filer/templates/admin/filer/widgets/admin_file.html

@@ -1,21 +1,21 @@
-{% load i18n filer_admin_tags %}{% spaceless %}
+{% load i18n staticfiles %}{% spaceless %}
 <span class="filerFile">
 {% if object %}
 	{% if object.icons.32 %}
 		<a href="{{ object.url }}" target="_blank"><img id="{{ thumb_id }}" src="{{ object.icons.48 }}" alt="{{ object.label }}" /></a>
 		&nbsp;<span id="{{ span_id }}">{{ object.label }}</span>
 	{% else %}
-		<img id="{{ thumb_id }}" src="{{ filer_static_prefix }}icons/missingfile_48x48.png" alt="{% trans 'file missing' %}" />
+		<img id="{{ thumb_id }}" src="{% static "filer/icons/missingfile_48x48.png" %}" alt="{% trans 'file missing' %}" />
 		&nbsp;<span id="{{ span_id }}">{% trans 'file missing' %}</span>
 	{% endif %}
 {% else %}
-	<img id="{{ thumb_id }}" src="{{ filer_static_prefix }}icons/nofile_48x48.png" class="quiet" alt="{% trans 'no file selected' %}" />
+	<img id="{{ thumb_id }}" src="{% static "filer/icons/nofile_48x48.png" %}" class="quiet" alt="{% trans 'no file selected' %}" />
 	&nbsp;<span id="{{ span_id }}"></span>
 {% endif %}
 <a href="{{ lookup_url }}" class="related-lookup" id="lookup_id_{{ lookup_name }}" title="{% trans 'Lookup' %}" onclick="return showRelatedObjectLookupPopup(this);">
-	<img src="{% admin_icon_base %}icon_searchbox.png" width="16" height="16" alt="{% trans 'Lookup' %}" />
+    <img src="{% static 'admin/img/icon_searchbox.png' %}" width="16" height="16" alt="{% trans 'Lookup' %}" />
 </a>
-<img id="{{ clear_id }}" class="filerClearer" src="{% admin_icon_base %}icon_deletelink.gif" width="10" height="10" alt="{% trans 'Clear' %}" title="{% trans 'Clear' %}"{% if not object %} style="display: none;"{% endif %} />
+<img id="{{ clear_id }}" class="filerClearer" src="{% static 'admin/img/icon_deletelink.gif' %}" width="10" height="10" alt="{% trans 'Clear' %}" title="{% trans 'Clear' %}"{% if not object %} style="display: none;"{% endif %} />
 <br />
 {{ hidden_input }}
 <script type="text/javascript" id="{{id}}_javascript">