# HG changeset patch
# User nishanth
# Date 1279118803 -19800
# Node ID 911b9d0ea1057d543d7b6f46f7c7afcb659be01e
# Parent  1f0be76a18fc319d683da299fe61e6bc46f19173# Parent  c62a1f9ef60940777aeea055b59a7de405e65d84
merged

diff -r 1f0be76a18fc -r 911b9d0ea105 sdi/views.py
--- a/sdi/views.py	Wed Jul 14 20:15:39 2010 +0530
+++ b/sdi/views.py	Wed Jul 14 20:16:43 2010 +0530
@@ -164,7 +164,7 @@
 	return render_to_response("organizers.html")
 
 def venue(request):
-	return render_to_response("venue.html")
+	return render_to_response("about_venue.html")
 
 def contact(request):
 	return render_to_response("contact.html")
@@ -175,9 +175,6 @@
 def accomodation(request):
 	return render_to_response("accomodation.html")
 
-def about_venue(request):
-    return render_to_response("about_venue.html")
-
 def about_mumbai(request):
     return render_to_response("about_mumbai.html")
 
diff -r 1f0be76a18fc -r 911b9d0ea105 templates/about_mumbai.html
--- a/templates/about_mumbai.html	Wed Jul 14 20:15:39 2010 +0530
+++ b/templates/about_mumbai.html	Wed Jul 14 20:16:43 2010 +0530
@@ -5,7 +5,7 @@
 {% block content %}
 <h2>About Venue</h2>
 
-<p><a href="/sage_days/about_venue">The Venue : IIT Bombay</a> | The City : Mumbai | <a href="/sage_days/reaching_iitb">How to reach IIT Bombay?</a></p>
+<p><a href="/sage_days/venue">Venue : IIT Bombay</a> | City : Mumbai | <a href="/sage_days/reaching_iitb">How to reach IIT Bombay?</a></p>
 
 <h1>The City : Mumbai</h1>
 <p>Mumbai previously called Bombay , etymologically derived from Mumba or Maha-Amba—the name of the Koli goddess Mumbadevi after which the city was derived . The previous name Bombay comes from Portuguese Bom meaning good and English bay .The transformation of the city from a fishermen's colony to a trading centre came when it came under the British Empire as a dowry gift from the Portuguese Catherine of Braganza to Charles the second.</p>
diff -r 1f0be76a18fc -r 911b9d0ea105 templates/about_venue.html
--- a/templates/about_venue.html	Wed Jul 14 20:15:39 2010 +0530
+++ b/templates/about_venue.html	Wed Jul 14 20:16:43 2010 +0530
@@ -1,11 +1,13 @@
 {% extends 'base.html' %}
 {% block title %}
-About Venue
+Venue
 {% endblock %}
 {% block content %}
-<h2>About Venue</h2>
+<h2>Venue</h2>
 
-<p>The Venue : IIT Bombay | <a href="/sage_days/about_mumbai">The City : Mumbai</a> | <a href="/sage_days/reaching_iitb">How to reach IIT Bombay?</a></p>
+<p>Venue : IIT Bombay | <a href="/sage_days/about_mumbai">City : Mumbai</a> | <a href="/sage_days/reaching_iitb">How to reach IIT Bombay?</a></p>
+
+<p>IIT Bombay, Mumbai, India.</p>
 
 <div class="section" id="the-venue-iit-bombay">
 <h1>The Venue : IIT Bombay</h1>
diff -r 1f0be76a18fc -r 911b9d0ea105 templates/base.html
--- a/templates/base.html	Wed Jul 14 20:15:39 2010 +0530
+++ b/templates/base.html	Wed Jul 14 20:16:43 2010 +0530
@@ -878,8 +878,6 @@
 <!--<li class="leaf"><a href="/sage_days/speakers" title="">Speakers</a></li>-->
 <li class="leaf"><a href="/sage_days/organizers" 
 title="Conference Organizers">Organizers</a></li>
-<li class="leaf"><a href="/sage_days/venue" 
-title="Venue">Venue</a></li>
 <li class="leaf"><a href="http://wiki.sagemath.org/daysindia25" title="">Sage Days Wiki</a></li>
 <!--<li class="leaf last"><a -->
 <!--href="http://www.fossee.in" -->
@@ -895,7 +893,7 @@
   <div class="content"><ul class="menu">
 <li class="leaf"><a href="/sage_days/accomodation" 
 title="Accomodation">Accomodation</a></li>
-<li class="leaf first"><a href="/sage_days/about_venue" title="">The Venue</a></li>
+<li class="leaf first"><a href="/sage_days/venue" title="">Venue</a></li>
 <!--<li class="leaf"><a href="/sage_days/speakers" title="">Speakers</a></li>-->
 <!--<li class="leaf"><a href="/sage_days/reaching_venue" -->
 <!--title="Conference Organizers">Reaching the Venue</a></li>-->
diff -r 1f0be76a18fc -r 911b9d0ea105 templates/reaching_iitb.html
--- a/templates/reaching_iitb.html	Wed Jul 14 20:15:39 2010 +0530
+++ b/templates/reaching_iitb.html	Wed Jul 14 20:16:43 2010 +0530
@@ -5,7 +5,7 @@
 {% block content %}
 <h2>About Venue</h2>
 
-<p><a href="/sage_days/about_venue">The Venue : IIT Bombay</a> | <a href="/sage_days/about_mumbai">The City : Mumbai</a> | How to reach IIT Bombay?</p>
+<p><a href="/sage_days/venue">Venue : IIT Bombay</a> | <a href="/sage_days/about_mumbai">City : Mumbai</a> | How to reach IIT Bombay?</p>
 
 <div class="section" id="how-to-reach-iit-bombay">
 <h1>How to reach IIT Bombay?</h1>
diff -r 1f0be76a18fc -r 911b9d0ea105 templates/venue.html
--- a/templates/venue.html	Wed Jul 14 20:15:39 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-{% extends 'base.html' %}
-{% block title %}
-Venue
-{% endblock %}
-{% block content %}
-<h2>Venue</h2>
-<p>IIT Bombay, Mumbai, India.</p>
-{% endblock %}
diff -r 1f0be76a18fc -r 911b9d0ea105 urls.py
--- a/urls.py	Wed Jul 14 20:15:39 2010 +0530
+++ b/urls.py	Wed Jul 14 20:16:43 2010 +0530
@@ -4,7 +4,7 @@
 from django.contrib import admin
 admin.autodiscover()
 
-from sage_days.sdi.views import register, homepage, schedule, organizers, venue, contact, about, accomodation, about_venue, about_mumbai, reaching_iitb
+from sage_days.sdi.views import register, homepage, schedule, organizers, venue, contact, about, accomodation, about_mumbai, reaching_iitb
 from sage_days.settings import APACHE_URL_PREFIX as aup
 
 urlpatterns = patterns('',
@@ -26,7 +26,6 @@
     (r'^accomodation/',accomodation),
     (r'^registration/', include('sage_days.sdi.site.urls')),
     (r'^captcha/', include('captcha.urls')),
-    (r'^about_venue/',about_venue),
     (r'^about_mumbai/',about_mumbai),
     (r'^reaching_iitb/',reaching_iitb),
 )