From 5a7ff70c11b53654de8240562926d0a1b8dade67 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <keegan@humbughq.com>
Date: Thu, 11 Oct 2012 11:23:22 -0400
Subject: [PATCH] Remove obsolete views

This functionality is part of the home view now.

(imported from commit 5f0327eb62840bf98af49566e6f3c0b86ca43b8d)
---
 humbug/urls.py  |  2 --
 zephyr/views.py | 20 --------------------
 2 files changed, 22 deletions(-)

diff --git a/humbug/urls.py b/humbug/urls.py
index 7047247697..9bfea425f9 100644
--- a/humbug/urls.py
+++ b/humbug/urls.py
@@ -22,9 +22,7 @@ urlpatterns = patterns('',
     url(r'^accounts/register/', 'zephyr.views.register', name='register'),
     url(r'^accounts/send_confirm/(?P<email>[\S]+)?', 'django.views.generic.simple.direct_to_template', {'template': 'zephyr/accounts_send_confirm.html'}, name='send_confirm'),
     url(r'^accounts/do_confirm/(?P<confirmation_key>[\w]+)', 'confirmation.views.confirm', name='confirm'),
-    url(r'^settings/manage/$', 'zephyr.views.manage_settings', name='manage_settings'),
     url(r'^settings/change/$', 'zephyr.views.change_settings', name='change_settings'),
-    url(r'^subscriptions/$', 'zephyr.views.subscriptions', name='subscriptions'),
     url(r'^json/subscriptions/list$', 'zephyr.views.json_list_subscriptions', name='list_subscriptions'),
     url(r'^json/subscriptions/remove$', 'zephyr.views.json_remove_subscription', name='remove_subscription'),
     url(r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/favicon.ico'}),
diff --git a/zephyr/views.py b/zephyr/views.py
index 549bf6e848..9f8fc335a2 100644
--- a/zephyr/views.py
+++ b/zephyr/views.py
@@ -429,15 +429,6 @@ def gather_subscriptions(user_profile):
     return sorted([get_display_recipient(sub.recipient) for sub in subscriptions
             if sub.recipient.type == Recipient.STREAM])
 
-@login_required
-def subscriptions(request):
-    user_profile = UserProfile.objects.get(user=request.user)
-
-    return render_to_response('zephyr/subscriptions.html',
-                              {'subscriptions': gather_subscriptions(user_profile),
-                               'user_profile': user_profile},
-                              context_instance=RequestContext(request))
-
 @login_required
 def json_list_subscriptions(request):
     subs = gather_subscriptions(UserProfile.objects.get(user=request.user))
@@ -504,17 +495,6 @@ def json_add_subscription(request):
         actually_new_sub = sub_name
     return json_success({"data": actually_new_sub})
 
-
-@login_required
-def manage_settings(request):
-    user_profile = UserProfile.objects.get(user=request.user)
-
-    return render_to_response('zephyr/settings.html',
-                              {'user_profile': user_profile,
-                               'email_hash': hashlib.md5(user_profile.user.email).hexdigest(),
-                               },
-                              context_instance=RequestContext(request))
-
 @login_required
 @require_post
 def change_settings(request):