diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-26 13:18:26 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-26 13:18:26 -0400 |
| commit | 593fb6005cef063f9f35af8a4a71f4ec96654583 (patch) | |
| tree | 15de8490c453b6068fc10d7acfc19dfc132fe9c7 /templates | |
| parent | da2751757bc8b6638b6dd6af35d961f05957a105 (diff) | |
| parent | 943ef2e8e436a32ce5dc956c4d855866cd644cc1 (diff) | |
Merge commit '943ef2e8e4'
Conflicts:
public/static/logos/legacy/arch-legacy-aqua-blue.png
public/static/logos/legacy/arch-legacy-aqua-blue.svg
public/static/logos/legacy/arch-legacy-aqua-white.png
public/static/logos/legacy/arch-legacy-aqua-white.svg
public/static/logos/legacy/arch-legacy-aqua.png
public/static/logos/legacy/arch-legacy-aqua.svg
public/static/logos/legacy/arch-legacy-blue1.png
public/static/logos/legacy/arch-legacy-blue1.svg
public/static/logos/legacy/arch-legacy-blue2.png
public/static/logos/legacy/arch-legacy-blue2.svg
public/static/logos/legacy/arch-legacy-noodle-blue.png
public/static/logos/legacy/arch-legacy-noodle-blue.svg
public/static/logos/legacy/arch-legacy-noodle-box.png
public/static/logos/legacy/arch-legacy-noodle-box.svg
public/static/logos/legacy/arch-legacy-noodle-cup.png
public/static/logos/legacy/arch-legacy-noodle-cup.svg
public/static/logos/legacy/arch-legacy-noodle-white.png
public/static/logos/legacy/arch-legacy-noodle-white.svg
public/static/logos/legacy/arch-legacy-ribbon1.png
public/static/logos/legacy/arch-legacy-ribbon2.png
public/static/logos/legacy/arch-legacy-ribbon3.png
public/static/logos/legacy/arch-legacy-ribbon4.png
public/static/logos/legacy/arch-legacy-ribbon5.png
public/static/logos/legacy/arch-legacy-ribbon6.png
public/static/logos/legacy/arch-legacy-wombat-lg.png
public/static/logos/legacy/arch-legacy-wombat.png
sitestatic/favicon.ico
sitestatic/jquery-1.4.4.min.js
sitestatic/jquery.tablesorter.min.js
sitestatic/silhouette.png
templates/base.html
templates/devel/clock.html
templates/packages/opensearch.xml
visualize/static/d3.geom.min.js
visualize/static/d3.layout.min.js
visualize/static/d3.min.js
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/devel/clock.html | 2 | ||||
| -rw-r--r-- | templates/devel/index.html | 4 | ||||
| -rw-r--r-- | templates/todolists/public_list.html | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/templates/devel/clock.html b/templates/devel/clock.html index 9fcae41b..06324d84 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -41,7 +41,7 @@ </div> {% load cdn %}{% jquery %} <script type="text/javascript" src="{{ STATIC_URL }}jquery.tablesorter.min.js"></script> -<script type="text/javascript" src="{{ STATIC_URL }}media/archweb.js"></script> +<script type="text/javascript" src="{{ STATIC_URL }}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 ad024a34..3853243c 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -288,8 +288,8 @@ {% endcache %} {% load cdn %}{% jquery %} -<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script> -<script type="text/javascript" src="/media/archweb.js"></script> +<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"> $(document).ready(function() { $("#dash-myflagged:not(:has(tbody tr.empty))").tablesorter( diff --git a/templates/todolists/public_list.html b/templates/todolists/public_list.html index e9dd3882..3ee206f4 100644 --- a/templates/todolists/public_list.html +++ b/templates/todolists/public_list.html @@ -71,6 +71,5 @@ $(document).ready(function() { $(".results").tablesorter({widgets: ['zebra'], sortList: [[0,0], [1,0]]}); }); - </script> {% endblock %} |