X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=186e661511cb108499bd6480707799251fd88870;hb=3811978cfec7c0a6022219aa0c19b36dbd998458;hp=59815ebdee7d707d33f1bc6a86e3b033a14e07dc;hpb=0f179c9ab60ac22c697027cadc9f4bdb9c515ce5;p=kivitendo-erp.git

diff --git a/SL/Form.pm b/SL/Form.pm
index 59815ebde..186e66151 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -485,7 +485,7 @@ sub header {
   push @header, map { qq|<link rel="stylesheet" href="$_" type="text/css" title="Stylesheet">| } $layout->stylesheets;
   push @header, "<style type='text/css'>\@page { size:landscape; }</style> "                     if $self->{landscape};
   push @header, "<link rel='shortcut icon' href='$self->{favicon}' type='image/x-icon'>"         if -f $self->{favicon};
-  push @header, map { qq|<script type="text/javascript" src="$_"></script>| }                 $layout->javascripts;
+  push @header, map { qq|<script type="text/javascript" src="$_"></script>| }                    $layout->javascripts;
   push @header, $self->{javascript} if $self->{javascript};
   push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
   push @header, "<script type='text/javascript'>function fokus(){ document.$self->{fokus}.focus(); }</script>" if $self->{fokus};
@@ -525,18 +525,20 @@ EOT
   print $::request->{layout}->pre_content;
   print $::request->{layout}->start_content;
 
+  $layout->header_done;
+
   $::lxdebug->leave_sub;
 }
 
 sub footer {
-  # TODO: fix abort conditions
+  return unless $::request->{layout}->need_footer;
 
   print $::request->{layout}->end_content;
   print $::request->{layout}->post_content;
-#  print "<script type='text/javascript' src='$_'></script>\n" for $::request->{layout}->javascripts;
-#  if (my @inline_scripts = $::request->{layout}->javascript_inline) {
-#    print "<script type='text/javascript'>$_</script>\n" for @inline_scripts;
-#  }
+
+  if (my @inline_scripts = $::request->{layout}->javascripts_inline) {
+    print "<script type='text/javascript'>@inline_scripts</script>\n";
+  }
 
   print <<EOL
  </body>