vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debug v20

Browse source
This commit is contained in:
Laurent Destailleur 2024-06-22 15:20:11 +02:00
parent b4cc409a37
commit 9bc84fdd4e
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
htdocs/admin/ihm.php
View file

@ -417,11 +417,13 @@ if ($mode == 'other') {
print '<td class="titlefieldmiddle"></td>';
print '</tr>';
// Show Quick Add link
print '<tr class="oddeven"><td>' . $langs->trans("ShowQuickAddLink") . '</td><td>';
print ajax_constantonoff("MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
print '</td>';
print '</tr>';
if (!empty($conf->use_javascript_ajax)) {
// Show Quick Add link
print '<tr class="oddeven"><td>' . $langs->trans("ShowQuickAddLink") . '</td><td>';
print ajax_constantonoff("MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
print '</td>';
print '</tr>';
}
// Hide wiki link on login page
$pictohelp = '<span class="fa fa-question-circle"></span>';

3
htdocs/core/class/doleditor.class.php
View file

@ -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;

9
htdocs/main.inc.php
View file

@ -2763,13 +2763,14 @@ function top_menu_quickadd()
}
}
$html .= '<!-- div for quick add link -->
if (!empty($conf->use_javascript_ajax)) {
$html .= '<!-- div for quick add link -->
<div id="topmenu-quickadd-dropdown" class="atoplogin dropdown inline-block">
<a accesskey="a" class="dropdown-toggle login-dropdown-a nofocusvisible" data-toggle="dropdown" href="#" title="'.$langs->trans('QuickAdd').' ('.$stringforfirstkey.' a)"><i class="fa fa-plus-circle"></i></a>
<div class="dropdown-menu">'.printDropdownQuickadd().'</div>
</div>';
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 .= '
<!-- Code to show/hide the user drop-down for the quick add -->
<script>
jQuery(document).ready(function() {
@ -2808,7 +2809,9 @@ function top_menu_quickadd()
});
</script>
';
}
}
return $html;
}