# HG changeset patch
# User Shantanu <shantanu@fossee.in>
# Date 1256122058 -19800
# Node ID 192ca2513f893de3d8b1b413ea1a3c7d329b8510
# Parent  aa68a264b036acf488ccd1e8eddeeb1415d5c93b
Added changes suggested by Vimal.

diff -r aa68a264b036 -r 192ca2513f89 template/home.html
--- a/template/home.html	Mon Oct 12 20:10:20 2009 +0530
+++ b/template/home.html	Wed Oct 21 16:17:38 2009 +0530
@@ -1,7 +1,33 @@
 {% extends "index.html" %}
 {% load i18n %}
-{% block siderbar %}  
-  
+{% block sidebar %}  
+ <div id="sidebar">
+		<ul>
+		   <li>
+		   <ul>   
+		     {% if user.is_authenticated %}
+		     <li>{{ user.username }}</li>
+		     <li><a href="logout" >{% trans "Logout" %}</a></li>
+		     {% else %}
+		     <form id="search" method="post" action=".">				
+					{{ form.as_p }}
+		     <input type="submit" value="login" />		     
+		     </form>
+		     <li><a href="/accounts/register">Register</a> </li>
+		     {% endif %}
+		     </ul>
+		   <li id="categories">
+				    <h2>Links</h2>
+				    <ul>
+					    <li><a href="http://scipy.in/#venue">Venue</a> </li>
+					    <li><a href="http://scipy.in/#theme">Theme</a> </li>
+					    <li><a href="http://scipy.in/#date">Dates</a> </li>
+					    <li><a href="http://scipy.in/#organizers">Organizers</a> </li>
+				    </ul>
+		   </li>
+		</ul>
+	</div>
+	<!-- end sidebar --> 
 {% endblock %}
 {% block centercontent %}
   <div class="post">
@@ -39,7 +65,7 @@
 				<h2><a name="venue">Venue</a></h2>
 			</div>
 			<div class="entry">
-				<p>This conference is organized by <a href="http://fossee.in">"Free/Open source Software in Science and Engineering Education" (FOSSEE)</a> project under the <a href="http://www.sakshat.ac.in/">National Mission on Education (NME)</a> through Information and Communication Technologies (ICT) jointly with <a href="http://fossee.in">SPACE-Kerala </a>. SPACE-Kerala is helping coordinate and organize the conference.<br />
+				<p>This conference is jointly organized by <a href="http://fossee.in">"Free/Open source Software in Science and Engineering Education" (FOSSEE)</a> project under the <a href="http://www.sakshat.ac.in/">National Mission on Education (NME)</a> through Information and Communication Technologies (ICT), <a href="http://space-kerala.org/">SPACE-Kerala </a>, <a href="http://www.itmission.kerala.gov.in/"> Kerala State IT Mission (KSITM)</a> and SIG-FOSS of CSI. SPACE-Kerala is helping coordinate and organize the conference.<br />
 The conference is proposed to be held at the Technopark in Trivandrum, keeping in mind accessibility, the number of attendees and the location, among other aspects to be considered.</p>
 			</div>
 	</div>
diff -r aa68a264b036 -r 192ca2513f89 template/index.html
--- a/template/index.html	Mon Oct 12 20:10:20 2009 +0530
+++ b/template/index.html	Wed Oct 21 16:17:38 2009 +0530
@@ -43,35 +43,9 @@
 <!-- end header -->
 <!-- start page -->
 <div id="page">	
-  <div id="sidebar">
-		<ul>
-		   <li>
-		   <ul>   
-		     {% if user.is_authenticated %}
-		     <li>{{ user.username }}</li>
-		     <li><a href="logout" >{% trans "Logout" %}</a></li>
-		     {% else %}
-		     <form id="search" method="post" action=".">				
-					{{ form.as_p }}
-		     <input type="submit" value="login" />		     
-		     </form>
-		     <li><a href="/accounts/register">Register</a> </li>
-		     {% endif %}
-		     </ul>
-		   <li id="categories">
-				    <h2>Links</h2>
-				    <ul>
-					    <li><a href="http://scipy.in/#venue">Venue</a> </li>
-					    <li><a href="http://scipy.in/#theme">Theme</a> </li>
-					    <li><a href="http://scipy.in/#date">Dates</a> </li>
-					    <li><a href="http://scipy.in/#organizers">Organizers</a> </li>
-				    </ul>
-		   </li>		
+  		
 		   {% block sidebar %}			
-		   {% endblock %}			  
-	 	</ul>
-	</div>
-	<!-- end sidebar --> 
+		   {% endblock %}	 	 
 	<!-- start content -->
 	<div id="content">		
 			{% block centercontent %}