Merge remote branch 'remotes/gullydwarf-cfdv/is330'

Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/gallery.html
This commit is contained in:
Christopher Allan Webber 2011-06-25 13:08:04 -05:00
commit 4765a52b1f

View File

@ -20,15 +20,16 @@
{% block mediagoblin_head %}
<link rel="alternate" type="application/atom+xml"
href="{{ request.urlgen(
'mediagoblin.user_pages.atom_feed',
'mediagoblin.user_pages.atom_feed',
user=user.username) }}">
{% endblock mediagoblin_head %}
{% block mediagoblin_content -%}
{% if user %}
<h1><a href="{{ request.urlgen(
'mediagoblin.user_pages.user_home',
user=user.username) }}">{{ user.username }}</a>'s media</h1>
<h1>
<a href="{{ request.urlgen(
'mediagoblin.user_pages.user_home',
user=user.username) }}">{{ user.username }}</a>'s media</h1>
{% include "mediagoblin/utils/object_gallery.html" %}