X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Flogin_screen%2Fuser_login.html;h=20c63f1e7f8d05a57093a7e832141033db0c1c00;hb=59274d46487423806bdc4c76ea405c57d9e45c0a;hp=453b07e700560efe526df6455bae418dd325aa6c;hpb=3772d03ab5a1d64173504ca61bf737dfcd451a92;p=kivitendo-erp.git

diff --git a/templates/webpages/login_screen/user_login.html b/templates/webpages/login_screen/user_login.html
index 453b07e70..20c63f1e7 100644
--- a/templates/webpages/login_screen/user_login.html
+++ b/templates/webpages/login_screen/user_login.html
@@ -1,21 +1,30 @@
 [%- USE T8 %]
 [%- USE HTML %][%- USE L -%][%- USE LxERP -%]
+[%- SET auth_client = '{AUTH}client' %]
+[%- SET auth_login  = '{AUTH}login'  %]
  <center>
   <table class="login" border="3" cellpadding="20">
    <tr>
     <td class="login" align="center">
-     <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" class="no-underlined-links"><img src="image/kivitendo.png" class='kivitendo-logo' border="0"></a>
+     <h1>[% LxERP.t8('kivitendo v#1', 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 warning %]
+     <div class="message_hint">[% HTML.escape(warning) %]</div>
+[% END %]
+[% IF info %]
+     <div class="message_ok">[% HTML.escape(info) %]</div>
+[% END %]
 
 [% IF SELF.clients.size %]
 [%- SET style="width: 250px" %]
       <form method="post" name="loginscreen" action="controller.pl" target="_top">
 
        <input type="hidden" name="show_dbupdate_warning" value="1">
+       [% L.hidden_tag("callback", callback) %]
 
        <table width="100%">
         <tr>
@@ -23,7 +32,7 @@
           <table>
            <tr>
             <th align="right">[% 'Login Name' | $T8 %]</th>
-            <td>[% L.input_tag('{AUTH}login', '', style=style) %]</td>
+            <td>[% L.input_tag('{AUTH}login', FORM.$auth_login, id='auth_login', style=style, class='initial_focus') %]</td>
            </tr>
            <tr>
             <th align="right">[% 'Password' | $T8 %]</th>
@@ -37,7 +46,7 @@
 
           <br>
           <input type="hidden" name="action" value="LoginScreen/login">
-          <input type="submit" value="[% 'Login' | $T8 %]" tabindex="3">
+          <input type="submit" value="[% 'Login' | $T8 %]">
 
          </td>
         </tr>
@@ -58,6 +67,19 @@
     </td>
    </tr>
   </table>
-  <script type='text/javascript'>
-    $(function(){ $('#input_login').focus() })
-  </script>
+
+  <p>
+   <a href="controller.pl?action=Admin/login" target="_top">[%- LxERP.t8('Administration area') %]</a>
+   &nbsp;|&nbsp;
+   <a href="doc/kivitendo-Dokumentation.pdf" target="_top">[%- LxERP.t8('Documentation') %]</a>
+  </p>
+
+[% IF FORM.$auth_client %]
+<script type='text/javascript'>
+$(function() {
+  $('[name="{AUTH}client_id"] option').filter(function() {
+     return ($(this).text() === '[% FORM.$auth_client %]');
+  }).prop('selected', true);
+});
+</script>
+[% END %]