heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added sidebar to profile page; moved some content

Browse Source
This commit is contained in:
Jef van Schendel 2011-07-08 15:22:15 +02:00
parent 7fb39157e0
commit cdc8cb285d
3 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/static/css/base.css
View File

@ -257,11 +257,3 @@ ul.mediagoblin_messages {
background-color: #f7f7f7; background-color: #f7f7f7;
color:#272727; color:#272727;
} }
/* profile stuff */
.profile_content {
padding: 6px;
background-color: #393939;
margin-bottom: 10px;
}

5
mediagoblin/templates/mediagoblin/user_pages/user.html
View File

@ -28,6 +28,7 @@
{% if user %} {% if user %}
<h1>{{ user.username }}'s profile</h1> <h1>{{ user.username }}'s profile</h1>
<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'] %}
@ -40,6 +41,8 @@
<a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a>
</p> </p>
{% endif %} {% endif %}
</div>
<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" %}
@ -55,4 +58,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/>
{% endif %} {% endif %}
</div>
{% endblock %} {% endblock %}

17
mediagoblin/templates/mediagoblin/utils/profile.html
View File

@ -17,19 +17,14 @@
#} #}
{% block profile_content -%} {% 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 %} {% if user.bio %}
<div class="profile_bio"> <p>
{{ user.bio }} {{ user.bio }}
</div> </p>
{% endif %} {% endif %}
</div> {% if user.url %}
<p>
<a href="{{ user.url }}">{{ user.url }}</a>
</p>
{% endif %} {% endif %}
{% endblock %} {% endblock %}