Commits

Luke Plant committed 4284601

Switched away from admin_media_prefix

  • Participants
  • Parent commits 1aeb80b

Comments (0)

Files changed (6)

File templates/500.html

-{% load adminmedia %}<!DOCTYPE html>
+{% load static %}<!DOCTYPE html>
 <html lang="en-gb">
 <head>
 <title>500 Internal Server Error</title>
-<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/base.css" />
-<link rel="stylesheet" type="text/css" href="/static/css/adminextra.css" />
-<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/ie.css" /><![endif]-->
+<link rel="stylesheet" type="text/css" href="{% static "css/base.css" %}" />
+<link rel="stylesheet" type="text/css" href="{% static "css/adminextra.css" %}" />
+<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% static "css/ie.css" %}" /><![endif]-->
 <meta name="robots" content="NONE,NOARCHIVE" />
 </head>
 <body>

File templates/admin/login.html

 {% extends "admin/base_site.html" %}
-{% load i18n %}
+{% load i18n static %}
 
-{% block extrastyle %}{% load adminmedia %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/login.css" />{% endblock %}
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}" />{% endblock %}
 
 {% block bodyclass %}login{% endblock %}
 

File templates/cciw/officers/base.html

 {% extends "admin/base_site.html" %}
-{% load adminmedia admin_modify %}
-{% block stylesheet %}{% admin_media_prefix %}css/base.css{% endblock %}
+{% load adminmedia static %}
+{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}
 {% block breadcrumbs %}{% endblock %}
 {% block title %}
 CCIW Officers
 {% endblock %}
 {% block extrastyle %}{{ block.super }}
 <script type="text/javascript" src="/admin/jsi18n/"></script>
-<script type="text/javascript" src="/static/admin/js/core.js"></script>
+<script type="text/javascript" src="{% static "admin/js/core.js" %}"></script>
 {% if form %}
   {{ form.media }}
 {% endif %}

File templates/cciw/officers/officer_list.html

 {% extends "cciw/officers/base.html" %}
 {% load url from future %}
-{% load adminmedia %}
+{% load static %}
 {% block title %}Officer list {{ camp.year }}-{{ camp.number }} | CCIW Officers{% endblock %}
 
 {% block extrastyle %}{{ block.super }}
-<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.tablesorter.min.js"></script>
-<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />
+<script type="text/javascript" src="{% static "js/jquery.tablesorter.min.js" %}"></script>
+<link rel="stylesheet" type="text/css" href="{% static "css/forms.css" %}" />
 <style type="text/css">
 
 .innerleft {
  alt="Add" src="{{ STATIC_URL }}images/officer-list-add.gif" /></a>
  &nbsp;&nbsp;&nbsp;
  <input type="text" id="id_available_officers_filter" />
- <img style="vertical-align: middle" alt="search" src="{% admin_media_prefix %}img/admin/selector-search.gif" />
+ <img style="vertical-align: middle" alt="search" src="{% static "admin/img/selector-search.gif" %}" />
 </div>
 <div>
 <select multiple="multiple" id="id_available_officers" style="min-width:30em;height: 30em;" name="officers">

File templates/cciw/officers/officer_list_table_editable.html

-{% load adminmedia %}
+{% load static %}
 <div  id="id_officer_list_table">
 <p>Total: {{ invitations|length }}</p>
 <table class="tablesorter">
     <td>{{ invite.notes }}</a></td>
     <td>
       <nobr>
-      <img class="editbtn" id="id_edit_{{ invite.officer.id }}" src="{% admin_media_prefix %}img/admin/icon_changelink.gif" alt="Edit" title="Edit" style="margin-right: 4px;"/>
-      <img class="removebtn" id="id_remove_{{ invite.officer.id }}" src="{{ STATIC_URL }}images/officer-list-remove.gif" alt="Remove" title="Remove" style="margin-right: 4px;"/>
-      <img class="emailbtn" id="id_email_{{ invite.officer.id }}" src="{{ STATIC_URL }}images/sendemail.gif" alt="Re-send initial e-mail" title="Re-send initial e-mail" />
+      <img class="editbtn" id="id_edit_{{ invite.officer.id }}" src="{% static "admin/img/icon_changelink.gif" %}" alt="Edit" title="Edit" style="margin-right: 4px;"/>
+      <img class="removebtn" id="id_remove_{{ invite.officer.id }}" src="{% static "images/officer-list-remove.gif" %}" alt="Remove" title="Remove" style="margin-right: 4px;"/>
+      <img class="emailbtn" id="id_email_{{ invite.officer.id }}" src="{% static "images/sendemail.gif" %}" alt="Re-send initial e-mail" title="Re-send initial e-mail" />
       </nobr>
    </td>
   </tr>

File templates/cciw/officers/stats.html

 {% extends "cciw/officers/base.html" %}
 {% load url from future %}
-{% load adminmedia %}
+{% load static %}
 {% load json_filters %}
 {% block title %}Officer stats | CCIW Officers{% endblock %}
 
 {% block extrastyle %}{{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />
-<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.flot.min.js"></script>
+<link rel="stylesheet" type="text/css" href="{% static "css/forms.css" %}" />
+<script type="text/javascript" src="{% static "js/jquery.flot.min.js" %}"></script>
 
 {% endblock %}
 {% block bodyclass%}change-form{% endblock %}