renamed the settings variable for static filer media

filer/admin/folderadmin.py

@@ -11,7 +11,7 @@
 from filer.models import Folder, FolderRoot, UnfiledImages, ImagesWithMissingData, File
 from filer.admin.tools import *
 from filer.models import tools
-from filer.settings import FILER_MEDIA_PREFIX
+from filer.settings import FILER_STATICMEDIA_PREFIX
 
 
 # Forms
@@ -106,7 +106,7 @@ def delete_view(self, request, object_id, extra_context=None):
             return HttpResponseRedirect(url)
         return r
     def icon_img(self,xs):
-        return mark_safe('<img src="%simg/icons/plainfolder_32x32.png" alt="Folder Icon" />' % FILER_MEDIA_PREFIX)
+        return mark_safe('<img src="%simg/icons/plainfolder_32x32.png" alt="Folder Icon" />' % FILER_STATICMEDIA_PREFIX)
     icon_img.allow_tags = True
 
     def get_urls(self):

filer/fields/file.py

@@ -7,7 +7,7 @@
 from django.core.urlresolvers import reverse
 from django.utils.safestring import mark_safe
 from sorl.thumbnail.base import ThumbnailException
-from filer.settings import FILER_MEDIA_PREFIX
+from filer.settings import FILER_STATICMEDIA_PREFIX
 from django.conf import settings as globalsettings
 from filer.models import File
 
@@ -72,8 +72,8 @@ def obj_for_value(self, value):
         return obj
 
     class Media:
-        js = (FILER_MEDIA_PREFIX+'js/admin_file_widget.js',
-              FILER_MEDIA_PREFIX+'js/popup_handling.js',)
+        js = (FILER_STATICMEDIA_PREFIX+'js/admin_file_widget.js',
+              FILER_STATICMEDIA_PREFIX+'js/popup_handling.js',)
 
 class AdminFileFormField(forms.ModelChoiceField):
     widget = AdminFileWidget

filer/fields/image.py

@@ -7,7 +7,7 @@
 from django.core.urlresolvers import reverse
 from django.utils.safestring import mark_safe
 from sorl.thumbnail.base import ThumbnailException
-from filer.settings import FILER_MEDIA_PREFIX
+from filer.settings import FILER_STATICMEDIA_PREFIX
 from django.conf import settings as globalsettings
 from filer.fields.file import AdminFileWidget, AdminFileFormField, FilerFileField
 from filer.models import Image

filer/models/mixins.py

@@ -1,4 +1,4 @@
-from filer.settings import FILER_ADMIN_ICON_SIZES, FILER_MEDIA_PREFIX
+from filer.settings import FILER_ADMIN_ICON_SIZES, FILER_STATICMEDIA_PREFIX
 
 class IconsMixin(object):
     '''
@@ -10,5 +10,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_MEDIA_PREFIX, self._icon, size, size)
+                r[size] = "%sicons/%s_%sx%s.png" % (FILER_STATICMEDIA_PREFIX, self._icon, size, size)
         return r

filer/settings.py

@@ -1,7 +1,7 @@
 from os.path import join
 from django.conf import settings
 
-FILER_MEDIA_PREFIX = getattr(settings, 'FILER_MEDIA_PREFIX', join(settings.MEDIA_URL,'filer/') )
+FILER_STATICMEDIA_PREFIX = getattr(settings, 'FILER_STATICMEDIA_PREFIX', join(settings.MEDIA_URL,'filer/') )
 
 FILER_UPLOAD_ROOT = getattr(settings,'FILER_UPLOAD_ROOT', 'catalogue')
 

filer/templates/admin/filer/base_site.html

@@ -2,5 +2,5 @@
 {% load i18n filermedia %}
 
 {% block extrastyle %}{{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% filer_media_prefix %}css/admin_style.css" />
+<link rel="stylesheet" type="text/css" href="{% filer_staticmedia_prefix %}css/admin_style.css" />
 {% endblock %}

filer/templates/admin/filer/change_form.html

@@ -6,5 +6,5 @@
 {% endblock %}
 
 {% block extrastyle %}{{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% filer_media_prefix %}css/admin_style.css" />
+<link rel="stylesheet" type="text/css" href="{% filer_staticmedia_prefix %}css/admin_style.css" />
 {% endblock %}

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

@@ -24,7 +24,7 @@
 {% block sidebar %}{% if not is_popup %}
 <div id="content-related">
     <div id="navcontainer">
-    	<img src="{% filer_media_prefix %}icons/plainfolder_128x128.png" alt="Folder Icon" />
+    	<img src="{% filer_staticmedia_prefix %}icons/plainfolder_128x128.png" alt="Folder Icon" />
     </div>
 </div>
 {% endif %}{% endblock %}

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

@@ -4,14 +4,14 @@
 
 {% block extrahead %}{{ block.super }}
 <script type="text/javascript" src="{% admin_media_prefix %}js/admin/RelatedObjectLookups.js"></script>
-<script type="text/javascript" src="{% filer_media_prefix %}js/popup_handling.js"></script>
+<script type="text/javascript" src="{% filer_staticmedia_prefix %}js/popup_handling.js"></script>
 
 {# upload stuff #}
-<script type="text/javascript" src="{% filer_media_prefix %}js/jquery-1.3.2.min.js"></script>
-<script type="text/javascript" src="{% filer_media_prefix %}js/jquery-ui-1.7.2.custom.min.js"></script>
-<script type="text/javascript" src="{% filer_media_prefix %}js/jquery.cookie.js"></script>
-<script type="text/javascript" src="{% filer_media_prefix %}js/swfupload.js"></script>
-<script type="text/javascript" src="{% filer_media_prefix %}js/swfupload.queue.js"></script>
+<script type="text/javascript" src="{% filer_staticmedia_prefix %}js/jquery-1.3.2.min.js"></script>
+<script type="text/javascript" src="{% filer_staticmedia_prefix %}js/jquery-ui-1.7.2.custom.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/swfupload.js"></script>
+<script type="text/javascript" src="{% filer_staticmedia_prefix %}js/swfupload.queue.js"></script>
 
 {% endblock %}
 

filer/templates/admin/filer/tools/upload_button.html

@@ -133,7 +133,7 @@
 		}
 	};
     var settings = {
-        flash_url : "{% filer_media_prefix %}flash/swfupload.swf",
+        flash_url : "{% filer_staticmedia_prefix %}flash/swfupload.swf",
         upload_url: "{% url admin:filer-ajax_upload %}",
         post_params: {'jsessionid':$.cookie('sessionid')},
         file_size_limit : "100 MB",
@@ -148,7 +148,7 @@
         debug: false,
 
         // Button settings
-        button_image_url: "{% filer_media_prefix %}img/upload_button.png",
+        button_image_url: "{% filer_staticmedia_prefix %}img/upload_button.png",
         button_width: "79",
         button_height: "16",
         button_placeholder_id: "spanButtonPlaceHolder",

filer/templates/image_filer/slideshow2.html

@@ -1,8 +1,8 @@
 {% load filermedia %}
 {% block extrahead %}{{ block.super }}
-<script type="text/javascript" src="{% filer_media_prefix %}slideshow2/js/mootools.js"></script>
-<script type="text/javascript" src="{% filer_media_prefix %}slideshow2/js/slideshow.js"></script>
-<link rel="stylesheet" type="text/css" href="{% filer_media_prefix %}slideshow2/css/slideshow.css" />
+<script type="text/javascript" src="{% filer_staticmedia_prefix %}slideshow2/js/mootools.js"></script>
+<script type="text/javascript" src="{% filer_staticmedia_prefix %}slideshow2/js/slideshow.js"></script>
+<link rel="stylesheet" type="text/css" href="{% filer_staticmedia_prefix %}slideshow2/css/slideshow.css" />
 {% endblock %}
 <div id="slideshow" class="slideshow">
 </div>

filer/templatetags/filermedia.py

@@ -2,13 +2,13 @@
 
 register = Library()
 
-def filer_media_prefix():
+def filer_staticmedia_prefix():
     """
-    Returns the string contained in the setting ADMIN_MEDIA_PREFIX.
+    Returns the string contained in the setting FILER_STATICMEDIA_PREFIX.
     """
     try:
         from filer import settings
     except ImportError:
         return ''
-    return settings.FILER_MEDIA_PREFIX
-admin_media_prefix = register.simple_tag(filer_media_prefix)
+    return settings.FILER_STATICMEDIA_PREFIX
+filer_staticmedia_prefix = register.simple_tag(filer_staticmedia_prefix)