the code works, but is not totally clean. all the parts meant to be removed are commented. group_management
authorcavaliet
Wed, 10 Aug 2011 16:45:51 +0200
branchgroup_management
changeset 129 e9f11d142db5
parent 128 503e365a3af7
child 130 1cc949de2d1f
the code works, but is not totally clean. all the parts meant to be removed are commented.
src/ldt/ldt/admin.py
src/ldt/ldt/management/__init__.py
src/ldt/ldt/user/admin.py
src/ldt/ldt/user/models.py
src/ldt/ldt/user/templates/ldt/user/change_password.html
--- a/src/ldt/ldt/admin.py	Wed Aug 10 12:40:29 2011 +0200
+++ b/src/ldt/ldt/admin.py	Wed Aug 10 16:45:51 2011 +0200
@@ -1,31 +1,31 @@
-#from django.contrib import admin
-from ldt.management import test_cms
-
-"""
-site admin pour cms page
-"""
-if test_cms():
-    pass
-#    class AdminSite(admin.AdminSite):
-#        index_template = 'admin/page_index.html'
-#        login_template = 'admin/page_login.html'
-#        app_index_template = 'admin/page_app_index.html'    
-        
-#    admin_site = AdminSite()
-
-#    from cms.models import Page
-#    from cms.admin import pageadmin
-
-#    class CmsPageAdmin(pageadmin.PageAdmin):
-#        change_list_template = "admin/cms_change_list.html"
-#       change_form_template = "admin/cms_change_form.html"
-
-#    admin_site.register(Page, CmsPageAdmin)
-
-#    from cms.plugins.snippet.models import Snippet
-#    from cms.plugins.snippet.admin import SnippetAdmin
-
-#    class CmsSnippetAdmin(SnippetAdmin):
-#        change_form_template = "admin/page_change_form.html"
-#        change_list_template = "admin/page_change_list.html"
-#    admin_site.register(Snippet, CmsSnippetAdmin)
+##from django.contrib import admin
+#from ldt.management import test_cms
+#
+#"""
+#site admin pour cms page
+#"""
+#if test_cms():
+#    pass
+##    class AdminSite(admin.AdminSite):
+##        index_template = 'admin/page_index.html'
+##        login_template = 'admin/page_login.html'
+##        app_index_template = 'admin/page_app_index.html'    
+#        
+##    admin_site = AdminSite()
+#
+##    from cms.models import Page
+##    from cms.admin import pageadmin
+#
+##    class CmsPageAdmin(pageadmin.PageAdmin):
+##        change_list_template = "admin/cms_change_list.html"
+##       change_form_template = "admin/cms_change_form.html"
+#
+##    admin_site.register(Page, CmsPageAdmin)
+#
+##    from cms.plugins.snippet.models import Snippet
+##    from cms.plugins.snippet.admin import SnippetAdmin
+#
+##    class CmsSnippetAdmin(SnippetAdmin):
+##        change_form_template = "admin/page_change_form.html"
+##        change_list_template = "admin/page_change_list.html"
+##    admin_site.register(Snippet, CmsSnippetAdmin)
--- a/src/ldt/ldt/management/__init__.py	Wed Aug 10 12:40:29 2011 +0200
+++ b/src/ldt/ldt/management/__init__.py	Wed Aug 10 16:45:51 2011 +0200
@@ -3,7 +3,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import signals
-from ldt.user.models import ldt, IriGroup
+from ldt.user.models import ldt#, IriGroup
 # import logging
 
     
@@ -12,10 +12,10 @@
     
 signals.post_save.connect(post_save_ldt, ldt) 
 
-def post_save_irigroup(instance, raw, created, **kwargs):
-    signals.post_save.send(sender=Group, instance=instance, raw=raw, created=created)
-    
-signals.post_save.connect(post_save_irigroup, IriGroup) 
+#def post_save_irigroup(instance, raw, created, **kwargs):
+#    signals.post_save.send(sender=Group, instance=instance, raw=raw, created=created)
+#    
+#signals.post_save.connect(post_save_irigroup, IriGroup) 
 
 def post_save_user(instance, raw, created, **kwargs):
     if created:
--- a/src/ldt/ldt/user/admin.py	Wed Aug 10 12:40:29 2011 +0200
+++ b/src/ldt/ldt/user/admin.py	Wed Aug 10 16:45:51 2011 +0200
@@ -2,8 +2,8 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from django.utils.translation import ugettext as _
-from forms import ldtForm, IriGroupForm
-from models import ldt, IriGroup
+from forms import ldtForm#, IriGroupForm
+from models import ldt#, IriGroup
 
 class ldtAdmin(UserAdmin):    
     list_display = ('username', 'email', 'first_name', 'last_name')
@@ -31,10 +31,10 @@
 admin.site.unregister(ldt)
 admin.site.register(ldt, ldtAdmin)
 
-class IriGroupAdmin(admin.ModelAdmin):
-    form = IriGroupForm
-    model = IriGroup
-    filter_horizontal = ('permissions',)
-    
-admin.site.unregister(IriGroup)
-admin.site.register(IriGroup, IriGroupAdmin)
+#class IriGroupAdmin(admin.ModelAdmin):
+#    form = IriGroupForm
+#    model = IriGroup
+#    filter_horizontal = ('permissions',)
+#    
+#admin.site.unregister(IriGroup)
+#admin.site.register(IriGroup, IriGroupAdmin)
--- a/src/ldt/ldt/user/models.py	Wed Aug 10 12:40:29 2011 +0200
+++ b/src/ldt/ldt/user/models.py	Wed Aug 10 16:45:51 2011 +0200
@@ -1,18 +1,18 @@
 from django.contrib import admin
-from django.contrib.auth.models import User, Group, UserManager
-from django.db import models
+from django.contrib.auth.models import User, UserManager#, Group
+#from django.db import models
 import datetime
 
 
-class IriGroup(Group):
-    description = models.TextField(null=True, blank=True)
-    
-    def __unicode__(self):
-        return self.name
+#class IriGroup(Group):
+#    description = models.TextField(null=True, blank=True)
+#    
+#    def __unicode__(self):
+#        return self.name
 
             
 class ldt(User):
-    irigroups = models.ManyToManyField(IriGroup, blank=True)
+#    irigroups = models.ManyToManyField(IriGroup, blank=True)
     
     class Meta:
         verbose_name = 'iri user'
@@ -38,4 +38,4 @@
 User.objects.contribute_to_class(User, "objects")
 
 admin.site.register(ldt)
-admin.site.register(IriGroup)
+#admin.site.register(IriGroup)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/user/templates/ldt/user/change_password.html	Wed Aug 10 16:45:51 2011 +0200
@@ -0,0 +1,35 @@
+{% extends "ldt/user/user_base.html" %}
+{# form of email address's change #}
+{% load i18n %}
+{% block breadcrumb %}
+    <li></li>
+    <li><a href="{% url ldt.user.views.profile %}">{% trans "Profiles" %}</a></li>
+    <li>{% trans "Modification de l'adresse émail" %}</li>
+{% endblock %}
+
+{% block content_title %}{% trans "Modification de l'adresse émail" %}{% endblock %}
+{% block js_declaration %}{{ block.super }}
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $("#change_email").validate();
+        });
+    </script>
+{% endblock %}
+{% block css_import %}
+{{ block.super }}
+    <style type="text/css">
+        label.error { float: none; color: red; padding-left: .5em; vertical-align: middle; }
+    </style>
+{% endblock %}
+
+{% block iricontent %}
+		<form method="post" id="my_form"
+			action="{% url ldt.ldt_utils.views.searchIndex %}"
+			accept-charset="utf-8">
+		{% csrf_token %}
+		<table>
+			{{ form.as_table }}
+		</table>
+		<input type="submit" class="search_submit" /></form>
+		</div>
+{% endblock%}