From 530443c0ac5e7f2c1ac1a585f35af290e5bbcc67 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Fri, 13 Mar 2020 17:40:37 +0000
Subject: [PATCH] Made links from agenda room names to floorplans conditional
 on the room having a floor plan set.  - Legacy-Id: 17435

---
 ietf/templates/meeting/agenda.html | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 960ea2186..9e85116d2 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -203,8 +203,10 @@
                     {% if item.timeslot.show_location and item.timeslot.get_location %}
 		      {% if schedule.meeting.number|add:"0" < 96 %}
                       <a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|xslugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
-		      {% else %}
+                      {% elif item.timeslot.location.floorplan %}
 		      <a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}?room={{ item.timeslot.get_location|xslugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
+		      {% else %}
+                      {{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}
 		      {% endif %}
 		      {% with item.timeslot.location.floorplan as floor %}
 		      {% if item.timeslot.location.floorplan %}
@@ -263,8 +265,10 @@
 		      {% if item.timeslot.show_location and item.timeslot.get_location %}
 			{% if schedule.meeting.number|add:"0" < 96 %}
 			<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|xslugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
-			{% else %}
+                        {% elif item.timeslot.location.floorplan %}
 			<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}?room={{ item.timeslot.get_location|xslugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
+			{% else %}
+                        {{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}
 			{% endif %}
 		      {% endif %}
 		    </td>
@@ -282,8 +286,10 @@
                       {% if item.timeslot.show_location and item.timeslot.get_location %}
 			{% if schedule.meeting.number|add:"0" < 96 %}
 			<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/venue/?room={{ item.timeslot.get_location|xslugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
-			{% else %}
+                        {% elif item.timeslot.location.floorplan %}
 			<a href="{% url 'ietf.meeting.views.floor_plan' num=schedule.meeting.number %}?room={{ item.timeslot.get_location|xslugify }}">{{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}</a>
+                        {% else %}
+                        {{item.timeslot.get_location|split:"/"|join:"/<wbr>"}}
 			{% endif %}
                       {% endif %}
                     </td>