X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FJavascript.pm;h=de3c7f3c0119cbf121b9e42bf7784ec77d7e0371;hb=479d8db7bb8da885e476862101f5d0014fdc4fb2;hp=85454c4ee658869f19ef7fdcfbf980e316ef045e;hpb=1fbcd0db6ef59f966caca6e5ba9e9d2bd58a06a5;p=kivitendo-erp.git

diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm
index 85454c4ee..de3c7f3c0 100644
--- a/SL/Layout/Javascript.pm
+++ b/SL/Layout/Javascript.pm
@@ -4,6 +4,7 @@ use strict;
 use parent qw(SL::Layout::Base);
 
 use SL::Layout::None;
+use SL::Layout::DHTMLMenu;
 use SL::Layout::Top;
 use SL::Layout::ActionBar;
 use SL::Layout::Content;
@@ -17,64 +18,10 @@ sub init_sub_layouts {
   [
     SL::Layout::None->new,
     SL::Layout::Top->new,
+    SL::Layout::DHTMLMenu->new,
+    $_[0]->sub_layouts_by_name->{actionbar},
     SL::Layout::Content->new,
   ]
 }
 
-sub javascripts {
-  my ($self) = @_;
-
-  return uniq grep { $_ } map { $self->_find_javascript($_)  }
-    map({ $_->javascripts } $self->sub_layouts),
-    qw(dhtmlsuite/menu-for-applications.js),
-    $_[0]->sub_layouts_by_name->{actionbar}->javascripts,
-    $self->use_javascript;
-}
-
-sub javascripts_inline {
-  $_[0]->SUPER::javascripts_inline,
-<<'EOJS',
-  DHTMLSuite.createStandardObjects();
-  DHTMLSuite.configObj.setImagePath('image/dhtmlsuite/');
-  var menu_model = new DHTMLSuite.menuModel();
-  menu_model.addItemsFromMarkup('main_menu_model');
-  menu_model.init();
-  var menu_bar = new DHTMLSuite.menuBar();
-  menu_bar.addMenuItems(menu_model);
-  menu_bar.setTarget('main_menu_div');
-  menu_bar.init();
-EOJS
-  $_[0]->sub_layouts_by_name->{actionbar}->javascripts_inline,
-}
-
-sub pre_content {
-  $_[0]->SUPER::pre_content .
-  $_[0]->presenter->render("menu/menunew",
-    force_ul_width  => 1,
-    menu            => $_[0]->menu,
-    icon_path       => sub { my $simg = "image/icons/svg/$_[0].svg";  my $pimg="image/icons/16x16/$_[0].png"; -f $simg ? $simg : ( -f $pimg ? $pimg : ()) },
-    max_width       => sub { 10 * max map { length $::locale->text($_->{name}) } @{ $_[0]{children} || [] } },
-  ) .
-  ($_[0]->sub_layouts_by_name->{actionbar}->pre_content // '');
-}
-
-sub stylesheets {
-  my ($self) = @_;
-  my $css_path = $self->get_stylesheet_for_user;
-
-  return
-    uniq
-    grep { $_ }
-    map { $self->_find_stylesheet($_, $css_path)  }
-    qw(
-      dhtmlsuite/menu-item.css
-      dhtmlsuite/menu-bar.css
-      icons16.css
-      menu.css
-    ),
-    ( map { $_->stylesheets } $_[0]->sub_layouts ),
-    $_[0]->sub_layouts_by_name->{actionbar}->stylesheets,
-    $_[0]->use_stylesheet;
-}
-
 1;