From 49637b4d6db949c633900d37bfd6842b925a8827 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 5 Jul 2012 17:47:25 +0200 Subject: [PATCH] add default grapher style, rm thumb refresh, fix colors, menus, --- example/settings.py | 2 +- teleforma/static/teleforma/css/teleforma.css | 4 +-- .../templates/teleforma/course_media.html | 2 +- teleforma/templates/teleforma/courses.html | 4 +-- .../teleforma/inc/conference_list.html | 10 ------- teleforma/templates/telemeta/base.html | 28 +++++++++---------- 6 files changed, 18 insertions(+), 32 deletions(-) diff --git a/example/settings.py b/example/settings.py index bb62f092..a58db1fa 100644 --- a/example/settings.py +++ b/example/settings.py @@ -169,7 +169,7 @@ TELEMETA_STREAMING_FORMATS = ('mp3', 'webm') TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'webm') TELEMETA_PUBLIC_ACCESS_PERIOD = 51 TELEMETA_DEFAULT_GRAPHER_SIZES = ['360x130', '640x130'] -TELEMETA_DEFAULT_GRAPHER_ID = 'waveform_joydiv' +TELEMETA_DEFAULT_GRAPHER_ID = 'waveform_contour_wh' AUTH_PROFILE_MODULE = 'telemeta.userprofile' LOGIN_URL = '/login/' diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css index 1a78b646..77a602ae 100644 --- a/teleforma/static/teleforma/css/teleforma.css +++ b/teleforma/static/teleforma/css/teleforma.css @@ -758,16 +758,14 @@ dl.dublincore dd.caption { color: #000000 !important; text-decoration: none; margin: 0; - background: #fff url(images/more.png) no-repeat left top; + background: transparent url(/static/telemeta/css/more.png) no-repeat left top; background-position: 0 -16px; padding-bottom: 2px; padding-left: 16px; border-bottom: none !important; outline: none; - background: transparent; } .extraInfos h4 a:hover { - background-color: transparent; border-bottom: none; color: #000000 !important; text-decoration:none; diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html index bf27a3da..00f99dea 100644 --- a/teleforma/templates/teleforma/course_media.html +++ b/teleforma/templates/teleforma/course_media.html @@ -42,7 +42,7 @@ $(document).ready(function(){ {% elif "audio" in mime_type %}
- +
{% endif %} diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html index f0f2d7bf..b0bc35f6 100644 --- a/teleforma/templates/teleforma/courses.html +++ b/teleforma/templates/teleforma/courses.html @@ -34,7 +34,7 @@ $(document).ready(function(){ {% block notes %} -
+ {% endblock notes %}
diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html index 1093aa84..2a49b277 100644 --- a/teleforma/templates/teleforma/inc/conference_list.html +++ b/teleforma/templates/teleforma/inc/conference_list.html @@ -30,16 +30,6 @@ {% if stream.streaming %} - {% endif %} {% else %} diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index b5986c74..33ffa20b 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -68,35 +68,33 @@ alt="logo" />