Merge lp:~cjohnston/summit/661430 into lp:summit

[Chris Johnston]

[Dave Walker (davewalker)]

This does cover it, but has been superseeded by mhall's branch where he has based his branch on this merge proposal.

Thanks!

=== modified file 'summit/schedule/templates/schedule/schedule_list.html'
--- summit/schedule/templates/schedule/schedule_list.html	2010-09-21 01:35:53 +0000
+++ summit/schedule/templates/schedule/schedule_list.html	2010-10-16 14:31:44 +0000
@@ -22,13 +22,21 @@
 <td>
 By room:
 <ul>
-  {% for room in summit.public_rooms %}
-  {% if room.track %}
-  <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.track.title }} - {{ room.title }}</a></li>
-  {% else %}
-  <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a></li>
-  {% endif %}
-  {% endfor %}
+    {% for room in summit.public_rooms %}
+        {% if schedule.edit %}
+            {% if room.track %}
+                <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.track.title }} - {{ room.title }}</a> ({{ room.size }})</li>
+            {% else %}
+                <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a> ({{ room.size }})</li>
+            {% endif %}
+        {% else %}
+            {% if room.track %}
+                <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.track.title }} - {{ room.title }}</a></li>
+            {% else %}
+                <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a></li>
+            {% endif %}
+        {% endif %}
+    {% endfor %}
 </ul>
 </td>
 </tr>