--- a/src/hdalab/config.py.tmpl Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/config.py.tmpl Mon Mar 09 02:15:09 2015 +0100
@@ -129,3 +129,5 @@
BROKER_URL = 'sqla+sqlite:///'+os.path.abspath(os.path.join(BASE_DIR,"../../run/celerydb.sqlite"))
#CELERY_EMAIL_BACKEND
+
+ENVELOPE_EMAIL_RECIPIENTS= ['histoiredesarts@culture.gouv.fr']
Binary file src/hdalab/locale/de/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/de/LC_MESSAGES/django.po Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/locale/de/LC_MESSAGES/django.po Mon Mar 09 02:15:09 2015 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 07:38-0600\n"
+"POT-Creation-Date: 2015-03-08 20:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,24 +41,24 @@
msgid "Japanese"
msgstr "Japanisch"
-#: models/renkan.py:37
+#: models/renkan.py:32
msgid "edition_state"
msgstr ""
-#: models/renkan.py:38
+#: models/renkan.py:33
msgid "moderated_state"
msgstr ""
-#: models/renkan.py:39
+#: models/renkan.py:34
msgid "published_state"
msgstr ""
-#: models/renkan.py:40
+#: models/renkan.py:35
msgid "rejected_state"
msgstr ""
#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75
-#: templates/base.html:96
+#: templates/base.html:97
msgid "A Propos"
msgstr ""
@@ -66,15 +66,15 @@
msgid "Accueil"
msgstr ""
-#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
msgid "Recherche"
msgstr "Einen Tag suchen"
-#: templates/base.html:40 templates/base.html.py:92
+#: templates/base.html:40 templates/base.html.py:93
msgid "Domaines Artistiques"
msgstr "Künstlerische Disziplinen"
-#: templates/base.html:41 templates/base.html.py:93
+#: templates/base.html:41 templates/base.html.py:94
msgid "Thésaurus"
msgstr ""
@@ -96,15 +96,20 @@
msgid "Mentions légales"
msgstr ""
-#: templates/base.html:90
+#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/envelope/contact.html.py:16
+msgid "Contact"
+msgstr ""
+
+#: templates/base.html:91
msgid "Rubriques"
msgstr ""
-#: templates/base.html:95
+#: templates/base.html:96
msgid "Renkan repères"
msgstr ""
-#: templates/base.html:102
+#: templates/base.html:103
msgid "Liens"
msgstr ""
@@ -483,26 +488,26 @@
msgid "Ressources"
msgstr ""
-#: templates/renkan_edit.html:191
+#: templates/renkan_edit.html:192
msgid "Change organisation"
msgstr ""
-#: templates/renkan_edit.html:192
+#: templates/renkan_edit.html:193
msgid "(Indisponible si modification du RENKAN)"
msgstr ""
-#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199
-#: templates/renkan_edit.html:203
-msgid "View graph in column"
-msgstr ""
-
#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200
#: templates/renkan_edit.html:204
-msgid "View graph in line"
+msgid "View graph in column"
msgstr ""
#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201
#: templates/renkan_edit.html:205
+msgid "View graph in line"
+msgstr ""
+
+#: templates/renkan_edit.html:198 templates/renkan_edit.html.py:202
+#: templates/renkan_edit.html:206
msgid "View graph in circle"
msgstr ""
@@ -578,6 +583,19 @@
msgid "reject renkan"
msgstr ""
+#: templates/envelope/contact.html:19
+msgid ""
+"\n"
+" <p>Vous souhaitez poser une question sur Histoire des arts' Lab ?</"
+"p>\n"
+" <p>Remplissez le formulaire suivant :</p>\n"
+" "
+msgstr ""
+
+#: templates/envelope/contact.html:29
+msgid "Send!"
+msgstr ""
+
#: templates/registration/activate.html:5
msgid "Registration - Activated"
msgstr ""
Binary file src/hdalab/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/en/LC_MESSAGES/django.po Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/locale/en/LC_MESSAGES/django.po Mon Mar 09 02:15:09 2015 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 07:38-0600\n"
+"POT-Creation-Date: 2015-03-08 20:09-0500\n"
"PO-Revision-Date: 2012-03-09 02:10+0200\n"
"Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
"Language-Team: IRI\n"
@@ -41,24 +41,24 @@
msgid "Japanese"
msgstr "Japanese"
-#: models/renkan.py:37
+#: models/renkan.py:32
msgid "edition_state"
msgstr "edition"
-#: models/renkan.py:38
+#: models/renkan.py:33
msgid "moderated_state"
msgstr "moderated"
-#: models/renkan.py:39
+#: models/renkan.py:34
msgid "published_state"
msgstr "published"
-#: models/renkan.py:40
+#: models/renkan.py:35
msgid "rejected_state"
msgstr "rejected"
#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75
-#: templates/base.html:96
+#: templates/base.html:97
msgid "A Propos"
msgstr "About"
@@ -66,15 +66,15 @@
msgid "Accueil"
msgstr "Home"
-#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
msgid "Recherche"
msgstr "Tag search"
-#: templates/base.html:40 templates/base.html.py:92
+#: templates/base.html:40 templates/base.html.py:93
msgid "Domaines Artistiques"
msgstr "Artistic discipline"
-#: templates/base.html:41 templates/base.html.py:93
+#: templates/base.html:41 templates/base.html.py:94
msgid "Thésaurus"
msgstr "Thesaurus"
@@ -96,15 +96,20 @@
msgid "Mentions légales"
msgstr "Legal Notices"
-#: templates/base.html:90
+#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/envelope/contact.html.py:16
+msgid "Contact"
+msgstr "Contact"
+
+#: templates/base.html:91
msgid "Rubriques"
msgstr "Topics"
-#: templates/base.html:95
+#: templates/base.html:96
msgid "Renkan repères"
msgstr "Landmark Renkan"
-#: templates/base.html:102
+#: templates/base.html:103
msgid "Liens"
msgstr "Links"
@@ -508,26 +513,26 @@
msgid "Ressources"
msgstr "Resources"
-#: templates/renkan_edit.html:191
+#: templates/renkan_edit.html:192
msgid "Change organisation"
msgstr "Change organisation"
-#: templates/renkan_edit.html:192
+#: templates/renkan_edit.html:193
msgid "(Indisponible si modification du RENKAN)"
msgstr "(Not allowed if renkan has been modified)"
-#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199
-#: templates/renkan_edit.html:203
+#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200
+#: templates/renkan_edit.html:204
msgid "View graph in column"
msgstr "View graph in column"
-#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200
-#: templates/renkan_edit.html:204
+#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201
+#: templates/renkan_edit.html:205
msgid "View graph in line"
msgstr "View graph in line"
-#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201
-#: templates/renkan_edit.html:205
+#: templates/renkan_edit.html:198 templates/renkan_edit.html.py:202
+#: templates/renkan_edit.html:206
msgid "View graph in circle"
msgstr "View graph in circle"
@@ -603,6 +608,25 @@
msgid "reject renkan"
msgstr "reject Renkan"
+#: templates/envelope/contact.html:19
+msgid ""
+"\n"
+" <p>Vous souhaitez poser une question sur Histoire des arts' Lab ?</"
+"p>\n"
+" <p>Remplissez le formulaire suivant :</p>\n"
+" "
+msgstr ""
+"\n"
+" <p>You wish to ask something about Histoire des arts' Lab ?</"
+"p>\n"
+" <p>Fill the following form:</p>\n"
+" "
+
+
+#: templates/envelope/contact.html:29
+msgid "Send!"
+msgstr "Send!"
+
#: templates/registration/activate.html:5
msgid "Registration - Activated"
msgstr "Registration - Activated"
@@ -772,9 +796,6 @@
#~ msgid "Reset password at %(site_name)s"
#~ msgstr "Reset password at %(site_name)s"
-#~ msgid "Contact"
-#~ msgstr "Contact"
-
#~ msgid "Pays"
#~ msgstr "Countries"
Binary file src/hdalab/locale/es/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/es/LC_MESSAGES/django.po Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/locale/es/LC_MESSAGES/django.po Mon Mar 09 02:15:09 2015 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 07:38-0600\n"
+"POT-Creation-Date: 2015-03-08 20:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,24 +41,24 @@
msgid "Japanese"
msgstr "Japonés"
-#: models/renkan.py:37
+#: models/renkan.py:32
msgid "edition_state"
msgstr "estado_edición"
-#: models/renkan.py:38
+#: models/renkan.py:33
msgid "moderated_state"
msgstr "estado_moderado"
-#: models/renkan.py:39
+#: models/renkan.py:34
msgid "published_state"
msgstr "estado_publicado"
-#: models/renkan.py:40
+#: models/renkan.py:35
msgid "rejected_state"
msgstr "estado_rechazado"
#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75
-#: templates/base.html:96
+#: templates/base.html:97
msgid "A Propos"
msgstr "Acerca de Nosotros"
@@ -66,17 +66,17 @@
msgid "Accueil"
msgstr ""
-#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
#, fuzzy
msgid "Recherche"
msgstr "Búsqueda por ramas"
-#: templates/base.html:40 templates/base.html.py:92
+#: templates/base.html:40 templates/base.html.py:93
#, fuzzy
msgid "Domaines Artistiques"
msgstr "Disciplinas artísticas"
-#: templates/base.html:41 templates/base.html.py:93
+#: templates/base.html:41 templates/base.html.py:94
msgid "Thésaurus"
msgstr ""
@@ -100,15 +100,20 @@
msgid "Mentions légales"
msgstr "Aviso Legal"
-#: templates/base.html:90
+#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/envelope/contact.html.py:16
+msgid "Contact"
+msgstr "Contactos"
+
+#: templates/base.html:91
msgid "Rubriques"
msgstr ""
-#: templates/base.html:95
+#: templates/base.html:96
msgid "Renkan repères"
msgstr ""
-#: templates/base.html:102
+#: templates/base.html:103
msgid "Liens"
msgstr ""
@@ -505,26 +510,26 @@
msgid "Ressources"
msgstr "Recursos"
-#: templates/renkan_edit.html:191
+#: templates/renkan_edit.html:192
msgid "Change organisation"
msgstr "Cambiar la organización"
-#: templates/renkan_edit.html:192
+#: templates/renkan_edit.html:193
msgid "(Indisponible si modification du RENKAN)"
msgstr "(Indisponible despues de modificar el RENKAN)"
-#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199
-#: templates/renkan_edit.html:203
+#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200
+#: templates/renkan_edit.html:204
msgid "View graph in column"
msgstr "Vista del gráfico en columnas"
-#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200
-#: templates/renkan_edit.html:204
+#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201
+#: templates/renkan_edit.html:205
msgid "View graph in line"
msgstr "Vista del gráfico en lineas"
-#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201
-#: templates/renkan_edit.html:205
+#: templates/renkan_edit.html:198 templates/renkan_edit.html.py:202
+#: templates/renkan_edit.html:206
msgid "View graph in circle"
msgstr "Vista del gráfico en círculo"
@@ -601,6 +606,19 @@
msgid "reject renkan"
msgstr "Gestionar mis Renkan"
+#: templates/envelope/contact.html:19
+msgid ""
+"\n"
+" <p>Vous souhaitez poser une question sur Histoire des arts' Lab ?</"
+"p>\n"
+" <p>Remplissez le formulaire suivant :</p>\n"
+" "
+msgstr ""
+
+#: templates/envelope/contact.html:29
+msgid "Send!"
+msgstr ""
+
#: templates/registration/activate.html:5
msgid "Registration - Activated"
msgstr "Inscriptición - Activada"
@@ -766,6 +784,3 @@
#~ msgid "Reset password at %(site_name)s"
#~ msgstr "Reiniciar la contraseña de %(site_name)s"
-
-#~ msgid "Contact"
-#~ msgstr "Contactos"
Binary file src/hdalab/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/fr/LC_MESSAGES/django.po Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/locale/fr/LC_MESSAGES/django.po Mon Mar 09 02:15:09 2015 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 07:38-0600\n"
+"POT-Creation-Date: 2015-03-08 20:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,26 +41,24 @@
msgid "Japanese"
msgstr "Japonais"
-#: models/renkan.py:37
+#: models/renkan.py:32
msgid "edition_state"
msgstr "édition"
-#: models/renkan.py:38
+#: models/renkan.py:33
msgid "moderated_state"
msgstr "modéré"
-#: models/renkan.py:39
+#: models/renkan.py:34
msgid "published_state"
msgstr "publié"
-#: models/renkan.py:40
+#: models/renkan.py:35
msgid "rejected_state"
msgstr "rejeté"
-#: templates/a_propos.html:5
-#: templates/base.html:43
-#: templates/base.html.py:75
-#: templates/base.html:96
+#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75
+#: templates/base.html:97
msgid "A Propos"
msgstr "À Propos"
@@ -68,29 +66,23 @@
msgid "Accueil"
msgstr ""
-#: templates/base.html:39
-#: templates/base.html.py:91
-#: templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
msgid "Recherche"
msgstr "Recherche"
-#: templates/base.html:40
-#: templates/base.html.py:92
+#: templates/base.html:40 templates/base.html.py:93
msgid "Domaines Artistiques"
msgstr "Disciplines artistiques"
-#: templates/base.html:41
-#: templates/base.html.py:93
+#: templates/base.html:41 templates/base.html.py:94
msgid "Thésaurus"
msgstr ""
-#: templates/base.html:50
-#: templates/ajax_identification/ajax_login_ok.html:4
+#: templates/base.html:50 templates/ajax_identification/ajax_login_ok.html:4
msgid "Log out"
msgstr "Déconnexion"
-#: templates/base.html:52
-#: templates/registration/activate.html:16
+#: templates/base.html:52 templates/registration/activate.html:16
#: templates/registration/activation_complete.html:16
#: templates/registration/password_reset_complete.html:15
msgid "Log in"
@@ -104,20 +96,24 @@
msgid "Mentions légales"
msgstr "Mentions légales"
-#: templates/base.html:90
+#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/envelope/contact.html.py:16
+msgid "Contact"
+msgstr ""
+
+#: templates/base.html:91
msgid "Rubriques"
msgstr "Rubriques"
-#: templates/base.html:95
+#: templates/base.html:96
msgid "Renkan repères"
msgstr "Renkan repères"
-#: templates/base.html:102
+#: templates/base.html:103
msgid "Liens"
msgstr "Liens"
-#: templates/categories.html:5
-#: templates/thesaurus.html:33
+#: templates/categories.html:5 templates/thesaurus.html:33
msgid "Recherche par arbre"
msgstr "Recherche par arbre"
@@ -137,8 +133,7 @@
msgid "Credits"
msgstr "Crédits"
-#: templates/facettes.html:5
-#: templates/facettes.html.py:46
+#: templates/facettes.html:5 templates/facettes.html.py:46
msgid "Recherche par facettes"
msgstr "Recherche par facettes"
@@ -204,7 +199,8 @@
"collections de ressources du portails histoire des arts avec d’autres sites "
"Web.<br><br>Vous pouvez déplacer chaque noeud en cliquant dessus et en "
"déplacant votre curseur."
-msgstr "Cet outil (RENKAN) vous permet de representer, spatialiser et organiser des "
+msgstr ""
+"Cet outil (RENKAN) vous permet de representer, spatialiser et organiser des "
"collections de ressources du portails histoire des arts avec d’autres sites "
"Web.<br><br>Vous pouvez déplacer chaque noeud en cliquant dessus et en "
"déplacant votre curseur."
@@ -225,13 +221,13 @@
msgid "Tag"
msgstr "Tag"
-#: templates/help_popup.html:22
-#: templates/help_popup.html.py:40
+#: templates/help_popup.html:22 templates/help_popup.html.py:40
msgid ""
"En cliquant sur chaque noeud ou lien vous pouvez les déplacer, éditer, "
"supprimer, agrandir, rétraicir, modifier en utilisant le menu circulaire "
"comme ci dessous."
-msgstr "En cliquant sur chaque noeud ou lien vous pouvez les déplacer, éditer, "
+msgstr ""
+"En cliquant sur chaque noeud ou lien vous pouvez les déplacer, éditer, "
"supprimer, agrandir, rétraicir, modifier en utilisant le menu circulaire "
"comme ci dessous."
@@ -247,14 +243,16 @@
msgid ""
"Une fois ce didacticiel fermer vous pouvez ajouter des ressources en faisant "
"“drag and drop” a partir de n’importe qu’elle fenetre de navigation web."
-msgstr "Une fois ce didacticiel fermer vous pouvez ajouter des ressources en faisant "
+msgstr ""
+"Une fois ce didacticiel fermer vous pouvez ajouter des ressources en faisant "
"“drag and drop” a partir de n’importe qu’elle fenetre de navigation web."
#: templates/help_popup.html:32
msgid ""
"En cliquant sur l’icone à gauche vous pouvez ouvrir le panel de recherche "
"pour retrouver des ressources du site HDA ou Wikipédia."
-msgstr "En cliquant sur l’icone à gauche vous pouvez ouvrir le panel de recherche "
+msgstr ""
+"En cliquant sur l’icone à gauche vous pouvez ouvrir le panel de recherche "
"pour retrouver des ressources du site HDA ou Wikipédia."
#: templates/help_popup.html:35
@@ -267,7 +265,8 @@
"la mise en page avant impression.<br><br>Le Lorem Ipsum est le faux texte "
"standard de l'imprimerie depuis les années 1500, quand un peintre anonyme "
"assembla ensemble des morceaux de texte pour réaliser un livre de texte."
-msgstr "Le Lorem Ipsum est simplement du faux texte employé dans la composition et "
+msgstr ""
+"Le Lorem Ipsum est simplement du faux texte employé dans la composition et "
"la mise en page avant impression.<br><br>Le Lorem Ipsum est le faux texte "
"standard de l'imprimerie depuis les années 1500, quand un peintre anonyme "
"assembla ensemble des morceaux de texte pour réaliser un livre de texte."
@@ -280,7 +279,8 @@
msgid ""
"Ensuite vous pouvez enregistrer en ciquant sur l’icone representant une "
"disquette."
-msgstr "Ensuite vous pouvez enregistrer en ciquant sur l’icone representant une "
+msgstr ""
+"Ensuite vous pouvez enregistrer en ciquant sur l’icone representant une "
"disquette."
#: templates/index.html:47
@@ -288,7 +288,8 @@
"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points "
"d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. "
"À la fois critères "
-msgstr "Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points "
+msgstr ""
+"Intuitive, la recherche d’Histoire des arts ‘Lab propose plusieurs points "
"d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. "
"À la fois critères "
@@ -296,7 +297,8 @@
msgid ""
"de recherche et modes de visualisation des résultats, ces différentes "
"facettes se mettent à jour au fur et à mesure de vos recherches."
-msgstr "de recherche et modes de visualisation des résultats, ces différentes "
+msgstr ""
+"de recherche et modes de visualisation des résultats, ces différentes "
"facettes se mettent à jour au fur et à mesure de vos recherches."
#: templates/index.html:59
@@ -313,7 +315,8 @@
msgid ""
"Construisez votre carte de connaissances à partir des ressources Histoires "
"des arts et Wikipedia."
-msgstr "Construisez votre carte de connaissances à partir des ressources Histoires "
+msgstr ""
+"Construisez votre carte de connaissances à partir des ressources Histoires "
"des arts et Wikipedia."
#: templates/index.html:91
@@ -324,7 +327,8 @@
msgid ""
"Naviguez autrement à travers les 5000 ressources du Portail Histoire des "
"arts :"
-msgstr "Naviguez autrement à travers les 5000 ressources du Portail Histoire des "
+msgstr ""
+"Naviguez autrement à travers les 5000 ressources du Portail Histoire des "
"arts :"
#: templates/index.html:95
@@ -383,68 +387,55 @@
msgid "Nouveau Renkan"
msgstr "Nouveau Renkan"
-#: templates/profile_home.html:55
-#: templates/profile_home.html.py:124
-#: templates/renkan_list.html:32
-#: templates/renkan_list.html.py:84
+#: templates/profile_home.html:55 templates/profile_home.html.py:124
+#: templates/renkan_list.html:32 templates/renkan_list.html.py:84
#: templates/editorial/manage_renkans.html:38
#: templates/editorial/manage_renkans.html:100
msgid "Previous"
msgstr "Précédent"
-#: templates/profile_home.html:56
-#: templates/profile_home.html.py:125
-#: templates/renkan_list.html:33
-#: templates/renkan_list.html.py:85
+#: templates/profile_home.html:56 templates/profile_home.html.py:125
+#: templates/renkan_list.html:33 templates/renkan_list.html.py:85
#: templates/editorial/manage_renkans.html:39
#: templates/editorial/manage_renkans.html:101
msgid "Next"
msgstr "Suivant"
-#: templates/profile_home.html:57
-#: templates/renkan_list.html:34
+#: templates/profile_home.html:57 templates/renkan_list.html:34
#: templates/editorial/manage_renkans.html:40
msgid "Filter"
msgstr "Filtrer"
-#: templates/profile_home.html:57
-#: templates/renkan_list.html:34
+#: templates/profile_home.html:57 templates/renkan_list.html:34
#: templates/editorial/manage_renkans.html:40
msgid "Advanced search"
msgstr "Recherche avancée"
-#: templates/profile_home.html:59
-#: templates/profile_home.html.py:77
-#: templates/renkan_list.html:36
-#: templates/renkan_list.html.py:48
+#: templates/profile_home.html:59 templates/profile_home.html.py:77
+#: templates/renkan_list.html:36 templates/renkan_list.html.py:48
#: templates/editorial/manage_renkans.html:42
#: templates/editorial/manage_renkans.html:60
msgid "Title"
msgstr "Titre"
-#: templates/profile_home.html:60
-#: templates/profile_home.html.py:81
-#: templates/renkan_list.html:37
-#: templates/renkan_list.html.py:56
+#: templates/profile_home.html:60 templates/profile_home.html.py:81
+#: templates/renkan_list.html:37 templates/renkan_list.html.py:56
#: templates/editorial/manage_renkans.html:43
#: templates/editorial/manage_renkans.html:66
msgid "Modification date"
msgstr "Date de modification"
-#: templates/profile_home.html:60
-#: templates/renkan_list.html:37
+#: templates/profile_home.html:60 templates/renkan_list.html:37
#: templates/editorial/manage_renkans.html:43
msgid "begin"
msgstr "début"
-#: templates/profile_home.html:61
-#: templates/renkan_list.html:38
+#: templates/profile_home.html:61 templates/renkan_list.html:38
#: templates/editorial/manage_renkans.html:44
msgid "end"
msgstr "fin"
-#: templates/profile_home.html:62
-#: templates/profile_home.html.py:84
+#: templates/profile_home.html:62 templates/profile_home.html.py:84
#: templates/editorial/manage_renkans.html:46
#: templates/editorial/manage_renkans.html:69
msgid "State"
@@ -454,51 +445,42 @@
msgid "Edition"
msgstr "Édition"
-#: templates/profile_home.html:66
-#: templates/editorial/manage_renkans.html:49
+#: templates/profile_home.html:66 templates/editorial/manage_renkans.html:49
msgid "Moderated"
msgstr "Modéré"
-#: templates/profile_home.html:67
-#: templates/editorial/manage_renkans.html:50
+#: templates/profile_home.html:67 templates/editorial/manage_renkans.html:50
msgid "Published"
msgstr "Publié"
-#: templates/profile_home.html:68
-#: templates/editorial/manage_renkans.html:51
+#: templates/profile_home.html:68 templates/editorial/manage_renkans.html:51
msgid "Rejected"
msgstr "Rejeté"
-#: templates/profile_home.html:71
-#: templates/renkan_list.html:41
+#: templates/profile_home.html:71 templates/renkan_list.html:41
#: templates/editorial/manage_renkans.html:54
msgid "Favorite"
msgstr "Favoris"
-#: templates/profile_home.html:72
-#: templates/renkan_list.html:43
+#: templates/profile_home.html:72 templates/renkan_list.html:43
#: templates/editorial/manage_renkans.html:55
msgid "Search"
msgstr "Rechercher"
-#: templates/profile_home.html:79
-#: templates/renkan_list.html:51
+#: templates/profile_home.html:79 templates/renkan_list.html:51
#: templates/editorial/manage_renkans.html:62
msgid "Fav."
msgstr "Fav."
-#: templates/profile_home.html:83
-#: templates/editorial/manage_renkans.html:68
+#: templates/profile_home.html:83 templates/editorial/manage_renkans.html:68
msgid "Preview"
msgstr "Prévisualisation"
-#: templates/profile_home.html:86
-#: templates/editorial/manage_renkans.html:71
+#: templates/profile_home.html:86 templates/editorial/manage_renkans.html:71
msgid "Actions"
msgstr "Actions"
-#: templates/profile_home.html:105
-#: templates/renkan_list.html:76
+#: templates/profile_home.html:105 templates/renkan_list.html:76
msgid "Are you sure you want to copy this renkan ?"
msgstr "Êtes-vous certain(e) de vouloir copier ce Renkan ?"
@@ -509,11 +491,11 @@
#: templates/profile_home.html:110
msgid ""
"Are you sure you want to delete this renkan ? You cannot undo this action."
-msgstr "Êtes-vous certain(e) de vouloir effacer ce Renkan ? Vous ne pourrez pas "
+msgstr ""
+"Êtes-vous certain(e) de vouloir effacer ce Renkan ? Vous ne pourrez pas "
"annuler cette action."
-#: templates/profile_home.html:115
-#: templates/editorial/manage_renkans.html:90
+#: templates/profile_home.html:115 templates/editorial/manage_renkans.html:90
msgid "publish renkan"
msgstr "publier renkan"
@@ -521,8 +503,7 @@
msgid "Are you sure you want to ask to publish this renkan ?"
msgstr "Êtes-vous certain(e) de vouloir demander la publication de ce Renkan ?"
-#: templates/profile_home.html:116
-#: templates/editorial/manage_renkans.html:91
+#: templates/profile_home.html:116 templates/editorial/manage_renkans.html:91
msgid "unpublish renkan"
msgstr "dépublier renkan"
@@ -534,45 +515,39 @@
msgid "Ressources"
msgstr "Ressources"
-#: templates/renkan_edit.html:191
+#: templates/renkan_edit.html:192
msgid "Change organisation"
msgstr "Changer de disposition"
-#: templates/renkan_edit.html:192
+#: templates/renkan_edit.html:193
msgid "(Indisponible si modification du RENKAN)"
msgstr "(Indisponible si le RENKAN est modifié)"
-#: templates/renkan_edit.html:195
-#: templates/renkan_edit.html.py:199
-#: templates/renkan_edit.html:203
+#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200
+#: templates/renkan_edit.html:204
msgid "View graph in column"
msgstr "Voir le graphe en colonne"
-#: templates/renkan_edit.html:196
-#: templates/renkan_edit.html.py:200
-#: templates/renkan_edit.html:204
+#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201
+#: templates/renkan_edit.html:205
msgid "View graph in line"
msgstr "Voir le graphe en ligne"
-#: templates/renkan_edit.html:197
-#: templates/renkan_edit.html.py:201
-#: templates/renkan_edit.html:205
+#: templates/renkan_edit.html:198 templates/renkan_edit.html.py:202
+#: templates/renkan_edit.html:206
msgid "View graph in circle"
msgstr "Voir le graphe en cercle"
-#: templates/renkan_list.html:6
-#: templates/renkan_list.html.py:29
+#: templates/renkan_list.html:6 templates/renkan_list.html.py:29
msgid "Public Renkans list"
msgstr "Liste des renkans publics"
-#: templates/renkan_list.html:39
-#: templates/editorial/manage_renkans.html:45
+#: templates/renkan_list.html:39 templates/editorial/manage_renkans.html:45
#: templates/registration/login.html:24
msgid "Username"
msgstr "Nom d'utilisateur"
-#: templates/renkan_list.html:54
-#: templates/editorial/manage_renkans.html:64
+#: templates/renkan_list.html:54 templates/editorial/manage_renkans.html:64
msgid "User"
msgstr "Utilisateur"
@@ -584,7 +559,8 @@
#: templates/registration/login.html:18
#: templates/registration/password_reset_form.html:18
msgid "Sorry, that's not a valid username or password."
-msgstr "Désolé, le nom de l'utilisateur ou le mot de passe ne sont pas valides."
+msgstr ""
+"Désolé, le nom de l'utilisateur ou le mot de passe ne sont pas valides."
#: templates/ajax_identification/ajax_login.html:15
#: templates/registration/registration_form.html:24
@@ -601,8 +577,7 @@
msgstr "Annuler"
#: templates/ajax_identification/ajax_login.html:23
-#: templates/registration/login.html:5
-#: templates/registration/login.html:32
+#: templates/registration/login.html:5 templates/registration/login.html:32
msgid "Login"
msgstr "Connexion"
@@ -636,6 +611,25 @@
msgid "reject renkan"
msgstr "rejeter Renkan"
+#: templates/envelope/contact.html:19
+msgid ""
+"\n"
+" <p>Vous souhaitez poser une question sur Histoire des arts' Lab ?</"
+"p>\n"
+" <p>Remplissez le formulaire suivant :</p>\n"
+" "
+msgstr ""
+"\n"
+" <p>Vous souhaitez poser une question sur Histoire des arts' Lab ?</"
+"p>\n"
+" <p>Remplissez le formulaire suivant :</p>\n"
+" "
+
+
+#: templates/envelope/contact.html:29
+msgid "Send!"
+msgstr "Envoyer !"
+
#: templates/registration/activate.html:5
msgid "Registration - Activated"
msgstr "Enregistrement - Activé"
@@ -667,7 +661,8 @@
"\n"
"You have created an account at %(sitename)s with the user name "
"%(username)s.\n"
-msgstr "\n"
+msgstr ""
+"\n"
"Vous avez créé un compte sur le site %(sitename)s avec le nom d'utilisateur "
"%(username)s.\n"
@@ -755,7 +750,8 @@
#: templates/registration/password_reset_done.html:14
msgid "Email with password reset instructions has been sent."
-msgstr "L'email avec les instructions pour réinitialiser le mot de passe a été "
+msgstr ""
+"L'email avec les instructions pour réinitialiser le mot de passe a été "
"envoyé."
#: templates/registration/password_reset_form.html:5
@@ -798,8 +794,6 @@
msgid "Plus de Ressources"
msgstr "Plus de Ressources"
-#: views/profile.py:448
-#: views/profile.py:527
+#: views/profile.py:448 views/profile.py:527
msgid "Period"
msgstr "Période"
-
Binary file src/hdalab/locale/it/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/it/LC_MESSAGES/django.po Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/locale/it/LC_MESSAGES/django.po Mon Mar 09 02:15:09 2015 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 07:38-0600\n"
+"POT-Creation-Date: 2015-03-08 20:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,24 +41,24 @@
msgid "Japanese"
msgstr "Giapponese"
-#: models/renkan.py:37
+#: models/renkan.py:32
msgid "edition_state"
msgstr ""
-#: models/renkan.py:38
+#: models/renkan.py:33
msgid "moderated_state"
msgstr ""
-#: models/renkan.py:39
+#: models/renkan.py:34
msgid "published_state"
msgstr ""
-#: models/renkan.py:40
+#: models/renkan.py:35
msgid "rejected_state"
msgstr ""
#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75
-#: templates/base.html:96
+#: templates/base.html:97
msgid "A Propos"
msgstr ""
@@ -66,17 +66,17 @@
msgid "Accueil"
msgstr ""
-#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
#, fuzzy
msgid "Recherche"
msgstr "Cercare un tag"
-#: templates/base.html:40 templates/base.html.py:92
+#: templates/base.html:40 templates/base.html.py:93
#, fuzzy
msgid "Domaines Artistiques"
msgstr "Discipline artistiche"
-#: templates/base.html:41 templates/base.html.py:93
+#: templates/base.html:41 templates/base.html.py:94
msgid "Thésaurus"
msgstr ""
@@ -98,15 +98,20 @@
msgid "Mentions légales"
msgstr ""
-#: templates/base.html:90
+#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/envelope/contact.html.py:16
+msgid "Contact"
+msgstr ""
+
+#: templates/base.html:91
msgid "Rubriques"
msgstr ""
-#: templates/base.html:95
+#: templates/base.html:96
msgid "Renkan repères"
msgstr ""
-#: templates/base.html:102
+#: templates/base.html:103
msgid "Liens"
msgstr ""
@@ -489,26 +494,26 @@
msgid "Ressources"
msgstr ""
-#: templates/renkan_edit.html:191
+#: templates/renkan_edit.html:192
msgid "Change organisation"
msgstr ""
-#: templates/renkan_edit.html:192
+#: templates/renkan_edit.html:193
msgid "(Indisponible si modification du RENKAN)"
msgstr ""
-#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199
-#: templates/renkan_edit.html:203
-msgid "View graph in column"
-msgstr ""
-
#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200
#: templates/renkan_edit.html:204
-msgid "View graph in line"
+msgid "View graph in column"
msgstr ""
#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201
#: templates/renkan_edit.html:205
+msgid "View graph in line"
+msgstr ""
+
+#: templates/renkan_edit.html:198 templates/renkan_edit.html.py:202
+#: templates/renkan_edit.html:206
msgid "View graph in circle"
msgstr ""
@@ -584,6 +589,19 @@
msgid "reject renkan"
msgstr ""
+#: templates/envelope/contact.html:19
+msgid ""
+"\n"
+" <p>Vous souhaitez poser une question sur Histoire des arts' Lab ?</"
+"p>\n"
+" <p>Remplissez le formulaire suivant :</p>\n"
+" "
+msgstr ""
+
+#: templates/envelope/contact.html:29
+msgid "Send!"
+msgstr ""
+
#: templates/registration/activate.html:5
msgid "Registration - Activated"
msgstr ""
Binary file src/hdalab/locale/ja/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/ja/LC_MESSAGES/django.po Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/locale/ja/LC_MESSAGES/django.po Mon Mar 09 02:15:09 2015 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 07:38-0600\n"
+"POT-Creation-Date: 2015-03-08 20:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -42,24 +42,24 @@
msgid "Japanese"
msgstr "日本語"
-#: models/renkan.py:37
+#: models/renkan.py:32
msgid "edition_state"
msgstr ""
-#: models/renkan.py:38
+#: models/renkan.py:33
msgid "moderated_state"
msgstr ""
-#: models/renkan.py:39
+#: models/renkan.py:34
msgid "published_state"
msgstr ""
-#: models/renkan.py:40
+#: models/renkan.py:35
msgid "rejected_state"
msgstr ""
#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75
-#: templates/base.html:96
+#: templates/base.html:97
msgid "A Propos"
msgstr ""
@@ -67,17 +67,17 @@
msgid "Accueil"
msgstr ""
-#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
#, fuzzy
msgid "Recherche"
msgstr "タグを検索する"
-#: templates/base.html:40 templates/base.html.py:92
+#: templates/base.html:40 templates/base.html.py:93
#, fuzzy
msgid "Domaines Artistiques"
msgstr "学術・芸術分野"
-#: templates/base.html:41 templates/base.html.py:93
+#: templates/base.html:41 templates/base.html.py:94
msgid "Thésaurus"
msgstr ""
@@ -99,15 +99,20 @@
msgid "Mentions légales"
msgstr ""
-#: templates/base.html:90
+#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/envelope/contact.html.py:16
+msgid "Contact"
+msgstr ""
+
+#: templates/base.html:91
msgid "Rubriques"
msgstr ""
-#: templates/base.html:95
+#: templates/base.html:96
msgid "Renkan repères"
msgstr ""
-#: templates/base.html:102
+#: templates/base.html:103
msgid "Liens"
msgstr ""
@@ -490,26 +495,26 @@
msgid "Ressources"
msgstr ""
-#: templates/renkan_edit.html:191
+#: templates/renkan_edit.html:192
msgid "Change organisation"
msgstr ""
-#: templates/renkan_edit.html:192
+#: templates/renkan_edit.html:193
msgid "(Indisponible si modification du RENKAN)"
msgstr ""
-#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199
-#: templates/renkan_edit.html:203
-msgid "View graph in column"
-msgstr ""
-
#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200
#: templates/renkan_edit.html:204
-msgid "View graph in line"
+msgid "View graph in column"
msgstr ""
#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201
#: templates/renkan_edit.html:205
+msgid "View graph in line"
+msgstr ""
+
+#: templates/renkan_edit.html:198 templates/renkan_edit.html.py:202
+#: templates/renkan_edit.html:206
msgid "View graph in circle"
msgstr ""
@@ -585,6 +590,19 @@
msgid "reject renkan"
msgstr ""
+#: templates/envelope/contact.html:19
+msgid ""
+"\n"
+" <p>Vous souhaitez poser une question sur Histoire des arts' Lab ?</"
+"p>\n"
+" <p>Remplissez le formulaire suivant :</p>\n"
+" "
+msgstr ""
+
+#: templates/envelope/contact.html:29
+msgid "Send!"
+msgstr ""
+
#: templates/registration/activate.html:5
msgid "Registration - Activated"
msgstr ""
Binary file src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Mon Mar 09 02:15:09 2015 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 07:38-0600\n"
+"POT-Creation-Date: 2015-03-08 20:09-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,24 +42,24 @@
msgid "Japanese"
msgstr ""
-#: models/renkan.py:37
+#: models/renkan.py:32
msgid "edition_state"
msgstr ""
-#: models/renkan.py:38
+#: models/renkan.py:33
msgid "moderated_state"
msgstr ""
-#: models/renkan.py:39
+#: models/renkan.py:34
msgid "published_state"
msgstr ""
-#: models/renkan.py:40
+#: models/renkan.py:35
msgid "rejected_state"
msgstr ""
#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75
-#: templates/base.html:96
+#: templates/base.html:97
msgid "A Propos"
msgstr ""
@@ -67,17 +67,17 @@
msgid "Accueil"
msgstr ""
-#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
#, fuzzy
msgid "Recherche"
msgstr "Rechercher un tag"
-#: templates/base.html:40 templates/base.html.py:92
+#: templates/base.html:40 templates/base.html.py:93
#, fuzzy
msgid "Domaines Artistiques"
msgstr "Disciplines artistiques"
-#: templates/base.html:41 templates/base.html.py:93
+#: templates/base.html:41 templates/base.html.py:94
msgid "Thésaurus"
msgstr ""
@@ -99,15 +99,20 @@
msgid "Mentions légales"
msgstr ""
-#: templates/base.html:90
+#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/envelope/contact.html.py:16
+msgid "Contact"
+msgstr ""
+
+#: templates/base.html:91
msgid "Rubriques"
msgstr ""
-#: templates/base.html:95
+#: templates/base.html:96
msgid "Renkan repères"
msgstr ""
-#: templates/base.html:102
+#: templates/base.html:103
msgid "Liens"
msgstr ""
@@ -490,26 +495,26 @@
msgid "Ressources"
msgstr ""
-#: templates/renkan_edit.html:191
+#: templates/renkan_edit.html:192
msgid "Change organisation"
msgstr ""
-#: templates/renkan_edit.html:192
+#: templates/renkan_edit.html:193
msgid "(Indisponible si modification du RENKAN)"
msgstr ""
-#: templates/renkan_edit.html:195 templates/renkan_edit.html.py:199
-#: templates/renkan_edit.html:203
-msgid "View graph in column"
-msgstr ""
-
#: templates/renkan_edit.html:196 templates/renkan_edit.html.py:200
#: templates/renkan_edit.html:204
-msgid "View graph in line"
+msgid "View graph in column"
msgstr ""
#: templates/renkan_edit.html:197 templates/renkan_edit.html.py:201
#: templates/renkan_edit.html:205
+msgid "View graph in line"
+msgstr ""
+
+#: templates/renkan_edit.html:198 templates/renkan_edit.html.py:202
+#: templates/renkan_edit.html:206
msgid "View graph in circle"
msgstr ""
@@ -585,6 +590,19 @@
msgid "reject renkan"
msgstr ""
+#: templates/envelope/contact.html:19
+msgid ""
+"\n"
+" <p>Vous souhaitez poser une question sur Histoire des arts' Lab ?</"
+"p>\n"
+" <p>Remplissez le formulaire suivant :</p>\n"
+" "
+msgstr ""
+
+#: templates/envelope/contact.html:29
+msgid "Send!"
+msgstr ""
+
#: templates/registration/activate.html:5
msgid "Registration - Activated"
msgstr ""
--- a/src/hdalab/settings.py Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/settings.py Mon Mar 09 02:15:09 2015 +0100
@@ -149,8 +149,10 @@
'django.contrib.staticfiles',
'django.contrib.admin',
'django_extensions',
- "djcelery_email",
+ 'djcelery_email',
'registration',
+ 'honeypot',
+ 'envelope',
'haystack',
'easy_thumbnails',
'renkanmanager',
@@ -186,6 +188,9 @@
EMAIL_BACKEND = 'djcelery_email.backends.CeleryEmailBackend'
+HONEYPOT_FIELD_NAME='phone'
+ENVELOPE_SUBJECT_INTRO='[hdalab contact]'
+
from hdalab.config import * #@UnusedWildImport
if 'LOGIN_REDIRECT_URL' not in locals():
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/static/hdalab/css/contact.css Mon Mar 09 02:15:09 2015 +0100
@@ -0,0 +1,88 @@
+@CHARSET "UTF-8";
+
+#contact-description {
+ margin-bottom: 20px;
+}
+
+#contact-div {
+ width: 500px;
+ padding: 10px;
+ background-color: rgb(230, 230, 230);
+ border-radius: 2px;
+ margin: auto;
+}
+
+#contact-div p {
+ color: #4f5451;
+ font-size: 14px;
+ font-size: 1.4rem;
+ margin: 10px 30px;
+ clear: right;
+}
+#contact-div label{
+ font-size: 14px;
+ font-size: 1.4rem;
+ line-height: 3.4;
+ display: block;
+}
+#contact-div .error input, #contact-div .error select {
+ border: 2px red solid;
+}
+
+#contact-div input[type="text"],
+#contact-div input[type="email"],
+#contact-div textarea {
+ border:0;
+ box-sizing: border-box;
+ color: #4f5451;
+ font-size: 12px;
+ font-size: 1.2rem;
+ font-weight: 300;
+ width: 100%;
+ border-radius: 2px;
+}
+
+#contact-div input[type="text"],
+#contact-div input[type="email"] {
+ height: 50px;
+ padding: 0 20px;
+}
+
+#contact-div textarea {
+ height: 200px;
+ padding: 5px 5px;
+}
+
+
+#contact-div input[type="text"]:focus,
+#contact-div input[type="email"]:focus,
+#contact-div textarea:focus {
+ background-color: rgba(255, 255, 255, 1);
+ border:1px solid #7cb0bd;
+}
+#contact-div input[type="submit"] {
+ content: " ";
+ height: 30px;
+ border: 0;
+ color: #fff;
+ font-size: 14px;
+ font-size: 1.4rem;
+ font-weight: 300;
+ background-color: #7cb0bd;
+ border-radius: 2px;
+ transition: background-color 0.3s ease;
+ cursor:pointer;
+ margin: 10px 0;
+/* float: right; */
+}
+#contact-div input[type="submit"]:hover {
+ background-color: #4f5451;
+}
+
+#contact-div .btn-submit {
+ text-align: right;
+}
+
+#contact-div fieldset {
+ border: none;
+}
--- a/src/hdalab/static/hdalab/css/footer.css Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/static/hdalab/css/footer.css Mon Mar 09 02:15:09 2015 +0100
@@ -7,7 +7,7 @@
background-color: #7cb0bd;
}
#footer .nav .row {
- width: 311px;
+ width: 350px;
}
#footer .nav ul {
float: left;
--- a/src/hdalab/templates/base.html Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/templates/base.html Mon Mar 09 02:15:09 2015 +0100
@@ -75,6 +75,7 @@
<li><a href="{% url 'a_propos'%}">{% trans 'A Propos' %}</a></li>
<li><a href="{% url 'credits'%}">{% trans 'Crédits' %}</a></li>
<li><a href="{% url 'mentions_legales'%}">{% trans 'Mentions légales' %}</a></li>
+ <li><a href="{% url 'envelope-contact'%}">{% trans 'Contact' %}</a></li>
</ul>
</div>
</div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/envelope/contact.html Mon Mar 09 02:15:09 2015 +0100
@@ -0,0 +1,32 @@
+{% extends "base.html" %}
+{% load static %}
+{% load i18n %}
+{% load envelope_tags %}
+
+{% block title %}{% trans "Contact" %}{% endblock %}
+
+{% block css_import %}
+{{block.super}}
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/contact.css' %}" />
+{% endblock %}
+
+
+{% block main_content %}
+ <div class="all-title">
+ <h1><strong>{% trans "Contact" %}</strong></h1>
+ </div>
+ <div id="contact-description" class="description">
+ {% blocktrans %}
+ <p>Vous souhaitez poser une question sur Histoire des arts' Lab ?</p>
+ <p>Remplissez le formulaire suivant :</p>
+ {% endblocktrans %}
+ </div>
+ <div id="contact-div">
+ <form action="{% url 'envelope-contact' %}" method="post">
+ {% csrf_token %}
+ {% antispam_fields %}
+ {{ form.as_p }}
+ <p><input type="submit" value="{% trans "Send!" %}" /></p>
+ </form>
+ </div>
+{% endblock %}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/envelope/email_body.html Mon Mar 09 02:15:09 2015 +0100
@@ -0,0 +1,107 @@
+{% load i18n %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title>Message du formulaire de contact hdalab</title>
+ <!-- Designed by https://github.com/kaytcat -->
+ <!-- Robot header image designed by Freepik.com -->
+ <style type="text/css" media="only screen and (max-width: 480px)">
+ /* Mobile styles */
+ @media only screen and (max-width: 480px) {
+ table[class="w320"] {
+ width: 320px;
+ }
+ td[class="mobile-block"] {
+ width: 100%;
+ display: block;
+ }
+ }
+ </style>
+</head>
+<body style="-webkit-font-smoothing:antialiased; width:100%; height:100%; color:#37302d; font-size:16px; padding:0; margin:0; display:block; background:#ffffff; -webkit-text-size-adjust:none" bgcolor="#ffffff" width="100%" height="100%">
+<table align="center" cellpadding="0" cellspacing="0" height="100%" style="border-collapse:collapse; width:100%" width="100%">
+ <tr>
+ <td align="center" valign="top" bgcolor="#ffffff" width="100%" style="font-family:Helvetica, Arial, sans-serif; font-weight:400; text-align:center">
+ <center>
+ <table style="border-collapse:collapse; margin:0 auto" cellpadding="0" cellspacing="0" width="600">
+ <tr>
+ <td align="center" valign="top" style="font-family:Helvetica, Arial, sans-serif; font-weight:400; text-align:center">
+ <table style="border-collapse:collapse; width:100%; margin:0 auto" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td style="font-family:Helvetica, Arial, sans-serif; font-weight:400; font-size:30px; text-align:center" align="center">
+ <br>
+ Message du formulaire de contact hdalab
+ <br>
+ <br>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse:collapse; width:100%; margin:0 auto" cellpadding="0" cellspacing="0" bgcolor="#4dbfbf" width="100%">
+ <tr>
+ <td style="font-family:Helvetica, Arial, sans-serif; font-weight:400; text-align:center" align="center">
+ <br>
+ <img src="https://www.filepicker.io/api/file/TjmeNWS5Q2SFmtJlUGLf" width="224" height="240" alt="robot picture">
+ </td>
+ </tr>
+ <tr>
+ <td style="font-family:Helvetica, Arial, sans-serif; font-weight:400; text-align:center; color:#ffffff; font-size:36px" align="center">
+ {{ subject }}
+ </td>
+ </tr>
+ <tr>
+ <td style="font-family:Helvetica, Arial, sans-serif; font-weight:400; text-align:center" align="center">
+ <center>
+ <table style="border-collapse:collapse; margin:0 auto" cellpadding="0" cellspacing="0" width="60%">
+ <tr>
+ <td style="font-family:Helvetica, Arial, sans-serif; font-weight:400; text-align:center; color:#187272" align="center">
+ <br>
+ {{ message }}
+ <br>
+ <br>
+ </td>
+ </tr>
+ </table>
+ </center>
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse:collapse; width:100%; margin:0 auto" cellpadding="0" cellspacing="0" bgcolor="#f5774e" width="100%">
+ <tr>
+ <td style="font-family:Helvetica, Arial, sans-serif; font-weight:400; text-align:center; background-color:#f5774e" bgcolor="#f5774e" align="center">
+ <center>
+ <table style="border-collapse:collapse; width:80%; margin:0 auto" cellspacing="0" cellpadding="0" width="80%">
+ <tr>
+ <td style="font-family:Helvetica, Arial, sans-serif; font-weight:400; text-align:left; color:#933f24" align="left">
+ <br>
+ <br>
+ Envoyeur: {{ sender }}
+ </td>
+ <td style="font-family:Helvetica, Arial, sans-serif; font-weight:400; text-align:right; vertical-align:top; color:#933f24" align="right">
+ <br>
+ <br>
+ {{ email }}
+ </td>
+ </tr>
+ </table>
+ <table style="border-collapse:collapse; width:80%; margin:0 auto" cellspacing="0" cellpadding="0" width="80%">
+ <tr>
+ <td style="font-family:Helvetica, Arial, sans-serif; font-weight:400; color:#933f24; text-align:left; border-bottom:1px solid #933f24" align="left">
+ <br>
+ <br>
+ </td>
+ </tr>
+ </table>
+ </center>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </center>
+ </td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/templates/envelope/email_body.txt Mon Mar 09 02:15:09 2015 +0100
@@ -0,0 +1,7 @@
+{% load i18n %}
+Message du formulaire de contact hdalab
+Envoyeur : {{ sender }} ({{ email }})
+Vici le message
+================================================================================
+{{ message }}
+================================================================================
--- a/src/hdalab/urls.py Sun Mar 08 23:53:23 2015 +0100
+++ b/src/hdalab/urls.py Mon Mar 09 02:15:09 2015 +0100
@@ -57,9 +57,10 @@
url(r'^edito/folder/(?P<folder_pk>[\w-]+)$', staff_member_required(HdalabAddOrUpdateFolder.as_view()), name='hdalab_add_or_update_folder'),
url(r'^edito/deletefolder/(?P<folder_pk>[\w-]+)$', staff_member_required(HdalabDeleteFolder.as_view()), name='hdalab_delete_folder'),
- url(r'^hdabo/a_propos/$', TemplateView.as_view(template_name="a_propos.html"), name='a_propos'),
- url(r'^hdabo/credits/$', TemplateView.as_view(template_name="credits.html"), name='credits'),
- url(r'^hdabo/mentions_legales/$', TemplateView.as_view(template_name="mentions_legales.html"), name='mentions_legales')
+ url(r'^hdalab/a_propos/$', TemplateView.as_view(template_name="a_propos.html"), name='a_propos'),
+ url(r'^hdalab/credits/$', TemplateView.as_view(template_name="credits.html"), name='credits'),
+ url(r'^hdalab/mentions_legales/$', TemplateView.as_view(template_name="mentions_legales.html"), name='mentions_legales'),
+ url(r'^hdalab/contact/', include('envelope.urls')),
)
--- a/virtualenv/res/lib/lib_create_env.py Sun Mar 08 23:53:23 2015 +0100
+++ b/virtualenv/res/lib/lib_create_env.py Mon Mar 09 02:15:09 2015 +0100
@@ -57,6 +57,8 @@
'CELERY': { 'setup': 'celery', 'url':'https://github.com/celery/celery/archive/v3.1.17.tar.gz', 'local':"celery-3.1.17.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
'APPCONF': { 'setup': 'django-appconf', 'url':'https://github.com/jezdez/django-appconf/archive/v1.0.1.tar.gz', 'local':"django-appconf-1.0.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
'CELERY-EMAIL': { 'setup': 'django-celery-email', 'url':'https://github.com/pmclanahan/django-celery-email/archive/1.1.0.tar.gz', 'local':"django-celery-email-1.1.0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+ 'DJANGO-ENVELOPE': { 'setup': 'django-envelope', 'url':'https://github.com/zsiciarz/django-envelope/archive/1.0.0.tar.gz', 'local':'django-envelope-1.0.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+ 'DJANGO-HONEYPOT': { 'setup': 'django-honeypot', 'url':'https://github.com/sunlightlabs/django-honeypot/archive/0.3.0.tar.gz', 'local':'django-honeypot-0.3.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
}
Binary file virtualenv/res/src/django-envelope-1.0.0.tar.gz has changed
Binary file virtualenv/res/src/django-honeypot-0.3.0.tar.gz has changed
--- a/virtualenv/web/res/requirements.txt Sun Mar 08 23:53:23 2015 +0100
+++ b/virtualenv/web/res/requirements.txt Mon Mar 09 02:15:09 2015 +0100
@@ -15,6 +15,7 @@
celery==3.1.17
django-appconf==1.0.1
django-celery-email==1.1.0
+django-envelope==1.0
django-extensions==1.4.4
django-haystack==2.2.0
django-registration-redux==1.1