# HG changeset patch # User cavaliet # Date 1360152927 -3600 # Node ID daaafc916dc4c55cd584c5f90ae913f429190e21 # Parent a7ace38e92a40c8bc5b8d47ca6ca27725d83dfb2 Debug in templates. All fragments page added. Language files updated. diff -r a7ace38e92a4 -r daaafc916dc4 src/egonomy/locale/en/LC_MESSAGES/django.mo Binary file src/egonomy/locale/en/LC_MESSAGES/django.mo has changed diff -r a7ace38e92a4 -r daaafc916dc4 src/egonomy/locale/en/LC_MESSAGES/django.po --- a/src/egonomy/locale/en/LC_MESSAGES/django.po Tue Feb 05 19:19:55 2013 +0100 +++ b/src/egonomy/locale/en/LC_MESSAGES/django.po Wed Feb 06 13:15:27 2013 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-05 10:34-0600\n" +"POT-Creation-Date: 2013-02-06 06:09-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,18 +25,24 @@ msgid "English" msgstr "" +#: templates/egonomy_all_fragments.html:7 +#: templates/egonomy_all_fragments.html:12 templates/egonomy_home.html:59 +msgid "All fragments" +msgstr "" + +#: templates/egonomy_all_fragments.html:40 +#: templates/egonomy_all_pictures.html:40 +#: templates/egonomy_annotate_picture.html:98 +#: templates/egonomy_create_fragment.html:99 templates/egonomy_home.html:50 +#: templates/egonomy_home.html.py:92 templates/egonomy_view_fragment.html:89 +msgid "Annotated by" +msgstr "" + #: templates/egonomy_all_pictures.html:7 #: templates/egonomy_all_pictures.html:12 templates/egonomy_home.html:23 msgid "All pictures" msgstr "" -#: templates/egonomy_all_pictures.html:40 -#: templates/egonomy_annotate_picture.html:102 -#: templates/egonomy_create_fragment.html:103 templates/egonomy_home.html:50 -#: templates/egonomy_home.html.py:91 templates/egonomy_view_fragment.html:89 -msgid "Annotated by" -msgstr "" - #: templates/egonomy_annotate_picture.html:6 msgid "Annotate a picture" msgstr "" @@ -65,38 +71,31 @@ msgid "RMN keywords" msgstr "" -#: templates/egonomy_annotate_picture.html:50 -#: templates/egonomy_create_fragment.html:51 -#: templates/egonomy_view_fragment.html:37 -msgid "Users keywords" -msgstr "" - -#: templates/egonomy_annotate_picture.html:55 +#: templates/egonomy_annotate_picture.html:51 #: templates/egonomy_view_fragment.html:42 msgid "Save keywords" msgstr "" -#: templates/egonomy_annotate_picture.html:58 -#: templates/egonomy_create_fragment.html:59 -#: templates/egonomy_view_fragment.html:45 -msgid "Last modification" +#: templates/egonomy_annotate_picture.html:54 +msgid "Last fragment created" msgstr "" -#: templates/egonomy_annotate_picture.html:64 +#: templates/egonomy_annotate_picture.html:55 templates/egonomy_base.html:22 +#: templates/egonomy_view_fragment.html:46 +msgid "by" +msgstr "" + +#: templates/egonomy_annotate_picture.html:60 #: templates/egonomy_view_fragment.html:51 msgid "Create a fragment" msgstr "" -#: templates/egonomy_annotate_picture.html:70 -#: templates/egonomy_create_fragment.html:71 +#: templates/egonomy_annotate_picture.html:66 +#: templates/egonomy_create_fragment.html:67 #: templates/egonomy_view_fragment.html:57 msgid "Fragments from this picture" msgstr "" -#: templates/egonomy_base.html:22 -msgid "by" -msgstr "" - #: templates/egonomy_base.html:24 msgid "Search" msgstr "" @@ -140,7 +139,17 @@ msgid "Fragment's description" msgstr "" -#: templates/egonomy_create_fragment.html:64 +#: templates/egonomy_create_fragment.html:51 +#: templates/egonomy_view_fragment.html:37 +msgid "Users keywords" +msgstr "" + +#: templates/egonomy_create_fragment.html:55 +#: templates/egonomy_view_fragment.html:45 +msgid "Last modification" +msgstr "" + +#: templates/egonomy_create_fragment.html:60 msgid "Save the fragment" msgstr "" @@ -172,7 +181,7 @@ msgid "Last created fragments" msgstr "" -#: templates/egonomy_home.html:90 +#: templates/egonomy_home.html:91 msgid "Fragment from" msgstr "" diff -r a7ace38e92a4 -r daaafc916dc4 src/egonomy/locale/fr/LC_MESSAGES/django.mo Binary file src/egonomy/locale/fr/LC_MESSAGES/django.mo has changed diff -r a7ace38e92a4 -r daaafc916dc4 src/egonomy/locale/fr/LC_MESSAGES/django.po --- a/src/egonomy/locale/fr/LC_MESSAGES/django.po Tue Feb 05 19:19:55 2013 +0100 +++ b/src/egonomy/locale/fr/LC_MESSAGES/django.po Wed Feb 06 13:15:27 2013 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-05 10:34-0600\n" +"POT-Creation-Date: 2013-02-06 06:09-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,21 +26,28 @@ msgid "English" msgstr "Anglais" +#: templates/egonomy_all_fragments.html:7 +#: templates/egonomy_all_fragments.html:12 +#: templates/egonomy_home.html:59 +msgid "All fragments" +msgstr "Tous les fragments" + +#: templates/egonomy_all_fragments.html:40 +#: templates/egonomy_all_pictures.html:40 +#: templates/egonomy_annotate_picture.html:98 +#: templates/egonomy_create_fragment.html:99 +#: templates/egonomy_home.html:50 +#: templates/egonomy_home.html.py:92 +#: templates/egonomy_view_fragment.html:89 +msgid "Annotated by" +msgstr "Annoté par" + #: templates/egonomy_all_pictures.html:7 #: templates/egonomy_all_pictures.html:12 #: templates/egonomy_home.html:23 msgid "All pictures" msgstr "Toutes les images" -#: templates/egonomy_all_pictures.html:40 -#: templates/egonomy_annotate_picture.html:102 -#: templates/egonomy_create_fragment.html:103 -#: templates/egonomy_home.html:50 -#: templates/egonomy_home.html.py:91 -#: templates/egonomy_view_fragment.html:89 -msgid "Annotated by" -msgstr "Annoté par" - #: templates/egonomy_annotate_picture.html:6 msgid "Annotate a picture" msgstr "Annoter une image" @@ -69,38 +76,32 @@ msgid "RMN keywords" msgstr "Mots-clés RMN" -#: templates/egonomy_annotate_picture.html:50 -#: templates/egonomy_create_fragment.html:51 -#: templates/egonomy_view_fragment.html:37 -msgid "Users keywords" -msgstr "Mots-clés Utilisateurs" - -#: templates/egonomy_annotate_picture.html:55 +#: templates/egonomy_annotate_picture.html:51 #: templates/egonomy_view_fragment.html:42 msgid "Save keywords" msgstr "Enregistrer les mots-clés" -#: templates/egonomy_annotate_picture.html:58 -#: templates/egonomy_create_fragment.html:59 -#: templates/egonomy_view_fragment.html:45 -msgid "Last modification" -msgstr "Dernière modification" +#: templates/egonomy_annotate_picture.html:54 +msgid "Last fragment created" +msgstr "Dernier fragment créé" -#: templates/egonomy_annotate_picture.html:64 +#: templates/egonomy_annotate_picture.html:55 +#: templates/egonomy_base.html:22 +#: templates/egonomy_view_fragment.html:46 +msgid "by" +msgstr "par" + +#: templates/egonomy_annotate_picture.html:60 #: templates/egonomy_view_fragment.html:51 msgid "Create a fragment" msgstr "Créer un fragment" -#: templates/egonomy_annotate_picture.html:70 -#: templates/egonomy_create_fragment.html:71 +#: templates/egonomy_annotate_picture.html:66 +#: templates/egonomy_create_fragment.html:67 #: templates/egonomy_view_fragment.html:57 msgid "Fragments from this picture" msgstr "Fragments de cette image" -#: templates/egonomy_base.html:22 -msgid "by" -msgstr "par" - #: templates/egonomy_base.html:24 msgid "Search" msgstr "Rechercher" @@ -144,7 +145,17 @@ msgid "Fragment's description" msgstr "Description du fragment" -#: templates/egonomy_create_fragment.html:64 +#: templates/egonomy_create_fragment.html:51 +#: templates/egonomy_view_fragment.html:37 +msgid "Users keywords" +msgstr "Mots-clés Utilisateurs" + +#: templates/egonomy_create_fragment.html:55 +#: templates/egonomy_view_fragment.html:45 +msgid "Last modification" +msgstr "Dernière modification" + +#: templates/egonomy_create_fragment.html:60 msgid "Save the fragment" msgstr "Enregistrer le fragment" @@ -176,7 +187,7 @@ msgid "Last created fragments" msgstr "Derniers fragments créés" -#: templates/egonomy_home.html:90 +#: templates/egonomy_home.html:91 msgid "Fragment from" msgstr "Fragment de" diff -r a7ace38e92a4 -r daaafc916dc4 src/egonomy/templates/egonomy_all_fragments.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/egonomy_all_fragments.html Wed Feb 06 13:15:27 2013 +0100 @@ -0,0 +1,53 @@ +{% extends "egonomy_base.html" %} +{% load static %} +{% load i18n %} +{% load thumbnail %} +{% load navigation %} + +{% block title %}{% trans "All fragments" %}{% endblock %} + +{% block content %} +
+
+

{% trans "All fragments" %}

+ {% if nb_pages %}

{% build_pagination nb_pages cur_page_nb "all_fragments" "contents_page clickable" %}

{% endif %} + + {% if nb_pages %}

{% build_pagination nb_pages cur_page_nb "all_fragments" "contents_page clickable" %}

{% endif %} +
+
+{% endblock %} + diff -r a7ace38e92a4 -r daaafc916dc4 src/egonomy/templates/egonomy_all_pictures.html --- a/src/egonomy/templates/egonomy_all_pictures.html Tue Feb 05 19:19:55 2013 +0100 +++ b/src/egonomy/templates/egonomy_all_pictures.html Wed Feb 06 13:15:27 2013 +0100 @@ -10,7 +10,7 @@

{% trans "All pictures" %}

- {% if nb_pages %}

{% build_pagination nb_pages page "contents_page clickable" %}

{% endif %} + {% if nb_pages %}

{% build_pagination nb_pages cur_page_nb "all_pictures" "contents_page clickable" %}

{% endif %}
    {% for img in results %}
  • @@ -41,7 +41,7 @@
  • {% endfor %}
- {% if nb_pages %}

{% build_pagination nb_pages page "contents_page clickable" %}

{% endif %} + {% if nb_pages %}

{% build_pagination nb_pages cur_page_nb "all_pictures" "contents_page clickable" %}

{% endif %}
{% endblock %} diff -r a7ace38e92a4 -r daaafc916dc4 src/egonomy/templates/egonomy_annotate_picture.html --- a/src/egonomy/templates/egonomy_annotate_picture.html Tue Feb 05 19:19:55 2013 +0100 +++ b/src/egonomy/templates/egonomy_annotate_picture.html Wed Feb 06 13:15:27 2013 +0100 @@ -24,39 +24,35 @@ - + - + - + - + - + - + - - - - - + - - + + @@ -71,7 +67,7 @@