# HG changeset patch # User ymh # Date 1434731135 -7200 # Node ID 3fd558fa38b1dd460cb922d3edc5ed0cb5e4b690 # Parent af0a0940539828a2dc3a68644c4bb4b99659616e correct various small bugs. upgrade renkan. news version diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/__init__.py --- a/src/hdalab/__init__.py Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/__init__.py Fri Jun 19 18:25:35 2015 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import -VERSION = (3, 0, 0, "rc", 15) +VERSION = (3, 0, 0, "rc", 16) def get_version(): diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/de/LC_MESSAGES/django.mo Binary file src/hdalab/locale/de/LC_MESSAGES/django.mo has changed diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/de/LC_MESSAGES/django.po --- a/src/hdalab/locale/de/LC_MESSAGES/django.po Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/locale/de/LC_MESSAGES/django.po Fri Jun 19 18:25:35 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-03 06:24-0500\n" +"POT-Creation-Date: 2015-06-19 05:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -73,101 +73,116 @@ msgid "Sorry, but the requested page could not be found." msgstr "" -#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74 -#: templates/base.html:96 +#: templates/a_propos.html:5 templates/base.html:46 templates/base.html.py:78 +#: templates/base.html:100 msgid "A Propos" msgstr "" -#: templates/ajax_identification/ajax_login.html:7 +#: templates/ajax_identification/ajax_login.html:5 msgid "Identifiants" msgstr "" -#: templates/ajax_identification/ajax_login.html:9 +#: templates/ajax_identification/ajax_login.html:7 #: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:19 msgid "Sorry, that's not a valid username or password." msgstr "" -#: templates/ajax_identification/ajax_login.html:15 +#: templates/ajax_identification/ajax_login.html:13 #: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" -#: templates/ajax_identification/ajax_login.html:19 +#: templates/ajax_identification/ajax_login.html:17 #: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 msgid "Cancel" msgstr "" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 #: templates/registration/login.html:5 templates/registration/login.html:33 msgid "Login" msgstr "" -#: templates/ajax_identification/ajax_login.html:26 +#: templates/ajax_identification/ajax_login.html:24 #: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "" -#: templates/ajax_identification/ajax_login.html:27 +#: templates/ajax_identification/ajax_login.html:25 #: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "" -#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49 +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:53 msgid "Log out" msgstr "" -#: templates/base.html:38 +#: templates/base.html:42 msgid "Accueil" msgstr "" -#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +#: templates/base.html:43 templates/base.html.py:95 templates/index.html:44 msgid "Recherche" msgstr "Einen Tag suchen" -#: templates/base.html:40 templates/base.html.py:92 +#: templates/base.html:44 templates/base.html.py:96 msgid "Domaines Artistiques" msgstr "Künstlerische Disziplinen" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:55 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "" -#: templates/base.html:75 +#: templates/base.html:79 msgid "Crédits" msgstr "" -#: templates/base.html:76 +#: templates/base.html:80 msgid "Mentions légales" msgstr "" -#: templates/base.html:77 templates/envelope/contact.html:6 +#: templates/base.html:81 templates/envelope/contact.html:6 #: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "" -#: templates/base.html:90 +#: templates/base.html:94 msgid "Rubriques" msgstr "" -#: templates/base.html:93 +#: templates/base.html:97 msgid "Thésaurus" msgstr "" -#: templates/base.html:95 +#: templates/base.html:99 msgid "Renkan repères" msgstr "" -#: templates/base.html:101 +#: templates/base.html:105 msgid "Liens" msgstr "" +#: templates/base.html:125 +msgid "" +"We use cookies on this website, you can read about them here. To use the " +"website as intended please..." +msgstr "" + +#: templates/base.html:126 +msgid "ACCEPT COOKIES" +msgstr "" + +#: templates/base.html:127 +msgid "DECLINE COOKIES" +msgstr "" + #: templates/categories.html:5 templates/thesaurus.html:33 msgid "Recherche par arbre" msgstr "Suche nach Facetten" @@ -212,14 +227,14 @@ #: templates/editorial/manage_renkans.html:41 #: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 #: templates/profile_home.html.py:125 templates/renkan_list.html:42 -#: templates/renkan_list.html.py:94 +#: templates/renkan_list.html.py:100 msgid "Previous" msgstr "" #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 #: templates/profile_home.html.py:126 templates/renkan_list.html:43 -#: templates/renkan_list.html.py:95 +#: templates/renkan_list.html.py:101 msgid "Next" msgstr "" @@ -236,14 +251,14 @@ #: templates/editorial/manage_renkans.html:45 #: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 #: templates/profile_home.html.py:78 templates/renkan_list.html:46 -#: templates/renkan_list.html.py:58 +#: templates/renkan_list.html.py:60 msgid "Title" msgstr "" #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 #: templates/profile_home.html.py:82 templates/renkan_list.html:47 -#: templates/renkan_list.html.py:66 +#: templates/renkan_list.html.py:70 msgid "Modification date" msgstr "" @@ -258,7 +273,7 @@ msgstr "" #: templates/editorial/manage_renkans.html:48 -#: templates/registration/login.html:25 templates/renkan_list.html:49 +#: templates/registration/login.html:25 templates/renkan_list.html:50 msgid "Username" msgstr "" @@ -281,21 +296,21 @@ msgstr "" #: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 -#: templates/renkan_list.html:51 +#: templates/renkan_list.html:53 msgid "Favorite" msgstr "" #: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 -#: templates/renkan_list.html:53 +#: templates/renkan_list.html:55 msgid "Search" msgstr "" #: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 -#: templates/renkan_list.html:61 +#: templates/renkan_list.html:63 msgid "Fav." msgstr "" -#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64 +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:67 msgid "User" msgstr "" @@ -693,11 +708,11 @@ msgstr "" #: templates/profile_home.html:94 templates/profile_home.html.py:102 -#: templates/renkan_list.html:74 templates/renkan_list.html.py:82 +#: templates/renkan_list.html:78 templates/renkan_list.html.py:88 msgid "View renkan" msgstr "" -#: templates/profile_home.html:106 templates/renkan_list.html:86 +#: templates/profile_home.html:106 templates/renkan_list.html:92 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -860,35 +875,35 @@ msgid "Mot de passe (Verification)" msgstr "" -#: templates/renkan_edit.html:70 +#: templates/renkan_edit.html:71 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:201 +#: templates/renkan_edit.html:202 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:203 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:205 templates/renkan_edit.html.py:209 -#: templates/renkan_edit.html:213 -msgid "View graph in column" -msgstr "" - #: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 #: templates/renkan_edit.html:214 -msgid "View graph in line" +msgid "View graph in column" msgstr "" #: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 #: templates/renkan_edit.html:215 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 +#: templates/renkan_edit.html:216 msgid "View graph in circle" msgstr "" #: templates/renkan_list.html:6 templates/renkan_list.html.py:29 -#: templates/renkan_list_favorite.html:4 +#: templates/renkan_list_favorite.html:4 templates/renkan_new_confirm.html:6 msgid "Marked Renkans list" msgstr "" @@ -913,11 +928,25 @@ "des arts." msgstr "" -#: views/profile.py:443 +#: templates/renkan_new_confirm.html:23 +msgid "Confirm renkan creation" +msgstr "" + +#: templates/renkan_new_confirm.html:27 +msgid "" +"You are now authenticated, you can create your new renkan by clicking on " +"this link:" +msgstr "" + +#: templates/renkan_new_confirm.html:28 +msgid "Create new Renkan" +msgstr "" + +#: views/profile.py:461 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:452 views/profile.py:531 +#: views/profile.py:470 views/profile.py:549 msgid "Period" msgstr "" diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/en/LC_MESSAGES/django.mo Binary file src/hdalab/locale/en/LC_MESSAGES/django.mo has changed diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/en/LC_MESSAGES/django.po --- a/src/hdalab/locale/en/LC_MESSAGES/django.po Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/locale/en/LC_MESSAGES/django.po Fri Jun 19 18:25:35 2015 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-03 06:24-0500\n" +"POT-Creation-Date: 2015-06-19 05:35-0500\n" "PO-Revision-Date: 2012-03-09 02:10+0200\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: IRI\n" @@ -73,101 +73,119 @@ msgid "Sorry, but the requested page could not be found." msgstr "Sorry, but the requested page could not be found." -#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74 -#: templates/base.html:96 +#: templates/a_propos.html:5 templates/base.html:46 templates/base.html.py:78 +#: templates/base.html:100 msgid "A Propos" msgstr "About" -#: templates/ajax_identification/ajax_login.html:7 +#: templates/ajax_identification/ajax_login.html:5 msgid "Identifiants" msgstr "Identifiers" -#: templates/ajax_identification/ajax_login.html:9 +#: templates/ajax_identification/ajax_login.html:7 #: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:19 msgid "Sorry, that's not a valid username or password." msgstr "Sorry, that's not a valid username or password." -#: templates/ajax_identification/ajax_login.html:15 +#: 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:19 +#: templates/ajax_identification/ajax_login.html:17 #: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "Password" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 msgid "Cancel" msgstr "Cancel" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 #: templates/registration/login.html:5 templates/registration/login.html:33 msgid "Login" msgstr "Login" -#: templates/ajax_identification/ajax_login.html:26 +#: templates/ajax_identification/ajax_login.html:24 #: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "Forgot password?" -#: templates/ajax_identification/ajax_login.html:27 +#: templates/ajax_identification/ajax_login.html:25 #: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "Still not a user? Create an account" -#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49 +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:53 msgid "Log out" msgstr "Log out" -#: templates/base.html:38 +#: templates/base.html:42 msgid "Accueil" msgstr "Home" -#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +#: templates/base.html:43 templates/base.html.py:95 templates/index.html:44 msgid "Recherche" msgstr "Tag search" -#: templates/base.html:40 templates/base.html.py:92 +#: templates/base.html:44 templates/base.html.py:96 msgid "Domaines Artistiques" msgstr "Artistic discipline" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:55 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "Log in" -#: templates/base.html:75 +#: templates/base.html:79 msgid "Crédits" msgstr "Credits" -#: templates/base.html:76 +#: templates/base.html:80 msgid "Mentions légales" msgstr "Legal Notices" -#: templates/base.html:77 templates/envelope/contact.html:6 +#: templates/base.html:81 templates/envelope/contact.html:6 #: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "Contact" -#: templates/base.html:90 +#: templates/base.html:94 msgid "Rubriques" msgstr "Topics" -#: templates/base.html:93 +#: templates/base.html:97 msgid "Thésaurus" msgstr "Thesaurus" -#: templates/base.html:95 +#: templates/base.html:99 msgid "Renkan repères" msgstr "Landmark Renkan" -#: templates/base.html:101 +#: templates/base.html:105 msgid "Liens" msgstr "Links" +#: templates/base.html:125 +msgid "" +"We use cookies on this website, you can read about them here. To use the " +"website as intended please..." +msgstr "" +"We use cookies on this website, you can read about them here. To use the " +"website as intended please..." + +#: templates/base.html:126 +msgid "ACCEPT COOKIES" +msgstr "ACCEPT COOKIES" + +#: templates/base.html:127 +msgid "DECLINE COOKIES" +msgstr "DECLINE COOKIES" + #: templates/categories.html:5 templates/thesaurus.html:33 msgid "Recherche par arbre" msgstr "Tree search" @@ -211,14 +229,14 @@ #: templates/editorial/manage_renkans.html:41 #: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 #: templates/profile_home.html.py:125 templates/renkan_list.html:42 -#: templates/renkan_list.html.py:94 +#: templates/renkan_list.html.py:100 msgid "Previous" msgstr "Previous" #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 #: templates/profile_home.html.py:126 templates/renkan_list.html:43 -#: templates/renkan_list.html.py:95 +#: templates/renkan_list.html.py:101 msgid "Next" msgstr "Next" @@ -235,14 +253,14 @@ #: templates/editorial/manage_renkans.html:45 #: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 #: templates/profile_home.html.py:78 templates/renkan_list.html:46 -#: templates/renkan_list.html.py:58 +#: templates/renkan_list.html.py:60 msgid "Title" msgstr "Title" #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 #: templates/profile_home.html.py:82 templates/renkan_list.html:47 -#: templates/renkan_list.html.py:66 +#: templates/renkan_list.html.py:70 msgid "Modification date" msgstr "Modification date" @@ -257,7 +275,7 @@ msgstr "End" #: templates/editorial/manage_renkans.html:48 -#: templates/registration/login.html:25 templates/renkan_list.html:49 +#: templates/registration/login.html:25 templates/renkan_list.html:50 msgid "Username" msgstr "Username" @@ -280,21 +298,21 @@ msgstr "Rejected" #: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 -#: templates/renkan_list.html:51 +#: templates/renkan_list.html:53 msgid "Favorite" msgstr "Favorite" #: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 -#: templates/renkan_list.html:53 +#: templates/renkan_list.html:55 msgid "Search" msgstr "Search" #: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 -#: templates/renkan_list.html:61 +#: templates/renkan_list.html:63 msgid "Fav." msgstr "Fav." -#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64 +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:67 msgid "User" msgstr "User" @@ -749,11 +767,11 @@ msgstr "Edition" #: templates/profile_home.html:94 templates/profile_home.html.py:102 -#: templates/renkan_list.html:74 templates/renkan_list.html.py:82 +#: templates/renkan_list.html:78 templates/renkan_list.html.py:88 msgid "View renkan" msgstr "View Renkan" -#: templates/profile_home.html:106 templates/renkan_list.html:86 +#: templates/profile_home.html:106 templates/renkan_list.html:92 msgid "Are you sure you want to copy this renkan ?" msgstr "Are you sure you want to copy this renkan ?" @@ -920,35 +938,35 @@ msgid "Mot de passe (Verification)" msgstr "Password (verification)" -#: templates/renkan_edit.html:70 +#: templates/renkan_edit.html:71 msgid "Ressources" msgstr "Resources" -#: templates/renkan_edit.html:201 +#: templates/renkan_edit.html:202 msgid "Change organisation" msgstr "Change organisation" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:203 msgid "(Indisponible si modification du RENKAN)" msgstr "(Not allowed if RENKAN has been modified)" -#: templates/renkan_edit.html:205 templates/renkan_edit.html.py:209 -#: templates/renkan_edit.html:213 +#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 +#: templates/renkan_edit.html:214 msgid "View graph in column" msgstr "View graph in column" -#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 -#: templates/renkan_edit.html:214 +#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 +#: templates/renkan_edit.html:215 msgid "View graph in line" msgstr "View graph in line" -#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 -#: templates/renkan_edit.html:215 +#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 +#: templates/renkan_edit.html:216 msgid "View graph in circle" msgstr "View graph in circle" #: templates/renkan_list.html:6 templates/renkan_list.html.py:29 -#: templates/renkan_list_favorite.html:4 +#: templates/renkan_list_favorite.html:4 templates/renkan_new_confirm.html:6 msgid "Marked Renkans list" msgstr "Marked Renkan list" @@ -982,10 +1000,26 @@ "Consult and customize Renkans of chronological landmarks from \"Histoire des " "arts\"." -#: views/profile.py:443 +#: templates/renkan_new_confirm.html:23 +msgid "Confirm renkan creation" +msgstr "Confirm renkan creation" + +#: templates/renkan_new_confirm.html:27 +msgid "" +"You are now authenticated, you can create your new renkan by clicking on " +"this link:" +msgstr "" +"You are now authenticated, you can create your new renkan by clicking on " +"this link:" + +#: templates/renkan_new_confirm.html:28 +msgid "Create new Renkan" +msgstr "Create new Renkan" + +#: views/profile.py:461 msgid "Plus de Ressources" msgstr "More Resources" -#: views/profile.py:452 views/profile.py:531 +#: views/profile.py:470 views/profile.py:549 msgid "Period" msgstr "Period" diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/es/LC_MESSAGES/django.mo Binary file src/hdalab/locale/es/LC_MESSAGES/django.mo has changed diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/es/LC_MESSAGES/django.po --- a/src/hdalab/locale/es/LC_MESSAGES/django.po Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/locale/es/LC_MESSAGES/django.po Fri Jun 19 18:25:35 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-03 06:24-0500\n" +"POT-Creation-Date: 2015-06-19 05:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -73,101 +73,116 @@ msgid "Sorry, but the requested page could not be found." msgstr "Lo sentimos, pero la página solicitada no se pudo encontrar." -#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74 -#: templates/base.html:96 +#: templates/a_propos.html:5 templates/base.html:46 templates/base.html.py:78 +#: templates/base.html:100 msgid "A Propos" msgstr "Acerca de Nosotros" -#: templates/ajax_identification/ajax_login.html:7 +#: templates/ajax_identification/ajax_login.html:5 msgid "Identifiants" msgstr "Datos de usuario" -#: templates/ajax_identification/ajax_login.html:9 +#: templates/ajax_identification/ajax_login.html:7 #: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:19 msgid "Sorry, that's not a valid username or password." msgstr "El usuario o la contraseña no es valido" -#: templates/ajax_identification/ajax_login.html:15 +#: 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:19 +#: templates/ajax_identification/ajax_login.html:17 #: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "Contraseña" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 msgid "Cancel" msgstr "Cancelar" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 #: templates/registration/login.html:5 templates/registration/login.html:33 msgid "Login" msgstr "Iniciar Sesión" -#: templates/ajax_identification/ajax_login.html:26 +#: templates/ajax_identification/ajax_login.html:24 #: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "Contraseña perdida ?" -#: templates/ajax_identification/ajax_login.html:27 +#: templates/ajax_identification/ajax_login.html:25 #: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "No tiene usuario ? Crear una cuenta" -#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49 +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:53 msgid "Log out" msgstr "Cerrar sesión" -#: templates/base.html:38 +#: templates/base.html:42 msgid "Accueil" msgstr "Inicio" -#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +#: templates/base.html:43 templates/base.html.py:95 templates/index.html:44 msgid "Recherche" msgstr "Búsqueda" -#: templates/base.html:40 templates/base.html.py:92 +#: templates/base.html:44 templates/base.html.py:96 msgid "Domaines Artistiques" msgstr "Disciplinas artísticas" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:55 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "Iniciar sesión" -#: templates/base.html:75 +#: templates/base.html:79 msgid "Crédits" msgstr "Creditos" -#: templates/base.html:76 +#: templates/base.html:80 msgid "Mentions légales" msgstr "Aviso Legal" -#: templates/base.html:77 templates/envelope/contact.html:6 +#: templates/base.html:81 templates/envelope/contact.html:6 #: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "Contactos" -#: templates/base.html:90 +#: templates/base.html:94 msgid "Rubriques" msgstr "Rubricas" -#: templates/base.html:93 +#: templates/base.html:97 msgid "Thésaurus" msgstr "Thesaurus" -#: templates/base.html:95 +#: templates/base.html:99 msgid "Renkan repères" msgstr "Renkan marcados" -#: templates/base.html:101 +#: templates/base.html:105 msgid "Liens" msgstr "Elaces" +#: templates/base.html:125 +msgid "" +"We use cookies on this website, you can read about them here. To use the " +"website as intended please..." +msgstr "" + +#: templates/base.html:126 +msgid "ACCEPT COOKIES" +msgstr "" + +#: templates/base.html:127 +msgid "DECLINE COOKIES" +msgstr "" + #: templates/categories.html:5 templates/thesaurus.html:33 msgid "Recherche par arbre" msgstr "Búsqueda por ramas" @@ -211,14 +226,14 @@ #: templates/editorial/manage_renkans.html:41 #: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 #: templates/profile_home.html.py:125 templates/renkan_list.html:42 -#: templates/renkan_list.html.py:94 +#: templates/renkan_list.html.py:100 msgid "Previous" msgstr "Anterior" #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 #: templates/profile_home.html.py:126 templates/renkan_list.html:43 -#: templates/renkan_list.html.py:95 +#: templates/renkan_list.html.py:101 msgid "Next" msgstr "Siguiente" @@ -235,14 +250,14 @@ #: templates/editorial/manage_renkans.html:45 #: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 #: templates/profile_home.html.py:78 templates/renkan_list.html:46 -#: templates/renkan_list.html.py:58 +#: templates/renkan_list.html.py:60 msgid "Title" msgstr "Titulo" #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 #: templates/profile_home.html.py:82 templates/renkan_list.html:47 -#: templates/renkan_list.html.py:66 +#: templates/renkan_list.html.py:70 msgid "Modification date" msgstr "Modificar la fecha" @@ -257,7 +272,7 @@ msgstr "fin" #: templates/editorial/manage_renkans.html:48 -#: templates/registration/login.html:25 templates/renkan_list.html:49 +#: templates/registration/login.html:25 templates/renkan_list.html:50 msgid "Username" msgstr "Nombre de Usuario" @@ -280,21 +295,21 @@ msgstr "Rechazado" #: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 -#: templates/renkan_list.html:51 +#: templates/renkan_list.html:53 msgid "Favorite" msgstr "Favorito" #: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 -#: templates/renkan_list.html:53 +#: templates/renkan_list.html:55 msgid "Search" msgstr "Buscar" #: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 -#: templates/renkan_list.html:61 +#: templates/renkan_list.html:63 msgid "Fav." msgstr "" -#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64 +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:67 msgid "User" msgstr "Usuario" @@ -715,13 +730,13 @@ msgstr "Edición" #: templates/profile_home.html:94 templates/profile_home.html.py:102 -#: templates/renkan_list.html:74 templates/renkan_list.html.py:82 +#: templates/renkan_list.html:78 templates/renkan_list.html.py:88 #, fuzzy #| msgid "reject renkan" msgid "View renkan" msgstr "rechazar un renkan" -#: templates/profile_home.html:106 templates/renkan_list.html:86 +#: templates/profile_home.html:106 templates/renkan_list.html:92 msgid "Are you sure you want to copy this renkan ?" msgstr "¿ Esta seguro que desea copiar este Renkan ?" @@ -885,35 +900,35 @@ msgid "Mot de passe (Verification)" msgstr "Contraseña (verificación)" -#: templates/renkan_edit.html:70 +#: templates/renkan_edit.html:71 msgid "Ressources" msgstr "Recursos" -#: templates/renkan_edit.html:201 +#: templates/renkan_edit.html:202 msgid "Change organisation" msgstr "Cambiar la organización" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:203 msgid "(Indisponible si modification du RENKAN)" msgstr "(Indisponible despues de modificar el RENKAN)" -#: templates/renkan_edit.html:205 templates/renkan_edit.html.py:209 -#: templates/renkan_edit.html:213 +#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 +#: templates/renkan_edit.html:214 msgid "View graph in column" msgstr "Vista del gráfico en columnas" -#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 -#: templates/renkan_edit.html:214 +#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 +#: templates/renkan_edit.html:215 msgid "View graph in line" msgstr "Vista del gráfico en lineas" -#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 -#: templates/renkan_edit.html:215 +#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 +#: templates/renkan_edit.html:216 msgid "View graph in circle" msgstr "Vista del gráfico en círculo" #: templates/renkan_list.html:6 templates/renkan_list.html.py:29 -#: templates/renkan_list_favorite.html:4 +#: templates/renkan_list_favorite.html:4 templates/renkan_new_confirm.html:6 msgid "Marked Renkans list" msgstr "Lista de Renkan marcados" @@ -939,10 +954,28 @@ "des arts." msgstr "" -#: views/profile.py:443 +#: templates/renkan_new_confirm.html:23 +#, fuzzy +#| msgid "Manage renkan publication" +msgid "Confirm renkan creation" +msgstr "Gestionar la publicación de Renkan" + +#: templates/renkan_new_confirm.html:27 +msgid "" +"You are now authenticated, you can create your new renkan by clicking on " +"this link:" +msgstr "" + +#: templates/renkan_new_confirm.html:28 +#, fuzzy +#| msgid "Gerer mes Renkan" +msgid "Create new Renkan" +msgstr "Gestionar mis Renkan" + +#: views/profile.py:461 msgid "Plus de Ressources" msgstr "Mas recursos" -#: views/profile.py:452 views/profile.py:531 +#: views/profile.py:470 views/profile.py:549 msgid "Period" msgstr "Periodo" diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/fr/LC_MESSAGES/django.mo Binary file src/hdalab/locale/fr/LC_MESSAGES/django.mo has changed diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/fr/LC_MESSAGES/django.po --- a/src/hdalab/locale/fr/LC_MESSAGES/django.po Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/locale/fr/LC_MESSAGES/django.po Fri Jun 19 18:25:35 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-03 06:24-0500\n" +"POT-Creation-Date: 2015-06-19 05:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -73,102 +73,121 @@ msgid "Sorry, but the requested page could not be found." msgstr "Désolé, mais la page demandée n'a pas put être trouvée." -#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74 -#: templates/base.html:96 +#: templates/a_propos.html:5 templates/base.html:46 templates/base.html.py:78 +#: templates/base.html:100 msgid "A Propos" msgstr "À Propos" -#: templates/ajax_identification/ajax_login.html:7 +#: templates/ajax_identification/ajax_login.html:5 msgid "Identifiants" msgstr "Identifiants" -#: templates/ajax_identification/ajax_login.html:9 +#: templates/ajax_identification/ajax_login.html:7 #: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:19 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." -#: templates/ajax_identification/ajax_login.html:15 +#: 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:19 +#: templates/ajax_identification/ajax_login.html:17 #: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "Mot de passe" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 msgid "Cancel" msgstr "Annuler" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 #: templates/registration/login.html:5 templates/registration/login.html:33 msgid "Login" msgstr "Connexion" -#: templates/ajax_identification/ajax_login.html:26 +#: templates/ajax_identification/ajax_login.html:24 #: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "Mot de passe oublié ?" -#: templates/ajax_identification/ajax_login.html:27 +#: templates/ajax_identification/ajax_login.html:25 #: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "Vous n'avez pas de compte ? Créez un compte" -#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49 +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:53 msgid "Log out" msgstr "Déconnexion" -#: templates/base.html:38 +#: templates/base.html:42 msgid "Accueil" msgstr "Accueil" -#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +#: templates/base.html:43 templates/base.html.py:95 templates/index.html:44 msgid "Recherche" msgstr "Recherche" -#: templates/base.html:40 templates/base.html.py:92 +#: templates/base.html:44 templates/base.html.py:96 msgid "Domaines Artistiques" msgstr "Domaines Artistiques" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:55 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "Connexion" -#: templates/base.html:75 +#: templates/base.html:79 msgid "Crédits" msgstr "Crédits" -#: templates/base.html:76 +#: templates/base.html:80 msgid "Mentions légales" msgstr "Mentions légales" -#: templates/base.html:77 templates/envelope/contact.html:6 +#: templates/base.html:81 templates/envelope/contact.html:6 #: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "Contact" -#: templates/base.html:90 +#: templates/base.html:94 msgid "Rubriques" msgstr "Rubriques" -#: templates/base.html:93 +#: templates/base.html:97 msgid "Thésaurus" msgstr "Thésaurus" -#: templates/base.html:95 +#: templates/base.html:99 msgid "Renkan repères" msgstr "Renkan repères" -#: templates/base.html:101 +#: templates/base.html:105 msgid "Liens" msgstr "Liens" +#: templates/base.html:125 +msgid "" +"We use cookies on this website, you can read about them here. To use the " +"website as intended please..." +msgstr "" +"Nous utilisons des cookie sur ce site, vous pouvez lire nos conditions d'utilisation. Pour utiliser le site, " +"veuillez cliquer sur le bouton suivant..." + + +#: templates/base.html:126 +msgid "ACCEPT COOKIES" +msgstr "Authoriser les cookies" + +#: templates/base.html:127 +msgid "DECLINE COOKIES" +msgstr "" + #: templates/categories.html:5 templates/thesaurus.html:33 msgid "Recherche par arbre" msgstr "Recherche par arbre" @@ -212,14 +231,14 @@ #: templates/editorial/manage_renkans.html:41 #: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 #: templates/profile_home.html.py:125 templates/renkan_list.html:42 -#: templates/renkan_list.html.py:94 +#: templates/renkan_list.html.py:100 msgid "Previous" msgstr "Précédent" #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 #: templates/profile_home.html.py:126 templates/renkan_list.html:43 -#: templates/renkan_list.html.py:95 +#: templates/renkan_list.html.py:101 msgid "Next" msgstr "Suivant" @@ -236,14 +255,14 @@ #: templates/editorial/manage_renkans.html:45 #: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 #: templates/profile_home.html.py:78 templates/renkan_list.html:46 -#: templates/renkan_list.html.py:58 +#: templates/renkan_list.html.py:60 msgid "Title" msgstr "Titre" #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 #: templates/profile_home.html.py:82 templates/renkan_list.html:47 -#: templates/renkan_list.html.py:66 +#: templates/renkan_list.html.py:70 msgid "Modification date" msgstr "Date de modification" @@ -258,7 +277,7 @@ msgstr "fin" #: templates/editorial/manage_renkans.html:48 -#: templates/registration/login.html:25 templates/renkan_list.html:49 +#: templates/registration/login.html:25 templates/renkan_list.html:50 msgid "Username" msgstr "Nom d'utilisateur" @@ -281,21 +300,21 @@ msgstr "Rejeté" #: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 -#: templates/renkan_list.html:51 +#: templates/renkan_list.html:53 msgid "Favorite" msgstr "Favoris" #: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 -#: templates/renkan_list.html:53 +#: templates/renkan_list.html:55 msgid "Search" msgstr "Rechercher" #: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 -#: templates/renkan_list.html:61 +#: templates/renkan_list.html:63 msgid "Fav." msgstr "Fav." -#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64 +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:67 msgid "User" msgstr "Utilisateur" @@ -759,11 +778,11 @@ msgstr "Édition" #: templates/profile_home.html:94 templates/profile_home.html.py:102 -#: templates/renkan_list.html:74 templates/renkan_list.html.py:82 +#: templates/renkan_list.html:78 templates/renkan_list.html.py:88 msgid "View renkan" msgstr "Voir renkan" -#: templates/profile_home.html:106 templates/renkan_list.html:86 +#: templates/profile_home.html:106 templates/renkan_list.html:92 msgid "Are you sure you want to copy this renkan ?" msgstr "Êtes-vous certain(e) de vouloir copier ce Renkan ?" @@ -933,35 +952,35 @@ msgid "Mot de passe (Verification)" msgstr "Mot de passe (vérification)" -#: templates/renkan_edit.html:70 +#: templates/renkan_edit.html:71 msgid "Ressources" msgstr "Ressources" -#: templates/renkan_edit.html:201 +#: templates/renkan_edit.html:202 msgid "Change organisation" msgstr "Changer de disposition" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:203 msgid "(Indisponible si modification du RENKAN)" msgstr "(Indisponible si le RENKAN est modifié)" -#: templates/renkan_edit.html:205 templates/renkan_edit.html.py:209 -#: templates/renkan_edit.html:213 +#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 +#: templates/renkan_edit.html:214 msgid "View graph in column" msgstr "Voir le graphe en colonne" -#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 -#: templates/renkan_edit.html:214 +#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 +#: templates/renkan_edit.html:215 msgid "View graph in line" msgstr "Voir le graphe en ligne" -#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 -#: templates/renkan_edit.html:215 +#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 +#: templates/renkan_edit.html:216 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_favorite.html:4 +#: templates/renkan_list_favorite.html:4 templates/renkan_new_confirm.html:6 msgid "Marked Renkans list" msgstr "Liste des Renkan repères" @@ -995,10 +1014,28 @@ "Consultez et personnalisez les Renkan des repères chronologiques d'Histoire " "des arts." -#: views/profile.py:443 +#: templates/renkan_new_confirm.html:23 +#, fuzzy +#| msgid "Manage renkan publication" +msgid "Confirm renkan creation" +msgstr "Gérer les publications de Renkan" + +#: templates/renkan_new_confirm.html:27 +msgid "" +"You are now authenticated, you can create your new renkan by clicking on " +"this link:" +msgstr "" +"Vous êtes maintenant authentifié, vous pouvez créer votre nouveau Renkan en " +"cliquant sur le lien suivant :" + +#: templates/renkan_new_confirm.html:28 +msgid "Create new Renkan" +msgstr "Créer un nouveau Renkan" + +#: views/profile.py:461 msgid "Plus de Ressources" msgstr "Plus de Ressources" -#: views/profile.py:452 views/profile.py:531 +#: views/profile.py:470 views/profile.py:549 msgid "Period" msgstr "Période" diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/it/LC_MESSAGES/django.mo Binary file src/hdalab/locale/it/LC_MESSAGES/django.mo has changed diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/it/LC_MESSAGES/django.po --- a/src/hdalab/locale/it/LC_MESSAGES/django.po Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/locale/it/LC_MESSAGES/django.po Fri Jun 19 18:25:35 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-03 06:24-0500\n" +"POT-Creation-Date: 2015-06-19 05:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -73,103 +73,118 @@ msgid "Sorry, but the requested page could not be found." msgstr "" -#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74 -#: templates/base.html:96 +#: templates/a_propos.html:5 templates/base.html:46 templates/base.html.py:78 +#: templates/base.html:100 msgid "A Propos" msgstr "" -#: templates/ajax_identification/ajax_login.html:7 +#: templates/ajax_identification/ajax_login.html:5 msgid "Identifiants" msgstr "" -#: templates/ajax_identification/ajax_login.html:9 +#: templates/ajax_identification/ajax_login.html:7 #: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:19 msgid "Sorry, that's not a valid username or password." msgstr "" -#: templates/ajax_identification/ajax_login.html:15 +#: templates/ajax_identification/ajax_login.html:13 #: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" -#: templates/ajax_identification/ajax_login.html:19 +#: templates/ajax_identification/ajax_login.html:17 #: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 msgid "Cancel" msgstr "" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 #: templates/registration/login.html:5 templates/registration/login.html:33 msgid "Login" msgstr "" -#: templates/ajax_identification/ajax_login.html:26 +#: templates/ajax_identification/ajax_login.html:24 #: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "" -#: templates/ajax_identification/ajax_login.html:27 +#: templates/ajax_identification/ajax_login.html:25 #: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "" -#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49 +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:53 msgid "Log out" msgstr "" -#: templates/base.html:38 +#: templates/base.html:42 msgid "Accueil" msgstr "" -#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +#: templates/base.html:43 templates/base.html.py:95 templates/index.html:44 #, fuzzy msgid "Recherche" msgstr "Cercare un tag" -#: templates/base.html:40 templates/base.html.py:92 +#: templates/base.html:44 templates/base.html.py:96 #, fuzzy msgid "Domaines Artistiques" msgstr "Discipline artistiche" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:55 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "" -#: templates/base.html:75 +#: templates/base.html:79 msgid "Crédits" msgstr "" -#: templates/base.html:76 +#: templates/base.html:80 msgid "Mentions légales" msgstr "" -#: templates/base.html:77 templates/envelope/contact.html:6 +#: templates/base.html:81 templates/envelope/contact.html:6 #: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "" -#: templates/base.html:90 +#: templates/base.html:94 msgid "Rubriques" msgstr "" -#: templates/base.html:93 +#: templates/base.html:97 msgid "Thésaurus" msgstr "" -#: templates/base.html:95 +#: templates/base.html:99 msgid "Renkan repères" msgstr "" -#: templates/base.html:101 +#: templates/base.html:105 msgid "Liens" msgstr "" +#: templates/base.html:125 +msgid "" +"We use cookies on this website, you can read about them here. To use the " +"website as intended please..." +msgstr "" + +#: templates/base.html:126 +msgid "ACCEPT COOKIES" +msgstr "" + +#: templates/base.html:127 +msgid "DECLINE COOKIES" +msgstr "" + #: templates/categories.html:5 templates/thesaurus.html:33 #, fuzzy msgid "Recherche par arbre" @@ -216,14 +231,14 @@ #: templates/editorial/manage_renkans.html:41 #: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 #: templates/profile_home.html.py:125 templates/renkan_list.html:42 -#: templates/renkan_list.html.py:94 +#: templates/renkan_list.html.py:100 msgid "Previous" msgstr "" #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 #: templates/profile_home.html.py:126 templates/renkan_list.html:43 -#: templates/renkan_list.html.py:95 +#: templates/renkan_list.html.py:101 msgid "Next" msgstr "" @@ -241,14 +256,14 @@ #: templates/editorial/manage_renkans.html:45 #: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 #: templates/profile_home.html.py:78 templates/renkan_list.html:46 -#: templates/renkan_list.html.py:58 +#: templates/renkan_list.html.py:60 msgid "Title" msgstr "" #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 #: templates/profile_home.html.py:82 templates/renkan_list.html:47 -#: templates/renkan_list.html.py:66 +#: templates/renkan_list.html.py:70 msgid "Modification date" msgstr "" @@ -263,7 +278,7 @@ msgstr "" #: templates/editorial/manage_renkans.html:48 -#: templates/registration/login.html:25 templates/renkan_list.html:49 +#: templates/registration/login.html:25 templates/renkan_list.html:50 msgid "Username" msgstr "" @@ -286,21 +301,21 @@ msgstr "" #: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 -#: templates/renkan_list.html:51 +#: templates/renkan_list.html:53 msgid "Favorite" msgstr "" #: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 -#: templates/renkan_list.html:53 +#: templates/renkan_list.html:55 msgid "Search" msgstr "" #: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 -#: templates/renkan_list.html:61 +#: templates/renkan_list.html:63 msgid "Fav." msgstr "" -#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64 +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:67 msgid "User" msgstr "" @@ -699,11 +714,11 @@ msgstr "" #: templates/profile_home.html:94 templates/profile_home.html.py:102 -#: templates/renkan_list.html:74 templates/renkan_list.html.py:82 +#: templates/renkan_list.html:78 templates/renkan_list.html.py:88 msgid "View renkan" msgstr "" -#: templates/profile_home.html:106 templates/renkan_list.html:86 +#: templates/profile_home.html:106 templates/renkan_list.html:92 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -866,35 +881,35 @@ msgid "Mot de passe (Verification)" msgstr "" -#: templates/renkan_edit.html:70 +#: templates/renkan_edit.html:71 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:201 +#: templates/renkan_edit.html:202 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:203 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:205 templates/renkan_edit.html.py:209 -#: templates/renkan_edit.html:213 -msgid "View graph in column" -msgstr "" - #: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 #: templates/renkan_edit.html:214 -msgid "View graph in line" +msgid "View graph in column" msgstr "" #: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 #: templates/renkan_edit.html:215 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 +#: templates/renkan_edit.html:216 msgid "View graph in circle" msgstr "" #: templates/renkan_list.html:6 templates/renkan_list.html.py:29 -#: templates/renkan_list_favorite.html:4 +#: templates/renkan_list_favorite.html:4 templates/renkan_new_confirm.html:6 msgid "Marked Renkans list" msgstr "" @@ -919,11 +934,25 @@ "des arts." msgstr "" -#: views/profile.py:443 +#: templates/renkan_new_confirm.html:23 +msgid "Confirm renkan creation" +msgstr "" + +#: templates/renkan_new_confirm.html:27 +msgid "" +"You are now authenticated, you can create your new renkan by clicking on " +"this link:" +msgstr "" + +#: templates/renkan_new_confirm.html:28 +msgid "Create new Renkan" +msgstr "" + +#: views/profile.py:461 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:452 views/profile.py:531 +#: views/profile.py:470 views/profile.py:549 msgid "Period" msgstr "" diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/ja/LC_MESSAGES/django.mo Binary file src/hdalab/locale/ja/LC_MESSAGES/django.mo has changed diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/ja/LC_MESSAGES/django.po --- a/src/hdalab/locale/ja/LC_MESSAGES/django.po Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/locale/ja/LC_MESSAGES/django.po Fri Jun 19 18:25:35 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-03 06:24-0500\n" +"POT-Creation-Date: 2015-06-19 05:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -74,103 +74,118 @@ msgid "Sorry, but the requested page could not be found." msgstr "" -#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74 -#: templates/base.html:96 +#: templates/a_propos.html:5 templates/base.html:46 templates/base.html.py:78 +#: templates/base.html:100 msgid "A Propos" msgstr "" -#: templates/ajax_identification/ajax_login.html:7 +#: templates/ajax_identification/ajax_login.html:5 msgid "Identifiants" msgstr "" -#: templates/ajax_identification/ajax_login.html:9 +#: templates/ajax_identification/ajax_login.html:7 #: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:19 msgid "Sorry, that's not a valid username or password." msgstr "" -#: templates/ajax_identification/ajax_login.html:15 +#: templates/ajax_identification/ajax_login.html:13 #: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" -#: templates/ajax_identification/ajax_login.html:19 +#: templates/ajax_identification/ajax_login.html:17 #: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 msgid "Cancel" msgstr "" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 #: templates/registration/login.html:5 templates/registration/login.html:33 msgid "Login" msgstr "" -#: templates/ajax_identification/ajax_login.html:26 +#: templates/ajax_identification/ajax_login.html:24 #: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "" -#: templates/ajax_identification/ajax_login.html:27 +#: templates/ajax_identification/ajax_login.html:25 #: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "" -#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49 +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:53 msgid "Log out" msgstr "" -#: templates/base.html:38 +#: templates/base.html:42 msgid "Accueil" msgstr "" -#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +#: templates/base.html:43 templates/base.html.py:95 templates/index.html:44 #, fuzzy msgid "Recherche" msgstr "タグを検索する" -#: templates/base.html:40 templates/base.html.py:92 +#: templates/base.html:44 templates/base.html.py:96 #, fuzzy msgid "Domaines Artistiques" msgstr "学術・芸術分野" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:55 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "" -#: templates/base.html:75 +#: templates/base.html:79 msgid "Crédits" msgstr "" -#: templates/base.html:76 +#: templates/base.html:80 msgid "Mentions légales" msgstr "" -#: templates/base.html:77 templates/envelope/contact.html:6 +#: templates/base.html:81 templates/envelope/contact.html:6 #: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "" -#: templates/base.html:90 +#: templates/base.html:94 msgid "Rubriques" msgstr "" -#: templates/base.html:93 +#: templates/base.html:97 msgid "Thésaurus" msgstr "" -#: templates/base.html:95 +#: templates/base.html:99 msgid "Renkan repères" msgstr "" -#: templates/base.html:101 +#: templates/base.html:105 msgid "Liens" msgstr "" +#: templates/base.html:125 +msgid "" +"We use cookies on this website, you can read about them here. To use the " +"website as intended please..." +msgstr "" + +#: templates/base.html:126 +msgid "ACCEPT COOKIES" +msgstr "" + +#: templates/base.html:127 +msgid "DECLINE COOKIES" +msgstr "" + #: templates/categories.html:5 templates/thesaurus.html:33 #, fuzzy msgid "Recherche par arbre" @@ -217,14 +232,14 @@ #: templates/editorial/manage_renkans.html:41 #: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 #: templates/profile_home.html.py:125 templates/renkan_list.html:42 -#: templates/renkan_list.html.py:94 +#: templates/renkan_list.html.py:100 msgid "Previous" msgstr "" #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 #: templates/profile_home.html.py:126 templates/renkan_list.html:43 -#: templates/renkan_list.html.py:95 +#: templates/renkan_list.html.py:101 msgid "Next" msgstr "" @@ -242,14 +257,14 @@ #: templates/editorial/manage_renkans.html:45 #: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 #: templates/profile_home.html.py:78 templates/renkan_list.html:46 -#: templates/renkan_list.html.py:58 +#: templates/renkan_list.html.py:60 msgid "Title" msgstr "" #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 #: templates/profile_home.html.py:82 templates/renkan_list.html:47 -#: templates/renkan_list.html.py:66 +#: templates/renkan_list.html.py:70 msgid "Modification date" msgstr "" @@ -264,7 +279,7 @@ msgstr "" #: templates/editorial/manage_renkans.html:48 -#: templates/registration/login.html:25 templates/renkan_list.html:49 +#: templates/registration/login.html:25 templates/renkan_list.html:50 msgid "Username" msgstr "" @@ -287,21 +302,21 @@ msgstr "" #: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 -#: templates/renkan_list.html:51 +#: templates/renkan_list.html:53 msgid "Favorite" msgstr "" #: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 -#: templates/renkan_list.html:53 +#: templates/renkan_list.html:55 msgid "Search" msgstr "" #: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 -#: templates/renkan_list.html:61 +#: templates/renkan_list.html:63 msgid "Fav." msgstr "" -#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64 +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:67 msgid "User" msgstr "" @@ -700,11 +715,11 @@ msgstr "" #: templates/profile_home.html:94 templates/profile_home.html.py:102 -#: templates/renkan_list.html:74 templates/renkan_list.html.py:82 +#: templates/renkan_list.html:78 templates/renkan_list.html.py:88 msgid "View renkan" msgstr "" -#: templates/profile_home.html:106 templates/renkan_list.html:86 +#: templates/profile_home.html:106 templates/renkan_list.html:92 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -867,35 +882,35 @@ msgid "Mot de passe (Verification)" msgstr "" -#: templates/renkan_edit.html:70 +#: templates/renkan_edit.html:71 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:201 +#: templates/renkan_edit.html:202 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:203 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:205 templates/renkan_edit.html.py:209 -#: templates/renkan_edit.html:213 -msgid "View graph in column" -msgstr "" - #: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 #: templates/renkan_edit.html:214 -msgid "View graph in line" +msgid "View graph in column" msgstr "" #: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 #: templates/renkan_edit.html:215 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 +#: templates/renkan_edit.html:216 msgid "View graph in circle" msgstr "" #: templates/renkan_list.html:6 templates/renkan_list.html.py:29 -#: templates/renkan_list_favorite.html:4 +#: templates/renkan_list_favorite.html:4 templates/renkan_new_confirm.html:6 msgid "Marked Renkans list" msgstr "" @@ -920,11 +935,25 @@ "des arts." msgstr "" -#: views/profile.py:443 +#: templates/renkan_new_confirm.html:23 +msgid "Confirm renkan creation" +msgstr "" + +#: templates/renkan_new_confirm.html:27 +msgid "" +"You are now authenticated, you can create your new renkan by clicking on " +"this link:" +msgstr "" + +#: templates/renkan_new_confirm.html:28 +msgid "Create new Renkan" +msgstr "" + +#: views/profile.py:461 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:452 views/profile.py:531 +#: views/profile.py:470 views/profile.py:549 msgid "Period" msgstr "" diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo Binary file src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo has changed diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/locale/zh-tw/LC_MESSAGES/django.po --- a/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Fri Jun 19 18:25:35 2015 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-03 06:24-0500\n" +"POT-Creation-Date: 2015-06-19 05:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,103 +74,118 @@ msgid "Sorry, but the requested page could not be found." msgstr "" -#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74 -#: templates/base.html:96 +#: templates/a_propos.html:5 templates/base.html:46 templates/base.html.py:78 +#: templates/base.html:100 msgid "A Propos" msgstr "" -#: templates/ajax_identification/ajax_login.html:7 +#: templates/ajax_identification/ajax_login.html:5 msgid "Identifiants" msgstr "" -#: templates/ajax_identification/ajax_login.html:9 +#: templates/ajax_identification/ajax_login.html:7 #: templates/registration/login.html:19 #: templates/registration/password_reset_form.html:19 msgid "Sorry, that's not a valid username or password." msgstr "" -#: templates/ajax_identification/ajax_login.html:15 +#: templates/ajax_identification/ajax_login.html:13 #: templates/registration/registration_form.html:25 msgid "Nom d'utilisateur" msgstr "" -#: templates/ajax_identification/ajax_login.html:19 +#: templates/ajax_identification/ajax_login.html:17 #: templates/registration/registration_form.html:33 msgid "Mot de passe" msgstr "" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 msgid "Cancel" msgstr "" -#: templates/ajax_identification/ajax_login.html:23 +#: templates/ajax_identification/ajax_login.html:21 #: templates/registration/login.html:5 templates/registration/login.html:33 msgid "Login" msgstr "" -#: templates/ajax_identification/ajax_login.html:26 +#: templates/ajax_identification/ajax_login.html:24 #: templates/registration/login.html:36 msgid "Forgot password ?" msgstr "" -#: templates/ajax_identification/ajax_login.html:27 +#: templates/ajax_identification/ajax_login.html:25 #: templates/registration/login.html:37 msgid "Still not a user ? Create an account" msgstr "" -#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49 +#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:53 msgid "Log out" msgstr "" -#: templates/base.html:38 +#: templates/base.html:42 msgid "Accueil" msgstr "" -#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44 +#: templates/base.html:43 templates/base.html.py:95 templates/index.html:44 #, fuzzy msgid "Recherche" msgstr "Rechercher un tag" -#: templates/base.html:40 templates/base.html.py:92 +#: templates/base.html:44 templates/base.html.py:96 #, fuzzy msgid "Domaines Artistiques" msgstr "Disciplines artistiques" -#: templates/base.html:51 templates/registration/activate.html:16 +#: templates/base.html:55 templates/registration/activate.html:16 #: templates/registration/activation_complete.html:16 #: templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "" -#: templates/base.html:75 +#: templates/base.html:79 msgid "Crédits" msgstr "" -#: templates/base.html:76 +#: templates/base.html:80 msgid "Mentions légales" msgstr "" -#: templates/base.html:77 templates/envelope/contact.html:6 +#: templates/base.html:81 templates/envelope/contact.html:6 #: templates/envelope/contact.html.py:17 msgid "Contact" msgstr "" -#: templates/base.html:90 +#: templates/base.html:94 msgid "Rubriques" msgstr "" -#: templates/base.html:93 +#: templates/base.html:97 msgid "Thésaurus" msgstr "" -#: templates/base.html:95 +#: templates/base.html:99 msgid "Renkan repères" msgstr "" -#: templates/base.html:101 +#: templates/base.html:105 msgid "Liens" msgstr "" +#: templates/base.html:125 +msgid "" +"We use cookies on this website, you can read about them here. To use the " +"website as intended please..." +msgstr "" + +#: templates/base.html:126 +msgid "ACCEPT COOKIES" +msgstr "" + +#: templates/base.html:127 +msgid "DECLINE COOKIES" +msgstr "" + #: templates/categories.html:5 templates/thesaurus.html:33 #, fuzzy msgid "Recherche par arbre" @@ -217,14 +232,14 @@ #: templates/editorial/manage_renkans.html:41 #: templates/editorial/manage_renkans.html:103 templates/profile_home.html:56 #: templates/profile_home.html.py:125 templates/renkan_list.html:42 -#: templates/renkan_list.html.py:94 +#: templates/renkan_list.html.py:100 msgid "Previous" msgstr "" #: templates/editorial/manage_renkans.html:42 #: templates/editorial/manage_renkans.html:104 templates/profile_home.html:57 #: templates/profile_home.html.py:126 templates/renkan_list.html:43 -#: templates/renkan_list.html.py:95 +#: templates/renkan_list.html.py:101 msgid "Next" msgstr "" @@ -242,14 +257,14 @@ #: templates/editorial/manage_renkans.html:45 #: templates/editorial/manage_renkans.html:63 templates/profile_home.html:60 #: templates/profile_home.html.py:78 templates/renkan_list.html:46 -#: templates/renkan_list.html.py:58 +#: templates/renkan_list.html.py:60 msgid "Title" msgstr "" #: templates/editorial/manage_renkans.html:46 #: templates/editorial/manage_renkans.html:69 templates/profile_home.html:61 #: templates/profile_home.html.py:82 templates/renkan_list.html:47 -#: templates/renkan_list.html.py:66 +#: templates/renkan_list.html.py:70 msgid "Modification date" msgstr "" @@ -264,7 +279,7 @@ msgstr "" #: templates/editorial/manage_renkans.html:48 -#: templates/registration/login.html:25 templates/renkan_list.html:49 +#: templates/registration/login.html:25 templates/renkan_list.html:50 msgid "Username" msgstr "" @@ -287,21 +302,21 @@ msgstr "" #: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72 -#: templates/renkan_list.html:51 +#: templates/renkan_list.html:53 msgid "Favorite" msgstr "" #: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73 -#: templates/renkan_list.html:53 +#: templates/renkan_list.html:55 msgid "Search" msgstr "" #: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80 -#: templates/renkan_list.html:61 +#: templates/renkan_list.html:63 msgid "Fav." msgstr "" -#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64 +#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:67 msgid "User" msgstr "" @@ -700,11 +715,11 @@ msgstr "" #: templates/profile_home.html:94 templates/profile_home.html.py:102 -#: templates/renkan_list.html:74 templates/renkan_list.html.py:82 +#: templates/renkan_list.html:78 templates/renkan_list.html.py:88 msgid "View renkan" msgstr "" -#: templates/profile_home.html:106 templates/renkan_list.html:86 +#: templates/profile_home.html:106 templates/renkan_list.html:92 msgid "Are you sure you want to copy this renkan ?" msgstr "" @@ -867,35 +882,35 @@ msgid "Mot de passe (Verification)" msgstr "" -#: templates/renkan_edit.html:70 +#: templates/renkan_edit.html:71 msgid "Ressources" msgstr "" -#: templates/renkan_edit.html:201 +#: templates/renkan_edit.html:202 msgid "Change organisation" msgstr "" -#: templates/renkan_edit.html:202 +#: templates/renkan_edit.html:203 msgid "(Indisponible si modification du RENKAN)" msgstr "" -#: templates/renkan_edit.html:205 templates/renkan_edit.html.py:209 -#: templates/renkan_edit.html:213 -msgid "View graph in column" -msgstr "" - #: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210 #: templates/renkan_edit.html:214 -msgid "View graph in line" +msgid "View graph in column" msgstr "" #: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211 #: templates/renkan_edit.html:215 +msgid "View graph in line" +msgstr "" + +#: templates/renkan_edit.html:208 templates/renkan_edit.html.py:212 +#: templates/renkan_edit.html:216 msgid "View graph in circle" msgstr "" #: templates/renkan_list.html:6 templates/renkan_list.html.py:29 -#: templates/renkan_list_favorite.html:4 +#: templates/renkan_list_favorite.html:4 templates/renkan_new_confirm.html:6 msgid "Marked Renkans list" msgstr "" @@ -920,11 +935,25 @@ "des arts." msgstr "" -#: views/profile.py:443 +#: templates/renkan_new_confirm.html:23 +msgid "Confirm renkan creation" +msgstr "" + +#: templates/renkan_new_confirm.html:27 +msgid "" +"You are now authenticated, you can create your new renkan by clicking on " +"this link:" +msgstr "" + +#: templates/renkan_new_confirm.html:28 +msgid "Create new Renkan" +msgstr "" + +#: views/profile.py:461 msgid "Plus de Ressources" msgstr "" -#: views/profile.py:452 views/profile.py:531 +#: views/profile.py:470 views/profile.py:549 msgid "Period" msgstr "" diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/static/hdalab/css/additionnal_renkan.css --- a/src/hdalab/static/hdalab/css/additionnal_renkan.css Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/static/hdalab/css/additionnal_renkan.css Fri Jun 19 18:25:35 2015 +0200 @@ -147,4 +147,16 @@ } input.Rk-PadTitle{ width: 155px; -} \ No newline at end of file +} + +#dialog-form { + background: #EEE url("ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png") repeat-x scroll 50% top; +} + +#dialog-form .register { + margin: 10px; +} + +#login-form { + margin-bottom: 5px; +} diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/static/hdalab/js/renkan-manual-save.js --- a/src/hdalab/static/hdalab/js/renkan-manual-save.js Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/static/hdalab/js/renkan-manual-save.js Fri Jun 19 18:25:35 2015 +0200 @@ -25,6 +25,7 @@ _proj.set({loading_status:true}); }, success: function(_data) { + _renkan.dataloader.load(_data); if (typeof(_data.bins) != 'undefined'){ _renkan.tabs.push(new Rkns[_data.bins.type].Bin(_renkan, _data.bins)); delete _data.bins; diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/static/hdalab/lib/jquery.cookie.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/static/hdalab/lib/jquery.cookie.js Fri Jun 19 18:25:35 2015 +0200 @@ -0,0 +1,117 @@ +/*! + * jQuery Cookie Plugin v1.4.1 + * https://github.com/carhartl/jquery-cookie + * + * Copyright 2013 Klaus Hartl + * Released under the MIT license + */ +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD + define(['jquery'], factory); + } else if (typeof exports === 'object') { + // CommonJS + factory(require('jquery')); + } else { + // Browser globals + factory(jQuery); + } +}(function ($) { + + var pluses = /\+/g; + + function encode(s) { + return config.raw ? s : encodeURIComponent(s); + } + + function decode(s) { + return config.raw ? s : decodeURIComponent(s); + } + + function stringifyCookieValue(value) { + return encode(config.json ? JSON.stringify(value) : String(value)); + } + + function parseCookieValue(s) { + if (s.indexOf('"') === 0) { + // This is a quoted cookie as according to RFC2068, unescape... + s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); + } + + try { + // Replace server-side written pluses with spaces. + // If we can't decode the cookie, ignore it, it's unusable. + // If we can't parse the cookie, ignore it, it's unusable. + s = decodeURIComponent(s.replace(pluses, ' ')); + return config.json ? JSON.parse(s) : s; + } catch(e) {} + } + + function read(s, converter) { + var value = config.raw ? s : parseCookieValue(s); + return $.isFunction(converter) ? converter(value) : value; + } + + var config = $.cookie = function (key, value, options) { + + // Write + + if (value !== undefined && !$.isFunction(value)) { + options = $.extend({}, config.defaults, options); + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setTime(+t + days * 864e+5); + } + + return (document.cookie = [ + encode(key), '=', stringifyCookieValue(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); + } + + // Read + + var result = key ? undefined : {}; + + // To prevent the for loop in the first place assign an empty array + // in case there are no cookies at all. Also prevents odd result when + // calling $.cookie(). + var cookies = document.cookie ? document.cookie.split('; ') : []; + + for (var i = 0, l = cookies.length; i < l; i++) { + var parts = cookies[i].split('='); + var name = decode(parts.shift()); + var cookie = parts.join('='); + + if (key && key === name) { + // If second argument (value) is a function it's a converter... + result = read(cookie, value); + break; + } + + // Prevent storing a cookie that we couldn't decode. + if (!key && (cookie = read(cookie)) !== undefined) { + result[name] = cookie; + } + } + + return result; + }; + + config.defaults = {}; + + $.removeCookie = function (key, options) { + if ($.cookie(key) === undefined) { + return false; + } + + // Must not alter options, thus extending a fresh object... + $.cookie(key, '', $.extend({}, options, { expires: -1 })); + return !$.cookie(key); + }; + +})); diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/static/hdalab/lib/jquery.cookiecuttr/README.md --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/static/hdalab/lib/jquery.cookiecuttr/README.md Fri Jun 19 18:25:35 2015 +0200 @@ -0,0 +1,112 @@ +CookieCuttr +=========== + +A tailorable jQuery plugin to deal with the EU Cookie Law. + +**We're not accepting any more pull requests, someone else is working on a new version at the moment, when its ready, we'll link it here.** + +Dependencies +------------ + +* [jQuery](https://github.com/jquery/jquery) +* [jQuery.cookie](https://github.com/carhartl/jquery-cookie) + +Useage +------ + +Add `jquery.cookiecuttr.js`, after jQuery and jQuery.cookie, and `cookiecuttr.css` to the head of your HTML document. Then call CookieCuttr on document ready. + +```javascript +$(document).ready(function () { + $.cookieCuttr(); +}); +``` + +For any JavaScript you want to disable, you need to wrap the following if statement around it. + +```javascript +if (jQuery.cookie('cc_cookie_accept') == "cc_cookie_accept") { + // insert the code you do not want to run UNTIL cookies are accepted here +} +``` + +Example with Google Analytics +----------------------------- + +```javascript +if (jQuery.cookie('cc_cookie_accept') == "cc_cookie_accept") { + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-XXXXXXXX-X']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document. getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); +} +``` + +Alternatively, you can do the following until cookies are declined. + +```javascript +if (jQuery.cookie('cc_cookie_decline') == "cc_cookie_decline") { + // do nothing +} else { + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-XXXXXXXX-X']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document. getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); +} +``` + +You can also do the following. + +```javascript +if( $.cookieAccepted() ) { + // insert the code you do not want to run UNTIL cookies are accepted here +} +``` + +Read More About EU Cookie Law +----------------------------- + +* [Is the EU's cookie law confusing you too?](http://www.123-reg.co.uk/blog/security-issues/is-the-eus-cookie-law-confusing-you-too/) +* [New EU cookie law (e-Privacy Directive)](http://www.ico.gov.uk/for_organisations/privacy_and_electronic_communications/the_guide/cookies.aspx) +* [Cookies – Doing nothing isn't the right answer](http://chriswharton.me/2012/05/cookies-doing-nothing-isnt-the-right-answer/) + +Using WordPress? +---------------- + +A Wordpress version is available [here](http://cookiecuttr.com/wordpress-plugin/). + +Options +------- + +For options, see the [WIKI](/weare2ndfloor/cookieCuttr/wiki/Options). + +Contributing to CookieCuttr +--------------------------- + +* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet +* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it +* Fork the project +* Start a feature/bugfix branch +* Commit and push until you are happy with your contribution +* Initiate a [pull request](https://help.github.com/articles/using-pull-requests) + +Credits +------- + +* [weare2ndfloor](https://github.com/weare2ndfloor) for the plugin +* [unsymbol](https://github.com/unsymbol) for organising the implementation txt into a readme markdown file + +Copyright +--------- + +Copyright (c) 2012 Chris Wharton. See LICENSE.txt for further details. diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/static/hdalab/lib/jquery.cookiecuttr/cookiecuttr.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/static/hdalab/lib/jquery.cookiecuttr/cookiecuttr.css Fri Jun 19 18:25:35 2015 +0200 @@ -0,0 +1,23 @@ +/* To be used with cookieCuttr by Chris Wharton (http://cookiecuttr.com) */ + +.cc-cookies { position:fixed; width: 90%; left: 0; top: 0; padding: 0.5em 5%; background: #565656; background: rgba(86,86,86,0.95); color: #fff; font-size: 13px; font-weight: 700; text-shadow: 0 -1px 0 rgba(0,0,0,0.35); z-index: 99999; text-align: center; color: #fff; } +.cc-cookies a, .cc-cookies a:hover { color: #fff; text-decoration: underline; } +.cc-cookies a:hover { text-decoration: none; } +.cc-overlay { height: 100%; padding-top: 25%; } +.cc-cookies-error { float: left; width: 90%; text-align: center; margin: 1em 0 2em 0; background: #fff; padding: 2em 5%; border: 1px solid #ccc; font-size: 18px; color: #333; } +.cc-cookies a.cc-cookie-accept, .cc-cookies-error a.cc-cookie-accept, .cc-cookies a.cc-cookie-decline, .cc-cookies-error a.cc-cookie-decline, .cc-cookies a.cc-cookie-reset { display: inline-block; color: #fff; text-decoration: none; background: #7DAF3B; padding: 0.5em 0.75em; border-radius: 3px; box-shadow: 0 0 2px rgba(0,0,0,0.25); text-shadow: 0 -1px 0 rgba(0,0,0,0.35); -o-transition: background 0.5s ease-in; -webkit-transition: background 0.25s ease-in; -moz-transition: background 0.25s ease-in; } +.cc-cookies a.cc-cookie-decline, .cc-cookies-error a.cc-cookie-decline { background: #af3b3b; margin-left: 0.5em; } +.cc-cookies a.cc-cookie-reset { background: #f15b00; } +.cc-cookies a:hover.cc-cookie-accept, .cc-cookies-error a:hover.cc-cookie-accept, .cc-cookies a:hover.cc-cookie-decline, .cc-cookies-error a:hover.cc-cookie-decline, .cc-cookies a:hover.cc-cookie-reset { background: #000; -o-transition: background 0.5s ease-in; -webkit-transition: background 0.25s ease-in; -moz-transition: background 0.25s ease-in; } +.cc-cookies-error a.cc-cookie-accept, .cc-cookies-error a.cc-cookie-decline { display: block; margin-top: 1em; } +.cc-cookies.cc-discreet { width: auto; padding: 0.5em 1em; left: auto; top: auto; } +.cc-cookies.cc-discreet a.cc-cookie-reset { background: none; text-shadow: none; padding: 0; text-decoration: underline; } +.cc-cookies.cc-discreet a:hover.cc-cookie-reset { text-decoration: none; } + +@media screen and (max-width: 768px) { +.cc-cookies a.cc-cookie-accept, .cc-cookies a.cc-cookie-decline, .cc-cookies a.cc-cookie-reset { display: block; margin: 1em 0; } +} + +@media screen and (max-width: 480px) { +.cc-cookies { position: relative; float: left; } +} \ No newline at end of file diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/static/hdalab/lib/jquery.cookiecuttr/jquery.cookiecuttr.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/static/hdalab/lib/jquery.cookiecuttr/jquery.cookiecuttr.js Fri Jun 19 18:25:35 2015 +0200 @@ -0,0 +1,290 @@ +/** + * Copyright (C) 2012 Chris Wharton (chris@weare2ndfloor.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT + * HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR + * FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE + * OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, + * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.COPYRIGHT HOLDERS WILL NOT + * BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL + * DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + + Documentation available at http://cookiecuttr.com + + */ +(function ($) { + $.cookieCuttr = function (options) { + var defaults = { + cookieCutter: false, // you'd like to enable the div/section/span etc. hide feature? change this to true + cookieCutterDeclineOnly: false, // you'd like the CookieCutter to only hide when someone has clicked declined set this to true + cookieAnalytics: true, // just using a simple analytics package? change this to true + cookieDeclineButton: false, // this will disable non essential cookies + cookieAcceptButton: true, // this will disable non essential cookies + cookieResetButton: false, + cookieOverlayEnabled: false, // don't want a discreet toolbar? Fine, set this to true + cookiePolicyLink: '/privacy-policy/', // if applicable, enter the link to your privacy policy here... + cookieMessage: 'We use cookies on this website, you can read about them here. To use the website as intended please...', + cookieAnalyticsMessage: 'We use cookies, just to track visits to our website, we store no personal details.', + cookieErrorMessage: "We\'re sorry, this feature places cookies in your browser and has been disabled.
To continue using this functionality, please", + cookieWhatAreTheyLink: "http://www.allaboutcookies.org/", + cookieDisable: '', + cookieExpires: 365, + cookieAcceptButtonText: "ACCEPT COOKIES", + cookieDeclineButtonText: "DECLINE COOKIES", + cookieResetButtonText: "RESET COOKIES FOR THIS WEBSITE", + cookieWhatAreLinkText: "What are cookies?", + cookieNotificationLocationBottom: false, // top or bottom - they are your only options, so true for bottom, false for top + cookiePolicyPage: false, + cookiePolicyPageMessage: 'Please read the information below and then choose from the following options', + cookieDiscreetLink: false, + cookieDiscreetReset: false, + cookieDiscreetLinkText: "Cookies?", + cookieDiscreetPosition: "topleft", //options: topleft, topright, bottomleft, bottomright + cookieNoMessage: false, // change to true hide message from all pages apart from your policy page + cookieDomain: "" + }; + var options = $.extend(defaults, options); + var message = defaults.cookieMessage.replace('{{cookiePolicyLink}}', defaults.cookiePolicyLink); + defaults.cookieMessage = 'We use cookies on this website, you can read about them here. To use the website as intended please...'; + //convert options + var cookiePolicyLinkIn = options.cookiePolicyLink; + var cookieCutter = options.cookieCutter; + var cookieCutterDeclineOnly = options.cookieCutterDeclineOnly; + var cookieAnalytics = options.cookieAnalytics; + var cookieDeclineButton = options.cookieDeclineButton; + var cookieAcceptButton = options.cookieAcceptButton; + var cookieResetButton = options.cookieResetButton; + var cookieOverlayEnabled = options.cookieOverlayEnabled; + var cookiePolicyLink = options.cookiePolicyLink; + var cookieMessage = message; + var cookieAnalyticsMessage = options.cookieAnalyticsMessage; + var cookieErrorMessage = options.cookieErrorMessage; + var cookieDisable = options.cookieDisable; + var cookieWhatAreTheyLink = options.cookieWhatAreTheyLink; + var cookieExpires = options.cookieExpires; + var cookieAcceptButtonText = options.cookieAcceptButtonText; + var cookieDeclineButtonText = options.cookieDeclineButtonText; + var cookieResetButtonText = options.cookieResetButtonText; + var cookieWhatAreLinkText = options.cookieWhatAreLinkText; + var cookieNotificationLocationBottom = options.cookieNotificationLocationBottom; + var cookiePolicyPage = options.cookiePolicyPage; + var cookiePolicyPageMessage = options.cookiePolicyPageMessage; + var cookieDiscreetLink = options.cookieDiscreetLink; + var cookieDiscreetReset = options.cookieDiscreetReset; + var cookieDiscreetLinkText = options.cookieDiscreetLinkText; + var cookieDiscreetPosition = options.cookieDiscreetPosition; + var cookieNoMessage = options.cookieNoMessage; + // cookie identifier + var $cookieAccepted = $.cookie('cc_cookie_accept') == "cc_cookie_accept"; + $.cookieAccepted = function () { + return $cookieAccepted; + }; + var $cookieDeclined = $.cookie('cc_cookie_decline') == "cc_cookie_decline"; + $.cookieDeclined = function () { + return $cookieDeclined; + }; + // write cookie accept button + if (cookieAcceptButton) { + var cookieAccept = ' ' + cookieAcceptButtonText + ' '; + } else { + var cookieAccept = ""; + } + // write cookie decline button + if (cookieDeclineButton) { + var cookieDecline = ' ' + cookieDeclineButtonText + ' '; + } else { + var cookieDecline = ""; + } + // write extra class for overlay + if (cookieOverlayEnabled) { + var cookieOverlay = 'cc-overlay'; + } else { + var cookieOverlay = ""; + } + // to prepend or append, that is the question? + if ((cookieNotificationLocationBottom) || (cookieDiscreetPosition == "bottomright") || (cookieDiscreetPosition == "bottomleft")) { + var appOrPre = true; + } else { + var appOrPre = false; + } + if (($cookieAccepted) || ($cookieDeclined)) { + // write cookie reset button + if ((cookieResetButton) && (cookieDiscreetReset)) { + if (appOrPre) { + $('body').append('
' + cookieResetButtonText + '
'); + } else { + $('body').prepend('
' + cookieResetButtonText + '
'); + } + //add appropriate CSS depending on position chosen + if (cookieDiscreetPosition == "topleft") { + $('div.cc-cookies').css("top", "0"); + $('div.cc-cookies').css("left", "0"); + } + if (cookieDiscreetPosition == "topright") { + $('div.cc-cookies').css("top", "0"); + $('div.cc-cookies').css("right", "0"); + } + if (cookieDiscreetPosition == "bottomleft") { + $('div.cc-cookies').css("bottom", "0"); + $('div.cc-cookies').css("left", "0"); + } + if (cookieDiscreetPosition == "bottomright") { + $('div.cc-cookies').css("bottom", "0"); + $('div.cc-cookies').css("right", "0"); + } + } else if (cookieResetButton) { + if (appOrPre) { + $('body').append('
' + cookieResetButtonText + '
'); + } else { + $('body').prepend('
' + cookieResetButtonText + '
'); + } + } else { + var cookieResetButton = ""; + } + } else { + // add message to just after opening body tag + if ((cookieNoMessage) && (!cookiePolicyPage)) { + // show no link on any pages APART from the policy page + } else if ((cookieDiscreetLink) && (!cookiePolicyPage)) { // show discreet link + if (appOrPre) { + $('body').append('
' + cookieDiscreetLinkText + '
'); + } else { + $('body').prepend('
' + cookieDiscreetLinkText + '
'); + } + //add appropriate CSS depending on position chosen + if (cookieDiscreetPosition == "topleft") { + $('div.cc-cookies').css("top", "0"); + $('div.cc-cookies').css("left", "0"); + } + if (cookieDiscreetPosition == "topright") { + $('div.cc-cookies').css("top", "0"); + $('div.cc-cookies').css("right", "0"); + } + if (cookieDiscreetPosition == "bottomleft") { + $('div.cc-cookies').css("bottom", "0"); + $('div.cc-cookies').css("left", "0"); + } + if (cookieDiscreetPosition == "bottomright") { + $('div.cc-cookies').css("bottom", "0"); + $('div.cc-cookies').css("right", "0"); + } + } else if (cookieAnalytics) { // show analytics overlay + if (appOrPre) { + $('body').append('
' + cookieAnalyticsMessage + cookieAccept + cookieDecline + '' + cookieWhatAreLinkText + '
'); + } else { + $('body').prepend('
' + cookieAnalyticsMessage + cookieAccept + cookieDecline + '' + cookieWhatAreLinkText + '
'); + } + } + if (cookiePolicyPage) { // show policy page overlay + if (appOrPre) { + $('body').append('
' + cookiePolicyPageMessage + " " + ' ' + cookieAcceptButtonText + ' ' + ' ' + cookieDeclineButtonText + ' ' + '
'); + } else { + $('body').prepend('
' + cookiePolicyPageMessage + " " + ' ' + cookieAcceptButtonText + ' ' + ' ' + cookieDeclineButtonText + ' ' + '
'); + } + } else if ((!cookieAnalytics) && (!cookieDiscreetLink)) { // show privacy policy option + if (appOrPre) { + $('body').append('
' + cookieMessage + cookieAccept + cookieDecline + '
'); + } else { + $('body').prepend('
' + cookieMessage + cookieAccept + cookieDecline + '
'); + } + } + } + if ((cookieCutter) && (!cookieCutterDeclineOnly) && (($cookieDeclined) || (!$cookieAccepted))) { + $(cookieDisable).html('
' + cookieErrorMessage + ' ' + cookieAcceptButtonText + ' ' + '
'); + } + if ((cookieCutter) && (cookieCutterDeclineOnly) && ($cookieDeclined)) { + $(cookieDisable).html('
' + cookieErrorMessage + ' ' + cookieAcceptButtonText + ' ' + '
'); + } + // if bottom is true, switch div to bottom if not in discreet mode + if ((cookieNotificationLocationBottom) && (!cookieDiscreetLink)) { + $('div.cc-cookies').css("top", "auto"); + $('div.cc-cookies').css("bottom", "0"); + } + if ((cookieNotificationLocationBottom) && (cookieDiscreetLink) && (cookiePolicyPage)) { + $('div.cc-cookies').css("top", "auto"); + $('div.cc-cookies').css("bottom", "0"); + } + // setting the cookies + + // for top bar + $('.cc-cookie-accept, .cc-cookie-decline').click(function (e) { + e.preventDefault(); + if ($(this).is('[href$=#decline]')) { + $.cookie("cc_cookie_accept", null, { + path: '/' + }); + $.cookie("cc_cookie_decline", "cc_cookie_decline", { + expires: cookieExpires, + path: '/' + }); + if (options.cookieDomain) { + // kill google analytics cookies + $.cookie("__utma", null, { + domain: '.' + options.cookieDomain, + path: '/' + }); + $.cookie("__utmb", null, { + domain: '.' + options.cookieDomain, + path: '/' + }); + $.cookie("__utmc", null, { + domain: '.' + options.cookieDomain, + path: '/' + }); + $.cookie("__utmz", null, { + domain: '.' + options.cookieDomain, + path: '/' + }); + } + } else { + $.cookie("cc_cookie_decline", null, { + path: '/' + }); + $.cookie("cc_cookie_accept", "cc_cookie_accept", { + expires: cookieExpires, + path: '/' + }); + } + $(".cc-cookies").fadeOut(function () { + // reload page to activate cookies + location.reload(); + }); + }); + //reset cookies + $('a.cc-cookie-reset').click(function (f) { + f.preventDefault(); + $.cookie("cc_cookie_accept", null, { + path: '/' + }); + $.cookie("cc_cookie_decline", null, { + path: '/' + }); + $(".cc-cookies").fadeOut(function () { + // reload page to activate cookies + location.reload(); + }); + }); + //cookie error accept + $('.cc-cookies-error a.cc-cookie-accept').click(function (g) { + g.preventDefault(); + $.cookie("cc_cookie_accept", "cc_cookie_accept", { + expires: cookieExpires, + path: '/' + }); + $.cookie("cc_cookie_decline", null, { + path: '/' + }); + // reload page to activate cookies + location.reload(); + }); + }; +})(jQuery); \ No newline at end of file diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/templates/ajax_identification/ajax_login.html --- a/src/hdalab/templates/ajax_identification/ajax_login.html Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/templates/ajax_identification/ajax_login.html Fri Jun 19 18:25:35 2015 +0200 @@ -1,8 +1,6 @@ {% load static %} {% load i18n %} - -

{% trans "Identifiants" %}

{% if form.errors %} diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/templates/base.html --- a/src/hdalab/templates/base.html Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/templates/base.html Fri Jun 19 18:25:35 2015 +0200 @@ -16,11 +16,15 @@ + {% endblock %} {% block js_import %} + + {% endblock %} + {% block header %} @@ -110,6 +114,21 @@
{% endblock %} + {% analytics %} diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/templates/google_analytics/analytics_template.html --- a/src/hdalab/templates/google_analytics/analytics_template.html Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/templates/google_analytics/analytics_template.html Fri Jun 19 18:25:35 2015 +0200 @@ -1,10 +1,11 @@ - \ No newline at end of file diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/templates/renkan_edit.html --- a/src/hdalab/templates/renkan_edit.html Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/templates/renkan_edit.html Fri Jun 19 18:25:35 2015 +0200 @@ -10,6 +10,7 @@ + {% endblock %} {% block js_import %} @@ -33,7 +34,7 @@ {% endblock %} {% block main_content %}
-

RENKAN

-
- {% if switch_shape_url %} - - {% endif %} - -
+

RENKAN

+
+ {% if switch_shape_url %} + + {% endif %} + +
- {% include 'ajax_identification/ajax_login.html' %} + {% include 'ajax_identification/ajax_login.html' %}
- {% include 'help_popup.html' %} + {% include 'help_popup.html' %}
diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/templates/renkan_list.html --- a/src/hdalab/templates/renkan_list.html Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/templates/renkan_list.html Fri Jun 19 18:25:35 2015 +0200 @@ -46,7 +46,9 @@

{% trans 'Title' %} :

{% trans 'Modification date' %} : {% trans 'begin' %} - {% trans 'end' %} :

+ {% if show_username %}

{% trans 'Username' %} :

+ {% endif %} {% if not hide_favorite %}

{% trans 'Favorite' %} : = 1 %} checked="checked" {% endif %} value="{{favorite}}" />

{% endif %} @@ -61,8 +63,10 @@ {% trans 'Fav.' %} {% if sort_param == 'favorite' %}{% endif %} {% endif %} + {% if show_username %} {% trans 'User' %} {% if sort_param == 'user' %}{% endif %} + {% endif %} {% trans 'Modification date' %} {% if sort_param == 'date' %}{% endif %} PreviewActions @@ -75,7 +79,9 @@ {% if not hide_favorite %} {% if hr.favorite %} {% else %} {% endif %} {% endif %} + {% if show_username %} {{ r.owner.username }} + {% endif %} {{ r.modification_date|date:"Y-m-d H:i" }} {% thumbnail r.image 100x100 as thumb %} diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/templates/renkan_new_confirm.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/templates/renkan_new_confirm.html Fri Jun 19 18:25:35 2015 +0200 @@ -0,0 +1,33 @@ +{% extends "base.html" %} +{% load i18n %} +{% load static %} +{% load thumbnail %} + +{% block title %}{{block.super}} > {% trans 'Marked Renkans list' %}{% endblock %} + +{% block css_import %} +{{block.super}} + + + +{% endblock %} + +{% block js_import %} +{{block.super}} + + +{% endblock %} + +{% block main_content %} +
+ {% block main_content_title %}

{% trans 'Confirm renkan creation' %}

{% endblock %} +
{% block new_renkan %} +
{% csrf_token %} +

+ {% trans 'You are now authenticated, you can create your new renkan by clicking on this link:' %} + +

+
+ {% endblock %}
+
+{% endblock %} \ No newline at end of file diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/templates/renkan_view.html --- a/src/hdalab/templates/renkan_view.html Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/templates/renkan_view.html Fri Jun 19 18:25:35 2015 +0200 @@ -32,6 +32,8 @@ show_bins: false, show_export_button: false, show_user_list: false, + hide_nodes: false, + show_node_editor_description_richtext: false, language: "{{ LANGUAGE_CODE }}", default_view: false, save_view: true diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/templates/renkan_view_full.html --- a/src/hdalab/templates/renkan_view_full.html Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/templates/renkan_view_full.html Fri Jun 19 18:25:35 2015 +0200 @@ -39,6 +39,7 @@ show_zoom: false, default_view: false, save_view: false, + hide_nodes: false, language: "fr" }); Rkns.jsonIO(_renkan, { diff -r af0a09405398 -r 3fd558fa38b1 src/hdalab/views/profile.py --- a/src/hdalab/views/profile.py Wed May 27 14:06:37 2015 +0200 +++ b/src/hdalab/views/profile.py Fri Jun 19 18:25:35 2015 +0200 @@ -126,8 +126,16 @@ def get_context_data(self, **kwargs): context = super(RenkanPublicList, self).get_context_data(**kwargs) #Liste des renkans publics + renkan_list = HdalabRenkan.objects + context['hide_favorite'] = True - return self.update_context(context, HdalabRenkan.objects.select_related("renkan", "renkan__owner").filter(state=HdalabRenkan.PUBLISHED, favorite=False) ) + context['show_username'] = self.request.user.is_staff + if self.request.user.is_staff: + renkan_list = renkan_list.select_related("renkan", "renkan__owner") + else: + renkan_list = renkan_list.select_related("renkan") + + return self.update_context(context, renkan_list.filter(state=HdalabRenkan.PUBLISHED, favorite=False) ) class RenkanFavoriteList(BaseRenkanList): @@ -136,12 +144,22 @@ def get_context_data(self, **kwargs): context = super(RenkanFavoriteList, self).get_context_data(**kwargs) + renkan_list = HdalabRenkan.objects + context['hide_favorite'] = True - return self.update_context(context, HdalabRenkan.objects.select_related("renkan", "renkan__owner").filter(state=HdalabRenkan.PUBLISHED, favorite=True) ) + context['show_username'] = self.request.user.is_staff + if self.request.user.is_staff: + renkan_list = renkan_list.select_related("renkan", "renkan__owner") + else: + renkan_list = renkan_list.select_related("renkan") + + return self.update_context(context, renkan_list.filter(state=HdalabRenkan.PUBLISHED, favorite=True) ) -class RenkanNew(View): +class RenkanNew(TemplateView): + template_name="renkan_new_confirm.html" + def post(self, request): rk = Renkan() rk_id = unicode(uuid.uuid1()) @@ -217,6 +235,7 @@ content = { "id": unicode(uuid.uuid1()), + "schema_version": 2, "title": "", "description": "(empty description)", "created": now, @@ -266,8 +285,9 @@ "image": "http://www.histoiredesarts.culture.fr/images/pf/" + notice.hda_id + ".jpg", "size": 0, "project_id": project_id, - "color": "#FF0033", - #"created_by": "roster_user-84fe909f-ba37-48e6-a25f-9d2f129a95b7", + "style" : { + "color": "#FF0033", + }, "shape": shapes["notice"] }) notice_id = content["nodes"][0]["id"] @@ -297,8 +317,9 @@ "image": img_url, "size": 0, "project_id": project_id, - "color": "#00FF33", - #"created_by": "roster_user-84fe909f-ba37-48e6-a25f-9d2f129a95b7", + "style": { + "color": "#00FF33" + }, "shape": shapes["tag2"] }) @@ -309,11 +330,12 @@ "title": "", "description": "", "uri": "", - "color": None, + "style": { + "color": None, + }, "from": notice_id, "to": node["id"], "project_id": project_id, - #"created_by": "de68xf75y6hs5rgjhgghxbm217xk" }) response = json.dumps(content) @@ -324,7 +346,7 @@ folder_id = request.GET.get("folder", "") if folder_id!="": #TODO : optimize to avoid tag request on each notice - folder = get_object_or_404(Folder.objects.select_related("datasheets", "datasheets__tags"), pk=folder_id) + folder = get_object_or_404(Folder.objects.prefetch_related("datasheets", "datasheets__tags"), pk=folder_id) notices = folder.datasheets.all() n_tags = [] notice_tag_dict = {} @@ -366,8 +388,9 @@ "image": "http://www.histoiredesarts.culture.fr/images/pf/" + n.hda_id + ".jpg", "size": 0, "project_id": project_id, - "color": "#FF0033", - #"created_by": "roster_user-84fe909f-ba37-48e6-a25f-9d2f129a95b7", + "style": { + "color": "#FF0033" + }, "shape": shapes["notice"] }) @@ -391,9 +414,10 @@ "image": img_url, "size": 0, "project_id": project_id, - "color": "#00FF33", - #"created_by": "roster_user-84fe909f-ba37-48e6-a25f-9d2f129a95b7", - "shape": shapes["tag2"] + "style": { + "color": "#00FF33" + }, + "shape": shapes["tag2"] }) # Place edges @@ -404,7 +428,9 @@ "title": "", "description": "", "uri": "", - "color": None, + "style": { + "color": None + }, "from": notice_tag_dict[n_pk]["uuid"], "to": tag_id, "project_id": project_id, @@ -521,8 +547,9 @@ "image": img_url, "size": 0, "project_id": project_id, - "color": None, - #"created_by": "roster_user-84fe909f-ba37-48e6-a25f-9d2f129a95b7", + "style" : { + "color": None, + }, "shape": shapes["tag1"] }) if period: @@ -535,8 +562,9 @@ "image": cat_dict[u"Datation"], "size": 0, "project_id": project_id, - "color": None, - #"created_by": "roster_user-84fe909f-ba37-48e6-a25f-9d2f129a95b7", + "style": { + "color": None + }, "shape": shapes["tag1"] }) @@ -550,8 +578,9 @@ "image": "http://www.histoiredesarts.culture.fr/images/pf/" + c["hda_id"]+ ".jpg", "size": 0, "project_id": project_id, - "color": "#FF0033", - #"created_by": "roster_user-84fe909f-ba37-48e6-a25f-9d2f129a95b7", + "style" : { + "color": "#FF0033" + }, "shape": shapes["notice"] }) @@ -571,8 +600,9 @@ "image": t["thumbnail"], "size": 0, "project_id": project_id, - "color": "#00FF33", - #"created_by": "roster_user-84fe909f-ba37-48e6-a25f-9d2f129a95b7", + "style": { + "color": "#00FF33" + }, "shape": shapes["tag2"] }) @@ -583,7 +613,9 @@ "title": "", "description": "", "uri": "", - "color": None, + "style": { + "color": None, + }, "from": c_id, "to": tag_id, "project_id": project_id, diff -r af0a09405398 -r 3fd558fa38b1 src/requirement.txt --- a/src/requirement.txt Wed May 27 14:06:37 2015 +0200 +++ b/src/requirement.txt Fri Jun 19 18:25:35 2015 +0200 @@ -1,1 +1,1 @@ -renkanmanager (==0.9) +renkanmanager (==0.11) diff -r af0a09405398 -r 3fd558fa38b1 virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Wed May 27 14:06:37 2015 +0200 +++ b/virtualenv/res/lib/lib_create_env.py Fri Jun 19 18:25:35 2015 +0200 @@ -17,7 +17,7 @@ URLS = { #'': {'setup': '', 'url':'', 'local':''}, '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/tarball/', 'local':"Django-1.8.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}}, '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}}, diff -r af0a09405398 -r 3fd558fa38b1 virtualenv/res/src/Django-1.8.2.tar.gz Binary file virtualenv/res/src/Django-1.8.2.tar.gz has changed diff -r af0a09405398 -r 3fd558fa38b1 virtualenv/res/src/Django-1.8.tar.gz Binary file virtualenv/res/src/Django-1.8.tar.gz has changed diff -r af0a09405398 -r 3fd558fa38b1 virtualenv/res/src/django-haystack-2.4.0.tar.gz Binary file virtualenv/res/src/django-haystack-2.4.0.tar.gz has changed diff -r af0a09405398 -r 3fd558fa38b1 virtualenv/web/res/requirements.txt --- a/virtualenv/web/res/requirements.txt Wed May 27 14:06:37 2015 +0200 +++ b/virtualenv/web/res/requirements.txt Fri Jun 19 18:25:35 2015 +0200 @@ -1,7 +1,7 @@ #-e git+git://github.com/IRI-Research/rdflib.git@96c30f98bbb628e13aaa32c9c392584b0fbf8788#egg=rdflib #STATIC_DEPS=true LIBXML2_VERSION=2.9.2 LIBXSLT_VERSION=1.1.28 LIBICONV_VERSION=1.14 pip install --no-index -r requirements.txt -f ../../res/src -Django==1.8 +Django==1.8.2 Pillow==2.7.0 PyYAML==3.11 SPARQLWrapper==1.6.4