Merge branch 'docker' into tc202-dev

diff --cc teleforma/templates/teleforma/course_conference_audio.html
Simple merge

diff --cc teleforma/templates/teleforma/course_conference_record.html
Simple merge

diff --cc teleforma/templates/teleforma/course_detail.html
Simple merge

diff --cc teleforma/templates/teleforma/course_document.html
Simple merge

diff --cc teleforma/templates/teleforma/course_media.html
Simple merge

diff --cc teleforma/templates/teleforma/inc/conference_list.html
index 18d11badedbe9fc041a4303680bfb3423df917ec,583dae025b876dd5362af1a13091139cf06648d8..c5637236b15970ce3efe8f470e4b38d80e879eb0
--- 1/teleforma/templates/teleforma/inc/conference_list.html
--- 2/teleforma/templates/teleforma/inc/conference_list.html
+++ b/teleforma/templates/teleforma/inc/conference_list.html
@@@ -7,48 -7,47 +7,67 @@@
  <div class="course_subtitle">
      <h3><img src="/static/telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Live conferences"%}</h3>
  </div>
 -    <table class="listing" width="100%">
 +  <table class="listing" width="100%">
      <tbody>
-       {% for conference in conferences %}
-         {% if not conference.class_group or conference.class_group|class_group_allows_user:user %}
 -       {% for conference in conferences|from_period:period %}
 -        {% for stream in conference.livestream.all %}
 -         {% if stream.stream_type == 'webm' %}
++      {% for conference in conferences|from_period:period %}
++        {% if not conference.class_group or conference.class_group|class_group_allows_user:user %})
 +          {% for stream in conference.livestream.all %}
 +            {% if stream.stream_type == 'webm' %}
-               <tr>
+             <tr>
+             {% if stream.streaming %}
+             <td {% if forloop.first %}class="border-top"{% endif %} width="230px">
+                <a href="{% url 'teleforma-conference-detail' period.id stream.conference.id %}" title="{% trans "View" %}">
+                <img id="snapshot-{{ stream.course.code }}-{{ stream.course_type }}" src="{{ stream.snapshot_url }}" width="100%" alt="{% trans 'Click here' %}" />
+                </a>
+             </td>
+             <td {% if forloop.first %}class="border-top"{% endif %} width="60%" style="padding-left: 1em;">
+                 <div>
+                     <dl class="listing" style="font-size: 1.2em;">
+                     <dt>{% trans "Title" %}</dt><dd>{{ stream.conference.course.title }}</dd>
+                     <dt>{% trans "Session" %}</dt><dd>{{ stream.conference.session }}</dd>
+                     {% if stream.conference.professor.user.username %}
+                     <dt>{% trans "Professor" %}</dt><dd><a href="{% url 'telemeta-profile-detail' stream.conference.professor.user.username %}" target="_blank">{{ stream.conference.professor }}</a></dd>
+                     {% endif %}
+                     <dt>{% trans "Begin" %}</dt><dd>{{ stream.conference.date_begin }}</dd>
+                     </dl>
+                  </div>
+             </td>
+             <td {% if forloop.first %}class="border-top"{% endif %} width="10%" align="center">
                  {% if stream.streaming %}
 -                <img src="/static/teleforma/images/network-wireless.png" style="vertical-align:middle" title="streaming" />
 -                <img src="/static/telemeta/images/media-record.png" style="vertical-align:middle" title="recording" />
 -              {% endif %}
 -            </td>
 -            {% else %}
 -            <div style="padding-left: 1em;">
 -
 -            </div>
 -             {% endif %}
 -            </tr>
 +                    <td {% if forloop.first %}class="border-top"{% endif %} width="230px">
 +                        <a href="{% url teleforma-conference-detail period.id stream.conference.id %}" title="{% trans "View" %}">
 +                        <img id="snapshot-{{ stream.course.code }}-{{ stream.course_type }}" src="{{ stream.snapshot_url }}" width="100%" alt="{% trans 'Click here' %}" />
 +                        </a>
 +                    </td>
 +                    <td {% if forloop.first %}class="border-top"{% endif %} width="60%" style="padding-left: 1em;">
 +                        <div>
 +                            <dl class="listing" style="font-size: 1.2em;">
 +                            <dt>{% trans "Title" %}</dt><dd>{{ stream.conference.course.title }}</dd>
 +                            <dt>{% trans "Session" %}</dt><dd>{{ stream.conference.session }}</dd>
 +                            {% if stream.conference.professor.user.username %}
 +                              <dt>{% trans "Professor" %}</dt><dd><a href="{% url telemeta-profile-detail stream.conference.professor.user.username %}" target="_blank">{{ stream.conference.professor }}</a></dd>
 +                            {% endif %}
 +                            <dt>{% trans "Begin" %}</dt><dd>{{ stream.conference.date_begin }}</dd>
 +                            </dl>
 +                        </div>
 +                    </td>
 +                    <td {% if forloop.first %}class="border-top"{% endif %} width="10%" align="center">
 +                        {% if stream.streaming %}
 +                            <img src="/static/teleforma/images/network-wireless.png" style="vertical-align:middle" title="streaming" />
 +                            <img src="/static/telemeta/images/media-record.png" style="vertical-align:middle" title="recording" />
 +                        {% endif %}
 +                    </td>
 +                {% else %}
 +                    <div style="padding-left: 1em;">
 +                    </div>
 +                {% endif %}
 +              </tr>
              {% endif %}
 -        {% endfor %}
 -        {% endfor %}
 +          {% endfor %}
 +        {% endif %}
 +      {% endfor %}
      </tbody>
 -    </table>
 +  </table>
  </div>
  {% endif %}
  {% endwith %}

diff --cc teleforma/templates/telemeta/base.html
Simple merge