Topics in Benutzeransicht

static/css/style.css

@@ -137,6 +137,16 @@ th.rede-medium-text {
     background-color: #F44335;
 }
 
+.rede-table-bg-blue {
+    color: white;
+    background-color: #448AFF;
+    font-weight: bold;
+}
+
+.rede-table-centered > td {
+    text-align: center;
+}
+
 .rede-paused-title {
     margin: 0 auto;
 }

templates/speech_content_index.html

@@ -7,34 +7,39 @@
             </h4>
         </div>
     {% endif %}
-    {% if event.current_topic_id != -1 and event.get_current_topic() %}
-        <div class="mdl-card__title">
-            {{ event.name }}: {{ event.get_current_topic().name }}
-        </div>
-        <table class="mdl-data-table mdl-js-table" style="min-width: 100%">
-            <thead>
-                <tr>
-                    <th class="mdl-data-table__cell--non-numeric">Speaker</th>
-                    <th class="mdl-data-table__cell">Count</th>
+    <div class="mdl-card__title">
+        {{ event.name }}: {{ event.get_current_topic().name }}
+    </div>
+    <table class="mdl-data-table mdl-js-table" style="min-width: 100%">
+        <thead>
+            <tr>
+                <th class="mdl-data-table__cell--non-numeric">Speaker</th>
+                <th class="mdl-data-table__cell">Count</th>
+            </tr>
+        </thead>
+        <tbody>
+        {% for topic in event.topics %}
+            {% if topic.id == event.current_topic_id %}
+                <tr class="rede-table-bg-blue rede-table-centered">
+                    <td colspan="2">{{ topic.name }}</td>
                 </tr>
-            </thead>
-            <tbody>
-            {% for statement in event.get_current_topic().sorted_statements() %}
-                {% if statement.is_meta %}
-                <tr class="rede-table-bg-red">
-                {% else %}
-                <tr>
-                {% endif %}
-                    <td class="mdl-data-table__cell--non-numeric">{{ statement.speaker.identifier() }}</td>
-                    <td class="mdl-data-table__cell">{{ statement.speaker.count(event.get_current_topic()) }}</td>
+                {% for statement in event.get_current_topic().sorted_statements() %}
+                    {% if statement.is_meta %}
+                    <tr class="rede-table-bg-red">
+                    {% else %}
+                    <tr>
+                    {% endif %}
+                        <td class="mdl-data-table__cell--non-numeric">{{ statement.speaker.identifier() }}</td>
+                        <td class="mdl-data-table__cell">{{ statement.speaker.count(event.get_current_topic()) }}</td>
+                    </tr>
+                {% endfor %}
+            {% else %}
+                <tr class="rede-table-centered">
+                    <td colspan="2">{{ topic.name }}</td>
                 </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    {% else %}
-        <div class="mdl-card__title">
-            {{ event.name }}: No topic set
-        </div>
-    {% endif %}
+            {% endif %}
+        {% endfor %}
+        </tbody>
+    </table>
     </div>
 {% endfor %}