diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index a09ae2a044f..0f540e144e7 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -58,27 +58,30 @@ llxHeader('', '', '', '', 0, 0, '', '', '', 'mod-admin page-system_about');
print load_fiche_titre($langs->trans("ExternalResources"), '', 'title_setup');
-print '
'.img_picto_common('', 'dolibarr_box.png', 'height="120"').'
';
-
-
print '';
+print '
';
+print '
'.img_picto_common('', 'dolibarr_box.png', 'height="100"').'
';
print $langs->trans("DolibarrLicense").' : ';
print '
';
+print'
';
//print "
\n";
+print '
';
print $langs->trans("Developpers").':';
print '
';
+print '
';
//print "
\n";
+print '
';
print $langs->trans("OtherInformations").':';
print '
';
+print '
';
+print '
';
print $langs->trans("Demo").':';
print '
';
+print '
';
+print '
';
print $langs->trans("ModulesMarketPlaces").':';
print '
';
-
+print '
';
print '
';
-
+print '
';
print $langs->trans("HelpCenter").':';
print '
';
+print '
';
-
+print '
';
print $langs->trans("Foundation").':';
print '
';
+print '
';
+print '
';
print $langs->trans("SocialNetworks").':';
print '
';
+print '
';
-
+print '
';
print $langs->trans("OtherResources").':';
print '
';
+print '
';
print '
';
print '
';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c1d2f0ebe5b..a7c4484da85 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1125,6 +1125,7 @@ class Form
}
}
$out .= '';
+ $out .= ajax_combobox($htmlname);
if ($conf->use_javascript_ajax && empty($disableautocomplete)) {
$out .= ajax_multiautocompleter('location_incoterms', array(), DOL_URL_ROOT . '/core/ajax/locationincoterms.php') . "\n";
@@ -8893,7 +8894,7 @@ class Form
cache: true
},
language: select2arrayoflanguage,
- containerCssClass: \':all:\', /* Line to add class of origin SELECT propagated to the new tag */
placeholder: "' . dol_escape_js($placeholder) . '",
escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
minimumInputLength: ' . ((int) $minimumInputLength) . ',
@@ -8983,7 +8984,7 @@ class Form
$(".' . $htmlname . '").select2({
data: data,
language: select2arrayoflanguage,
- containerCssClass: \':all:\', /* Line to add class of origin SELECT propagated to the new tag */
placeholder: "' . dol_escape_js($placeholder) . '",
escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
minimumInputLength: ' . $minimumInputLength . ',
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 79de2f1c0a3..0996eae15bc 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -3362,7 +3362,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
//$textsearch = $langs->trans("Search");
$textsearch = ''.$langs->trans("Search");
- $searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, 'accesskey="s"', 1, 0, (!getDolGlobalString('MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY') ? 1 : 0), 'vmenusearchselectcombo', 1, $textsearch, 1, $stringforfirstkey.' s');
+ $searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, 'accesskey="s"', 1, 0, (getDolGlobalString('MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY') ? 0 : 1), 'vmenusearchselectcombo', 1, $textsearch, 1, $stringforfirstkey.' s');
} else {
if (is_array($arrayresult)) {
// @phan-suppress-next-line PhanEmptyForeach // array is really empty in else case.
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 955f7026681..ec4f64e8905 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1692,7 +1692,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
}
print ' | ';
print '';
- print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOSTINT("no_email") : getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS')), 1, false, (getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2));
+ print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOSTINT("no_email") : getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS')), 1, false, (getDolGlobalInt('MAILING_CONTACT_DEFAULT_BULK_STATUS') == 2 ? 1 : 0), 1);
print ' | ';
}
print '';
@@ -1856,9 +1856,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
print '| '.$form->editfieldkey('Capital', 'capital', '', $object, 0).' | ';
print ' ';
if (isModEnabled("multicurrency")) {
- print ''.$langs->trans("Currency".$object->multicurrency_code).' |
';
+ print '';
+ //print $langs->trans("Currency".$object->multicurrency_code);
+ print $langs->getCurrencySymbol($object->multicurrency_code);
+ print '';
} else {
- print ''.$langs->trans("Currency".$conf->currency).'';
+ print '';
+ print $langs->getCurrencySymbol($conf->currency);
+ //print $langs->trans("Currency".$conf->currency);
+ print '';
}
if (getDolGlobalInt('MAIN_MULTILANGS')) {
print '| '.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).' | '."\n";
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 40b62833cd2..b5cbeb76443 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3499,7 +3499,7 @@ div.vmenu, td.vmenu {
.vmenu {
width: px;
- margin-left: 6px;
+ margin-left: 8px;
display: none;
@@ -3593,10 +3593,23 @@ div.blockvmenusearchphone
{
margin: 0 0 8px 2px;
}
-.vmenu div.blockvmenusearch
-{
- padding-bottom: 13px;
+.vmenu div.blockvmenusearch {
+ margin-top: 5px;
+ margin-bottom: 15px;
}
+/*
+.vmenu div.blockvmenusearch {
+ border: 1px solid #888;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 0;
+ padding-right: 0;
+ border-radius: 6px;
+ box-sizing: border-box;
+ margin-left: 3px;
+ margin-left: 3px;
+}
+*/
.vmenu div.blockvmenuend
{
padding-bottom: 5px;
@@ -5446,7 +5459,11 @@ div#card-errors {
border: 1px solid #e0e0e0;
border-radius: 6px;
}
-
+.ui-dialog {
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-top: 10px;
+}
/* ============================================================================== */
/* For content of image preview */
@@ -6910,7 +6927,7 @@ input.select2-input {
.select2-dropdown {
/*background-color: var(--colorbackvmenu1);
border: 1px solid var(--colorbackvmenu1); */
- box-shadow: 1px 2px 10px var(--colorbackvmenu1);
+ box-shadow: 1px 2px 10px #8884;
background-color: var(--colorbackbody);
color: var(--colortext);
}
@@ -7078,9 +7095,14 @@ span#select2-boxbookmark-container {
cursor: text;
overflow: hidden;
}
-
-ul.select2-results__options li {
- font-size: 0.95em;
+.select2-results__option {
+ padding: 8px;
+}
+span.select2-dropdown--below {
+ margin-top: -1px;
+}
+span.select2-dropdown--above {
+ margin-bottom: -1px;
}
.parentonrightofpage {
|