From e3f07619ecd412a3c6244bd78398d3c50d32923e Mon Sep 17 00:00:00 2001
From: Sven Donath <lxo@dexo.de>
Date: Thu, 21 Oct 2010 02:24:33 +0200
Subject: [PATCH] Teil 2 von: Usability und Lokalisierung,
 Administrations-Interface
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

  * Admin User-Liste Spalten geändert
    - Spalte "Driver" ausgeblendet, in list_users.html die Spalte Driver / Pg
      auskommentiert. Ist die nicht unnütz?
    - Reihenfolge der Spalten geändert
    - Neue Spalten hinzugefügt: Vorlagen, Drucken, Sprache
    - Den Bedienhinweis hellgelb hinterlegt

  * Gruppen-Administration aufgeräumt und etwas logischer gemacht.
  * Zurück-Knöpfe repariert und optimiert. (sind möglichst an der gleichen Stelle)
  * Strings "eingedeutscht", <br>-Tags entfernt
  * Reihenfolge der Seitensegmente logischer gemacht
  * An verschiedenen Stellen table-tr-td-Tags entfernt
  * die inline-Styles kommen später ins CSS
  * Das Nachrichten-System ist etwas verbessert. Messages wurden von Users übersehen.
    Meldungen werden per CSS farblich hervorgehoben. Vier CSS-Klassen,
    message_ok, message_error, message_hint,   message_error_login
    Ok = grün,  Fehler = rot,  Hinweis = gelb, Fehler beim Login ist altes CSS, neuer Name
    Der CSS-Code für die Messages ist in allen drei CSSs (noch) identisch.

Im nächsten Teil geht es mit $form->{saved_message} weiter, damit diese Nachrichten
ebenfalls berücksichtigt werden.
---
 config/lx-erp.conf                            |   4 +-
 css/Mobile.css                                |  68 +++++++-----
 css/Win2000.css                               |  49 ++++++++-
 css/lx-office-erp.css                         |  32 ++++--
 locale/de/all                                 |   8 +-
 locale/de_DE/all                              |  12 +-
 locale/en/all                                 |   6 +-
 locale/fr/all                                 |   4 +-
 menu.ini                                      |   4 -
 templates/webpages/admin/adminlogin.html      |   2 +-
 .../webpages/admin/delete_group_confirm.html  |   4 +-
 templates/webpages/admin/edit_group.html      | 104 ++++++------------
 .../webpages/admin/edit_group_membership.html |   2 +-
 templates/webpages/admin/edit_groups.html     |  51 ++++-----
 templates/webpages/admin/list_users.html      |  29 +++--
 .../webpages/admin/test_db_connection.html    |   4 +-
 templates/webpages/admin_printer/list.html    |   2 +-
 .../bank_account_display_form.html            |   2 +-
 templates/webpages/dbupgrade/warning.html     |   6 +-
 templates/webpages/login/login_screen.html    |   2 +-
 .../report_generator/html_report.html         |   2 +-
 templates/webpages/rp/html_report_susa.html   |   2 +-
 .../webpages/sepa/bank_transfer_create.html   |   2 +-
 23 files changed, 212 insertions(+), 189 deletions(-)

diff --git a/config/lx-erp.conf b/config/lx-erp.conf
index 225098ab5..2bd50a706 100644
--- a/config/lx-erp.conf
+++ b/config/lx-erp.conf
@@ -20,13 +20,15 @@ $templates = "templates";
 # member file
 $memberfile = "users/members";
 
-# Wenn nicht Bilanzierung dann auf 1 setzen
+# Wenn Einnahmen-Überschussrechnung, dann auf 1 setzen
+# Wenn Bilanzierung (z.B. GmbH), dann auf 0 setzen
 $eur = 1;
 
 # location of sendmail
 $sendmail = '| /usr/sbin/sendmail -t<%if myconfig_email%> -f <%myconfig_email%><%end%>';
 
 # set language for login and admin
+# currently "de" (German), "de_DE" (new German) and "en" (English, not perfect) are available
 $language = "de";
 
 # Oracle
diff --git a/css/Mobile.css b/css/Mobile.css
index 1fa35b45e..adba4fba0 100644
--- a/css/Mobile.css
+++ b/css/Mobile.css
@@ -1,7 +1,7 @@
-/* stylesheet for LX-Office ERP
-Getestet mit W3C CSS-Validator:
-Keine Fehler oder Warnungen gefunden
-*/
+/* Stylesheet for Lx-Office
+ * Name: Mobile.css*/
+
+/* The look of links */
 A      { font-size: 8pt; }
 A:link { color: black; text-decoration: none; }
 A:visited { color: black; text-decoration: none; }
@@ -20,7 +20,7 @@ A:hover {
 }
 
 input:focus, textarea:focus, select:focus {
-  background-color:yellow;
+  background-color: yellow;
 }
 
 body {
@@ -72,6 +72,43 @@ body.menu {
   font-size:8pt;
   color: black;
 }
+
+.message_error_login {
+    color: #000000;
+    border: 1px solid #8b0000;
+    background-color: #ffcccc;
+    padding: 3px;
+}
+.message_ok {
+    font-size: 12pt;
+    padding:5px;
+    background-color: #ADFFB6;
+    color: black;
+    font-weight: bolder;
+    text-align:center;
+    border-style:solid;
+    border-width:thin;
+}
+.message_error {
+    font-size: 12pt;
+    padding:5px;
+    background-color: #FFAAAA;
+    color: black;
+    font-weight: bolder;
+    text-align:center;
+    border-style:solid;
+    border-width:thin;
+}
+.message_hint {
+    font-size: 12pt;
+    padding:5px;
+    background-color: #FFFE47;
+    color: black;
+    font-weight: bolder;
+    text-align:center;
+    border-style:solid;
+    border-width:thin;
+}
 .listtop {
   background-color: #b8d1f3;
   text-align:left;
@@ -100,27 +137,6 @@ body.menu {
   background:#D4D0C8;
 }
 
-.message_ok {
-    font-size: 10pt;
-    padding:3px;
-    background-color: lightgreen;
-    color: black;
-    font-weight: bolder;
-    text-align:center;
-    border-style:solid;
-    border-width:thin;
-}
-
-.message_error {
-    font-size: 10pt;
-    padding:5px;
-    background-color: #FFAAAA;
-    color: white;
-    font-weight: bolder;
-    text-align:center;
-    border-style:solid;
-    border-width:thin;
-}
 
 /* Bei Listen den Farbwechsel zur besseren Lesbarkeit: */
 .listrow1 { background-color: #C8D4C6; color: black; vertical-align: top; }
diff --git a/css/Win2000.css b/css/Win2000.css
index d9dc7b2cd..f2b681a29 100644
--- a/css/Win2000.css
+++ b/css/Win2000.css
@@ -1,8 +1,7 @@
-/* stylesheet for LX-Office ERP
-Getestet mit W3C CSS-Validator:
-Keine Fehler oder Warnungen gefunden
-*/
+/* Stylesheet for Lx-Office
+ * Name: Win2000.css*/
 
+/* The look of links */
 A:link { color: black; text-decoration: none; }
 A:visited { color: black; text-decoration: none; }
 A:active { color: black; text-decoration: underline; }
@@ -15,12 +14,12 @@ A.nohover:hover {
 A:hover {
   color:white;
   background-color: #093280;
-  font-size: 10pt;
+  /*font-size: 10pt;*/
   text-decoration: none;
 }
 
 input:focus, textarea:focus, select:focus {
-  background-color:yellow;
+  background-color: yellow;
 }
 
 body {
@@ -72,6 +71,44 @@ body.menu {
   font-size:10pt;
   color: black;
 }
+
+.message_error_login {
+    color: #000000;
+    border: 1px solid #8b0000;
+    background-color: #ffcccc;
+    padding: 3px;
+}
+.message_ok {
+    font-size: 12pt;
+    padding:5px;
+    background-color: #ADFFB6;
+    color: black;
+    font-weight: bolder;
+    text-align:center;
+    border-style:solid;
+    border-width:thin;
+}
+.message_error {
+    font-size: 12pt;
+    padding:5px;
+    background-color: #FFAAAA;
+    color: black;
+    font-weight: bolder;
+    text-align:center;
+    border-style:solid;
+    border-width:thin;
+}
+.message_hint {
+    font-size: 12pt;
+    padding:5px;
+    background-color: #FFFE47;
+    color: black;
+    font-weight: bolder;
+    text-align:center;
+    border-style:solid;
+    border-width:thin;
+}
+
 .listtop {
   background-color: #b8d1f3;
   text-align:left;
diff --git a/css/lx-office-erp.css b/css/lx-office-erp.css
index bf6d86d5a..404c76725 100644
--- a/css/lx-office-erp.css
+++ b/css/lx-office-erp.css
@@ -1,4 +1,5 @@
-/* stylesheet for LX-Office ERP */
+/* Stylesheet for Lx-Office
+ * Name: lx-office-erp.css*/
 
 /* The look of links */
 A:link { color: mediumblue; text-decoration: none; }
@@ -10,7 +11,7 @@ A:hover { color: black;
          }
 
 input:focus, textarea:focus, select:focus {
-  background-color:yellow;
+  background-color: yellow;
 }
 
 body {
@@ -84,17 +85,22 @@ body.menu {
   color: black;
 }
 
+.message_error_login {
+    color: #000000;
+    border: 1px solid #8b0000;
+    background-color: #ffcccc;
+    padding: 3px;
+}
 .message_ok {
     font-size: 12pt;
     padding:5px;
-    background-color: lightgreen;
+    background-color: #ADFFB6;
     color: black;
     font-weight: bolder;
     text-align:center;
     border-style:solid;
     border-width:thin;
 }
-
 .message_error {
     font-size: 12pt;
     padding:5px;
@@ -105,6 +111,16 @@ body.menu {
     border-style:solid;
     border-width:thin;
 }
+.message_hint {
+    font-size: 12pt;
+    padding:5px;
+    background-color: #FFFE66;
+    color: black;
+    font-weight: bolder;
+    text-align:center;
+    border-style:solid;
+    border-width:thin;
+}
 
 /*
     Überschriftsbalken
@@ -255,11 +271,3 @@ label {
 .unbalanced_ledger {
   background-color: #ffa0a0;
 }
-
-.error_message {
-  color: #000000;
-  border: 1px solid #8b0000;
-  background-color: #ffcccc;
-  padding: 3px;
-}
-
diff --git a/locale/de/all b/locale/de/all
index 25d7887b6..fe3a458ff 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -177,6 +177,7 @@ $self->{texts} = {
   'Amended Advance Turnover Tax Return (Nr. 10)' => 'Ist dies eine berichtigte Anmeldung? (Nr. 10/Zeile 15 Steuererklärung)',
   'Amount'                      => 'Betrag',
   'Amount Due'                  => 'Betrag fällig',
+  'Amount has to be greater then zero! Wrong row number: ' => 'Leere Eingabe oder Werte kleiner, gleich null eingegeben. Fehler in Reihe Nummer: ',
   'Annotations'                 => 'Anmerkungen',
   'Another user with the login #1 does already exist.' => 'Es existiert bereits ein anderer Benutzer mit diesem Login.',
   'Ap aging on %s'              => 'Offene Verbindlichkeiten zum %s',
@@ -970,7 +971,7 @@ $self->{texts} = {
   'Lx-Office can fix these problems automatically.' => 'Lx-Office kann solche Probleme automatisch beheben.',
   'Lx-Office has been switched to group-based access restrictions.' => 'Lx-Office wurde auf eine gruppenbasierte Benutzerzugriffsverwaltung umgestellt.',
   'Lx-Office has found one or more problems in the general ledger.' => 'Lx-Office hat ein oder mehrere Probleme im Hauptbuch gefunden.',
-  'Lx-Office is about to update the database <b>#1</b>.' => 'Lx-Office wird gleich die Datenbank <b>#1</b> aktualisieren.',
+  'Lx-Office is about to update the database [ #1 ].' => 'Lx-Office wird gleich die Datenbank [ #1 ] aktualisieren.',
   'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' => 'Lx-Office enth&auml;lt jetzt auch echte Lagerverwaultung anstatt reiner Mengenz&auml;hlung.',
   'MAILED'                      => 'Gesendet',
   'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' => 'Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte w&auml;hlen Sie ein anderes Men&uuml; in der Benutzerkonfiguration im Administrationsmen&uuml; aus.',
@@ -994,6 +995,8 @@ $self->{texts} = {
   'May '                        => 'Mai',
   'May set the BCC field when sending emails' => 'Beim Verschicken von Emails das Feld \'BCC\' setzen',
   'Medium Number'               => 'Datentr&auml;gernummer',
+  'Members not of'              => 'Benutzer nicht in Gruppe',
+  'Members of'                  => 'Benutzer in Gruppe',
   'Memo'                        => 'Memo',
   'Menu'                        => 'Men&uuml;',
   'Message'                     => 'Nachricht',
@@ -1075,7 +1078,6 @@ $self->{texts} = {
   'No valid number entered for pricegroup "#1".' => 'Für Preisgruppe "#1" wurde keine gültige Nummer eingegeben.',
   'No vendor has been selected yet.' => 'Es wurde noch kein Lieferant ausgewählt.',
   'No warehouse has been created yet or the quantity of the bins is not configured yet.' => 'Es wurde noch kein Lager angelegt, bzw. die dazugehörigen Lagerplätze sind noch nicht konfiguriert.',
-  'Amount has to be greater then zero! Wrong row number: ' => 'Leere Eingabe oder Werte kleiner, gleich null eingegeben. Fehler in Reihe Nummer: ',
   'No.'                         => 'Position',
   'Non-taxable Purchases'       => 'Nicht zu versteuernde Einkäufe',
   'Non-taxable Sales'           => 'Nicht zu versteuernde Verkäufe',
@@ -1802,8 +1804,6 @@ $self->{texts} = {
   'User name'                   => 'Benutzername',
   'User saved!'                 => 'Benutzer gespeichert!',
   'Username'                    => 'Benutzername',
-  'Users in<br>this group'      => 'Benutzer in<br>dieser Gruppe',
-  'Users not in this group'     => 'Benutzer nicht in dieser Gruppe',
   'Ust-IDNr'                    => 'USt-IdNr.',
   'Valid from'                  => 'Gültig ab',
   'Valid until'                 => 'gültig bis',
diff --git a/locale/de_DE/all b/locale/de_DE/all
index 04eae0302..127d0bffd 100644
--- a/locale/de_DE/all
+++ b/locale/de_DE/all
@@ -177,6 +177,7 @@ $self->{texts} = {
   'Amended Advance Turnover Tax Return (Nr. 10)' => 'Ist dies eine berichtigte Anmeldung? (Nr. 10/Zeile 15 Steuererklärung)',
   'Amount'                      => 'Betrag',
   'Amount Due'                  => 'Betrag fällig',
+  'Amount has to be greater then zero! Wrong row number: ' => '"Betrag" muss größer Null sein. Fehlerhafte Zeile: ',
   'Annotations'                 => 'Hilfe',
   'Another user with the login #1 does already exist.' => 'Es existiert bereits ein anderer Benutzer mit diesem Login.',
   'Ap aging on %s'              => 'Offene Verbindlichkeiten zum %s',
@@ -970,7 +971,7 @@ $self->{texts} = {
   'Lx-Office can fix these problems automatically.' => 'Lx-Office kann solche Probleme automatisch beheben.',
   'Lx-Office has been switched to group-based access restrictions.' => 'Lx-Office wurde auf eine gruppenbasierte Benutzerzugriffsverwaltung umgestellt.',
   'Lx-Office has found one or more problems in the general ledger.' => 'Lx-Office hat ein oder mehrere Probleme im Hauptbuch gefunden.',
-  'Lx-Office is about to update the database <b>#1</b>.' => 'Lx-Office wird gleich die Datenbank <b>#1</b> aktualisieren.',
+  'Lx-Office is about to update the database [ #1 ].' => '',
   'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' => 'Lx-Office enth&auml;lt jetzt auch echte Lagerverwaultung anstatt reiner Mengenz&auml;hlung.',
   'MAILED'                      => 'Gesendet',
   'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' => 'Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte w&auml;hlen Sie ein anderes Men&uuml; in der Benutzerkonfiguration im Administrationsmen&uuml; aus.',
@@ -994,6 +995,8 @@ $self->{texts} = {
   'May '                        => 'Mai',
   'May set the BCC field when sending emails' => 'Beim Verschicken von Emails das Feld \'BCC\' setzen',
   'Medium Number'               => 'Datentr&auml;gernummer',
+  'Members not of'              => 'Nicht Mitglied in',
+  'Members of'                  => 'Mitglied in',
   'Memo'                        => 'Memo',
   'Menu'                        => 'Men&uuml;',
   'Message'                     => 'Nachricht',
@@ -1075,7 +1078,6 @@ $self->{texts} = {
   'No valid number entered for pricegroup "#1".' => 'Für Preisgruppe "#1" wurde keine gültige Nummer eingegeben.',
   'No vendor has been selected yet.' => 'Es wurde noch kein Lieferant ausgewählt.',
   'No warehouse has been created yet or the quantity of the bins is not configured yet.' => 'Es wurde noch kein Lager angelegt, bzw. die dazugehörigen Lagerplätze sind noch nicht konfiguriert.',
-  'Amount has to be greater then zero! Wrong row number: ' => '"Betrag" muss größer Null sein. Fehlerhafte Zeile: ',
   'No.'                         => 'Position',
   'Non-taxable Purchases'       => 'Nicht zu versteuernde Einkäufe',
   'Non-taxable Sales'           => 'Nicht zu versteuernde Verkäufe',
@@ -1615,7 +1617,7 @@ $self->{texts} = {
   'The following warnings occured during an upgrade to the document templates:' => 'Die folgenden Warnungen traten w&auml;hrend einer Aktualisierung der Dokumentenvorlagen auf:',
   'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' => 'Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname = Variable Einheit;<br>Variablenname2 = Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Variablennamen und Einheiten dürfen nur aus alphanumerischen Zeichen bestehen.<br>Es muss jeweils die Gesamte Zeile eingegeben werden',
   'The greetings have been saved.' => 'Die Anreden wurden gespeichert',
-  'The group has been added.'   => 'Die Gruppe wurde erfasst.',
+  'The group has been added.'   => 'Die neue Gruppe wurde angelegt.',
   'The group has been deleted.' => 'Die Gruppe wurde gel&ouml;scht.',
   'The group has been saved.'   => 'Die Gruppe wurde gespeichert.',
   'The group memberships have been saved.' => 'Die Gruppenmitgliedschaften wurden gespeichert.',
@@ -1639,7 +1641,7 @@ $self->{texts} = {
   'The pg_restore process could not be started.' => 'Der pg_restore-Prozess konnte nicht gestartet werden.',
   'The preferred one is to install packages provided by your operating system distribution (e.g. Debian or RPM packages).' => 'Die bevorzugte Art, ein Perl-Modul zu installieren, ist durch Installation eines von Ihrem Betriebssystem zur Verf&uuml;gung gestellten Paketes (z.B. Debian-Pakete oder RPM).',
   'The program\'s exit code was #1 (&quot;0&quot; usually means that everything went OK).' => 'Der Exitcode des Programms war #1 (&quot;0&quot; bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).',
-  'The project has been added.' => 'Das Projekt wurde erfasst.',
+  'The project has been added.' => 'Das neue Projekt wurde angelegt.',
   'The project has been saved.' => 'Das Projekt wurde gespeichert.',
   'The restoration process has started. Here\'s the output of the &quot;pg_restore&quot; command:' => 'Der Wiederherstellungsprozess wurde gestartet. Hier ist die Ausgabe des &quot;pg_restore&quot;-Programmes:',
   'The restoration process is complete. Please review &quot;pg_restore&quot;\'s output to find out if the restoration was successful.' => 'Die Wiederherstellung ist abgeschlossen. Bitte sehen Sie sich die Ausgabe von &quot;pg_restore&quot; an, um festzustellen, ob die Wiederherstellung erfolgreich war.',
@@ -1802,8 +1804,6 @@ $self->{texts} = {
   'User name'                   => 'Benutzername',
   'User saved!'                 => 'Benutzer gespeichert!',
   'Username'                    => 'Benutzername',
-  'Users in<br>this group'      => 'Benutzer in<br>dieser Gruppe',
-  'Users not in this group'     => 'Benutzer nicht in dieser Gruppe',
   'Ust-IDNr'                    => 'USt-IdNr.',
   'Valid from'                  => 'Gültig ab',
   'Valid until'                 => 'gültig bis',
diff --git a/locale/en/all b/locale/en/all
index a4b95b28d..2224c7b35 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -971,7 +971,7 @@ $self->{texts} = {
   'Lx-Office can fix these problems automatically.' => '',
   'Lx-Office has been switched to group-based access restrictions.' => '',
   'Lx-Office has found one or more problems in the general ledger.' => '',
-  'Lx-Office is about to update the database <b>#1</b>.' => '',
+  'Lx-Office is about to update the database [ #1 ].' => '',
   'Lx-Office is now able to manage warehouses instead of just tracking the amount of goods in your system.' => '',
   'MAILED'                      => '',
   'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' => '',
@@ -995,6 +995,8 @@ $self->{texts} = {
   'May '                        => '',
   'May set the BCC field when sending emails' => '',
   'Medium Number'               => '',
+  'Members not of'              => 'Not members of',
+  'Members of'                  => 'Members of',
   'Memo'                        => '',
   'Menu'                        => '',
   'Message'                     => '',
@@ -1800,8 +1802,6 @@ $self->{texts} = {
   'User name'                   => '',
   'User saved!'                 => '',
   'Username'                    => '',
-  'Users in<br>this group'      => '',
-  'Users not in this group'     => '',
   'Ust-IDNr'                    => '',
   'Valid from'                  => '',
   'Valid until'                 => '',
diff --git a/locale/fr/all b/locale/fr/all
index 2ab00b6ea..1d6cc5441 100644
--- a/locale/fr/all
+++ b/locale/fr/all
@@ -1785,8 +1785,8 @@ $self->{texts} = {
   'User name'                   => '',
   'User saved!'                 => '',
   'Username'                    => '',
-  'Users in<br>this group'      => '',
-  'Users not in this group'     => '',
+  'Members of'                  => '',
+  'Members not of'              => '',
   'Ust-IDNr'                    => '',
   'Valid from'                  => '',
   'Valid until'                 => '',
diff --git a/menu.ini b/menu.ini
index 310c7b568..edb30dcb6 100644
--- a/menu.ini
+++ b/menu.ini
@@ -791,10 +791,6 @@ action=audit_control
 module=am.pl
 action=show_history_search
 
-[System--Administration area]
-module=admin.pl
-action=login
-
 
 [Program]
 
diff --git a/templates/webpages/admin/adminlogin.html b/templates/webpages/admin/adminlogin.html
index 803d9842a..614b33f0a 100644
--- a/templates/webpages/admin/adminlogin.html
+++ b/templates/webpages/admin/adminlogin.html
@@ -10,7 +10,7 @@
   <h2>[% 'Administration' | $T8 %]</h2>
 
   [% IF error_message %]
-  <p><span class="error_message">[% error_message %]</span></p>
+  <p><span class="message_error_login">[% error_message %]</span></p>
   [% END %]
 
   <form method="post" action="admin.pl">
diff --git a/templates/webpages/admin/delete_group_confirm.html b/templates/webpages/admin/delete_group_confirm.html
index 2f684a5c8..e74911efb 100644
--- a/templates/webpages/admin/delete_group_confirm.html
+++ b/templates/webpages/admin/delete_group_confirm.html
@@ -8,11 +8,11 @@
 
   <div class="listtop">[% 'Delete group' | $T8 %]</div>
 
-  <p>[% 'Do you really want to delete this group:' | $T8 %] [% name %] ?</p>
+  <p class="message_hint">[% 'Do you really want to delete this group:' | $T8 %] [% name %] ?</p>
 
   <input type="hidden" name="delete_nextsub" value="delete_group">
-  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
   <button type="button" onclick="history.back()">[% 'Back' | $T8 %]</button>
+  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
 
  </form>
 
diff --git a/templates/webpages/admin/edit_group.html b/templates/webpages/admin/edit_group.html
index 177fbc9be..195efbcab 100644
--- a/templates/webpages/admin/edit_group.html
+++ b/templates/webpages/admin/edit_group.html
@@ -3,23 +3,35 @@
  <form name="Form" method="post" action="admin.pl">
 
   <input type="hidden" name="group_id" value="[% HTML.escape(group_id) %]">
-
   <input type="hidden" name="back_nextsub" value="edit_groups">
 
   [% IF message %]
-  <p>[% message %]</p>
+  <p class="message_ok">[% message %]</p>
   [% END %]
 
-  <div class="listtop">[% 'Edit group ' | $T8 %] [% HTML.escape(name) %]</div>
+  <div class="listtop">[% 'Edit group ' | $T8 %]:  [% HTML.escape(name) %]</div>
+
+  <p><input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]"></p>
+
+   <hr>
 
-  <table width="100%">
-   <tr>
-    <td>
+   <p class="listheading">[% 'Rename the group' | $T8 %]</p>
+   <table>
+     <tr><td><div style="">[% 'Name' | $T8 %]</th><td><input name="name" maxlength="50" value="[% HTML.escape(name) %]"></td></tr>
+	 <tr><th>[% 'Description' | $T8 %]</th><td><input name="description" value="[% HTML.escape(description) %]"></td></tr>
+   </table>
+   <br>
+     <input type="hidden" name="save_nextsub" value="save_group">
+     <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+
+ <hr>
+ <br>
+ <div class="listtop">[% 'Group membership' | $T8 %]</div>
      <table>
-      <tr class="listheading">
-       <td><b>[% 'Users in<br>this group' | $T8 %]</b></td>
-       <td>&nbsp;</td>
-       <td><b>[% 'Users not in this group' | $T8 %]</b></td>
+      <tr>
+       <td><p class="listheading">[% 'Members of' | $T8 %]<br>[% HTML.escape(name) %]</p></td>
+       <td> </td>
+       <td><p class="listheading">[% 'Members not of' | $T8 %]<br>[% HTML.escape(name) %]</p></td>
       </tr>
 
       <tr>
@@ -42,74 +54,30 @@
         </select>
        </td>
       </tr>
-
-      <tr>
-       <td>
-        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
-       </td>
-      </tr>
      </table>
-
-     <hr>
-
-     <table>
-      <tr class="listheading">
-       <td colspan="2">[% 'Edit rights' | $T8 %]</td>
-      </tr>
+ <hr>
+ <br>
+    <div class="listtop">[% 'Edit rights' | $T8 %]</div>
 
       [% FOREACH right = RIGHTS %]
-      <tr>
-       <td>
+
         [% IF right.is_section %]
-        <i>[% right.description %]</i>
+        <br>
+        <h4 style="border-bottom: solid; border-bottom-width: 1px; border-bottom-color: #ddd;">[% right.description %]</h4>
         [% ELSE %]
+        <p style="/*font-size: 11px;*/ margin: 0;">
         <input type="checkbox" name="[% HTML.escape(right.right) %]_granted" id="[% HTML.escape(right.right) %]_granted" [% IF right.granted %]checked[% END %]>
         <label for="[% HTML.escape(right.right) %]_granted">[% IF right.description %][% right.description %][% ELSE %]<i>[% HTML.escape(right.right) %]</i>[% END %]</label>
+         </p>
         [% END %]
-       </td>
-      </tr>
-      [% END %]
 
-      <tr>
-       <td>
-        <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
-        &nbsp;
-        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
-       </td>
-      </tr>
-     </table>
-
-     <hr>
-
-     <table>
-      <tr class="listheading">
-       <td colspan="2">[% 'Rename the group' | $T8 %]</td>
-      </tr>
-
-      <tr>
-       <td>[% 'Name' | $T8 %]:</td>
-       <td><input name="name" maxlength="50" value="[% HTML.escape(name) %]"></td>
-      </tr>
-
-      <tr>
-       <td>[% 'Description' | $T8 %]:</td>
-       <td><input name="description" value="[% HTML.escape(description) %]"></td>
-      </tr>
+      [% END %]
 
-      <tr>
-       <td>
-        <input type="hidden" name="save_nextsub" value="save_group">
-        <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
-        &nbsp;
-        <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
+   <hr>
+    <input type="hidden" name="save_nextsub" value="save_group">
+    <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
+    &nbsp;
+    <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
  </form>
-
 </body>
 </html>
diff --git a/templates/webpages/admin/edit_group_membership.html b/templates/webpages/admin/edit_group_membership.html
index 59047a3e7..103c06689 100644
--- a/templates/webpages/admin/edit_group_membership.html
+++ b/templates/webpages/admin/edit_group_membership.html
@@ -3,6 +3,7 @@
 
  <div class="listtop">[% 'Edit group membership' | $T8 %]</div>
 
+ <p><input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]"></p>
  <p>[% 'Select the checkboxes that match users to the groups they should belong to.' | $T8 %]</p>
 
  <form action="admin.pl">
@@ -38,7 +39,6 @@
 
   <p>
    <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
-   <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
   </p>
 
  </form>
diff --git a/templates/webpages/admin/edit_groups.html b/templates/webpages/admin/edit_groups.html
index fc55609dc..41cbf724d 100644
--- a/templates/webpages/admin/edit_groups.html
+++ b/templates/webpages/admin/edit_groups.html
@@ -1,15 +1,31 @@
 [%- USE T8 %]
 [% USE HTML %]<body>
- <form name="Form" method="post" action="admin.pl">
-
 
+  <div class="listtop">[% 'Edit groups' | $T8 %]</div>
   [% IF message %]
-  <p>[% message %]</p>
+  <p class="message_ok">[% message %]</p>
   [% END %]
 
-  <div class="listtop">[% 'Edit groups' | $T8 %]</div>
+  <form method="post" action="admin.pl">
+     <input type="hidden" name="back_nextsub" value="list_users">
+    <p><input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]"></p>
+  </form>
+
+ <div class="listheading">[% 'Add a new group' | $T8 %]</div>
+ <form method="post" action="admin.pl">
+ <br>
+  <table border="0">
+   <tr><td>[% 'Name' | $T8 %] </td><td><input name="name" maxlength="50"></td></tr>
+   <tr><td>[% 'Description' | $T8 %] </td><td><input name="description"></td></tr>
+  </table>
+   <input type="hidden" name="add_nextsub" value="add_group">
+   <p><input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]"></p>
+  <hr>
+ </form>
+
+
+ <form name="Form" method="post" action="admin.pl">
 
-  <p><input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]"></p>
 
   <div class="listheading">[% 'Edit and delete a group' | $T8 %]</div>
 
@@ -33,7 +49,6 @@
    <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
    [% END %]
    <input type="hidden" name="back_nextsub" value="list_users">
-   <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
   </p>
  </form>
 
@@ -53,29 +68,5 @@
 
  <hr size="2" noshade>
 
- <div class="listheading">[% 'Add a new group' | $T8 %]</div>
-
- <form method="post" action="admin.pl">
-  <p>
-   <table border="0">
-    <tr>
-     <td>[% 'Name' | $T8 %]:</td>
-     <td><input name="name" maxlength="50"></td>
-    </tr>
-
-    <tr>
-     <td>[% 'Description' | $T8 %]:</td>
-     <td><input name="description"></td>
-    </tr>
-   </table>
-  </p>
-
-  <p>
-   <input type="hidden" name="add_nextsub" value="add_group">
-   <input type="submit" class="submit" name="action" value="[% 'Add' | $T8 %]">
-  </p>
-
- </form>
-
 </body>
 </html>
diff --git a/templates/webpages/admin/list_users.html b/templates/webpages/admin/list_users.html
index e2011908e..0828b00c3 100644
--- a/templates/webpages/admin/list_users.html
+++ b/templates/webpages/admin/list_users.html
@@ -11,26 +11,30 @@
      <th class="listtop">[% 'Login Name' | $T8 %]</th>
      <th class="listtop">[% 'Name' | $T8 %]</th>
      <th class="listtop">[% 'Company' | $T8 %]</th>
-     <th class="listtop">[% 'Driver' | $T8 %]</th>
-     <th class="listtop">[% 'Host' | $T8 %]</th>
-     <th class="listtop">[% 'Dataset' | $T8 %]</th>
      <th class="listtop">[% 'Templates' | $T8 %]</th>
+     <th class="listtop">[% 'Print' | $T8 %]</th>
+     <th class="listtop">[% 'Language' | $T8 %]</th>
+     <th class="listtop">[% 'Dataset' | $T8 %]</th>
+     <th class="listtop">[% 'Host' | $T8 %]</th>
+<!-- <th class="listtop">[% 'Driver' | $T8 %]</th> -->
     </tr>
 
     [% FOREACH row = MEMBERS %]
      <tr class="listrow[% loop.count % 2 %]">
-      <td><a href="admin.pl?action=edit&login=[% HTML.url(row.login) %]">[% HTML.escape(row.login) %]</a></td>
-      <td>[% HTML.escape(row.name) %]</td>
-      <td>[% HTML.escape(row.company) %]</td>
-      <td>[% HTML.escape(row.dbdriver) %]</td>
-      <td>[% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %]</td>
-      <td>[% HTML.escape(row.dbname) %]</td>
-      <td>[% HTML.escape(row.templates) %]</td>
+      <td>&nbsp;<a href="admin.pl?action=edit&login=[% HTML.url(row.login) %]">[% HTML.escape(row.login) %]</a></td>
+      <td>&nbsp;[% HTML.escape(row.name) %]</td>
+      <td>&nbsp;[% HTML.escape(row.company) %]</td>
+      <td>&nbsp;[% HTML.escape(row.templates) %]</td>
+      <td>&nbsp;[% HTML.escape(row.template_format) %]</td>
+      <td>&nbsp;[% HTML.escape(row.countrycode) %]</td>
+      <td>&nbsp;[% HTML.escape(row.dbname) %]</td>
+      <td>&nbsp;[% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %]</td>
+<!--  <td>&nbsp;[% HTML.escape(row.dbdriver) %]</td> -->
      </tr>
     [% END %]
 
-    <td colspan="7"><hr size="3" noshade></td>
    </table>
+  <hr size="3" noshade>
   </p>
 
 
@@ -45,9 +49,10 @@
   [% END %]
   <input type="submit" class="submit" name="action" value="[% 'Logout' | $T8 %]">
 
+  <div style="background-color: #FFFFDA; font-size: 12px; padding: 0.5em; max-width: 720px; margin: 1em;">
   <p>[% 'Click on login name to edit!' | $T8 %]</p>
-
   <p>[% 'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.' | $T8 %]</p>
+  </div>
  </form>
 
  <form method="post" action="login.pl">
diff --git a/templates/webpages/admin/test_db_connection.html b/templates/webpages/admin/test_db_connection.html
index 865efeac9..fc0b2839e 100644
--- a/templates/webpages/admin/test_db_connection.html
+++ b/templates/webpages/admin/test_db_connection.html
@@ -5,11 +5,11 @@
 
  [%- IF connection_ok %]
 
- <p>[% 'The connection was established successfully.' | $T8 %]</p>
+ <p class="message_ok">[% 'The connection was established successfully.' | $T8 %]</p>
 
  [%- ELSE %]
 
- <p>
+ <p class="message_error">
   [% 'The connection to the database could not be established.' | $T8 %]
   [% 'Error message from the database driver:' | $T8 %]
  </p>
diff --git a/templates/webpages/admin_printer/list.html b/templates/webpages/admin_printer/list.html
index 92a7095d4..cd9b78475 100644
--- a/templates/webpages/admin_printer/list.html
+++ b/templates/webpages/admin_printer/list.html
@@ -25,7 +25,7 @@
         </tr>
 [%- END %]
 [%- ELSE %]
-        <tr><td colspan='3'>[% 'No data was found.' | $T8 %]</td></tr>
+        <tr><td colspan='3'><p class="message_hint">[% 'No data was found.' | $T8 %]</p></td></tr>
 [%- END %]
       </table>
     </td>
diff --git a/templates/webpages/bankaccounts/bank_account_display_form.html b/templates/webpages/bankaccounts/bank_account_display_form.html
index 5ea200721..b12468231 100644
--- a/templates/webpages/bankaccounts/bank_account_display_form.html
+++ b/templates/webpages/bankaccounts/bank_account_display_form.html
@@ -3,7 +3,7 @@
 <body>
 
 [%- IF params.error %]
- <p><div class="error_message">[% params.error %]</div></p>
+ <p><div class="message_error">[% params.error %]</div></p>
 [%- END %]
 
  <p><div class="listtop">[% title %]</div></p>
diff --git a/templates/webpages/dbupgrade/warning.html b/templates/webpages/dbupgrade/warning.html
index 129b36b61..f54c68754 100644
--- a/templates/webpages/dbupgrade/warning.html
+++ b/templates/webpages/dbupgrade/warning.html
@@ -5,10 +5,10 @@
 
  <input type="hidden" name="action" value="login">
  <p><input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]"></p>
+ <p class="message_hint">
+  [% LxERP.t8('Lx-Office is about to update the database [ #1 ].', dbname) | html %]
+ </p>
  <p>
-  [% LxERP.t8('Lx-Office is about to update the database <b>#1</b>.', dbname) | html %]
-  </p>
-  <p>
   [% 'You should create a backup of the database before proceeding because the backup might not be reversible.' | $T8 %]
  </p>
 
diff --git a/templates/webpages/login/login_screen.html b/templates/webpages/login/login_screen.html
index 0b298c750..8bfd2185e 100644
--- a/templates/webpages/login/login_screen.html
+++ b/templates/webpages/login/login_screen.html
@@ -9,7 +9,7 @@
      <h3 class="login" align="center">[% 'Lx-Office' | $T8 %] [% version %]</h3>
 
      [% IF error_message %]
-     <p><span class="error_message">[% error_message %]</span></p>
+     <p><span class="message_error_login">[% error_message %]</span></p>
      [% END %]
 
      <p>
diff --git a/templates/webpages/report_generator/html_report.html b/templates/webpages/report_generator/html_report.html
index fa8874c5b..32c2bd5d8 100644
--- a/templates/webpages/report_generator/html_report.html
+++ b/templates/webpages/report_generator/html_report.html
@@ -92,7 +92,7 @@
   </table>
  </p>
  [% ELSE %]
-  <p>[% 'No data was found.' | $T8 %]</p>
+  <p class="message_hint">[% 'No data was found.' | $T8 %]</p>
  [% END %]
 
  [% RAW_BOTTOM_INFO_TEXT %]
diff --git a/templates/webpages/rp/html_report_susa.html b/templates/webpages/rp/html_report_susa.html
index c9b010a78..269e44c9a 100644
--- a/templates/webpages/rp/html_report_susa.html
+++ b/templates/webpages/rp/html_report_susa.html
@@ -91,7 +91,7 @@
   </table>
  </p>
  [% ELSE %]
-  <p>[% 'No data was found.' | $T8 %]</p>
+  <p class="message_hint">[% 'No data was found.' | $T8 %]</p>
  [% END %]
 
  [% RAW_BOTTOM_INFO_TEXT %]
diff --git a/templates/webpages/sepa/bank_transfer_create.html b/templates/webpages/sepa/bank_transfer_create.html
index 318639e2e..06bbea880 100644
--- a/templates/webpages/sepa/bank_transfer_create.html
+++ b/templates/webpages/sepa/bank_transfer_create.html
@@ -3,7 +3,7 @@
 <body>
 
  [%- IF error_message %]
- <p><div class="error_message">[% error_message %]</div></p>
+ <p><div class="message_error">[% error_message %]</div></p>
  [%- END %]
 
  <p><div class="listtop">[% title %]</div></p>
-- 
2.20.1