From f867803c2fe7db380a23ab83008e9fa4f9f068b8 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 16 Nov 2012 17:35:23 +0100
Subject: [PATCH] =?utf8?q?Admin-Login-Maske=20an=20User-Login-Maske=20ange?=
 =?utf8?q?passt;=20Farbgebung=20f=C3=BCr=20h1-=C3=9Cberschriften=20rot=20z?=
 =?utf8?q?ur=20Unterscheidung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 css/kivitendo/main.css                   |  7 +-
 locale/de/all                            |  4 +-
 templates/webpages/admin/adminlogin.html | 82 ++++++++++++++----------
 3 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css
index 379ef4da7..c3c64dc76 100644
--- a/css/kivitendo/main.css
+++ b/css/kivitendo/main.css
@@ -117,10 +117,9 @@ td.login {
 th.login {
 	text-align: right;
 }
-div.admin {
-	background-color: #FFFFE0;
-    padding: 8px;
-	color: #000000;
+.admin h1 {
+	background-color: #fe5f14;
+  text-color: #ffffff;
 }
 body.menu {
 	color: #000000;
diff --git a/locale/de/all b/locale/de/all
index f4db27d66..88fe7984a 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -248,7 +248,6 @@ $self->{texts} = {
   'BWA'                         => 'BWA',
   'Back'                        => 'Zurück',
   'Back to login'               => 'Zurück zur Anmeldung',
-  'Back to the login page'      => 'Zurück zur Loginseite',
   'Background job history'      => 'Verlauf der Hintergrund-Jobs',
   'Background jobs'             => 'Hintergrund-Jobs',
   'Background jobs and task server' => 'Hintergrund-Jobs und Task-Server',
@@ -670,6 +669,7 @@ $self->{texts} = {
   'Do you want to store the existing onhand values into a new warehouse?' => 'M&ouml;chten Sie die vorhandenen Mengendaten in ein Lager &uuml;bertragen?',
   'Document'                    => 'Dokument',
   'Document Project Number'     => 'Projektnummer des Belegs',
+  'Documentation'               => 'Dokumentation',
   'Documentation (in German)'   => 'Dokumentation',
   'Documents in the WebDAV repository' => 'Dokumente im WebDAV-Repository',
   'Done'                        => 'Fertig',
@@ -2178,6 +2178,7 @@ $self->{texts} = {
   'User Login'                  => 'Als Benutzer anmelden',
   'User data migration'         => 'Benutzerdatenmigration',
   'User deleted!'               => 'Benutzer gelöscht!',
+  'User login'                  => 'Benutzeranmeldung',
   'User migration complete'     => 'Benutzermigration abgeschlossen',
   'User name'                   => 'Benutzername',
   'User saved!'                 => 'Benutzer gespeichert!',
@@ -2377,6 +2378,7 @@ $self->{texts} = {
   'invoice_list'                => 'debitorenbuchungsliste',
   'kivitendo'                   => 'kivitendo',
   'kivitendo Homepage'          => 'Infos zu kivitendo',
+  'kivitendo administration'    => 'kivitendo Administration',
   'kivitendo can fix these problems automatically.' => 'kivitendo kann solche Probleme automatisch beheben.',
   'kivitendo has been switched to group-based access restrictions.' => 'kivitendo wurde auf eine gruppenbasierte Benutzerzugriffsverwaltung umgestellt.',
   'kivitendo has found one or more problems in the general ledger.' => 'kivitendo hat ein oder mehrere Probleme im Hauptbuch gefunden.',
diff --git a/templates/webpages/admin/adminlogin.html b/templates/webpages/admin/adminlogin.html
index 543f228e2..8cbaf29d7 100644
--- a/templates/webpages/admin/adminlogin.html
+++ b/templates/webpages/admin/adminlogin.html
@@ -1,37 +1,51 @@
 [%- USE T8 %]
 [% USE HTML %]
 [% USE LxERP%]
- <script type='text/javascript'>
-    $(function(){ document.getElementsById('rpw').focus();});
- </script>
- <div align="center">
-
-  <a href="http://www.kivitendo.org"><img src="image/kivitendo.png" border="0"></a>
-
-  <h3 class="login">[% 'kivitendo' | $T8 %] [% HTML.escape(version) %]</h3>
-
-  <h2>[% 'Administration' | $T8 %]</h2>
-
-  [% IF error %]
-  <p><span class="message_error_login">[% error %]</span></p>
-  [% END %]
-
-  <form method="post" action="admin.pl">
-
-   <table>
-    <tr>
-     <th>[% 'Password' | $T8 %]</th>
-     <td><input type="password" name="{AUTH}admin_password" id="rpw"></td>
-     <td><input type="submit" class="submit" name="action" value="[% 'Login' | $T8 %]"></td>
-    </tr>
-    <input type="hidden" name="action" value="login">
-   </table>
-
-  </form>
-
-  <p>[% 'kivitendo Homepage' | $T8 %]: <a href="http://kivitendo.de" target="_blank" title="[% 'kivitendo Homepage' | $T8 %]">http://kivitendo.de</a></p>
-
-  <p><a href="controller.pl?action=LoginScreen/user_login" target="_top">[%- LxERP.t8('Back to the login page') %]</a></p>
-
- </div>
-
+ <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 administration' | $T8 %] [% version %]</h1>
+
+     [% IF error %]
+     <p><span class="message_error_login">[% error %]</span></p>
+     [% END %]
+
+     <p>
+
+      <form method="post" action="admin.pl">
+
+       <table width="100%">
+        <tr>
+         <td align="center">
+          <table>
+           <tr>
+            <th align="right">[% 'Password' | $T8 %]</th>
+            <td><input class="login" type="password" name="{AUTH}admin_password" id="admin_password" size="30" tabindex="1"></td>
+           </tr>
+          </table>
+
+          <br>
+          <input type="submit" value="[% 'Login' | $T8 %]" tabindex="2">
+
+         </td>
+        </tr>
+       </table>
+
+       <input type="hidden" name="action" value="login">
+      </form>
+
+    </td>
+   </tr>
+  </table>
+
+  <p>
+   <a href="controller.pl?action=LoginScreen/user_login" target="_top">[%- LxERP.t8('User login') %]</a>
+   &nbsp;|&nbsp;
+   <a href="doc/kivitendo-Dokumentation.pdf" target="_top">[%- LxERP.t8('Documentation') %]</a>
+  </p>
+
+  <script type='text/javascript'>
+    $('#admin_password').focus();
+  </script>
-- 
2.20.1