summaryrefslogtreecommitdiff
path: root/templates/packages
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 19:15:24 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 19:15:24 -0500
commit4b700666e3405b8dc1891dd7e156b233333c7912 (patch)
tree81189b8d685e35f8b255e59ecb88fe1ab0a4a8bf /templates/packages
parentbcf8f7438278880f092361814bbcd3207d11e937 (diff)
parent3e2e4d4ef8910351910d633d17f8b4e9c0ea4c74 (diff)
Merge commit '3e2e4d4' (Convert STATIC_URL usage to {% static %} template tag
Conflicts: templates/mirrors/mirrors.html templates/news/add.html templates/packages/differences.html templates/packages/groups.html templates/packages/stale_relations.html
Diffstat (limited to 'templates/packages')
-rw-r--r--templates/packages/details.html3
-rw-r--r--templates/packages/differences.html6
-rw-r--r--templates/packages/groups.html6
-rw-r--r--templates/packages/packages_list.html5
-rw-r--r--templates/packages/signoffs.html5
-rw-r--r--templates/packages/stale_relations.html6
6 files changed, 20 insertions, 11 deletions
diff --git a/templates/packages/details.html b/templates/packages/details.html
index b1d9be6c..7a83f9ee 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 %}
@@ -200,7 +201,7 @@
</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 527a5ab2..a94089ce 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -1,4 +1,6 @@
{% extends "base.html" %}
+{% load static from staticfiles %}
+
{% block title %}Parabola - Package Differences Reports{% endblock %}
{% block navbarclass %}anb-packages{% endblock %}
@@ -123,8 +125,8 @@
</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 20752398..3f275ef4 100644
--- a/templates/packages/groups.html
+++ b/templates/packages/groups.html
@@ -1,4 +1,6 @@
{% extends "base.html" %}
+{% load static from staticfiles %}
+
{% block title %}Parabola - Package Groups{% if arch %} - {{ arch }}{% endif %}{% endblock %}
{% block navbarclass %}anb-packages{% endblock %}
@@ -28,8 +30,8 @@
</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 1b894c8e..6cdf815a 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 %}Parabola - {{ name }} ({{ arch.name }}) - {{ list_title }}{% endblock %}
@@ -40,8 +41,8 @@
</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 d7c0fef6..2d7b04cd 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 %}Parabola - Package Signoffs{% endblock %}
@@ -79,8 +80,8 @@
</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 4e814450..678d3bc9 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 %}Parabola - Stale Package Relations{% endblock %}
{% block navbarclass %}anb-packages{% endblock %}
@@ -106,8 +108,8 @@
</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]]});