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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-02-08 11:17:14 +01:00
commit e81a2548d8
2 changed files with 277 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
htdocs/theme/eldy/main_menu_fa_icons.css Normal file
View File

@ -0,0 +1,151 @@
div.mainmenu.home::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f015";
color: white;
font-size: 1.5em;
}
div.mainmenu.billing::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f0d6";
color: white;
font-size: 1.5em;
}
div.mainmenu.accountancy::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f0d6";
color: white;
font-size: 1.5em;
}
div.mainmenu.agenda::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f073";
color: white;
font-size: 1.5em;
}
div.mainmenu.bank::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f19c";
color: white;
font-size: 1.5em;
}
div.mainmenu.cashdesk::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f788";
color: white;
font-size: 1.5em;
}
div.mainmenu.takepos::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f788";
color: white;
font-size: 1.5em;
}
div.mainmenu.companies::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f1ad";
color: white;
font-size: 1.5em;
}
div.mainmenu.commercial::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f508";
color: white;
font-size: 1.5em;
}
div.mainmenu.ecm::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f07c";
color: white;
font-size: 1.5em;
}
div.mainmenu.externalsite::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f360";
color: white;
font-size: 1.5em;
}
div.mainmenu.ftp::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f362";
color: white;
font-size: 1.5em;
}
div.mainmenu.hrm::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f5ca";
color: white;
font-size: 1.5em;
}
div.mainmenu.members::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f0c0";
color: white;
font-size: 1.5em;
}
div.mainmenu.products::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f468";
color: white;
font-size: 1.5em;
}
div.mainmenu.project::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f542";
color: white;
font-size: 1.5em;
}
div.mainmenu.ticket::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f3ff";
color: white;
font-size: 1.5em;
}
div.mainmenu.tools::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f0ad";
color: white;
font-size: 1.5em;
}
div.mainmenu.website::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f0e8";
color: white;
font-size: 1.5em;
}

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

@ -1716,8 +1716,10 @@ a.tmenuimage {
/* Do not load menu img for other if hidden to save bandwidth */ /* Do not load menu img for other if hidden to save bandwidth */
<?php if (empty($dol_hide_topmenu)) { ?> <?php if (empty($dol_hide_topmenu)) : ?>
<?php if (! defined('DISABLE_FONT_AWSOME') && !empty($conf->global->MAIN_USE_FONT_AWESOME_5)) { ?>
<?php include echo dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.css', 1); ?>
<?php } else { ?>
div.mainmenu.home{ div.mainmenu.home{
background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home_over.png', 1) ?>); background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home_over.png', 1) ?>);
background-position-x: center; background-position-x: center;
@ -1811,7 +1813,6 @@ foreach($conf->modules as $val)
{ {
$mainmenuused.=','.(isset($moduletomainmenu[$val])?$moduletomainmenu[$val]:$val); $mainmenuused.=','.(isset($moduletomainmenu[$val])?$moduletomainmenu[$val]:$val);
} }
//var_dump($mainmenuused);
$mainmenuusedarray=array_unique(explode(',',$mainmenuused)); $mainmenuusedarray=array_unique(explode(',',$mainmenuused));
$generic=1; $generic=1;
@ -1862,9 +1863,8 @@ while ($j++ < 4)
// End of part to add more div class css // End of part to add more div class css
?> ?>
<?php <?php } //legacy icons ?>
} // End test if $dol_hide_topmenu <?php } // End test if $dol_hide_topmenu ?>
?>
.tmenuimage { .tmenuimage {
padding:0 0 0 0 !important; padding:0 0 0 0 !important;