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/devel | |
| 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/devel')
| -rw-r--r-- | templates/devel/clock.html | 5 | ||||
| -rw-r--r-- | templates/devel/index.html | 5 | ||||
| -rw-r--r-- | templates/devel/packages.html | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/templates/devel/clock.html b/templates/devel/clock.html index e8a7bf11..f906800a 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load tz %} {% block title %}Parabola GNU/Linux-libre - Hackers World Clocks{% 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() { $("#clocks-table:has(tbody tr)").tablesorter( diff --git a/templates/devel/index.html b/templates/devel/index.html index 3f36f43e..7661f3b9 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load cache %} {% load package_extras %} @@ -293,8 +294,8 @@ {% endcache %} {% 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() { $("#dash-myflagged:not(:has(tbody tr.empty))").tablesorter( diff --git a/templates/devel/packages.html b/templates/devel/packages.html index e0865fee..6979e8c2 100644 --- a/templates/devel/packages.html +++ b/templates/devel/packages.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load attributes %} {% load package_extras %} @@ -52,8 +53,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']}); |