Merge pull request django-cms#922 from ojii/stephrdev-feature/staticf…

…iles

Transition to staticfiles

cms/admin/pageadmin.py

@@ -164,15 +164,14 @@ class PageAdmin(ModelAdmin):
 
     class Media:
         css = {
-            'all': [os.path.join(settings.CMS_MEDIA_URL, path) for path in (
+            'all': [os.path.join(settings.STATIC_URL, 'cms', path) for path in (
                 'css/rte.css',
                 'css/pages.css',
                 'css/change_form.css',
                 'css/jquery.dialog.css',
             )]
         }
-        js = ['%sjs/jquery.min.js' % settings.ADMIN_MEDIA_PREFIX] + [
-                os.path.join(settings.CMS_MEDIA_URL, path) for path in [
+        js = ['%sjs/jquery.min.js' % settings.ADMIN_MEDIA_PREFIX] + [os.path.join(settings.STATIC_URL, 'cms', path) for path in [
                 'js/plugins/admincompat.js',
                 'js/libs/jquery.query.js',
                 'js/libs/jquery.ui.core.js',

cms/admin/placeholderadmin.py

@@ -21,7 +21,7 @@ class PlaceholderAdmin(ModelAdmin):
 
     class Media:
         css = {
-            'all': [os.path.join(settings.CMS_MEDIA_URL, path) for path in (
+            'all': [os.path.join(settings.STATIC_URL, 'cms', path) for path in (
                 'css/rte.css',
                 'css/pages.css',
                 'css/change_form.css',
@@ -30,7 +30,7 @@ class Media:
             )]
         }
         js = ['%sjs/jquery.min.js' % settings.ADMIN_MEDIA_PREFIX] + [
-            os.path.join(settings.CMS_MEDIA_URL, path) for path in [
+            os.path.join(settings.STATIC_URL, 'cms', path) for path in [
                 'js/plugins/admincompat.js',
                 'js/csrf.js',
                 'js/libs/jquery.query.js',

cms/forms/widgets.py

@@ -130,13 +130,12 @@ def __init__(self, attrs=None):
             self.attrs = {}
 
     class Media:
-        js = [join(settings.CMS_MEDIA_URL, path) for path in (
+        js = [join(settings.STATIC_URL, 'cms', path) for path in (
             'js/libs/jquery.ui.core.js',
             'js/libs/jquery.ui.sortable.js',
-            'js/plugin_editor.js',
         )]
         css = {
-            'all': [join(settings.CMS_MEDIA_URL, path) for path in (
+            'all': [join(settings.STATIC_URL, 'cms', path) for path in (
                 'css/plugin_editor.css',
             )]
         }
@@ -217,4 +216,4 @@ def render(self, name, value, attrs=None):
         #return mark_safe(render_to_string(
         #    'admin/cms/page/widgets/plugin_editor.html', context))
         return mark_safe(render_to_string(
-            'admin/cms/page/widgets/placeholder_editor.html', context, RequestContext(self.request)))
+            'admin/cms/page/widgets/placeholder_editor.html', context, RequestContext(self.request)))

cms/plugins/file/cms_plugins.py

@@ -20,6 +20,6 @@ def render(self, context, instance, placeholder):
     def icon_src(self, instance):
         file_icon = instance.get_icon_url()
         if file_icon: return file_icon
-        return settings.CMS_MEDIA_URL + u"images/plugins/file.png"
+        return settings.STATIC_URL + u"cms/images/plugins/file.png"
 
 plugin_pool.register_plugin(FilePlugin)

cms/plugins/file/models.py

@@ -26,8 +26,8 @@ class File(CMSPlugin):
     # CMS_ICON_EXTENSIONS and CMS_ICON_PATH are assumed to be plugin-specific, and not included in cms.settings
     # -- they are therefore imported from django.conf.settings
     ICON_EXTENSIONS = getattr(settings, "CMS_FILE_ICON_EXTENSIONS", ('gif', 'png'))
-    ICON_PATH = getattr(settings, "CMS_FILE_ICON_PATH", os.path.join(settings.CMS_MEDIA_ROOT, "images", "file_icons"))
-    ICON_URL = getattr(settings, "CMS_FILE_ICON_URL", "%s%s/%s/" % (settings.CMS_MEDIA_URL, "images", "file_icons"))
+    ICON_PATH = getattr(settings, "CMS_FILE_ICON_PATH", os.path.join(settings.STATIC_ROOT, "cms", "images", "file_icons"))
+    ICON_URL = getattr(settings, "CMS_FILE_ICON_URL", "%s%s/%s/%s/" % (settings.STATIC_URL, "cms", "images", "file_icons"))
 
     def get_icon_url(self):
         path_base = os.path.join(self.ICON_PATH, self.get_ext())

cms/plugins/flash/templates/cms/plugins/flash.html

@@ -1,5 +1,5 @@
 {% load i18n sekizai_tags %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/swfobject.min.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/swfobject.min.js"></script>{% endaddtoblock %}
 {% addtoblock "js" %}
 <script type="text/javascript">
 //<![CDATA[
@@ -12,7 +12,7 @@
 		name: 'flash-plugin-name-{{ object.id }}'
 	};
 	// replace flash_plugin object through swfobject
-	swfobject.embedSWF('{{ object.file.url }}', 'flash-plugin-{{ object.id }}', '{{ object.get_width }}', '{{ object.get_height }}', '9', '{{ CMS_MEDIA_URL }}swf/expressInstall.swf', flashvars, params, attributes);
+	swfobject.embedSWF('{{ object.file.url }}', 'flash-plugin-{{ object.id }}', '{{ object.get_width }}', '{{ object.get_height }}', '9', '{{ STATIC_URL }}cms/swf/expressInstall.swf', flashvars, params, attributes);
 })();
 //]]>
 </script>
@@ -39,11 +39,11 @@
 		<!-- alternate content -->
 		{% trans "Missing flash plugin. Please download the latest Adobe Flash Player: " %}<br />
 		<a href="https://www.adobe.com/go/getflashplayer">
-			<img alt="{% trans 'Get Adobe Flash Player' %}" src="{{ CMS_MEDIA_URL }}images/plugins/get_flash_player.gif" />
+			<img alt="{% trans 'Get Adobe Flash Player' %}" src="{{ STATIC_URL }}cms/images/plugins/get_flash_player.gif" />
 		</a>
 		<!-- /alternate content -->
 			<!--[if !IE]>-->
 			</object>
 			<!--<![endif]-->
 	</object>
-</div>
+</div>

cms/plugins/link/cms_plugins.py

@@ -62,6 +62,6 @@ def __call__(self, *args, **kwargs):
         return FakeForm(Form, site)
 
     def icon_src(self, instance):
-        return settings.CMS_MEDIA_URL + u"images/plugins/link.png"
+        return settings.STATIC_URL + u"cms/images/plugins/link.png"
 
 plugin_pool.register_plugin(LinkPlugin)

cms/plugins/picture/cms_plugins.py

@@ -26,6 +26,6 @@ def render(self, context, instance, placeholder):
 
     def icon_src(self, instance):
         # TODO - possibly use 'instance' and provide a thumbnail image
-        return settings.CMS_MEDIA_URL + u"images/plugins/image.png"
+        return settings.STATIC_URL + u"cms/images/plugins/image.png"
 
 plugin_pool.register_plugin(PicturePlugin)

cms/plugins/snippet/cms_plugins.py

@@ -36,6 +36,6 @@ def render(self, context, instance, placeholder):
         return context
 
     def icon_src(self, instance):
-        return settings.CMS_MEDIA_URL + u"images/plugins/snippet.png"
+        return settings.STATIC_URL + u"cms/images/plugins/snippet.png"
 
 plugin_pool.register_plugin(SnippetPlugin)

cms/plugins/text/settings.py

@@ -61,6 +61,6 @@
 #Advantageously replaces WYM_CLASSES and WYM_STYLES
 ##Prepare url for wymeditor.css
 CMS_MEDIA_PATH = getattr(settings, 'CMS_MEDIA_PATH', 'cms/')
-WYM_STYLESHEET_PATH = getattr(settings, 'CMS_MEDIA_URL', ''.join((settings.MEDIA_URL, CMS_MEDIA_PATH)) )
+WYM_STYLESHEET_PATH = getattr(settings, 'WYM_STYLESHEET_PATH', ''.join((settings.STATIC_URL, 'cms')) )
 WYM_STYLESHEET = getattr(settings, "WYM_STYLESHEET",  '"%scss/wymeditor.css"' % WYM_STYLESHEET_PATH  )
 

cms/plugins/text/templates/cms/plugins/text_plugin_change_form.html

@@ -5,12 +5,12 @@
 {% for fieldset in adminform %}
 	{% include "cms/plugins/text_plugin_fieldset.html" %}
 {% endfor %}
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/classy.min.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/plugins/cms.base.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/classy.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/plugins/cms.base.js"></script>
 <script type="text/javascript">
 jQuery(document).ready(function ($) {
 	// initialize security patch
 	CMS.API.Security.csrf();
 });
 </script>
-{% endblock %}
+{% endblock %}

cms/plugins/text/templates/cms/plugins/widgets/wymeditor.html

@@ -14,7 +14,7 @@
     $('#id_{{ name }}').wymeditor({
         lang: '{{ language }}',
         skin: 'django',
-        skinPath: "{{ CMS_MEDIA_URL }}js/wymeditor/skins/django/",
+        skinPath: "{{ STATIC_URL }}cms/js/wymeditor/skins/django/",
         updateSelector: 'input[type=submit],',
         updateEvent: 'click',
 		logoHtml: '',
@@ -111,4 +111,4 @@
         + '</li>';
 return html;
 }
-</script>
+</script>

cms/plugins/text/widgets/tinymce_widget.py

@@ -30,12 +30,12 @@ def render_additions(self, name, value, attrs=None):
 
     def _media(self):
         media = super(TinyMCEEditor, self)._media()
-        media.add_js([join(settings.CMS_MEDIA_URL, path) for path in (
+        media.add_js([join(settings.STATIC_URL, 'cms', path) for path in (
                       'js/tinymce.placeholdereditor.js',
                       'js/libs/jquery.ui.core.js',
                       'js/placeholder_editor_registry.js',
                       )])
-        media.add_css({"all":[join(settings.CMS_MEDIA_URL, path) for path in ('css/jquery/cupertino/jquery-ui.css',
+        media.add_css({"all":[join(settings.STATIC_URL, 'cms', path) for path in ('css/jquery/cupertino/jquery-ui.css',
                                                                      'css/tinymce_toolbar.css')]})
 
         return media

cms/plugins/text/widgets/wymeditor_widget.py

@@ -10,15 +10,15 @@
 
 class WYMEditor(Textarea):
     class Media:
-        js = [join(settings.CMS_MEDIA_URL, path) for path in (
+        js = [join(settings.STATIC_URL, 'cms', path) for path in (
             'wymeditor/jquery.wymeditor.js',
             'wymeditor/plugins/resizable/jquery.wymeditor.resizable.js',
             'js/wymeditor.placeholdereditor.js',
             'js/libs/jquery.ui.core.js',
             'js/placeholder_editor_registry.js',
         )]
         css = {
-            'all': [join(settings.CMS_MEDIA_URL, path) for path in (
+            'all': [join(settings.STATIC_URL, 'cms', path) for path in (
                         'css/jquery/cupertino/jquery-ui.css',
                     )],
         }
@@ -43,7 +43,7 @@ def render_additions(self, name, value, attrs=None):
         context = {
             'name': name,
             'language': language,
-            'CMS_MEDIA_URL': settings.CMS_MEDIA_URL,
+            'STATIC_URL': settings.STATIC_URL,
             'WYM_TOOLS': mark_safe(text_settings.WYM_TOOLS),
             'WYM_CONTAINERS': mark_safe(text_settings.WYM_CONTAINERS),
             'WYM_CLASSES': mark_safe(text_settings.WYM_CLASSES),
@@ -56,4 +56,4 @@ def render_additions(self, name, value, attrs=None):
 
     def render(self, name, value, attrs=None):
         return self.render_textarea(name, value, attrs) + \
-            self.render_additions(name, value, attrs)
+            self.render_additions(name, value, attrs)

cms/plugins/twitter/templates/cms/plugins/twitter_recent_entries.html

@@ -1,5 +1,5 @@
 {% load i18n sekizai_tags %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.tweet.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.tweet.js"></script>{% endaddtoblock %}
 {% addtoblock "js" %}
 <script type="text/javascript">
 //<![CDATA[
@@ -27,4 +27,4 @@
 	<h2>{{ object.title }} <a href="https://www.twitter.com/{{ object.twitter_user }}" class="twitter-icon">{% trans "Twitter" %}</a></h2>
 	<div id="twitter-container-{{ object.pk }}"></div>
 	{% if object.twitter_user %}<p><a href="https://www.twitter.com/{{ object.twitter_user }}" class="twitter-link">{{ object.link_hint }}</a></p>{% endif %}
-</div>
+</div>

cms/plugins/video/templates/cms/plugins/video.html

@@ -1,5 +1,5 @@
 {% load i18n sekizai_tags js %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/swfobject.min.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/swfobject.min.js"></script>{% endaddtoblock %}
 {% addtoblock "js" %}
 <script type="text/javascript">
 //<![CDATA[
@@ -30,15 +30,15 @@
 	var attributes = { align: 'middle' };
 
 	// load
-	swfobject.embedSWF('{{ CMS_MEDIA_URL }}swf/player.swf', 'video-plugin-{{ object.id }}', '{{ object.get_width }}', '{{ object.get_height }}', '9', '{{ CMS_MEDIA_URL }}swf/expressInstall.swf', flashvars, params, attributes);
+	swfobject.embedSWF('{{ STATIC_URL }}cms/swf/player.swf', 'video-plugin-{{ object.id }}', '{{ object.get_width }}', '{{ object.get_height }}', '9', '{{ STATIC_URL }}cms/swf/expressInstall.swf', flashvars, params, attributes);
 })();
 //]]>
 </script>
 {% endaddtoblock %}
 
 <div class="plugin_video">
 	<object id="video-plugin-{{ object.id }}" width="{{ object.get_width }}" height="{{ object.get_height }}" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" >
-		<param name="movie" value="{{ CMS_MEDIA_URL }}swf/player.swf"/>
+		<param name="movie" value="{{ STATIC_URL }}cms/swf/player.swf"/>
 		<param name="allowFullScreen" value="true" />
 		<param name="allowScriptAccess" value="always" />
 		<param name="allowFullScreen" value="true" />
@@ -47,7 +47,7 @@
 		<param name="bgcolor" value="#{{ object.bgcolor }}" />
 		<param name="flashvars" value="movie={{ object.get_movie }}&amp;{% if object.image %}image={{ object.image.url }}&amp;{% endif %}autoplay={{ object.auto_play|bool }}&amp;loop={{ object.loop|bool }}&amp;autohide={{ object.auto_hide|bool }}&amp;fullscreen={{ object.fullscreen|bool }}&amp;color_text=0x{{ object.textcolor }}&amp;color_seekbar=0x{{ object.seekbarcolor }}&amp;color_loadingbar=0x{{ object.loadingbarcolor }}&amp;color_seekbarbg=0x{{ object.seekbarbgcolor }}&amp;color_button_out=0x{{ object.buttonoutcolor }}&amp;color_button_over=0x{{ object.buttonovercolor }}&amp;color_button_highlight=0x{{ object.buttonhighlightcolor }}" />
 			<!--[if !IE]>-->
-			<object width="{{ object.get_width }}" height="{{ object.get_height }}" data="{{ CMS_MEDIA_URL }}swf/player.swf" type="application/x-shockwave-flash">
+			<object width="{{ object.get_width }}" height="{{ object.get_height }}" data="{{ STATIC_URL }}cms/swf/player.swf" type="application/x-shockwave-flash">
 			<param name="allowFullScreen" value="true" />
 			<param name="allowScriptAccess" value="always" />
 			<param name="allowFullScreen" value="true" />
@@ -59,7 +59,7 @@
 		<!-- alternate content -->
 		{% trans "Missing flash plugin. Please download the latest Adobe Flash Player: " %}<br />
 		<a href="https://www.adobe.com/go/getflashplayer">
-			<img alt="{% trans 'Get Adobe Flash Player' %}" src="{{ CMS_MEDIA_URL }}images/plugins/get_flash_player.gif" />
+			<img alt="{% trans 'Get Adobe Flash Player' %}" src="{{ STATIC_URL }}cms/images/plugins/get_flash_player.gif" />
 		</a>
 		<!-- /alternate content -->
 			<!--[if !IE]>-->

cms/templates/admin/cms/page/change_form.html

@@ -4,11 +4,11 @@
 
 {% block extrahead %}
 {{ block.super }}
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/csrf.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/csrf.js"></script>
 <script type="text/javascript" src="{% url admin:jsi18n %}"></script>
 
 {% if not add %}
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/change_form.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/change_form.js"></script>
 {% endif %}
 <script type="text/javascript" src="{% admin_media_prefix %}js/urlify.js"></script>
 

cms/templates/admin/cms/page/change_list.html

@@ -12,32 +12,32 @@
 
 {% block coltype %}flex{% endblock %}
 {% block extrahead %}
-<link rel="stylesheet" type="text/css" href="{{ CMS_MEDIA_URL }}css/pages.css"/>
-<link rel="stylesheet" type="text/css" href="{{ CMS_MEDIA_URL }}jstree/tree_component.css" />
-<link rel="stylesheet" type="text/css" href="{{ CMS_MEDIA_URL }}css/jquery.dialog.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/css/pages.css"/>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/jstree/tree_component.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/css/jquery.dialog.css" />
 
 {{ block.super }}
 <script type="text/javascript" src="{% admin_media_prefix %}js/jquery.min.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/csrf.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.livequery.js"></script>
-
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.ui.core.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.bind.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.ui.checkbox.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.ui.effects.core.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.ui.effects.highlight.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.form.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}jstree/_lib/_all.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}jstree/tree_component.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.ui.dialog.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.functional.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/classy.min.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/plugins/cms.base.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/change_list.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/csrf.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.livequery.js"></script>
+
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.ui.core.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.bind.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.ui.checkbox.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.ui.effects.core.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.ui.effects.highlight.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.form.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/jstree/_lib/_all.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/jstree/tree_component.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.ui.dialog.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.functional.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/classy.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/plugins/cms.base.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/change_list.js"></script>
 
 
 {% if cl.is_filtered %}
-<link rel="stylesheet" type="text/css" href="{{ CMS_MEDIA_URL }}jstree/themes/default/style.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/jstree/themes/default/style.css" />
 {% endif %}
 {% endblock %}
 

cms/templates/admin/cms/page/plugin_forms_history.html

@@ -18,4 +18,4 @@
 })(jQuery);
 //]]>
 </script>
-{% endblock %}
+{% endblock %}

cms/templates/cms/new.html

@@ -43,7 +43,7 @@
 <body>
 	<div id="main">
 		<div class="box-left">
-			<p><img src="{{ CMS_MEDIA_URL }}images/pony.jpg" alt="" />&nbsp;</p>
+			<p><img src="{{ STATIC_URL }}cms/images/pony.jpg" alt="" />&nbsp;</p>
 		</div>
 		<div class="box-right">
 			<h1>Welcome to the django CMS!<br />Here is what to do next:</h1>
@@ -58,12 +58,12 @@ <h2>Log into the <a href="/admin/">admin</a> interface and start <a href="/admin
 		</div>
 		<div class="clear"></div>
 		<p class="foot padding-top">
-			If you don't see the django CMS logo at the end of this line make sure you linked the <code>cms/media</code> folder 
-			to your media files: <img src="{{ CMS_MEDIA_URL }}images/logo.jpg" alt="here should be a logo" height="20" /></p>
+			If you don't see the django CMS logo at the end of this line make sure you linked the <code>cms/static</code> folder 
+			to your static files: <img src="{{ STATIC_URL }}cms/images/logo.jpg" alt="here should be a logo" height="20" /></p>
 		<p class="foot">
 			You're seeing this message because you have <code>DEBUG = True</code> in your 
 			django settings file and haven't added any pages yet. Get to work!"
 		</p>
 	</div>
 </body>
-</html>
+</html>