diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 19:15:24 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 19:15:24 -0500 |
| commit | 4b700666e3405b8dc1891dd7e156b233333c7912 (patch) | |
| tree | 81189b8d685e35f8b255e59ecb88fe1ab0a4a8bf /templates/releng | |
| parent | bcf8f7438278880f092361814bbcd3207d11e937 (diff) | |
| parent | 3e2e4d4ef8910351910d633d17f8b4e9c0ea4c74 (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/releng')
| -rw-r--r-- | templates/releng/iso_overview.html | 5 | ||||
| -rw-r--r-- | templates/releng/result_list.html | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html index 76479c52..ca5a8c08 100644 --- a/templates/releng/iso_overview.html +++ b/templates/releng/iso_overview.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load url from future %} {% block content %} @@ -31,8 +32,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:not(:has(tbody tr.empty))").tablesorter({widgets: ['zebra']}); diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html index 62264217..207a8ba3 100644 --- a/templates/releng/result_list.html +++ b/templates/releng/result_list.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load url from future %} {% block content %} @@ -34,8 +35,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:not(:has(tbody tr.empty))").tablesorter({widgets: ['zebra']}); |