add default grapher style, rm thumb refresh, fix colors, menus,

diff --git a/example/settings.py b/example/settings.py
index bb62f092812a72bdef1ed3506b944893fa498bdb..a58db1faf990e126fa980289284a79808e22c629 100644 (file)
--- 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 1a78b646439e349b389dc707306c3874d6fd930b..77a602ae7b9a0b91b261aa76d9b0fe01d67f3e59 100644 (file)
--- 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 bf27a3dab5c57036a8ab62335153a69600cbe92a..00f99deaaababdcbe38e8cd476ac17afa8337cdb 100644 (file)
--- 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 %}
 <div class="audio">
-<iframe width='640' height='200' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src="{% url telemeta-item-player-simple  media.item.public_id 640 130 %}"></iframe>
+<iframe width='640' height='200' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src="{% url telemeta-item-player-contour  media.item.public_id 640 130 %}"></iframe>
 </div>
 {% endif %}
 

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index f0f2d7bf135aade4ef615c03e42f5967a15e2b10..b0bc35f617a16e7eca5c75ca4e335de4caab3e5e 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -34,7 +34,7 @@ $(document).ready(function(){
 </div>
 
 {% block notes %}
-<div class="module">
+<!--<div class="module">
 <h3><img src="{{ STATIC_URL }}telemeta/images/view-pim-notes.png" alt="playlists" style="vertical-align:middle" />{% trans "My notes" %}</h3>
 <div style="background: white;">
 <ul>
@@ -46,7 +46,7 @@ $(document).ready(function(){
 </div>
 <div class="module_action">
 <a href="#" class="component_icon button" id="action_violet">{% trans "New note" %}</a>
-</div>
+</div>-->
 {% endblock notes %}
 
 </div>

diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html
index 1093aa8460c67b635fcdde0e16f787ab4927334d..2a49b277edd1f7eaa36f66ae486a07cd7121c5e0 100644 (file)
--- a/teleforma/templates/teleforma/inc/conference_list.html
+++ b/teleforma/templates/teleforma/inc/conference_list.html
@@ -30,16 +30,6 @@
                 {% if stream.streaming %}
                 <img src="{{ STATIC_URL }}teleforma/images/network-wireless.png" style="vertical-align:middle" title="streaming" />
                 <img src="{{ STATIC_URL }}telemeta/images/media-record.png" style="vertical-align:middle" title="recording" />
-                <script type="text/javascript">
-                    function update_snapshots_callback_{{ stream.course.code }}_{{ stream.course_type }}() {
-                        var d = 3000;
-                        var refresh = function(){
-                        $("#snapshot-{{ stream.course.code }}-{{ stream.course_type }}").attr("src","{{ stream.snapshot_url }}");
-                        };
-                        setInterval(refresh,d);
-                    };
-                    update_snapshots_callback_{{ stream.course.code }}_{{ stream.course_type }}();
-                    </script>
               {% endif %}
             </td>
             {% else %}

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index b5986c743a1a83d44b2b813d8471eac364f88993..33ffa20b767e809a82ba08c7224a6bda10e05681 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -68,35 +68,33 @@ alt="logo" />
 <ul id="nav">
 
  {% if user.is_authenticated %}
- <li><a href="{% url teleforma-desk %}" class="violet">{% trans "Desk" %}</a>
+ <li><a href="{% url teleforma-desk %}" class="red">{% trans "Desk" %}</a>
  </li>
  {% else %}
-  <li><a href="{% url teleforma-login %}" class="violet">{% trans "Home" %}</a></li>
+  <li><a href="{% url teleforma-login %}" class="red">{% trans "Home" %}</a></li>
  {% endif %}
 
  {% if user.is_authenticated %}
 
- <li><a href="/messages" class="red">{% trans "Messaging" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}</a></li>
+ <li><a href="/messages" class="orange">{% trans "Messaging" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}</a></li>
 
- <li><a href="{% url teleforma-users %}" class="orange">{% trans "Users" %}</a></li>
+ {% if user.is_staff %}
+ <li><a href="{% url teleforma-users %}" class="yellow">{% trans "Users" %}</a></li>
+ {% endif %}
 
- <li><a href="{% url telemeta-search-criteria %}" class="yellow">{% trans "Search" %}</a></li>
 
- {% if user.is_staff %}
- <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
+ {% if user.is_authenticated %}
+  {% if user.is_staff %}
+   <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
  <ul>
+ <li><a href="{% url telemeta-search-criteria %}">{% trans "Search" %}</a></li>
  <li><a href="{% url telemeta-collections %}">{% trans "Collections" %}</a></li>
  <li><a href="{% url telemeta-items %}">{% trans "Items" %}</a></li>
  </ul>
  </li>
-
- {% else %}
-  <li><a href="{% url telemeta-flatpage "help" %}" class="green">{% trans "Help" %}</a></li>
- {% endif %}
-
- {% if user.is_authenticated %}
-  {% if user.is_staff %}
  <li><a href="{% url telemeta-admin-general %}" class="blue">{% trans "Admin" %}</a></li>
+  {% else %}
+   <li><a href="{% url telemeta-flatpage "help" %}" class="green">{% trans "Help" %}</a></li>
  {% endif %}
 
  <li style="a.active{background-image:{{ STATIC_URL }}telemeta/images/user_tr_bk.png; background-repeat: no-repeat;
@@ -106,7 +104,7 @@ alt="logo" />
  {{ user.username }}
  {% endif %}</a>
     <ul>
-    <li><a href="{% url telemeta-profile-detail user.username %}">{% trans "Profile" %}</a></li>
+    <li><a href="{% url telemeta-profile-detail user.username %}" class="yellow">{% trans "Profile" %}</a></li>
     {% if user.is_staff %}
     <li><a href="{% url telemeta-desk-lists %}">{% trans "Lists" %}</a></li>
     <li><a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a></li>