update media list

diff --git a/teleforma/models.py b/teleforma/models.py
index 1a854ff7e3bcec9167942a3709f382b5059ee59c..9bc49537dc34dd9a50a9061b5c54a2af7307f9f9 100755 (executable)
--- 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 6969b4c6a49f478b46194a99f4e298d98a51dc53..01c0e0a1ed7693bc5ff339e14e4edd86b7c702e1 100644 (file)
--- 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 43819387aaa956678c19d70907e3e2e3b2e9dd2e..d336d2b7c34890a4390e17f2e5241981d8229a10 100644 (file)
--- 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 268d6b8e1bd0da04746694d2e26e12003023263b..6fc2200c5b38107d98af1c116f4e3a17491ee6f7 100644 (file)
--- 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 %}