From 8b53581169eabe89aee5793033b247751ad6397d Mon Sep 17 00:00:00 2001
From: eric <eric@hellman.net>
Date: Mon, 2 Dec 2013 10:12:22 -0500
Subject: [PATCH] clean up instructions

---
 frontend/templates/libraryauth/edit.html | 21 ++++++++++++++++++---
 libraryauth/views.py                     |  4 +---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/frontend/templates/libraryauth/edit.html b/frontend/templates/libraryauth/edit.html
index 27c240ff..28811042 100644
--- a/frontend/templates/libraryauth/edit.html
+++ b/frontend/templates/libraryauth/edit.html
@@ -10,9 +10,7 @@
 
 {% block doccontent %}
 {% if library.pk %}
-<h2>Edit Library</h2>
-<ul><li> Go to <a href="{% url library library.user %}">{{ library }} Page</a></li>
-<li><a href="{% url library_login library.id %}">Log in</a> as the library user </li>
+<h2>Configure {{ library }}</h2>
 {% else %}
 <h2>Add a Library to Unglue.it</h2>
 {% endif %}
@@ -35,6 +33,23 @@
 	</div>    
 	<input type="submit" name="create_new_library" value="{% if library.pk %}Save Edits{% else %}Create A Library{% endif %}" id="submit">
 </form>
+{% if library.pk %}
+<h2>Settings for {{ library }}</h2>
+<ul class="terms">
+<li> Go to <a href="{% url library library.user %}">{{ library }} Page</a></li>
+{% ifequal request.user library.user %}
+<li> <i>You are logged in as the library user.</i> You can...</li>
+<li> ... edit the <a href="{% url supporter library.user %}#edit">Profile Settings</a> or ... </li>
+<li> ... <a href="{% url manage_account %}">configure</a> the library's account</li>
+{% else %}
+{% ifequal request.user library.owner %}
+<li> To set links and tagline, configure the account, and build book lists for {{ library }}, first <a href="{% url library_login library.id %}">click here to log in</a> as the library user </li>
+{% else %}
+<li> <i>{{ library.owner }}</i> is authorized to set links and tagline, configure the account, and build book lists for {{ library }}.</li>
+{% endifequal %}
+{% endifequal %}
+</ul>
+{% endif %}
 {% if backend_admin_forms %}
 <h2>User Verification Setup</h2>
 {% include form.instance.help_template %}
diff --git a/libraryauth/views.py b/libraryauth/views.py
index d3067b11..c8c0c23b 100644
--- a/libraryauth/views.py
+++ b/libraryauth/views.py
@@ -209,9 +209,7 @@ def login_as_library(request, library_id):
     if request.user == library.owner:
         login_user(request, library.user)
             
-        return HttpResponseRedirect(reverse('library',args=[library.user]))
-    else:
-        return HttpResponseRedirect(reverse('library_admin',args=[library.user]))
+    return HttpResponseRedirect(reverse('library_admin',args=[library.id]))
 
 
 def login_user(request, user):