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

[mfinanz.git] / SL / Layout / Base.pm

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index 18ef133e920b2e23cd92c8ea67c28914fa4ab4d4..83f8ff5ef03fc15c3a5b7281348b3fe2b4bd1b18 100644 (file)
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -11,8 +11,8 @@ use Rose::Object::MakeMethods::Generic (
   'array'                 => [
     'add_stylesheets_inline' => { interface => 'add', hash_key => 'stylesheets_inline' },
     'add_javascripts_inline' => { interface => 'add', hash_key => 'javascripts_inline' },
-    'sub_layouts',
-    'add_sub_layouts'         => { interface => 'add', hash_key => 'sub_layouts' },
+    'sub_layouts',           => { interface => 'get_set_init' },
+    'add_sub_layouts'        => { interface => 'add', hash_key => 'sub_layouts' },
   ],
 );
 
@@ -60,6 +60,8 @@ sub javascripts_inline {
   @{ $_[0]->{javascripts_inline} || [] };
 }
 
+sub init_sub_layouts { [] }
+
 
 #########################################
 # Interface
@@ -99,10 +101,10 @@ sub get_stylesheet_for_user {
         -f "$css_path/$user_style/main.css") {
       $css_path = "$css_path/$user_style";
     } else {
-      $css_path = "$css_path/lx-office-erp";
+      $css_path = "$css_path/kivitendo";
     }
   } else {
-    $css_path = "$css_path/lx-office-erp";
+    $css_path = "$css_path/kivitendo";
   }
   $::myconfig{css_path} = $css_path; # needed for menunew, FIXME: don't do this here