From 3e2e4d4ef8910351910d633d17f8b4e9c0ea4c74 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 24 Mar 2012 12:37:19 -0500
Subject: Convert STATIC_URL usage to {% static %} template tag

This is a lot more flexible and will allow more than just simple
prefixing of the static file resources.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/details.html         | 3 ++-
 templates/packages/differences.html     | 6 ++++--
 templates/packages/groups.html          | 6 ++++--
 templates/packages/packages_list.html   | 5 +++--
 templates/packages/signoffs.html        | 5 +++--
 templates/packages/stale_relations.html | 6 ++++--
 6 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'templates/packages')

diff --git a/templates/packages/details.html b/templates/packages/details.html
index bbbef2eb..a066969c 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load static from staticfiles %}
 {% load package_extras %}
 {% load pgp %}
 
@@ -205,7 +206,7 @@ <h3 title="Complete list of files contained within this package">
 </div>
 
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(ajaxifyFiles);
 </script>
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index e2deedcd..01e1f857 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% load static from staticfiles %}
+
 {% block title %}Arch Linux - Package Differences Reports{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
@@ -94,8 +96,8 @@ <h2>Multilib Differences to Main Packages</h2>
 </div>
 
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
+<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $('#table_differences').tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]});
diff --git a/templates/packages/groups.html b/templates/packages/groups.html
index dad8665d..2786244d 100644
--- a/templates/packages/groups.html
+++ b/templates/packages/groups.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% load static from staticfiles %}
+
 {% block title %}Arch Linux - Package Groups{% if arch %} - {{ arch }}{% endif %}{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
@@ -28,8 +30,8 @@ <h2>Package Groups Overview{% if arch %} - {{ arch }}{% endif %}</h2>
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
+<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results").tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]});
diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html
index 599ddcb9..ee2d2087 100644
--- a/templates/packages/packages_list.html
+++ b/templates/packages/packages_list.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load static from staticfiles %}
 {% load package_extras %}
 
 {% block title %}Arch Linux - {{ name }} ({{ arch.name }}) - {{ list_title }}{% endblock %}
@@ -40,8 +41,8 @@ <h2>{{ list_title }} - {{ name }} ({{ arch.name }})</h2>
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
+<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results").tablesorter({widgets: ['zebra'], sortList: [[2,0]]});
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 26fd88dd..3a2c3509 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load static from staticfiles %}
 {% load package_extras %}
 
 {% block title %}Arch Linux - Package Signoffs{% endblock %}
@@ -79,8 +80,8 @@ <h3>Filter Displayed Signoffs</h3>
     </table>
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
+<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $('a.signoff-link').click(signoff_package);
diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html
index 80e912c0..df469e78 100644
--- a/templates/packages/stale_relations.html
+++ b/templates/packages/stale_relations.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% load static from staticfiles %}
+
 {% block title %}Arch Linux - Stale Package Relations{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
@@ -106,8 +108,8 @@ <h3>Maintainers with Wrong Permissions ({{ wrong_permissions|length }})</h3>
 
 </div>
 {% load cdn %}{% jquery %}
-<script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}archweb.js"></script>
+<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $('#inactive-user:not(:has(tbody tr.empty))').tablesorter({widgets: ['zebra'], headers: { 0: { sorter: false } }, sortList: [[3,0]]});
-- 
cgit v1.2.3-54-g00ecf