Fehlermeldung im Login nicht beliebig breit; Logoutmeldung in grün und nicht in rot

diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm
index a7cc905c16e73ee21eb8550649e16bb6d66e5f68..e64ad0c78c3e653b4476db2e8684a35cdf11c73c 100644 (file)
--- a/SL/Controller/LoginScreen.pm
+++ b/SL/Controller/LoginScreen.pm
@@ -39,7 +39,7 @@ sub action_logout {
 
   $::auth->destroy_session;
   $::auth->create_or_refresh_session;
 
   $::auth->destroy_session;
   $::auth->create_or_refresh_session;

-  $self->show_login_form(error => $::locale->text('You are logged out!'));
+  $self->show_login_form(info => $::locale->text('You are logged out!'));

 }
 
 sub action_login {
 }
 
 sub action_login {

diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css
index e765fbfba4e63f5873a9483594262b434db0e801..c2ef521345df8cf5eb64c67e940976be20a4816c 100644 (file)
--- a/css/kivitendo/main.css
+++ b/css/kivitendo/main.css
@@ -110,6 +110,7 @@ body.login {
 table.login {
        background-color: #FFFFE0;
        padding: 20px;
 table.login {
        background-color: #FFFFE0;
        padding: 20px;

+  width: 500px;

 }
 td.login {
        text-align: center;
 }
 td.login {
        text-align: center;

diff --git a/templates/webpages/login_screen/user_login.html b/templates/webpages/login_screen/user_login.html
index 0a161ec098ebe34e6d0183017381cf7d2cf11bbd..da4d9ba85d397d8298e1aaab727840e9dcb72b8a 100644 (file)
--- a/templates/webpages/login_screen/user_login.html
+++ b/templates/webpages/login_screen/user_login.html
@@ -7,9 +7,12 @@
      <a href="http://www.kivitendo.de" target="_top"><img src="image/kivitendo.png" border="0"></a>
      <h1>[% 'kivitendo' | $T8 %] [% version %]</h1>
 
      <a href="http://www.kivitendo.de" target="_top"><img src="image/kivitendo.png" border="0"></a>
      <h1>[% 'kivitendo' | $T8 %] [% version %]</h1>
 

-     [% IF error %]
-     <p><span class="message_error_login">[% error %]</span></p>
-     [% END %]
+[% IF error %]
+     <div class="message_error_login">[% HTML.escape(error) %]</div>
+[% END %]
+[% IF info %]
+     <div class="message_ok">[% HTML.escape(info) %]</div>
+[% END %]

 
 [% IF SELF.clients.size %]
 [%- SET style="width: 250px" %]
 
 [% IF SELF.clients.size %]
 [%- SET style="width: 250px" %]