projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master', remote branch 'origin'
[kivitendo-erp.git]
/
SL
/
Layout
/
Javascript.pm
diff --git
a/SL/Layout/Javascript.pm
b/SL/Layout/Javascript.pm
index
cdc6491
..
a9a1748
100644
(file)
--- a/
SL/Layout/Javascript.pm
+++ b/
SL/Layout/Javascript.pm
@@
-6,16
+6,8
@@
use parent qw(SL::Layout::Base);
use List::Util qw(max);
use URI;
use List::Util qw(max);
use URI;
-sub new {
- my ($class, @slurp) = @_;
-
- my $self = $class->SUPER::new(@slurp);
-
- $self->add_sub_layouts([
- SL::Layout::None->new,
- ]);
-
- $self;
+sub init_sub_layouts {
+ [ SL::Layout::None->new ]
}
sub pre_content {
}
sub pre_content {
@@
-30,6
+22,15
@@
sub end_content {
"</div>\n";
}
"</div>\n";
}
+sub stylesheets {
+ $_[0]->add_stylesheets(qw(
+ dhtmlsuite/menu-item.css
+ dhtmlsuite/menu-bar.css
+ menu.css
+ ));
+ $_[0]->SUPER::stylesheets;
+}
+
sub display {
my ($self) = @_;
my $form = $main::form;
sub display {
my ($self) = @_;
my $form = $main::form;
@@
-114,7
+115,7
@@
sub create_menu {
my $item = { 'title' => $::locale->text($name) };
push @{ $all_items }, $item;
my $item = { 'title' => $::locale->text($name) };
push @{ $all_items }, $item;
- if ($menu_item->{submenu} || !defined($menu_item->{module})
|| ($menu_item->{module} eq "menu.pl")
) {
+ if ($menu_item->{submenu} || !defined($menu_item->{module})) {
$item->{subitems} = [];
$item->{image} = _icon_path("$name.png");
$self->create_menu($menu, $item->{subitems}, "${parent}${name}", $depth * 1 + 1);
$item->{subitems} = [];
$item->{image} = _icon_path("$name.png");
$self->create_menu($menu, $item->{subitems}, "${parent}${name}", $depth * 1 + 1);