Merge branch 'master' of git.nordu.net:coip

3 files changed, 80 insertions, 11 deletions

diff --git a/templates/apps/name/acls.html b/templates/apps/name/acls.html
index 5b91429..7fe8250 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="/name/{{ace.src.id}}/acl/{{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
diff --git a/templates/apps/name/addace.html b/templates/apps/name/addace.html
new file mode 100644
index 0000000..17d8362
--- /dev/null
+++ b/templates/apps/name/addace.html
@@ -0,0 +1,51 @@
+{% extends "edit_fieldsets.html" %}
+{% load permdisplay %}
+{% block widgets %}
+   	$('#wizard').formwizard({
+    	validationEnabled: true,
+    	focusFirstInput: true,
+    	textSubmit: "Finish",
+    	validationOptions: {
+    		rules: {
+    			subject_label: 'required'
+    		}
+    	}
+    });
+    $('#id_subject').autocomplete({
+    		source: "/name/search.json",
+    		focus: function(event, ui) {
+                $('#id_subject').val(ui.item.label);
+                return false;
+            },
+            select: function(event, ui) {
+                $('#id_subject').val(ui.item.label);
+                $('#id_dst').val(ui.item.value);
+                return false;
+            },
+			minLength: 2,
+			open: function() {
+				$( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
+			},
+			close: function() {
+				$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
+			}
+    });
+{% endblock %}
+{% block beforeform %}
+<h1>Permissions on {{name.short}}</h1>
+<div id="acl" style="margin-bottom: 20px;">
+{% for ace in acl %}
+<div id="{{acc.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 %}
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html
index 2489004..e00a887 100644
--- a/templates/apps/name/name.html
+++ b/templates/apps/name/name.html
@@ -28,7 +28,7 @@
 		<div class="rlist">
 		  <ul>
 		  	 {% if render.acl %}
-			 <li class="button"><a href="/name/{{name.id}}/link/0">Modify Access</a></li>
+			 <li class="button"><a href="/name/{{name.id}}/acl/0">Modify Access</a></li>
 			 {% endif %}
 		     {% if render.edit %}
 			 <li class="button"><a href="/name/{{name.id}}/edit">Modify</a></li>