Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

CSS For bookmark dropdown

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-21 17:18:01 +01:00
parent df1851838e
commit 7e4af04886
7 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/conf.class.php
View File

@ -686,8 +686,6 @@ class Conf
if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) $this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';
if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) $this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';
if (! isset($this->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) $this->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN = 1;
// If we are in develop mode, we activate the option MAIN_SECURITY_CSRF_WITH_TOKEN to 1 if not already defined.
if (!isset($this->global->MAIN_SECURITY_CSRF_WITH_TOKEN) && $this->global->MAIN_FEATURES_LEVEL >= 2) $this->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 1;

51
htdocs/main.inc.php
View File

@ -1623,31 +1623,6 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
print '<div class="login_block usedropdown">'."\n";
// Add login user link
$toprightmenu .= '<div class="login_block_user">';
// Login name with photo and tooltip
$mode = -1;
$toprightmenu .= '<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
// Add search dropdown
$toprightmenu .= top_menu_search();
}
if (!empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) {
// Add bookmark dropdown
$toprightmenu .= top_menu_bookmark();
}
// Add user dropdown
$toprightmenu .= top_menu_user();
$toprightmenu .= '</div></div>';
$toprightmenu .= '</div>'."\n";
$toprightmenu .= '<div class="login_block_other">';
// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
@ -1739,7 +1714,31 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
// Logout link
$toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);
$toprightmenu .= '</div>';
$toprightmenu .= '</div>'; // end div class="login_block_other"
// Add login user link
$toprightmenu .= '<div class="login_block_user">';
// Login name with photo and tooltip
$mode = -1;
$toprightmenu .= '<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
// Add search dropdown
$toprightmenu .= top_menu_search();
}
// Add bookmark dropdown
$toprightmenu .= top_menu_bookmark();
// Add user dropdown
$toprightmenu .= top_menu_user();
$toprightmenu .= '</div></div>';
$toprightmenu .= '</div>'."\n";
print $toprightmenu;

2
htdocs/theme/eldy/dropdown.inc.php
View File

@ -124,7 +124,7 @@ button.dropdown-item.global-search-item {
}
.tmenu .dropdown-menu, .login_block .dropdown-menu {
position: absolute;
right: 0;
right: 2px;
<?php echo $left; ?>: auto;
line-height:1.3em;
}

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

@ -1150,7 +1150,7 @@ td.showDragHandle {
#id-left {
padding-top: 20px;
padding-bottom: 5px;
<?php if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN) && !empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) { ?>
<?php if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) { ?>
padding-top: 8px;
<?php } ?>
}
@ -1340,7 +1340,7 @@ div.fichetwothirdright {
<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?>
}
div.fichetwothirdright div.ficheaddleft {
padding-left: 20px;
padding-<?php echo $left ?>: 20px;
}
div.fichehalfleft {
<?php if ($conf->browser->layout != 'phone') { print "float: ".$left.";\n"; } ?>

2
htdocs/theme/eldy/style.css.php
View File

@ -204,7 +204,7 @@ if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $m
if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
if (!empty($conf->bookmark->enabled) && !empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
if (!empty($conf->bookmark->enabled)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
print '/*'."\n";

4
htdocs/theme/md/dropdown.inc.php
View File

@ -16,7 +16,9 @@ div#topmenu-bookmark-dropdown {
top: 0px;
}
#topmenu-login-dropdown .dropdown-toggle:after {
display: none;
}
button.dropdown-item.global-search-item {

2
htdocs/theme/md/style.css.php
View File

@ -2280,7 +2280,7 @@ div.login_block_other { padding-top: 3px; }
float: right;
vertical-align: top;
padding: 0px 0px 0px 2px !important;
height: 16px;
height: 18px;
}
.login_block_elem_name {
margin-top: 1px;