connected some pages together

rahulkgupta · Nov 5, 2012 · e4af8e1 · e4af8e1
1 parent 13f6400
commit e4af8e1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/spatula/urls.py b/spatula/urls.py
@@ -9,14 +9,17 @@
     url(r'^$', 'spatula.views.home', name='home'),
     url(r'^search', 'spatula.views.search'),
     url(r'^timeline$', 'spatula.views.timeline'),
+    url(r'^timeline2$', 'spatula.views.timeline2'),
     url(r'^step2$', 'spatula.views.step2'),
     url(r'^step3$', 'spatula.views.step3'),
     url(r'^step4$', 'spatula.views.step4'),
     url(r'^step5$', 'spatula.views.step5'),
     url(r'^mozarella$', 'spatula.views.mozarella'),
     url(r'^mozarella2$', 'spatula.views.mozarella2'),
     url(r'^summary$', 'spatula.views.summary'),
-    url(r'^summary2$', 'spatula.views.summary2')
+    url(r'^summary2$', 'spatula.views.summary2'),
+    url(r'^topbar$', 'spatula.views.topbar')
+
 
 
     # url(r'^spatula/', include('spatula.foo.urls')),

diff --git a/spatula/views.py b/spatula/views.py
@@ -40,6 +40,10 @@ def summary2(request):
     return render_to_response('summary2.html', {},context_instance=RequestContext(request)
 )
 
+def topbar(request):
+    return render_to_response('topbar.html', {},context_instance=RequestContext(request)
+                              )
+
 def search(request):
     search = request.GET['query']
     return render_to_response('step4.html', {},context_instance=RequestContext(request))

diff --git a/templates/step3.html b/templates/step3.html
@@ -145,7 +145,7 @@ <h2>Let's cook the following for
 				<div class="row-fluid" style="margin-top:50px;text-align:center;">
 					<div class="span4 fade-in one">
 						<img src="{{ STATIC_URL }}img/st-andrews.png">
-						<a href="/" class="btn btn-large btn fade" type="button" style="margin-top:-90px;">Add Recipe List</a>
+						<a href="summary" class="btn btn-large btn fade" type="button" style="margin-top:-90px;">Add Recipe List</a>
 					</div>
 					<div class="span4 fade-in two">
 						<img src="{{ STATIC_URL }}img/tiger.png">

diff --git a/templates/step5.html b/templates/step5.html
@@ -89,7 +89,7 @@
               <form name="input" class="navbar-search" action="search" method="get">
                 <input type="text" class="search-query" name="query" placeholder="Search">
               </form>
-              <li><a href="#kitchen">Kitchen</a></li>
+              <li><a href="summary2">Summary</a></li>
               <li><a href="#account">Joe</a></li>
             </ul>
           </div><!--/.nav-collapse -->

diff --git a/templates/summary.html b/templates/summary.html
@@ -175,7 +175,7 @@
 
 				<div class="row-fluid" style="text-align:left;">
 
-					<button class="btn btn-large btn-success span3" type="button">Start Cooking</button>
+					<a href="timeline" <button class="btn btn-large btn-success span3" type="button">Start Cooking</button></a>
 					<div class="btn-group pull-right">
 					  <button class="btn btn-large active"><i class="icon-list"></i> Information</button>
 					  <button class="btn btn-large"><i class="icon-calendar"></i> Timeline</button>