projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfix bei Artikelstammdaten: Beim erneuten Aufrufen des Sprachenfensters wurden...
[kivitendo-erp.git]
/
SL
/
Form.pm
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
e4c4dd5
..
0445a25
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-380,6
+380,12
@@
sub header {
my ($stylesheet, $favicon);
if ($ENV{HTTP_USER_AGENT}) {
my ($stylesheet, $favicon);
if ($ENV{HTTP_USER_AGENT}) {
+ my $doctype;
+
+ if ($ENV{'HTTP_USER_AGENT'} =~ m/MSIE\s+\d/) {
+ # Only set the DOCTYPE for Internet Explorer. Other browsers have problems displaying the menu otherwise.
+ $doctype = qq|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\n|;
+ }
my $stylesheets = "$self->{stylesheet} $self->{stylesheets}";
my $stylesheets = "$self->{stylesheet} $self->{stylesheets}";
@@
-433,8
+439,7
@@
sub header {
}
print qq|Content-Type: text/html; charset=${db_charset};
}
print qq|Content-Type: text/html; charset=${db_charset};
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
+${doctype}<html>
<head>
<title>$self->{titlebar}</title>
$stylesheet
<head>
<title>$self->{titlebar}</title>
$stylesheet
@@
-606,9
+611,10
@@
sub parse_html_template2 {
sub show_generic_error {
my ($self, $error, $title, $action) = @_;
sub show_generic_error {
my ($self, $error, $title, $action) = @_;
- my $add_params = {};
- $add_params->{"title"} = $title if ($title);
- $self->{"label_error"} = $error;
+ my $add_params = {
+ 'title_error' => $title,
+ 'label_error' => $error,
+ };
my @vars;
if ($action) {
my @vars;
if ($action) {
@@
-621,21
+627,26
@@
sub show_generic_error {
}
$add_params->{"VARIABLES"} = \@vars;
}
$add_params->{"VARIABLES"} = \@vars;
+ $self->{title} = $title if ($title);
+
$self->header();
$self->header();
- print
($self->parse_html_template("generic/error", $add_params)
);
+ print
$self->parse_html_template2("generic/error", $add_params
);
die("Error: $error\n");
}
sub show_generic_information {
die("Error: $error\n");
}
sub show_generic_information {
- my ($self, $error, $title) = @_;
+ my ($self, $text, $title) = @_;
+
+ my $add_params = {
+ 'title_information' => $title,
+ 'label_information' => $text,
+ };
- my $add_params = {};
- $add_params->{"title"} = $title if ($title);
- $self->{"label_information"} = $error;
+ $self->{title} = $title if ($title);
$self->header();
$self->header();
- print
($self->parse_html_template("generic/information", $add_params)
);
+ print
$self->parse_html_template2("generic/information", $add_params
);
die("Information: $error\n");
}
die("Information: $error\n");
}