From d60a62a68a5c3442a6b464cca1c1a218d57d8ecc Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 3 Mar 2011 23:28:11 +0100
Subject: new acl UI

---
 templates/apps/name/acls.html | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'templates/apps/name/acls.html')

diff --git a/templates/apps/name/acls.html b/templates/apps/name/acls.html
index 5b91429..3d3d134 100644
--- a/templates/apps/name/acls.html
+++ b/templates/apps/name/acls.html
@@ -1,14 +1,32 @@
-{% extends "edit.html" %}
+{% extends "tree.html" %}
 {% load permdisplay %}
-{% block beforeform %}
-<h1>Permissions on {{name}}</h1>
-<table style="margin-bottom: 20px;">
+{% block widgets %}
+    $("#acl").accordion({
+   		header: 'h3',
+   		collapsible: true,
+        active: false
+   	});
+{% endblock %}
+{% block content %}
+<h1>Permissions on {{name.short}}</h1>
+<div id="acl" style="margin-bottom: 20px;">
 {% for ace in acl %}
-<tr>
-   <td>{{ace.dst|acldstdisplay}}</td>
-   <td>{{ace.data|permdisplay}}</td>
-   <td><a href="/namelink/{{ace.id}}/remove"><span class="ui-icon ui-icon-trash"></span></td>
-</tr>
+	<div id="{{ace.id}}">
+	   <h3 class="listheader">Permissions for {{ace.dst|acldstdisplay}}</h3>
+	   <div>
+	      <div>{{ace.dst|acldstdisplay}} {{ace.data|permdisplay}}.</div>
+	      <div class="rlist button">
+	         <ul>
+	            <li><a href="/namelink/{{ace.id}}/remove">Remove</a></li>
+	         </ul>
+	      </div>
+	   </div>
+	</div>
 {% endfor %}
-</table>
+</div>
+<div class="ilist button">
+   <ul>
+      <li><a href="/name/{{name.id}}/acl/0/add">Add Permission</a></li>
+   </ul>
+</div>
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.1


From f0dd7b2469b6d276fdfdc0a0dc4da5101ce272cc Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 4 Mar 2011 00:30:55 +0100
Subject: fix removing acls

---
 templates/apps/name/acls.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/apps/name/acls.html')

diff --git a/templates/apps/name/acls.html b/templates/apps/name/acls.html
index 3d3d134..7fe8250 100644
--- a/templates/apps/name/acls.html
+++ b/templates/apps/name/acls.html
@@ -17,7 +17,7 @@
 	      <div>{{ace.dst|acldstdisplay}} {{ace.data|permdisplay}}.</div>
 	      <div class="rlist button">
 	         <ul>
-	            <li><a href="/namelink/{{ace.id}}/remove">Remove</a></li>
+	            <li><a href="/name/{{ace.src.id}}/acl/{{ace.id}}/remove">Remove</a></li>
 	         </ul>
 	      </div>
 	   </div>
-- 
cgit v1.1