aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-09-14 19:52:47 +0200
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-09-14 19:52:47 +0200
commit32d1a69d2f1293cb53cf9620f0e0a4f266ad230b (patch)
tree3218fa85378aa3c3d96d79d4538a26ce2699fa3f
parent9122a9d047765574bb0d11436522a6c868da86cc (diff)
downloadmediagoblin-32d1a69d2f1293cb53cf9620f0e0a4f266ad230b.tar.lz
mediagoblin-32d1a69d2f1293cb53cf9620f0e0a4f266ad230b.tar.xz
mediagoblin-32d1a69d2f1293cb53cf9620f0e0a4f266ad230b.zip
Templates: Use request.staticdirect instead of /mgoblin_static
Any reference to static, shipped content should use request.staticdirect instead of the default path. Especially if hosting mediagoblin via fastcgi, the paths might need changing.
-rw-r--r--mediagoblin/templates/mediagoblin/utils/pagination.html4
-rw-r--r--mediagoblin/templates/mediagoblin/utils/prev_next.html8
2 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/templates/mediagoblin/utils/pagination.html b/mediagoblin/templates/mediagoblin/utils/pagination.html
index 87e15e0f..0df3bfea 100644
--- a/mediagoblin/templates/mediagoblin/utils/pagination.html
+++ b/mediagoblin/templates/mediagoblin/utils/pagination.html
@@ -36,7 +36,7 @@
{% set prev_url = pagination.get_page_url_explicit(
base_url, get_params,
pagination.page - 1) %}
- <a href="{{ prev_url }}"><img class="pagination_arrow" src="/mgoblin_static/images/pagination_left.png" alt="Previous page" /></a>
+ <a href="{{ prev_url }}"><img class="pagination_arrow" src="{{ request.staticdirect('/images/pagination_left.png') }}" alt="Previous page" /></a>
<a href="{{ prev_url }}">{% trans %}Newer{% endtrans %}</a>
{% endif %}
{% if pagination.has_next %}
@@ -44,7 +44,7 @@
base_url, get_params,
pagination.page + 1) %}
<a href="{{ next_url }}">{% trans %}Older{% endtrans %}</a>
- <a href="{{ next_url }}"><img class="pagination_arrow" src="/mgoblin_static/images/pagination_right.png" alt="Next page" /></a>
+ <a href="{{ next_url }}"><img class="pagination_arrow" src="{{ request.staticdirect('/images/pagination_right.png') }}" alt="Next page" /></a>
{% endif %}
<br />
Go to page:
diff --git a/mediagoblin/templates/mediagoblin/utils/prev_next.html b/mediagoblin/templates/mediagoblin/utils/prev_next.html
index 74f855ed..75903076 100644
--- a/mediagoblin/templates/mediagoblin/utils/prev_next.html
+++ b/mediagoblin/templates/mediagoblin/utils/prev_next.html
@@ -25,23 +25,23 @@
{# There are no previous entries for the very first media entry #}
{% if prev_entry_url %}
<a class="navigation_button navigation_left" href="{{ prev_entry_url }}">
- <img src="/mgoblin_static/images/navigation_left.png" alt="Previous image" />
+ <img src="{{ request.staticdirect('/images/navigation_left.png') }}" alt="Previous image" />
</a>
{% else %}
{# This is the first entry. display greyed-out 'previous' image #}
<p class="navigation_button navigation_left">
- <img src="/mgoblin_static/images/navigation_end.png" alt="No previous images" />
+ <img src="{{ request.staticdirect('/images/navigation_end.png') }}" alt="No previous images" />
</p>
{% endif %}
{# Likewise, this could be the very last media entry #}
{% if next_entry_url %}
<a class="navigation_button" href="{{ next_entry_url }}">
- <img src="/mgoblin_static/images/navigation_right.png" alt="Next image" />
+ <img src="{{ request.staticdirect('/images/navigation_right.png') }}" alt="Next image" />
</a>
{% else %}
{# This is the last entry. display greyed-out 'next' image #}
<p class="navigation_button">
- <img src="/mgoblin_static/images/navigation_end.png" alt="No following images" />
+ <img src="{{ request.staticdirect('/images/navigation_end.png') }}" alt="No following images" />
</p>
{% endif %}
</div>