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/todolists | |
| 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/todolists')
| -rw-r--r-- | templates/todolists/list.html | 5 | ||||
| -rw-r--r-- | templates/todolists/public_list.html | 5 | ||||
| -rw-r--r-- | templates/todolists/view.html | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/templates/todolists/list.html b/templates/todolists/list.html index 2e24fe9f..4826c300 100644 --- a/templates/todolists/list.html +++ b/templates/todolists/list.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% block title %}Parabola - Todo Lists{% endblock %} @@ -43,8 +44,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() { // I'm not sure why it didn't autodetect digit, but it has to be explicit diff --git a/templates/todolists/public_list.html b/templates/todolists/public_list.html index 3ee206f4..9978fd00 100644 --- a/templates/todolists/public_list.html +++ b/templates/todolists/public_list.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load package_extras %} {% block title %}Parabola - Todo Lists{% endblock %} @@ -65,8 +66,8 @@ </div> {% endif %} {% 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: [[0,0], [1,0]]}); diff --git a/templates/todolists/view.html b/templates/todolists/view.html index 9c87f38b..a3a3666a 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load package_extras %} {% block title %}Parabola - Todo: {{ list.name }}{% endblock %} @@ -70,8 +71,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.status-link').click(todolist_flag); |