From a19bceaa961c8001cb5aea7a2ab93c0ccd684b35 Mon Sep 17 00:00:00 2001
From: jamesthoughton <jamesthoughton@gmail.com>
Date: Tue, 3 May 2016 01:04:38 -0400
Subject: [PATCH] Add necessary conditionals to prevent overlap

---
 intranet/templates/eighth/signup_widget.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intranet/templates/eighth/signup_widget.html b/intranet/templates/eighth/signup_widget.html
index 510aecf420e..5093bc26ff1 100644
--- a/intranet/templates/eighth/signup_widget.html
+++ b/intranet/templates/eighth/signup_widget.html
@@ -59,7 +59,7 @@ <h2>
                     <span class="block-signup{% if block.is_today %} today{% endif %}" title="{% if block.current_signup_cancelled %}The activity you signed up for was cancelled. Click to change.{% else %}You {% if block.current_signup_sticky %}are stuck to this activity. Questions? Ask 8th Pd. Office{% else %}have signed up for this activity. Click to change.{% endif %}{% endif %}">
                         {{ block.current_signup }}
                     </span>
-                    {% if block.rooms and block != last_displayed_block %}
+                    {% if block.rooms and block != last_displayed_block and not block.is_today and not block.current_signup_cancelled %}
                         <span class="block-rooms">
                             {% for r in block.rooms %}
                                 {{ r.formatted_name }}{% if r != block.rooms.last %}, {% endif %}