From 54563defc38d0075bfc448720e4f5805998a824a Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 9 Jul 2010 00:27:44 +0200
Subject: a bit more bling on the ui

---
 coip/apps/name/views.py       |  6 +++++-
 templates/apps/name/name.html | 16 +++++++++++++++-
 templates/base.html           |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/coip/apps/name/views.py b/coip/apps/name/views.py
index 125060c..6e0132f 100644
--- a/coip/apps/name/views.py
+++ b/coip/apps/name/views.py
@@ -46,7 +46,11 @@ def show(request,name):
     if name.has_permission(request.user,'r'):
         return respond_to(request, 
                           {'text/html': 'apps/name/name.html'}, 
-                          {'name': name, 'memberships': name.memberships, 'edit': name.has_permission(request.user,'#w')})
+                          {'name': name, 
+                           'memberships': name.memberships, 
+                           'delete': name.has_permission(request.user,'#d'),
+                           'insert': name.has_permission(request.user,'#i'),
+                           'edit': name.has_permission(request.user,'#w')})
     else:
         return HttpResponseForbidden()
 
diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html
index 744948c..6ef3e91 100644
--- a/templates/apps/name/name.html
+++ b/templates/apps/name/name.html
@@ -36,7 +36,21 @@ $(function() {
 <div style="float: right; width: 60%; padding-left: 20px;">
 {% if name %}
 	<div class="ui-widget-content ui-corner-all infopanel">
-		<h3 style="float: left;">{{name}}</h3><a style="float: right;" href="/name/edit/id/{{name.id}}"><div class="ui-icon ui-icon-wrench"></div></a><div class="clear"/>
+		<div class="navlist">
+		   <ul>
+		     {% if edit %}
+			 <li style="float: right;"><a class="tip" title="Modify this name" href="/name/edit/id/{{name.id}}"><span class="ui-icon ui-icon-wrench"></span></a>
+			 {% endif %}
+			 {% if delete %}
+			 <li style="float: right;"><a class="tip" title="Permanently remove this name" href="/name/delete/id/{{name.id}}"><span class="ui-icon ui-icon-trash"></span></a>
+			 {% endif %}
+			 {% if insert %}
+			 <li style="float: right;"><a class="tip" title="Create new subordinate name" href="/name/add/id/{{name.id}}"><span class="ui-icon ui-icon-plusthick"></span></a>
+			 {% endif %}
+		   </ul>
+		</div>
+		<div class="clear"/>
+		<h3>{{name}}</h3>
 		<p>{{name.description}}</p>
 	</div>
 	{% endif %}
diff --git a/templates/base.html b/templates/base.html
index cc0f8a4..18172d3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -91,8 +91,8 @@
 	      <ul>
 	         <li><a href="/user"><span class="ui-icon ui-icon-locked" style="float: left;"></span>{{ profile.display_name }}</a></li>
 	      </ul>
-	   {% endif %}
 	   </div>
+	   {% endif %}
 	   <div id="branding"><a style="text-decoration: none" href="/">{% block headline %}{% endblock %}</a></div>
 	</div>
 	<div class="clear"></div>
-- 
cgit v1.1