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

Forgot to add these layout changes. Everything should work now.

Browse Source
This commit is contained in:
Jef van Schendel 2012-02-21 18:09:38 +01:00
parent aa8804719c
commit ee9a0e3c78
8 changed files with 168 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,7 @@ input, textarea {
.container { .container {
margin: auto; margin: auto;
width: 96%; width: 96%;
max-width: 940px; max-width: 820px;
} }
header { header {
@ -151,22 +151,19 @@ footer {
} }
.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 {
margin-left: auto; width: 100%;
margin-right: auto;
display: block;
} }
.media_sidebar { .media_sidebar {
width: 280px; width: 240px;
margin-left: 10px; margin-left: 10px;
margin-right: 0px;
float: left; float: left;
} }
@ -232,15 +229,6 @@ text-align: center;
float: right; float: right;
} }
textarea#comment_content {
resize: vertical;
width: 634px;
height: 90px;
border: none;
background-color: #f1f1f1;
padding: 3px;
}
.clear { .clear {
clear: both; clear: both;
display: block; display: block;
@ -250,6 +238,15 @@ textarea#comment_content {
height: 0; height: 0;
} }
h3.sidedata {
border: none;
background-color: #212121;
border-radius: 4px 4px 0 0;
padding: 3px 8px;
margin: 20px 0 5px 0;
font-size: 1em;
}
/* forms */ /* forms */
.form_box,.form_box_xl { .form_box,.form_box_xl {
@ -331,13 +328,18 @@ textarea#description, textarea#bio {
} }
textarea#comment_content { textarea#comment_content {
width: 634px; resize: vertical;
width: 100%;
height: 90px; height: 90px;
border: none; border: none;
background-color: #f1f1f1; background-color: #f1f1f1;
padding: 3px; padding: 3px;
} }
#form_comment .form_field_input {
padding-right: 6px;
}
/* media galleries */ /* media galleries */
.media_thumbnail { .media_thumbnail {
@ -348,6 +350,7 @@ textarea#comment_content {
margin: 0px 5px 10px 5px; margin: 0px 5px 10px 5px;
text-align: center; text-align: center;
font-size: 0.875em; font-size: 0.875em;
list-style: none;
} }
.media_thumbnail a { .media_thumbnail a {
@ -359,6 +362,12 @@ textarea#comment_content {
h2.media_title { h2.media_title {
margin-bottom: 0px; margin-bottom: 0px;
display: inline-block;
}
p.context {
display: inline-block;
padding-top: 4px;
} }
p.media_specs { p.media_specs {
@ -385,19 +394,21 @@ img.media_icon {
/* navigation */ /* navigation */
.navigation {
float: right;
}
.navigation_button { .navigation_button {
width: 135px; width: 135px;
display: block; display: inline-block;
float: left;
text-align: center; text-align: center;
background-color: #1d1d1d; background-color: #1d1d1d;
border: 1px solid; border: 1px solid;
border-color: #2c2c2c #232323 #1a1a1a; border-color: #2c2c2c #232323 #1a1a1a;
border-radius: 4px; border-radius: 4px;
text-decoration: none; text-decoration: none;
padding: 12px 0 16px; padding: 4px 0 8px;
font-size: 1.4em; margin: 0 0 6px;
margin: 0 0 20px
} }
.navigation_left { .navigation_left {
@ -482,11 +493,17 @@ table.media_panel th {
} }
/* Media queries and other responsivisivity */ /* Media queries and other responsivisivity */
@media screen and (max-width: 680px) { @media screen and (max-width: 820px) {
.media_pane { .media_pane {
width: 100%; width: 100%;
margin: 0px; margin: 0px;
} }
.media_sidebar {
width: 100%;
margin: 0px;
}
img.media_image { img.media_image {
width: 100%; width: 100%;
display: inline; display: inline;
@ -495,18 +512,31 @@ table.media_panel th {
.media_thumbnail { .media_thumbnail {
width: 21%; width: 21%;
} }
}
@media screen and (max-width: 960px) {
.profile_sidebar { .profile_sidebar {
width: 100%; width: 100%;
margin: 0px; margin: 0px;
} }
.profile_showcase { .profile_showcase {
width: 100%; width: 100%;
margin: 0px; margin: 0px;
} }
.navigation {
float: none;
}
.navigation_button {
width: 49%;
float: right;
}
.navigation_left {
margin-right: 0;
float: left;
}
.navigation { .navigation {
float: none; float: none;
} }

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

@ -40,67 +40,84 @@
{% endblock mediagoblin_head %} {% endblock mediagoblin_head %}
{% block mediagoblin_content %} {% block mediagoblin_content %}
<div class="media_pane"> {% trans user_url=request.urlgen(
<div class="media_image_container"> 'mediagoblin.user_pages.user_home',
{% block mediagoblin_media %} user=media.get_uploader.username),
{% set display_media = request.app.public_store.file_url( username=media.get_uploader.username -%}
media.get_display_media(media.media_files)) %} <p class="context">❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p>
{# if there's a medium file size, that means the medium size {%- endtrans %}
# isn't the original... so link to the original! {% include "mediagoblin/utils/prev_next.html" %}
#} <div class="media_image_container">
{% if media.media_files.has_key('medium') %} {% block mediagoblin_media %}
<a href="{{ request.app.public_store.file_url( {% set display_media = request.app.public_store.file_url(
media.media_files['original']) }}"> media.get_display_media(media.media_files)) %}
<img class="media_image" {# if there's a medium file size, that means the medium size
src="{{ display_media }}" # isn't the original... so link to the original!
alt="Image for {{ media.title }}" /> #}
</a> {% if media.media_files.has_key('medium') %}
{% else %} <a href="{{ request.app.public_store.file_url(
media.media_files['original']) }}">
<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>
{% if request.user and
(media.uploader == request.user._id or
request.user.is_admin) %}
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
user= media.get_uploader.username,
media= media._id) %}
<a class="button_action" href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
user= media.get_uploader.username,
media= media._id) %}
<a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
{% endif %}
{% autoescape False %} {% autoescape False %}
<p>{{ media.description_html }}</p> <p>{{ media.description_html }}</p>
{% endautoescape %} {% endautoescape %}
<p class="media_specs"> {% if media.attachment_files|count %}
{% trans date=media.created.strftime("%Y-%m-%d") -%} <h3>Attachments</h3>
Added on {{ date }}. <ul>
{%- endtrans %} {% for attachment in media.attachment_files %}
{% if request.user and <li>
(media.uploader == request.user._id or <a href="{{ request.app.public_store.file_url(attachment.filepath) }}">
request.user.is_admin) %} {{ attachment.name }}
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media', </a>
user= media.get_uploader.username, </li>
media= media._id) %} {% endfor %}
<a class="button_action" href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a> </ul>
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', {% endif %}
user= media.get_uploader.username, {% if app_config['allow_attachments']
media= media._id) %} and request.user
<a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a> and (media.uploader == request.user._id
{% endif %} or request.user.is_admin) %}
</p> <p>
<a href="{{ request.urlgen('mediagoblin.edit.attachments',
user=media.get_uploader.username,
media=media._id) }}">Add attachment</a>
</p>
{% endif %}
{% if comments %} {% if comments %}
<h3> <h3>
{% if comments.count()==1 %}
{% trans comment_count=comments.count() -%}{{ comment_count }} comment{%- endtrans %}
{% elif comments.count()>1 %}
{% trans comment_count=comments.count() -%}{{ comment_count }} comments{%- endtrans %}
{% else %}
{% trans %}No comments yet.{% endtrans %}
{% endif %}
<div class="right_align"> <div class="right_align">
<a <a
{% if not request.user %} {% if not request.user %}
href="{{ request.urlgen('mediagoblin.auth.login') }}" href="{{ request.urlgen('mediagoblin.auth.login') }}"
{% endif %} {% endif %}
class="button_action" id="button_addcomment" title="Add a comment"> class="button_action" id="button_addcomment" title="Add a comment">
{% trans %}Add one{% endtrans %} {% trans %}Add a comment{% endtrans %}
</a> </a>
</div> </div>
</h3> </h3>
@ -150,35 +167,10 @@
{% endif %} {% endif %}
</div> </div>
<div class="media_sidebar"> <div class="media_sidebar">
{% trans user_url=request.urlgen( {% trans date=media.created.strftime("%Y-%m-%d") -%}
'mediagoblin.user_pages.user_home', <h3 class="sidedata">Added on</h3>
user=media.get_uploader.username), <p>{{ date }}</p>
username=media.get_uploader.username -%}
<p>❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p>
{%- endtrans %} {%- endtrans %}
{% include "mediagoblin/utils/prev_next.html" %}
{% if media.attachment_files|count %}
<h3>Attachments</h3>
<ul>
{% for attachment in media.attachment_files %}
<li>
<a href="{{ request.app.public_store.file_url(attachment.filepath) }}">
{{ attachment.name }}
</a>
</li>
{% endfor %}
</ul>
{% endif %}
{% if app_config['allow_attachments']
and request.user
and (media.uploader == request.user._id
or request.user.is_admin) %}
<p>
<a href="{{ request.urlgen('mediagoblin.edit.attachments',
user=media.get_uploader.username,
media=media._id) }}">Add attachment</a>
</p>
{% endif %}
{% if media.tags %} {% if media.tags %}
{% include "mediagoblin/utils/tags.html" %} {% include "mediagoblin/utils/tags.html" %}
{% endif %} {% endif %}

2
mediagoblin/templates/mediagoblin/utils/exif.html
View File

@ -20,7 +20,7 @@
{% if media.media_data.has_key('exif') {% if media.media_data.has_key('exif')
and app_config['exif_visible'] and app_config['exif_visible']
and media.media_data.exif.has_key('useful') %} and media.media_data.exif.has_key('useful') %}
<h4>EXIF</h4> <h3 class="sidedata">EXIF</h3>
<table> <table>
{% for key, tag in media.media_data.exif.useful.items() %} {% for key, tag in media.media_data.exif.useful.items() %}
<tr> <tr>

2
mediagoblin/templates/mediagoblin/utils/geolocation_map.html
View File

@ -20,7 +20,7 @@
{% if media.media_data.has_key('gps') {% if media.media_data.has_key('gps')
and app_config['geolocation_map_visible'] and app_config['geolocation_map_visible']
and media.media_data.gps %} and media.media_data.gps %}
<h4>Map</h4> <h3 class="sidedata">Location</h3>
<div> <div>
{% set gps = media.media_data.gps %} {% set gps = media.media_data.gps %}
<div id="tile-map" style="width: 100%; height: 196px;"> <div id="tile-map" style="width: 100%; height: 196px;">

2
mediagoblin/templates/mediagoblin/utils/license.html
View File

@ -17,8 +17,8 @@
#} #}
{% block license_content -%} {% block license_content -%}
<h3 class="sidedata">{% trans %}License{% endtrans %}</h3>
<p> <p>
{% trans %}License:{% endtrans %}
{% if media.license %} {% if media.license %}
<a href="{{ media.license }}">{{ media.get_license_data().abbreviation }}</a> <a href="{{ media.license }}">{{ media.get_license_data().abbreviation }}</a>
{% else %} {% else %}

36
mediagoblin/templates/mediagoblin/utils/object_gallery.html
View File

@ -19,29 +19,23 @@
{% from "mediagoblin/utils/pagination.html" import render_pagination %} {% from "mediagoblin/utils/pagination.html" import render_pagination %}
{% macro media_grid(request, media_entries, col_number=5) %} {% macro media_grid(request, media_entries, col_number=5) %}
<table class="thumb_gallery"> <ul class="thumb_gallery">
{% for row in gridify_cursor(media_entries, col_number) %} {% for row in gridify_cursor(media_entries, col_number) %}
<tr class="thumb_row {% for entry in row %}
{%- if loop.first %} thumb_row_first {% set entry_url = entry.url_for_self(request.urlgen) %}
{%- elif loop.last %} thumb_row_last{% endif %}"> <li class="media_thumbnail">
{% for entry in row %} <a href="{{ entry_url }}">
{% set entry_url = entry.url_for_self(request.urlgen) %} <img src="{{ request.app.public_store.file_url(
<td class="media_thumbnail thumb_entry entry.media_files['thumb']) }}" />
{%- if loop.first %} thumb_entry_first </a>
{%- elif loop.last %} thumb_entry_last{% endif %}"> {% if entry.title %}
<a href="{{ entry_url }}"> <br />
<img src="{{ request.app.public_store.file_url( <a href="{{ entry_url }}">{{ entry.title }}</a>
entry.media_files['thumb']) }}" /> {% endif %}
</a> </li>
{% if entry.title %} {% endfor %}
<br />
<a href="{{ entry_url }}">{{ entry.title }}</a>
{% endif %}
</td>
{% endfor %}
</tr>
{% endfor %} {% endfor %}
</table> </ul>
{%- endmacro %} {%- endmacro %}
{# {#

46
mediagoblin/templates/mediagoblin/utils/prev_next.html
View File

@ -21,26 +21,28 @@
{% set next_entry_url = media.url_to_next(request.urlgen) %} {% set next_entry_url = media.url_to_next(request.urlgen) %}
{% if prev_entry_url or next_entry_url %} {% if prev_entry_url or next_entry_url %}
{# There are no previous entries for the very first media entry #} <div class="navigation">
{% if prev_entry_url %} {# There are no previous entries for the very first media entry #}
<a class="navigation_button navigation_left" href="{{ prev_entry_url }}"> {% if prev_entry_url %}
&larr; {% trans %}newer{% endtrans %} <a class="navigation_button navigation_left" href="{{ prev_entry_url }}">
</a> &larr; {% trans %}newer{% endtrans %}
{% else %} </a>
{# This is the first entry. display greyed-out 'previous' image #} {% else %}
<p class="navigation_button navigation_left"> {# This is the first entry. display greyed-out 'previous' image #}
&larr; {% trans %}newer{% endtrans %} <p class="navigation_button navigation_left">
</p> &larr; {% trans %}newer{% endtrans %}
{% endif %} </p>
{# Likewise, this could be the very last media entry #} {% endif %}
{% if next_entry_url %} {# Likewise, this could be the very last media entry #}
<a class="navigation_button" href="{{ next_entry_url }}"> {% if next_entry_url %}
{% trans %}older{% endtrans %} &rarr; <a class="navigation_button" href="{{ next_entry_url }}">
</a> {% trans %}older{% endtrans %} &rarr;
{% else %} </a>
{# This is the last entry. display greyed-out 'next' image #} {% else %}
<p class="navigation_button"> {# This is the last entry. display greyed-out 'next' image #}
{% trans %}older{% endtrans %} &rarr; <p class="navigation_button">
</p> {% trans %}older{% endtrans %} &rarr;
{% endif %} </p>
{% endif %}
</div>
{% endif %} {% endif %}

9
mediagoblin/templates/mediagoblin/utils/tags.html
View File

@ -17,16 +17,17 @@
#} #}
{% block tags_content -%} {% block tags_content -%}
<p>{% trans %}View more media tagged with{% endtrans %} <h3 class="sidedata">Tagged with</h3>
<p>
{% for tag in media.tags %} {% for tag in media.tags %}
{% if loop.last %} {% if loop.last %}
{# the 'and' should only appear if there is more than one tag #} {# the 'and' should only appear if there is more than one tag #}
{% if media.tags|length > 1 %} {% if media.tags|length > 1 %}
{% trans %}or{% endtrans %} &middot;
{% endif %} {% endif %}
<a href="{{ request.urlgen( <a href="{{ request.urlgen(
'mediagoblin.listings.tags_listing', 'mediagoblin.listings.tags_listing',
tag=tag['slug']) }}">{{ tag['name'] }}</a>. tag=tag['slug']) }}">{{ tag['name'] }}</a>
{% elif loop.revindex == 2 %} {% elif loop.revindex == 2 %}
<a href="{{ request.urlgen( <a href="{{ request.urlgen(
'mediagoblin.listings.tags_listing', 'mediagoblin.listings.tags_listing',
@ -34,7 +35,7 @@
{% else %} {% else %}
<a href="{{ request.urlgen( <a href="{{ request.urlgen(
'mediagoblin.listings.tags_listing', 'mediagoblin.listings.tags_listing',
tag=tag['slug']) }}">{{ tag['name'] }}</a>, tag=tag['slug']) }}">{{ tag['name'] }}</a> &middot;
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</p> </p>