--- a/.settings/org.eclipse.core.resources.prefs Thu Apr 02 22:52:54 2015 +0200
+++ b/.settings/org.eclipse.core.resources.prefs Fri Apr 03 02:22:15 2015 +0200
@@ -9,6 +9,7 @@
encoding//src/hdabo/management/commands/query_wikipedia.py=utf-8
encoding//src/hdabo/management/utils.py=utf-8
encoding//src/hdabo/migrations/0001_initial.py=utf-8
+encoding//src/hdabo/migrations/0002_alter_user_fields_after_1_8.py=utf-8
encoding//src/hdabo/models.py=utf-8
encoding//src/hdabo/search/french_whoosh_backend.py=utf-8
encoding//src/hdabo/tests/test_models.py=utf-8
@@ -37,6 +38,7 @@
encoding//src/hdalab/management/commands/send_moderation_mail.py=utf-8
encoding//src/hdalab/management/utils.py=utf-8
encoding//src/hdalab/migrations/0001_initial.py=utf-8
+encoding//src/hdalab/migrations/0002_alter_tagyears_tag_one2one.py=utf-8
encoding//src/hdalab/models/dataviz.py=utf-8
encoding//src/hdalab/models/renkan.py=utf-8
encoding//src/hdalab/services.py=utf-8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdabo/migrations/0002_alter_user_fields_after_1_8.py Fri Apr 03 02:22:15 2015 +0200
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django.core.validators
+import django.contrib.auth.models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('hdabo', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterModelManagers(
+ name='user',
+ managers=[
+ (b'objects', django.contrib.auth.models.UserManager()),
+ ],
+ ),
+ migrations.AlterField(
+ model_name='user',
+ name='email',
+ field=models.EmailField(max_length=254, verbose_name='email address', blank=True),
+ ),
+ migrations.AlterField(
+ model_name='user',
+ name='groups',
+ field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups'),
+ ),
+ migrations.AlterField(
+ model_name='user',
+ name='last_login',
+ field=models.DateTimeField(null=True, verbose_name='last login', blank=True),
+ ),
+ migrations.AlterField(
+ model_name='user',
+ name='username',
+ field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, verbose_name='username'),
+ ),
+ ]
Binary file src/hdalab/locale/de/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/de/LC_MESSAGES/django.po Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/locale/de/LC_MESSAGES/django.po Fri Apr 03 02:22:15 2015 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-19 09:40-0500\n"
+"POT-Creation-Date: 2015-04-02 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,27 +33,27 @@
msgid "rejected_state"
msgstr ""
-#: settings.py:40
+#: settings.py:39
msgid "French"
msgstr "Französisch"
-#: settings.py:41
+#: settings.py:40
msgid "English"
msgstr "Englisch"
-#: settings.py:42
+#: settings.py:41
msgid "Italian"
msgstr "Italienisch"
-#: settings.py:43
+#: settings.py:42
msgid "German"
msgstr "Deutsch"
-#: settings.py:44
+#: settings.py:43
msgid "Spanish"
msgstr "Spanisch"
-#: settings.py:45
+#: settings.py:44
msgid "Japanese"
msgstr "Japanisch"
@@ -73,8 +73,8 @@
msgid "Sorry, but the requested page could not be found."
msgstr ""
-#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75
-#: templates/base.html:97
+#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74
+#: templates/base.html:96
msgid "A Propos"
msgstr ""
@@ -117,7 +117,7 @@
msgid "Still not a user ? Create an account"
msgstr ""
-#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:50
+#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49
msgid "Log out"
msgstr ""
@@ -125,46 +125,46 @@
msgid "Accueil"
msgstr ""
-#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
msgid "Recherche"
msgstr "Einen Tag suchen"
-#: templates/base.html:40 templates/base.html.py:93
+#: templates/base.html:40 templates/base.html.py:92
msgid "Domaines Artistiques"
msgstr "Künstlerische Disziplinen"
-#: templates/base.html:41 templates/base.html.py:94
-msgid "Thésaurus"
-msgstr ""
-
-#: templates/base.html:52 templates/registration/activate.html:16
+#: templates/base.html:51 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:76
+#: templates/base.html:75
msgid "Crédits"
msgstr ""
-#: templates/base.html:77
+#: templates/base.html:76
msgid "Mentions légales"
msgstr ""
-#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/base.html:77 templates/envelope/contact.html:6
#: templates/envelope/contact.html.py:17
msgid "Contact"
msgstr ""
-#: templates/base.html:91
+#: templates/base.html:90
msgid "Rubriques"
msgstr ""
-#: templates/base.html:96
+#: templates/base.html:93
+msgid "Thésaurus"
+msgstr ""
+
+#: templates/base.html:95
msgid "Renkan repères"
msgstr ""
-#: templates/base.html:103
+#: templates/base.html:101
msgid "Liens"
msgstr ""
@@ -211,54 +211,54 @@
#: 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:39
-#: templates/renkan_list.html.py:91
+#: templates/profile_home.html.py:125 templates/renkan_list.html:42
+#: templates/renkan_list.html.py:94
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:40
-#: templates/renkan_list.html.py:92
+#: templates/profile_home.html.py:126 templates/renkan_list.html:43
+#: templates/renkan_list.html.py:95
msgid "Next"
msgstr ""
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
msgid "Filter"
msgstr "Filter:"
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
msgid "Advanced search"
msgstr ""
#: 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:43
-#: templates/renkan_list.html.py:55
+#: templates/profile_home.html.py:78 templates/renkan_list.html:46
+#: templates/renkan_list.html.py:58
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:44
-#: templates/renkan_list.html.py:63
+#: templates/profile_home.html.py:82 templates/renkan_list.html:47
+#: templates/renkan_list.html.py:66
msgid "Modification date"
msgstr ""
#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61
-#: templates/renkan_list.html:44
+#: templates/renkan_list.html:47
msgid "begin"
msgstr ""
#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62
-#: templates/renkan_list.html:45
+#: templates/renkan_list.html:48
msgid "end"
msgstr ""
#: templates/editorial/manage_renkans.html:48
-#: templates/registration/login.html:25 templates/renkan_list.html:46
+#: templates/registration/login.html:25 templates/renkan_list.html:49
msgid "Username"
msgstr ""
@@ -281,21 +281,21 @@
msgstr ""
#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72
-#: templates/renkan_list.html:48
+#: templates/renkan_list.html:51
msgid "Favorite"
msgstr ""
#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73
-#: templates/renkan_list.html:50
+#: templates/renkan_list.html:53
msgid "Search"
msgstr ""
#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80
-#: templates/renkan_list.html:58
+#: templates/renkan_list.html:61
msgid "Fav."
msgstr ""
-#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61
+#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64
msgid "User"
msgstr ""
@@ -612,7 +612,7 @@
"de ressources du portail Histoire des Arts."
msgstr ""
-#: templates/index.html:76 templates/renkan_list.html:35
+#: templates/index.html:76
msgid ""
"Construisez votre carte de connaissances à partir des ressources Histoires "
"des arts et Wikipedia."
@@ -684,7 +684,7 @@
msgid "Gerer mes Renkan"
msgstr ""
-#: templates/profile_home.html:54 templates/renkan_list.html:33
+#: templates/profile_home.html:54
msgid "Nouveau Renkan"
msgstr ""
@@ -692,7 +692,7 @@
msgid "Edition"
msgstr ""
-#: templates/profile_home.html:106 templates/renkan_list.html:83
+#: templates/profile_home.html:106 templates/renkan_list.html:86
msgid "Are you sure you want to copy this renkan ?"
msgstr ""
@@ -855,46 +855,64 @@
msgid "Mot de passe (Verification)"
msgstr ""
-#: templates/renkan_edit.html:67
+#: templates/renkan_edit.html:70
msgid "Ressources"
msgstr ""
-#: templates/renkan_edit.html:198
+#: templates/renkan_edit.html:201
msgid "Change organisation"
msgstr ""
-#: templates/renkan_edit.html:199
+#: templates/renkan_edit.html:202
msgid "(Indisponible si modification du RENKAN)"
msgstr ""
-#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206
-#: templates/renkan_edit.html:210
+#: 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:203 templates/renkan_edit.html.py:207
-#: templates/renkan_edit.html:211
+#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210
+#: templates/renkan_edit.html:214
msgid "View graph in line"
msgstr ""
-#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208
-#: templates/renkan_edit.html:212
+#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211
+#: templates/renkan_edit.html:215
msgid "View graph in circle"
msgstr ""
-#: templates/renkan_list.html:6 views/profile.py:143
+#: templates/renkan_list.html:6 templates/renkan_list.html.py:29
+#: templates/renkan_list_favorite.html:4
msgid "Marked Renkans list"
msgstr ""
-#: views/profile.py:131
+#: templates/renkan_list.html:29 templates/renkan_list_favorite.html:4
msgid "Public Renkans list"
msgstr ""
-#: views/profile.py:447
+#: templates/renkan_list.html:32
+msgid ""
+"\n"
+" Consultez des cartes de connaissances sur les arts et \n"
+" <button id=\"new-renkan-button\" title=\"Nouveau Renkan\" class="
+"\"renkan-inline-action\"><span id=\"new-renkan\">créez vos propres cartes</"
+"span></button>\n"
+" à partir des ressources Histoire des arts et Wikipedia.\n"
+" "
+msgstr ""
+
+#: templates/renkan_list_favorite.html:6
+msgid ""
+"Consultez et personnalisez les Renkan des repères chronologiques d'Histoire "
+"des arts."
+msgstr ""
+
+#: views/profile.py:445
msgid "Plus de Ressources"
msgstr ""
-#: views/profile.py:456 views/profile.py:535
+#: views/profile.py:454 views/profile.py:533
msgid "Period"
msgstr ""
Binary file src/hdalab/locale/en/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/en/LC_MESSAGES/django.po Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/locale/en/LC_MESSAGES/django.po Fri Apr 03 02:22:15 2015 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-19 09:40-0500\n"
+"POT-Creation-Date: 2015-04-02 17:42-0500\n"
"PO-Revision-Date: 2012-03-09 02:10+0200\n"
"Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
"Language-Team: IRI\n"
@@ -33,27 +33,27 @@
msgid "rejected_state"
msgstr "rejected"
-#: settings.py:40
+#: settings.py:39
msgid "French"
msgstr "French"
-#: settings.py:41
+#: settings.py:40
msgid "English"
msgstr "English"
-#: settings.py:42
+#: settings.py:41
msgid "Italian"
msgstr "Italian"
-#: settings.py:43
+#: settings.py:42
msgid "German"
msgstr "German"
-#: settings.py:44
+#: settings.py:43
msgid "Spanish"
msgstr "Spanish"
-#: settings.py:45
+#: settings.py:44
msgid "Japanese"
msgstr "Japanese"
@@ -73,8 +73,8 @@
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:43 templates/base.html.py:75
-#: templates/base.html:97
+#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74
+#: templates/base.html:96
msgid "A Propos"
msgstr "About"
@@ -117,7 +117,7 @@
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:50
+#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49
msgid "Log out"
msgstr "Log out"
@@ -125,46 +125,46 @@
msgid "Accueil"
msgstr "Home"
-#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
msgid "Recherche"
msgstr "Tag search"
-#: templates/base.html:40 templates/base.html.py:93
+#: templates/base.html:40 templates/base.html.py:92
msgid "Domaines Artistiques"
msgstr "Artistic discipline"
-#: templates/base.html:41 templates/base.html.py:94
-msgid "Thésaurus"
-msgstr "Thesaurus"
-
-#: templates/base.html:52 templates/registration/activate.html:16
+#: templates/base.html:51 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:76
+#: templates/base.html:75
msgid "Crédits"
msgstr "Credits"
-#: templates/base.html:77
+#: templates/base.html:76
msgid "Mentions légales"
msgstr "Legal Notices"
-#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/base.html:77 templates/envelope/contact.html:6
#: templates/envelope/contact.html.py:17
msgid "Contact"
msgstr "Contact"
-#: templates/base.html:91
+#: templates/base.html:90
msgid "Rubriques"
msgstr "Topics"
-#: templates/base.html:96
+#: templates/base.html:93
+msgid "Thésaurus"
+msgstr "Thesaurus"
+
+#: templates/base.html:95
msgid "Renkan repères"
msgstr "Landmark Renkan"
-#: templates/base.html:103
+#: templates/base.html:101
msgid "Liens"
msgstr "Links"
@@ -210,54 +210,54 @@
#: 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:39
-#: templates/renkan_list.html.py:91
+#: templates/profile_home.html.py:125 templates/renkan_list.html:42
+#: templates/renkan_list.html.py:94
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:40
-#: templates/renkan_list.html.py:92
+#: templates/profile_home.html.py:126 templates/renkan_list.html:43
+#: templates/renkan_list.html.py:95
msgid "Next"
msgstr "Next"
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
msgid "Filter"
msgstr "Filter"
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
msgid "Advanced search"
msgstr "Advanced search"
#: 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:43
-#: templates/renkan_list.html.py:55
+#: templates/profile_home.html.py:78 templates/renkan_list.html:46
+#: templates/renkan_list.html.py:58
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:44
-#: templates/renkan_list.html.py:63
+#: templates/profile_home.html.py:82 templates/renkan_list.html:47
+#: templates/renkan_list.html.py:66
msgid "Modification date"
msgstr "Modification date"
#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61
-#: templates/renkan_list.html:44
+#: templates/renkan_list.html:47
msgid "begin"
msgstr "Begin"
#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62
-#: templates/renkan_list.html:45
+#: templates/renkan_list.html:48
msgid "end"
msgstr "End"
#: templates/editorial/manage_renkans.html:48
-#: templates/registration/login.html:25 templates/renkan_list.html:46
+#: templates/registration/login.html:25 templates/renkan_list.html:49
msgid "Username"
msgstr "Username"
@@ -280,21 +280,21 @@
msgstr "Rejected"
#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72
-#: templates/renkan_list.html:48
+#: templates/renkan_list.html:51
msgid "Favorite"
msgstr "Favorite"
#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73
-#: templates/renkan_list.html:50
+#: templates/renkan_list.html:53
msgid "Search"
msgstr "Search"
#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80
-#: templates/renkan_list.html:58
+#: templates/renkan_list.html:61
msgid "Fav."
msgstr "Fav."
-#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61
+#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64
msgid "User"
msgstr "User"
@@ -664,13 +664,13 @@
"Explore 18 great artistic domains through trees of enriched resources from "
"the portal \"Histoire des Arts\"."
-#: templates/index.html:76 templates/renkan_list.html:35
+#: templates/index.html:76
msgid ""
"Construisez votre carte de connaissances à partir des ressources Histoires "
"des arts et Wikipedia."
msgstr ""
-"Consult knowledge map on arts and build your own knowledge map from resources "
-"from \"Histoire des Arts\" and Wikipedia."
+"Consult knowledge map on arts and build your own knowledge map from "
+"resources from \"Histoire des Arts\" and Wikipedia."
#: templates/index.html:91
msgid "Bienvenue sur Histoire des arts‘Lab !"
@@ -740,7 +740,7 @@
msgid "Gerer mes Renkan"
msgstr "Manage my Renkan"
-#: templates/profile_home.html:54 templates/renkan_list.html:33
+#: templates/profile_home.html:54
msgid "Nouveau Renkan"
msgstr "New renkan"
@@ -748,7 +748,7 @@
msgid "Edition"
msgstr "Edition"
-#: templates/profile_home.html:106 templates/renkan_list.html:83
+#: templates/profile_home.html:106 templates/renkan_list.html:86
msgid "Are you sure you want to copy this renkan ?"
msgstr "Are you sure you want to copy this renkan ?"
@@ -915,45 +915,73 @@
msgid "Mot de passe (Verification)"
msgstr "Password (verification)"
-#: templates/renkan_edit.html:67
+#: templates/renkan_edit.html:70
msgid "Ressources"
msgstr "Resources"
-#: templates/renkan_edit.html:198
+#: templates/renkan_edit.html:201
msgid "Change organisation"
msgstr "Change organisation"
-#: templates/renkan_edit.html:199
+#: templates/renkan_edit.html:202
msgid "(Indisponible si modification du RENKAN)"
msgstr "(Not allowed if RENKAN has been modified)"
-#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206
-#: templates/renkan_edit.html:210
+#: templates/renkan_edit.html:205 templates/renkan_edit.html.py:209
+#: templates/renkan_edit.html:213
msgid "View graph in column"
msgstr "View graph in column"
-#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207
-#: templates/renkan_edit.html:211
+#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210
+#: templates/renkan_edit.html:214
msgid "View graph in line"
msgstr "View graph in line"
-#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208
-#: templates/renkan_edit.html:212
+#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211
+#: templates/renkan_edit.html:215
msgid "View graph in circle"
msgstr "View graph in circle"
-#: templates/renkan_list.html:6 views/profile.py:143
+#: templates/renkan_list.html:6 templates/renkan_list.html.py:29
+#: templates/renkan_list_favorite.html:4
msgid "Marked Renkans list"
msgstr "Marked Renkan list"
-#: views/profile.py:131
+#: templates/renkan_list.html:29 templates/renkan_list_favorite.html:4
msgid "Public Renkans list"
msgstr "Public Renkan list"
-#: views/profile.py:447
+#: templates/renkan_list.html:32
+msgid ""
+"\n"
+" Consultez des cartes de connaissances sur les arts et \n"
+" <button id=\"new-renkan-button\" title=\"Nouveau Renkan\" class="
+"\"renkan-inline-action\"><span id=\"new-renkan\">créez vos propres cartes</"
+"span></button>\n"
+" à partir des ressources Histoire des arts et Wikipedia.\n"
+" "
+msgstr ""
+"\n"
+" Consult knowledge map on art and \n"
+" <button id=\"new-renkan-button\" title=\"New Renkan\" class="
+"\"renkan-inline-action\"><span id=\"new-renkan\">create your own maps</"
+"span></button>\n"
+" from \"Histoire des arts\" and Wikipedia resources.\n"
+" "
+
+
+#: templates/renkan_list_favorite.html:6
+msgid ""
+"Consultez et personnalisez les Renkan des repères chronologiques d'Histoire "
+"des arts."
+msgstr ""
+"Consult and customize Renkans of chronological landmarks from \"Histoire "
+"des arts\"."
+
+#: views/profile.py:445
msgid "Plus de Ressources"
msgstr "More Resources"
-#: views/profile.py:456 views/profile.py:535
+#: views/profile.py:454 views/profile.py:533
msgid "Period"
msgstr "Period"
Binary file src/hdalab/locale/es/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/es/LC_MESSAGES/django.po Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/locale/es/LC_MESSAGES/django.po Fri Apr 03 02:22:15 2015 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-19 09:40-0500\n"
+"POT-Creation-Date: 2015-04-02 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,27 +33,27 @@
msgid "rejected_state"
msgstr "estado_rechazado"
-#: settings.py:40
+#: settings.py:39
msgid "French"
msgstr "Francés"
-#: settings.py:41
+#: settings.py:40
msgid "English"
msgstr "Inglés"
-#: settings.py:42
+#: settings.py:41
msgid "Italian"
msgstr "Italiano"
-#: settings.py:43
+#: settings.py:42
msgid "German"
msgstr "Alemán"
-#: settings.py:44
+#: settings.py:43
msgid "Spanish"
msgstr "Español"
-#: settings.py:45
+#: settings.py:44
msgid "Japanese"
msgstr "Japonés"
@@ -73,8 +73,8 @@
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:43 templates/base.html.py:75
-#: templates/base.html:97
+#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74
+#: templates/base.html:96
msgid "A Propos"
msgstr "Acerca de Nosotros"
@@ -117,7 +117,7 @@
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:50
+#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49
msgid "Log out"
msgstr "Cerrar sesión"
@@ -125,46 +125,46 @@
msgid "Accueil"
msgstr "Inicio"
-#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
msgid "Recherche"
msgstr "Búsqueda"
-#: templates/base.html:40 templates/base.html.py:93
+#: templates/base.html:40 templates/base.html.py:92
msgid "Domaines Artistiques"
msgstr "Disciplinas artísticas"
-#: templates/base.html:41 templates/base.html.py:94
-msgid "Thésaurus"
-msgstr "Thesaurus"
-
-#: templates/base.html:52 templates/registration/activate.html:16
+#: templates/base.html:51 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:76
+#: templates/base.html:75
msgid "Crédits"
msgstr "Creditos"
-#: templates/base.html:77
+#: templates/base.html:76
msgid "Mentions légales"
msgstr "Aviso Legal"
-#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/base.html:77 templates/envelope/contact.html:6
#: templates/envelope/contact.html.py:17
msgid "Contact"
msgstr "Contactos"
-#: templates/base.html:91
+#: templates/base.html:90
msgid "Rubriques"
msgstr "Rubricas"
-#: templates/base.html:96
+#: templates/base.html:93
+msgid "Thésaurus"
+msgstr "Thesaurus"
+
+#: templates/base.html:95
msgid "Renkan repères"
msgstr "Renkan marcados"
-#: templates/base.html:103
+#: templates/base.html:101
msgid "Liens"
msgstr "Elaces"
@@ -210,54 +210,54 @@
#: 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:39
-#: templates/renkan_list.html.py:91
+#: templates/profile_home.html.py:125 templates/renkan_list.html:42
+#: templates/renkan_list.html.py:94
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:40
-#: templates/renkan_list.html.py:92
+#: templates/profile_home.html.py:126 templates/renkan_list.html:43
+#: templates/renkan_list.html.py:95
msgid "Next"
msgstr "Siguiente"
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
msgid "Filter"
msgstr "Filtro"
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
msgid "Advanced search"
msgstr "Búsqueda avanzada"
#: 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:43
-#: templates/renkan_list.html.py:55
+#: templates/profile_home.html.py:78 templates/renkan_list.html:46
+#: templates/renkan_list.html.py:58
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:44
-#: templates/renkan_list.html.py:63
+#: templates/profile_home.html.py:82 templates/renkan_list.html:47
+#: templates/renkan_list.html.py:66
msgid "Modification date"
msgstr "Modificar la fecha"
#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61
-#: templates/renkan_list.html:44
+#: templates/renkan_list.html:47
msgid "begin"
msgstr "inicio"
#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62
-#: templates/renkan_list.html:45
+#: templates/renkan_list.html:48
msgid "end"
msgstr "fin"
#: templates/editorial/manage_renkans.html:48
-#: templates/registration/login.html:25 templates/renkan_list.html:46
+#: templates/registration/login.html:25 templates/renkan_list.html:49
msgid "Username"
msgstr "Nombre de Usuario"
@@ -280,21 +280,21 @@
msgstr "Rechazado"
#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72
-#: templates/renkan_list.html:48
+#: templates/renkan_list.html:51
msgid "Favorite"
msgstr "Favorito"
#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73
-#: templates/renkan_list.html:50
+#: templates/renkan_list.html:53
msgid "Search"
msgstr "Buscar"
#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80
-#: templates/renkan_list.html:58
+#: templates/renkan_list.html:61
msgid "Fav."
msgstr ""
-#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61
+#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64
msgid "User"
msgstr "Usuario"
@@ -625,10 +625,10 @@
"Explorez 9 grands domaines artistiques à travers des arborescences enrichies "
"de ressources du portail Histoire des Arts."
msgstr ""
-"Exploa 18 grandes temas artisticos a traves de arborescencias de recursos del "
-"portal de Histoire des Arts."
+"Exploa 18 grandes temas artisticos a traves de arborescencias de recursos "
+"del portal de Histoire des Arts."
-#: templates/index.html:76 templates/renkan_list.html:35
+#: templates/index.html:76
msgid ""
"Construisez votre carte de connaissances à partir des ressources Histoires "
"des arts et Wikipedia."
@@ -706,7 +706,7 @@
msgid "Gerer mes Renkan"
msgstr "Gestionar mis Renkan"
-#: templates/profile_home.html:54 templates/renkan_list.html:33
+#: templates/profile_home.html:54
msgid "Nouveau Renkan"
msgstr "Nuevo Renkan"
@@ -714,7 +714,7 @@
msgid "Edition"
msgstr "Edición"
-#: templates/profile_home.html:106 templates/renkan_list.html:83
+#: templates/profile_home.html:106 templates/renkan_list.html:86
msgid "Are you sure you want to copy this renkan ?"
msgstr "¿ Esta seguro que desea copiar este Renkan ?"
@@ -878,46 +878,64 @@
msgid "Mot de passe (Verification)"
msgstr "Contraseña (verificación)"
-#: templates/renkan_edit.html:67
+#: templates/renkan_edit.html:70
msgid "Ressources"
msgstr "Recursos"
-#: templates/renkan_edit.html:198
+#: templates/renkan_edit.html:201
msgid "Change organisation"
msgstr "Cambiar la organización"
-#: templates/renkan_edit.html:199
+#: templates/renkan_edit.html:202
msgid "(Indisponible si modification du RENKAN)"
msgstr "(Indisponible despues de modificar el RENKAN)"
-#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206
-#: templates/renkan_edit.html:210
+#: templates/renkan_edit.html:205 templates/renkan_edit.html.py:209
+#: templates/renkan_edit.html:213
msgid "View graph in column"
msgstr "Vista del gráfico en columnas"
-#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207
-#: templates/renkan_edit.html:211
+#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210
+#: templates/renkan_edit.html:214
msgid "View graph in line"
msgstr "Vista del gráfico en lineas"
-#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208
-#: templates/renkan_edit.html:212
+#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211
+#: templates/renkan_edit.html:215
msgid "View graph in circle"
msgstr "Vista del gráfico en círculo"
-#: templates/renkan_list.html:6 views/profile.py:143
+#: templates/renkan_list.html:6 templates/renkan_list.html.py:29
+#: templates/renkan_list_favorite.html:4
msgid "Marked Renkans list"
msgstr "Lista de Renkan marcados"
-#: views/profile.py:131
+#: templates/renkan_list.html:29 templates/renkan_list_favorite.html:4
#, fuzzy
msgid "Public Renkans list"
msgstr "Lista de Renkan marcados"
-#: views/profile.py:447
+#: templates/renkan_list.html:32
+msgid ""
+"\n"
+" Consultez des cartes de connaissances sur les arts et \n"
+" <button id=\"new-renkan-button\" title=\"Nouveau Renkan\" class="
+"\"renkan-inline-action\"><span id=\"new-renkan\">créez vos propres cartes</"
+"span></button>\n"
+" à partir des ressources Histoire des arts et Wikipedia.\n"
+" "
+msgstr ""
+
+#: templates/renkan_list_favorite.html:6
+msgid ""
+"Consultez et personnalisez les Renkan des repères chronologiques d'Histoire "
+"des arts."
+msgstr ""
+
+#: views/profile.py:445
msgid "Plus de Ressources"
msgstr "Mas recursos"
-#: views/profile.py:456 views/profile.py:535
+#: views/profile.py:454 views/profile.py:533
msgid "Period"
msgstr "Periodo"
Binary file src/hdalab/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/fr/LC_MESSAGES/django.po Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/locale/fr/LC_MESSAGES/django.po Fri Apr 03 02:22:15 2015 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-19 09:40-0500\n"
+"POT-Creation-Date: 2015-04-02 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,27 +33,27 @@
msgid "rejected_state"
msgstr "rejeté"
-#: settings.py:40
+#: settings.py:39
msgid "French"
msgstr "Français"
-#: settings.py:41
+#: settings.py:40
msgid "English"
msgstr "Anglais"
-#: settings.py:42
+#: settings.py:41
msgid "Italian"
msgstr "Italien"
-#: settings.py:43
+#: settings.py:42
msgid "German"
msgstr "Allemand"
-#: settings.py:44
+#: settings.py:43
msgid "Spanish"
msgstr "Espagnol"
-#: settings.py:45
+#: settings.py:44
msgid "Japanese"
msgstr "Japonais"
@@ -73,8 +73,8 @@
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:43 templates/base.html.py:75
-#: templates/base.html:97
+#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74
+#: templates/base.html:96
msgid "A Propos"
msgstr "À Propos"
@@ -118,7 +118,7 @@
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:50
+#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49
msgid "Log out"
msgstr "Déconnexion"
@@ -126,46 +126,46 @@
msgid "Accueil"
msgstr "Accueil"
-#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
msgid "Recherche"
msgstr "Recherche"
-#: templates/base.html:40 templates/base.html.py:93
+#: templates/base.html:40 templates/base.html.py:92
msgid "Domaines Artistiques"
msgstr "Domaines Artistiques"
-#: templates/base.html:41 templates/base.html.py:94
-msgid "Thésaurus"
-msgstr "Thésaurus"
-
-#: templates/base.html:52 templates/registration/activate.html:16
+#: templates/base.html:51 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:76
+#: templates/base.html:75
msgid "Crédits"
msgstr "Crédits"
-#: templates/base.html:77
+#: templates/base.html:76
msgid "Mentions légales"
msgstr "Mentions légales"
-#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/base.html:77 templates/envelope/contact.html:6
#: templates/envelope/contact.html.py:17
msgid "Contact"
msgstr "Contact"
-#: templates/base.html:91
+#: templates/base.html:90
msgid "Rubriques"
msgstr "Rubriques"
-#: templates/base.html:96
+#: templates/base.html:93
+msgid "Thésaurus"
+msgstr "Thésaurus"
+
+#: templates/base.html:95
msgid "Renkan repères"
msgstr "Renkan repères"
-#: templates/base.html:103
+#: templates/base.html:101
msgid "Liens"
msgstr "Liens"
@@ -211,54 +211,54 @@
#: 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:39
-#: templates/renkan_list.html.py:91
+#: templates/profile_home.html.py:125 templates/renkan_list.html:42
+#: templates/renkan_list.html.py:94
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:40
-#: templates/renkan_list.html.py:92
+#: templates/profile_home.html.py:126 templates/renkan_list.html:43
+#: templates/renkan_list.html.py:95
msgid "Next"
msgstr "Suivant"
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
msgid "Filter"
msgstr "Filtrer"
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
msgid "Advanced search"
msgstr "Recherche avancée"
#: 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:43
-#: templates/renkan_list.html.py:55
+#: templates/profile_home.html.py:78 templates/renkan_list.html:46
+#: templates/renkan_list.html.py:58
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:44
-#: templates/renkan_list.html.py:63
+#: templates/profile_home.html.py:82 templates/renkan_list.html:47
+#: templates/renkan_list.html.py:66
msgid "Modification date"
msgstr "Date de modification"
#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61
-#: templates/renkan_list.html:44
+#: templates/renkan_list.html:47
msgid "begin"
msgstr "début"
#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62
-#: templates/renkan_list.html:45
+#: templates/renkan_list.html:48
msgid "end"
msgstr "fin"
#: templates/editorial/manage_renkans.html:48
-#: templates/registration/login.html:25 templates/renkan_list.html:46
+#: templates/registration/login.html:25 templates/renkan_list.html:49
msgid "Username"
msgstr "Nom d'utilisateur"
@@ -281,21 +281,21 @@
msgstr "Rejeté"
#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72
-#: templates/renkan_list.html:48
+#: templates/renkan_list.html:51
msgid "Favorite"
msgstr "Favoris"
#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73
-#: templates/renkan_list.html:50
+#: templates/renkan_list.html:53
msgid "Search"
msgstr "Rechercher"
#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80
-#: templates/renkan_list.html:58
+#: templates/renkan_list.html:61
msgid "Fav."
msgstr "Fav."
-#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61
+#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64
msgid "User"
msgstr "Utilisateur"
@@ -534,8 +534,8 @@
msgstr ""
"\n"
"\t\t \t\t\t\t\tL'icone ouvre un panel de recherche permettant de "
-"rechercher des ressources du site HDA ou Wikipédia, ainsi que de retrouver des "
-"ressources supplémentaires en lien avec votre recherche.\n"
+"rechercher des ressources du site HDA ou Wikipédia, ainsi que de retrouver "
+"des ressources supplémentaires en lien avec votre recherche.\n"
"\t\t \t\t\t\t"
#: templates/help_popup.html:57
@@ -671,10 +671,10 @@
"Explorez 9 grands domaines artistiques à travers des arborescences enrichies "
"de ressources du portail Histoire des Arts."
msgstr ""
-"Explorez 18 grands domaines artistiques à travers des arborescences enrichies "
-"de ressources du portail Histoire des Arts."
+"Explorez 18 grands domaines artistiques à travers des arborescences "
+"enrichies de ressources du portail Histoire des Arts."
-#: templates/index.html:76 templates/renkan_list.html:35
+#: templates/index.html:76
msgid ""
"Construisez votre carte de connaissances à partir des ressources Histoires "
"des arts et Wikipedia."
@@ -682,7 +682,6 @@
"Consultez des cartes de connaissances sur les arts et créez vos propres "
"cartes à partir des ressources Histoire des arts et Wikipedia."
-
#: templates/index.html:91
msgid "Bienvenue sur Histoire des arts‘Lab !"
msgstr "Bienvenue sur Histoire des arts‘Lab !"
@@ -751,7 +750,7 @@
msgid "Gerer mes Renkan"
msgstr "Gérer mes Renkan"
-#: templates/profile_home.html:54 templates/renkan_list.html:33
+#: templates/profile_home.html:54
msgid "Nouveau Renkan"
msgstr "Nouveau Renkan"
@@ -759,7 +758,7 @@
msgid "Edition"
msgstr "Édition"
-#: templates/profile_home.html:106 templates/renkan_list.html:83
+#: templates/profile_home.html:106 templates/renkan_list.html:86
msgid "Are you sure you want to copy this renkan ?"
msgstr "Êtes-vous certain(e) de vouloir copier ce Renkan ?"
@@ -929,45 +928,73 @@
msgid "Mot de passe (Verification)"
msgstr "Mot de passe (vérification)"
-#: templates/renkan_edit.html:67
+#: templates/renkan_edit.html:70
msgid "Ressources"
msgstr "Ressources"
-#: templates/renkan_edit.html:198
+#: templates/renkan_edit.html:201
msgid "Change organisation"
msgstr "Changer de disposition"
-#: templates/renkan_edit.html:199
+#: templates/renkan_edit.html:202
msgid "(Indisponible si modification du RENKAN)"
msgstr "(Indisponible si le RENKAN est modifié)"
-#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206
-#: templates/renkan_edit.html:210
+#: templates/renkan_edit.html:205 templates/renkan_edit.html.py:209
+#: templates/renkan_edit.html:213
msgid "View graph in column"
msgstr "Voir le graphe en colonne"
-#: templates/renkan_edit.html:203 templates/renkan_edit.html.py:207
-#: templates/renkan_edit.html:211
+#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210
+#: templates/renkan_edit.html:214
msgid "View graph in line"
msgstr "Voir le graphe en ligne"
-#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208
-#: templates/renkan_edit.html:212
+#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211
+#: templates/renkan_edit.html:215
msgid "View graph in circle"
msgstr "Voir le graphe en cercle"
-#: templates/renkan_list.html:6 views/profile.py:143
+#: templates/renkan_list.html:6 templates/renkan_list.html.py:29
+#: templates/renkan_list_favorite.html:4
msgid "Marked Renkans list"
msgstr "Liste des Renkan repères"
-#: views/profile.py:131
+#: templates/renkan_list.html:29 templates/renkan_list_favorite.html:4
msgid "Public Renkans list"
msgstr "Liste des Renkan publics"
-#: views/profile.py:447
+#: templates/renkan_list.html:32
+msgid ""
+"\n"
+" Consultez des cartes de connaissances sur les arts et \n"
+" <button id=\"new-renkan-button\" title=\"Nouveau Renkan\" class="
+"\"renkan-inline-action\"><span id=\"new-renkan\">créez vos propres cartes</"
+"span></button>\n"
+" à partir des ressources Histoire des arts et Wikipedia.\n"
+" "
+msgstr ""
+"\n"
+" Consultez des cartes de connaissances sur les arts et \n"
+" <button id=\"new-renkan-button\" title=\"Nouveau Renkan\" class="
+"\"renkan-inline-action\"><span id=\"new-renkan\">créez vos propres cartes</"
+"span></button>\n"
+" à partir des ressources Histoire des arts et Wikipedia.\n"
+" "
+
+
+#: templates/renkan_list_favorite.html:6
+msgid ""
+"Consultez et personnalisez les Renkan des repères chronologiques d'Histoire "
+"des arts."
+msgstr ""
+"Consultez et personnalisez les Renkan des repères chronologiques d'Histoire "
+"des arts."
+
+#: views/profile.py:445
msgid "Plus de Ressources"
msgstr "Plus de Ressources"
-#: views/profile.py:456 views/profile.py:535
+#: views/profile.py:454 views/profile.py:533
msgid "Period"
msgstr "Période"
Binary file src/hdalab/locale/it/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/it/LC_MESSAGES/django.po Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/locale/it/LC_MESSAGES/django.po Fri Apr 03 02:22:15 2015 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-19 09:40-0500\n"
+"POT-Creation-Date: 2015-04-02 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,27 +33,27 @@
msgid "rejected_state"
msgstr ""
-#: settings.py:40
+#: settings.py:39
msgid "French"
msgstr "Francese"
-#: settings.py:41
+#: settings.py:40
msgid "English"
msgstr "Inglese"
-#: settings.py:42
+#: settings.py:41
msgid "Italian"
msgstr "Italiano"
-#: settings.py:43
+#: settings.py:42
msgid "German"
msgstr "Tedesco"
-#: settings.py:44
+#: settings.py:43
msgid "Spanish"
msgstr "Spagnolo"
-#: settings.py:45
+#: settings.py:44
msgid "Japanese"
msgstr "Giapponese"
@@ -73,8 +73,8 @@
msgid "Sorry, but the requested page could not be found."
msgstr ""
-#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75
-#: templates/base.html:97
+#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74
+#: templates/base.html:96
msgid "A Propos"
msgstr ""
@@ -117,7 +117,7 @@
msgid "Still not a user ? Create an account"
msgstr ""
-#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:50
+#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49
msgid "Log out"
msgstr ""
@@ -125,48 +125,48 @@
msgid "Accueil"
msgstr ""
-#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
#, fuzzy
msgid "Recherche"
msgstr "Cercare un tag"
-#: templates/base.html:40 templates/base.html.py:93
+#: templates/base.html:40 templates/base.html.py:92
#, fuzzy
msgid "Domaines Artistiques"
msgstr "Discipline artistiche"
-#: templates/base.html:41 templates/base.html.py:94
-msgid "Thésaurus"
-msgstr ""
-
-#: templates/base.html:52 templates/registration/activate.html:16
+#: templates/base.html:51 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:76
+#: templates/base.html:75
msgid "Crédits"
msgstr ""
-#: templates/base.html:77
+#: templates/base.html:76
msgid "Mentions légales"
msgstr ""
-#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/base.html:77 templates/envelope/contact.html:6
#: templates/envelope/contact.html.py:17
msgid "Contact"
msgstr ""
-#: templates/base.html:91
+#: templates/base.html:90
msgid "Rubriques"
msgstr ""
-#: templates/base.html:96
+#: templates/base.html:93
+msgid "Thésaurus"
+msgstr ""
+
+#: templates/base.html:95
msgid "Renkan repères"
msgstr ""
-#: templates/base.html:103
+#: templates/base.html:101
msgid "Liens"
msgstr ""
@@ -215,55 +215,55 @@
#: 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:39
-#: templates/renkan_list.html.py:91
+#: templates/profile_home.html.py:125 templates/renkan_list.html:42
+#: templates/renkan_list.html.py:94
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:40
-#: templates/renkan_list.html.py:92
+#: templates/profile_home.html.py:126 templates/renkan_list.html:43
+#: templates/renkan_list.html.py:95
msgid "Next"
msgstr ""
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
#, fuzzy
msgid "Filter"
msgstr "Filtri:"
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
msgid "Advanced search"
msgstr ""
#: 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:43
-#: templates/renkan_list.html.py:55
+#: templates/profile_home.html.py:78 templates/renkan_list.html:46
+#: templates/renkan_list.html.py:58
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:44
-#: templates/renkan_list.html.py:63
+#: templates/profile_home.html.py:82 templates/renkan_list.html:47
+#: templates/renkan_list.html.py:66
msgid "Modification date"
msgstr ""
#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61
-#: templates/renkan_list.html:44
+#: templates/renkan_list.html:47
msgid "begin"
msgstr ""
#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62
-#: templates/renkan_list.html:45
+#: templates/renkan_list.html:48
msgid "end"
msgstr ""
#: templates/editorial/manage_renkans.html:48
-#: templates/registration/login.html:25 templates/renkan_list.html:46
+#: templates/registration/login.html:25 templates/renkan_list.html:49
msgid "Username"
msgstr ""
@@ -286,21 +286,21 @@
msgstr ""
#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72
-#: templates/renkan_list.html:48
+#: templates/renkan_list.html:51
msgid "Favorite"
msgstr ""
#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73
-#: templates/renkan_list.html:50
+#: templates/renkan_list.html:53
msgid "Search"
msgstr ""
#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80
-#: templates/renkan_list.html:58
+#: templates/renkan_list.html:61
msgid "Fav."
msgstr ""
-#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61
+#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64
msgid "User"
msgstr ""
@@ -618,7 +618,7 @@
"de ressources du portail Histoire des Arts."
msgstr ""
-#: templates/index.html:76 templates/renkan_list.html:35
+#: templates/index.html:76
msgid ""
"Construisez votre carte de connaissances à partir des ressources Histoires "
"des arts et Wikipedia."
@@ -690,7 +690,7 @@
msgid "Gerer mes Renkan"
msgstr ""
-#: templates/profile_home.html:54 templates/renkan_list.html:33
+#: templates/profile_home.html:54
msgid "Nouveau Renkan"
msgstr ""
@@ -698,7 +698,7 @@
msgid "Edition"
msgstr ""
-#: templates/profile_home.html:106 templates/renkan_list.html:83
+#: templates/profile_home.html:106 templates/renkan_list.html:86
msgid "Are you sure you want to copy this renkan ?"
msgstr ""
@@ -861,46 +861,64 @@
msgid "Mot de passe (Verification)"
msgstr ""
-#: templates/renkan_edit.html:67
+#: templates/renkan_edit.html:70
msgid "Ressources"
msgstr ""
-#: templates/renkan_edit.html:198
+#: templates/renkan_edit.html:201
msgid "Change organisation"
msgstr ""
-#: templates/renkan_edit.html:199
+#: templates/renkan_edit.html:202
msgid "(Indisponible si modification du RENKAN)"
msgstr ""
-#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206
-#: templates/renkan_edit.html:210
+#: 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:203 templates/renkan_edit.html.py:207
-#: templates/renkan_edit.html:211
+#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210
+#: templates/renkan_edit.html:214
msgid "View graph in line"
msgstr ""
-#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208
-#: templates/renkan_edit.html:212
+#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211
+#: templates/renkan_edit.html:215
msgid "View graph in circle"
msgstr ""
-#: templates/renkan_list.html:6 views/profile.py:143
+#: templates/renkan_list.html:6 templates/renkan_list.html.py:29
+#: templates/renkan_list_favorite.html:4
msgid "Marked Renkans list"
msgstr ""
-#: views/profile.py:131
+#: templates/renkan_list.html:29 templates/renkan_list_favorite.html:4
msgid "Public Renkans list"
msgstr ""
-#: views/profile.py:447
+#: templates/renkan_list.html:32
+msgid ""
+"\n"
+" Consultez des cartes de connaissances sur les arts et \n"
+" <button id=\"new-renkan-button\" title=\"Nouveau Renkan\" class="
+"\"renkan-inline-action\"><span id=\"new-renkan\">créez vos propres cartes</"
+"span></button>\n"
+" à partir des ressources Histoire des arts et Wikipedia.\n"
+" "
+msgstr ""
+
+#: templates/renkan_list_favorite.html:6
+msgid ""
+"Consultez et personnalisez les Renkan des repères chronologiques d'Histoire "
+"des arts."
+msgstr ""
+
+#: views/profile.py:445
msgid "Plus de Ressources"
msgstr ""
-#: views/profile.py:456 views/profile.py:535
+#: views/profile.py:454 views/profile.py:533
msgid "Period"
msgstr ""
Binary file src/hdalab/locale/ja/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/ja/LC_MESSAGES/django.po Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/locale/ja/LC_MESSAGES/django.po Fri Apr 03 02:22:15 2015 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-19 09:40-0500\n"
+"POT-Creation-Date: 2015-04-02 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -34,27 +34,27 @@
msgid "rejected_state"
msgstr ""
-#: settings.py:40
+#: settings.py:39
msgid "French"
msgstr "フランス語"
-#: settings.py:41
+#: settings.py:40
msgid "English"
msgstr "英語"
-#: settings.py:42
+#: settings.py:41
msgid "Italian"
msgstr "イタリア語"
-#: settings.py:43
+#: settings.py:42
msgid "German"
msgstr "ドイツ語"
-#: settings.py:44
+#: settings.py:43
msgid "Spanish"
msgstr "スペイン語"
-#: settings.py:45
+#: settings.py:44
msgid "Japanese"
msgstr "日本語"
@@ -74,8 +74,8 @@
msgid "Sorry, but the requested page could not be found."
msgstr ""
-#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75
-#: templates/base.html:97
+#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74
+#: templates/base.html:96
msgid "A Propos"
msgstr ""
@@ -118,7 +118,7 @@
msgid "Still not a user ? Create an account"
msgstr ""
-#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:50
+#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49
msgid "Log out"
msgstr ""
@@ -126,48 +126,48 @@
msgid "Accueil"
msgstr ""
-#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
#, fuzzy
msgid "Recherche"
msgstr "タグを検索する"
-#: templates/base.html:40 templates/base.html.py:93
+#: templates/base.html:40 templates/base.html.py:92
#, fuzzy
msgid "Domaines Artistiques"
msgstr "学術・芸術分野"
-#: templates/base.html:41 templates/base.html.py:94
-msgid "Thésaurus"
-msgstr ""
-
-#: templates/base.html:52 templates/registration/activate.html:16
+#: templates/base.html:51 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:76
+#: templates/base.html:75
msgid "Crédits"
msgstr ""
-#: templates/base.html:77
+#: templates/base.html:76
msgid "Mentions légales"
msgstr ""
-#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/base.html:77 templates/envelope/contact.html:6
#: templates/envelope/contact.html.py:17
msgid "Contact"
msgstr ""
-#: templates/base.html:91
+#: templates/base.html:90
msgid "Rubriques"
msgstr ""
-#: templates/base.html:96
+#: templates/base.html:93
+msgid "Thésaurus"
+msgstr ""
+
+#: templates/base.html:95
msgid "Renkan repères"
msgstr ""
-#: templates/base.html:103
+#: templates/base.html:101
msgid "Liens"
msgstr ""
@@ -216,55 +216,55 @@
#: 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:39
-#: templates/renkan_list.html.py:91
+#: templates/profile_home.html.py:125 templates/renkan_list.html:42
+#: templates/renkan_list.html.py:94
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:40
-#: templates/renkan_list.html.py:92
+#: templates/profile_home.html.py:126 templates/renkan_list.html:43
+#: templates/renkan_list.html.py:95
msgid "Next"
msgstr ""
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
#, fuzzy
msgid "Filter"
msgstr "フィルター"
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
msgid "Advanced search"
msgstr ""
#: 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:43
-#: templates/renkan_list.html.py:55
+#: templates/profile_home.html.py:78 templates/renkan_list.html:46
+#: templates/renkan_list.html.py:58
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:44
-#: templates/renkan_list.html.py:63
+#: templates/profile_home.html.py:82 templates/renkan_list.html:47
+#: templates/renkan_list.html.py:66
msgid "Modification date"
msgstr ""
#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61
-#: templates/renkan_list.html:44
+#: templates/renkan_list.html:47
msgid "begin"
msgstr ""
#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62
-#: templates/renkan_list.html:45
+#: templates/renkan_list.html:48
msgid "end"
msgstr ""
#: templates/editorial/manage_renkans.html:48
-#: templates/registration/login.html:25 templates/renkan_list.html:46
+#: templates/registration/login.html:25 templates/renkan_list.html:49
msgid "Username"
msgstr ""
@@ -287,21 +287,21 @@
msgstr ""
#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72
-#: templates/renkan_list.html:48
+#: templates/renkan_list.html:51
msgid "Favorite"
msgstr ""
#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73
-#: templates/renkan_list.html:50
+#: templates/renkan_list.html:53
msgid "Search"
msgstr ""
#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80
-#: templates/renkan_list.html:58
+#: templates/renkan_list.html:61
msgid "Fav."
msgstr ""
-#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61
+#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64
msgid "User"
msgstr ""
@@ -619,7 +619,7 @@
"de ressources du portail Histoire des Arts."
msgstr ""
-#: templates/index.html:76 templates/renkan_list.html:35
+#: templates/index.html:76
msgid ""
"Construisez votre carte de connaissances à partir des ressources Histoires "
"des arts et Wikipedia."
@@ -691,7 +691,7 @@
msgid "Gerer mes Renkan"
msgstr ""
-#: templates/profile_home.html:54 templates/renkan_list.html:33
+#: templates/profile_home.html:54
msgid "Nouveau Renkan"
msgstr ""
@@ -699,7 +699,7 @@
msgid "Edition"
msgstr ""
-#: templates/profile_home.html:106 templates/renkan_list.html:83
+#: templates/profile_home.html:106 templates/renkan_list.html:86
msgid "Are you sure you want to copy this renkan ?"
msgstr ""
@@ -862,46 +862,64 @@
msgid "Mot de passe (Verification)"
msgstr ""
-#: templates/renkan_edit.html:67
+#: templates/renkan_edit.html:70
msgid "Ressources"
msgstr ""
-#: templates/renkan_edit.html:198
+#: templates/renkan_edit.html:201
msgid "Change organisation"
msgstr ""
-#: templates/renkan_edit.html:199
+#: templates/renkan_edit.html:202
msgid "(Indisponible si modification du RENKAN)"
msgstr ""
-#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206
-#: templates/renkan_edit.html:210
+#: 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:203 templates/renkan_edit.html.py:207
-#: templates/renkan_edit.html:211
+#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210
+#: templates/renkan_edit.html:214
msgid "View graph in line"
msgstr ""
-#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208
-#: templates/renkan_edit.html:212
+#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211
+#: templates/renkan_edit.html:215
msgid "View graph in circle"
msgstr ""
-#: templates/renkan_list.html:6 views/profile.py:143
+#: templates/renkan_list.html:6 templates/renkan_list.html.py:29
+#: templates/renkan_list_favorite.html:4
msgid "Marked Renkans list"
msgstr ""
-#: views/profile.py:131
+#: templates/renkan_list.html:29 templates/renkan_list_favorite.html:4
msgid "Public Renkans list"
msgstr ""
-#: views/profile.py:447
+#: templates/renkan_list.html:32
+msgid ""
+"\n"
+" Consultez des cartes de connaissances sur les arts et \n"
+" <button id=\"new-renkan-button\" title=\"Nouveau Renkan\" class="
+"\"renkan-inline-action\"><span id=\"new-renkan\">créez vos propres cartes</"
+"span></button>\n"
+" à partir des ressources Histoire des arts et Wikipedia.\n"
+" "
+msgstr ""
+
+#: templates/renkan_list_favorite.html:6
+msgid ""
+"Consultez et personnalisez les Renkan des repères chronologiques d'Histoire "
+"des arts."
+msgstr ""
+
+#: views/profile.py:445
msgid "Plus de Ressources"
msgstr ""
-#: views/profile.py:456 views/profile.py:535
+#: views/profile.py:454 views/profile.py:533
msgid "Period"
msgstr ""
Binary file src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo has changed
--- a/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po Fri Apr 03 02:22:15 2015 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-19 09:40-0500\n"
+"POT-Creation-Date: 2015-04-02 17:42-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,27 +34,27 @@
msgid "rejected_state"
msgstr ""
-#: settings.py:40
+#: settings.py:39
msgid "French"
msgstr "Français"
-#: settings.py:41
+#: settings.py:40
msgid "English"
msgstr "Anglais"
-#: settings.py:42
+#: settings.py:41
msgid "Italian"
msgstr ""
-#: settings.py:43
+#: settings.py:42
msgid "German"
msgstr "Allemand"
-#: settings.py:44
+#: settings.py:43
msgid "Spanish"
msgstr "Espagnol"
-#: settings.py:45
+#: settings.py:44
msgid "Japanese"
msgstr ""
@@ -74,8 +74,8 @@
msgid "Sorry, but the requested page could not be found."
msgstr ""
-#: templates/a_propos.html:5 templates/base.html:43 templates/base.html.py:75
-#: templates/base.html:97
+#: templates/a_propos.html:5 templates/base.html:42 templates/base.html.py:74
+#: templates/base.html:96
msgid "A Propos"
msgstr ""
@@ -118,7 +118,7 @@
msgid "Still not a user ? Create an account"
msgstr ""
-#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:50
+#: templates/ajax_identification/ajax_login_ok.html:4 templates/base.html:49
msgid "Log out"
msgstr ""
@@ -126,48 +126,48 @@
msgid "Accueil"
msgstr ""
-#: templates/base.html:39 templates/base.html.py:92 templates/index.html:44
+#: templates/base.html:39 templates/base.html.py:91 templates/index.html:44
#, fuzzy
msgid "Recherche"
msgstr "Rechercher un tag"
-#: templates/base.html:40 templates/base.html.py:93
+#: templates/base.html:40 templates/base.html.py:92
#, fuzzy
msgid "Domaines Artistiques"
msgstr "Disciplines artistiques"
-#: templates/base.html:41 templates/base.html.py:94
-msgid "Thésaurus"
-msgstr ""
-
-#: templates/base.html:52 templates/registration/activate.html:16
+#: templates/base.html:51 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:76
+#: templates/base.html:75
msgid "Crédits"
msgstr ""
-#: templates/base.html:77
+#: templates/base.html:76
msgid "Mentions légales"
msgstr ""
-#: templates/base.html:78 templates/envelope/contact.html:6
+#: templates/base.html:77 templates/envelope/contact.html:6
#: templates/envelope/contact.html.py:17
msgid "Contact"
msgstr ""
-#: templates/base.html:91
+#: templates/base.html:90
msgid "Rubriques"
msgstr ""
-#: templates/base.html:96
+#: templates/base.html:93
+msgid "Thésaurus"
+msgstr ""
+
+#: templates/base.html:95
msgid "Renkan repères"
msgstr ""
-#: templates/base.html:103
+#: templates/base.html:101
msgid "Liens"
msgstr ""
@@ -216,55 +216,55 @@
#: 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:39
-#: templates/renkan_list.html.py:91
+#: templates/profile_home.html.py:125 templates/renkan_list.html:42
+#: templates/renkan_list.html.py:94
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:40
-#: templates/renkan_list.html.py:92
+#: templates/profile_home.html.py:126 templates/renkan_list.html:43
+#: templates/renkan_list.html.py:95
msgid "Next"
msgstr ""
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
#, fuzzy
msgid "Filter"
msgstr "Filtres :"
#: templates/editorial/manage_renkans.html:43 templates/profile_home.html:58
-#: templates/renkan_list.html:41
+#: templates/renkan_list.html:44
msgid "Advanced search"
msgstr ""
#: 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:43
-#: templates/renkan_list.html.py:55
+#: templates/profile_home.html.py:78 templates/renkan_list.html:46
+#: templates/renkan_list.html.py:58
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:44
-#: templates/renkan_list.html.py:63
+#: templates/profile_home.html.py:82 templates/renkan_list.html:47
+#: templates/renkan_list.html.py:66
msgid "Modification date"
msgstr ""
#: templates/editorial/manage_renkans.html:46 templates/profile_home.html:61
-#: templates/renkan_list.html:44
+#: templates/renkan_list.html:47
msgid "begin"
msgstr ""
#: templates/editorial/manage_renkans.html:47 templates/profile_home.html:62
-#: templates/renkan_list.html:45
+#: templates/renkan_list.html:48
msgid "end"
msgstr ""
#: templates/editorial/manage_renkans.html:48
-#: templates/registration/login.html:25 templates/renkan_list.html:46
+#: templates/registration/login.html:25 templates/renkan_list.html:49
msgid "Username"
msgstr ""
@@ -287,21 +287,21 @@
msgstr ""
#: templates/editorial/manage_renkans.html:57 templates/profile_home.html:72
-#: templates/renkan_list.html:48
+#: templates/renkan_list.html:51
msgid "Favorite"
msgstr ""
#: templates/editorial/manage_renkans.html:58 templates/profile_home.html:73
-#: templates/renkan_list.html:50
+#: templates/renkan_list.html:53
msgid "Search"
msgstr ""
#: templates/editorial/manage_renkans.html:65 templates/profile_home.html:80
-#: templates/renkan_list.html:58
+#: templates/renkan_list.html:61
msgid "Fav."
msgstr ""
-#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:61
+#: templates/editorial/manage_renkans.html:67 templates/renkan_list.html:64
msgid "User"
msgstr ""
@@ -619,7 +619,7 @@
"de ressources du portail Histoire des Arts."
msgstr ""
-#: templates/index.html:76 templates/renkan_list.html:35
+#: templates/index.html:76
msgid ""
"Construisez votre carte de connaissances à partir des ressources Histoires "
"des arts et Wikipedia."
@@ -691,7 +691,7 @@
msgid "Gerer mes Renkan"
msgstr ""
-#: templates/profile_home.html:54 templates/renkan_list.html:33
+#: templates/profile_home.html:54
msgid "Nouveau Renkan"
msgstr ""
@@ -699,7 +699,7 @@
msgid "Edition"
msgstr ""
-#: templates/profile_home.html:106 templates/renkan_list.html:83
+#: templates/profile_home.html:106 templates/renkan_list.html:86
msgid "Are you sure you want to copy this renkan ?"
msgstr ""
@@ -862,46 +862,64 @@
msgid "Mot de passe (Verification)"
msgstr ""
-#: templates/renkan_edit.html:67
+#: templates/renkan_edit.html:70
msgid "Ressources"
msgstr ""
-#: templates/renkan_edit.html:198
+#: templates/renkan_edit.html:201
msgid "Change organisation"
msgstr ""
-#: templates/renkan_edit.html:199
+#: templates/renkan_edit.html:202
msgid "(Indisponible si modification du RENKAN)"
msgstr ""
-#: templates/renkan_edit.html:202 templates/renkan_edit.html.py:206
-#: templates/renkan_edit.html:210
+#: 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:203 templates/renkan_edit.html.py:207
-#: templates/renkan_edit.html:211
+#: templates/renkan_edit.html:206 templates/renkan_edit.html.py:210
+#: templates/renkan_edit.html:214
msgid "View graph in line"
msgstr ""
-#: templates/renkan_edit.html:204 templates/renkan_edit.html.py:208
-#: templates/renkan_edit.html:212
+#: templates/renkan_edit.html:207 templates/renkan_edit.html.py:211
+#: templates/renkan_edit.html:215
msgid "View graph in circle"
msgstr ""
-#: templates/renkan_list.html:6 views/profile.py:143
+#: templates/renkan_list.html:6 templates/renkan_list.html.py:29
+#: templates/renkan_list_favorite.html:4
msgid "Marked Renkans list"
msgstr ""
-#: views/profile.py:131
+#: templates/renkan_list.html:29 templates/renkan_list_favorite.html:4
msgid "Public Renkans list"
msgstr ""
-#: views/profile.py:447
+#: templates/renkan_list.html:32
+msgid ""
+"\n"
+" Consultez des cartes de connaissances sur les arts et \n"
+" <button id=\"new-renkan-button\" title=\"Nouveau Renkan\" class="
+"\"renkan-inline-action\"><span id=\"new-renkan\">créez vos propres cartes</"
+"span></button>\n"
+" à partir des ressources Histoire des arts et Wikipedia.\n"
+" "
+msgstr ""
+
+#: templates/renkan_list_favorite.html:6
+msgid ""
+"Consultez et personnalisez les Renkan des repères chronologiques d'Histoire "
+"des arts."
+msgstr ""
+
+#: views/profile.py:445
msgid "Plus de Ressources"
msgstr ""
-#: views/profile.py:456 views/profile.py:535
+#: views/profile.py:454 views/profile.py:533
msgid "Period"
msgstr ""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/migrations/0002_alter_tagyears_tag_one2one.py Fri Apr 03 02:22:15 2015 +0200
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('hdalab', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='tagyears',
+ name='tag',
+ field=models.OneToOneField(related_name='years', to='hdabo.Tag'),
+ ),
+ ]
--- a/src/hdalab/models/dataviz.py Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/models/dataviz.py Fri Apr 03 02:22:15 2015 +0200
@@ -12,7 +12,7 @@
class TagYears(models.Model):
- tag = models.ForeignKey(Tag, related_name="years", blank=False, null=False, db_index=True, unique=True)
+ tag = models.OneToOneField(Tag, related_name="years", blank=False, null=False, db_index=True)
start_year = models.IntegerField(blank=False, null=False, db_index=True)
end_year = models.IntegerField(blank=False, null=False, db_index=True)
--- a/src/hdalab/settings.py Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/settings.py Fri Apr 03 02:22:15 2015 +0200
@@ -134,6 +134,8 @@
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
+ 'django.middleware.security.SecurityMiddleware',
+ 'django.middleware.clickjacking.XFrameOptionsMiddleware'
)
@@ -195,6 +197,12 @@
HONEYPOT_FIELD_NAME='phone'
ENVELOPE_SUBJECT_INTRO='[hdalab contact]'
+X_FRAME_OPTIONS='DENY'
+SESSION_COOKIE_SECURE=False
+SECURE_CONTENT_TYPE_NOSNIFF=True
+SECURE_BROWSER_XSS_FILTER=True
+CSRF_COOKIE_SECURE=False
+
from hdalab.config import * #@UnusedWildImport
if 'LOGIN_REDIRECT_URL' not in locals():
--- a/src/hdalab/static/hdalab/css/profile.css Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/static/hdalab/css/profile.css Fri Apr 03 02:22:15 2015 +0200
@@ -31,22 +31,40 @@
}
.renkan-basic-action {
+ display: inline;
+}
+
+button.renkan-inline-action {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ background: transparent;
+ font-family: inherit;
+ cursor: pointer;
+}
+button.renkan-inline-action::-moz-focus-inner {
+ padding: 0;
+ border: 0;
+}
+
+
+.renkan-basic-action {
float: left;
margin-right: 5px;
}
button.renkan-basic-action {
- margin : 0;
- padding : 0;
- border : 0;
- background : transparent;
- font-family : inherit;
- cursor : pointer;
+ margin: 0;
+ padding: 0;
+ border: 0;
+ background: transparent;
+ font-family: inherit;
+ cursor: pointer;
}
-button.renkan-basic-action::-moz-focus-inner{
- padding : 0;
- border : 0;
+button.renkan-basic-action::-moz-focus-inner {
+ padding: 0;
+ border: 0;
}
.ui-icon-eye {
@@ -111,27 +129,30 @@
#new-renkan-button:hover {
color: #28292D;
}
+
#content {
min-height: 274px;
}
-#new_renkan #new-renkan-button{
- float: right;
- margin: 2px 10px 0px;
+#new_renkan #new-renkan-button {
+ font-size: inherit;
+ margin: 0px;
}
-.publish-renkan, .unpublish-renkan{
- display: inline-block;
- height: 10px;
- width: 10px;
- margin-top:4px;
- margin-left:1px;
+.publish-renkan, .unpublish-renkan {
+ display: inline-block;
+ height: 10px;
+ width: 10px;
+ margin-top: 4px;
+ margin-left: 1px;
}
-.publish-renkan{
- background: url(../img/check.png) no-repeat;
- background-size: 10px
+
+.publish-renkan {
+ background: url(../img/check.png) no-repeat;
+ background-size: 10px
}
-.unpublish-renkan{
- background: url(../img/uncheck.png) no-repeat;
- background-size: 10px
+
+.unpublish-renkan {
+ background: url(../img/uncheck.png) no-repeat;
+ background-size: 10px
}
\ No newline at end of file
--- a/src/hdalab/templates/renkan_list.html Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/templates/renkan_list.html Fri Apr 03 02:22:15 2015 +0200
@@ -26,14 +26,17 @@
{% block main_content %}
<div class="all-title">
- {% block main_content_title %}<h1>{% trans 'Public Renkans list' %}</h1> <h2><a href="{% url 'renkan_favorite_list' %}">{% trans 'Marked Renkans list' %}</a></h2>{% endblock %}
- <div id="new_renkan">
- <form action="{% url 'renkan_new' %}" method="post">
- {% csrf_token %}
- <button id="new-renkan-button" title="{% trans 'Nouveau Renkan' %}" class="renkan-basic-action"><div id="new-renkan">{% trans 'Nouveau Renkan' %}</div></button>
- </form>
- <p>{% blocktrans %}Construisez votre carte de connaissances à partir des ressources Histoires des arts et Wikipedia.{% endblocktrans %}</p>
- </div>
+ {% block main_content_title %}<h1>{% trans 'Public Renkans list' %}</h1> <h2><a href="{% url 'renkan_favorite_list' %}">{% trans 'Marked Renkans list' %}</a></h2>{% endblock %}
+ <div id="new_renkan">{% block new_renkan %}
+ <form action="{% url 'renkan_new' %}" method="post">{% csrf_token %}
+ <p>{% blocktrans %}
+ Consultez des cartes de connaissances sur les arts et
+ <button id="new-renkan-button" title="Nouveau Renkan" class="renkan-inline-action"><span id="new-renkan">créez vos propres cartes</span></button>
+ à partir des ressources Histoire des arts et Wikipedia.
+ {% endblocktrans %}
+ </p>
+ </form>
+ {% endblock %}</div>
</div>
<p class="inline">{% if page.has_previous %}<a href="?page={{ page.previous_page_number }}&sort={{ sort_param }}&order={{ order_param }}{{ filters }}" >{% trans 'Previous' %}</a>{% endif %}
--- a/src/hdalab/templates/renkan_list_favorite.html Thu Apr 02 22:52:54 2015 +0200
+++ b/src/hdalab/templates/renkan_list_favorite.html Fri Apr 03 02:22:15 2015 +0200
@@ -1,4 +1,7 @@
{% extends "renkan_list.html" %}
{% load i18n %}
-{% block main_content_title %}<h1>{% trans 'Marked Renkans list' %}</h1> <h2><a href="{% url 'renkan_public_list' %}">{% trans 'Public Renkans list' %}</a></h2>{% endblock %}
\ No newline at end of file
+{% block main_content_title %}<h1>{% trans 'Marked Renkans list' %}</h1> <h2><a href="{% url 'renkan_public_list' %}">{% trans 'Public Renkans list' %}</a></h2>{% endblock %}
+{% block new_renkan %}<p>
+{% blocktrans %}Consultez et personnalisez les Renkan des repères chronologiques d'Histoire des arts.{% endblocktrans %}
+</p>{% endblock %}
\ No newline at end of file
--- a/src/manage.py Thu Apr 02 22:52:54 2015 +0200
+++ b/src/manage.py Fri Apr 03 02:22:15 2015 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python -W ignore
import os
import sys