Moved a div around
This commit is contained in:
parent
06a5f21eb1
commit
b1f11df07c
@ -26,19 +26,18 @@
|
|||||||
|
|
||||||
{% block mediagoblin_content -%}
|
{% block mediagoblin_content -%}
|
||||||
{% if user %}
|
{% if user %}
|
||||||
<h1>{{ user.username }}'s profile</h1>
|
<h1>{{ user.username }}'s profile</h1>
|
||||||
<div class="grid_6 alpha">
|
<div class="grid_6 alpha">
|
||||||
{% include "mediagoblin/utils/profile.html" %}
|
{% include "mediagoblin/utils/profile.html" %}
|
||||||
{% if request.user['_id'] == user['_id'] or request.user['is_admin'] %}
|
{% if request.user['_id'] == user['_id'] or request.user['is_admin'] %}
|
||||||
<a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
|
<a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
|
||||||
user.username }}">Edit profile</a>
|
user.username }}">Edit profile</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div class="grid_10 omega">
|
<div class="grid_10 omega">
|
||||||
{% set pagination_base_url = user_gallery_url %}
|
{% set pagination_base_url = user_gallery_url %}
|
||||||
{% include "mediagoblin/utils/object_gallery.html" %}
|
{% include "mediagoblin/utils/object_gallery.html" %}
|
||||||
<div class="clear"></div>
|
<p><a href="{{ user_gallery_url }}">View all of {{ user.username }}'s media</a></p>
|
||||||
<p><a href="{{ user_gallery_url }}">View all of {{ user.username }}'s media</a></p>
|
|
||||||
<a href={{ request.urlgen(
|
<a href={{ request.urlgen(
|
||||||
'mediagoblin.user_pages.atom_feed',
|
'mediagoblin.user_pages.atom_feed',
|
||||||
user=user.username) }}>atom feed</a>
|
user=user.username) }}>atom feed</a>
|
||||||
@ -46,5 +45,6 @@
|
|||||||
{# This *should* not occur as the view makes sure we pass in a user. #}
|
{# This *should* not occur as the view makes sure we pass in a user. #}
|
||||||
<p>Sorry, no such user found.<p/>
|
<p>Sorry, no such user found.<p/>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="clear"></div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user