Merge remote branch 'remotes/elrond/misc/use_staticdirect'

This commit is contained in:
Christopher Allan Webber 2011-09-28 17:33:03 -05:00
commit 573aba86b5
2 changed files with 6 additions and 6 deletions

View File

@ -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:

View File

@ -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>