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.
Commit Julien:
authorrougeronj
Wed, 19 Sep 2012 18:16:19 +0200
changeset 789 d92d032a6d78
parent 788 7413a50c9666
child 790 015f40d64d43
Commit Julien: Champ de recherche de users et groups dans l'ajout de content, amélioré pour que le mot "recherche" disparaisse au moment ou l'on clique sur le champ. Meme modification dans la page "groups". Permettre à un user qui a le droit de creer un group, d'en creer un (le label de la permission est "auth.add_group").
src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html file | annotate | diff | comparison | revisions
src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html file | annotate | diff | comparison | revisions
src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html file | annotate | diff | comparison | revisions
src/ldt/ldt/ldt_utils/views/group.py file | annotate | diff | comparison | revisions 
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html	Wed Sep 19 17:01:18 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html	Wed Sep 19 18:16:19 2012 +0200
@@ -6,8 +6,8 @@
 
 {% block js_import %}
 	{{ block.super }}
-    <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}/js/jquery.nyroModal.min.js"></script> 
-    <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script> 
+    <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.nyroModal.min.js"></script> 
+    <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
 	<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js" ></script> 
 	<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/tiny_mce/tiny_mce.js"></script>
 	{{ content_form.media.js }}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html	Wed Sep 19 17:01:18 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html	Wed Sep 19 18:16:19 2012 +0200
@@ -98,7 +98,7 @@
 			<div class="span-4 last searchfielddiv" >
 				
 				<div class="span-4 last searchfielddiv" >
-			    	<div class="searchfield rounded"><input id="searchgroupsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><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 class="searchfield rounded"><input id="searchgroupsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><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>
 			</div>
 		</div>
@@ -110,7 +110,7 @@
 		<div class="span-12 last titlediv" >
 			<div class="span-8 projectscontentstitle" >{% trans "The group's projects" %}</div>
 			<div class="span-4 last searchfielddiv" >
-			    <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><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 class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><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>
 		</div>
 		<div class="span-12 last projectscontentsdiv" id="projectslistcontainer">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html	Wed Sep 19 17:01:18 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html	Wed Sep 19 18:16:19 2012 +0200
@@ -118,7 +118,11 @@
 		<div id="elemslistcontainer" clas="span-9">
 			<div id="elemslistheader">
 				{% trans "User and group 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 class="searchfield span-4">
+					<input type="text" name="search" id="searchuserinput" class="searchfieldinput searchfieldinputbase" placeholder="{% 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 />
 			
 			<div class="tableuserorgroup">
--- a/src/ldt/ldt/ldt_utils/views/group.py	Wed Sep 19 17:01:18 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/views/group.py	Wed Sep 19 18:16:19 2012 +0200
@@ -33,7 +33,7 @@
 
 @login_required
 def create_group(request):
-    if not request.user.has_perm('add_group'):
+    if not request.user.has_perm('auth.add_group'):
         return HttpResponseServerError('<h1>User %s can not create a group.</h1>' % request.user.username)
 
     form_status = ''
@@ -65,7 +65,6 @@
                         elem.groups.add(group)
                         if elem in admin_list:
                             cached_assign('change_group', elem, group)
-                            
                 form_status = 'saved'
             else:
                 group.delete()
platform