diff options
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/user.html | 5 | ||||
-rw-r--r-- | mediagoblin/templates/mediagoblin/utils/profile.html | 25 |
2 files changed, 15 insertions, 15 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index aed330c8..97a882c6 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -28,6 +28,7 @@ {% if user %} <h1>{{ user.username }}'s profile</h1> + <div class="grid_6 alpha"> {% include "mediagoblin/utils/profile.html" %} {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} @@ -40,6 +41,8 @@ <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> </p> {% endif %} + </div> + <div class="grid_10 omega"> {% set pagination_base_url = user_gallery_url %} {% include "mediagoblin/utils/object_gallery.html" %} @@ -55,4 +58,6 @@ {# This *should* not occur as the view makes sure we pass in a user. #} <p>Sorry, no such user found.<p/> {% endif %} + + </div> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/utils/profile.html b/mediagoblin/templates/mediagoblin/utils/profile.html index cd60bbfc..f44defa5 100644 --- a/mediagoblin/templates/mediagoblin/utils/profile.html +++ b/mediagoblin/templates/mediagoblin/utils/profile.html @@ -17,19 +17,14 @@ #} {% block profile_content -%} - {% if user.url or user.bio %} - <div class="profile_content"> - {% if user.url %} - <div class="profile_homepage"> - <a href="{{ user.url }}">{{ user.url }}</a> - </div> - {% endif %} - - {% if user.bio %} - <div class="profile_bio"> - {{ user.bio }} - </div> - {% endif %} - </div> + {% if user.bio %} + <p> + {{ user.bio }} + </p> {% endif %} -{% endblock %} + {% if user.url %} + <p> + <a href="{{ user.url }}">{{ user.url }}</a> + </p> + {% endif %} +{% endblock %} |