X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/2219d15895a48a6ec3aecef5ed3ae2313bf1c900..b6fd15a8dc44f9b09d5a2bce766cda14b87c6e13:/SL/Form.pm?ds=sidebyside
diff --git a/SL/Form.pm b/SL/Form.pm
index 450dd792d..aa83e2913 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -56,6 +56,7 @@ use SL::DBUtils;
use SL::DO;
use SL::IC;
use SL::IS;
+use SL::Layout::Dispatcher;
use SL::Locale;
use SL::Mailer;
use SL::Menu;
@@ -454,10 +455,14 @@ sub header {
my $db_charset = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
my @header;
- my $layout = $::request->{layout};
-
$::lxdebug->leave_sub and return if !$ENV{HTTP_USER_AGENT} || $self->{header}++;
+ if ($params{no_layout}) {
+ $::request->{layout} = SL::Layout::Dispatcher->new(style => 'none');
+ }
+
+ my $layout = $::request->{layout};
+
# standard css for all
$layout->use_stylesheet("$_.css") for qw(
main menu tabcontent list_accounts jquery.autocomplete
@@ -488,7 +493,6 @@ sub header {
push @header, map { qq|| } $layout->javascripts;
push @header, $self->{javascript} if $self->{javascript};
push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
- push @header, "" if $self->{fokus};
my %doctypes = (
strict => qq||,
@@ -531,16 +535,14 @@ EOT
}
sub footer {
- # TODO: fix abort conditions
-
return unless $::request->{layout}->need_footer;
print $::request->{layout}->end_content;
print $::request->{layout}->post_content;
-# print "\n" for $::request->{layout}->javascripts;
-# if (my @inline_scripts = $::request->{layout}->javascript_inline) {
-# print "\n" for @inline_scripts;
-# }
+
+ if (my @inline_scripts = $::request->{layout}->javascripts_inline) {
+ print "\n";
+ }
print <