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

Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Browse Source
This commit is contained in:
Christopher Allan Webber 2012-03-17 17:09:26 -05:00
commit 2011f2d89e
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,13 +234,14 @@ text-align: center;
height: 0; height: 0;
} }
h3.sidedata { .media_sidebar h3 {
border: none;
background-color: #212121;
border-radius: 4px 4px 0 0;
padding: 3px 8px;
margin: 20px 0 5px 0;
font-size: 1em; font-size: 1em;
margin: 0 0 5px;
border: none;
}
.media_sidebar p {
padding-left: 8px;
} }
/* forms */ /* forms */

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

@ -172,7 +172,7 @@
</div> </div>
<div class="media_sidebar"> <div class="media_sidebar">
{% trans date=media.created.strftime("%Y-%m-%d") -%} {% trans date=media.created.strftime("%Y-%m-%d") -%}
<h3 class="sidedata">Added on</h3> <h3>Added on</h3>
<p>{{ date }}</p> <p>{{ date }}</p>
{%- endtrans %} {%- endtrans %}
{% if media.tags %} {% if media.tags %}

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

@ -20,7 +20,7 @@
{% if app_config['exif_visible'] {% if app_config['exif_visible']
and media.media_data.exif is defined and media.media_data.exif is defined
and media.media_data.exif.has_key('useful') %} and media.media_data.exif.has_key('useful') %}
<h3 class="sidedata">EXIF</h3> <h3>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

@ -22,7 +22,7 @@
and media.media_data.gps_latitude and media.media_data.gps_latitude
and media.media_data.gps_longitude is defined and media.media_data.gps_longitude is defined
and media.media_data.gps_longitude %} and media.media_data.gps_longitude %}
<h3 class="sidedata">{% trans %}Location{% endtrans %}</h3> <h3>{% trans %}Location{% endtrans %}</h3>
<div> <div>
{%- set lon = media.media_data.gps_longitude %} {%- set lon = media.media_data.gps_longitude %}
{%- set lat = media.media_data.gps_latitude %} {%- set lat = media.media_data.gps_latitude %}

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

@ -17,7 +17,7 @@
#} #}
{% block license_content -%} {% block license_content -%}
<h3 class="sidedata">{% trans %}License{% endtrans %}</h3> <h3>{% trans %}License{% endtrans %}</h3>
<p> <p>
{% 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>

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

@ -17,7 +17,7 @@
#} #}
{% block tags_content -%} {% block tags_content -%}
<h3 class="sidedata">{% trans %}Tagged with{% endtrans %}</h3> <h3>{% trans %}Tagged with{% endtrans %}</h3>
<p> <p>
{% for tag in media.tags %} {% for tag in media.tags %}
{% if loop.last %} {% if loop.last %}