Merge pull request #376 from CTPUG/bugs/mark_cancelled_talks_in_editor

Mark cancelled talks in the Schedule editor.
CTPUG · Sep 26, 2017 · 30d0a03 · 30d0a03
2 parents ea69629 + 424e585
commit 30d0a03
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/wafer/schedule/templates/wafer.schedule/edit_schedule.html b/wafer/schedule/templates/wafer.schedule/edit_schedule.html
@@ -69,7 +69,11 @@ <h1>Schedule Editor
                     </span>
                   </button>
                 {% endif %}
+                {% if venue.talk and venue.talk.cancelled %}
+                <del>{{ venue.title }} (Cancelled)</del>
+                {% else %}
                 {{ venue.title }}
+                {% endif %}
               </td>
             {% endfor %}
           </tr>
@@ -111,7 +115,11 @@ <h2>Bucket</h2>
                   id="talk{{ talk.talk_id }}"
                   data-toggle="tooltip" data-placement="left"
                   title="{{ talk.title }}" data-type="talk" data-talk-id="{{ talk.talk_id }}">
+              {% if not talk.cancelled %}
               {{ talk.title|truncatechars:24 }}
+              {% else %}
+              <del>{{ talk.title|truncatechars:12 }} (Cancelled)</del>
+              {% endif %}
             </span>
           {% endfor %}
         </div>
@@ -121,8 +129,12 @@ <h2>Bucket</h2>
             <span draggable="true" class="col-md-6 badge badge-warning draggable"
                   id="talk{{ talk.talk_id }}"
                   data-toggle="tooltip" data-placement="left"
-                  title="{{ talk.title }}" data-type="talk" data-talk-id="{{ talk.talk_id }}">
+                  title="{{ talk.title }} (Cancelled)" data-type="talk" data-talk-id="{{ talk.talk_id }}">
+              {% if not talk.cancelled %}
               {{ talk.title|truncatechars:24 }}
+              {% else %}
+              <del>{{ talk.title|truncatechars:12 }} (Cancelled)</del>
+              {% endif %}
             </span>
           {% endfor %}
         </div>