From 46a8cfb51df38ad43267842a279876e73235711b Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Mon, 3 Jun 2019 14:26:01 +0200 Subject: [PATCH] Add reset search button --- public_html/images/default/reset.png | Bin 0 -> 795 bytes .../lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo | Bin 47958 -> 47995 bytes .../lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po | 32 ++++++++++-------- public_html/lang/ldapsaisie.pot | 30 +++++++++------- public_html/templates/default/viewSearch.tpl | 2 +- public_html/view.php | 13 ++++--- 6 files changed, 45 insertions(+), 32 deletions(-) create mode 100644 public_html/images/default/reset.png diff --git a/public_html/images/default/reset.png b/public_html/images/default/reset.png new file mode 100644 index 0000000000000000000000000000000000000000..ab92010c2c970d77e0412120172b4c04278fab5b GIT binary patch literal 795 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 delta 6312 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 DF&Bm& diff --git a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po b/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po index 2a9148b9..bd44d92e 100644 --- a/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po +++ b/public_html/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: LdapSaisie\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-27 18:10+0200\n" -"PO-Revision-Date: 2019-05-27 18:11+0200\n" +"POT-Creation-Date: 2019-06-03 14:24+0200\n" +"PO-Revision-Date: 2019-06-03 14:24+0200\n" "Last-Translator: Benjamin Renard \n" "Language-Team: LdapSaisie \n" @@ -57,6 +57,22 @@ msgstr "Recherche approximative" msgid "Recursive search" msgstr "Recherche récursive" +#: view.php:143 create.php:120 includes/class/class.LSrelation.php:267 +msgid "New" +msgstr "Nouveau" + +#: view.php:149 import.php:59 +msgid "Import" +msgstr "Importer" + +#: view.php:156 includes/class/class.LSsession.php:1418 +msgid "Refresh" +msgstr "Rafraîchir" + +#: view.php:161 +msgid "Reset" +msgstr "Réinitialiser" + #: select.php:70 includes/class/class.LSsession.php:1214 #: includes/class/class.LSsession.php:2284 msgid "Level" @@ -74,10 +90,6 @@ msgstr "L'objet a bien été modifié." msgid "View" msgstr "Voir" -#: import.php:59 -msgid "Import" -msgstr "Importer" - #: create.php:75 msgid "Data entry form" msgstr "Masque de saisie" @@ -86,10 +98,6 @@ msgstr "Masque de saisie" msgid "Object has been added." msgstr "L'objet a été ajouté." -#: create.php:120 includes/class/class.LSrelation.php:267 -msgid "New" -msgstr "Nouveau" - #: custom_search_action.php:53 msgid "" "The custom action %{title} have been successfully execute on this search." @@ -769,10 +777,6 @@ msgstr "" msgid "Your new password has been sent to %{mail}. " msgstr "Votre nouveau mot de passe vous a été envoyé à l'adresse %{mail}." -#: includes/class/class.LSsession.php:1418 -msgid "Refresh" -msgstr "Rafraîchir" - #: includes/class/class.LSsession.php:1434 msgid "Language" msgstr "Langue" diff --git a/public_html/lang/ldapsaisie.pot b/public_html/lang/ldapsaisie.pot index 2ca5acc3..d6769448 100644 --- a/public_html/lang/ldapsaisie.pot +++ b/public_html/lang/ldapsaisie.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-27 18:09+0200\n" +"POT-Creation-Date: 2019-06-03 14:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,6 +54,22 @@ msgstr "" msgid "Recursive search" msgstr "" +#: view.php:143 create.php:120 includes/class/class.LSrelation.php:267 +msgid "New" +msgstr "" + +#: view.php:149 import.php:59 +msgid "Import" +msgstr "" + +#: view.php:156 includes/class/class.LSsession.php:1418 +msgid "Refresh" +msgstr "" + +#: view.php:161 +msgid "Reset" +msgstr "" + #: select.php:70 includes/class/class.LSsession.php:1214 #: includes/class/class.LSsession.php:2284 msgid "Level" @@ -71,10 +87,6 @@ msgstr "" msgid "View" msgstr "" -#: import.php:59 -msgid "Import" -msgstr "" - #: create.php:75 msgid "Data entry form" msgstr "" @@ -83,10 +95,6 @@ msgstr "" msgid "Object has been added." msgstr "" -#: create.php:120 includes/class/class.LSrelation.php:267 -msgid "New" -msgstr "" - #: custom_search_action.php:53 msgid "" "The custom action %{title} have been successfully execute on this search." @@ -667,10 +675,6 @@ msgstr "" msgid "Your new password has been sent to %{mail}. " msgstr "" -#: includes/class/class.LSsession.php:1418 -msgid "Refresh" -msgstr "" - #: includes/class/class.LSsession.php:1434 msgid "Language" msgstr "" diff --git a/public_html/templates/default/viewSearch.tpl b/public_html/templates/default/viewSearch.tpl index 0b451096..4a680047 100644 --- a/public_html/templates/default/viewSearch.tpl +++ b/public_html/templates/default/viewSearch.tpl @@ -22,7 +22,7 @@ diff --git a/public_html/view.php b/public_html/view.php index f9b4a25b..87f23955 100644 --- a/public_html/view.php +++ b/public_html/view.php @@ -112,7 +112,7 @@ if(LSsession :: startLSsession()) { $object = new $LSobject(); LStemplate :: assign('pagetitle',$object -> getLabel()); - $LSsearch = new LSsearch($LSobject,'LSview'); + $LSsearch = new LSsearch($LSobject, 'LSview', null, (isset($_REQUEST['reset']))); $LSsearch -> setParam('extraDisplayedColumns',True); $LSsearch -> setParamsFormPostData(); @@ -140,23 +140,28 @@ if(LSsession :: startLSsession()) { $LSview_actions=array(); if(LSsession :: canCreate($LSobject)) { $LSview_actions['create'] = array ( - 'label' => 'New', + 'label' => _('New'), 'url' => 'create.php?LSobject='.$LSobject, 'action' => 'create' ); if ($object -> listValidIOformats()) { $LSview_actions['import'] = array ( - 'label' => 'Import', + 'label' => _('Import'), 'url' => 'import.php?LSobject='.$LSobject, 'action' => 'import' ); } } $LSview_actions['refresh'] = array ( - 'label' => 'Refresh', + 'label' => _('Refresh'), 'url' => 'view.php?LSobject='.$LSobject.'&refresh', 'action' => 'refresh' ); + $LSview_actions['reset'] = array ( + 'label' => _('Reset'), + 'url' => 'view.php?LSobject='.$LSobject.'&reset', + 'action' => 'reset' + ); /*$LSview_actions['purge'] = array ( 'label' => 'Purge the cache', 'url' => 'view.php?LSobject='.$LSobject.'&LSsearchPurgeSession',