From: yomguy <yomguy@parisson.com>
Date: Fri, 22 Jun 2012 09:05:04 +0000 (+0200)
Subject: fix live conference link, colors
X-Git-Tag: 0.6^2~25
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b3c0dda989d96ca873c8a97d0088e99543454149;p=teleforma.git

fix live conference link, colors
---

diff --git a/example/settings.py b/example/settings.py
index 1e366e89..15749e89 100644
--- a/example/settings.py
+++ b/example/settings.py
@@ -180,4 +180,4 @@ DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'
 
 POSTMAN_AUTO_MODERATE_AS=True
 
-FILE_PROTECTION_METHOD = 'xsendfile'
+#FILE_PROTECTION_METHOD = 'xsendfile'
diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index d0daff6f..17242070 100644
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1160,7 +1160,7 @@ a.image-link {
 
 #action_red {
 /*     background-color:  #bb1020; */
-    background-color: #bb0000;
+    background-color: #bd2c00;
     color: #FFF;
     padding:0.8em 0.8em 0.8em 0.8em;
     }
diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html
index d336d2b7..b0cb720f 100644
--- a/teleforma/templates/teleforma/inc/conference_list.html
+++ b/teleforma/templates/teleforma/inc/conference_list.html
@@ -10,7 +10,7 @@
     <tbody>
         {% for stream in course.livestream.all|from_course_type:type %}
             <tr>
-            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %} width="60%"><a href="{% url teleforma-conference-detail conference.id %}" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/network-wireless.png" style="vertical-align:middle" alt="" /> {{ stream.slug }}</a></td>
+            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %} width="60%"><a href="{% url teleforma-conference-detail stream.conference.id %}" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/network-wireless.png" style="vertical-align:middle" alt="" /> {{ stream.slug }}</a></td>
             <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %} width="35%">{{ stream.conference.date_begin }}</td>
             <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %} width="5%" align="center">
                 {% if stream.streaming %}