From dac7766ee7a217a1d44fbbe98ae4e2f0e64d4688 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sat, 18 Aug 2012 18:27:56 -0700
Subject: [PATCH 1/4] Use a named url instead of the url to reference login
 view

---
 views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views.py b/views.py
index 471dacd..9c1528b 100644
--- a/views.py
+++ b/views.py
@@ -22,7 +22,7 @@ def login(request):
     # Make sure the user can accept cookies.
     if request.session.test_cookie_worked():
         request.session.delete_test_cookie()
-        return redirect('/login/github/')
+        return redirect('socialauth_begin', backend='github')
     else:
         # During development, I've landed here a lot, despite having cookies
         # enabled. So, set the test cookie so that trying to login from here

From 8cd494021506d10ca178cde7d31b75853a07e1dd Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sat, 18 Aug 2012 18:40:45 -0700
Subject: [PATCH 2/4] Sort repo list

---
 views.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/views.py b/views.py
index 9c1528b..1121e3a 100644
--- a/views.py
+++ b/views.py
@@ -33,10 +33,17 @@ def login(request):
                                   { 'error': "Fix your damn cookies!" })
 
 
+def _sorted_repos(request):
+    repos = [r for r in request.github.get_iter('users/%s/repos' %
+        request.user.username)]
+    repos.sort(key=lambda x: x['name'])
+    return repos
+
+
 @login_required
 def graph_followers(request):
     return render_to_response('graph_followers.html', {
-        'repos': request.github.get_iter('users/%s/repos' % request.user.username)
+        'repos': _sorted_repos(request)
     }, RequestContext(request))
 
 
@@ -45,5 +52,5 @@ def graph_repo(request, user=None, repo=None):
     return render_to_response('graph_repo.html', {
         'graph_user': user,
         'graph_repo': repo,
-        'repos': request.github.get_iter('users/%s/repos' % request.user.username)
+        'repos': _sorted_repos(request)
     }, RequestContext(request))

From e2aa534e7636a31d139db378d1745ed098e7133c Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sat, 18 Aug 2012 18:43:17 -0700
Subject: [PATCH 3/4] Remove some remnants of a bad merge...

---
 templates/navbar.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/templates/navbar.html b/templates/navbar.html
index 81872e1..664df17 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -23,10 +23,6 @@
               <li><a href="#">Logout</a></li>
             </ul>
           </li>
-          <li><a href="{% url index %}">Followers</a></li>
-        </ul>
-        <ul class="nav pull-right">
-          <li><a href="">Logout</a></li>
         </ul>
     </div>
   </div>

From d0386b475a7c8dcdb810cb2580332f316e51e84c Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sat, 18 Aug 2012 18:57:06 -0700
Subject: [PATCH 4/4] Fix indentation in navbar template

---
 templates/navbar.html | 44 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/templates/navbar.html b/templates/navbar.html
index 664df17..84fd464 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -2,28 +2,28 @@
 <div class="navbar navbar-fixed-top">
   <div class="navbar-inner">
     <div class="container-fluid">
-        <a class="brand" href="">Cool name</a>
-        <ul class="nav">
-          <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">My Repos</a>
-            <ul class="dropdown-menu">
-              {% for r in repos %}
-              <li><a href="#">{{ r.name }}</a></li>
-              {% endfor %}
-            </ul>
-          </li>
-          <li><a href="{% url index %}">Followers</a></li>
-        </ul>
-        <ul class="nav pull-right">
-          <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-              {{ request.user.username }}
-            </a>
-            <ul class="dropdown-menu">
-              <li><a href="#">Logout</a></li>
-            </ul>
-          </li>
-        </ul>
+      <a class="brand" href="">Cool name</a>
+      <ul class="nav">
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown">My Repos</a>
+          <ul class="dropdown-menu">
+            {% for r in repos %}
+            <li><a href="#">{{ r.name }}</a></li>
+            {% endfor %}
+          </ul>
+        </li>
+        <li><a href="{% url index %}">Followers</a></li>
+      </ul>
+      <ul class="nav pull-right">
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            {{ request.user.username }}
+          </a>
+          <ul class="dropdown-menu">
+            <li><a href="#">Logout</a></li>
+          </ul>
+        </li>
+      </ul>
     </div>
   </div>
 </div>