no message

ox-it · Apr 29, 2016 · 6b3d5b7 · 6b3d5b7
1 parent e1c7e27
commit 6b3d5b7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/talks/templates/events/event-group.html b/talks/templates/events/event-group.html
@@ -51,11 +51,6 @@ <h3 class="panel-title contains-floating-buttons">
                 {% endif %}
             </div>
         </h3>
-        {% if editors %}
-            Editor{{ editors|pluralize }}: {% for editor in editors %}
-              {{ editor.username }}{% if not forloop.last %}, {% endif %}
-            {% endfor %}
-        {% endif %}
     </div>
     {% if event_group.description %}
     <div class="panel-body">
@@ -90,6 +85,12 @@ <h3 class="panel-title contains-floating-buttons">
     {% else %}
       <strong>Only showing upcoming talks   </strong><a class="btn btn-default navbar-btn" href="{% url 'show-event-group' event_group.slug %}?show_all=true">Show all talks in this series</a>
     {% endif %}
+    {% if editors %}
+        <p>Editor{{ editors|pluralize }}: {% for editor in editors %}
+          {{ editor.first_name }} {{ editor.last_name }}{% if not forloop.last %}, {% endif %}
+        {% endfor %}</p>
+    {% endif %}
+
   </div>
 </div>
 

diff --git a/talks/templates/events/event-group.txt.html b/talks/templates/events/event-group.txt.html
@@ -19,11 +19,6 @@
 
 <br>{{ event_group.title }}
 <br>
-{% if editors %}
-    Editor{{ editors|pluralize }}: {% for editor in editors %}
-      {{ editor.username }}{% if not forloop.last %}, {% endif %}
-    {% endfor %}
-{% endif %}
 {% if event_group.description %}
     <br>{{ event_group.description_html | safe | striptags | linebreaksbr }}
 {% else %}
@@ -58,6 +53,11 @@
       <br>No upcoming talks to display for this series.
   {% endif %}
 {% endif %}
+{% if editors %}
+    <br>Editor{{ editors|pluralize }}: {% for editor in editors %}
+      {{ editor.first_name }} {{ editor.last_name }}{% if not forloop.last %}, {% endif %}
+    {% endfor %}
+{% endif %}
 
 <br>
 {% endblock %}
diff --git a/talks/templates/events/event.html b/talks/templates/events/event.html
@@ -95,13 +95,6 @@ <h3 class="panel-title contains-floating-buttons event">
           {% endif %} 
         {% endif %}
 
-        {% if editors %}
-            <div class="editors">
-              Editor{{ editors|pluralize }}: {% for editor in editors %}
-                {{ editor.username }}{% if not forloop.last %}, {% endif %}
-              {% endfor %}
-            </div>
-        {% endif %}
 
         {% if event.special_message %}
         <br>
@@ -186,6 +179,13 @@ <h3 class="panel-title contains-floating-buttons event">
                 </ul>
             </li>
         {% endif %}
+        {% if editors %}
+            <li class="list-group-item">
+              Editor{{ editors|pluralize }}: {% for editor in editors %}
+              {{ editor.first_name }} {{ editor.last_name }}{% if not forloop.last %}, {% endif %}
+              {% endfor %}
+            </li>
+        {% endif %}
 
     </ul>
 </div>

diff --git a/talks/templates/events/event.txt.html b/talks/templates/events/event.txt.html
@@ -20,11 +20,6 @@
 {% if not event.is_published %}
     <br>Status: This talk is in preparation - details may change
 {% endif %} 
-{% if editors %}
-    <br>Editor{{ editors|pluralize }}: {% for editor in editors %}
-      {{ editor.username }}{% if not forloop.last %}, {% endif %}
-    {% endfor %}
-{% endif %}
 
 {% if event.special_message %}
     <br>{{ event.special_message }}
@@ -116,4 +111,9 @@
 <br>Audience: 
 {{ event.get_audience_display }}
 
+{% if editors %}
+    <br>Editor{{ editors|pluralize }}: {% for editor in editors %}
+      {{ editor.first_name }} {{ editor.last_name }}{% if not forloop.last %}, {% endif %}
+    {% endfor %}
+{% endif %}
 {% endblock %}