Commits

Anonymous committed a1d7703 Merge

merged

  • Participants
  • Parent commits 10c2ee6, d3c32ec

Comments (0)

Files changed (3)

File sitemedia/css/style.css

     border-bottom: #aaaaaa solid 1px;
     height: 4em;
 }
+
+table.schedule tr td.talk {
+    border: #aaaaaa solid 1px;
+    width: 31%;
+}

File templates/web/displayschedule.html

             {% if hall %}
               {% ifnotequal hall 1 %}
                 {% for item, num_slots in hall %}
-                  <td style="background: {% if item.talk.get_colour %}{{ item.talk.get_colour }} {% else %} #CCCCCC {% endif %};" rowspan="{{ num_slots }}">
+                  <td class="talk" style="background: {% if item.talk.get_colour %}{{ item.talk.get_colour }} {% else %} #CCCCCC {% endif %};" rowspan="{{ num_slots }}">
                 <a href= "{% url talk_by_id id=item.talk.id %}">
                   {{ item.talk.title }}
                 </a>
                 by
               {% for spk in item.talk.speaker.all %}
-                <a  class ="name" href="{% url delegate_by_id id=spk.id %}">
-                  {{ spk.username.get_full_name }}
-                </a>
+                <a  class ="name" href="{% url delegate_by_id id=spk.id %}">{{ spk.username.get_full_name }}</a>{% if forloop.revcounter0 %}, {% endif %}
               {% endfor %}
              </td>
           {% endfor %}

File templates/web/talkfull.html

             </a>
         </div>
     {% if p %}
-    <table width = "auto" cellpadding="5" cellspacing="0" border="0" style="text-align: center;">
+    <table width = "auto" cellpadding="5" cellspacing="0" border="0" style="text-align: center;  clear:both;">
             <tr>
                 <th>
                 {% trans "Talk" %}