From 9bc84fdd4e68a90c78b31147840c47b64d2d9090 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 22 Jun 2024 15:20:11 +0200 Subject: [PATCH] Debug v20 --- htdocs/admin/ihm.php | 12 +++++++----- htdocs/core/class/doleditor.class.php | 3 +++ htdocs/main.inc.php | 9 ++++++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 7d6a6116a9f..d8f102ba2bc 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -417,11 +417,13 @@ if ($mode == 'other') { print ''; print ''; - // Show Quick Add link - print '' . $langs->trans("ShowQuickAddLink") . ''; - print ajax_constantonoff("MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other'); - print ''; - print ''; + if (!empty($conf->use_javascript_ajax)) { + // Show Quick Add link + print '' . $langs->trans("ShowQuickAddLink") . ''; + print ajax_constantonoff("MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other'); + print ''; + print ''; + } // Hide wiki link on login page $pictohelp = ''; diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index a4f0689d687..1272ffb3043 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -97,6 +97,9 @@ class DolEditor $this->tool = 'ace'; } //if ($conf->dol_use_jmobile) $this->tool = 'textarea'; // ckeditor and ace seems ok with mobile + if (empty($conf->use_javascript_ajax)) { // If no javascript, we force use of textarea + $this->tool = 'textarea'; + } if ( isset($poscursor['find']) ) { $posy = 0; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 24774489d58..7d3daf1971f 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -2763,13 +2763,14 @@ function top_menu_quickadd() } } - $html .= ' + if (!empty($conf->use_javascript_ajax)) { + $html .= ' '; - if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax)) { // This may be set by some pages that use different jquery version to avoid errors - $html .= ' + if (!defined('JS_JQUERY_DISABLE_DROPDOWN')) { // This may be set by some pages that use different jquery version to avoid errors + $html .= ' '; + } } + return $html; }