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/mirrors | |
| 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/mirrors')
| -rw-r--r-- | templates/mirrors/mirror_details.html | 5 | ||||
| -rw-r--r-- | templates/mirrors/mirrors.html | 5 | ||||
| -rw-r--r-- | templates/mirrors/status.html | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index dd0f87f5..507b69bf 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load mirror_status %} {% block title %}Parabola - {{ mirror.name }} - Mirror Details{% endblock %} @@ -105,8 +106,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() { $("#available_urls:has(tbody tr)").tablesorter( diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html index e4e208e9..50f50bde 100644 --- a/templates/mirrors/mirrors.html +++ b/templates/mirrors/mirrors.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% block title %}Parabola - Mirror Overview{% endblock %} {% block content %} @@ -41,8 +42,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], [2,0]]}); diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index e0e2ac86..307b96dd 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load mirror_status %} {% block title %}Parabola - Mirror Status{% endblock %} @@ -102,8 +103,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() { var headers = { 5: { sorter: 'duration' }, 6: { sorter: 'mostlydigit' }, 7: { sorter: 'mostlydigit' }, 8: { sorter: 'mostlydigit' } }; |