# HG changeset patch # User ymh # Date 1445883654 -3600 # Node ID 04255afd160ea785fe258d2f2830928d4f0764a5 # Parent a1ee9f6c19e54a70e54d6ee093ae3264d9c14566 display errors in registration form. Add check for email unicity. slightly change registration message, upgrade django-registration-redux diff -r a1ee9f6c19e5 -r 04255afd160e src/hdabo/forms.py --- a/src/hdabo/forms.py Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdabo/forms.py Mon Oct 26 19:20:54 2015 +0100 @@ -2,6 +2,7 @@ from django import forms from django.db.models.query import QuerySet +from registration.forms import RegistrationFormUniqueEmail class SortedMultipleChoiceField(forms.ModelMultipleChoiceField): def clean(self, value): @@ -12,3 +13,6 @@ (unicode(key), value) for key, value in queryset.in_bulk(value).iteritems())) return [object_list[unicode(pk)] for pk in value] + +class HdaboRegistrationForm(RegistrationFormUniqueEmail): + error_css_class = "registration-error" diff -r a1ee9f6c19e5 -r 04255afd160e src/hdabo/templates/registration/activation_email.txt --- a/src/hdabo/templates/registration/activation_email.txt Mon Oct 19 14:21:51 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -{% load i18n %} -{% trans "Activate account at" %} {{ site.name }}: - -http://{{ site.domain }}{% url 'registration_activate' activation_key %} - -{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %} diff -r a1ee9f6c19e5 -r 04255afd160e src/hdabo/urls.py --- a/src/hdabo/urls.py Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdabo/urls.py Mon Oct 26 19:20:54 2015 +0100 @@ -4,7 +4,6 @@ from django.contrib.admin.views.decorators import staff_member_required from .views import AddOrUpdateFolder, Folders, SearchDatasheet, DeleteFolder - urlpatterns = patterns('', # Examples: # url(r'^$', 'hdabo.views.home', name='home'), @@ -13,7 +12,6 @@ # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - # Uncomment the next line to enable the admin: url(r'^accounts/', include(auth_url)), url(r'^accounts/password/reset/confirm/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', auth_views.password_reset_confirm, name='auth_password_reset_confirm'), url(r'^accounts/', include('registration.backends.default.urls')), diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/apps.py --- a/src/hdalab/apps.py Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/apps.py Mon Oct 26 19:20:54 2015 +0100 @@ -11,10 +11,10 @@ class HdalabAppConfig(AppConfig): - + name = "hdalab" verbose_name = "HdaLab" - + def ready(self): from .celery import app as celery_app # @UnusedImport - import hdalab.signals # @UnusedImport \ No newline at end of file + import hdalab.signals # @UnusedImport diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/de/LC_MESSAGES/django.mo Binary file src/hdalab/locale/de/LC_MESSAGES/django.mo has changed diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/de/LC_MESSAGES/django.po --- a/src/hdalab/locale/de/LC_MESSAGES/django.po Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/locale/de/LC_MESSAGES/django.po Mon Oct 26 19:20:54 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-19 05:35-0500\n" +"POT-Creation-Date: 2015-10-26 12:39-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -89,12 +89,10 @@ msgstr "" #: templates/ajax_identification/ajax_login.html:13 -#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" #: templates/ajax_identification/ajax_login.html:17 -#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" @@ -196,7 +194,6 @@ msgstr "" #: templates/categories.html:65 -#, fuzzy msgid "Entrez une catégorie" msgstr "Information über ein Stichwort" @@ -396,7 +393,6 @@ msgstr "Notizen" #: templates/facettes.html:137 -#, fuzzy msgid "Domaines artistiques" msgstr "Künstlerische Disziplinen" @@ -415,7 +411,7 @@ #: templates/hdabo/user_update_form.html:20 #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Precedent" msgstr "" @@ -423,7 +419,7 @@ #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_confirm.html:19 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Submit" msgstr "" @@ -589,7 +585,6 @@ msgstr "" #: templates/help_popup.html:99 -#, fuzzy msgid "voir un RENKAN (lecture seule)" msgstr "Schreibgeschützt" @@ -754,10 +749,16 @@ msgid "Your account is now activated." msgstr "" +#: templates/registration/activation_email.html:9 +msgid "registration" +msgstr "" + +#: templates/registration/activation_email.html:14 #: templates/registration/activation_email.txt:2 msgid "Hello" msgstr "" +#: templates/registration/activation_email.html:17 #: templates/registration/activation_email.txt:4 #, python-format msgid "" @@ -766,15 +767,31 @@ "%(username)s.\n" msgstr "" +#: templates/registration/activation_email.html:22 #: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "" +#: templates/registration/activation_email.html:31 #: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "" +#: templates/registration/activation_email.html:34 +#: templates/registration/activation_email.txt:12 +#, python-format +msgid "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" +msgstr "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" + #: templates/registration/activation_email_subject.txt:1 msgid "Account activation on" msgstr "" @@ -867,38 +884,30 @@ msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "" -#: templates/registration/registration_form.html:29 -msgid "E-mail" -msgstr "" - -#: templates/registration/registration_form.html:37 -msgid "Mot de passe (Verification)" -msgstr "" - -#: templates/renkan_edit.html:71 +#: templates/renkan_edit.html:77 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:208 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:203 +#: templates/renkan_edit.html:209 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 -#: templates/renkan_edit.html:214 +#: templates/renkan_edit.html:212 templates/renkan_edit.html.py:216 +#: templates/renkan_edit.html:220 msgid "View graph in column" msgstr "" -#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 -#: templates/renkan_edit.html:215 +#: templates/renkan_edit.html:213 templates/renkan_edit.html.py:217 +#: templates/renkan_edit.html:221 msgid "View graph in line" msgstr "" -#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 -#: templates/renkan_edit.html:216 +#: templates/renkan_edit.html:214 templates/renkan_edit.html.py:218 +#: templates/renkan_edit.html:222 msgid "View graph in circle" msgstr "" @@ -942,11 +951,11 @@ msgid "Create new Renkan" msgstr "" -#: views/profile.py:461 +#: views/profile.py:473 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:470 views/profile.py:549 +#: views/profile.py:482 views/profile.py:562 msgid "Period" msgstr "" diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/en/LC_MESSAGES/django.mo Binary file src/hdalab/locale/en/LC_MESSAGES/django.mo has changed diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/en/LC_MESSAGES/django.po --- a/src/hdalab/locale/en/LC_MESSAGES/django.po Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/locale/en/LC_MESSAGES/django.po Mon Oct 26 19:20:54 2015 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-19 05:35-0500\n" +"POT-Creation-Date: 2015-10-26 12:39-0500\n" "PO-Revision-Date: 2012-03-09 02:10+0200\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: IRI\n" @@ -89,12 +89,10 @@ msgstr "Sorry, that's not a valid username or password." #: templates/ajax_identification/ajax_login.html:13 -#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "Username" #: templates/ajax_identification/ajax_login.html:17 -#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "Password" @@ -420,7 +418,7 @@ #: templates/hdabo/user_update_form.html:20 #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Precedent" msgstr "Previous" @@ -428,7 +426,7 @@ #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_confirm.html:19 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Submit" msgstr "Submit" @@ -814,10 +812,17 @@ msgid "Your account is now activated." msgstr "Your account is now activated." +#: templates/registration/activation_email.html:9 +#| msgid "Registration" +msgid "registration" +msgstr "Registration" + +#: templates/registration/activation_email.html:14 #: templates/registration/activation_email.txt:2 msgid "Hello" msgstr "Hello," +#: templates/registration/activation_email.html:17 #: templates/registration/activation_email.txt:4 #, python-format msgid "" @@ -829,15 +834,31 @@ "You have created an account at %(sitename)s with the user name " "%(username)s.\n" +#: templates/registration/activation_email.html:22 #: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "Activate account at" +#: templates/registration/activation_email.html:31 #: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "Link is valid for %(expiration_days)s days." +#: templates/registration/activation_email.html:34 +#: templates/registration/activation_email.txt:12 +#, python-format +msgid "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" +msgstr "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" + #: templates/registration/activation_email_subject.txt:1 msgid "Account activation on" msgstr "Account activation on" @@ -930,38 +951,30 @@ msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "There is a problem in the user information" -#: templates/registration/registration_form.html:29 -msgid "E-mail" -msgstr "Email" - -#: templates/registration/registration_form.html:37 -msgid "Mot de passe (Verification)" -msgstr "Password (verification)" - -#: templates/renkan_edit.html:71 +#: templates/renkan_edit.html:77 msgid "Ressources" msgstr "Resources" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:208 msgid "Change organisation" msgstr "Change organisation" -#: templates/renkan_edit.html:203 +#: templates/renkan_edit.html:209 msgid "(Indisponible si modification du RENKAN)" msgstr "(Not allowed if RENKAN has been modified)" -#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 -#: templates/renkan_edit.html:214 +#: templates/renkan_edit.html:212 templates/renkan_edit.html.py:216 +#: templates/renkan_edit.html:220 msgid "View graph in column" msgstr "View graph in column" -#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 -#: templates/renkan_edit.html:215 +#: templates/renkan_edit.html:213 templates/renkan_edit.html.py:217 +#: templates/renkan_edit.html:221 msgid "View graph in line" msgstr "View graph in line" -#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 -#: templates/renkan_edit.html:216 +#: templates/renkan_edit.html:214 templates/renkan_edit.html.py:218 +#: templates/renkan_edit.html:222 msgid "View graph in circle" msgstr "View graph in circle" @@ -1016,10 +1029,16 @@ msgid "Create new Renkan" msgstr "Create new Renkan" -#: views/profile.py:461 +#: views/profile.py:473 msgid "Plus de Ressources" msgstr "More Resources" -#: views/profile.py:470 views/profile.py:549 +#: views/profile.py:482 views/profile.py:562 msgid "Period" msgstr "Period" + +#~ msgid "E-mail" +#~ msgstr "Email" + +#~ msgid "Mot de passe (Verification)" +#~ msgstr "Password (verification)" diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/es/LC_MESSAGES/django.mo Binary file src/hdalab/locale/es/LC_MESSAGES/django.mo has changed diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/es/LC_MESSAGES/django.po --- a/src/hdalab/locale/es/LC_MESSAGES/django.po Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/locale/es/LC_MESSAGES/django.po Mon Oct 26 19:20:54 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-19 05:35-0500\n" +"POT-Creation-Date: 2015-10-26 12:39-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -89,12 +89,10 @@ msgstr "El usuario o la contraseña no es valido" #: templates/ajax_identification/ajax_login.html:13 -#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "Nombre de usuario" #: templates/ajax_identification/ajax_login.html:17 -#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "Contraseña" @@ -407,7 +405,6 @@ msgstr "Resultados de búsqueda" #: templates/hdabo/user_update_form.html:6 -#, fuzzy msgid "Profile change" msgstr "Cambiar la contraseña" @@ -418,7 +415,7 @@ #: templates/hdabo/user_update_form.html:20 #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Precedent" msgstr "Volver" @@ -426,7 +423,7 @@ #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_confirm.html:19 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Submit" msgstr "Entregar" @@ -708,12 +705,10 @@ msgstr "Modificar mi perfil" #: templates/profile_home.html:46 -#, fuzzy msgid "Modification du mot de passe" msgstr "Recuperación de la contraseña" #: templates/profile_home.html:47 -#, fuzzy msgid "Modification des informations du compte" msgstr "Modificar la fecha" @@ -731,7 +726,6 @@ #: templates/profile_home.html:94 templates/profile_home.html.py:102 #: templates/renkan_list.html:78 templates/renkan_list.html.py:88 -#, fuzzy #| msgid "reject renkan" msgid "View renkan" msgstr "rechazar un renkan" @@ -779,10 +773,17 @@ msgid "Your account is now activated." msgstr "Su cuenta esta ahora activada" +#: templates/registration/activation_email.html:9 +#| msgid "Registration" +msgid "registration" +msgstr "Identificación" + +#: templates/registration/activation_email.html:14 #: templates/registration/activation_email.txt:2 msgid "Hello" msgstr "Hola" +#: templates/registration/activation_email.html:17 #: templates/registration/activation_email.txt:4 #, python-format msgid "" @@ -791,15 +792,31 @@ "%(username)s.\n" msgstr "" +#: templates/registration/activation_email.html:22 #: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "Activar la cuenta en" +#: templates/registration/activation_email.html:31 #: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "Enlace valido por %(expiration_days)s dias" +#: templates/registration/activation_email.html:34 +#: templates/registration/activation_email.txt:12 +#, python-format +msgid "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" +msgstr "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" + #: templates/registration/activation_email_subject.txt:1 msgid "Account activation on" msgstr "Activación de cuenta en" @@ -892,38 +909,30 @@ msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "Ups ! Hay un probema con los datos del nuevo usuario" -#: templates/registration/registration_form.html:29 -msgid "E-mail" -msgstr "Correo electrónico" - -#: templates/registration/registration_form.html:37 -msgid "Mot de passe (Verification)" -msgstr "Contraseña (verificación)" - -#: templates/renkan_edit.html:71 +#: templates/renkan_edit.html:77 msgid "Ressources" msgstr "Recursos" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:208 msgid "Change organisation" msgstr "Cambiar la organización" -#: templates/renkan_edit.html:203 +#: templates/renkan_edit.html:209 msgid "(Indisponible si modification du RENKAN)" msgstr "(Indisponible despues de modificar el RENKAN)" -#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 -#: templates/renkan_edit.html:214 +#: templates/renkan_edit.html:212 templates/renkan_edit.html.py:216 +#: templates/renkan_edit.html:220 msgid "View graph in column" msgstr "Vista del gráfico en columnas" -#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 -#: templates/renkan_edit.html:215 +#: templates/renkan_edit.html:213 templates/renkan_edit.html.py:217 +#: templates/renkan_edit.html:221 msgid "View graph in line" msgstr "Vista del gráfico en lineas" -#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 -#: templates/renkan_edit.html:216 +#: templates/renkan_edit.html:214 templates/renkan_edit.html.py:218 +#: templates/renkan_edit.html:222 msgid "View graph in circle" msgstr "Vista del gráfico en círculo" @@ -933,7 +942,6 @@ msgstr "Lista de Renkan marcados" #: templates/renkan_list.html:29 templates/renkan_list_favorite.html:4 -#, fuzzy msgid "Public Renkans list" msgstr "Lista de Renkan marcados" @@ -955,7 +963,6 @@ msgstr "" #: templates/renkan_new_confirm.html:23 -#, fuzzy #| msgid "Manage renkan publication" msgid "Confirm renkan creation" msgstr "Gestionar la publicación de Renkan" @@ -967,15 +974,20 @@ msgstr "" #: templates/renkan_new_confirm.html:28 -#, fuzzy #| msgid "Gerer mes Renkan" msgid "Create new Renkan" msgstr "Gestionar mis Renkan" -#: views/profile.py:461 +#: views/profile.py:473 msgid "Plus de Ressources" msgstr "Mas recursos" -#: views/profile.py:470 views/profile.py:549 +#: views/profile.py:482 views/profile.py:562 msgid "Period" msgstr "Periodo" + +#~ msgid "E-mail" +#~ msgstr "Correo electrónico" + +#~ msgid "Mot de passe (Verification)" +#~ msgstr "Contraseña (verificación)" diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/fr/LC_MESSAGES/django.mo Binary file src/hdalab/locale/fr/LC_MESSAGES/django.mo has changed diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/fr/LC_MESSAGES/django.po --- a/src/hdalab/locale/fr/LC_MESSAGES/django.po Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/locale/fr/LC_MESSAGES/django.po Mon Oct 26 19:20:54 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-19 05:35-0500\n" +"POT-Creation-Date: 2015-10-26 12:39-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,12 +90,10 @@ "Désolé, le nom de l'utilisateur ou le mot de passe ne sont pas valides." #: templates/ajax_identification/ajax_login.html:13 -#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "Nom d'utilisateur" #: templates/ajax_identification/ajax_login.html:17 -#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "Mot de passe" @@ -175,9 +173,9 @@ "title=\"read about our cookies\">read about them here. To use the " "website as intended please..." msgstr "" -"En poursuivant votre navigation sur ce site, vous acceptez l’utilisation des cookies. En savoir plus. " - +"En poursuivant votre navigation sur ce site, vous acceptez l’utilisation des " +"cookies. En savoir plus. " #: templates/base.html:126 msgid "ACCEPT COOKIES" @@ -422,7 +420,7 @@ #: templates/hdabo/user_update_form.html:20 #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Precedent" msgstr "Précédent" @@ -430,7 +428,7 @@ #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_confirm.html:19 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Submit" msgstr "Envoyer" @@ -825,10 +823,17 @@ msgid "Your account is now activated." msgstr "Votre compte est maintenant activé." +#: templates/registration/activation_email.html:9 +#| msgid "Registration" +msgid "registration" +msgstr "Enregistrement" + +#: templates/registration/activation_email.html:14 #: templates/registration/activation_email.txt:2 msgid "Hello" msgstr "Bonjour," +#: templates/registration/activation_email.html:17 #: templates/registration/activation_email.txt:4 #, python-format msgid "" @@ -840,15 +845,31 @@ "Vous avez créé un compte sur le site %(sitename)s avec le nom d'utilisateur " "%(username)s.\n" +#: templates/registration/activation_email.html:22 #: templates/registration/activation_email.txt:7 msgid "Activate account at" -msgstr "Activer votre compte à" +msgstr "Activer votre compte sur" +#: templates/registration/activation_email.html:31 #: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "Le lien est valide pendant %(expiration_days)s jours." +#: templates/registration/activation_email.html:34 +#: templates/registration/activation_email.txt:12 +#, python-format +msgid "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" +msgstr "" +"\n" +"Cordialement,\n" +"\n" +"L'équipe %(sitename)s.\n" + #: templates/registration/activation_email_subject.txt:1 msgid "Account activation on" msgstr "Activation du compte sur" @@ -863,7 +884,7 @@ #: templates/registration/password_change_done.html:5 msgid "Password change - Done" -msgstr "Cahngement de mote de pass - Terminé" +msgstr "Changement du mot de passe - Terminé" #: templates/registration/password_change_done.html:14 msgid "Password changed" @@ -943,38 +964,30 @@ msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "Il y a un problème dans les données du nouvel utilisateur" -#: templates/registration/registration_form.html:29 -msgid "E-mail" -msgstr "E-Mail" - -#: templates/registration/registration_form.html:37 -msgid "Mot de passe (Verification)" -msgstr "Mot de passe (vérification)" - -#: templates/renkan_edit.html:71 +#: templates/renkan_edit.html:77 msgid "Ressources" msgstr "Ressources" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:208 msgid "Change organisation" msgstr "Changer de disposition" -#: templates/renkan_edit.html:203 +#: templates/renkan_edit.html:209 msgid "(Indisponible si modification du RENKAN)" msgstr "(Indisponible si le RENKAN est modifié)" -#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 -#: templates/renkan_edit.html:214 +#: templates/renkan_edit.html:212 templates/renkan_edit.html.py:216 +#: templates/renkan_edit.html:220 msgid "View graph in column" msgstr "Voir le graphe en colonne" -#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 -#: templates/renkan_edit.html:215 +#: templates/renkan_edit.html:213 templates/renkan_edit.html.py:217 +#: templates/renkan_edit.html:221 msgid "View graph in line" msgstr "Voir le graphe en ligne" -#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 -#: templates/renkan_edit.html:216 +#: templates/renkan_edit.html:214 templates/renkan_edit.html.py:218 +#: templates/renkan_edit.html:222 msgid "View graph in circle" msgstr "Voir le graphe en cercle" @@ -1014,10 +1027,8 @@ "des arts." #: templates/renkan_new_confirm.html:23 -#, fuzzy -#| msgid "Manage renkan publication" msgid "Confirm renkan creation" -msgstr "Gérer les publications de Renkan" +msgstr "Confirmez la créaion du renkan" #: templates/renkan_new_confirm.html:27 msgid "" @@ -1031,10 +1042,16 @@ msgid "Create new Renkan" msgstr "Créer un nouveau Renkan" -#: views/profile.py:461 +#: views/profile.py:473 msgid "Plus de Ressources" msgstr "Plus de Ressources" -#: views/profile.py:470 views/profile.py:549 +#: views/profile.py:482 views/profile.py:562 msgid "Period" msgstr "Période" + +#~ msgid "E-mail" +#~ msgstr "E-Mail" + +#~ msgid "Mot de passe (Verification)" +#~ msgstr "Mot de passe (vérification)" diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/it/LC_MESSAGES/django.mo Binary file src/hdalab/locale/it/LC_MESSAGES/django.mo has changed diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/it/LC_MESSAGES/django.po --- a/src/hdalab/locale/it/LC_MESSAGES/django.po Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/locale/it/LC_MESSAGES/django.po Mon Oct 26 19:20:54 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-19 05:35-0500\n" +"POT-Creation-Date: 2015-10-26 12:39-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -89,12 +89,10 @@ msgstr "" #: templates/ajax_identification/ajax_login.html:13 -#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" #: templates/ajax_identification/ajax_login.html:17 -#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" @@ -126,12 +124,10 @@ msgstr "" #: templates/base.html:43 templates/base.html.py:95 templates/index.html:44 -#, fuzzy msgid "Recherche" msgstr "Cercare un tag" #: templates/base.html:44 templates/base.html.py:96 -#, fuzzy msgid "Domaines Artistiques" msgstr "Discipline artistiche" @@ -186,12 +182,10 @@ msgstr "" #: templates/categories.html:5 templates/thesaurus.html:33 -#, fuzzy msgid "Recherche par arbre" msgstr "Ricerca per campo" #: templates/categories.html:35 -#, fuzzy msgid "Explorer les domaines artistiques" msgstr "Discipline artistiche" @@ -200,7 +194,6 @@ msgstr "" #: templates/categories.html:65 -#, fuzzy msgid "Entrez une catégorie" msgstr "Informazioni su una parola chiave" @@ -244,7 +237,6 @@ #: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 #: templates/renkan_list.html:44 -#, fuzzy msgid "Filter" msgstr "Filtri:" @@ -385,7 +377,6 @@ msgstr "" #: templates/facettes.html:110 -#, fuzzy msgid "Entrez un mot-clef" msgstr "Informazioni su una parola chiave" @@ -402,7 +393,6 @@ msgstr "Note" #: templates/facettes.html:137 -#, fuzzy msgid "Domaines artistiques" msgstr "Discipline artistiche" @@ -421,7 +411,7 @@ #: templates/hdabo/user_update_form.html:20 #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Precedent" msgstr "" @@ -429,7 +419,7 @@ #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_confirm.html:19 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Submit" msgstr "" @@ -595,7 +585,6 @@ msgstr "" #: templates/help_popup.html:99 -#, fuzzy msgid "voir un RENKAN (lecture seule)" msgstr "Solo lettura" @@ -760,10 +749,16 @@ msgid "Your account is now activated." msgstr "" +#: templates/registration/activation_email.html:9 +msgid "registration" +msgstr "" + +#: templates/registration/activation_email.html:14 #: templates/registration/activation_email.txt:2 msgid "Hello" msgstr "" +#: templates/registration/activation_email.html:17 #: templates/registration/activation_email.txt:4 #, python-format msgid "" @@ -772,15 +767,31 @@ "%(username)s.\n" msgstr "" +#: templates/registration/activation_email.html:22 #: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "" +#: templates/registration/activation_email.html:31 #: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "" +#: templates/registration/activation_email.html:34 +#: templates/registration/activation_email.txt:12 +#, python-format +msgid "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" +msgstr "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" + #: templates/registration/activation_email_subject.txt:1 msgid "Account activation on" msgstr "" @@ -873,38 +884,30 @@ msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "" -#: templates/registration/registration_form.html:29 -msgid "E-mail" -msgstr "" - -#: templates/registration/registration_form.html:37 -msgid "Mot de passe (Verification)" -msgstr "" - -#: templates/renkan_edit.html:71 +#: templates/renkan_edit.html:77 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:208 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:203 +#: templates/renkan_edit.html:209 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 -#: templates/renkan_edit.html:214 +#: templates/renkan_edit.html:212 templates/renkan_edit.html.py:216 +#: templates/renkan_edit.html:220 msgid "View graph in column" msgstr "" -#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 -#: templates/renkan_edit.html:215 +#: templates/renkan_edit.html:213 templates/renkan_edit.html.py:217 +#: templates/renkan_edit.html:221 msgid "View graph in line" msgstr "" -#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 -#: templates/renkan_edit.html:216 +#: templates/renkan_edit.html:214 templates/renkan_edit.html.py:218 +#: templates/renkan_edit.html:222 msgid "View graph in circle" msgstr "" @@ -948,11 +951,11 @@ msgid "Create new Renkan" msgstr "" -#: views/profile.py:461 +#: views/profile.py:473 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:470 views/profile.py:549 +#: views/profile.py:482 views/profile.py:562 msgid "Period" msgstr "" diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/ja/LC_MESSAGES/django.mo Binary file src/hdalab/locale/ja/LC_MESSAGES/django.mo has changed diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/ja/LC_MESSAGES/django.po --- a/src/hdalab/locale/ja/LC_MESSAGES/django.po Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/locale/ja/LC_MESSAGES/django.po Mon Oct 26 19:20:54 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-19 05:35-0500\n" +"POT-Creation-Date: 2015-10-26 12:39-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -90,12 +90,10 @@ msgstr "" #: templates/ajax_identification/ajax_login.html:13 -#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" #: templates/ajax_identification/ajax_login.html:17 -#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" @@ -127,12 +125,10 @@ msgstr "" #: templates/base.html:43 templates/base.html.py:95 templates/index.html:44 -#, fuzzy msgid "Recherche" msgstr "タグを検索する" #: templates/base.html:44 templates/base.html.py:96 -#, fuzzy msgid "Domaines Artistiques" msgstr "学術・芸術分野" @@ -187,12 +183,10 @@ msgstr "" #: templates/categories.html:5 templates/thesaurus.html:33 -#, fuzzy msgid "Recherche par arbre" msgstr "ファセット検索" #: templates/categories.html:35 -#, fuzzy msgid "Explorer les domaines artistiques" msgstr "学術・芸術分野" @@ -201,7 +195,6 @@ msgstr "" #: templates/categories.html:65 -#, fuzzy msgid "Entrez une catégorie" msgstr "キーワードについての情報" @@ -245,7 +238,6 @@ #: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 #: templates/renkan_list.html:44 -#, fuzzy msgid "Filter" msgstr "フィルター" @@ -386,7 +378,6 @@ msgstr "" #: templates/facettes.html:110 -#, fuzzy msgid "Entrez un mot-clef" msgstr "キーワードについての情報" @@ -403,7 +394,6 @@ msgstr "注釈" #: templates/facettes.html:137 -#, fuzzy msgid "Domaines artistiques" msgstr "学術・芸術分野" @@ -422,7 +412,7 @@ #: templates/hdabo/user_update_form.html:20 #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Precedent" msgstr "" @@ -430,7 +420,7 @@ #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_confirm.html:19 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Submit" msgstr "" @@ -596,7 +586,6 @@ msgstr "" #: templates/help_popup.html:99 -#, fuzzy msgid "voir un RENKAN (lecture seule)" msgstr "読み出しのみ" @@ -761,10 +750,16 @@ msgid "Your account is now activated." msgstr "" +#: templates/registration/activation_email.html:9 +msgid "registration" +msgstr "" + +#: templates/registration/activation_email.html:14 #: templates/registration/activation_email.txt:2 msgid "Hello" msgstr "" +#: templates/registration/activation_email.html:17 #: templates/registration/activation_email.txt:4 #, python-format msgid "" @@ -773,15 +768,31 @@ "%(username)s.\n" msgstr "" +#: templates/registration/activation_email.html:22 #: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "" +#: templates/registration/activation_email.html:31 #: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "" +#: templates/registration/activation_email.html:34 +#: templates/registration/activation_email.txt:12 +#, python-format +msgid "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" +msgstr "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" + #: templates/registration/activation_email_subject.txt:1 msgid "Account activation on" msgstr "" @@ -874,38 +885,30 @@ msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "" -#: templates/registration/registration_form.html:29 -msgid "E-mail" -msgstr "" - -#: templates/registration/registration_form.html:37 -msgid "Mot de passe (Verification)" -msgstr "" - -#: templates/renkan_edit.html:71 +#: templates/renkan_edit.html:77 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:208 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:203 +#: templates/renkan_edit.html:209 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 -#: templates/renkan_edit.html:214 +#: templates/renkan_edit.html:212 templates/renkan_edit.html.py:216 +#: templates/renkan_edit.html:220 msgid "View graph in column" msgstr "" -#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 -#: templates/renkan_edit.html:215 +#: templates/renkan_edit.html:213 templates/renkan_edit.html.py:217 +#: templates/renkan_edit.html:221 msgid "View graph in line" msgstr "" -#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 -#: templates/renkan_edit.html:216 +#: templates/renkan_edit.html:214 templates/renkan_edit.html.py:218 +#: templates/renkan_edit.html:222 msgid "View graph in circle" msgstr "" @@ -949,11 +952,11 @@ msgid "Create new Renkan" msgstr "" -#: views/profile.py:461 +#: views/profile.py:473 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:470 views/profile.py:549 +#: views/profile.py:482 views/profile.py:562 msgid "Period" msgstr "" diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo Binary file src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo has changed diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/locale/zh-tw/LC_MESSAGES/django.po --- a/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Mon Oct 26 19:20:54 2015 +0100 @@ -3,12 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-19 05:35-0500\n" +"POT-Creation-Date: 2015-10-26 12:39-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,12 +89,10 @@ msgstr "" #: templates/ajax_identification/ajax_login.html:13 -#: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" #: templates/ajax_identification/ajax_login.html:17 -#: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" @@ -127,12 +124,10 @@ msgstr "" #: templates/base.html:43 templates/base.html.py:95 templates/index.html:44 -#, fuzzy msgid "Recherche" msgstr "Rechercher un tag" #: templates/base.html:44 templates/base.html.py:96 -#, fuzzy msgid "Domaines Artistiques" msgstr "Disciplines artistiques" @@ -187,12 +182,10 @@ msgstr "" #: templates/categories.html:5 templates/thesaurus.html:33 -#, fuzzy msgid "Recherche par arbre" msgstr "Recherche par facettes" #: templates/categories.html:35 -#, fuzzy msgid "Explorer les domaines artistiques" msgstr "Disciplines artistiques" @@ -201,7 +194,6 @@ msgstr "" #: templates/categories.html:65 -#, fuzzy msgid "Entrez une catégorie" msgstr "Information sur un mot-clé" @@ -245,7 +237,6 @@ #: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58 #: templates/renkan_list.html:44 -#, fuzzy msgid "Filter" msgstr "Filtres :" @@ -386,7 +377,6 @@ msgstr "" #: templates/facettes.html:110 -#, fuzzy msgid "Entrez un mot-clef" msgstr "Information sur un mot-clé" @@ -403,7 +393,6 @@ msgstr "Notes" #: templates/facettes.html:137 -#, fuzzy msgid "Domaines artistiques" msgstr "Disciplines artistiques" @@ -422,7 +411,7 @@ #: templates/hdabo/user_update_form.html:20 #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Precedent" msgstr "" @@ -430,7 +419,7 @@ #: templates/registration/password_change_form.html:31 #: templates/registration/password_reset_confirm.html:19 #: templates/registration/password_reset_form.html:28 -#: templates/registration/registration_form.html:41 +#: templates/registration/registration_form.html:37 msgid "Submit" msgstr "" @@ -596,7 +585,6 @@ msgstr "" #: templates/help_popup.html:99 -#, fuzzy msgid "voir un RENKAN (lecture seule)" msgstr "En lecture seule" @@ -761,10 +749,16 @@ msgid "Your account is now activated." msgstr "" +#: templates/registration/activation_email.html:9 +msgid "registration" +msgstr "" + +#: templates/registration/activation_email.html:14 #: templates/registration/activation_email.txt:2 msgid "Hello" msgstr "" +#: templates/registration/activation_email.html:17 #: templates/registration/activation_email.txt:4 #, python-format msgid "" @@ -773,15 +767,31 @@ "%(username)s.\n" msgstr "" +#: templates/registration/activation_email.html:22 #: templates/registration/activation_email.txt:7 msgid "Activate account at" msgstr "" +#: templates/registration/activation_email.html:31 #: templates/registration/activation_email.txt:11 #, python-format msgid "Link is valid for %(expiration_days)s days." msgstr "" +#: templates/registration/activation_email.html:34 +#: templates/registration/activation_email.txt:12 +#, python-format +msgid "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" +msgstr "" +"\n" +"Regards,\n" +"\n" +"The %(sitename)s team.\n" + #: templates/registration/activation_email_subject.txt:1 msgid "Account activation on" msgstr "" @@ -874,38 +884,30 @@ msgid "Oups ! Il y a un problème dans les données du nouvel utilisateur" msgstr "" -#: templates/registration/registration_form.html:29 -msgid "E-mail" -msgstr "" - -#: templates/registration/registration_form.html:37 -msgid "Mot de passe (Verification)" -msgstr "" - -#: templates/renkan_edit.html:71 +#: templates/renkan_edit.html:77 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:208 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:203 +#: templates/renkan_edit.html:209 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 -#: templates/renkan_edit.html:214 +#: templates/renkan_edit.html:212 templates/renkan_edit.html.py:216 +#: templates/renkan_edit.html:220 msgid "View graph in column" msgstr "" -#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 -#: templates/renkan_edit.html:215 +#: templates/renkan_edit.html:213 templates/renkan_edit.html.py:217 +#: templates/renkan_edit.html:221 msgid "View graph in line" msgstr "" -#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 -#: templates/renkan_edit.html:216 +#: templates/renkan_edit.html:214 templates/renkan_edit.html.py:218 +#: templates/renkan_edit.html:222 msgid "View graph in circle" msgstr "" @@ -949,11 +951,11 @@ msgid "Create new Renkan" msgstr "" -#: views/profile.py:461 +#: views/profile.py:473 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:470 views/profile.py:549 +#: views/profile.py:482 views/profile.py:562 msgid "Period" msgstr "" diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/settings.py --- a/src/hdalab/settings.py Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/settings.py Mon Oct 26 19:20:54 2015 +0100 @@ -204,6 +204,8 @@ CSRF_COOKIE_SECURE=False #SILENCED_SYSTEM_CHECKS = ['fields.W342'] # to silence a problem in registration module +REGISTRATION_FORM = 'hdabo.forms.HdaboRegistrationForm' +REGISTRATION_EMAIL_HTML = False from hdalab.config import * #@UnusedWildImport @@ -211,4 +213,3 @@ LOGIN_REDIRECT_URL = BASE_URL if 'LOGIN_URL' not in locals(): LOGIN_URL = BASE_URL + "hdalab/hdabo/accounts/login" - diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/static/hdalab/css/login.css --- a/src/hdalab/static/hdalab/css/login.css Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/static/hdalab/css/login.css Mon Oct 26 19:20:54 2015 +0100 @@ -18,4 +18,66 @@ div.register > p { font-size: 1.4rem; -} \ No newline at end of file +} +p.error { + color: #ce4844; +} + +.errorlist { + color: #ce4844; + margin: 10px 30px; + font-size: 1.4rem; +} + +.registration-error > input { + background-color: #f9f2f4; +} + +.helptext { + background: none repeat scroll 0 0 #F8F8F8; + border: 5px solid #DFDFDF; + color: #717171; + font-size: 1.4rem; + line-height: 1.4rem; + margin: -1.4rem auto 0 10px; + text-align: center; + display: none; + padding: 1rem 1.4rem; + width: 150px; +} + +.helptext:after, .helptext:before { + right: 100%; + top: 50%; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} + +.helptext:after { + border-color: rgba(248, 248, 248, 0); + border-right-color: #f8f8f8; + border-width: 10px; + margin-top: -10px; +} +.helptext:before { + border-color: rgba(223, 223, 223, 0); + border-right-color: #dfdfdf; + border-width: 16px; + margin-top: -16px; +} + +.registration-field-wrapper:hover .helptext { + display:inline-block; + position: absolute; +} + +.registration-field-wrapper { + color: #4F5451; + font-size: 1.4rem; + margin: 10px 30px; + clear: right; +} diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/templates/registration/activation_email.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/templates/registration/activation_email.html Mon Oct 26 19:20:54 2015 +0100 @@ -0,0 +1,42 @@ + +{% load i18n %} +{% load url from future %} + + + + + + {{ site.name }} {% trans "registration" %} + + + +

+{% trans "Hello" %} +

+

+{% blocktrans with sitename=site.name username=user.username %} +You have created an account at {{ sitename }} with the user name {{ username }}. +{% endblocktrans %} +

+

+{% trans "Activate account at" %} {{ site.name }}: +

+ +

+ + {{site.domain}}{% url 'registration_activate' activation_key %} + +

+

+{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %} +

+

+{% blocktrans with sitename=site.name %} +Regards, + +The {{ sitename }} team. +{% endblocktrans %} +

+ + diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/templates/registration/activation_email.txt --- a/src/hdalab/templates/registration/activation_email.txt Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/templates/registration/activation_email.txt Mon Oct 26 19:20:54 2015 +0100 @@ -1,5 +1,5 @@ {% load i18n %} -{% trans "Hello" %} {{user.firstname}} {{user.lastname}}, +{% trans "Hello" %} {% blocktrans with sitename=site.name username=user.username %} You have created an account at {{ sitename }} with the user name {{ username }}. @@ -9,3 +9,8 @@ http://{{ site.domain }}{% url 'registration_activate' activation_key %} {% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %} +{% blocktrans with sitename=site.name %} +Regards, + +The {{ sitename }} team. +{% endblocktrans %} diff -r a1ee9f6c19e5 -r 04255afd160e src/hdalab/templates/registration/registration_form.html --- a/src/hdalab/templates/registration/registration_form.html Mon Oct 19 14:21:51 2015 +0200 +++ b/src/hdalab/templates/registration/registration_form.html Mon Oct 26 19:20:54 2015 +0100 @@ -14,35 +14,28 @@ {% block main_content %}
-

{% trans "Nouvel Utilisateur" %}

- {% if form.errors %} -

{% trans "Oups ! Il y a un problème dans les données du nouvel utilisateur" %}

- {% endif %} -
- {% csrf_token %} - -

- - {{form.username}} -

-

- - {{form.email}} -

-

- - {{form.password1}} -

-

- - {{form.password2}} -

+

{% trans "Nouvel Utilisateur" %}

+ {% if form.errors %} +

{% trans "Oups ! Il y a un problème dans les données du nouvel utilisateur" %}

+ {% endif %} + + {% csrf_token %} + + {% for hidden in form.hidden_fields %} + {{ hidden }} + {% endfor %} + {% for field in form.visible_fields %} +
+ {{ field.label_tag }} {{ field }} + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} + {{ field.errors }} +
+ {% endfor %}
{% endblock %} - - - diff -r a1ee9f6c19e5 -r 04255afd160e virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Mon Oct 19 14:21:51 2015 +0200 +++ b/virtualenv/res/lib/lib_create_env.py Mon Oct 26 19:20:54 2015 +0100 @@ -19,7 +19,7 @@ 'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz', 'local':"distribute-0.6.24.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO': {'setup': 'django', 'url': 'https://www.djangoproject.com/download/1.8.2/tarball/', 'local':"Django-1.8.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/archive/1.5.1.tar.gz', 'local':"django-extensions-1.5.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'REGISTRATION': { 'setup': 'django-registration', 'url':'https://github.com/macropin/django-registration/archive/v1.1.tar.gz', 'local':"django-registration-1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'REGISTRATION': { 'setup': 'django-registration', 'url':'https://github.com/macropin/django-registration/archive/v1.2.tar.gz', 'local':"django-registration-1.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'HTTPLIB2': { 'setup': 'httplib2', 'url':'https://github.com/jcgregorio/httplib2/archive/v0.9.tar.gz', 'local':"httplib2-0.7.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'PYCRYPTO': {'setup': 'pycrypto', 'url':'https://github.com/dlitz/pycrypto/archive/v2.6.1.tar.gz', 'local':'pycrypto-2.6.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'SSH': {'setup': 'ssh', 'url':'http://pypi.python.org/packages/source/s/ssh/ssh-1.7.14.tar.gz#md5=4cdd0549ef4699bd67b96264d3b21427', 'local':'ssh-1.7.14.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, @@ -30,7 +30,7 @@ 'WIKITOOLS' : { 'setup': 'wikitools', 'url': 'https://github.com/alexz-enwp/wikitools/archive/1.2.tar.gz', 'local': 'wikitools-1.2.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'ISODATE' : {'setup': 'isodate', 'url': 'http://pypi.python.org/packages/source/i/isodate/isodate-0.5.1.tar.gz', 'local': 'isodate-0.5.1.tar.gz', 'install' : {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'RDFLIB' : { 'setup': 'rdflib', 'url': 'https://github.com/IRI-Research/rdflib/archive/30f0f8ca7dba3e9dbfef39fb2006e4b395748f6c.tar.gz', 'local': 'rdflib-4.2.0-dev.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'SPARQLWRAPPER' : { 'setup': 'SPARQLWrapper', 'url': 'https://github.com/RDFLib/sparqlwrapper/archive/1.6.4.tar.gz', 'local' : 'SPARQLWrapper-1.6.4.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'SPARQLWRAPPER' : { 'setup': 'SPARQLWrapper', 'url': 'https://github.com/RDFLib/sparqlwrapper/archive/1.6.4.tar.gz', 'local' : 'SPARQLWrapper-1.6.4.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'REQUESTS' : { 'setup': 'requests', 'url': 'https://github.com/kennethreitz/requests/archive/v2.6.0.tar.gz', 'local' : 'requests-2.6.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'ELASTICSEARCH' : { 'setup': 'elasticsearch', 'url': 'https://github.com/elasticsearch/elasticsearch-py/archive/1.4.0.tar.gz', 'local' : 'elasticsearch-1.4.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'PYPARSING' : { 'setup': 'pyparsing', 'url': 'https://pypi.python.org/packages/source/p/pyparsing/pyparsing-2.0.3.tar.gz', 'local' : 'pyparsing-2.0.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, @@ -68,7 +68,7 @@ if system_str == 'Windows': - + URLS.update({ 'PSYCOPG2': {'setup': 'psycopg2','url': 'psycopg2-2.0.14.win32-py2.6-pg8.4.3-release.zip', 'local':"psycopg2-2.0.14.win32-py2.6-pg8.4.3-release.zip", 'install': {'method': 'install_psycopg2', 'option_str': None, 'dict_extra_env': None}}, 'PIL': {'setup': 'pil', 'url': 'http://effbot.org/media/downloads/PIL-1.1.7.win32-py2.6.exe', 'local':"PIL-1.1.7.win32-py2.6.exe", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, @@ -88,7 +88,7 @@ 'LXML': {'setup': 'lxml', 'url':"lxml-3.4.2.tar.gz", 'local':"lxml-3.4.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': lxml_options}}, 'PYYAML' : { 'setup': 'PyYAML', 'url': 'http://pyyaml.org/download/pyyaml/PyYAML-3.11.tar.gz', 'local': 'PyYAML-3.11.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, }) - + class ResourcesEnv(object): @@ -103,11 +103,11 @@ return os.path.abspath(os.path.join(self.src_base, fpath)).replace("\\","/") def get_run_res_base_path(self, fpath): - return os.path.abspath(os.path.join(self.run_base, 'res', fpath)).replace("\\","/") - + return os.path.abspath(os.path.join(self.run_base, 'res', fpath)).replace("\\","/") + def __add_package_def(self, key, dict): self.URLS[key] = dict - + def __init_url(self, urls): for key, url_dict in urls.items(): url_dict_copy = url_dict.copy() @@ -127,7 +127,7 @@ logger.notify('Creating directory %s' % dir) os.makedirs(dir) -def extend_parser(parser): +def extend_parser(parser): parser.add_option( '--index-url', metavar='INDEX_URL', @@ -163,28 +163,28 @@ psycopg2_base_path = os.path.join(src_dir,"psycopg2") zf.extractall(psycopg2_base_path) zf.close() - + psycopg2_src_path = os.path.join(psycopg2_base_path, os.listdir(psycopg2_base_path)[0]) shutil.copytree(os.path.join(psycopg2_src_path, 'psycopg2'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'psycopg2'))) shutil.copy(os.path.join(psycopg2_src_path, 'psycopg2-2.4.5-py2.7.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'site-packages'))) - + def gen_install_comp_lib(lib_name, lib_key, configure_options=[], configure_env={}): - + def install_lib(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop): lib_src = os.path.join(src_dir,lib_name+".tar.gz") logger.notify("Copy %s to %s " % (res_env.URLS[lib_key][res_source_key],lib_src)) shutil.copy(res_env.URLS[lib_key][res_source_key], lib_src) tf = tarfile.open(lib_src,'r:gz') - lib_base_path = os.path.join(src_dir, lib_name) + lib_base_path = os.path.join(src_dir, lib_name) logger.notify("Extract %s to %s " % (lib_name,lib_base_path)) tf.extractall(lib_base_path) tf.close() - + lib_src_path = os.path.join(lib_base_path, os.listdir(lib_base_path)[0]) - - + + context_map = { 'option_str' : option_str, 'home_dir': os.path.abspath(home_dir), @@ -192,10 +192,10 @@ 'tmp_dir': os.path.abspath(tmp_dir), 'src_dir': os.path.abspath(src_dir), } - + configure_options_trans = map(lambda s: s % context_map, configure_options) configure_env_trans = {k: s % context_map for k,s in configure_env.items()} - + logger.notify(lib_name + " configure in " + lib_src_path) call_subprocess(['./configure', '--prefix='+os.path.abspath(home_dir)] + configure_options_trans, cwd=os.path.abspath(lib_src_path), @@ -203,13 +203,13 @@ show_stdout=True, extra_env=configure_env_trans ) - + logger.notify(lib_name + " make in " + lib_src_path) call_subprocess(['make'], cwd=os.path.abspath(lib_src_path), filter_stdout=filter_python_develop, show_stdout=True) - + logger.notify(lib_name + "make install in " + lib_src_path) call_subprocess(['make', 'install'], cwd=os.path.abspath(lib_src_path), @@ -245,19 +245,19 @@ pystemmer_base_path = os.path.join(src_dir,"pystemmer") zf.extractall(pystemmer_base_path) zf.close() - + shutil.copy(os.path.join(pystemmer_base_path, 'Stemmer.pyd'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages'))) shutil.copy(os.path.join(pystemmer_base_path, 'PyStemmer-1.0.1-py2.6.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages'))) - + #osx_extra_env = {'ARCHFLAGS': '-Wno-error=unused-command-line-argument-hard-error-in-future', 'CFLAGS': '-Qunused-arguments', 'CPPFLAGS': '-Qunused-arguments'} osx_extra_env = {} def lib_generate_install_methods(path_locations, src_base, run_base, Logger, call_subprocess, normal_installs, options_to_add=None, urls= None): - + all_urls = URLS.copy() if urls is not None: all_urls.update(urls) - + res_env = ResourcesEnv(src_base, run_base, all_urls, normal_installs) def filter_python_develop(line): @@ -269,8 +269,8 @@ if line.startswith(prefix): return Logger.DEBUG return Logger.NOTIFY - - + + def normal_install(key, res_path, method, option_str, extra_env, res_source_key, home_dir, tmp_dir, res_env, logger, call_subprocess): logger.notify("Install %s from %s with %s" % (key,res_path,method)) if method == 'pip': @@ -325,16 +325,16 @@ filter_stdout=filter_python_develop, show_stdout=True, extra_env=extra_env) - - + + def after_install(options, home_dir): - + global logger - + verbosity = options.verbose - options.quiet logger = Logger([(Logger.level_for_integer(2-verbosity), sys.stdout)]) - + home_dir, lib_dir, inc_dir, bin_dir = path_locations(home_dir) base_dir = os.path.dirname(home_dir) src_dir = os.path.join(home_dir, 'src') @@ -342,23 +342,23 @@ ensure_dir(src_dir, logger) ensure_dir(tmp_dir, logger) system_str = platform.system() - + res_source_key = getattr(options, 'type_install') if hasattr(options, 'type_install') else 'local' #.get('type_install', 'local') if res_source_key is None: res_source_key = 'local' - + ignore_packages = [] - + if system_str == 'Windows': default_install_options = {'method': 'easy_install', 'option_str': None, 'dict_extra_env': {}} else: default_install_options = {'method': 'pip', 'option_str': None, 'dict_extra_env': {}} - + if options.ignore_packages : ignore_packages = options.ignore_packages.split(",") - + logger.indent += 2 - try: + try: for key in res_env.NORMAL_INSTALL: install_options = None if isinstance(key, dict): @@ -377,7 +377,7 @@ extra_env = install_options.get('dict_extra_env', default_install_options['dict_extra_env']) if not extra_env: extra_env = {} - + if 'TMPDIR' not in extra_env: extra_env['TMPDIR'] = os.path.abspath(tmp_dir) if system_str == 'Darwin': @@ -387,26 +387,26 @@ #flags += " -Wno-error=unused-command-line-argument-hard-error-in-future" flags += " "+flag_value extra_env[flag_key] = flags.strip() - + #isinstance(lst, (list, tuple)) if key not in ignore_packages: logger.notify("install %s with method %s" % (key, repr(method))) if callable(method): method(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop) - elif method in globals() and callable(globals()[method]) and method not in ['pip', 'easy_install']: + elif method in globals() and callable(globals()[method]) and method not in ['pip', 'easy_install']: globals()[method](option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop) else: normal_install(key, res_path, method, option_str, extra_env, res_source_key, home_dir, tmp_dir, res_env, logger, call_subprocess) - + logger.notify("Clear source dir") shutil.rmtree(src_dir) - + finally: logger.indent -= 2 script_dir = join(base_dir, bin_dir) logger.notify('Run "%s Package" to install new packages that provide builds' % join(script_dir, 'easy_install')) - + def adjust_options(options, args): if not options_to_add: return @@ -415,4 +415,3 @@ setattr(options, opt, opt_val) return adjust_options, extend_parser, after_install - diff -r a1ee9f6c19e5 -r 04255afd160e virtualenv/res/src/django-registration-1.1.tar.gz Binary file virtualenv/res/src/django-registration-1.1.tar.gz has changed diff -r a1ee9f6c19e5 -r 04255afd160e virtualenv/res/src/django-registration-1.2.tar.gz Binary file virtualenv/res/src/django-registration-1.2.tar.gz has changed diff -r a1ee9f6c19e5 -r 04255afd160e virtualenv/web/res/requirements.txt --- a/virtualenv/web/res/requirements.txt Mon Oct 19 14:21:51 2015 +0200 +++ b/virtualenv/web/res/requirements.txt Mon Oct 26 19:20:54 2015 +0100 @@ -20,7 +20,7 @@ django-extensions==1.5.1 django-haystack==2.4.0 django-honeypot==0.4.0 -django-registration==1.1 +django-registration==1.2 easy-thumbnails==2.2 elasticsearch==1.4.0 html5lib==0.999 @@ -43,5 +43,3 @@ user-agents==0.3.0 wikitools==1.2 wsgiref==0.1.2 - -