--- a/templates/view_event.html	Thu Apr 15 19:00:23 2010 +0530
+++ b/templates/view_event.html	Thu Apr 15 19:19:08 2010 +0530
@@ -5,19 +5,17 @@
 	{{event.description|linebreaksbr}}<br /><br />
 	<b>Duration:</b> {{event.start_date|date:"d M Y"}} to {{event.stop_date|date:"d M Y"}}<br />
 	<b>Venue:</b> {{event.venue}} <br /><br />
-	
-	{% if user.is_authenticated %}
-		{% if event.registration_is_open %}
-			{% if is_attendee %}
-				You have registered for this workshop.<br />
-			{% else %}
+
+	{% if event.registration_is_open %}	
+		{% if user.is_authenticated %}
+			{% if not is_attendee %}
 				<a href="/reg/event/register/{{event.key}}">Register for this workshop.</a><br />
 			{% endif %}	
 		{% else %}
-			Registration for this workshop is not open at this moment.<br />
+			<a href="/reg/register/{{event.key}}">Register for this workshop</a>.<br />
 		{% endif %}
 	{% else %}
-		<a href="/reg/register/{{event.key}}">Register for this workshop</a>.<br />
+		Registration for this workshop is not open at this moment.<br />
 	{% endif %}
 	
 	{% if can_submit_feedback %}