Merge branch 'develop' of github.com:divio/django-cms into feature/ve…

…nv-tests

cms/admin/pageadmin.py

@@ -37,6 +37,7 @@
 from django.utils.encoding import force_unicode
 from django.utils.translation import ugettext, ugettext_lazy as _
 from menus.menu_pool import menu_pool
+from cms.templatetags.cms_admin import admin_static_url
 import django
 import inspect
 
@@ -168,7 +169,7 @@ class Media:
                 'css/jquery.dialog.css',
             )]
         }
-        js = ['%sjs/jquery.min.js' % settings.STATIC_URL] + [cms_static_url(path) for path in [
+        js = ['%sjs/jquery.min.js' % admin_static_url()] + [cms_static_url(path) for path in [
                 'js/plugins/admincompat.js',
                 'js/libs/jquery.query.js',
                 'js/libs/jquery.ui.core.js',

cms/admin/placeholderadmin.py

@@ -15,6 +15,7 @@
 from django.template import RequestContext
 from django.template.defaultfilters import force_escape, escapejs
 from django.utils.translation import ugettext as _
+from cms.templatetags.cms_admin import admin_static_url
 
 
 class PlaceholderAdmin(ModelAdmin):
@@ -29,7 +30,7 @@ class Media:
                 'css/plugin_editor.css',
             )]
         }
-        js = ['%sjs/jquery.min.js' % settings.STATIC_URL] + [cms_static_url(path) for path in [
+        js = ['%sjs/jquery.min.js' % admin_static_url()] + [cms_static_url(path) for path in [
                 'js/plugins/admincompat.js',
                 'js/csrf.js',
                 'js/libs/jquery.query.js',

cms/forms/widgets.py

@@ -12,6 +12,7 @@
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 import copy
+from cms.templatetags.cms_admin import admin_static_url
 
 class PageSelectWidget(MultiWidget):
     """A widget that allows selecting a page by first selecting a site and then
@@ -170,7 +171,7 @@ def render(self, name, value, attrs=None, choices=()):
             add_url = '../../../cms/pageuser/add/'
             output.append(u'<a href="%s" class="add-another" id="add_id_%s" onclick="return showAddAnotherPopup(this);"> ' % \
                     (add_url, name))
-            output.append(u'<img src="%simg/admin/icon_addlink.gif" width="10" height="10" alt="%s"/></a>' % (settings.STATIC_URL, _('Add Another')))
+            output.append(u'<img src="%simg/admin/icon_addlink.gif" width="10" height="10" alt="%s"/></a>' % (admin_static_url(), _('Add Another')))
         return mark_safe(u''.join(output))
 
 

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

@@ -6,6 +6,7 @@
 	{% include "cms/plugins/text_plugin_fieldset.html" %}
 {% endfor %}
 <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.setup.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}cms/js/plugins/cms.base.js"></script>
 <script type="text/javascript">
 jQuery(document).ready(function ($) {

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

@@ -10,7 +10,7 @@
 {% if not add %}
 <script type="text/javascript" src="{{ STATIC_URL }}cms/js/change_form.js"></script>
 {% endif %}
-<script type="text/javascript" src="{{ STATIC_URL }}js/urlify.js"></script>
+<script type="text/javascript" src="{% admin_static_url %}js/urlify.js"></script>
 
 {% if add %}
 <script type="text/javascript">
@@ -36,7 +36,7 @@
 	margin-bottom:-1px;
 	border-color:#ddd #aaa #ccc #ddd !important;
 	border:1px;
-	background:#fff url('{{ STATIC_URL }}img/admin/nav-bg.gif') repeat-x center bottom !important;
+	background:#fff url('{% admin_static_url %}img/admin/nav-bg.gif') repeat-x center bottom !important;
 }
 
 #lang_tab_content h2.header {
@@ -45,7 +45,7 @@
 	font-size:11px;
 	text-align:left;
 	font-weight:bold;
-	background:#7ca0c7 url('{{ STATIC_URL }}img/admin/default-bg.gif') repeat-x left top;
+	background:#7ca0c7 url('{% admin_static_url %}img/admin/default-bg.gif') repeat-x left top;
 	color:#fff;
 }
 

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

@@ -17,7 +17,7 @@
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/css/jquery.dialog.css" />
 
 {{ block.super }}
-<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
+<script type="text/javascript" src="{% admin_static_url %}js/jquery.min.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>
 
@@ -32,6 +32,7 @@
 <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.setup.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>
 

cms/templates/admin/cms/page/menu_item.html

@@ -13,8 +13,8 @@
 			{% if not CMS_PERMISSION or has_add_permission or has_add_page_permission %}
 				{# if permissions not enabled, user user haves global can_add page #}
 					{% if has_add_on_same_level_permission %}
-						<a href="#" class="move-target left" title="{% trans "insert above" %}"><img alt="" src="{{ STATIC_URL }}img/admin/arrow-up.gif"/></a><span class="line first"> |</span>
-						<a href="#" class="move-target right" title="{% trans "insert below" %}"><img alt="" src="{{ STATIC_URL }}img/admin/arrow-down.gif"/></a><span class="line second"> |</span>
+						<a href="#" class="move-target left" title="{% trans "insert above" %}"><img alt="" src="{% admin_static_url %}img/admin/arrow-up.gif"/></a><span class="line first"> |</span>
+						<a href="#" class="move-target right" title="{% trans "insert below" %}"><img alt="" src="{% admin_static_url %}img/admin/arrow-down.gif"/></a><span class="line second"> |</span>
 					{% endif %}
 				<a href="#" class="move-target last-child" title="{% trans "insert inside" %}">↘</a>
 			{% endif %}
@@ -46,7 +46,7 @@
 
 		<div class="col-navigation">
 			<label>
-                <img alt="{{ page.in_navigation|yesno:"True,False" }}" src="{{ STATIC_URL }}img/admin/icon-{{ page.in_navigation|yesno:"yes,no" }}.gif" />
+                <img alt="{{ page.in_navigation|yesno:"True,False" }}" src="{% admin_static_url %}img/admin/icon-{{ page.in_navigation|yesno:"yes,no" }}.gif" />
                 {% if has_change_permission %}<input type="checkbox" class="navigation-checkbox" name="navigation-{{ page.id }}" {% if page.in_navigation %}checked="checked"{% endif %} value="{{ page.in_navigation|yesno:"1,0" }}" />{% endif %}
 			</label>
 		</div>

cms/templates/admin/cms/page/plugin_change_form.html

@@ -2,7 +2,7 @@
 {% load i18n admin_modify adminmedia cms_admin %}
 
 {% block extrahead %}{{ block.super }}
-<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
+<script type="text/javascript" src="{% admin_static_url %}js/jquery.min.js"></script>
 <script type="text/javascript" src="{% url admin:jsi18n %}"></script>
 {{ media }}
 
@@ -56,7 +56,7 @@
 
 {% endblock %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/forms.css" />{% endblock %}
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_static_url %}css/forms.css" />{% endblock %}
 
 {% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %}
 

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

@@ -1,9 +1,9 @@
 {% extends "admin/change_form.html" %}
-{% load i18n admin_modify adminmedia cms_tags %}
+{% load i18n admin_modify adminmedia cms_tags cms_admin %}
 {% block title %}{% trans "Change a page" %}{% endblock %}
 
 {% block extrahead %}
-<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
+<script type="text/javascript" src="{% admin_static_url %}js/jquery.min.js"></script>
 {% endblock %}
 
 {% block content_title %}{% trans "An old revision of a plugin can not be saved!" %}{% endblock %}

cms/templates/admin/cms/page/plugin_forms_ok.html

@@ -1,10 +1,10 @@
 {% extends "admin/change_form.html" %}
-{% load i18n admin_modify adminmedia cms_js_tags %}
+{% load i18n admin_modify adminmedia cms_js_tags cms_admin %}
 
 {% block title %}{% trans "Change a page" %}{% endblock %}
 
 {% block extrahead %}
-	<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
+	<script type="text/javascript" src="{% admin_static_url %}js/jquery.min.js"></script>
 	{{ media }}
 {% endblock %}
 

cms/templates/cms/toolbar/toolbar.html

@@ -1,6 +1,6 @@
-{% load i18n adminmedia sekizai_tags cms_js_tags %}
+{% load i18n adminmedia sekizai_tags cms_js_tags cms_admin %}
 {% addtoblock "js" %}<script type="text/javascript">var jQuery = (jQuery) ? jQuery.noConflict(true) : undefined;</script>{% endaddtoblock %}
-{% addtoblock "js" %}<script type="text/javascript" src="{% admin_media_prefix %}js/jquery.min.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{% admin_static_url %}js/jquery.min.js"></script>{% endaddtoblock %}
 {% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/classy.min.js"></script>{% endaddtoblock %}
 {% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.cookie.js"></script>{% endaddtoblock %}
 {% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/plugins/cms.setup.js"></script>{% endaddtoblock %}

cms/templatetags/cms_admin.py

@@ -76,7 +76,7 @@ def get_context(self, context, cl, spec):
 @register.filter
 def boolean_icon(value):
     BOOLEAN_MAPPING = {True: 'yes', False: 'no', None: 'unknown'}
-    return mark_safe(u'<img src="%simg/admin/icon-%s.gif" alt="%s" />' % (settings.STATIC_URL, BOOLEAN_MAPPING[value], value))
+    return mark_safe(u'<img src="%simg/admin/icon-%s.gif" alt="%s" />' % (admin_static_url(), BOOLEAN_MAPPING[value], value))
 
 @register.filter
 def is_restricted(page, request):
@@ -179,3 +179,11 @@ def get_context(self, context):
 def in_filtered(seq1, seq2):
     return [x for x in seq1 if x in seq2]
 in_filtered = register.filter('in_filtered', in_filtered)
+
+
+@register.simple_tag
+def admin_static_url():
+    """
+    If set, returns the string contained in the setting ADMIN_MEDIA_PREFIX, otherwise returns STATIC_URL + 'admin/'.
+    """
+    return getattr(settings, 'ADMIN_MEDIA_PREFIX', None) or ''.join([settings.STATIC_URL, 'admin/'])

cms/tests/middleware.py

@@ -7,6 +7,7 @@
 from django.http import HttpResponse, HttpResponseRedirect
 from django.conf import settings
 import django
+from cms.templatetags.cms_admin import admin_static_url
 
 class MiddlewareTestCase(CMSTestCase):
     def test_multilingual_middleware_get_lang_from_request(self):
@@ -81,7 +82,7 @@ def test_multilingual_middleware_ignores_static_url(self):
                 </ul>""" %(
                     settings.MEDIA_URL,
                     settings.STATIC_URL,
-                    settings.STATIC_URL,
+                    admin_static_url(),
                     '/some-path/',
                 )
 
@@ -94,7 +95,7 @@ def test_multilingual_middleware_ignores_static_url(self):
             # These shall not
             self.assertTrue('href="%simages/some-media-file.jpg' %settings.MEDIA_URL in response.content)
             self.assertTrue('href="%simages/some-static-file.jpg' %settings.STATIC_URL in response.content)            
-            self.assertTrue('href="%simages/some-admin-file.jpg' %settings.STATIC_URL in response.content)
+            self.assertTrue('href="%simages/some-admin-file.jpg' %admin_static_url() in response.content)
 
 
     def test_multilingual_middleware_handles_redirections(self):

cms/utils/plugins.py

@@ -68,8 +68,10 @@ def _extend_nodelist(extend_node):
     placeholders += _scan_placeholders(parent_template.nodelist, None, blocks.keys())
     return placeholders
 
-def _scan_placeholders(nodelist, current_block=None, ignore_blocks=[]):
+def _scan_placeholders(nodelist, current_block=None, ignore_blocks=None):
     placeholders = []
+    if ignore_blocks is None:
+        ignore_blocks = []
 
     for node in nodelist:
         # check if this is a placeholder first