From 07222ca74ad5fcecb654b9280fe95a1e48f5a89c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Larchev=C3=AAque?= Date: Thu, 2 Feb 2012 14:21:00 -0500 Subject: [PATCH] 1.1 --- CHANGES | 7 ++++++- auf/django/skin/context_processors.py | 9 +++++++++ auf/django/skin/static/skin/images/favicon.ico | Bin 4286 -> 4286 bytes auf/django/skin/static/skin/images/logo_auf.gif | Bin 6296 -> 6296 bytes auf/django/skin/static/skin/images/menu.png | Bin 251 -> 251 bytes auf/django/skin/templates/admin/base.html | 18 +++++++++--------- setup.py | 2 +- 7 files changed, 25 insertions(+), 11 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 CHANGES mode change 100644 => 100755 MANIFEST.in mode change 100644 => 100755 README mode change 100644 => 100755 auf/__init__.py mode change 100644 => 100755 auf/django/__init__.py mode change 100644 => 100755 auf/django/skin/__init__.py mode change 100644 => 100755 auf/django/skin/context_processors.py mode change 100644 => 100755 auf/django/skin/static/skin/css/admin.css mode change 100644 => 100755 auf/django/skin/static/skin/css/auf.css mode change 100644 => 100755 auf/django/skin/static/skin/images/favicon.ico mode change 100644 => 100755 auf/django/skin/static/skin/images/logo_auf.gif mode change 100644 => 100755 auf/django/skin/static/skin/images/menu.png mode change 100644 => 100755 auf/django/skin/templates/404.html mode change 100644 => 100755 auf/django/skin/templates/500.html mode change 100644 => 100755 auf/django/skin/templates/actions.html mode change 100644 => 100755 auf/django/skin/templates/admin/base.html mode change 100644 => 100755 auf/django/skin/templates/admin/base_site.html mode change 100644 => 100755 auf/django/skin/templates/admin/form_utils/better_form.html mode change 100644 => 100755 auf/django/skin/templates/admin/form_utils/field.html mode change 100644 => 100755 auf/django/skin/templates/base.html mode change 100644 => 100755 auf/django/skin/templates/breadcrumb.html mode change 100644 => 100755 auf/django/skin/templates/footer.html mode change 100644 => 100755 auf/django/skin/templates/menu.html mode change 100644 => 100755 auf/django/skin/templates/registration/login.html mode change 100644 => 100755 auf/django/skin/templates/skin/demo.html mode change 100644 => 100755 auf/django/skin/templatetags/auf_menu.py mode change 100644 => 100755 auf/django/skin/views.py mode change 100644 => 100755 setup.cfg mode change 100644 => 100755 setup.py diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/CHANGES b/CHANGES old mode 100644 new mode 100755 index 496f02f..cdcd3a8 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,9 @@ -0.17dev (2012-01-12) +1.1 +--- + +* Cacher le changement de mdp pour les comptes employés + +1.0 (2012-01-12) -------------------- - Django 1.3 ready diff --git a/MANIFEST.in b/MANIFEST.in old mode 100644 new mode 100755 diff --git a/README b/README old mode 100644 new mode 100755 diff --git a/auf/__init__.py b/auf/__init__.py old mode 100644 new mode 100755 diff --git a/auf/django/__init__.py b/auf/django/__init__.py old mode 100644 new mode 100755 diff --git a/auf/django/skin/__init__.py b/auf/django/skin/__init__.py old mode 100644 new mode 100755 diff --git a/auf/django/skin/context_processors.py b/auf/django/skin/context_processors.py old mode 100644 new mode 100755 index 9be1632..c15e3a1 --- a/auf/django/skin/context_processors.py +++ b/auf/django/skin/context_processors.py @@ -1,6 +1,7 @@ # -*- encoding: utf-8 -*- import settings +from auf.django.references import models as ref PROJET_TITRE_KEY = 'PROJET_TITRE' @@ -12,6 +13,14 @@ def auf(request): if not site: site = "Créer une clef '%s' dans settings.py" % PROJET_TITRE_KEY + # le User peut changer de mdp s'il est local + try: + email = request.user.email + can_change_password = not ref.Authentification.objects.filter(courriel=email).exists() + except: + can_change_password = None + return { 'AUF_SITE' : site, + 'can_change_password' : can_change_password, } diff --git a/auf/django/skin/static/skin/css/admin.css b/auf/django/skin/static/skin/css/admin.css old mode 100644 new mode 100755 diff --git a/auf/django/skin/static/skin/css/auf.css b/auf/django/skin/static/skin/css/auf.css old mode 100644 new mode 100755 diff --git a/auf/django/skin/static/skin/images/favicon.ico b/auf/django/skin/static/skin/images/favicon.ico old mode 100644 new mode 100755 diff --git a/auf/django/skin/static/skin/images/logo_auf.gif b/auf/django/skin/static/skin/images/logo_auf.gif old mode 100644 new mode 100755 diff --git a/auf/django/skin/static/skin/images/menu.png b/auf/django/skin/static/skin/images/menu.png old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/404.html b/auf/django/skin/templates/404.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/500.html b/auf/django/skin/templates/500.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/actions.html b/auf/django/skin/templates/actions.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/admin/base.html b/auf/django/skin/templates/admin/base.html old mode 100644 new mode 100755 index c04af16..0e3c60a --- a/auf/django/skin/templates/admin/base.html +++ b/auf/django/skin/templates/admin/base.html @@ -1,4 +1,4 @@ -{% load theming_tags %} +{% load i18n theming_tags auf_admin %} @@ -12,7 +12,6 @@ {% block extrahead %}{% endblock %} {% block blockbots %}{% endblock %} -{% load i18n %} @@ -36,14 +35,15 @@ {% endif %} Voir le site / - - {% url admin:password_change as password_change_url %} - {% if password_change_url %} - - {% else %} - + {% if can_change_password %} + {% url admin:password_change as password_change_url %} + {% if password_change_url %} + + {% else %} + + {% endif %} + {% trans 'Change password' %} / {% endif %} - {% trans 'Change password' %} / {% url admin:logout as logout_url %} {% if logout_url %} diff --git a/auf/django/skin/templates/admin/base_site.html b/auf/django/skin/templates/admin/base_site.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/admin/form_utils/better_form.html b/auf/django/skin/templates/admin/form_utils/better_form.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/admin/form_utils/field.html b/auf/django/skin/templates/admin/form_utils/field.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/base.html b/auf/django/skin/templates/base.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/breadcrumb.html b/auf/django/skin/templates/breadcrumb.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/footer.html b/auf/django/skin/templates/footer.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/menu.html b/auf/django/skin/templates/menu.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/registration/login.html b/auf/django/skin/templates/registration/login.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templates/skin/demo.html b/auf/django/skin/templates/skin/demo.html old mode 100644 new mode 100755 diff --git a/auf/django/skin/templatetags/auf_menu.py b/auf/django/skin/templatetags/auf_menu.py old mode 100644 new mode 100755 diff --git a/auf/django/skin/views.py b/auf/django/skin/views.py old mode 100644 new mode 100755 diff --git a/setup.cfg b/setup.cfg old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index 3323768..93f1823 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages import sys, os name = 'auf.django.skin' -version = '1.0' +version = '1.1' setup(name=name, version=version, -- 1.7.10.4