Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix MAIN_OPTIMIZEFORTEXTBROWSER

Browse Source
This commit is contained in:
Laurent Destailleur
2020-09-16 13:15:57 +02:00
parent 40acd8a386
commit 09558d0ce9
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/functions.lib.php
View File

@@ -1212,11 +1212,11 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
if ($morehtmlright) $out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under. if ($morehtmlright) $out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.
// Show title // Show title
if (!empty($title) && $showtitle) if (!empty($title) && $showtitle && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{ {
$limittitle = 30; $limittitle = 30;
$out .= '<a class="tabTitle">'; $out .= '<a class="tabTitle">';
if ($picto && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' '; if ($picto) $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
$out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>'; $out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>';
$out .= '</a>'; $out .= '</a>';
} }

2
htdocs/core/lib/usergroups.lib.php
View File

@@ -47,7 +47,7 @@ function user_prepare_head($object)
$head = array(); $head = array();
$head[$h][0] = DOL_URL_ROOT.'/user/card.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/user/card.php?id='.$object->id;
$head[$h][1] = $langs->trans("UserCard"); $head[$h][1] = $langs->trans("User");
$head[$h][2] = 'user'; $head[$h][2] = 'user';
$h++; $h++;

3
htdocs/main.inc.php
View File

@@ -1698,9 +1698,10 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
} }
} }
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$text = '<span href="#" class="aversion"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></span>'; $text = '<span href="#" class="aversion"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></span>';
$toprightmenu .= @Form::textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2); $toprightmenu .= @Form::textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2);
}
// Logout link // Logout link
$toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2); $toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);