Projects and contents can be shared or not during edition and creation
authorverrierj
Wed, 21 Dec 2011 11:07:49 +0100
changeset 293 4fd110c8fa26
parent 292 48d9e8297287
child 294 53afb302c3c5
Projects and contents can be shared or not during edition and creation
src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html
src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html
src/ldt/ldt/ldt_utils/views.py
src/ldt/ldt/locale/en/LC_MESSAGES/django.mo
src/ldt/ldt/locale/en/LC_MESSAGES/django.po
src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo
src/ldt/ldt/locale/fr/LC_MESSAGES/django.po
src/ldt/ldt/security/forms.py
src/ldt/ldt/static/ldt/js/projectscontents.js
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html	Fri Dec 16 17:19:22 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html	Wed Dec 21 11:07:49 2011 +0100
@@ -26,12 +26,13 @@
 	function init_events(container) {
 		filter_elems($("#sharelist"),$("#selectedlist"));
 	}	
-	
+
 	$(document).ready(function() {
 		check_uncheck_all("content");
 		
 		var form_status = $("input[name=form_status]").val();
 		var redirect_to = '{{ redirect_to }}';
+		
 		if (form_status == "saved" && redirect_to) {
 			parent.location.href = redirect_to;
 			parent.$.nmTop.close();
@@ -40,8 +41,7 @@
 		$("#close_button").click(function (e) {
 			e.preventDefault();
 			parent.$.nmTop().close();
-		});		
-				
+		});						
 	});
 	</script>
 	<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/tiny_mce/tiny_mce.js"></script>
@@ -66,8 +66,8 @@
 {% endblock %}
 
 {% block body %}
-	<div id="add_contribution" class="span-20 last">
-	<div class="projectscontentstitle span-20 last">{% if ldt_id %}{% trans "Update your project" %}{% else %}{% trans "Create your project" %}{% endif %}</div>
+	<div id="add_contribution" class="span-18 last">
+	<div class="projectscontentstitle span-18 last">{% if ldt_id %}{% trans "Update your project" %}{% else %}{% trans "Create your project" %}{% endif %}</div>
 	<form action="{{create_project_action}}" method="POST" {% if target_parent %}target="_parent"{% endif %}>
 	{% csrf_token %} 
 	<input type="hidden" name="form_status" value="{{form_status}}" id="project_form_status" />	
@@ -114,7 +114,7 @@
 	</div>		
 	
 	{% include "ldt/ldt_utils/partial/permissions.html" %}
-              
+             
     <div id="submitcontent" class="span-18 last">
                    
 	    <div id="submitcontent-buttons" class="span-18 last">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html	Fri Dec 16 17:19:22 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html	Wed Dec 21 11:07:49 2011 +0100
@@ -1,58 +1,96 @@
 {% load i18n %}
 	
 <script type="text/javascript">
-	
+		
 	$(document).ready(function() {
 		var search_url = "{% url ldt.ldt_utils.views.share_filter filter='__FILTER__' use_groups='true' %}";
+		var share_this = '{% trans "share this project" %}';
+		var do_not_share = '{% trans "do not share" %}';
+		var state = 1;
+			
+		if ($("#add_contribution").size()) {
+			var resize_elem = $("#add_contribution");	
+		} else {
+			var resize_elem = $("#add_content");
+		}
+		
+		init_multi_select_events ($("#sharelist"), $("#selectedlist"), $("#read"), $("#write"), "#searchuserinput", search_url);
 
-		init_multi_select_events ($("#sharelist"), $("#selectedlist"), $("#read"), $("#write"), "#searchuserinput", search_url);
+		$("#shareproject").click(function () {
+			if (state == 1) {
+				$("#sharecontainer").show();
+				$("input[id=id_share]").val('True');
+				$(this).html(do_not_share);
+				state = 2;
+			} else {
+				$("#sharecontainer").hide();
+				$("input[id=id_share]").val('False');
+				$(this).html(share_this);
+				state = 1;
+			}
+			
+			resize_modal_window(resize_elem);
+		});
+		
 	});
 </script>
 
-<div id="permissioncontainer" class="append-bottom clear">
-	<div id="elemslistcontainer" clas="span-9">
-		<div id="elemslistheader">
-			{% trans "User list" %}<br />
-			<div class="searchfield 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="sharelist">
-			{% include "ldt/ldt_utils/partial/sharewith.html" %}
-		</select>
-		<div id="elemslistfooter">
-			<a href="#" id="selectall" title="{% trans "select all" %}">{% trans "select all" %}</a>
+
+<div id="shareproject" class="clear">
+	 + Share this project
+</div>
+<input type="hidden" name="share" value="False" id="id_share"/>
+
+
+<div id="sharecontainer" style="display:none;">
+
+	<div id="permissioncontainer" class="append-bottom clear">
+		<div id="elemslistcontainer" clas="span-9">
+			<div id="elemslistheader">
+				{% trans "User list" %}<br />
+				<div class="searchfield 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="sharelist">
+				{% include "ldt/ldt_utils/partial/sharewith.html" %}
+			</select>
+			<div id="elemslistfooter">
+				<a href="#" id="selectall" title="{% trans "select all" %}">{% trans "select all" %}</a>
+			</div>
 		</div>
-	</div>
-	
-	<div id="selectors">
-		<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="selectedlistcontainer" class="span-9 last">
-		<div id="selectedlistheader" >
-			{% trans "Members list" %}
+		
+		<div id="selectors">
+			<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>
-		<select multiple="multiple" id="selectedlist" >
-			{% for elem in member_list %}
-				<option value="{{ elem.id }}-{{elem.type}}" {% if elem.change %}style="color: #2181B1;"{% endif %}>{{ elem.name }}</option>
-			{% endfor %}
-		</select>
-		<div id="selectedlistfooter" class="span-6" >
-			<a href="#" id="removeall" title="{% trans "remove all" %}">{% trans "remove all" %}</a>
-			| <a href="#" id="chooseaux" title="{% trans "Decide whether a user user can change this group" %}">{% trans "can change" %}</a>
-			| <a href="#" id="removeaux">{% trans "can not change" %}</a>
-		</div>	
-	</div>
 	
-	<div id="read">
-	{% for elem in member_list %}
-		<input type="hidden" value="{{ elem.id }}-{{ elem.type }}" name="read_list"/>
-	{% endfor %}
-	</div>
+		<div id="selectedlistcontainer" class="span-9 last">
+			<div id="selectedlistheader" >
+				{% trans "Members list" %}
+			</div>
+			<select multiple="multiple" id="selectedlist" >
+				{% for elem in member_list %}
+					<option value="{{ elem.id }}-{{elem.type}}" {% if elem.change %}style="color: #2181B1;"{% endif %}>{{ elem.name }}</option>
+				{% endfor %}
+			</select>
+			<div id="selectedlistfooter" class="span-6" >
+				<a href="#" id="removeall" title="{% trans "remove all" %}">{% trans "remove all" %}</a>
+				| <a href="#" id="chooseaux" title="{% trans "Decide whether a user user can change this group" %}">{% trans "can change" %}</a>
+				| <a href="#" id="removeaux">{% trans "can not change" %}</a>
+			</div>	
+		</div>
+		
+		<div id="read">
+		{% for elem in member_list %}
+			<input type="hidden" value="{{ elem.id }}-{{ elem.type }}" name="read_list"/>
+		{% endfor %}
+		</div>
+		
+		<div id="write">
+		{% for elem in admin_list %}
+			<input type="hidden" value="{{ elem.id }}-{{ elem.type }}" name="write_list"/>
+		{% endfor %}
+		</div>
+	</div> 
+
+</div>
 	
-	<div id="write">
-	{% for elem in admin_list %}
-		<input type="hidden" value="{{ elem.id }}-{{ elem.type }}" name="write_list"/>
-	{% endfor %}
-	</div>
-</div>  
--- a/src/ldt/ldt/ldt_utils/views.py	Fri Dec 16 17:19:22 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/views.py	Wed Dec 21 11:07:49 2011 +0100
@@ -448,19 +448,21 @@
         form_status = "none"
         contents = Content.safe_objects.all()
            
-        if form.is_valid():          
+        if form.is_valid():              
+                     
             user = request.user            
             project = Project.create_project(title=form.cleaned_data['title'], user=user, 
                                              contents=form.cleaned_data['contents'],
                                              description=form.cleaned_data['description'])
   
-            assign_perm_to_obj(project, form.cleaned_data["read_list"], form.cleaned_data["write_list"], user)
+            if form.cleaned_data["share"]:
+                assign_perm_to_obj(project, form.cleaned_data["read_list"], form.cleaned_data["write_list"], user)
             form_status = "saved"
             is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1);
             if is_gecko :
                 redirect_to = reverse('index_project_full', args=[project.ldt_id])
             else:
-                return HttpResponseRedirect(reverse('index_project', args=[project.ldt_id]))       
+                return HttpResponseRedirect(reverse('index_project', args=[project.ldt_id]))   
      
     else:
         form = LdtAddForm()
@@ -1295,7 +1297,7 @@
         if form.is_valid():          
             name = form.cleaned_data['name']
             members_list = form.cleaned_data['read_list']
-            admin_list = form.cleaned_data['write_list']            
+            admin_list = form.cleaned_data['write_list']          
             
             group = Group.objects.create(name=name)
             group.save()
Binary file src/ldt/ldt/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/ldt/ldt/locale/en/LC_MESSAGES/django.po	Fri Dec 16 17:19:22 2011 +0100
+++ b/src/ldt/ldt/locale/en/LC_MESSAGES/django.po	Wed Dec 21 11:07:49 2011 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 12:18+0100\n"
+"POT-Creation-Date: 2011-12-16 17:58+0100\n"
 "PO-Revision-Date: 2010-02-17 03:53+0100\n"
 "Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,61 +24,61 @@
 msgid "Time"
 msgstr "Time"
 
-#: .\ldt_utils\forms.py:33
+#: .\ldt_utils\forms.py:28
 #: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:52
 msgid "Search"
 msgstr "search"
 
-#: .\ldt_utils\forms.py:34
+#: .\ldt_utils\forms.py:29
 msgid "all"
 msgstr "all"
 
-#: .\ldt_utils\forms.py:34 .\ldt_utils\models.py:47
+#: .\ldt_utils\forms.py:29 .\ldt_utils\models.py:47
 #: .\ldt_utils\templates\ldt\ldt_utils\content_list.html.py:69
 msgid "title"
 msgstr "title"
 
-#: .\ldt_utils\forms.py:34
+#: .\ldt_utils\forms.py:29
 msgid "resume"
 msgstr "resume"
 
-#: .\ldt_utils\forms.py:34
+#: .\ldt_utils\forms.py:29
 msgid "tags"
 msgstr "tags"
 
-#: .\ldt_utils\forms.py:34
+#: .\ldt_utils\forms.py:29
 msgid "Fields"
 msgstr "Fields"
 
-#: .\ldt_utils\forms.py:35
+#: .\ldt_utils\forms.py:30
 msgid "Display the results in Lignes De Temps"
 msgstr "Display the results in Lignes De Temps"
 
-#: .\ldt_utils\forms.py:51 .\ldt_utils\models.py:125
+#: .\ldt_utils\forms.py:46 .\ldt_utils\models.py:125
 msgid "content.content_creation_date"
 msgstr "content creation date"
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "content.media_input_type"
 msgstr "Media source type"
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "file_upload"
 msgstr "file upload"
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "url"
 msgstr "url"
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "existing_media"
 msgstr "existing media"
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "create_media"
 msgstr "create media"
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "none_media"
 msgstr "no media"
 
@@ -178,29 +178,29 @@
 msgid "Personal cutting"
 msgstr "Personal cutting"
 
-#: .\ldt_utils\views.py:123 .\ldt_utils\views.py:652 .\ldt_utils\views.py:698
+#: .\ldt_utils\views.py:120 .\ldt_utils\views.py:651 .\ldt_utils\views.py:697
 msgid "You can not access this project"
 msgstr "You can not access this project"
 
-#: .\ldt_utils\views.py:871
+#: .\ldt_utils\views.py:870
 #, python-format
 msgid "the project %(title)s is published. please unpublish before deleting."
 msgstr "the project %(title)s is published. please unpublish before deleting."
 
-#: .\ldt_utils\views.py:872
+#: .\ldt_utils\views.py:871
 msgid "can not delete the project. Please correct the following error"
 msgstr "can not delete the project. Please correct the following error"
 
-#: .\ldt_utils\views.py:873
+#: .\ldt_utils\views.py:872
 msgid "title error deleting project"
 msgstr "Error when deleting project"
 
-#: .\ldt_utils\views.py:875
+#: .\ldt_utils\views.py:874
 #, python-format
 msgid "please confirm deleting project %(title)s"
 msgstr "Please confirm deleting project %(title)s"
 
-#: .\ldt_utils\views.py:876
+#: .\ldt_utils\views.py:875
 msgid "confirm deletion"
 msgstr "Confirm deletion"
 
@@ -212,27 +212,27 @@
 msgid "Problem when uploading file : "
 msgstr "Problem when uploading file: "
 
-#: .\ldt_utils\views.py:1156
+#: .\ldt_utils\views.py:1157
 #, python-format
 msgid "There is %(count)d error when deleting content"
 msgid_plural "There are %(count)d errors when deleting content"
 msgstr[0] "There is %(count)d error when deleting content"
 msgstr[1] "There are %(count)d errors when deleting content"
 
-#: .\ldt_utils\views.py:1157
+#: .\ldt_utils\views.py:1158
 msgid "title error deleting content"
 msgstr "Error when deleting content"
 
-#: .\ldt_utils\views.py:1159
+#: .\ldt_utils\views.py:1160
 #, python-format
 msgid "Confirm delete content %(titles)s"
 msgstr "Confirm delete content %(titles)s"
 
-#: .\ldt_utils\views.py:1160
+#: .\ldt_utils\views.py:1161
 msgid "confirm delete content"
 msgstr "Confirm delete content"
 
-#: .\ldt_utils\views.py:1198
+#: .\ldt_utils\views.py:1199
 #, python-format
 msgid ""
 "Content '%(title)s' is referenced by this project : %(project_titles)s. "
@@ -289,7 +289,7 @@
 msgstr "Copy your project"
 
 #: .\ldt_utils\templates\ldt\ldt_utils\copy_ldt.html.py:17
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:76
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:97
 msgid "Title"
 msgstr "Title"
 
@@ -297,24 +297,24 @@
 msgid "Copy"
 msgstr "Copy"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:42
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:52
 msgid "Browse"
 msgstr "Browse"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:43
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:53
 msgid "File uploaded"
 msgstr "File uploaded"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:44
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:54
 msgid "Please wait, the upload is not finished yet"
 msgstr "Please wait, the upload is not finished yet"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:45
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:55
 #, fuzzy
 msgid "Cancel upload"
 msgstr "Cancel upload"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:58
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:74
 msgid ""
 "The operation could not be performed because one or more error(s) occurred."
 "<br />Please resubmit the media form after making the following changes:"
@@ -322,31 +322,31 @@
 "The operation could not be performed because one or more error(s) occurred."
 "<br />Please resubmit the media form after making the following changes:"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:68
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:84
 #: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:54
 msgid "Create content"
 msgstr "Create content"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:86
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:102
 msgid "publish for everyone"
 msgstr "publish for everyone"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:117
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:133
 msgid "media file is being processed please wait."
 msgstr "media file is being processed please wait."
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:121
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:137
 #: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:137
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:121
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:149
 #: .\ldt_utils\templates\ldt\ldt_utils\error_confirm.html.py:52
 msgid "close_cancel"
 msgstr "Close"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:122
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:138
 msgid "delete"
 msgstr "Approve delete"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:123
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:139
 msgid "write"
 msgstr "Write"
 
@@ -370,7 +370,8 @@
 msgstr "User details"
 
 #: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:90
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:102
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:97
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:109
 #: .\ldt_utils\templates\ldt\ldt_utils\ldt_list.html.py:79
 #: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:70
 #: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:56
@@ -431,39 +432,47 @@
 msgid "create_group"
 msgstr "Create a group"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:36
+msgid "share this project"
+msgstr "share this project"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:37
+msgid "do not share"
+msgstr "do not share this project"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:91
 msgid "Update your project"
 msgstr "Create your project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:91
 msgid "Create your project"
 msgstr "Create your project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:81
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:102
 #, fuzzy
 msgid "Description :"
 msgstr "description"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:86
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:107
 msgid "List of contents"
 msgstr "List of contents"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:100
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:121
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:3
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:3
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:3
 msgid "name"
 msgstr "name"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:123
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:151
 msgid "delete_project"
 msgstr "delete project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:124
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:152
 msgid "update_project"
 msgstr "update project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:126
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:154
 msgid "create_project"
 msgstr "Create new project"
 
@@ -511,21 +520,21 @@
 msgid "do_delete"
 msgstr "Approve delete"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:62
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:64
 msgid "Do you want to leave this group ?"
 msgstr "Do you want to leave this group ?"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:87
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:89
 #: .\templates\ldt\ldt_base.html.py:112
 msgid "My groups"
 msgstr "My groups"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:90
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:91
 #, fuzzy
 msgid "Create group"
 msgstr "Create new project"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:100
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:107
 #, fuzzy
 msgid "The group's projects"
 msgstr "The group's project"
@@ -629,7 +638,7 @@
 msgid "Change this group"
 msgstr "Create a group"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:27
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:29
 msgid "Projects shared with me only"
 msgstr "Projects shared with me only"
 
Binary file src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po	Fri Dec 16 17:19:22 2011 +0100
+++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po	Wed Dec 21 11:07:49 2011 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 12:17+0100\n"
+"POT-Creation-Date: 2011-12-16 17:57+0100\n"
 "PO-Revision-Date: 2010-03-09 15:52+0100\n"
 "Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,61 +24,61 @@
 msgid "Time"
 msgstr "Heure"
 
-#: .\ldt_utils\forms.py:33
+#: .\ldt_utils\forms.py:28
 #: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:52
 msgid "Search"
 msgstr "Recherche"
 
-#: .\ldt_utils\forms.py:34
+#: .\ldt_utils\forms.py:29
 msgid "all"
 msgstr "tous"
 
-#: .\ldt_utils\forms.py:34 .\ldt_utils\models.py:47
+#: .\ldt_utils\forms.py:29 .\ldt_utils\models.py:47
 #: .\ldt_utils\templates\ldt\ldt_utils\content_list.html.py:69
 msgid "title"
 msgstr "titre"
 
-#: .\ldt_utils\forms.py:34
+#: .\ldt_utils\forms.py:29
 msgid "resume"
 msgstr "description"
 
-#: .\ldt_utils\forms.py:34
+#: .\ldt_utils\forms.py:29
 msgid "tags"
 msgstr "tags"
 
-#: .\ldt_utils\forms.py:34
+#: .\ldt_utils\forms.py:29
 msgid "Fields"
 msgstr "Champs"
 
-#: .\ldt_utils\forms.py:35
+#: .\ldt_utils\forms.py:30
 msgid "Display the results in Lignes De Temps"
 msgstr "Afficher les résultats dans Lignes De Temps"
 
-#: .\ldt_utils\forms.py:51 .\ldt_utils\models.py:125
+#: .\ldt_utils\forms.py:46 .\ldt_utils\models.py:125
 msgid "content.content_creation_date"
 msgstr "Date de création du contenu"
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "content.media_input_type"
 msgstr "Source du média"
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "file_upload"
 msgstr "upload fichier"
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "url"
 msgstr "url"
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "existing_media"
 msgstr "média existant"
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "create_media"
 msgstr "source externe : fichier streamé, statique, url youtube..."
 
-#: .\ldt_utils\forms.py:52
+#: .\ldt_utils\forms.py:47
 msgid "none_media"
 msgstr "Aucun"
 
@@ -178,30 +178,30 @@
 msgid "Personal cutting"
 msgstr "Découpages personnels"
 
-#: .\ldt_utils\views.py:123 .\ldt_utils\views.py:652 .\ldt_utils\views.py:698
+#: .\ldt_utils\views.py:120 .\ldt_utils\views.py:651 .\ldt_utils\views.py:697
 msgid "You can not access this project"
 msgstr "vous n'avez pas l'autorisation d'accéder à ce projet"
 
-#: .\ldt_utils\views.py:871
+#: .\ldt_utils\views.py:870
 #, python-format
 msgid "the project %(title)s is published. please unpublish before deleting."
 msgstr "Le projet %(title)s est publié. Déplublier le avant de l'effacer."
 
-#: .\ldt_utils\views.py:872
+#: .\ldt_utils\views.py:871
 msgid "can not delete the project. Please correct the following error"
 msgstr ""
 "Le projet ne peut pas être effacé. Veuillez corriger les erreurs suivantes."
 
-#: .\ldt_utils\views.py:873
+#: .\ldt_utils\views.py:872
 msgid "title error deleting project"
 msgstr "Erreur lors de l'effacement du projet"
 
-#: .\ldt_utils\views.py:875
+#: .\ldt_utils\views.py:874
 #, python-format
 msgid "please confirm deleting project %(title)s"
 msgstr "Confirmer l'effacement du projet intitulé %(title)s"
 
-#: .\ldt_utils\views.py:876
+#: .\ldt_utils\views.py:875
 msgid "confirm deletion"
 msgstr "Confirmation d'effacement"
 
@@ -213,27 +213,27 @@
 msgid "Problem when uploading file : "
 msgstr "Problème lors de l'upload du fichier : "
 
-#: .\ldt_utils\views.py:1156
+#: .\ldt_utils\views.py:1157
 #, python-format
 msgid "There is %(count)d error when deleting content"
 msgid_plural "There are %(count)d errors when deleting content"
 msgstr[0] "Il y a %(count)d erreur lors de l'effacement du contenu"
 msgstr[1] "Il y a %(count)d erreurs lors de l'effacement du contenu"
 
-#: .\ldt_utils\views.py:1157
+#: .\ldt_utils\views.py:1158
 msgid "title error deleting content"
 msgstr "Erreur lors de l'effacement du contenu"
 
-#: .\ldt_utils\views.py:1159
+#: .\ldt_utils\views.py:1160
 #, python-format
 msgid "Confirm delete content %(titles)s"
 msgstr "Veuillez confirmer l'effacement du contenu %(titles)s"
 
-#: .\ldt_utils\views.py:1160
+#: .\ldt_utils\views.py:1161
 msgid "confirm delete content"
 msgstr "Confirmation effacement contenu"
 
-#: .\ldt_utils\views.py:1198
+#: .\ldt_utils\views.py:1199
 #, python-format
 msgid ""
 "Content '%(title)s' is referenced by this project : %(project_titles)s. "
@@ -290,7 +290,7 @@
 msgstr "Copier votre projet"
 
 #: .\ldt_utils\templates\ldt\ldt_utils\copy_ldt.html.py:17
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:76
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:97
 msgid "Title"
 msgstr "Titre"
 
@@ -298,23 +298,23 @@
 msgid "Copy"
 msgstr "Copier"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:42
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:52
 msgid "Browse"
 msgstr "Parcourir"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:43
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:53
 msgid "File uploaded"
 msgstr "Fichier téléversé"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:44
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:54
 msgid "Please wait, the upload is not finished yet"
 msgstr "Veuillez patienter, le téléversement est en cours"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:45
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:55
 msgid "Cancel upload"
 msgstr "Annuler le téléversement"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:58
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:74
 msgid ""
 "The operation could not be performed because one or more error(s) occurred."
 "<br />Please resubmit the media form after making the following changes:"
@@ -322,31 +322,31 @@
 "opération impossible à cause d'une ou plusieurs erreurs.<br />Veuillez "
 "resoumettre le formulaire media après avoir fait les changements suivants:"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:68
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:84
 #: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:54
 msgid "Create content"
 msgstr "Créer un contenu"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:86
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:102
 msgid "publish for everyone"
 msgstr "publier pour tout le monde"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:117
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:133
 msgid "media file is being processed please wait."
 msgstr "Le fichier média est en cours de traitement. Veuillez patienter."
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:121
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:137
 #: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:137
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:121
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:149
 #: .\ldt_utils\templates\ldt\ldt_utils\error_confirm.html.py:52
 msgid "close_cancel"
 msgstr "Fermer"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:122
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:138
 msgid "delete"
 msgstr "Effacer"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:123
+#: .\ldt_utils\templates\ldt\ldt_utils\create_content.html.py:139
 msgid "write"
 msgstr "Enregistrer"
 
@@ -369,7 +369,8 @@
 msgstr "Liste des utilisateurs"
 
 #: .\ldt_utils\templates\ldt\ldt_utils\create_group.html.py:90
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:102
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:97
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:109
 #: .\ldt_utils\templates\ldt\ldt_utils\ldt_list.html.py:79
 #: .\ldt_utils\templates\ldt\ldt_utils\published_projects.html.py:70
 #: .\ldt_utils\templates\ldt\ldt_utils\workspace_base.html.py:56
@@ -429,38 +430,46 @@
 msgid "create_group"
 msgstr "Créer un nouveau groupe"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:36
+msgid "share this project"
+msgstr "partager ce projet"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:37
+msgid "do not share"
+msgstr "ne pas partager ce projet"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:91
 msgid "Update your project"
 msgstr "Mettre à jour votre projet Lignes de Temps"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:70
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:91
 msgid "Create your project"
 msgstr "Créer votre projet Lignes de Temps"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:81
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:102
 msgid "Description :"
 msgstr "Description :"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:86
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:107
 msgid "List of contents"
 msgstr "Liste de contenus"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:100
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:121
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\contentslist.html.py:3
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\projectslist.html.py:3
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\publishedprojectslist.html.py:3
 msgid "name"
 msgstr "Nom"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:123
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:151
 msgid "delete_project"
 msgstr "Effacer"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:124
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:152
 msgid "update_project"
 msgstr "Mettre à jour"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:126
+#: .\ldt_utils\templates\ldt\ldt_utils\create_ldt.html.py:154
 msgid "create_project"
 msgstr "Créer un nouveau projet Ligne de Temps"
 
@@ -508,20 +517,20 @@
 msgid "do_delete"
 msgstr "Effacer"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:62
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:64
 msgid "Do you want to leave this group ?"
 msgstr "Voulez-vous quitter ce groupe ?"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:87
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:89
 #: .\templates\ldt\ldt_base.html.py:112
 msgid "My groups"
 msgstr "Groupes"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:90
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:91
 msgid "Create group"
 msgstr "Créer un nouveau groupe"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:100
+#: .\ldt_utils\templates\ldt\ldt_utils\groups.html.py:107
 msgid "The group's projects"
 msgstr "projets du groupe"
 
@@ -622,7 +631,7 @@
 msgid "Change this group"
 msgstr "Modifier ce groupe"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:27
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:29
 msgid "Projects shared with me only"
 msgstr "Projets partagés avec moi uniquement"
 
--- a/src/ldt/ldt/security/forms.py	Fri Dec 16 17:19:22 2011 +0100
+++ b/src/ldt/ldt/security/forms.py	Wed Dec 21 11:07:49 2011 +0100
@@ -1,6 +1,6 @@
 from django import forms
 from django.contrib.auth.models import User, Group
-from django.forms.widgets import MultipleHiddenInput
+from django.forms.widgets import HiddenInput, MultipleHiddenInput
 
 class LazyMultipleChoiceField(forms.MultipleChoiceField):
     
@@ -10,6 +10,7 @@
 class ShareForm(forms.ModelForm):
     read_list = LazyMultipleChoiceField(required=False, widget=MultipleHiddenInput())
     write_list = LazyMultipleChoiceField(required=False, widget=MultipleHiddenInput()) 
+    share = forms.BooleanField(required=False, initial=False, widget=HiddenInput())
 
     def clean(self):
         super(ShareForm, self).clean()
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js	Fri Dec 16 17:19:22 2011 +0100
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js	Wed Dec 21 11:07:49 2011 +0100
@@ -60,7 +60,7 @@
     	position: {
     		my: 'top left',
     		at: 'bottom left',
-    	}   	
+    	}
     });
     
     $('.infostooltip').each( function () {
@@ -162,6 +162,9 @@
                     }
                     init_events($(container_selector));
                     target.removeAttr('timer');
+                },
+                error: function(jqXHR, textStatus, errorThrown) {
+                	alert(jqXHR.responseText);
                 }
             });  
         },
@@ -180,7 +183,7 @@
         filters: ['iframe'],
         sizes: {
             minW: 740,
-            minH: 810
+            minH: 500
         },
         closeOnClick:false,
         callbacks: {
@@ -195,8 +198,8 @@
                     }
                 });                
 
-                nm.store.iframe.width(740);
-                nm.store.iframe.height(800);
+                nm.store.iframe.width(730);
+                nm.store.iframe.height(490);
             }
         }
     });
@@ -215,7 +218,7 @@
         filters: ['iframe'],
         sizes: {
             minW: 740,
-            minH: 810
+            minH: 500
         },
         closeOnClick:false,
         callbacks: {
@@ -231,7 +234,7 @@
                   });
                 
                 nm.store.iframe.width(740);
-                nm.store.iframe.height(800);
+                nm.store.iframe.height(490);
             }
         }
     });
@@ -284,7 +287,7 @@
 function init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
 
     init_modal_window ('.ldt_link_open_ldt', 1035, 670, 1025, 660, base_node, searchprojectfilterurl);
-    init_modal_window ('.ldt_link_create_project', 740, 650, 820, 640, base_node, searchprojectfilterurl);
+    init_modal_window ('.ldt_link_create_project', 750, 400, 740, 390, base_node, searchprojectfilterurl);
     init_modal_window ('.ldt_link_copy_project', 500, 150, 500, 150, base_node, searchprojectfilterurl);
     
     $('.publishedproject', base_node).click(function(e) {
@@ -329,14 +332,13 @@
 
     $('.projecttitlelink').each(function(i){
         $(this).attr("target","_blank");
-    });
-    
+    });    
     
     $('.projecttitlelink').nyroModal({
         filters: ['iframe'],
         sizes: {
-            minW: '740',
-            minH: '650'
+            minW: '750',
+            minH: '400'
         },
         closeOnClick:false,
         callbacks: {
@@ -352,8 +354,8 @@
                     }
                   });
 
-                nm.store.iframe.width(820);
-                nm.store.iframe.height(640);
+                nm.store.iframe.width(740);
+                nm.store.iframe.height(390);
             }
         }
     });