use strict;
use SL::Menu;
-use Data::Dumper;
use URI;
use List::MoreUtils qw(apply);
-my $menufile = "menu.ini";
my $nbsp = ' ';
my $mainlevel;
$callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/;
my $framesize = _calc_framesize();
- $::form->header;
+ $::form->header(doctype => 'frameset');
print qq|
<frameset rows="28px,*" cols="*" framespacing="0" frameborder="0">
- <frame src="kopf.pl" name="kopf" scrolling="NO">
+ <frame src="controller.pl?action=FrameHeader/header" scrolling="NO">
<frameset cols="$framesize,*" framespacing="0" frameborder="0" border="0" id="menuframe" name="menuframe">
<frame src="$::form->{script}?action=acc_menu" name="acc_menu" scrolling="auto" noresize marginwidth="0">
<frame src="$callback" name="main_window" scrolling="auto">
my $framesize = _calc_framesize() - 2;
my $menu = Menu->new("menu.ini");
$mainlevel = $::form->{level};
- $::form->{title} = $::locale->text('Lx-Office');
+ $::form->{title} = $::locale->text('kivitendo');
$::form->header;
- print qq|
-<body class="menu">
-
-<div align="left">\n<table width="$framesize" border="0">\n|;
-
- section_menu($menu);
-
- print qq|</table></div>
-</body>
-</html>
-|;
+ print $::form->parse_html_template('menu/menu', {
+ framesize => $framesize,
+ sections => [ section_menu($menu) ],
+ });
$::lxdebug->leave_sub;
}
$::lxdebug->enter_sub;
my ($menu, $level) = @_;
my @menuorder = $menu->access_control(\%::myconfig, $level);
+ my @items;
for my $item (@menuorder) {
my $menuitem = $menu->{$item};
$label = $::locale->text($label);
+ $menuitem->{module} ||= $::form->{script};
+ $menuitem->{action} ||= "section_menu";
$menuitem->{target} ||= "main_window";
+ $menuitem->{href} ||= "$menuitem->{module}?action=$menuitem->{action}";
+
+ # add other params
+ foreach my $key (keys %$menuitem) {
+ next if $key =~ /target|module|action|href/;
+ $menuitem->{href} .= "&" . $::form->escape($key, 1) . "=";
+ my ($value, $conf) = split(/=/, $menuitem->{$key}, 2);
+ $value = $::myconfig{$value} . "/$conf" if ($conf);
+ $menuitem->{href} .= $::form->escape($value, 1);
+ }
- my $anchor = $menu->menuitem(\%::myconfig, $::form, $item, $level);
+ my $anchor = $menuitem->{href};
if (!$level) { # toplevel
my $ml_ = $::form->escape($ml);
- my $image = make_image(icon => $item . '.png', size => 24, label => $label, valign => 'middle');
- my $anchor = "<a href='menu.pl?action=acc_menu&level=$ml_' class='nohover' title='$label'>";
+ my $image = make_image(icon => $item . '.png', size => 24, label => $label);
+ my $anchor = "menu.pl?action=acc_menu&level=$ml_";
- print make_item(a => $anchor, img => $image, label => $label, height => 24);
- section_menu($menu, $item);
+ push @items, make_item(href => $anchor, img => $image, label => $label, height => 24, class => 'menu');
+ push @items, section_menu($menu, $item);
} elsif ($menuitem->{submenu}) {
my $image = make_image(submenu => 1);
if ($mainlevel && $item =~ /^\Q$mainlevel\E/) {
- print make_item(spacer => $spacer, bold => 1, img => $image, label => $label) if $show;
- section_menu($menu, $item);
+ push @items, make_item(target => $menuitem->{target}, spacer => $spacer, img => $image, label => $label, class => 'submenu') if $show;
+ push @items, section_menu($menu, $item);
} else {
- print make_item(spacer => $spacer, a => $anchor, img => $image, label => $label . ' ...') if $show;
+ push @items, make_item(spacer => $spacer, href => $anchor, img => $image, label => $label . ' ...', class => 'submenu') if $show;
}
} elsif ($menuitem->{module}) {
my $image = make_image(label => $label, icon => $label_icon);
- print make_item(img => $image, a => $anchor, spacer => $spacer, label => $label) if $show;
- section_menu($menu, $item) if $show && $::form->{$item} && $::form->{level} eq $item;
+ push @items, make_item(target => $menuitem->{target}, img => $image, href => $anchor, spacer => $spacer, label => $label, class => 'item') if $show;
+ push @items, section_menu($menu, $item) if $show && $::form->{$item} && $::form->{level} eq $item;
}
}
$::lxdebug->leave_sub;
+ return @items;
}
sub make_item {
my %params = @_;
- my $anchor = $params{a} || '';
- my @chunks = multiline($params{label});
- my $spacer = $params{spacer} || '';
- my $image = $params{img};
- my $height = $params{height} || 16;
- my $a_end = $anchor ? '</a>' : '';
- my $bold = $params{bold} ? '<b>' : '';
- my $b_end = $bold ? '</b>' : '';
- my $hidden_image = make_image(hidden => 1);
- return join "\n",
- "<tr><td class='hover' height='$height'>$bold$spacer$anchor$image$chunks[0]$a_end$b_end</td></tr>\n",
- map "<tr style='vertical-align:top'><td class='hover'>$bold$spacer$hidden_image$anchor$chunks[$_]$a_end$b_end</td></tr>\n",
- 1..$#chunks;
+ $params{a} ||= '';
+ $params{spacer} ||= '';
+ $params{height} ||= 16;
+
+ return {
+ %params,
+ chunks => [ multiline($params{label}) ],
+ };
}
# multi line hack, sschoeling jul06
sub make_image {
my (%params) = @_;
- my $label = $params{label};
my $icon = $params{icon};
- my $hidden = $params{hidden};
my $size = $params{size} || 16;
- my $valign = $params{valign} || 'text-top';
return unless _show_images();
my $icon_found = $icon && -f _icon_path($icon, $size);
-
- my $image_url = $icon_found ? _icon_path($icon, $size) : "image/unterpunkt.png";
- my $style = $hidden ? "visibility:hidden" : "vertical-align:$valign";
- my $width = $hidden ? "width='$size'" : '';
-
- my $padding = $size == 16 && $icon_found || $hidden ? $nbsp x 2
- : $size == 24 ? $nbsp
- : '';
-
- return "<img src='$image_url' border='0' style='$style' title='$label' $width>$padding";
+ my $padding = $size == 16 && $icon_found ? $nbsp x 2
+ : $size == 24 ? $nbsp
+ : '';
+
+ return {
+ src => $icon_found ? _icon_path($icon, $size) : "image/unterpunkt.png",
+ alt => $params{label},
+ width => $icon_found ? $size : 24,
+ height => $size,
+ padding => $padding,
+ }
}
sub _calc_framesize {
projects / kivitendo-erp.git / blobdiff