From d23604701cc7f4cc0e6ae60a4e8b1a2ac98be65f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 7 Dec 2016 15:00:20 +0100 Subject: [PATCH] Fix responsive --- dev/skeletons/modMyModule.class.php | 2 +- htdocs/comm/propal/list.php | 2 +- htdocs/core/class/html.form.class.php | 22 +++++++++++----------- htdocs/product/stock/massstockmove.php | 5 ++++- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 64890b9d9cf..4f994c7c654 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -64,7 +64,7 @@ class modMyModule extends DolibarrModules $this->description = "Description of module MyModule"; $this->descriptionlong = "A very long description. Can be a full HTML content"; $this->editor_name = 'Editor name'; - $this->editor_url = 'http://www.dolibarr.org'; + $this->editor_url = 'https://www.dolibarr.org'; // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z' $this->version = '1.0'; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 02afc350e97..647ed8a7b4b 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -538,7 +538,7 @@ if ($resql) $moreforfilter.='
'; $moreforfilter.=$langs->trans('IncludingProductWithTag'). ': '; $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1); - $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, '', 1); + $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1); $moreforfilter.='
'; } $parameters=array(); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index b1b798e2c00..a86a3b939a2 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4871,17 +4871,17 @@ class Form if ($addjscombo && empty($conf->dol_use_jmobile) && $jsbeautify) { $minLengthToAutocomplete=0; - $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT')?constant('REQUIRE_JQUERY_MULTISELECT'):'select2':$conf->global->MAIN_USE_JQUERY_MULTISELECT; - $out.=' - '; + $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?(constant('REQUIRE_JQUERY_MULTISELECT')?constant('REQUIRE_JQUERY_MULTISELECT'):'select2'):$conf->global->MAIN_USE_JQUERY_MULTISELECT; + + // Enhance with select2 + $nodatarole=''; + if ($conf->use_javascript_ajax) + { + include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; + $comboenhancement = ajax_combobox($htmlname); + $out.=$comboenhancement; + $nodatarole=($comboenhancement?' data-role="none"':''); + } } $out.=''; print ''; + +print '
'; print ''; //print '
'; @@ -378,7 +380,7 @@ print ''; if ($conf->productbatch->enabled) { print '
'; } // In warehouse @@ -428,6 +430,7 @@ foreach($listofdata as $key => $val) } print '
'; - print ''; + print ''; print '
'; +print '
'; print '';