# HG changeset patch
# User verrierj
# Date 1324657503 -3600
# Node ID 50981ee4ff58397744524dc960c4cb8c45a114f2
# Parent  1399742880296396b6d3b5027c07d8fc5920d52a
Change group edition window

diff -r 139974288029 -r 50981ee4ff58 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html	Fri Dec 23 16:44:56 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html	Fri Dec 23 17:25:03 2011 +0100
@@ -48,11 +48,7 @@
 {% block js_declaration %}
 	{{ block.super }}
 	<script type="text/javascript">
-	
-	function init_events(container) {
-		filter_elems($("#userslist"),$("#selecteduserslist"));
-	}
-	
+		
 	$(document).ready(function() {	
 		$("#close_button").click(function (e) {
 			e.preventDefault();
@@ -60,8 +56,7 @@
 		});
 		
 		var search_url = "{% url ldt.ldt_utils.views.share_filter filter='__FILTER__' use_groups='false' %}";
-		init_multi_select_events ($("#userslist"), $("#selecteduserslist"), $("#memberselection"), $("#adminselection"), "#searchuserinput", search_url);
-
+	
 	});
 	</script>
 
@@ -69,8 +64,8 @@
 
 {% block body %}
 				 
-	<div id="add_group" class="span-12 last">
-	<div class="projectscontentstitle span-12 last">{% if group_id %}{% trans "Update a group" %}{% else %}{% trans "Create a group" %}{% endif %}</div>
+	<div id="add_group" class="span-20 last">
+	<div class="projectscontentstitle span-20 last">{% if group_id %}{% trans "Update a group" %}{% else %}{% trans "Create a group" %}{% endif %}</div>
 	
 	<form action="{% if group_id %}{% url ldt.ldt_utils.views.update_group group_id %} {% else %}{% url ldt.ldt_utils.views.create_group %}{% endif %}" method="POST" {% if target_parent %}target="_parent"{% endif %}>
 	{% csrf_token %} 
@@ -84,54 +79,7 @@
 		{% endfor %}
 	</div>
 
-	<div id="userslistcontainer">
-		<div id="userslistheader">
-			{% trans "User list" %}<br />
-			<div class="searchfield rounded span-4"><input type="text" name="search" id="searchuserinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}"/><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
-		</div><br /><br />	
-		<select multiple="multiple" id="userslist">
-			{% include "ldt/ldt_utils/partial/sharewith.html" %}
-		</select>
-		<div id="userslistfooter">
-			<a href="#" id="selectall" title="{% trans "select all" %}">{% trans "select all" %}</a>
-		</div>
-	</div>
-	
-	<div id="moveleftright" class="span-1">
-		<a href="#" id="selectelems"><img src="{{LDT_MEDIA_PREFIX}}img/to-right.gif" title="{% trans "select users" %}"></a><br />
-		<a href="#" id="removeelems"><img src="{{LDT_MEDIA_PREFIX}}img/to-left.gif" title="{% trans "remove users" %}"></a>
-	</div>
-	
-	<div id="memberslistcontainer">
-		<div id="selecteduserslistheader">
-			{% trans "Members list" %}
-		</div>				
-		<select multiple="multiple" id="selecteduserslist" >
-			{% for user in member_list %}
-				<option value="{{ user.id }}-{{user.type}}" {% if is_owner_group and user.change %}style="color: #2181B1;"{% endif %}>{{ user.name }}</option>
-			{% endfor %}
-		</select>
-		<div id="selecteduserslistfooter" >
-			<a href="#" id="removeall" title="{% trans "remove all" %}">{% trans "remove all" %}</a>
-
-			{% if not group_id or is_owner_group %}
-			| <a href="#" id="chooseaux" title="{% trans "Decide whether a user user can change this group" %}">{% trans "is admin" %}</a>
-			| <a href="#" id="removeaux">{% trans "is not admin" %}</a>
-			{% endif %}
-		</div>
-	</div>	
-	
-	<div id="adminselection">
-	{% for user in admin_list %}
-		<input name="write_list" type="hidden" value="{{ user.id }}-{{user.type}}" />
-	{% endfor %}
-	</div>
-	
-	<div id="memberselection">
-	{% for user in member_list %}
-		<input name="read_list" type="hidden" value="{{ user.id }}-{{user.type}}" />
-	{% endfor %}
-	</div>
+	{% include "ldt/ldt_utils/partial/permissions.html" %}
 	
 	<div id="submitcontent-buttons" class="span-12 last">
 		<button type="button" id="close_button"  value="close">{% trans "close_cancel" %}</button>
diff -r 139974288029 -r 50981ee4ff58 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html	Fri Dec 23 16:44:56 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html	Fri Dec 23 17:25:03 2011 +0100
@@ -17,7 +17,11 @@
 	}
 		
 	$(document).ready(function() {
-		var search_url = "{% url ldt.ldt_utils.views.share_filter filter='__FILTER__' use_groups='true' %}";
+		{% if group_edition %}
+			var search_url = "{% url ldt.ldt_utils.views.share_filter filter='__FILTER__' use_groups='false' %}";
+		{% else %}
+			var search_url = "{% url ldt.ldt_utils.views.share_filter filter='__FILTER__' use_groups='true' %}";
+		{% endif %}
 		var share_this = '{% trans "share this project" %}';
 		var do_not_share = '{% trans "do not share" %}';
 		var share_img = '{{LDT_MEDIA_PREFIX}}img/user_add.png';
@@ -112,14 +116,15 @@
 	});
 </script>
 
-
+{% if not group_edition %}
 <div id="shareproject" class="clear">
 <img class="shareicon" src="{{LDT_MEDIA_PREFIX}}img/user_add.png" />{% trans "share" %}
 </div>
+{% endif %}
 
 <input type="hidden" name="share" value="False" id="id_share"/>
 
-<div id="sharecontainer" style="display:none;">
+<div id="sharecontainer" {% if not group_edition %}style="display:none;"{% endif %}>
 
 	<div id="permissioncontainer" class="append-bottom clear">
 		<div id="elemslistcontainer" clas="span-9">
diff -r 139974288029 -r 50981ee4ff58 src/ldt/ldt/ldt_utils/views.py
--- a/src/ldt/ldt/ldt_utils/views.py	Fri Dec 23 16:44:56 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/views.py	Fri Dec 23 17:25:03 2011 +0100
@@ -1300,7 +1300,7 @@
     if request.method == 'POST':
         form = GroupAddForm(request.POST)
         
-        if form.is_valid():          
+        if form.is_valid():         
             name = form.cleaned_data['name']
             members_list = form.cleaned_data['read_list']
             admin_list = form.cleaned_data['write_list']          
@@ -1322,7 +1322,7 @@
     else:
         form = GroupAddForm()
         
-    return render_to_response("ldt/ldt_utils/create_group.html", {'form' : form, 'form_status' : form_status, 'elem_list' : get_userlist(request.user)}, context_instance=RequestContext(request))
+    return render_to_response("ldt/ldt_utils/create_group.html", {'group_edition': True, 'form' : form, 'form_status' : form_status, 'elem_list' : get_userlist(request.user)}, context_instance=RequestContext(request))
 
 @login_required
 def update_group(request, group_id):
@@ -1374,6 +1374,6 @@
         form = GroupAddForm(initial={'name':unicode(group.name)})    
 
     member_list, admin_list = get_userlist_group(group, request.user)
-    return render_to_response("ldt/ldt_utils/create_group.html", {'group_id' : group_id, 'form' : form, 'form_status' : form_status,
+    return render_to_response("ldt/ldt_utils/create_group.html", {'group_id' : group_id, 'form' : form, 'form_status' : form_status, 'group_edition': True,
                                                                   'elem_list' : get_userlist(request.user), 'member_list': member_list, 'admin_list': admin_list,
                                                                   'is_owner_group': is_owner_group}, context_instance=RequestContext(request))
diff -r 139974288029 -r 50981ee4ff58 src/ldt/ldt/static/ldt/js/projectscontents.js
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js	Fri Dec 23 16:44:56 2011 +0100
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js	Fri Dec 23 17:25:03 2011 +0100
@@ -375,7 +375,7 @@
     $('.create_group',base_node).nyroModal({
         filters: ['iriIframe'],
         sizes: {
-            minW: '520',
+            minW: '830',
             minH: '460'
         },
         showCloseButton: true,
@@ -391,7 +391,7 @@
                     }
                         
                 });  
-                nm.store.iframe.width(510);
+                nm.store.iframe.width(820);
                 nm.store.iframe.height(450);
             },
             afterClose: function(nm) {