lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15020 from defrance/patch-159

Browse Source 
NEW If specific help page is available, we change color of icon
This commit is contained in:
Laurent Destailleur 2020-10-14 18:53:44 +02:00 committed by GitHub
commit 9162e1fe96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/main.inc.php
View File

@ -12,6 +12,7 @@
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2020 Demarest Maxime <maxime@indelog.fr> * Copyright (C) 2020 Demarest Maxime <maxime@indelog.fr>
* Copyright (C) 2020 Charlene Benke <charlie@patas-monkey.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -1655,8 +1656,13 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
$helpbaseurl = ''; $helpbaseurl = '';
$helppage = ''; $helppage = '';
$mode = ''; $mode = '';
$helpresent = '';
if (empty($helppagename)) $helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios'; if (empty($helppagename)) {
$helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
} else {
$helpresent = 'helppresent';
}
// Get helpbaseurl, helppage and mode from helppagename and langs // Get helpbaseurl, helppage and mode from helppagename and langs
$arrayres = getHelpParamFor($helppagename, $langs); $arrayres = getHelpParamFor($helppagename, $langs);
@ -1674,7 +1680,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
if ($mode == 'wiki') $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage))); if ($mode == 'wiki') $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
else $text .= sprintf($helpbaseurl, $helppage); else $text .= sprintf($helpbaseurl, $helppage);
$text .= '">'; $text .= '">';
$text .= '<span class="fa fa-question-circle atoplogin valignmiddle"></span>'; $text .= '<span class="fa fa-question-circle atoplogin valignmiddle'.($helppresent ? ' '.$helppresent : '')."></span>';
$text .= '</a>'; $text .= '</a>';
$toprightmenu .= @Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2); $toprightmenu .= @Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
} }