From 51c6540a56baa78f3352cf672a88058551722188 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Jan 2020 23:28:50 +0100 Subject: [PATCH] WIP Advanced search --- htdocs/core/class/html.form.class.php | 14 +++++++++++--- htdocs/langs/en_US/main.lang | 5 ++++- htdocs/theme/eldy/global.inc.php | 9 +++++++++ htdocs/theme/md/style.css.php | 9 +++++++++ 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 725457b4bb5..38e18d24b8b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -8040,11 +8040,19 @@ class Form */ public function searchComponent($arrayofcriterias, $search_component_params) { + global $conf, $langs; + $ret = ''; - - - + $ret .= '
'; + //$ret .= ''; + $ret .= ''; + $ret .= ''; + $ret .= $langs->trans("Filters"); + $ret .= ''; + $ret .= ''; + $ret .= ''; + $ret .= '
'; return $ret; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index de3ea66d682..c5c24372e06 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1015,4 +1015,7 @@ ContactAddedAutomatically=Contact added from contact thirdparty roles More=More ShowDetails=Show details CustomReports=Custom reports -SelectYourGraphOptionsFirst=Select your graph options to build a graph \ No newline at end of file +SelectYourGraphOptionsFirst=Select your graph options to build a graph +Measures=Measures +XAxis=X-Axis +YAxis=Y-Axis \ No newline at end of file diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 706cff9e46e..ae9c6cb6d65 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -2573,6 +2573,15 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd border: 0px; } +.unsetcolor { + color: unset !important; +} +.nopaddingleft { + padding-: 0px; +} +.nopaddingright { + padding-: 0px; +} .notopnoleft { border-collapse: collapse; border: 0px; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 68be6b84b0c..1baea54e815 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2749,6 +2749,15 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd border: 0px; } +.unsetcolor { + color: unset !important; +} +.nopaddingleft { + padding-: 0px; +} +.nopaddingright { + padding-: 0px; +} .notopnoleft { border-collapse: collapse; border: 0px;