Fixes admin icon references using cms_admin_icon_base templatetag.

Supersedes django-cms#1346

Author: yakky

cms/forms/widgets.py

@@ -12,7 +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
+from cms.templatetags.cms_admin import CMS_ADMIN_ICON_BASE
 
 class PageSelectWidget(MultiWidget):
     """A widget that allows selecting a page by first selecting a site and then
@@ -171,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>' % (admin_static_url(), _('Add Another')))
+            output.append(u'<img src="%sicon_addlink.gif" width="10" height="10" alt="%s"/></a>' % (CMS_ADMIN_ICON_BASE, _('Add Another')))
         return mark_safe(u''.join(output))
 
 

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

@@ -37,7 +37,7 @@
 	margin-bottom:-1px;
 	border-color:#ddd #aaa #ccc #ddd !important;
 	border:1px;
-	background:#fff url('{% admin_static_url %}img/admin/nav-bg.gif') repeat-x center bottom !important;
+	background:#fff url('{% cms_admin_icon_base %}nav-bg.gif') repeat-x center bottom !important;
 }
 
 #lang_tab_content h2.header {
@@ -46,7 +46,7 @@
 	font-size:11px;
 	text-align:left;
 	font-weight:bold;
-	background:#7ca0c7 url('{% admin_static_url %}img/admin/default-bg.gif') repeat-x left top;
+	background:#7ca0c7 url('{% cms_admin_icon_base %}default-bg.gif') repeat-x left top;
 	color:#fff;
 }