X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=8915ca20f1cff28bc5e2a5f988f3b25731d31054;hb=5adfb6910687b4af59a3a1b25795d07830a127da;hp=59815ebdee7d707d33f1bc6a86e3b033a14e07dc;hpb=0f179c9ab60ac22c697027cadc9f4bdb9c515ce5;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index 59815ebde..8915ca20f 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,11 +455,16 @@ 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
+ # this should gradually move to the layouts that need it
$layout->use_stylesheet("$_.css") for qw(
main menu tabcontent list_accounts jquery.autocomplete
jquery.multiselect2side frame_header/header
@@ -485,10 +491,9 @@ sub header {
push @header, map { qq|| } $layout->stylesheets;
push @header, " " if $self->{landscape};
push @header, "" if -f $self->{favicon};
- push @header, map { qq|| } $layout->javascripts;
+ 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||,
@@ -525,18 +530,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 "\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 <
@@ -1734,10 +1741,9 @@ sub set_payment_options {
$amounts{invtotal} = $self->{invtotal};
$amounts{total} = $self->{total};
}
- $amounts{skonto_in_percent} = 100.0 * $self->{percent_skonto};
-
map { $amounts{$_} = $self->parse_amount($myconfig, $amounts{$_}) } keys %amounts;
+ $amounts{skonto_in_percent} = 100.0 * $self->{percent_skonto};
$amounts{skonto_amount} = $amounts{invtotal} * $self->{percent_skonto};
$amounts{invtotal_wo_skonto} = $amounts{invtotal} * (1 - $self->{percent_skonto});
$amounts{total_wo_skonto} = $amounts{total} * (1 - $self->{percent_skonto});