projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
task_server: pro Job mit Sprache vom konfiguriert initialisieren
[kivitendo-erp.git]
/
SL
/
Layout
/
Javascript.pm
diff --git
a/SL/Layout/Javascript.pm
b/SL/Layout/Javascript.pm
index
8d61609
..
5615ce9
100644
(file)
--- a/
SL/Layout/Javascript.pm
+++ b/
SL/Layout/Javascript.pm
@@
-10,6
+10,14
@@
sub init_sub_layouts {
[ SL::Layout::None->new ]
}
[ SL::Layout::None->new ]
}
+sub use_javascript {
+ my $self = shift;
+ qw(
+ js/quicksearch_input.js
+ ),
+ $self->SUPER::use_javascript(@_);
+}
+
sub pre_content {
&display
}
sub pre_content {
&display
}
@@
-26,6
+34,8
@@
sub stylesheets {
$_[0]->add_stylesheets(qw(
dhtmlsuite/menu-item.css
dhtmlsuite/menu-bar.css
$_[0]->add_stylesheets(qw(
dhtmlsuite/menu-item.css
dhtmlsuite/menu-bar.css
+ icons16.css
+ frame_header/header.css
menu.css
));
$_[0]->SUPER::stylesheets;
menu.css
));
$_[0]->SUPER::stylesheets;
@@
-39,7
+49,7
@@
sub display {
$callback = URI->new($callback)->rel($callback) if $callback;
$callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/;
$callback = URI->new($callback)->rel($callback) if $callback;
$callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/;
- $self->
render("menu/menunew", { partial => 1, no_output => 1 }
,
+ $self->
presenter->render("menu/menunew"
,
force_ul_width => 1,
date => $self->clock_line,
menu_items => $self->acc_menu,
force_ul_width => 1,
date => $self->clock_line,
menu_items => $self->acc_menu,
@@
-102,10
+112,13
@@
sub create_menu {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $form = $main::form;
my %myconfig = %main::myconfig;
+ $depth ||= 0;
+
die if ($depth * 1 > 5);
my @menuorder = $menu->access_control(\%myconfig, $parent);
$parent .= "--" if ($parent);
die if ($depth * 1 > 5);
my @menuorder = $menu->access_control(\%myconfig, $parent);
$parent .= "--" if ($parent);
+ $parent ||= '';
foreach my $name (@menuorder) {
substr($name, 0, length($parent), "");
foreach my $name (@menuorder) {
substr($name, 0, length($parent), "");