diff --git a/workflow/engine/menus/processmaker.php b/workflow/engine/menus/processmaker.php index 00938be7a..2b4bce638 100755 --- a/workflow/engine/menus/processmaker.php +++ b/workflow/engine/menus/processmaker.php @@ -48,7 +48,7 @@ if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) { // ADMIN MODULE if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1) { - $G_TMP_MENU->AddIdRawOption('SETUP', 'setup/main', G::LoadTranslation('ID_SETUP'), '', '', '', 'x-pm-setup'); + $G_TMP_MENU->AddIdRawOption('SETUP', 'setup/main', strtolower(G::LoadTranslation('ID_SETUP')), '', '', '', 'x-pm-setup'); } /*----------------------------------********---------------------------------*/ diff --git a/workflow/engine/skinEngine/neoclassic/css/style.css b/workflow/engine/skinEngine/neoclassic/css/style.css index bae524f5a..54e56e44f 100644 --- a/workflow/engine/skinEngine/neoclassic/css/style.css +++ b/workflow/engine/skinEngine/neoclassic/css/style.css @@ -486,14 +486,7 @@ span.XtreeMinus:hover { /* Theme leimnud.module.grid END */ /* Menues */ TD.mainMenuBG { - background-image: url(/skins/neoclassic/images/ext/gray/toolbar/bg.gif); - background-repeat: repeat-x; - /*height: 25px;*/ - - left: 46px; - top: 72px; - direction: ltr; - text-align: left; + vertical-align: top; } TD.mainMenu { background-image: url(/skins/neoclassic/images/classic/bm.jpg); @@ -3262,7 +3255,6 @@ table.DynarchCalendar-titleCont { } /*Menu Principal*/ #pm_main_table .mainMenuBG { - background: #676767; } ul#pm_menu { list-style: none; @@ -3272,21 +3264,27 @@ ul#pm_menu { ul#pm_menu li { float: left; padding: 0; - height: 25px; + margin-top: 6.5px; } ul#pm_menu a { - color: #fff; - font-size: 13px; + color: #7b7c80; + font-size: 15px; text-decoration: none; display: block; - padding: 0px 25px; - text-transform: uppercase; - line-height: 25px; + text-transform: capitalize; font-weight: bold; + padding: 16px 3px 3px 3px; + margin: 0 12px 0 12px; +} +ul#pm_menu a:hover { + color:#3397e1; +} +ul#pm_menu li.SelectedMenu a{ + color:#3397e1; + border-bottom: 2px solid #3397e1; } ul#pm_menu li.SelectedMenu, ul#pm_menu li:hover { - background: #00a1e4; } ul#pm_submenu { list-style: none; @@ -3485,5 +3483,5 @@ button.x-btn-text:focus, } .logo_company { - padding-left: 10px; + padding: 7px 10px; } \ No newline at end of file diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html index ee901deb5..f429b65e1 100644 --- a/workflow/engine/skinEngine/neoclassic/layout.html +++ b/workflow/engine/skinEngine/neoclassic/layout.html @@ -8,12 +8,18 @@ -
+ {if $user_logged neq '' or $tracker neq ''} - - + + - @@ -47,25 +53,6 @@
+ + {include file="$tpl_menu"} + {if (count($subMenus)>0) } + {include file= "$tpl_submenu"} + {/if} +
{if $user_logged neq ''} @@ -37,7 +43,7 @@ {/if}
+
- - {if $user_logged neq '' or $tracker neq ''} - - {else} - - {/if} - - {if (count($subMenus)>0) } - - - - {/if}
- {include file="$tpl_menu"} - -
- - -
{include file= "$tpl_submenu"}
-
{php}