From c6dcc95b51ba587d739ec32a23f2a6c02e26ce50 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Thu, 4 Jun 2020 17:10:24 +0200 Subject: [PATCH] LSview/LSform: fix loading view dependencies --- src/includes/class/class.LSform.php | 17 ++-- src/includes/js/LSview.js | 28 ++++-- src/includes/routes.php | 1 + src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo | Bin 58258 -> 58412 bytes src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po | 95 ++++++++++-------- src/lang/ldapsaisie.pot | 93 +++++++++-------- src/templates/default/modify.tpl | 4 +- 7 files changed, 134 insertions(+), 104 deletions(-) diff --git a/src/includes/class/class.LSform.php b/src/includes/class/class.LSform.php index 606415f9..ba89203c 100644 --- a/src/includes/class/class.LSform.php +++ b/src/includes/class/class.LSform.php @@ -83,15 +83,12 @@ class LSform { * @retval void */ public function display($LSform_action=null){ - if ($this -> idForm == 'view') { - self :: loadDependenciesDisplayView($this -> $ldapObject); - } - else { - LStemplate :: addJSscript('LSformElement_field.js'); - LStemplate :: addJSscript('LSformElement.js'); - LStemplate :: addJSscript('LSform.js'); - LStemplate :: addCssFile('LSform.css'); - } + // Load view dependencies + self :: loadDependenciesDisplayView(); + + // Load form dependencies + LStemplate :: addJSscript('LSformElement_field.js'); + LStemplate :: addJSscript('LSformElement.js'); LSsession :: addHelpInfos( 'LSform', @@ -216,7 +213,7 @@ class LSform { } } LStemplate :: addJSconfigParam('LSview_labels', array_merge(array( - 'delete_confirm_text' => _("Do you really want to delete"), + 'delete_confirm_text' => _('Do you really want to delete "%{name}"?'), 'delete_confirm_title' => _("Caution"), 'delete_confirm_validate' => _("Delete") ),$customActionLabels)); diff --git a/src/includes/js/LSview.js b/src/includes/js/LSview.js index 5eb919cd..d3a6bf41 100644 --- a/src/includes/js/LSview.js +++ b/src/includes/js/LSview.js @@ -3,12 +3,23 @@ var LSview = new Class({ this.labels = varLSdefault.LSjsConfig['LSview_labels']; if (!$type(this.labels)) { this.labels = { - delete_confirm_text: "Do you really want to delete", + delete_confirm_text: 'Do you really want to delete "%{name}"?', delete_confirm_title: "Caution", delete_confirm_validate: "Delete" }; } + this.title = $('LSview_title'); + if (this.title) { + this.object_name = this.title.innerHTML; + } + else { + this.title = $('LSform_title'); + if (this.title) { + this.object_name = this.title.getProperty('data-object-name'); + } + } + $$('td.LSobject-list-names').each(function(el) { el.addEvent('click',this.onTdLSobjectListNamesClick.bind(this,el)); }, this); @@ -43,11 +54,11 @@ var LSview = new Class({ onWindowResized: function() { var window_width = window.getWidth().toInt(); - if ($('LSview_title')) { - window_width = $('LSview_title').getWidth().toInt(); + if (this.title) { + window_width = this.title.getWidth().toInt(); } if ($('LSview_search_predefinedFilter')) { - window_width -= $('LSview_search_predefinedFilter').getWidth().toInt(); + window_width -= $('LSview_search_predefinedFilter').getWidth().toInt() + $('LSview_search_predefinedFilter').getPosition().x; } $$('ul.LSview-actions').each(function(ul) { // Calculte menu width @@ -81,7 +92,7 @@ var LSview = new Class({ this._confirmBoxOpen = 1; var name = a.getParent().getParent().getFirst('td').getElement('a').innerHTML; this.confirmBox = new LSconfirmBox({ - text: this.labels.delete_confirm_text + ' "'+name+'" ?', + text: getFData(this.labels.delete_confirm_text, name), startElement: a, onConfirm: this.removeFromA.bind(this,a), onClose: this.onConfirmBoxClose.bind(this) @@ -93,9 +104,9 @@ var LSview = new Class({ Event(event).stop(); if (!this._confirmBoxOpen) { this._confirmBoxOpen = 1; - var name = $('LSview_title').innerHTML; + var name = this.object_name; this.confirmBox = new LSconfirmBox({ - text: this.labels.delete_confirm_text + ' "'+name+'" ?', + text: getFData(this.labels.delete_confirm_text, name), title: this.labels.delete_confirm_title, validate_label: this.labels.delete_confirm_yes_btn, startElement: a, @@ -128,8 +139,7 @@ var LSview = new Class({ var text = this.labels['custom_action_'+name+'_confirm_text'] } else { - var objectname = $('LSview_title').innerHTML; - var text = getFData('Do you really want to execute custom action %{customAction} on %{objectname} ?',{customAction: name, objectname: objectname }); + var text = getFData('Do you really want to execute custom action %{customAction} on %{objectname} ?',{customAction: name, objectname: this.object_name }); } this.confirmBox = new LSconfirmBox({ text: text, diff --git a/src/includes/routes.php b/src/includes/routes.php index c587f3eb..67e413dd 100644 --- a/src/includes/routes.php +++ b/src/includes/routes.php @@ -1066,6 +1066,7 @@ function handle_LSobject_modify($request) { // Define page title LStemplate :: assign('pagetitle',_('Modify').' : '.$object -> getDisplayName()); + LStemplate :: assign('object_name', $object -> getDisplayName()); $form -> display("object/$LSobject/".urlencode($object -> getDn())."/modify"); // Set & display template diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo index 4dfe1a56467c05ed7a686dbd1994a0548934837e..70f95cbfbda88699038312684b697715f08a2832 100644 GIT binary patch delta 9421 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 diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po index 9e74fb51..2680ecdb 100644 --- a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po +++ b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: LdapSaisie\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-05-28 20:22+0200\n" +"PO-Revision-Date: 2020-06-04 17:11+0200\n" "Last-Translator: Benjamin Renard \n" "Language-Team: LdapSaisie \n" @@ -448,8 +448,8 @@ msgstr "Confirmez-vous votre choix ?" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsmoothbox.php:39 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:68 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:573 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1129 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1237 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1130 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1256 #: templates/default/recoverpassword.tpl:19 msgid "Validate" msgstr "Valider" @@ -515,6 +515,8 @@ msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsearchEntry.php:169 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:910 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1068 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1143 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1269 msgid "Modify" msgstr "Modifier" @@ -1323,7 +1325,6 @@ msgid "updating relations" msgstr "mise à jour des relations" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:602 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:219 msgid "Do you really want to delete" msgstr "Voulez-vous vraiment supprimer" @@ -1332,7 +1333,7 @@ msgid "Warning" msgstr "Attention" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:604 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:221 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:218 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSformElement_select_object.php:69 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSformElement_select_object.php:85 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsearchEntry.php:185 @@ -1342,17 +1343,17 @@ msgid "Delete" msgstr "Supprimer" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:642 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:882 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:885 msgid "No object." msgstr "Aucun objet." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:667 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:670 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:410 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:865 msgid "New" msgstr "Nouveau" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:951 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:954 msgid "" "LSrelation : Invalid parameter '%{parameter}' of the relation %{relation}: " "objects %{LSobject} have no function '%{function}'." @@ -1360,23 +1361,23 @@ msgstr "" "LSrelation : Le paramètre '%{parametre}' de la relation %{relation} est " "invalide: les objets %{LSobject} n'ont pas de fonction '%{function}'." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:954 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:957 msgid "LSrelation : Relation %{relation} of object type %{LSobject} unknown." msgstr "" "LSrelation : La relation %{relation} du type d'objet %{LSobject} est " "inconnue." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:957 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:960 msgid "LSrelation : Error during relation update of the relation %{relation}." msgstr "LSsession : Erreur durant la mise à jour de la relation %{relation}" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:960 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:963 msgid "LSrelation : Object type %{LSobject} unknown (Relation : %{relation})." msgstr "" "LSsession : La fonction de mise à jour de la relation %{relation} est " "inconnue." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:963 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:966 msgid "" "LSrelation : Incomplete configuration for LSrelation %{relation} of object " "type %{LSobject} for action : %{action}." @@ -1384,7 +1385,7 @@ msgstr "" "LSrelation : Configuration incomplète de la LSrelation %{relation} du type " "d'objet %{LSobject} pour l'action : %{action}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:966 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:969 msgid "" "LSrelation : Invalid editable attribute for LSrelation %{relation} with " "LSobject %{LSobject}." @@ -1392,7 +1393,7 @@ msgstr "" "LSrelation : Attribut éditable invalide pour la LSrelation %{relation} du " "type d'objet %{LSobject}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:969 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:972 msgid "" "LSrelation : The configuration parameter '%{parameter}' of the relation " "%{relation} of %{LSobject} is missing." @@ -1400,7 +1401,7 @@ msgstr "" "LSrelation : Le paramètre '%{paramerer}' est manquant dans la configuration " "de la relation %{relation} des objets %{LSobject}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:972 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:975 msgid "" "LSrelation : The configuration parameter '%{parameter}' of the relation " "%{relation} of %{LSobject} is invalid." @@ -1518,23 +1519,23 @@ msgstr "" "des constantes suivantes : LSAUTH_CAS_SERVER_SSL_CACERT ou " "LSAUTH_CAS_SERVER_NO_SSL_VALIDATION" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:99 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:96 msgid "Add a field to add another values." msgstr "Ajouter une autre valeur à ce champ." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:100 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:97 msgid "Delete this field." msgstr "Supprimer cette valeur." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:202 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:199 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:569 msgid "Do you really want to execute custom action %{title} on this search ?" msgstr "" "Êtes-vous vraiment sûre de vouloir exécuter l'action personnalisée %{title} " "sur cette recherche ?" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:208 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1231 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:205 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1250 msgid "" "Do you really want to execute custom action %{customAction} on " "%{objectname} ?" @@ -1542,49 +1543,53 @@ msgstr "" "Êtes-vous vraiment sûre de vouloir exécuter l'action personnalisée " "%{customAction} sur %{objectname} ?" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:220 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:216 +msgid "Do you really want to delete \"%{name}\"?" +msgstr "Voulez-vous vraiment supprimer \"%{name}\" ?" + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:217 msgid "Caution" msgstr "Attention" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:274 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:271 msgid "%{label} attribute data is not valid." msgstr "Les données de l'attribut %{label} sont incorrectes." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:354 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:351 msgid "Mandatory field" msgstr "Champ obligatoire" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:788 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:785 msgid "LSform : Error during the recovery of the values of the form." msgstr "LSform : Erreur durant la récupération des valeurs du formulaire." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:791 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:788 msgid "" "LSform : Error durring the recovery of the value of the field '%{element}'." msgstr "" "LSform : Erreur durant la recupération de la valeur du champ %{element}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:798 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:795 msgid "LSform : The field %{element} doesn't exist." msgstr "LSform : Le champ %{element} n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:801 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:798 msgid "LSfom : Field type unknow (%{type})." msgstr "LSform : Type de champ inconnu (%{type})." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:804 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:801 msgid "LSform : Error during the creation of the element '%{element}'." msgstr "LSform : Erreur durant la création de l'élément %{element}." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:807 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:804 msgid "LSform : The data entry form %{name} doesn't exist." msgstr "LSform : Le masque de saisie %{name} n'existe pas." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:810 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:807 msgid "LSform : The data entry form %{name} is not correctly configured." msgstr "LSform : Le masque de saisie %{name} n'est pas correctement configuré." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:813 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:810 msgid "" "LSform : The element %{name}, listed as displayed in data entry form " "configuration, doesn't exist." @@ -1765,7 +1770,7 @@ msgid "Actions" msgstr "Actions" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsearch.php:1091 -#: templates/default/global_search.tpl:24 +#: templates/default/global_search.tpl:16 msgid "This search didn't get any result." msgstr "Cette recherche n'a retournée aucun résultat." @@ -2038,6 +2043,8 @@ msgstr "Erreur inconnu : %{error}" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsearchEntry.php:161 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1052 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1135 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1261 msgid "View" msgstr "Voir" @@ -2123,19 +2130,19 @@ msgstr "L'objet a été partiellement modifié." msgid "The object has been modified successfully." msgstr "L'objet a bien été modifié." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1117 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1118 msgid "%{objectname} has been successfully deleted." msgstr "%{objectname} a bien été supprimé." -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1126 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1127 msgid "Deleting : %{objectname}" msgstr "Suppression : %{objectname}" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1127 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1128 msgid "Do you really want to delete %{displayName} ?" msgstr "Voulez-vous vraiment supprimer %{displayName} ?" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1203 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1222 msgid "" "The custom action %{customAction} have been successfully execute on " "%{objectname}." @@ -2168,7 +2175,7 @@ msgstr "Retour" msgid "Connect" msgstr "Se connecter" -#: templates/default/base_connected.tpl:48 +#: templates/default/base_connected.tpl:49 msgid "Connected as" msgstr "Connecté en tant que" @@ -2193,8 +2200,8 @@ msgid "Format" msgstr "Format" #: templates/default/global_search.tpl:9 -#: templates/default/base_connected.tpl:22 #: templates/default/base_connected.tpl:23 +#: templates/default/base_connected.tpl:24 msgid "Global search" msgstr "Recherche globale" @@ -2211,7 +2218,7 @@ msgid "LDAP server" msgstr "Serveur LDAP" #: templates/default/recoverpassword.tpl:25 templates/default/login.tpl:22 -#: templates/default/login.tpl:33 templates/default/base_connected.tpl:39 +#: templates/default/login.tpl:33 templates/default/base_connected.tpl:40 msgid "Language" msgstr "Langue" @@ -2220,7 +2227,7 @@ msgstr "Langue" msgid "Legend:" msgstr "Légende :" -#: templates/default/base_connected.tpl:50 +#: templates/default/base_connected.tpl:51 msgid "Logout" msgstr "Déconnexion" @@ -2228,7 +2235,7 @@ msgstr "Déconnexion" msgid "Message" msgstr "Message" -#: templates/default/viewSearch.tpl:134 +#: templates/default/viewSearch.tpl:113 msgid "Nb / page :" msgstr "Nb / page :" @@ -2276,7 +2283,7 @@ msgstr "Lecture" msgid "Readable / Writable" msgstr "Lecture / Écriture" -#: templates/default/base_connected.tpl:49 +#: templates/default/base_connected.tpl:50 msgid "Refresh my access rights" msgstr "Rafraîchir mes droits d'accès" @@ -2288,6 +2295,10 @@ msgstr "Relations / Profils" msgid "Result" msgstr "Résultat" +#: templates/default/base_connected.tpl:6 +msgid "Show/hide menu" +msgstr "Afficher/cacher le menu" + #: templates/default/LSmail.tpl:21 msgid "Subject" msgstr "Sujet" diff --git a/src/lang/ldapsaisie.pot b/src/lang/ldapsaisie.pot index 337f1e17..22aff51e 100644 --- a/src/lang/ldapsaisie.pot +++ b/src/lang/ldapsaisie.pot @@ -369,8 +369,8 @@ msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsmoothbox.php:39 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:68 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:573 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1129 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1237 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1130 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1256 #: templates/default/recoverpassword.tpl:19 msgid "Validate" msgstr "" @@ -428,6 +428,8 @@ msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsearchEntry.php:169 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:910 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1068 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1143 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1269 msgid "Modify" msgstr "" @@ -1090,7 +1092,6 @@ msgid "updating relations" msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:602 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:219 msgid "Do you really want to delete" msgstr "" @@ -1099,7 +1100,7 @@ msgid "Warning" msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:604 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:221 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:218 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSformElement_select_object.php:69 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSformElement_select_object.php:85 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsearchEntry.php:185 @@ -1109,53 +1110,53 @@ msgid "Delete" msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:642 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:882 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:885 msgid "No object." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:667 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:670 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:410 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:865 msgid "New" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:951 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:954 msgid "" "LSrelation : Invalid parameter '%{parameter}' of the relation %{relation}: " "objects %{LSobject} have no function '%{function}'." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:954 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:957 msgid "LSrelation : Relation %{relation} of object type %{LSobject} unknown." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:957 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:960 msgid "LSrelation : Error during relation update of the relation %{relation}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:960 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:963 msgid "LSrelation : Object type %{LSobject} unknown (Relation : %{relation})." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:963 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:966 msgid "" "LSrelation : Incomplete configuration for LSrelation %{relation} of object " "type %{LSobject} for action : %{action}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:966 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:969 msgid "" "LSrelation : Invalid editable attribute for LSrelation %{relation} with " "LSobject %{LSobject}." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:969 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:972 msgid "" "LSrelation : The configuration parameter '%{parameter}' of the relation " "%{relation} of %{LSobject} is missing." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:972 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSrelation.php:975 msgid "" "LSrelation : The configuration parameter '%{parameter}' of the relation " "%{relation} of %{LSobject} is invalid." @@ -1251,68 +1252,72 @@ msgid "" "LSAUTH_CAS_SERVER_SSL_CACERT or LSAUTH_CAS_SERVER_NO_SSL_VALIDATION" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:99 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:96 msgid "Add a field to add another values." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:100 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:97 msgid "Delete this field." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:202 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:199 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:569 msgid "Do you really want to execute custom action %{title} on this search ?" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:208 -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1231 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:205 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1250 msgid "" "Do you really want to execute custom action %{customAction} on " "%{objectname} ?" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:220 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:216 +msgid "Do you really want to delete \"%{name}\"?" +msgstr "" + +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:217 msgid "Caution" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:274 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:271 msgid "%{label} attribute data is not valid." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:354 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:351 msgid "Mandatory field" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:788 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:785 msgid "LSform : Error during the recovery of the values of the form." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:791 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:788 msgid "" "LSform : Error durring the recovery of the value of the field '%{element}'." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:798 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:795 msgid "LSform : The field %{element} doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:801 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:798 msgid "LSfom : Field type unknow (%{type})." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:804 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:801 msgid "LSform : Error during the creation of the element '%{element}'." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:807 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:804 msgid "LSform : The data entry form %{name} doesn't exist." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:810 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:807 msgid "LSform : The data entry form %{name} is not correctly configured." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:813 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:810 msgid "" "LSform : The element %{name}, listed as displayed in data entry form " "configuration, doesn't exist." @@ -1476,7 +1481,7 @@ msgid "Actions" msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsearch.php:1091 -#: templates/default/global_search.tpl:24 +#: templates/default/global_search.tpl:16 msgid "This search didn't get any result." msgstr "" @@ -1715,6 +1720,8 @@ msgstr "" #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsearchEntry.php:161 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1052 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1135 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1261 msgid "View" msgstr "" @@ -1794,19 +1801,19 @@ msgstr "" msgid "The object has been modified successfully." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1117 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1118 msgid "%{objectname} has been successfully deleted." msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1126 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1127 msgid "Deleting : %{objectname}" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1127 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1128 msgid "Do you really want to delete %{displayName} ?" msgstr "" -#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1203 +#: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1222 msgid "" "The custom action %{customAction} have been successfully execute on " "%{objectname}." @@ -1837,7 +1844,7 @@ msgstr "" msgid "Connect" msgstr "" -#: templates/default/base_connected.tpl:48 +#: templates/default/base_connected.tpl:49 msgid "Connected as" msgstr "" @@ -1862,8 +1869,8 @@ msgid "Format" msgstr "" #: templates/default/global_search.tpl:9 -#: templates/default/base_connected.tpl:22 #: templates/default/base_connected.tpl:23 +#: templates/default/base_connected.tpl:24 msgid "Global search" msgstr "" @@ -1880,7 +1887,7 @@ msgid "LDAP server" msgstr "" #: templates/default/recoverpassword.tpl:25 templates/default/login.tpl:22 -#: templates/default/login.tpl:33 templates/default/base_connected.tpl:39 +#: templates/default/login.tpl:33 templates/default/base_connected.tpl:40 msgid "Language" msgstr "" @@ -1889,7 +1896,7 @@ msgstr "" msgid "Legend:" msgstr "" -#: templates/default/base_connected.tpl:50 +#: templates/default/base_connected.tpl:51 msgid "Logout" msgstr "" @@ -1897,7 +1904,7 @@ msgstr "" msgid "Message" msgstr "" -#: templates/default/viewSearch.tpl:134 +#: templates/default/viewSearch.tpl:113 msgid "Nb / page :" msgstr "" @@ -1945,7 +1952,7 @@ msgstr "" msgid "Readable / Writable" msgstr "" -#: templates/default/base_connected.tpl:49 +#: templates/default/base_connected.tpl:50 msgid "Refresh my access rights" msgstr "" @@ -1957,6 +1964,10 @@ msgstr "" msgid "Result" msgstr "" +#: templates/default/base_connected.tpl:6 +msgid "Show/hide menu" +msgstr "" + #: templates/default/LSmail.tpl:21 msgid "Subject" msgstr "" diff --git a/src/templates/default/modify.tpl b/src/templates/default/modify.tpl index 5bb7568f..b11b56ca 100644 --- a/src/templates/default/modify.tpl +++ b/src/templates/default/modify.tpl @@ -1,7 +1,7 @@ {extends file='ls:base_connected.tpl'} {block name="content"} - {if $pagetitle != ''}

{$pagetitle|escape:"htmlall"}

{/if} - + {if $pagetitle != ''}

{$pagetitle|escape:"htmlall"}

{/if} + {include file='ls:LSview_actions.tpl'} {include file='ls:LSform.tpl'}