Commits

Chris Moffitt committed 66c43e0

Fix admin style sheets. Closes #1431

  • Participants
  • Parent commits dcf713d

Comments (0)

Files changed (2)

satchmo/apps/satchmo_store/shop/templates/admin/base_site.html

 {% extends "admin/base.html" %}
-{% load i18n adminmedia satchmo_util%}
+{% load i18n satchmo_util%}
 
 {% block extrahead %}
 {% blackbird_logging %}
 
 {% block extrastyle %}
 {{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/base.css" />
+
+{% if STATIC_URL %}
+    {% load admin_static %}
+    <link rel="stylesheet" type="text/css" href="{% static 'admin/css/base.css' %}" />
+{% else %}
+    {% load adminmedia %}
+    <link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/base.css"/>
+{% endif %}
+
 <style type="text/css">
 #content-related { float:right; width:29em; position:relative; margin-right: -30em;}
 #content-related .module h2 { cursor: default; }

satchmo/apps/satchmo_store/shop/templates/admin/index.html

 {% extends "admin/base_site.html" %}
-{% load i18n adminmedia app_plugins satchmo_util %}
+{% load i18n app_plugins satchmo_util %}
 
-{% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css"/>{% endblock %}
-
+{% block extrastyle %}
+{{ block.super }}
+{% if STATIC_URL %}
+    {% load admin_static %}
+    <link rel="stylesheet" type="text/css" href="{% static 'admin/css/dashboard.css' %}" />
+{% else %}
+    {% load adminmedia %}
+    <link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/dashboard.css"/>
+{% endif %}
+{% endblock %}
 {% block coltype %}colMS{% endblock %}
 
 {% block bodyclass %}dashboard{% endblock %}