Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed processing of NavBarModule for process tickets and submenus #463

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from
+18 −35
Open

Fixed processing of NavBarModule for process tickets and submenus #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c20a127
changed processing of NavBarModules
tipue-dev Jul 20, 2023
62e2426
re-enable submenus
tipue-dev Jul 21, 2023
d8f78b3
removed empty rules
tipue-dev Jul 21, 2023
3b6f8fc
Merge branch 'dev' into dev-customer_menu_fix
dennykorsukewitz Aug 1, 2023
9ae6b94
Merge branch 'dev' into dev-customer_menu_fix
NiklasSchmitt Nov 23, 2023
d290b31
Merge branch 'dev' into dev-customer_menu_fix
NiklasSchmitt Dec 5, 2023
3d7c659
Merge branch 'dev' into dev-customer_menu_fix
dennykorsukewitz Jul 9, 2024
483a075
Merge branch 'dev' into dev-customer_menu_fix
dennykorsukewitz Aug 22, 2024
85963e2
Merge branch 'dev' into dev-customer_menu_fix
dennykorsukewitz Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Kernel/Output/HTML/Layout.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4721,13 +4721,10 @@ sub CustomerNavigationBar {
);

# run module
%NavBarModule = (
%NavBarModule,
$Object->Run(
%Param,
Config => $Jobs{$Job},
NavBarModule => \%NavBarModule || {},
),
$Object->Run(
%Param,
Config => $Jobs{$Job},
NavBarModule => \%NavBarModule || {},
);
}
}
Expand Down
8 changes: 2 additions & 6 deletions Kernel/Output/HTML/NavBar/CustomerTicketProcess.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,11 @@ sub Run {
my $Priority = sprintf( '%07d', $FrontendNavigationConfig->{'002-ProcessManagement'}->[0]->{Prio} );

return if !$Param{NavBarModule};
my %Return = %{ $Param{NavBarModule} };

# remove CustomerTicketProcess from the TicketMenu
delete $Return{$NavBarName}->{$Priority};

# remove CustomerTicketProcess from the Menu if set outside of the TicketMenu, see bug #11393
# remove CustomerTicketProcess from the main menu
delete $Param{NavBarModule}->{$Priority};

return ( Sub => \%Return );
return 1;
}

1;
34 changes: 12 additions & 22 deletions var/httpd/htdocs/skins/Customer/default/css/Core.Control.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt.

}*/

/*#Navigation > ul > li:hover ul:not(:empty),
#Navigation > ul > li a:focus + ul:not(:empty),*/
#Navigation > ul > li ul.Expanded:not(:empty:blank) {
#Navigation > ul > li:hover ul,
#Navigation > ul > li a:focus + ul,
#Navigation > ul > li ul.Expanded {
display: block;
z-index: 1000;
}
Expand Down Expand Up @@ -157,9 +157,6 @@ did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt.
cursor: pointer;
}

#Navigation > ul > li > ul li:last-child {
}

#Navigation > ul > li > ul a:hover,
#Navigation > ul > li > ul a:focus,
#Navigation > ul > li > ul a.SubSelected {
Expand All @@ -180,9 +177,6 @@ did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt.
white-space: normal;
}

#Navigation li:active {
}

#Navigation .Selected + li {
margin-left: -1px;
}
Expand All @@ -191,12 +185,6 @@ did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt.
padding-left: 10px;
}

#Navigation .Selected,
#Navigation .Selected:active,
#Navigation > ul > li:hover {

}

#Navigation > ul > li > a::after {
content: "";
width: 100%;
Expand Down Expand Up @@ -287,9 +275,10 @@ did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt.
border-radius: 0;
}

#Navigation > ul.menuItems > .Selected a,
#Navigation > ul.menuItems > li:focus a,
#Navigation > ul.menuItems > li:hover a {
#Navigation > ul.menuItems > .Selected a,
#Navigation > ul.menuItems > li:focus a,
#Navigation > ul.menuItems > li:hover > a,
#Navigation > ul.menuItems > li:hover > a ul a {
background: var(--primary-color);
color: var(--white);
}
Expand All @@ -309,6 +298,7 @@ did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt.

#Navigation > ul.menuItems > li > ul {
display: flex;
flex-direction: column;
position: relative;
top: unset;
left: unset;
Expand All @@ -319,11 +309,11 @@ did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt.
padding: var(--padding-sm);
border-radius: var(--border-radius-xs);
}

.RTL #Navigation > ul.menuItems > li > ul {
right: 1px;
}

#Navigation > ul.menuItems > li > ul > li {
font-size: 11px;
line-height: 11px;
Expand Down Expand Up @@ -422,8 +412,8 @@ did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt.
background-position: left;
}

.Filter li .Selected,
.Filter li .Selected:hover,
.Filter li .Selected,
.Filter li .Selected:hover,
.Filter li .Selected:active {
background: none;
position: relative;
Expand Down
Loading