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

Restore sidebar

Browse Source
This commit is contained in:
Jef van Schendel 2012-02-12 16:18:58 +01:00
parent fb1dc4f56b
commit b21c943427
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,21 +150,19 @@ footer {
clear: both; clear: both;
} }
/* TEMP removal -> permanent removal should also be done in html!
.media_pane { .media_pane {
width: 640px; width: 560px;
margin-left: 0px; margin-left: 0px;
margin-right: 10px; margin-right: 10px;
float: left; float: left;
} }
*/
img.media_image { img.media_image {
width: 100%; width: 100%;
} }
.media_sidebar { .media_sidebar {
width: 280px; width: 240px;
margin-left: 10px; margin-left: 10px;
margin-right: 0px; margin-right: 0px;
float: left; float: left;

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

@ -40,35 +40,35 @@
{% endblock mediagoblin_head %} {% endblock mediagoblin_head %}
{% block mediagoblin_content %} {% block mediagoblin_content %}
<div class="media_pane"> {% trans user_url=request.urlgen(
{% trans user_url=request.urlgen( 'mediagoblin.user_pages.user_home',
'mediagoblin.user_pages.user_home', user=media.get_uploader.username),
user=media.get_uploader.username), username=media.get_uploader.username -%}
username=media.get_uploader.username -%} <p class="context">❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p>
<p class="context">❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p> {%- endtrans %}
{%- endtrans %} {% include "mediagoblin/utils/prev_next.html" %}
{% include "mediagoblin/utils/prev_next.html" %} <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( media.get_display_media(media.media_files)) %}
media.get_display_media(media.media_files)) %} {# if there's a medium file size, that means the medium size
{# if there's a medium file size, that means the medium size # isn't the original... so link to the original!
# isn't the original... so link to the original! #}
#} {% if media.media_files.has_key('medium') %}
{% if media.media_files.has_key('medium') %} <a href="{{ request.app.public_store.file_url(
<a href="{{ request.app.public_store.file_url( media.media_files['original']) }}">
media.media_files['original']) }}">
<img class="media_image"
src="{{ display_media }}"
alt="Image for {{ media.title }}" />
</a>
{% else %}
<img class="media_image" <img class="media_image"
src="{{ display_media }}" src="{{ display_media }}"
alt="Image for {{ media.title }}" /> alt="Image for {{ media.title }}" />
{% endif %} </a>
{% endblock %} {% else %}
</div> <img class="media_image"
src="{{ display_media }}"
alt="Image for {{ media.title }}" />
{% endif %}
{% endblock %}
</div>
<div class="media_pane">
<h2 class="media_title"> <h2 class="media_title">
{{ media.title }} {{ media.title }}
</h2> </h2>
@ -155,6 +155,8 @@
{{ render_pagination(request, pagination, {{ render_pagination(request, pagination,
media.url_for_self(request.urlgen)) }} media.url_for_self(request.urlgen)) }}
{% endif %} {% endif %}
</div>
<div class="media_sidebar">
{% if media.attachment_files|count %} {% if media.attachment_files|count %}
<h3>Attachments</h3> <h3>Attachments</h3>
<ul> <ul>