Skip to content

Loading…

Removes leftover img/admin/ urls to adapt to django 1.4 #1346

Closed
wants to merge 1 commit into from

4 participants

@rebost

I reckon the /admin in "{% admin_static_url %}img/admin/..." urls is meant to be removed

@travisbot

This pull request passes (merged 24d5b1f into dc00224).

@digi604
Divio AG member

Is this change compatible to django 1.3?

@yakky yakky added a commit to yakky/django-cms that referenced this pull request
@yakky yakky Fixes admin icon references using `cms_admin_icon_base` templatetag.
Supersedes #1346
60b3ae3
@yakky

Actually there is cms_admin_icon_base templatetag to ensure 1.3 - 1.4 compatibility.
PR #1398 rewrite the patch using the templatetag

@digi604
Divio AG member

merged in PR #1398

@digi604 digi604 closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 14, 2012
  1. @rebost
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 3 deletions.
  1. +1 −1 cms/forms/widgets.py
  2. +2 −2 cms/templates/admin/cms/page/change_form.html
View
2 cms/forms/widgets.py
@@ -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="%simg/icon_addlink.gif" width="10" height="10" alt="%s"/></a>' % (admin_static_url(), _('Add Another')))
return mark_safe(u''.join(output))
View
4 cms/templates/admin/cms/page/change_form.html
@@ -36,7 +36,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('{% admin_static_url %}img/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('{% admin_static_url %}img/admin/default-bg.gif') repeat-x left top;
+ background:#7ca0c7 url('{% admin_static_url %}img/default-bg.gif') repeat-x left top;
color:#fff;
}
Something went wrong with that request. Please try again.