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

move "wide" view to seperate branch

Browse Source
This commit is contained in:
jpope 2014-01-08 00:08:11 -06:00
parent 4a9a796a7f
commit 5cdf3a0a14
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,13 +205,15 @@ footer {
} }
.media_pane { .media_pane {
border-bottom: 1px solid #333333; /* in place for possible future wide view */
/* border-bottom: 1px solid #333333;*/
} }
.media_sidebar { .media_sidebar {
border-left: 1px solid #333333; /* in place for possible future wide view */
padding-left: 1em; /* border-left: 1px solid #333333;*/
padding-top: 1em; /* padding-left: 1em;*/
/* padding-top: 1em;*/
} }
.media_comments { .media_comments {

11
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -46,7 +46,7 @@
{% include "mediagoblin/utils/prev_next.html" %} {% include "mediagoblin/utils/prev_next.html" %}
</div> </div>
</div> </div>
<div class="media_pane sixteen columns"> <div class="media_pane eleven columns">
<div class="media_image_container"> <div class="media_image_container">
{% block mediagoblin_media %} {% block mediagoblin_media %}
{% set display_media = request.app.public_store.file_url( {% set display_media = request.app.public_store.file_url(
@ -92,9 +92,6 @@
<p>{{ media.description_html }}</p> <p>{{ media.description_html }}</p>
{% endautoescape %} {% endautoescape %}
</div> </div>
</div>
<div class="eleven columns omega">
{% if comments and request.user and request.user.has_privilege('commenter') %} {% if comments and request.user and request.user.has_privilege('commenter') %}
<div class="media_comments"> <div class="media_comments">
{% if app_config['allow_comments'] %} {% if app_config['allow_comments'] %}
@ -174,9 +171,11 @@
<div class="empty_space no_background"> <div class="empty_space no_background">
{% endif %} {% endif %}
</div> </div>
</div>
<div class="five columns alpha media_sidebar"> </div>
<div class="five columns media_sidebar">
<h3>{% trans %}Added{% endtrans %}</h3> <h3>{% trans %}Added{% endtrans %}</h3>
<p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}"> <p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}">
{%- trans formatted_time=timesince(media.created) -%} {%- trans formatted_time=timesince(media.created) -%}