From d3835e76df74c5bc7f014048303a2845a1d2277e Mon Sep 17 00:00:00 2001
From: Sven Donath <lxo@dexo.de>
Date: Mon, 1 Nov 2010 10:37:14 +0100
Subject: [PATCH] Teil 2.1 von: Usability und Lokalisierung, Administration,
 Gruppen
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Einen "Zurück"-Button mit absoluter Rücksprung Adresse versehen statt in der Historie
einen Schritt zurück zu gehen.
Auf Gruppenrechte-Seite die Buttons "Zurück" und "Speichern" vertauscht.
Delete-Confirm-Message so umgebaut, dass der Gruppenname am Anfang der Frage steht
und zusätzlich in der Überschrift.

Fehlermeldungen durch generic/error.html so verändert, dass die Fehlerursache
mit in der CSS-class="message_error" steht. Der "Zurück"-Button befindet sich darunter.
Es gibt Fälle, wo der "Zurück"-Button keine Funktion hat. Mir ist es bisher im Pop-Up "Details"
für Kunden und Lieferanten z.B. in der Rechnungsmaske aufgefallen. In Pop-Up-Fehlermeldungen
sollte der "Zurück"-Button ein "Schließen"- oder "OK"-Button werden.
Das werde ich mit einer Anpassung der Bedingung IF SHOW_BACK_BUTTON realisieren.
---
 locale/de/all                                 |  2 +-
 locale/de_DE/all                              |  2 +-
 locale/en/all                                 |  2 +-
 locale/fr/all                                 |  2 +-
 .../webpages/admin/delete_group_confirm.html  | 24 +++++++++----------
 templates/webpages/admin/edit_group.html      |  3 +--
 templates/webpages/admin_printer/edit.html    |  2 +-
 templates/webpages/admin_printer/list.html    |  8 +++----
 templates/webpages/admin_printer/login.html   |  2 +-
 templates/webpages/generic/error.html         |  8 ++++---
 10 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/locale/de/all b/locale/de/all
index 2cb27051a..25677233b 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -554,7 +554,7 @@ $self->{texts} = {
   'Do you really want to delete AP transaction #1?' => 'Wollen Sie wirklich die Kreditorenbuchung #1 löschen?',
   'Do you really want to delete AR transaction #1?' => 'Wollen Sie wirklich die Debitorenbuchung #1 löschen?',
   'Do you really want to delete GL transaction #1?' => 'Wollen Sie wirklich die Dialogbuchung #1 löschen?',
-  'Do you really want to delete this group:' => 'Wollen Sie wirklich diese Gruppe l&ouml;schen:',
+  'Do you really want to delete this group?' => 'Gruppe wirklich l&ouml;schen?',
   'Do you really want to delete this warehouse?' => 'Wollen Sie dieses Lager wirklich l&ouml;schen?',
   'Do you want Lx-Office to create a group for access to all functions?' => 'Wollen Sie, dass Lx-Office eine Gruppe mit Zugriff auf alle Funktionen anlegt?',
   'Do you want to <b>limit</b> your search?' => 'Wollen Sie Ihre Suche <b>spezialisieren</b>?',
diff --git a/locale/de_DE/all b/locale/de_DE/all
index 127d0bffd..d39bf7695 100644
--- a/locale/de_DE/all
+++ b/locale/de_DE/all
@@ -554,7 +554,7 @@ $self->{texts} = {
   'Do you really want to delete AP transaction #1?' => 'Wollen Sie wirklich die Kreditorenbuchung #1 löschen?',
   'Do you really want to delete AR transaction #1?' => 'Wollen Sie wirklich die Debitorenbuchung #1 löschen?',
   'Do you really want to delete GL transaction #1?' => 'Wollen Sie wirklich die Dialogbuchung #1 löschen?',
-  'Do you really want to delete this group:' => 'Wollen Sie wirklich diese Gruppe l&ouml;schen:',
+  'Do you really want to delete this group?' => 'Gruppe wirklich l&ouml;schen?',
   'Do you really want to delete this warehouse?' => 'Wollen Sie dieses Lager wirklich l&ouml;schen?',
   'Do you want Lx-Office to create a group for access to all functions?' => 'Wollen Sie, dass Lx-Office eine Gruppe mit Zugriff auf alle Funktionen anlegt?',
   'Do you want to <b>limit</b> your search?' => 'Wollen Sie Ihre Suche <b>spezialisieren</b>?',
diff --git a/locale/en/all b/locale/en/all
index 2224c7b35..cb322eebd 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -554,7 +554,7 @@ $self->{texts} = {
   'Do you really want to delete AP transaction #1?' => '',
   'Do you really want to delete AR transaction #1?' => '',
   'Do you really want to delete GL transaction #1?' => '',
-  'Do you really want to delete this group:' => '',
+  'Do you really want to delete this group?' => '',
   'Do you really want to delete this warehouse?' => '',
   'Do you want Lx-Office to create a group for access to all functions?' => '',
   'Do you want to <b>limit</b> your search?' => '',
diff --git a/locale/fr/all b/locale/fr/all
index 1d6cc5441..6b0057729 100644
--- a/locale/fr/all
+++ b/locale/fr/all
@@ -549,7 +549,7 @@ $self->{texts} = {
   'Do you really want to delete AP transaction #1?' => '',
   'Do you really want to delete AR transaction #1?' => '',
   'Do you really want to delete GL transaction #1?' => '',
-  'Do you really want to delete this group:' => '',
+  'Do you really want to delete this group?' => '',
   'Do you really want to delete this warehouse?' => '',
   'Do you want Lx-Office to create a group for access to all functions?' => '',
   'Do you want to <b>limit</b> your search?' => '',
diff --git a/templates/webpages/admin/delete_group_confirm.html b/templates/webpages/admin/delete_group_confirm.html
index e74911efb..1b558c733 100644
--- a/templates/webpages/admin/delete_group_confirm.html
+++ b/templates/webpages/admin/delete_group_confirm.html
@@ -1,20 +1,18 @@
 [%- USE T8 %]
 [% USE HTML %]<body>
- <form name="Form" method="post" action="admin.pl">
+  <div class="listtop">[% 'Delete group' | $T8 %]: [% name %]</div>
+  <p class="message_hint">[ [% name %] ] - [% 'Do you really want to delete this group?' | $T8 %]</p>
 
+   <form name="Form" method="post" action="admin.pl">
+    <input type="hidden" name="back_nextsub" value="edit_groups">
+    <input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]">
 
-  <input type="hidden" name="group_id" value="[% HTML.escape(id) %]">
-  <input type="hidden" name="confirmed" value="1">
 
-  <div class="listtop">[% 'Delete group' | $T8 %]</div>
+    <input type="hidden" name="group_id" value="[% HTML.escape(id) %]">
+    <input type="hidden" name="confirmed" value="1">
+    <input type="hidden" name="delete_nextsub" value="delete_group">
+    <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
+   </form>
 
-  <p class="message_hint">[% 'Do you really want to delete this group:' | $T8 %] [% name %] ?</p>
-
-  <input type="hidden" name="delete_nextsub" value="delete_group">
-  <button type="button" onclick="history.back()">[% 'Back' | $T8 %]</button>
-  <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
-
- </form>
-
-</body>
+ </body>
 </html>
diff --git a/templates/webpages/admin/edit_group.html b/templates/webpages/admin/edit_group.html
index 195efbcab..88ced6a67 100644
--- a/templates/webpages/admin/edit_group.html
+++ b/templates/webpages/admin/edit_group.html
@@ -75,9 +75,8 @@
 
    <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 %]">
+    <input type="submit" class="submit" name="action" value="[% 'Save' | $T8 %]">
  </form>
 </body>
 </html>
diff --git a/templates/webpages/admin_printer/edit.html b/templates/webpages/admin_printer/edit.html
index c8edd609c..6f50b6410 100644
--- a/templates/webpages/admin_printer/edit.html
+++ b/templates/webpages/admin_printer/edit.html
@@ -28,12 +28,12 @@
 
 <br>
 <input type=hidden name=action value="printer_dispatcher">
+<input type=submit class=submit name=list_printers value="[% 'Back' | $T8 %]">
 <input type=submit class=submit name=save_printer value="[% 'Save' | $T8 %]">
 
 [%- IF id %]
 <input type=submit class=submit name=delete_printer value="[% 'Delete' | $T8 %]">
 [%- END %]
-<input type=submit class=submit name=list_printers value="[% 'Back' | $T8 %]">
 
 </form>
 
diff --git a/templates/webpages/admin_printer/list.html b/templates/webpages/admin_printer/list.html
index cd9b78475..6ff4b5e88 100644
--- a/templates/webpages/admin_printer/list.html
+++ b/templates/webpages/admin_printer/list.html
@@ -19,9 +19,9 @@
 [%- IF all_printers.size %]
 [%- FOREACH row = all_printers %]
         <tr valign=top class="listrow[% loop.count % 2 %]">
-          <td><a href="[% edit_link %][% row.id %]">[% row.printer_description %]</a></td>
-          <td align=left>[% row.printer_command | html %]</td>
-          <td align=left>[% row.template_code | html %]</td>
+          <td>&nbsp;<a href="[% edit_link %][% row.id %]">[% row.printer_description %]</a></td>
+          <td align=left>&nbsp;[% row.printer_command | html %]</td>
+          <td align=left>&nbsp;[% row.template_code | html %]</td>
         </tr>
 [%- END %]
 [%- ELSE %]
@@ -37,8 +37,8 @@
 
 <br>
  <input type="hidden" name="action" value="printer_dispatcher">
- <input type="submit" name="add_printer" value ="[% 'Add' | $T8 %]">
  <input type="submit" name='get_login_form' value="[% 'Back' | $T8 %]">
+ <input type="submit" name="add_printer" value ="[% 'Add' | $T8 %]">
 </form>
 </body>
 </html>
diff --git a/templates/webpages/admin_printer/login.html b/templates/webpages/admin_printer/login.html
index d45f1ce85..0948d1bf1 100644
--- a/templates/webpages/admin_printer/login.html
+++ b/templates/webpages/admin_printer/login.html
@@ -9,8 +9,8 @@
 
 <input type='hidden' name='action' value='printer_dispatcher'>
 <p>
-<input type='submit' name='list_printers' value='[% 'Continue' | $T8 %]'>
 <input type='submit' name='list_users' value='[% 'Back' | $T8 %]'>
+<input type='submit' name='list_printers' value='[% 'Continue' | $T8 %]'>
 </p>
 
 </form>
diff --git a/templates/webpages/generic/error.html b/templates/webpages/generic/error.html
index f421e0cb8..cb3f22531 100644
--- a/templates/webpages/generic/error.html
+++ b/templates/webpages/generic/error.html
@@ -1,10 +1,12 @@
 [%- USE T8 %]
 [% USE HTML %]<body>
 
- <div class="message_error">[% IF title_error %][% title_error %][% ELSE %][% 'Error!' | $T8 %][% END %]</div>
-<p><input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]"></p>
+ <div class="message_error">[% IF title_error %][% title_error %][% ELSE %][% 'Error!' | $T8 %][% END %]
  <p>[% label_error %]</p>
-
+ </div>
+ 
+ <p style="text-align: left;"><input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]"></p>
+ 
  [%- IF SHOW_BACK_BUTTON %]
  <form>
   <p>
-- 
2.20.1