Mercurial Mercurial > platform / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add translations for uneditable groups + change size of modal windows
authorverrierj
Tue, 03 Jan 2012 15:18:32 +0100
changeset 326 7b7325dc4aec
parent 325 f4cb93c06b42
child 327 e801e50edcce
Add translations for uneditable groups + change size of modal windows
src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html file | annotate | diff | comparison | revisions
src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html file | annotate | diff | comparison | revisions
src/ldt/ldt/locale/en/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/ldt/ldt/locale/fr/LC_MESSAGES/django.po file | annotate | diff | comparison | revisions
src/ldt/ldt/static/ldt/js/projectscontents.js file | annotate | diff | comparison | revisions
src/ldt/ldt/user/views.py file | annotate | diff | comparison | revisions 
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html	Tue Jan 03 14:26:19 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html	Tue Jan 03 15:18:32 2012 +0100
@@ -34,10 +34,8 @@
 		if (checkbox.is(":checked")) {
 			$("#removeall").trigger("click");
 			$("#sharelist option").css('color', '');
-			$("#sharelist, #selectedlist").attr("disabled", "disabled");
-		} else {
-			$("#sharelist, #selectedlist").removeAttr("disabled");
-		}
+			$("#shareproject").trigger("click");
+		} 
 	}
 	
 	$(document).ready(function() {
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html	Tue Jan 03 14:26:19 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html	Tue Jan 03 15:18:32 2012 +0100
@@ -12,12 +12,14 @@
 		
 		{% if group.change %}
 			<td class="cellimg">
-			  <a class="grouplink create_group" title="{% trans 'Change this group'%}" href="{% url ldt.ldt_utils.views.group.update_group group.id %}">
-			  <img src="{{LDT_MEDIA_PREFIX}}img/group_edit.png" alt="{% trans 'Change this group' %}" title="{% trans 'Change this group' %}"/></a>
+			 	<a class="grouplink create_group" title="{% trans 'Change this group'%}" href="{% url ldt.ldt_utils.views.group.update_group group.id %}">
+			 	<img src="{{LDT_MEDIA_PREFIX}}img/group_edit.png" alt="{% trans 'Change this group' %}" title="{% trans 'Change this group' %}"/></a>
 			</td>
 			<td><b>{{ group.name }}</b></td>
 		{% else %}
-			<td class="cellimg"></td>
+			<td class="cellimg">
+			 	<img class="grouplink" src="{{ LDT_MEDIA_PREFIX }}img/group.png" title="{% trans "You are not allowed to edit this group" %}"/>
+			</td>
 			<td>{{ group.name }}</td>
 		{% endif %}
 		
@@ -28,7 +30,9 @@
 	
 	{% if not user.is_superuser and not search_active %}
 	<tr class="imageline {% cycle color_cycle %} update_group_projects" id="-1">  
-			<td class="cellimg"></td>
+			<td class="cellimg">
+			 	<img class="grouplink" src="{{ LDT_MEDIA_PREFIX }}img/group.png" title="{% trans "You are not allowed to edit this group" %}"/>
+			</td>
 			<td>{% trans "Projects shared with me only" %}</td>
 			
 			<td class="align_right"><img src="{{LDT_MEDIA_PREFIX}}/img/control_play.png" class="next_icon"/></td>	
--- a/src/ldt/ldt/locale/en/LC_MESSAGES/django.po	Tue Jan 03 14:26:19 2012 +0100
+++ b/src/ldt/ldt/locale/en/LC_MESSAGES/django.po	Tue Jan 03 15:18:32 2012 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:14+0100\n"
+"POT-Creation-Date: 2012-01-03 14:38+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"
@@ -524,7 +524,11 @@
 msgid "Change this group"
 msgstr "Create a group"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:32
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:21
+msgid "You are not allowed to edit this group"
+msgstr "You are not allowed to change this group"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:34
 msgid "Projects shared with me only"
 msgstr "Projects shared with me only"
 
@@ -585,6 +589,7 @@
 msgstr "remove all"
 
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:8
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:40
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:41
 msgid "choose a profile image"
 msgstr "choose a profile image"
--- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po	Tue Jan 03 14:26:19 2012 +0100
+++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po	Tue Jan 03 15:18:32 2012 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 14:15+0100\n"
+"POT-Creation-Date: 2012-01-03 14:37+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"
@@ -517,7 +517,11 @@
 msgid "Change this group"
 msgstr "Modifier ce groupe"
 
-#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:32
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:21
+msgid "You are not allowed to edit this group"
+msgstr "vous n'avez pas l'autorisation de modifier ce groupe"
+
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:34
 msgid "Projects shared with me only"
 msgstr "Projets partagés avec moi uniquement"
 
@@ -577,6 +581,7 @@
 msgstr "tout enlever"
 
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:8
+#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:40
 #: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:41
 msgid "choose a profile image"
 msgstr "choisir une image de profil"
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js	Tue Jan 03 14:26:19 2012 +0100
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js	Tue Jan 03 15:18:32 2012 +0100
@@ -148,7 +148,8 @@
         setTimeout(function() {
             target.next(".searchajaxloader").show();
             target.nextAll(".searchclear").hide();
-            var filterVal = "_" + escape(target.realVal());
+            //var filterVal = "_" + escape(target.realVal());
+            var filterVal = "_" + target.realVal();
             url = url.replace('__FILTER__',filterVal);
             url = url.replace('__ID_GROUP__',$('#id_group').val());
             $.ajax({
--- a/src/ldt/ldt/user/views.py	Tue Jan 03 14:26:19 2012 +0100
+++ b/src/ldt/ldt/user/views.py	Tue Jan 03 15:18:32 2012 +0100
@@ -13,24 +13,20 @@
 @login_required   
 def profile(request):
     msg = ''
-    user_language = request.user.get_profile().language
+    profile = request.user.get_profile()
+    user_language = profile.language
     
     if request.method == "POST":
         profile_form = ProfileForm(request.user, request.POST, instance=request.user)
         language_form = LanguageChangeForm(request.user, request.POST)
         password_form = PasswordChangeForm(request.user)
 
-        #assert False, "before : %s " % request.user.username 
-
         if profile_form.is_valid() and language_form.is_valid():
             profile_form.save()
             language_form.save()  
             set_language(request)
             msg = _("Your profile has been updated.")
-            user_language = request.user.get_profile().language
-
-            
-        #assert False, "after: %s " % request.user.username        
+            user_language = language_form.cleaned_data['language']      
               
     else:
         language_form = LanguageChangeForm()
platform