diff options
| -rw-r--r-- | ishtar_common/locale/fr/LC_MESSAGES/django.po | 240 | ||||
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 7 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/parcels_wizard.html | 8 |
3 files changed, 137 insertions, 118 deletions
diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po index 0e390f7c6..5229fa056 100644 --- a/ishtar_common/locale/fr/LC_MESSAGES/django.po +++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-03 19:58+0200\n" +"POT-Creation-Date: 2013-10-26 23:49+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n" "Language-Team: \n" @@ -44,32 +44,32 @@ msgstr "Unité d'Enregistrement" msgid "Find" msgstr "Mobilier" -#: forms.py:64 +#: forms.py:63 msgid "Enter a valid name consisting of letters, spaces and hyphens." msgstr "Entrez un nom correct composé de lettres, espaces et tirets." -#: forms.py:77 forms_common.py:214 +#: forms.py:76 forms_common.py:214 msgid "Confirm" msgstr "Confirmation" -#: forms.py:85 +#: forms.py:84 msgid "There are identical items." msgstr "Il y a des éléments identiques." -#: forms.py:114 forms.py:115 +#: forms.py:113 forms.py:114 msgid "Closing date" msgstr "Date de clotûre" -#: forms.py:119 +#: forms.py:118 msgid "You should select an item." msgstr "Vous devez sélectionner un élément." -#: forms.py:120 +#: forms.py:119 msgid "Add a new item" msgstr "Ajouter un nouvel élément" -#: forms_common.py:42 forms_common.py:80 forms_common.py:84 models.py:591 -#: models.py:803 templates/ishtar/sheet_person.html:15 +#: forms_common.py:42 forms_common.py:80 forms_common.py:84 models.py:607 +#: models.py:829 templates/ishtar/sheet_person.html:15 #: templates/ishtar/sheet_person.html:25 msgid "Town" msgstr "Commune" @@ -92,62 +92,62 @@ msgstr "" "<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la " "commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>" -#: forms_common.py:56 forms_common.py:286 ishtar_menu.py:29 models.py:650 -#: models.py:696 models.py:728 templates/ishtar/sheet_person.html:6 +#: forms_common.py:56 forms_common.py:286 ishtar_menu.py:29 models.py:669 +#: models.py:721 models.py:754 templates/ishtar/sheet_person.html:6 msgid "Person" msgstr "Individu" -#: forms_common.py:70 forms_common.py:104 forms_common.py:133 models.py:608 -#: models.py:643 models.py:789 templates/ishtar/sheet_person.html:8 +#: forms_common.py:70 forms_common.py:104 forms_common.py:133 models.py:625 +#: models.py:662 models.py:815 templates/ishtar/sheet_person.html:8 #: templates/ishtar/sheet_person.html:21 msgid "Name" msgstr "Nom" -#: forms_common.py:72 models.py:604 +#: forms_common.py:72 models.py:620 msgid "Organization type" msgstr "Type d'organisation" -#: forms_common.py:74 models.py:586 templates/ishtar/sheet_person.html:12 +#: forms_common.py:74 models.py:602 templates/ishtar/sheet_person.html:12 #: templates/ishtar/sheet_person.html:22 msgid "Address" msgstr "Adresse" -#: forms_common.py:76 models.py:587 templates/ishtar/sheet_person.html:13 +#: forms_common.py:76 models.py:603 templates/ishtar/sheet_person.html:13 #: templates/ishtar/sheet_person.html:23 msgid "Address complement" msgstr "Complément d'adresse" -#: forms_common.py:78 models.py:589 templates/ishtar/sheet_person.html:14 +#: forms_common.py:78 models.py:605 templates/ishtar/sheet_person.html:14 #: templates/ishtar/sheet_person.html:24 msgid "Postal code" msgstr "Code postal" -#: forms_common.py:81 models.py:592 +#: forms_common.py:81 models.py:608 msgid "Country" msgstr "Pays" -#: forms_common.py:83 models.py:594 templates/ishtar/sheet_person.html:16 +#: forms_common.py:83 models.py:610 templates/ishtar/sheet_person.html:16 #: templates/ishtar/sheet_person.html:26 msgid "Phone" msgstr "Téléphone" -#: forms_common.py:105 forms_common.py:131 models.py:641 +#: forms_common.py:105 forms_common.py:131 models.py:660 #: templates/ishtar/sheet_person.html:9 msgid "Surname" msgstr "Prénom" -#: forms_common.py:106 forms_common.py:135 forms_common.py:172 models.py:644 +#: forms_common.py:106 forms_common.py:135 forms_common.py:172 models.py:663 #: templates/ishtar/sheet_person.html:10 msgid "Email" msgstr "Courriel" -#: forms_common.py:107 models.py:610 models.py:752 templates/sheet_ope.html:85 +#: forms_common.py:107 models.py:627 models.py:778 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/sheet_person.html:37 templates/ishtar/sheet_person.html:90 msgid "Type" msgstr "Type" -#: forms_common.py:108 models.py:613 +#: forms_common.py:108 models.py:630 msgid "Organization" msgstr "Organisation" @@ -159,7 +159,7 @@ msgstr "Recherche d'individus" msgid "Identity" msgstr "Identité" -#: forms_common.py:130 forms_common.py:243 models.py:640 models.py:751 +#: forms_common.py:130 forms_common.py:243 models.py:659 models.py:777 #: templates/sheet_ope.html:104 templates/ishtar/sheet_person.html:89 msgid "Title" msgstr "Titre" @@ -168,7 +168,7 @@ msgstr "Titre" msgid "Current organization" msgstr "Organisation actuelle" -#: forms_common.py:154 forms_common.py:157 models.py:629 +#: forms_common.py:154 forms_common.py:157 models.py:647 msgid "Person type" msgstr "Type d'individu" @@ -176,7 +176,7 @@ msgstr "Type d'individu" msgid "Account" msgstr "Compte" -#: forms_common.py:174 wizards.py:816 +#: forms_common.py:174 wizards.py:836 msgid "New password" msgstr "Nouveau mot de passe" @@ -200,7 +200,7 @@ msgstr "Ce nom d'utilisateur existe déjà." msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: forms_common.py:223 forms_common.py:235 models.py:804 +#: forms_common.py:223 forms_common.py:235 models.py:830 #: templates/ishtar/sheet_person.html:67 msgid "Towns" msgstr "Communes" @@ -213,23 +213,23 @@ msgstr "Il y a des communes identiques." msgid "Documentation informations" msgstr "Information sur le document" -#: forms_common.py:245 forms_common.py:264 models.py:747 +#: forms_common.py:245 forms_common.py:264 models.py:773 msgid "Source type" msgstr "Type de source" -#: forms_common.py:247 models.py:756 +#: forms_common.py:247 models.py:782 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: forms_common.py:248 models.py:758 +#: forms_common.py:248 models.py:784 msgid "Receipt date" msgstr "Date de réception" -#: forms_common.py:250 models.py:760 +#: forms_common.py:250 models.py:786 msgid "Creation date" msgstr "Date de création" -#: forms_common.py:261 forms_common.py:280 forms_common.py:310 models.py:733 +#: forms_common.py:261 forms_common.py:280 forms_common.py:310 models.py:759 msgid "Author" msgstr "Auteur" @@ -237,7 +237,7 @@ msgstr "Auteur" msgid "Would you like to delete this documentation?" msgstr "Voulez vous supprimer ce document ?" -#: forms_common.py:287 models.py:724 models.py:730 +#: forms_common.py:287 models.py:750 models.py:756 msgid "Author type" msgstr "Type d'auteur" @@ -249,7 +249,7 @@ msgstr "Sélection d'auteur" msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: forms_common.py:320 models.py:734 models.py:753 +#: forms_common.py:320 models.py:760 models.py:779 #: templates/sheet_ope.html:106 msgid "Authors" msgstr "Auteurs" @@ -270,192 +270,192 @@ msgstr "Modification" msgid "Account management" msgstr "Gestion des comptes" -#: models.py:83 +#: models.py:95 msgid "Not a valid item." msgstr "Élément invalide." -#: models.py:95 +#: models.py:107 msgid "An item selected is not a valid item." msgstr "Un élément sélectionné n'est pas valide." -#: models.py:105 +#: models.py:117 msgid "This item already exist." msgstr "Cet élément existe déjà." -#: models.py:157 models.py:465 models.py:574 +#: models.py:169 models.py:481 models.py:590 msgid "Label" msgstr "Libellé" -#: models.py:158 +#: models.py:170 msgid "Textual ID" msgstr "Identifiant textuel" -#: models.py:160 +#: models.py:172 msgid "Comment" msgstr "Commentaire" -#: models.py:161 +#: models.py:173 msgid "Available" msgstr "Disponible" -#: models.py:323 +#: models.py:339 msgid "Last editor" msgstr "Dernier éditeur" -#: models.py:453 models.py:464 +#: models.py:469 models.py:480 msgid "URL name" msgstr "Nom de l'URL" -#: models.py:455 models.py:463 +#: models.py:471 models.py:479 msgid "Wizard" msgstr "Assistant" -#: models.py:462 +#: models.py:478 msgid "Order" msgstr "Ordre" -#: models.py:467 +#: models.py:483 msgid "Wizard step" msgstr "Étape de l'assistant" -#: models.py:510 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:526 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/sheet_person.html:34 templates/ishtar/sheet_person.html:63 #: templates/ishtar/sheet_person.html:88 msgid "Year" msgstr "Année" -#: models.py:513 models.py:575 +#: models.py:529 models.py:591 #: templates/ishtar/dashboards/dashboard_main.html:74 msgid "Number" msgstr "Nombre" -#: models.py:578 +#: models.py:594 msgid "Department" msgstr "Département" -#: models.py:579 +#: models.py:595 msgid "Departments" msgstr "Départements" -#: models.py:595 templates/ishtar/sheet_person.html:17 +#: models.py:611 templates/ishtar/sheet_person.html:17 #: templates/ishtar/sheet_person.html:27 msgid "Mobile phone" msgstr "Téléphone portable" -#: models.py:605 +#: models.py:621 msgid "Organization types" msgstr "Types d'organisation" -#: models.py:614 +#: models.py:631 msgid "Organizations" msgstr "Organisations" -#: models.py:616 +#: models.py:633 msgid "Can view all Organization" msgstr "Peut voir toutes les Organisations" -#: models.py:617 +#: models.py:634 msgid "Can view own Organization" msgstr "Peut voir sa propre Organisation" -#: models.py:618 +#: models.py:635 msgid "Can add own Organization" msgstr "Peut ajouter sa propre Organisation" -#: models.py:619 +#: models.py:636 msgid "Can change own Organization" msgstr "Peut changer sa propre Organisation" -#: models.py:620 +#: models.py:637 msgid "Can delete own Organization" msgstr "Peut supprimer sa propre Organisation" -#: models.py:627 -msgid "Rights" -msgstr "Droits" +#: models.py:645 +msgid "Groups" +msgstr "Groupes" -#: models.py:630 +#: models.py:648 msgid "Person types" msgstr "Types d'individu" -#: models.py:633 +#: models.py:652 msgid "Mr" msgstr "M" -#: models.py:634 +#: models.py:653 msgid "Miss" msgstr "Mlle" -#: models.py:635 +#: models.py:654 msgid "Mrs" msgstr "Mme" -#: models.py:636 +#: models.py:655 msgid "Doctor" msgstr "Dr" -#: models.py:645 models.py:666 +#: models.py:664 models.py:685 msgid "Types" msgstr "Types" -#: models.py:647 +#: models.py:666 msgid "Is attached to" msgstr "Est rattaché à" -#: models.py:651 +#: models.py:670 msgid "Persons" msgstr "Individus" -#: models.py:653 +#: models.py:672 msgid "Can view all Person" msgstr "Peut voir toutes les Personnes" -#: models.py:654 +#: models.py:673 msgid "Can view own Person" msgstr "Peut voir sa propre Personne" -#: models.py:655 +#: models.py:674 msgid "Can add own Person" msgstr "Peut ajouter sa propre Personne" -#: models.py:656 +#: models.py:675 msgid "Can change own Person" msgstr "Peut changer sa propre Personne" -#: models.py:657 +#: models.py:676 msgid "Can delete own Person" msgstr "Peut supprimer sa propre Personne" -#: models.py:699 +#: models.py:725 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: models.py:700 +#: models.py:726 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: models.py:725 +#: models.py:751 msgid "Author types" msgstr "Types d'auteur" -#: models.py:748 +#: models.py:774 msgid "Source types" msgstr "Types de source" -#: models.py:761 templates/ishtar/sheet_person.html:35 +#: models.py:787 templates/ishtar/sheet_person.html:35 #: templates/ishtar/sheet_person.html:62 msgid "Ref." msgstr "Réf." -#: models.py:763 +#: models.py:789 msgid "Internal reference" msgstr "Référence interne" -#: models.py:790 +#: models.py:816 msgid "Surface (m²)" msgstr "Area (m²)" -#: models.py:791 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:817 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Localisation" @@ -479,57 +479,61 @@ msgstr "Oui" msgid "False" msgstr "Non" -#: views.py:323 templates/ishtar/sheet_person.html:52 +#: views.py:354 templates/ishtar/sheet_person.html:52 #: templates/ishtar/sheet_person.html:78 msgid "Details" msgstr "Détails" -#: views.py:527 views.py:568 +#: views.py:562 views.py:603 msgid "Operation not permitted." msgstr "Opération non permise" -#: views.py:530 +#: views.py:565 #, python-format msgid "New %s" msgstr "Nouveau %s" -#: views.py:590 +#: views.py:624 msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: views.py:593 +#: views.py:627 msgid "Operations" msgstr "Opérations" -#: views.py:596 views.py:599 +#: views.py:630 msgid "Context records" msgstr "Unité d'Enregistrement" -#: widgets.py:41 +#: views.py:633 +msgid "Finds" +msgstr "Mobilier" + +#: widgets.py:42 msgid "Delete" msgstr "Supprimer" -#: widgets.py:241 +#: widgets.py:246 msgid "No results" msgstr "Pas de résultats" -#: widgets.py:242 +#: widgets.py:247 msgid "Loading..." msgstr "Chargement..." -#: widgets.py:243 +#: widgets.py:248 msgid "Remove" msgstr "Enlever" -#: wizards.py:202 +#: wizards.py:206 msgid "Yes" msgstr "Oui" -#: wizards.py:204 +#: wizards.py:208 msgid "No" msgstr "Non" -#: wizards.py:870 +#: wizards.py:890 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "[%(app_name)s] Ajout - modification du compte" @@ -568,33 +572,33 @@ msgstr "Merci pour l'intérêt que vous portez au projet." msgid "The %(app_name)s team" msgstr "L'équipe %(app_name)s" -#: templates/base.html:26 +#: templates/base.html:28 msgid "Logged in" msgstr "Connecté" -#: templates/base.html:27 +#: templates/base.html:29 msgid "Log out" msgstr "Déconnexion" -#: templates/base.html:28 +#: templates/base.html:30 msgid "Change password" msgstr "Changement de mot de passe" -#: templates/base.html:30 templates/registration/activate.html:10 +#: templates/base.html:32 templates/registration/activate.html:10 #: templates/registration/login.html:8 templates/registration/login.html:10 #: templates/registration/password_reset_complete.html:8 msgid "Log in" msgstr "Connexion" -#: templates/base.html:36 +#: templates/base.html:38 msgid "Lang" msgstr "Langue" -#: templates/base.html:36 +#: templates/base.html:38 msgid ":" msgstr " :" -#: templates/base.html:61 +#: templates/base.html:63 msgid "Default selected items" msgstr "Éléments sélectionnés par défaut" @@ -850,6 +854,14 @@ msgstr "Rechercher puis sélectionner un élément" msgid "Export as CSV" msgstr "Export en CSV" +#: templates/blocks/JQueryJqGrid.html:18 +msgid "simple" +msgstr "simple" + +#: templates/blocks/JQueryJqGrid.html:19 +msgid "full" +msgstr "complet" + #: templates/blocks/form_snippet.html:9 msgid "Help" msgstr "Aide" @@ -1005,25 +1017,29 @@ msgstr "Voulez vous sauver ces informations ?" #: templates/ishtar/wizard/default_wizard.html:27 #: templates/ishtar/wizard/default_wizard.html:42 #: templates/ishtar/wizard/parcels_wizard.html:12 -#: templates/ishtar/wizard/parcels_wizard.html:25 -#: templates/ishtar/wizard/search.html:15 +#: templates/ishtar/wizard/parcels_wizard.html:26 +#: templates/ishtar/wizard/search.html:13 #: templates/ishtar/wizard/towns_wizard.html:11 #: templates/ishtar/wizard/towns_wizard.html:31 msgid "Validate" msgstr "Valider" #: templates/ishtar/wizard/default_wizard.html:33 -#: templates/ishtar/wizard/parcels_wizard.html:22 -#: templates/ishtar/wizard/search.html:22 +#: templates/ishtar/wizard/parcels_wizard.html:23 +#: templates/ishtar/wizard/search.html:20 #: templates/ishtar/wizard/towns_wizard.html:19 msgid "Add/Modify" msgstr "Ajouter-Modifier" #: templates/ishtar/wizard/default_wizard.html:43 -#: templates/ishtar/wizard/parcels_wizard.html:26 +#: templates/ishtar/wizard/parcels_wizard.html:27 msgid "Validate and end" msgstr "Valider et confirmer" +#: templates/ishtar/wizard/parcels_wizard.html:20 +msgid "all" +msgstr "tout" + #: templates/ishtar/wizard/towns_wizard.html:27 msgid "No town set in the associated file." msgstr "Pas de commune dans le dossier associé." @@ -1127,8 +1143,8 @@ msgstr "" "Vous être maintenant enregistré. Un courriel d'activation de votre compte " "vous a été envoyé." -#~ msgid "Finds" -#~ msgstr "Mobilier" +#~ msgid "Rights" +#~ msgstr "Droits" #~ msgid "Find_complete_Label" #~ msgstr "Find_complete_Label" @@ -1151,12 +1167,6 @@ msgstr "" #~ msgid "No find associated to this operation" #~ msgstr "Pas de mobilier associé à cette opération" -#~ msgid "simple" -#~ msgstr "simple" - -#~ msgid "full" -#~ msgstr "complet" - #~ msgid "Context Record" #~ msgstr "Unité d'Enregistrement" diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 8da9d38dc..13f3896a6 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -61,10 +61,15 @@ $('#to_top_arrow').live('click', function(){ $("html, body").animate({ scrollTop: 0}, 1000); }); +$('.check-all').live('click', function(){ + $(this).closest('table' + ).find('input:checkbox' + ).attr('checked', $(this).is(':checked')); +}); $("#main_menu ul li").live('click', function(){ var current_id = $(this).attr('id'); - console.log(current_id); + console.log(current_id); $("#main_menu ul ul").not($(this).parents('ul')).not($(this).find('ul') ).hide('slow'); $(this).find('ul').show('slow'); diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html index 5aea689dd..fdce51cdb 100644 --- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html @@ -15,8 +15,9 @@ <tr class='error'><th colspan='2'>{{wizard.form.non_form_errors}}</th></tr> </table>{%endif%} {{wizard.form.selection_form}} -<table class='inline-table'> - <tr>{% for field in wizard.form.forms.0 %}<th>{{ field.label_tag }}</th>{% endfor %}</tr> +<table class='inline-table' id='parcel-table'> + <tr>{% for field in wizard.form.forms.0 %}<th{% if not forloop.last %} rowspan='2'{% endif %}>{{ field.label_tag }}</th>{% endfor %}</tr> + <tr><td>({% trans "all"%} <input type='checkbox' name='check-all' class='check-all'/>)</td></tr> {% inline_formset 'Parcels' wizard.form.forms False %} </table> <p><button name="formset_modify" value="{{wizard.steps.current}}">{% trans "Add/Modify" %}</button></p> @@ -26,4 +27,7 @@ {% if next_steps %}<input type="submit" id="submit_end_form" name='validate_and_end' value="{% trans "Validate and end" %}"/>{% endif %} </div> </form> +<script type='text/javascript'> + +</script> {% endblock %} |