From d8f1d6408550b19e698c1d199a05aa34adbea597 Mon Sep 17 00:00:00 2001
From: Ed Summers <ehs@pobox.com>
Date: Mon, 12 Sep 2011 15:13:21 +0000
Subject: [PATCH 1/3] need to distinguish between the user being viewed
 (subscriber for now) and the logged in user

---
 frontend/templates/user.html | 4 ++--
 frontend/views.py            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/templates/user.html b/frontend/templates/user.html
index 6b4e1bda..bb87af49 100644
--- a/frontend/templates/user.html
+++ b/frontend/templates/user.html
@@ -2,9 +2,9 @@
 
 {% block content %}
 
-<h1>Wishlist for {{ user.username }}</h1>
+<h1>Wishlist for {{ subscriber.username }}</h1>
 
-{% for work in user.wishlist.works.all %}
+{% for work in subscriber.wishlist.works.all %}
 {% include "book_panel.html" %}
 {% endfor %}
 
diff --git a/frontend/views.py b/frontend/views.py
index 14605401..5c21164a 100755
--- a/frontend/views.py
+++ b/frontend/views.py
@@ -13,6 +13,6 @@ def home(request):
 def user(request, username):
     u = get_object_or_404(User, username=username)
     return render_to_response('user.html',
-        {"user": u, "wishlist": u.wishlist},
+        {"subscriber": u},
         context_instance=RequestContext(request)
     )

From 4ddaf1f3cb776ac3cd4f57d0229412c97c3f3089 Mon Sep 17 00:00:00 2001
From: Ed Summers <ehs@pobox.com>
Date: Mon, 12 Sep 2011 15:23:33 +0000
Subject: [PATCH 2/3] renamed user view to contributor, since that is what eric
 has been calling it

---
 frontend/templates/{user.html => contributor.html} | 4 ++--
 frontend/urls.py                                   | 2 +-
 frontend/views.py                                  | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename frontend/templates/{user.html => contributor.html} (52%)

diff --git a/frontend/templates/user.html b/frontend/templates/contributor.html
similarity index 52%
rename from frontend/templates/user.html
rename to frontend/templates/contributor.html
index bb87af49..cd46f646 100644
--- a/frontend/templates/user.html
+++ b/frontend/templates/contributor.html
@@ -2,9 +2,9 @@
 
 {% block content %}
 
-<h1>Wishlist for {{ subscriber.username }}</h1>
+<h1>Wishlist for {{ contributor.username }}</h1>
 
-{% for work in subscriber.wishlist.works.all %}
+{% for work in contributor.wishlist.works.all %}
 {% include "book_panel.html" %}
 {% endfor %}
 
diff --git a/frontend/urls.py b/frontend/urls.py
index 1132853a..bc03e6b9 100644
--- a/frontend/urls.py
+++ b/frontend/urls.py
@@ -3,5 +3,5 @@ from django.conf.urls.defaults import *
 urlpatterns = patterns(
     "regluit.frontend.views",
     url(r"^$", "home", name="home"),
-    url(r"^user/(?P<username>.+)/$", "user", name="user"),
+    url(r"^contributor/(?P<contributor_username>.+)/$", "contributor", name="contributor"),
 )
diff --git a/frontend/views.py b/frontend/views.py
index 5c21164a..6498ab71 100755
--- a/frontend/views.py
+++ b/frontend/views.py
@@ -10,9 +10,9 @@ def home(request):
         context_instance=RequestContext(request)
     )
 
-def user(request, username):
-    u = get_object_or_404(User, username=username)
-    return render_to_response('user.html',
-        {"subscriber": u},
+def contributor(request, contributor_username):
+    contributor = get_object_or_404(User, username=contributor_username)
+    return render_to_response('contributor.html',
+        {"contributor": contributor},
         context_instance=RequestContext(request)
     )

From 392f746b2fcd8eb38a074d34dc31cbee30ba6e8e Mon Sep 17 00:00:00 2001
From: Ed Summers <ehs@pobox.com>
Date: Mon, 12 Sep 2011 18:20:36 +0000
Subject: [PATCH 3/3] should have been supporter not contributor ...

---
 frontend/templates/{contributor.html => supporter.html} | 4 ++--
 frontend/urls.py                                        | 2 +-
 frontend/views.py                                       | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename frontend/templates/{contributor.html => supporter.html} (52%)

diff --git a/frontend/templates/contributor.html b/frontend/templates/supporter.html
similarity index 52%
rename from frontend/templates/contributor.html
rename to frontend/templates/supporter.html
index cd46f646..beab18a2 100644
--- a/frontend/templates/contributor.html
+++ b/frontend/templates/supporter.html
@@ -2,9 +2,9 @@
 
 {% block content %}
 
-<h1>Wishlist for {{ contributor.username }}</h1>
+<h1>Wishlist for {{ supporter.username }}</h1>
 
-{% for work in contributor.wishlist.works.all %}
+{% for work in supporter.wishlist.works.all %}
 {% include "book_panel.html" %}
 {% endfor %}
 
diff --git a/frontend/urls.py b/frontend/urls.py
index bc03e6b9..c3740c5c 100644
--- a/frontend/urls.py
+++ b/frontend/urls.py
@@ -3,5 +3,5 @@ from django.conf.urls.defaults import *
 urlpatterns = patterns(
     "regluit.frontend.views",
     url(r"^$", "home", name="home"),
-    url(r"^contributor/(?P<contributor_username>.+)/$", "contributor", name="contributor"),
+    url(r"^supporter/(?P<supporter_username>.+)/$", "supporter", name="supporter"),
 )
diff --git a/frontend/views.py b/frontend/views.py
index 6498ab71..9dd667f6 100755
--- a/frontend/views.py
+++ b/frontend/views.py
@@ -10,9 +10,9 @@ def home(request):
         context_instance=RequestContext(request)
     )
 
-def contributor(request, contributor_username):
-    contributor = get_object_or_404(User, username=contributor_username)
-    return render_to_response('contributor.html',
-        {"contributor": contributor},
+def supporter(request, supporter_username):
+    supporter = get_object_or_404(User, username=supporter_username)
+    return render_to_response('supporter.html',
+        {"supporter": supporter},
         context_instance=RequestContext(request)
     )