init_sub_layouts ist sauberer

diff --git a/SL/Layout/Admin.pm b/SL/Layout/Admin.pm
index 188655fae01dae1f965782816c39c37ffd1851ff..00e31254030bc6cb2d4b718a430380e0bf6d7823 100644 (file)
--- a/SL/Layout/Admin.pm
+++ b/SL/Layout/Admin.pm
@@ -3,16 +3,8 @@ package SL::Layout::Admin;
 use strict;
 use parent qw(SL::Layout::Base);
 
 use strict;
 use parent qw(SL::Layout::Base);
 

-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 start_content {
 }
 
 sub start_content {

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index 18ef133e920b2e23cd92c8ea67c28914fa4ab4d4..0c209e2aff7ef7a8ba595b4419775e9a396ddd0a 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' },
   '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} || [] };
 }
 
   @{ $_[0]->{javascripts_inline} || [] };
 }
 

+sub init_sub_layouts { [] }
+

 
 #########################################
 # Interface
 
 #########################################
 # Interface

diff --git a/SL/Layout/Classic.pm b/SL/Layout/Classic.pm
index a2ef7702db8755abfdd19a258584a4a8a8a2d213..9503d05fe24c94bfe0a19c19f0a678103171c800 100644 (file)
--- a/SL/Layout/Classic.pm
+++ b/SL/Layout/Classic.pm
@@ -5,19 +5,14 @@ use parent qw(SL::Layout::Base);
 
 use SL::Layout::Top;
 use SL::Layout::MenuLeft;
 
 use SL::Layout::Top;
 use SL::Layout::MenuLeft;

+use SL::Layout::None;

 
 

-sub new {
-  my ($class, @slurp) = @_;
-
-  my $self = $class->SUPER::new(@slurp);
-
-  $self->add_sub_layouts([
+sub init_sub_layouts {
+  [

     SL::Layout::Top->new,
     SL::Layout::MenuLeft->new,
     SL::Layout::None->new,
     SL::Layout::Top->new,
     SL::Layout::MenuLeft->new,
     SL::Layout::None->new,

-  ]);
-
-  $self;
+  ]

 }
 
 1;
 }
 
 1;

diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm
index 28731ec9ed2cdc5a870d7c52d41c2b1eb67eb3e2..d8f079fcf25532a9d9f525cf5700e7303d2d2ff9 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 {

diff --git a/SL/Layout/V3.pm b/SL/Layout/V3.pm
index 78b498e97b4448abfa1da8e59aa25e569cf96803..4769c4062a9cffcf2091038e709a2ef515f3c624 100644 (file)
--- a/SL/Layout/V3.pm
+++ b/SL/Layout/V3.pm
@@ -6,16 +6,8 @@ use SL::Layout::Css;
 
 use URI;
 
 
 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 {

diff --git a/SL/Layout/V4.pm b/SL/Layout/V4.pm
index fff1dfe0e46e80f54be315158341fdef587fea32..81789d46663aef44f189505dc2d0839e32431098 100644 (file)
--- a/SL/Layout/V4.pm
+++ b/SL/Layout/V4.pm
@@ -7,15 +7,11 @@ use SL::Layout::Top;
 
 use URI;
 
 
 use URI;
 

-sub new {
-  my ($class, @slurp) = @_;
-
-  my $self = $class->SUPER::new(@slurp);
-  $self->add_sub_layouts(
+sub init_sub_layouts {
+  [

     SL::Layout::Top->new,
     SL::Layout::None->new,
     SL::Layout::Top->new,
     SL::Layout::None->new,

-  );
-  $self;
+  ]

 }
 
 sub start_content {
 }
 
 sub start_content {