From f8d9a2e82955e4db5e558e2e4bc1e13fd40704dc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 21 Jan 2026 11:16:10 +0100 Subject: [PATCH] Fix css and responsive pb --- htdocs/admin/modules.php | 7 ++-- .../class/externalModules.class.php | 35 ++++++++++++------- htdocs/admin/remotestore/css/store.css | 2 +- htdocs/core/lib/functions.lib.php | 11 ++++++ htdocs/theme/eldy/theme_vars.inc.php | 2 +- 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index c0b166d4730..3fbb0cb29d7 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -1296,8 +1296,8 @@ if ($mode == 'marketplace') { print '
'; print ''."\n"; print ''."\n"; - print ''; - print ''; + print ''; print ''; print ''; @@ -1412,8 +1412,9 @@ if ($mode == 'marketplace') { print $remotestore->getPagination(); print ''; - print ''; + print ''; print '
'; + print ''; ?>
diff --git a/htdocs/admin/remotestore/class/externalModules.class.php b/htdocs/admin/remotestore/class/externalModules.class.php index 1b3e49daed9..97763fc6ae7 100644 --- a/htdocs/admin/remotestore/class/externalModules.class.php +++ b/htdocs/admin/remotestore/class/externalModules.class.php @@ -534,7 +534,7 @@ class ExternalModules } elseif ($this->versionCompare($product["dolibarr_min"], $dolibarrversiontouse) <= 0) { if (!empty($product["dolibarr_max"]) && $product["dolibarr_max"] != 'auto' && $product["dolibarr_max"] != 'unknown' && $this->versionCompare($product["dolibarr_max"], $dolibarrversiontouse) >= 0) { //compatible - $version = ''.$langs->trans( + $version = ''.$langs->trans( 'CompatibleUpTo', $dolibarrversiontouse, $product["dolibarr_min"], @@ -543,7 +543,7 @@ class ExternalModules $compatible = ''; } else { // never compatible, module expired - $version = ''.$langs->trans( + $version = ''.$langs->trans( 'NotCompatible', $dolibarrversiontouse, $product["dolibarr_min"], @@ -574,7 +574,7 @@ class ExternalModules } // Output the line - $html .= '
'; + $html .= ''; // Logo $html .= ''; + if (getDolOptimizeSmallScreen()) { + $html .= ''; + } + // Price - do not load if display none - $html .= ''; + + if (!getDolOptimizeSmallScreen()) { + $html .= ''; + $html .= ''; + $html .= $download_link; + $html .= ''; $html .= ''; } if (empty($this->products)) { - $html .= ''; diff --git a/htdocs/admin/remotestore/css/store.css b/htdocs/admin/remotestore/css/store.css index 94645994e57..02c6a673d99 100644 --- a/htdocs/admin/remotestore/css/store.css +++ b/htdocs/admin/remotestore/css/store.css @@ -124,7 +124,7 @@ div.divsearchfield { tr.app { height: 200px; } -tr.app td { +tr.app2 td { border-bottom: 1px solid #888; } div#newsDoli.tabBar { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index b6220161fef..7c382e2b3c8 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -315,6 +315,17 @@ function getDolCurrency() return (string) $conf->currency; } +/** + * Return if render must be optimized for small screen + * + * @return string Value returned + */ +function getDolOptimizeSmallScreen() +{ + global $conf; + return (string) $conf->dol_optimize_smallscreen; +} + /** * Return the current entity * diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php index c8eb6aef288..3d8fa004106 100644 --- a/htdocs/theme/eldy/theme_vars.inc.php +++ b/htdocs/theme/eldy/theme_vars.inc.php @@ -64,7 +64,7 @@ $colorbacklinepair2 = '252,252,252'; // line pair $colorbacklinepairhover = '240,242,249'; // line hover $colorbacklinepairchecked = '240,242,249'; // line checked $colorbacklinebreak = '248,247,244'; // line break -$colortexttitlenotab = '35,135,140'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120 +$colortexttitlenotab = '0,135,160'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120 $colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120 $colortexttitle = '40, 40, 60'; $colortexttitlelink = '10, 20, 100';
'.$form->textwithpicto($langs->trans("ModuleProviderSites"), $langs->trans("WebSiteDesc")).''; + print ''.$form->textwithpicto($langs->trans("ModuleProviderSites"), $langs->trans("WebSiteDesc")).''; print '
'; @@ -585,17 +585,17 @@ class ExternalModules $html .= '

'; $html .= dolPrintHTML(dol_string_nohtmltag(ucfirst($product["label"]))); if (!empty($product['author']) && $product['author'] != 'unkownauthor') { - $html .= '   -   '.img_picto('', 'company', 'class="pictofixedwidth"'); + $html .= '   -   '.img_picto('', 'company', 'class="pictofixedwidth"'); if (!empty($product['author_url'])) { $html .= ''.$product['author'].''; } else { $html .= $product['author']; } - $html .= ''; + $html .= ''; } - $html .= '
'; + $html .= '
'; $html .= $version; // Version Dolibarr. No dol_escape_htmltag, it is already escape html - $html .= '
'; + $html .= ''; $html .= '

'; $html .= ' '; @@ -632,21 +632,32 @@ class ExternalModules $html .= '
'.dolPrintHTML(dol_string_nohtmltag($product["description"])).'
'; $html .= '
'; + $html .= ''; $html .= $price; - $html .= ''; + } // Links - $html .= ''.$download_link.'
'; - $html .= '

'; + $colspan = (getDolOptimizeSmallScreen() ? 1 : 3); $langs->load("website"); + + $html .= '
'; + $html .= '

'; $html .= $langs->trans("noResultsWereFound").'...'; $html .= '

'; $html .= '