Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index 83f8ff5ef03fc15c3a5b7281348b3fe2b4bd1b18..cd5ace9391fc43637f8b6c121da187643954e115 100644 (file)
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -125,7 +125,7 @@ sub javascripts {
   my ($self) = @_;
 
   return uniq map { $self->_find_javascript($_)  }
-    $self->use_javascript, map { $_->javascripts } $self->sub_layouts;
+    map({ $_->javascripts } $self->sub_layouts), $self->use_javascript;
 }
 
 sub _find_javascript {

diff --git a/SL/Layout/Classic.pm b/SL/Layout/Classic.pm
index 9503d05fe24c94bfe0a19c19f0a678103171c800..94f12b3d6c55041b0c98b7b0849f384764f27d4f 100644 (file)
--- a/SL/Layout/Classic.pm
+++ b/SL/Layout/Classic.pm
@@ -9,9 +9,9 @@ use SL::Layout::None;
 
 sub init_sub_layouts {
   [
+    SL::Layout::None->new,
     SL::Layout::Top->new,
     SL::Layout::MenuLeft->new,
-    SL::Layout::None->new,
   ]
 }
 

diff --git a/SL/Layout/MenuLeft.pm b/SL/Layout/MenuLeft.pm
index 2cee4ea29f5c13e62ae15812665e8b1c5e3eb7ad..2f260c935ccae78c3cbd3e18ec3c809d467f926f 100644 (file)
--- a/SL/Layout/MenuLeft.pm
+++ b/SL/Layout/MenuLeft.pm
@@ -20,7 +20,10 @@ sub javascripts_inline {
 }
 
 sub javascripts {
- 'js/jquery.cookie.js';
+  qw(
+    js/jquery.cookie.js
+    js/switchmenuframe.js
+  );
 }
 
 sub pre_content {

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index ff82d8e1c30cd7fdea9553078e53f2b04ff3bc1e..50ab2f8546982d35fc4bb8776337c201fdee23d7 100644 (file)
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -21,6 +21,7 @@ sub use_stylesheet {
   my $self = shift;
   qw(
     main.css
+    menu.css
   ),
   $self->SUPER::use_stylesheet(@_);
 }

diff --git a/SL/Layout/V3.pm b/SL/Layout/V3.pm
index 4769c4062a9cffcf2091038e709a2ef515f3c624..ab50ef1aea533c1c15c30593704c03298102632c 100644 (file)
--- a/SL/Layout/V3.pm
+++ b/SL/Layout/V3.pm
@@ -10,6 +10,14 @@ sub init_sub_layouts {
   [ SL::Layout::None->new ]
 }
 
+sub use_stylesheet {
+  my $self = shift;
+  qw(
+    frame_header/header.css
+  ),
+  $self->SUPER::use_stylesheet(@_);
+}
+
 sub pre_content {
   &render;
 }