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 4dfe1a56..70f95cbf 100644 Binary files a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo and b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo differ 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'}