Commits

Anonymous committed daf1500 Merge

merged

Comments (0)

Files changed (1)

templates/web/displayschedule.html

     {% for conf_day,day in schedule_data %}
       <h3>Schedule on {{ conf_day.confdate|date:"d F,Y" }}</h3>
       <table style="border: #000 solid 1px; text-align: center;">
-	<tr>
+    <tr>
           <th>
-	    Time
+        Time
           </th>
           {% for hall in halls %}
             <th>
-	      <a href="{% url hall_day_schedule day=conf_day.id,hall=hall.id %}">
-	        {{ hall.name }}
-	      </a>
+          <a href="{% url hall_day_schedule day=conf_day.id,hall=hall.id %}">
+            {{ hall.name }}
+          </a>
             </th>
           {% endfor %}
         </tr>
-	  {% for time_int,time_slot in day %}
+      {% for time_int,time_slot in day %}
            <tr>
-	     <td valign="top">{{ time_int }}</td>	   
-	      {% for hall in time_slot %}
-	        {% if hall %}
-	          {% ifnotequal hall 1 %}
-	            {% for item, num_slots in hall %}
-	              <td style="background: {% if item.talk.get_colour %}{{ item.talk.get_colour }} {% else %} #FFFFFFF {% endif %};" rowspan="{{ num_slots }}">
-		        <a href= "{% url talk_by_id id=item.talk.id %}">
-		          {{ item.talk.title }}
-		        </a>
-		      {% for spk in item.talk.speaker.all %}
-		        <a  class ="name" href="{% url delegate_by_id id=spk.id %}">
-		          {{ spk.username.get_full_name }}
-		        </a>
-		      {% endfor %}
-		     </td>
-		  {% endfor %}
+         <td valign="top">{{ time_int }}</td>      
+          {% for hall in time_slot %}
+            {% if hall %}
+              {% ifnotequal hall 1 %}
+                {% for item, num_slots in hall %}
+                  <td style="background: {% if item.talk.get_colour %}{{ item.talk.get_colour }} {% else %} #FFFFFFF {% 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>
+              {% endfor %}
+             </td>
+          {% endfor %}
                 {% endifnotequal %}
-	      {% else %}
-	        <td></td>
-	      {% endif %}
-	    {% endfor %}
+          {% else %}
+            <td></td>
+          {% endif %}
+        {% endfor %}
           </tr>
         {% endfor %}
       </table>