From: yomguy Date: Thu, 19 Apr 2012 15:28:05 +0000 (+0200) Subject: fix footer, media infos X-Git-Tag: 0.3~20 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c3cea625875df939e6cd248700caff2e463a1658;p=teleforma.git fix footer, media infos --- diff --git a/teleforma/htdocs/css/teleforma.css b/teleforma/htdocs/css/teleforma.css index 57c3c43a..ec88cdd5 100644 --- a/teleforma/htdocs/css/teleforma.css +++ b/teleforma/htdocs/css/teleforma.css @@ -586,7 +586,7 @@ color:#FFF; border-bottom: 1px solid #000; height: 30px; padding: 0em 0.5em 10px 0.5em; - margin-top: 2.5em; + margin-top: 1em; } #footer :link, #footer :visited { color: #FFF; } #footer hr { display: none } diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html index 592496df..161dacb0 100644 --- a/teleforma/templates/teleforma/course_media.html +++ b/teleforma/templates/teleforma/course_media.html @@ -48,9 +48,17 @@ $(document).ready(function(){
{% dl_field item "title" placeholder %}
{% field_label item "approx_duration" %}
-
{{ item.approx_duration }}
-
{% trans "Recording date" %}
-
{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}
+
{{ item.approx_duration }}
+{% if media.conference %} +
{% trans "Begin date" %}
+
{{ media.conference.date_begin }}
+
{% trans "End date" %}
+
{{ media.conference.date_end }}
+{% endif %} +
{% trans "Date added" %}
+
{{ media.date_added }}
+
{% trans "Mime type" %}
+
{{ mime_type }}
{% endblock general_info %}