aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-08-18 19:57:24 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-08-18 19:57:24 -0500
commit66a65c9c4c8ef08a7a8ab7935259c749fa7b9d51 (patch)
treeb9546a0a1ac0f852f1b6b97b0dae789ee871d7eb
parent3617ff4acf108bc1d90c6181e51c67dcb4fc44f0 (diff)
downloadmediagoblin-66a65c9c4c8ef08a7a8ab7935259c749fa7b9d51.tar.lz
mediagoblin-66a65c9c4c8ef08a7a8ab7935259c749fa7b9d51.tar.xz
mediagoblin-66a65c9c4c8ef08a7a8ab7935259c749fa7b9d51.zip
Switch "atom feed" to "Atom feed" and made the icons and text separate links
Before doing the latter there was an ugly underline spanning the icon and the text.
-rw-r--r--mediagoblin/templates/mediagoblin/listings/tag.html12
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/gallery.html13
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/user.html11
3 files changed, 22 insertions, 14 deletions
diff --git a/mediagoblin/templates/mediagoblin/listings/tag.html b/mediagoblin/templates/mediagoblin/listings/tag.html
index d047096b..f36f3df4 100644
--- a/mediagoblin/templates/mediagoblin/listings/tag.html
+++ b/mediagoblin/templates/mediagoblin/listings/tag.html
@@ -36,11 +36,13 @@
</div>
<div class="grid_16">
- <a href="{{ request.urlgen(
- 'mediagoblin.listings.tag_atom_feed',
- tag=tag_slug) }}"
- ><img src="{{ request.staticdirect('/images/icon_feed.png') }}"
- class="media_icon" />{%- trans %}atom feed{% endtrans -%}
+ {% set feed_url = request.urlgen(
+ 'mediagoblin.listings.tag_atom_feed',
+ tag=tag_slug) %}
+ <a href="{{ feed_url }}">
+ <img src="{{ request.staticdirect('/images/icon_feed.png') }}"
+ class="media_icon" />
</a>
+ <a href="{{ feed_url }}">{%- trans %}Atom feed{% endtrans -%}</a>
</div>
{% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index ff935ac4..6acee9ef 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
@@ -37,16 +37,19 @@
{%- endtrans %}
</h1>
- </div>
<div class="container_16 media_gallery">
{{ object_gallery(request, media_entries, pagination) }}
</div>
+
<div class="grid_16">
- <a href="{{ request.urlgen(
- 'mediagoblin.user_pages.atom_feed',
- user=user.username) }}">
- {%- trans %}atom feed{% endtrans -%}
+ {% set feed_url = request.urlgen(
+ 'mediagoblin.user_pages.atom_feed',
+ user=user.username) %}
+ <a href="{{ feed_url }}">
+ <img src="{{ request.staticdirect('/images/icon_feed.png') }}"
+ class="media_icon" />
</a>
+ <a href="{{ feed_url }}">{%- trans %}Atom feed{% endtrans -%}</a>
</div>
{% else %}
{# This *should* not occur as the view makes sure we pass in a user. #}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index f189ed94..56f6503c 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -113,11 +113,14 @@
View all of {{ username }}'s media{% endtrans -%}
</a>
</p>
- <a href="{{ request.urlgen( 'mediagoblin.user_pages.atom_feed',
- user=user.username) }}"
- ><img src="{{ request.staticdirect('/images/icon_feed.png') }}"
- class="media_icon" />{%- trans %}atom feed{% endtrans -%}
+ {% set feed_url = request.urlgen(
+ 'mediagoblin.user_pages.atom_feed',
+ user=user.username) %}
+ <a href="{{ feed_url }}">
+ <img src="{{ request.staticdirect('/images/icon_feed.png') }}"
+ class="media_icon" />
</a>
+ <a href="{{ feed_url }}">{%- trans %}Atom feed{% endtrans -%}</a>
</div>
<div class="clear"></div>