fix borders on listings

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index 29d1dbedbb8754e334929fad2515194abec353a0..09c12f0d7765741f64363a8a692f3bb222ebafd1 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -59,7 +59,7 @@ a img { border: none; }
 #content {
     /*margin-top: 1em;*/
     position: relative;
-    margin-left: 5%;
+    margin-left: 3%;
     margin-right: 2em;
     margin-bottom: 0em;
 }
@@ -846,6 +846,12 @@ table.listing th, table.listing thead, table.listing td {
     border-bottom: 1px solid #dfdfdf;
     font-weight: normal;
 }
+
+table.listing td.border-top {
+    border-top: 1px solid #dfdfdf;
+}
+
+
 table.listing thead { background: #fafafa; /*background: #e8eaf0*/ }
 table.listing thead th {
     font-size: 0.9em;
@@ -874,7 +880,7 @@ table.listing tbody td, table.listing tbody th {
     font-weight: normal;
 }
 table.listing tbody td {
-    padding: 0.5em 0em 0.5em 0.8em;
+    padding: 0.5em 0em 0.5em 0em;
     font-weight: normal;
     font-size: 0.9em;
 }
@@ -884,7 +890,7 @@ table.listing tbody td.tmp {
 table.listing tbody td a:hover, table.listing tbody th a:hover {
     background-color: transparent;
 }
-table.listing tbody tr { border-top: 1px solid #ddd }
+table.listing tbody tr { border-top: 1px solid #dfdfdf; }
 table.listing tbody tr.even { background-color: transparent }
 table.listing tbody tr.odd { background-color: transparent }
 table.listing tbody tr:hover { background: transparent !important }
@@ -1395,7 +1401,7 @@ input,textarea{
 .desk_center {
     float: left;
     width:52%;
-    padding: 0em 2em 0em 1em;
+    padding: 0em 2em 0em 2em;
     max-height: 550px;
     overflow-y: auto;
     }
@@ -1586,4 +1592,3 @@ input,textarea{
     font-size: 0.8125em;
     text-align: center;
     }
-

diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html
index f6864fa761d89acb2a337767aa094994b3e61460..43819387aaa956678c19d70907e3e2e3b2e9dd2e 100644 (file)
--- a/teleforma/templates/teleforma/inc/conference_list.html
+++ b/teleforma/templates/teleforma/inc/conference_list.html
@@ -10,10 +10,10 @@
     <tbody>
         {% for stream in course.livestream.all|from_course_type:type %}
             <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
-            <td><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 conference.professor.user %}<a href="{% url teleforma-profile-detail conference.professor.user.username %}" target="_blank">{{ conference.professor }}</a>{% endif %}</td>
-            <td><a href="{% url teleforma-conference-detail conference.id %}">{{ conference.date_begin }}</a></td>
-             <td align="center">
+            <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 %}
                 <img src="images/media-record.png" alt="yes" style="vertical-align:middle" />
                 {% endif %}

diff --git a/teleforma/templates/teleforma/inc/document_list.html b/teleforma/templates/teleforma/inc/document_list.html
index dd794cfa53bb5e6ab547010ba98de146a736d6ff..6da984695fffbc7ce89a38f93ebb4f4748d61add 100644 (file)
--- a/teleforma/templates/teleforma/inc/document_list.html
+++ b/teleforma/templates/teleforma/inc/document_list.html
@@ -14,14 +14,14 @@
     <tbody>
         {% for document in course.document.all|from_course_type:type|from_doc_type:doc_type %}
         <tr>
-        <td>{% if document.file %}<a href="{% url teleforma-document-view document.id %}" target="_blank" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" />{% endif %} {{ document.title }}{% if document.file %}</a>{% endif %}</td>
+        <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %}>{% if document.file %}<a href="{% url teleforma-document-view document.id %}" target="_blank" title="{% trans "View" %}"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" />{% endif %} {{ document.title }}{% if document.file %}</a>{% endif %}</td>
         <!--<td align="center">
         {% if document.is_annal %}
           <img src="images/ok.png" alt="yes" style="vertical-align:middle" />&nbsp;
         {% endif %}
         </td>-->
-        <td>{{ document.date_added }}</td>
-        <td align="center">{% if document.file %}<a href="{% url teleforma-document-download document.id %}"><img src="{% url telemeta-images "download.png" %}" width="16px"  style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a>{% endif %}</td>
+        <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %}>{{ document.date_added }}</td>
+        <td {% if forloop.counter0 == 0 %}class="border-top"{% endif %} align="center">{% if document.file %}<a href="{% url teleforma-document-download document.id %}"><img src="{% url telemeta-images "download.png" %}" width="16px"  style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a>{% endif %}</td>
         </tr>
     {% endfor %}
     </tbody>

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index 660f4b1d3b4bc3dbd55f5a596ebf300e7a1cfd9a..268d6b8e1bd0da04746694d2e26e12003023263b 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -11,11 +11,11 @@
         {% for media in course.media.all|from_course_type:type %}
          {% if media.published or user.is_staff %}
             <tr>
-            <td><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><a href="{% url teleforma-media-detail media.id %}">{{ media.conference.session }}</a></td>
-            <td>{% 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 media.conference.date_begin %}<a href="{% url teleforma-media-detail media.id %}">{{ media.conference.date_begin }}</a>{% endif %}</td>
-            <td>{{ media.item.approx_duration }}</td>
+            <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>
             </tr>
          {% endif %}
         {% endfor %}