From 9af296c2b49a01b145360453aa7cd1348d3bd11f Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 3 Mar 2011 15:17:59 +0100
Subject: renamed service to entity and implemented add-member dialog

---
 templates/apps/membership/edit.html |  2 +-
 templates/apps/name/name.html       | 10 +++++++---
 templates/edit_fieldsets.html       |  6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/templates/apps/membership/edit.html b/templates/apps/membership/edit.html
index e9074b0..8174aea 100644
--- a/templates/apps/membership/edit.html
+++ b/templates/apps/membership/edit.html
@@ -1,6 +1,6 @@
 {% extends "edit_fieldsets.html" %}
 {% block widgets %}
-    $('#form').formwizard({
+    $('#wizard').formwizard({
     	validationEnabled: true,
     	focusFirstInput: true,
     	textSubmit: "Finish"
diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html
index ebf0402..2b773bf 100644
--- a/templates/apps/name/name.html
+++ b/templates/apps/name/name.html
@@ -38,9 +38,13 @@
 			 {% if render.invite %}
 			 <li class="button"><a href="/name/{{name.id}}/invite">Invite</a></li>
 			 {% endif %}
+			 {% if render.invite %}
+			 <li class="button"><a href="/name/{{name.id}}/join">Add Member</a></li>
+			 {% endif %}
 			 {% if render.join %}
-			 <li class="button"><a href="/name/{{name.id}}/join">Join</a></li>
+			 <li class="button"><a href="/name/{{name.id}}/join/{{user.username}}">Join</a></li>
 			 {% endif %}
+			 
 		   </ul>
 		</div>
 		<div class="clear"></div>
@@ -58,10 +62,10 @@
 			   <div class="rlist">
 		         <ul>
 		            {% if user == m.user %}
-		            <li class="button"><a href="/name/{{name.id}}/{{m.user.username}}/leave">Leave Group</a></li>
+		            <li class="button"><a href="/name/{{name.id}}/leave/{{m.user.username}}">Leave Group</a></li>
 		            {% else %} 
 		            {% if render.kick %} 
-		            <li class="button"><a href="/name/{{name.id}}/{{m.user.username}}/leave">Remove from Group</a></li>
+		            <li class="button"><a href="/name/{{name.id}}/leave/{{m.user.username}}">Remove from Group</a></li>
 		            {% endif %}
 		            {% endif %}
 		         </ul>
diff --git a/templates/edit_fieldsets.html b/templates/edit_fieldsets.html
index b86f3d9..d528a4c 100644
--- a/templates/edit_fieldsets.html
+++ b/templates/edit_fieldsets.html
@@ -13,7 +13,7 @@
 				  <legend class="ui-state-highlight ui-corner-all">{{ fieldset.legend }}</legend>
 				  {% endif %}
 				  {% if fieldset.description %}
-				  <p>{{ fieldset.description }}</p>
+				  <p class="description">{{ fieldset.description }}</p>
 				  {% endif %}
 				  <ul class="links">
 				  {% for field in fieldset %}
@@ -35,7 +35,9 @@
 			   <ul>
 			      <li><input type="reset" value="Back"/></li>
 			      <li><input type="submit" value="Finish"/></li>
-			      <li><input type="button" style="float: right;" onClick="document.location='{{name.url}}'" value="Cancel"/></li>
+			      {% if name %}
+			      <li style="float: right;"><input type="button" onClick="document.location='{{name.url}}'" value="Cancel"/></li>
+			      {% endif %}
 			   </ul>
 		    </div>
 		</form>
-- 
cgit v1.1