From 82841483296c37f6d5423618e35a776b7b5c30ca Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Tue, 19 Jun 2012 23:10:07 +0200
Subject: [PATCH] update media list

---
 teleforma/models.py                                   |  2 +-
 teleforma/static/teleforma/css/teleforma.css          |  2 +-
 .../templates/teleforma/inc/conference_list.html      | 11 +++++------
 teleforma/templates/teleforma/inc/media_list.html     |  9 ++++-----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/teleforma/models.py b/teleforma/models.py
index 1a854ff7..9bc49537 100755
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -186,7 +186,6 @@ class Conference(Model):
     comment         = CharField(_('comment'), max_length=255, blank=True)
     date_begin      = DateTimeField(_('begin date'), null=True, blank=True)
     date_end        = DateTimeField(_('end date'), null=True, blank=True)
-    streaming       = BooleanField(_('is live'))
     readers         = ManyToManyField(User, related_name="conference", verbose_name=_('readers'),
                                         blank=True, null=True)
 
@@ -246,6 +245,7 @@ class LiveStream(Model):
                                 verbose_name=_('streaming server'))
     stream_type = CharField(_('Streaming type'),
                             choices=streaming_choices, max_length=32)
+    streaming       = BooleanField(_('streaming'))
 
     @property
     def slug(self):
diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index 6969b4c6..01c0e0a1 100644
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1482,7 +1482,7 @@ input,textarea{
 .course_media {
     float: left;
     background-color: transparent;
-    margin: 0em 0em 2em 1em;
+    margin: 0em 0em 2em 2em;
     -moz-border-radius: 8px 0px 8px 8px;
     -webkit-border-radius: 8px 0px 8px 8px;
     border-radius: 8px 0px 8px 8px;
diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html
index 43819387..d336d2b7 100644
--- a/teleforma/templates/teleforma/inc/conference_list.html
+++ b/teleforma/templates/teleforma/inc/conference_list.html
@@ -9,12 +9,11 @@
     <table class="listing" width="100%">
     <tbody>
         {% for stream in course.livestream.all|from_course_type:type %}
-            <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
-            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %}><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 %}>{% if conference.professor.user %}<a href="{% url teleforma-profile-detail conference.professor.user.username %}" target="_blank">{{ conference.professor }}</a>{% endif %}</td>
-            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %}><a href="{% url teleforma-conference-detail conference.id %}">{{ conference.date_begin }}</a></td>
-            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %} align="center">
-                {% if conference.streaming %}
+            <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="35%">{{ stream.conference.date_begin }}</td>
+            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %} width="5%" align="center">
+                {% if stream.streaming %}
                 <img src="images/media-record.png" alt="yes" style="vertical-align:middle" />
                 {% endif %}
             </td>
diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index 268d6b8e..6fc2200c 100644
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -11,11 +11,10 @@
         {% for media in course.media.all|from_course_type:type %}
          {% if media.published or user.is_staff %}
             <tr>
-            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %}><a href="{% url teleforma-media-detail media.id %}" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/tool-animator.png" style="vertical-align:middle" alt="" /> {{ media.title }}</a></td>
-            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %}><a href="{% url teleforma-media-detail media.id %}">{{ media.conference.session }}</a></td>
-            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %}>{% if media.conference.professor.user %}<a href="{% url teleforma-profile-detail media.conference.professor.user.username %}" target="_blank">{{ media.conference.professor }}</a>{% endif %}</td>
-            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %}>{% if media.conference.date_begin %}<a href="{% url teleforma-media-detail media.id %}">{{ media.conference.date_begin }}</a>{% endif %}</td>
-            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %}>{{ media.item.approx_duration }}</td>
+            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %} width="40%"><a href="{% url teleforma-media-detail media.id %}" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/tool-animator.png" style="vertical-align:middle" alt="" /> {{ media.title }} - {{ media.conference.session }}</a></td>
+            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %} width="20%">{% if media.conference.professor.user %}<a href="{% url teleforma-profile-detail media.conference.professor.user.username %}" target="_blank">{{ media.conference.professor }}</a>{% endif %}</td>
+            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %} width="35%">{% if media.conference.date_begin %}{{ media.conference.date_begin }}{% endif %}</td>
+            <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %} width="5%"></td>
             </tr>
          {% endif %}
         {% endfor %}
-- 
2.39.5