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

NEW Restore version of application on main screen for screenshot

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-15 17:20:11 +01:00
parent 6c9fb06292
commit f47966a25a
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/main.inc.php
View File

@ -1714,11 +1714,6 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
if ($helpbaseurl && $helppage)
{
$text = '';
if (!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
$langs->load('admin');
$appli .= '<br>'.$langs->trans("Database").': '.$db->database_name;
}
$title = $appli.'<br>';
$title .= $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
if ($mode == 'wiki') $title .= ' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;';
$text .= '<a class="help" target="_blank" rel="noopener" href="';
@ -1729,6 +1724,13 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
$text .= '</a>';
$toprightmenu .= @Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
}
if (!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
$langs->load('admin');
$appli .= '<br>'.$langs->trans("Database").': '.$db->database_name;
}
$text = '<a href="#"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></a>';
$toprightmenu .= @Form::textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2);
}

17
htdocs/theme/eldy/global.inc.php
View File

@ -2125,19 +2125,28 @@ div.login a:hover {
}
div.login_block_user {
display: inline-block;
vertical-align: middle;
line-height: <?php echo $disableimages ? '25' : '50'; ?>px;
height: <?php echo $disableimages ? '25' : '50'; ?>px;
}
div.login_block_other {
display: inline-block;
vertical-align: middle;
clear: <?php echo $disableimages ? 'none' : 'both'; ?>;
padding-top: 0;
text-align: right;
margin-right: 8px;
max-width: 200px;
}
div.login_block_other { padding-top: 0; text-align: right; margin-right: 8px; }
.login_block_elem {
float: right;
vertical-align: top;
padding: 0px 3px 0px 4px !important;
line-height: <?php echo $disableimages ? '25' : '48'; ?>px;
height: <?php echo $disableimages ? '25' : '50'; ?>px;
}
.login_block_other .login_block_elem {
line-height: 25px;
height: 25px;
}
.atoplogin, .atoplogin:hover {
color: #<?php echo $colortextbackhmenu; ?> !important;
@ -2257,7 +2266,7 @@ a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; wh
font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
li a.vsmenudisabled, li.vsmenudisabled { color: #aaa !important; }
a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { font-size:<?php print is_numeric($fontsizesmaller) ? ($fontsizesmaller.'px') : $fontsizesmaller; ?>; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; color: #aaa; text-decoration: none; }
a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { text-align: <?php print $left; ?>; color: #aaa; text-decoration: none; }
.vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
{