diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 300665578d7837c897c9f5db2465675ed679f50d..51d0a6174c855470f6a81d6bbb3232b3450c04e7 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -48,6 +48,7 @@ if (! defined("MAIN_MOTD")) define("MAIN_MOTD","");
// List of supported permanent search area
$searchform=array();
+/* deprecated
if (empty($conf->use_javascript_ajax))
{
$searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT", "MAIN_SEARCHFORM_EMPLOYEE");
@@ -55,6 +56,7 @@ if (empty($conf->use_javascript_ajax))
$searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("Members"), $langs->trans("Projects"), $langs->trans("Users"));
$searchformmodule=array('Module1Name','Module1Name','Module50Name','Module310Name','Module400Name');
}
+*/
/*
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 7ec92e17fa6fab88369a09948659ecc325442003..ea611fe947a1265466f2271c8993dcfdc8ad7bc2 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -76,13 +76,6 @@ class modAdherent extends DolibarrModules
$this->const = array();
$r=0;
- $this->const[$r][0] = "MAIN_SEARCHFORM_ADHERENT";
- $this->const[$r][1] = "yesno";
- $this->const[$r][2] = "1";
- $this->const[$r][3] = "Show form for quick member search";
- $this->const[$r][4] = 0;
- $r++;
-
$this->const[$r][0] = "ADHERENT_MAIL_RESIL";
$this->const[$r][1] = "texte";
$this->const[$r][2] = "Votre adhésion vient d'être résiliée.\r\nNous espérons vous revoir très bientôt";
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index e0f1c2af8fe68013b36716b3e5792609e4578e91..295e348dc988f76cb51f4dd63896358a9f12adaa 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -84,13 +84,6 @@ class modProduct extends DolibarrModules
$this->const[$r][4] = 0;
$r++;
- $this->const[$r][0] = "MAIN_SEARCHFORM_PRODUITSERVICE";
- $this->const[$r][1] = "yesno";
- $this->const[$r][2] = "1";
- $this->const[$r][3] = "Show form for quick product search";
- $this->const[$r][4] = 0;
- $r++;
-
// Boxes
$this->boxes = array(
0=>array('file'=>'box_produits.php','enabledbydefaulton'=>'Home'),
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index dd2aa0a6711936efa14d9c76b9c37c1d880bb2a6..41fd00e546367a5bc8e994aab75b6a14aac07ba9 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -96,20 +96,6 @@ class modSociete extends DolibarrModules
$this->const[$r][4] = 0;
$r++;
- $this->const[$r][0] = "MAIN_SEARCHFORM_SOCIETE";
- $this->const[$r][1] = "yesno";
- $this->const[$r][2] = "1";
- $this->const[$r][3] = "Show form for quick company search";
- $this->const[$r][4] = 0;
- $r++;
-
- $this->const[$r][0] = "MAIN_SEARCHFORM_CONTACT";
- $this->const[$r][1] = "yesno";
- $this->const[$r][2] = "1";
- $this->const[$r][3] = "Show form for quick contact search";
- $this->const[$r][4] = 0;
- $r++;
-
$this->const[$r][0] = "COMPANY_ADDON_PDF_ODT_PATH";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/thirdparties";
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d57bbe8c2a5de2fcb78e88d71a8210a541afd1fb..a24eda81fb31b4422dbb87fa77d3f7a75a8d1830 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1615,38 +1615,38 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
else
{
// Define $searchform
- if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
+ if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && $user->rights->societe->lire)
{
$langs->load("companies");
$searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'soc', 'sall', 'T', 'searchleftt', img_object('','company'));
}
- if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire)
+ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
{
$langs->load("companies");
$searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'contact', 'sall', 'A', 'searchleftc', img_object('','contact'));
}
if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
- && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE))
+ )
{
$langs->load("products");
$searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleftp', img_object('','product'));
}
- if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire)
+ if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
{
$langs->load("projects");
$searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
}
- if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire)
+ if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
{
$langs->load("members");
$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user'));
}
- if (! empty($conf->user->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_USER) && $user->rights->user->user->lire)
+ if (! empty($conf->user->enabled) && $user->rights->user->user->lire)
{
$langs->load("users");
$searchform.=printSearchForm(DOL_URL_ROOT.'/user/list.php', DOL_URL_ROOT.'/user/list.php', $langs->trans("Users"), 'user', 'sall', 'M', 'searchleftuser', img_object('','user'));
@@ -1662,6 +1662,19 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
}
else $searchform=$hookmanager->resPrint;
+ if ($conf->use_javascript_ajax && $conf->browser->layout == 'phone')
+ {
+ $searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
+ $searchform.='<script type="text/javascript">
+ jQuery(document).ready(function () {
+ jQuery("#divsearchforms1").click(function(){
+ jQuery("#divsearchforms2").toggle();
+ });
+ });
+ </script>' . "\n";
+ $searchform.='</div>';
+ }
+
// Define $bookmarks
if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
{
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index fae19ae1c3a8fe0e780404d1dc7bddcb8d92022f..536801716dd9fdf0a9d24ef8c4676157ff92bba6 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1187,14 +1187,14 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
-.vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenubookmarks
+.vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
{
border-top: 1px solid #BBB;
}
a.vsmenu.addbookmarkpicto {
padding-right: 10px;
}
-.vmenu div.blockvmenubookmarks, .vmenu div.blockvmenuend, .vmenu div.blockvmenulogo
+.vmenu div.blockvmenubookmarks, .vmenu div.blockvmenuend, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone
{
border-bottom: 1px solid #BBB;
}
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 58d0f282b100ab0355243afee35991855e093cf0..a853870ee8c4ee97addef9d536f6664a29ef7a9d 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -67,9 +67,11 @@ $object->fetch($id);
$object->getrights();
// Liste des zone de recherche permanentes supportees
+/* deprecated
$searchform=array("main_searchform_societe","main_searchform_contact","main_searchform_produitservice");
$searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE);
$searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),$langs->trans("ProductsAndServices"));
+*/
$form = new Form($db);
$formadmin=new FormAdmin($db);
@@ -107,8 +109,6 @@ if (empty($reshook)) {
$tabparam["MAIN_THEME"] = '';
}
- $tabparam["MAIN_SEARCHFORM_CONTACT"] = $_POST["main_searchform_contact"];
-
$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'), array()))));
if ($val == '') {
$tabparam['THEME_ELDY_TOPMENU_BACK1'] = '';
@@ -131,10 +131,6 @@ if (empty($reshook)) {
$tabparam["THEME_ELDY_USE_HOVER"] = 0;
}
- $tabparam["MAIN_SEARCHFORM_SOCIETE"] = $_POST["main_searchform_societe"];
-
- $tabparam["MAIN_SEARCHFORM_PRODUITSERVICE"] = $_POST["main_searchform_produitservice"];
-
$result = dol_set_user_param($db, $conf, $object, $tabparam);
header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);