From 6613bbae1b7d3262fec64ae1c8da7d772c2e2b66 Mon Sep 17 00:00:00 2001
From: Johan Berggren <jbn@nordu.net>
Date: Fri, 4 Mar 2011 14:22:57 +0100
Subject: Added tagging on Memberships

---
 templates/apps/name/name.html |  5 ++++-
 templates/apps/tag/add.html   | 33 ++++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'templates/apps')

diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html
index f1442be..2489004 100644
--- a/templates/apps/name/name.html
+++ b/templates/apps/name/name.html
@@ -1,6 +1,7 @@
 {% extends "tree.html" %}
 {% load datehumanize %}
 {% load userdisplay %}
+{% load tagging_tags %}
 {% block widgets %}
     $("#memberships").accordion({
    		header: 'h3',
@@ -62,8 +63,10 @@
 			   <div class="rlist">
 		         <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">Tag</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>
diff --git a/templates/apps/tag/add.html b/templates/apps/tag/add.html
index 378ebee..1325929 100644
--- a/templates/apps/tag/add.html
+++ b/templates/apps/tag/add.html
@@ -1,7 +1,34 @@
 {% 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 tag to {{ type|escape }}</h1>
+	<h1>Add role to {{ type|escape }} {{ name }}</h1>
     <div class="ui-widget ui-widget-content ui-helper-reset ui-corner-all infopanel">
-{{ tagobj }}
-</div>
+      <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
-- 
cgit v1.1