From: Kriti Godey <kriti.godey@gmail.com>
Date: Fri, 5 Mar 2010 21:17:34 +0000 (-0500)
Subject: Added a custom context processor (to pass in the context required for the sidebar... 
X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/commitdiff_plain/df689da172dfd36fe2512833a5c7c07ad5cb6446

Added a custom context processor (to pass in the context required for the sidebar), and made image display depend on whether an image actually existed.
---

diff --git a/templates/allsandwiches.html b/templates/allsandwiches.html
index 4877263..24f15b7 100644
--- a/templates/allsandwiches.html
+++ b/templates/allsandwiches.html
@@ -5,7 +5,9 @@
 		{% for s in allsandwiches %}
 			<h3 class="sandwichtitle">{{ s.adjective }}</h3>
 			<p class="metadata">Made on {{ s.date_made }} and added by {{ s.user.username }}.</p>
-			<img class="sandwichimg" src="{{ s.picture.url }}">
+			{% if s.picture %}
+				<img class="sandwichimg" src="{{ s.picture.url }}">
+			{% endif %}
 			<h4 class="sandwichsub">Ingredients</h4>
 			<ul class="ingredients">
 				{% for i in s.ingredients.all %}
diff --git a/templates/base.html b/templates/base.html
index b12c087..56fab48 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -9,7 +9,7 @@
 				<h1 class="header">Ma'ayanwich Tracker</h1>
 			</div>
 			<div id="sidebar">
-				<h3 class="navtitle">ACCOUNT</h3>
+				<h3 class="navtitle">Account</h3>
 				<ul class="nav">
 					{% if user.is_authenticated %}
 						<li><a href="http://127.0.0.1:8000/sandwich/add/" class="navlink">Add sandwich</a></li>
@@ -19,13 +19,13 @@
 						<li><a href="http://127.0.0.1:8000/signup/" class="navlink">Signup</a></li>
 					{% endif %}
 				</ul>
-				<h3 class="navtitle">NEWEST</h3>
+				<h3 class="navtitle">Newest</h3>
 				<ul class="newest">
 					{% for s in sandwiches %}
 						<li><a href="{{ s.get_absolute_url }}">{{ s.adjective }}</a></li>
 					{% endfor %}
 				</ul>
-				<h3 class="navtitle">SANDWICHES</h3>
+				<h3 class="navtitle">Sandwiches</h3>
 				<ul class="newest">
 					<li>January 2010</li>
 					<li>February 2010</li>
diff --git a/templates/onesandwich.html b/templates/onesandwich.html
index b9bf28b..1158a43 100644
--- a/templates/onesandwich.html
+++ b/templates/onesandwich.html
@@ -5,7 +5,9 @@
 {% block content %}
 	<h3 class="sandwichtitle">{{ s.adjective }}</h3>
 	<p class="metadata">Made on {{ s.date_made }} and added by {{ s.user.username }}.</p>
-	<img class="sandwichimg" src="{{ s.picture.url }}">
+	{% if s.picture %}
+		<img class="sandwichimg" src="{{ s.picture.url }}">
+	{% endif %}
 	<h4 class="sandwichsub">Ingredients</h4>
 	<ul class="ingredients">
 		{% for i in s.ingredients.all %}
diff --git a/views.py b/views.py
index 9e1ee35..430446c 100644
--- a/views.py
+++ b/views.py
@@ -6,8 +6,16 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from models import Sandwich, Ingredient
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.forms import AuthenticationForm
+from django.template import RequestContext
 import datetime
 
+def sidebar_context(request):
+	if Sandwich.objects.count() > 5:
+		sandwiches = Sandwich.objects.order_by('-date_made')[:5]
+	else:
+		sandwiches = Sandwich.objects.order_by('-date_made')
+	return {'sandwiches': sandwiches}
+
 
 def add_sandwich(request):
 	if Sandwich.objects.count() > 5:
@@ -25,7 +33,7 @@ def add_sandwich(request):
 				return HttpResponse(thankshtml) # Redirect after POST
 		else:
 			form = SandwichForm(initial={'user': request.user}) # An unbound form
-		return render_to_response('sandwich.html', {'sform': form, 'sandwiches': sandwiches, 'user': request.user,})
+		return render_to_response('sandwich.html', {'sform': form, 'user': request.user,}, context_instance=RequestContext(request))
 	else:
 		thankshtml = "<p class=\"formthanks\">You are not logged in.</p>"
 		return HttpResponse(thankshtml) # Redirect after POST
@@ -46,7 +54,7 @@ def add_ingredient(request):
 		else:
 			form = IngredientForm() # An unbound form
 
-		return render_to_response('ingredient.html', {'iform': form, 'sandwiches': sandwiches, 'user': request.user,})
+		return render_to_response('ingredient.html', {'iform': form, 'user': request.user,}, context_instance=RequestContext(request))
 	else:
 		thankshtml = "<p class=\"formthanks\">You are not logged in.</p>"
 		return HttpResponse(thankshtml) # Redirect after POST
@@ -60,7 +68,7 @@ def all_sandwich(request):
 			sandwiches = Sandwich.objects.order_by('-date_made')
 	except Sandwich.DoesNotExist:
 	        raise Http404
-	return render_to_response('allsandwiches.html', {'allsandwiches': allsandwiches, 'sandwiches': sandwiches, 'user': request.user,})
+	return render_to_response('allsandwiches.html', {'allsandwiches': allsandwiches, 'user': request.user,}, context_instance=RequestContext(request))
 
 
 def baseview(request):
@@ -73,7 +81,7 @@ def baseview(request):
 			allsandwiches = Sandwich.objects.all()
 	except Sandwich.DoesNotExist:
 	        raise Http404
-	return render_to_response('base.html', {'sandwiches': sandwiches, 'all': allsandwiches,})
+	return render_to_response('base.html', {'all': allsandwiches,}, context_instance=RequestContext(request))
 
 
 def sandwich_month(request, year, month):
@@ -85,7 +93,7 @@ def sandwich_month(request, year, month):
 			sandwiches = Sandwich.objects.order_by('-date_made')
 	except Sandwich.DoesNotExist:
 	        raise Http404
-	return render_to_response('allsandwiches.html', {'allsandwiches': ms, 'sandwiches': sandwiches, 'user': request.user,})
+	return render_to_response('allsandwiches.html', {'allsandwiches': ms, 'user': request.user,}, context_instance=RequestContext(request))
 	
 def current_home(request):
 	temp = Sandwich.objects.order_by('-date_made')[0]
@@ -99,7 +107,7 @@ def current_home(request):
 			sandwiches = Sandwich.objects.order_by('-date_made')
 	except Sandwich.DoesNotExist:
 	        raise Http404
-	return render_to_response('allsandwiches.html', {'allsandwiches': ms, 'sandwiches': sandwiches, 'user': request.user,})
+	return render_to_response('allsandwiches.html', {'allsandwiches': ms, 'user': request.user,}, context_instance=RequestContext(request))
 
 
 def specific_sandwich(request, slug):
@@ -111,13 +119,9 @@ def specific_sandwich(request, slug):
 			sandwiches = Sandwich.objects.order_by('-date_made')
 	except Sandwich.DoesNotExist:
 		raise Http404
-	return render_to_response('onesandwich.html', {'s': s, 'sandwiches': sandwiches, 'user': request.user,})
+	return render_to_response('onesandwich.html', {'s': s, 'user': request.user,}, context_instance=RequestContext(request))
 
 def logout_view(request):
-	if Sandwich.objects.count() > 5:
-		sandwiches = Sandwich.objects.order_by('-date_made')[:5]
-	else:
-		sandwiches = Sandwich.objects.order_by('-date_made')
 	if request.user.is_authenticated():
 		logout(request)
 		thankshtml = "<p class=\"formthanks\">You have been logged out.</p>"
@@ -149,7 +153,7 @@ def login_view(request):
 			return HttpResponse(thankshtml)
 	except KeyError:
 		aform = AuthenticationForm()
-		return render_to_response('login.html', {'aform': aform, 'sandwiches': sandwiches, 'user': request.user,})
+		return render_to_response('login.html', {'aform': aform, 'user': request.user,}, context_instance=RequestContext(request))
 
 
 def create_user(request):
@@ -182,4 +186,4 @@ def create_user(request):
 				return HttpResponse(thankshtml) # Redirect after POST	
 	else:
 		form = NewUserForm() # An unbound form
-		return render_to_response('newuser.html', {'cform': form, 'sandwiches': sandwiches, 'user': request.user,})
\ No newline at end of file
+		return render_to_response('newuser.html', {'cform': form, 'user': request.user,}, context_instance=RequestContext(request))
\ No newline at end of file