--- a/templates/index.html	Tue Apr 13 14:29:00 2010 +0530
+++ b/templates/index.html	Tue Apr 13 14:50:48 2010 +0530
@@ -1,8 +1,14 @@
 {% extends "base.html" %}
 {% block content %}
+	{% if not user.is_authenticated %}
+		Welcome Guest.<br />
+		<br />
+		You can know about workshops by clicking on workshops link on the left.<br />		
+	{% else %}
+		Welcome {{user.get_full_name}}<br />
+		<br />Workshops you have registered for:
+	{% endif %}
 	{% if user.is_staff %}
 		<a href="/reg/event/create">Create an event</a><br />	
 	{% endif %}
-	<a href="/reg/event/list">List of Workshops</a> 
-
 {% endblock %}

--- a/templates/view_event.html	Tue Apr 13 14:29:00 2010 +0530
+++ b/templates/view_event.html	Tue Apr 13 14:50:48 2010 +0530
@@ -1,16 +1,22 @@
 {% extends "base.html" %}
 {% block content %}
-	<h3>{{ event.title }}</h3><br />
-	Description:<br />
-	{{event.description|linebreaksbr}}<br />
-	duration of the workshop: {{event.start_date|date:"d M Y"}} to {{event.stop_date|date:"d M Y"}}<br />
+	<h3>{{ event.title }}</h3>
+	<b>Description:</b><br />
+	{{event.description|linebreaksbr}}<br /><br />
+	<b>Duration:</b> {{event.start_date|date:"d M Y"}} to {{event.stop_date|date:"d M Y"}}<br /><br />
 	
-	{% if not is_guest and event.registration_is_open %}
-		{% if is_attendee %}
-			You have registered for this workshop.
+	{% if user.is_authenticated %}
+		{% if event.registration_is_open %}
+			{% if is_attendee %}
+				You have registered for this workshop.
+			{% else %}
+				<a href="/reg/event/register/{{event.key}}">Register for the workshop.</a><br />
+			{% endif %}	
 		{% else %}
-			<a href="/reg/event/register/{{event.key}}">Click here</a> to register for the workshop.<br />
+			Registration for this workshop is not open at this moment.
 		{% endif %}
+	{% else %}
+		You must be a registered user to register for this workshop.
 	{% endif %}
 	
 	{% if can_submit_feedback %}
@@ -19,24 +25,26 @@
 	
 	{% if is_org %}
 		<a href="/reg/event/attendees/{{event.key}}">Click here</a> to view list of people registered for the workshop. <br />
-		{% if event.registration_is_open %}
-			<a href="/reg/event/registration/close/{{event.key}}">Click here</a> to close the registration.<br />
-		{% else %}
-			<a href="/reg/event/registration/open/{{event.key}}">Click here</a> to open the registration.<br />
+		{% if user.is_staff %}
+			{% if event.registration_is_open %}
+				<a href="/reg/event/registration/close/{{event.key}}">Click here</a> to close the registration.<br />
+			{% else %}
+				<a href="/reg/event/registration/open/{{event.key}}">Click here</a> to open the registration.<br />
+			{% endif %}
+			
+			{% ifequal event.quiz_status "00" %}
+				<a href="/reg/event/quiz/open/{{event.key}}">Click here</a> to open quiz.<br />
+			{% else %}
+				<a href="/reg/event/registration/close/{{event.key}}">Click here</a> to close the registration.<br />
+			{% endifequal %}
+			
+			{% ifequal event.feedback_status "0" %}
+				<a href="/reg/event/feedback/open/{{event.key}}">Click here</a> to open the feedback.<br />
+			{% else %}
+				<a href="/feedback/list/{{event.key}}">Click here</a> to see the feedbacks that we submitted.<br />
+				<a href="/reg/event/feedback/close/{{event.key}}">Click here</a> to close the feedback for day {{event.feedback_status}}.<br />
+			{% endifequal %}
 		{% endif %}
-		
-		{% ifequal event.quiz_status "00" %}
-			<a href="/reg/event/quiz/open/{{event.key}}">Click here</a> to open quiz.<br />
-		{% else %}
-			<a href="/reg/event/registration/close/{{event.key}}">Click here</a> to close the registration.<br />
-		{% endifequal %}
-		
-		{% ifequal event.feedback_status "0" %}
-			<a href="/reg/event/feedback/open/{{event.key}}">Click here</a> to open the feedback.<br />
-		{% else %}
-			<a href="/feedback/list/{{event.key}}">Click here</a> to see the feedbacks that we submitted.<br />
-			<a href="/reg/event/feedback/close/{{event.key}}">Click here</a> to close the feedback for day {{event.feedback_status}}.<br />
-		{% endifequal %}
 	{% endif %}
 	
 {% endblock %}