(merge) window.onload nicht direkt setzen

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

diff --git a/SL/Controller/Layout/Base.pm b/SL/Controller/Layout/Base.pm
index 1a27174b512080edb3cf14f815a2c2d88b7d45da..ed25f1b7828a75533d581c71ea4f9e29b68a2447 100644 (file)
--- a/SL/Controller/Layout/Base.pm
+++ b/SL/Controller/Layout/Base.pm
@@ -5,6 +5,13 @@ use parent qw(SL::Controller::Base);
 
 use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => qw(menu),
 
 use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => qw(menu),

+  'scalar'                => qw(focus),
+  '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' },
+  ],

 );
 
 use SL::Menu;
 );
 
 use SL::Menu;


@@ -26,23 +33,32 @@ sub init_menu {
 ##########################################
 
 sub pre_content {
 ##########################################
 
 sub pre_content {

+  join '', map { $_->pre_content } $_[0]->sub_layouts;

 }
 
 sub start_content {
 }
 
 sub start_content {

+  join '', map { $_->start_content } $_[0]->sub_layouts;

 }
 
 sub end_content {
 }
 
 sub end_content {

+  join '', map { $_->end_content } $_[0]->sub_layouts;

 }
 
 sub post_content {
 }
 
 sub post_content {

+  join '', map { $_->post_content } $_[0]->sub_layouts;

 }
 
 sub stylesheets_inline {
 }
 
 sub stylesheets_inline {

+  ( map { $_->stylesheets_inline } $_[0]->sub_layouts ),
+  @{ $_[0]->{stylesheets_inline} || [] };

 }
 
 }
 

-sub javascript_inline {
+sub javascripts_inline {
+  ( map { $_->javascripts_inline } $_[0]->sub_layouts ),
+  @{ $_[0]->{javascripts_inline} || [] };

 }
 
 }
 

+

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


@@ -57,7 +73,8 @@ sub stylesheets {
   my ($self) = @_;
   my $css_path = $self->get_stylesheet_for_user;
 
   my ($self) = @_;
   my $css_path = $self->get_stylesheet_for_user;
 

-  return grep { $_ } map { $self->_find_stylesheet($_, $css_path)  } $self->use_stylesheet;
+  return grep { $_ } map { $self->_find_stylesheet($_, $css_path)  }
+    $self->use_stylesheet, map { $_->stylesheets } $self->sub_layouts;

 }
 
 sub _find_stylesheet {
 }
 
 sub _find_stylesheet {


@@ -89,7 +106,6 @@ sub get_stylesheet_for_user {
 
 sub use_javascript {
   my $self = shift;
 
 sub use_javascript {
   my $self = shift;

-  $::lxdebug->dump(0,  "class", \@_);

   push @{ $self->{javascripts} ||= [] }, @_ if @_;
   @{ $self->{javascripts} ||= [] };
 }
   push @{ $self->{javascripts} ||= [] }, @_ if @_;
   @{ $self->{javascripts} ||= [] };
 }


@@ -97,8 +113,8 @@ sub use_javascript {
 sub javascripts {
   my ($self) = @_;
 
 sub javascripts {
   my ($self) = @_;
 

-  $::lxdebug->dump(0,  "called", [ map { $self->find_javascript($_)  } $self->use_javascript ]);
-  return map { $self->_find_javascript($_)  } $self->use_javascript;
+  return map { $self->_find_javascript($_)  }
+    $self->use_javascript, map { $_->javascripts } $self->sub_layouts;

 }
 
 sub _find_javascript {
 }
 
 sub _find_javascript {


@@ -108,4 +124,17 @@ sub _find_javascript {
   return $javascript             if -f $javascript;
 }
 
   return $javascript             if -f $javascript;
 }
 

+
+############################################
+# track state of form header
+############################################
+
+sub header_done {
+  $_[0]{_header_done} = 1;
+}
+
+sub need_footer {
+  $_[0]{_header_done};
+}
+

 1;
 1;