tagging works now

5 files changed, 40 insertions, 46 deletions

diff --git a/templates/apps/name/acls.html b/templates/apps/name/acls.html
index 7fe8250..a514b91 100644
--- a/templates/apps/name/acls.html
+++ b/templates/apps/name/acls.html
@@ -27,6 +27,9 @@
 <div class="ilist button">
    <ul>
       <li><a href="/name/{{name.id}}/acl/0/add">Add Permission</a></li>
+      {% if name %}
+      <li style="float: right;"><input type="button" onClick="document.location='{{name.url}}'" value="Cancel"/></li>
+	  {% endif %}
    </ul>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html
index e00a887..01de064 100644
--- a/templates/apps/name/name.html
+++ b/templates/apps/name/name.html
@@ -59,18 +59,22 @@
 		<div id="m{{m.id}}" class="{{m.status}}">
 		   <h3 class="listheader">{{m.user|lastidentifier}}</h3>
 		   <div>
-			   <div>{{m.user|userdisplay}} ({{m.user|lastidentifier}}) became a member of {{name.shortname}} {{m.timecreated|datehumanize}}.</div>
-			   <div class="rlist">
+			   <div>
+				    {{m.user|userdisplay}} ({{m.user|lastidentifier}}) became a member of {{name.shortname}} {{m.timecreated|datehumanize}} 
+				   	and has the following role{{m.tags|pluralize}}:
+			          <ul>
+			             {% for tag in m.tags %}
+			             <li>{{ tag|escape }}</li>
+			             {% endfor %}
+			          </ul>		
+			   </div>
+			   <div class="rlist button">
 		         <ul>
-		            {% if user == m.user %}
-		            <b>Role{{ m.tags|pluralize }} in this group</b><br>
-		            {% for tag in m.tags %}<ul>{{ tag|escape }}</ul>{% endfor %}
-		            <li class="button"><a href="/name/{{name.id}}/leave/{{m.user.username}}">Leave Group</a></li>
-		            <li class="button"><a href="/tag/membership/{{m.id}}/add">Add role</a></li>
-		            {% else %} 
-		            {% if render.kick %} 
-		            <li class="button"><a href="/name/{{name.id}}/leave/{{m.user.username}}">Remove from Group</a></li>
+		            {% if render.edit %}
+		            <li><a href="/tag/membership/{{m.id}}/modify">Modify Roles</a></li>
 		            {% endif %}
+		            {% if render.kick %}
+		            <li><a href="/name/{{name.id}}/leave/{{m.user.username}}">{% if m.user == user %}Leave{% else %}Remove from{% endif %} Group</a></li>
 		            {% endif %}
 		         </ul>
 		      </div>
diff --git a/templates/apps/tag/add.html b/templates/apps/tag/add.html
deleted file mode 100644
index 1325929..0000000
--- a/templates/apps/tag/add.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "tree.html" %}
-{% block js %}
-<script>
-	$(document).ready(function(){
-		$("#taglist").tagit({
-			existingTags: [{% for t in tagobj.tags %}'{{t}}',{% endfor%}],
-			namePrefix: 'tags'
-		});
-	});
-</script>
-{% endblock %}
-
-{% block content %}
-	<h1>Add role to {{ type|escape }} {{ name }}</h1>
-    <div class="ui-widget ui-widget-content ui-helper-reset ui-corner-all infopanel">
-      <h3 class="altheader">Current role{{ tagobj.tags|pluralize }} in this group</h3>
-	  {% for tag in tagobj.tags %}<b>{{ tag|escape }} </b>{% endfor %}
-      	<h3>Add</h3>
-      <div class="altcontent">
-        <form method="POST" action="">{% csrf_token %}
-                  <div style="margin-top: 20px;">
-                    <ul id="taglist"></ul>
-                  </div>
-                  <br/>
-                  <div class="button">
-                    <input type="submit" value="Save Changes" />
-                        <input type="button" onClick="history.go(-1)" value="Cancel"/>
-                  </div>
-        </form>
-      </div>
-   </div>
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/templates/apps/tag/modify.html b/templates/apps/tag/modify.html
new file mode 100644
index 0000000..8218889
--- /dev/null
+++ b/templates/apps/tag/modify.html
@@ -0,0 +1,23 @@
+{% extends "tree.html" %}
+{% block widgets %}
+	$("#taglist").tagit({
+		existingTags: [{% for t in tagobj.tags %}'{{t}}',{% endfor %}],
+		namePrefix: 'tags'
+	});
+{% endblock %}
+{% block content %}
+    <div>
+       <h1>Modify {{tagtype|escape}} on {{type|escape}} {{name.short|escape}}</h1>
+       <form method="POST" class="bbq ui-helper-reset ui-widget ui-widget-content ui-corner-all formpadding">
+          <div style="margin-top: 20px;">
+            <ul id="taglist"></ul>
+          </div>
+          <div class="ilist button" style="padding-bottom: 10px;" >
+             <ul>
+                <li><input type="submit" value="Save Changes" /></li>
+                <li style="float: right;"><input type="button" onClick="history.go(-1)" value="Cancel"/></li>
+             </ul>
+          </div>
+       </form>
+   </div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index fddbc95..bb59dda 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -4,7 +4,6 @@
         <link type="text/css" href="/site-media/css/flick/jquery-ui-1.8.10.custom.css" rel="stylesheet" />
         <!-- link type="text/css" href="/site-media/css/jquery.jnotify.css" rel="stylesheet" />
         <link type="text/css" href="/site-media/css/jquery.tooltip.css" rel="stylesheet" />
-        <link type="text/css" href="/site-media/css/jquery.tagInput.css" rel="stylesheet" />
         <link type="text/css" href="/site-media/css/jquery.multiselect2side.css" rel="stylesheet" /-->
         <link type="text/css" href="/site-media/css/jquery.ui.autocomplete.custom.css" rel="stylesheet" />
         <link type="text/css" href="/site-media/css/jquery.wysiwyg.css" rel="stylesheet" />
@@ -17,7 +16,6 @@
         <!-- script type="text/javascript" src="/site-media/js/jquery.jnotify.js"></script>
         <script type="text/javascript" src="/site-media/js/jquery.cookie.js"></script>
         <script type="text/javascript" src="/site-media/js/jquery.timers.js"></script -->
-        <!-- script type="text/javascript" src="/site-media/js/jquery.tagInput.js"></script-->
         <!-- script type="text/javascript" src="/site-media/js/jquery.multiselect2side.js"></script -->
         <script type="text/javascript" src="/site-media/js/jquery.jstree.js"></script>
         <script type="text/javascript" src="/site-media/js/jquery.wysiwyg.js"></script>