Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 022f039ee5106dda5168e6c3bcda2cbbfed544a3..fa46e646bcb791ec7e073a72c32c0ab8e86298c9 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -38,6 +38,7 @@
 
 use Carp;
 use CGI;
+use List::MoreUtils qw(uniq);
 use List::Util qw(min max first);
 
 use SL::CVar;
@@ -1504,14 +1505,8 @@ sub print_form {
   push @template_files, "$form->{formname}$form->{language}$printer_code.$extension";
   push @template_files, "$form->{formname}.$extension";
   push @template_files, "default.$extension";
-
-  $form->{IN} = undef;
-  for my $filename (@template_files) {
-    if (-f "$myconfig{templates}/$filename") {
-      $form->{IN} = $filename;
-      last;
-    }
-  }
+  @template_files = uniq @template_files;
+  $form->{IN}     = first { -f "$myconfig{templates}/$_" } @template_files;
 
   if (!defined $form->{IN}) {
     $::form->error($::locale->text('Cannot find matching template for this print request. Please contact your template maintainer. I tried these: #1.', join ', ', map { "'$_'"} @template_files));

diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css
index 46e4ba15a6974448b0b0400d68683f10606de015..4cd3644e9668e41f0511a48a8df765b0e35e5edd 100644 (file)
--- a/css/kivitendo/main.css
+++ b/css/kivitendo/main.css
@@ -141,7 +141,7 @@ body.menu {
 .message_error {
        padding: 5px;
        background-color: #CC0000;
-       color: black;
+       color: white;
        font-weight: bolder;
        text-align: center;
        border-style: solid;
@@ -159,6 +159,7 @@ body.menu {
 .message_error_label {
        padding: 0.5em;
        background-color: #E00000;
+  color: white;
        font-weight: normal;
        text-align: left;
        border-style: solid;