diff options
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 6 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 15 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/user.html | 9 |
3 files changed, 20 insertions, 10 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 2d6f03d9..0d22608b 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -56,8 +56,12 @@ {% block mediagoblin_header %} <div class="container"> <header> + <div class="row hell"> + <div class="eight columns alpha omega"> {%- include "mediagoblin/bits/logo.html" -%} {% block mediagoblin_header_title %}{% endblock %} + </div> + <div class="eight columns alpha omega pull-right"> <div class="header_right"> {%- if request.user %} {% if request.user and @@ -105,6 +109,7 @@ </a> {%- endif %} </div> + </div><!--end eight columns pull-right--> <div class="clear"></div> {% if request.user and request.user.has_privilege('active') %} <div class="header_dropdown"> @@ -158,6 +163,7 @@ {% include 'mediagoblin/fragments/header_notifications.html' %} </div> {% endif %} + </div><!-- end row --> </header> </div> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 81e5013e..4c2323cf 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -32,9 +32,9 @@ {% template_hook("media_head") %} {% endblock mediagoblin_head %} - {% block mediagoblin_content %} - <p class="context"> +<div class="row hell"> + <p class="eleven columns context"> {%- trans user_url=request.urlgen( 'mediagoblin.user_pages.user_home', user=media.get_uploader.username), @@ -42,8 +42,11 @@ ❖ Browsing media by <a href="{{user_url}}">{{username}}</a> {%- endtrans -%} </p> - {% include "mediagoblin/utils/prev_next.html" %} - <div class="media_pane"> + <div class="five columns"> + {% include "mediagoblin/utils/prev_next.html" %} + </div> +</div> + <div class="media_pane eleven columns"> <div class="media_image_container"> {% block mediagoblin_media %} {% set display_media = request.app.public_store.file_url( @@ -161,8 +164,8 @@ {{ render_pagination(request, pagination, media.url_for_self(request.urlgen)) }} {% endif %} - </div> - <div class="media_sidebar"> + </div><!--end media_pane--> + <div class="five columns media_sidebar"> <h3>{% trans %}Added{% endtrans %}</h3> <p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}"> {%- trans formatted_time=timesince(media.created) -%} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 14a67431..51baa9bb 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -41,6 +41,7 @@ {% block mediagoblin_content -%} + <div class="six columns"> <h1> {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%} </h1> @@ -81,9 +82,9 @@ </a> </p> </div> - + </div><!--end six columns--> {% if media_entries.count() %} - <div class="profile_showcase"> + <div class="ten columns profile_showcase"> {{ object_gallery(request, media_entries, pagination, pagination_base_url=user_gallery_url, col_number=3) }} {% include "mediagoblin/utils/object_gallery.html" %} @@ -101,7 +102,7 @@ </div> {% else %} {% if request.user and (request.user.id == user.id) %} - <div class="profile_showcase empty_space"> + <div class="ten columns profile_showcase empty_space"> <p> {% trans -%} This is where your media will appear, but you don't seem to have added anything yet. @@ -113,7 +114,7 @@ </a> </div> {% else %} - <div class="profile_showcase empty_space"> + <div class="ten columns profile_showcase empty_space"> <p> {% trans -%} There doesn't seem to be any media here yet... |