From 38e7a330463acef3f5856985353faba026ecf7f9 Mon Sep 17 00:00:00 2001
From: Sven Donath <lxo@dexo.de>
Date: Thu, 12 Aug 2010 01:19:19 +0200
Subject: [PATCH] =?utf8?q?Seitliches=20Men=C3=BC=20mit=20den=20Icons=20des?=
 =?utf8?q?=20XUL-Men=C3=BCs=20in=2024x24=20versehen.=20Reparatur=20an=20XU?=
 =?utf8?q?L-Men=C3=BC=20nach=20"Programm->Program"-=C3=84nderung.=20Anf?=
 =?utf8?q?=C3=BChrungszeichen=20in=20kopf.pl=20und=20Vorw=C3=A4rts-Link.?=
 =?utf8?q?=20Falls=20die=2024x24-Icons=20okay=20sind,=20k=C3=B6nnen=20die?=
 =?utf8?q?=20alten=20Icons=20(direkt=20unterhalb=20images/)=20gel=C3=B6sch?=
 =?utf8?q?t=20werden.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/Form.pm                                 |   6 ++++++
 bin/mozilla/kopf.pl                        |   3 ++-
 bin/mozilla/menu.pl                        |   2 +-
 image/icons/24x24/Productivity.png         | Bin 0 -> 1720 bytes
 image/icons/24x24/Warehouse.png            | Bin 0 -> 1626 bytes
 locale/de/all                              |   2 ++
 templates/webpages/login/company_logo.html |  17 +++++++----------
 xslt/xulmenu.xsl                           |   2 +-
 8 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 image/icons/24x24/Productivity.png
 create mode 100644 image/icons/24x24/Warehouse.png

diff --git a/SL/Form.pm b/SL/Form.pm
index 20acf122c..707540ed7 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -472,6 +472,12 @@ sub info {
     print qq|
     <p class="message_ok"><b>$msg</b></p>
     
+    <script type="text/javascript">
+    <!--
+    setTimeout("parent.frames.main_window.location.href='login.pl?action=company_logo'",1000);
+    //-->
+    </script>
+    
 </body>
     |;
 
diff --git a/bin/mozilla/kopf.pl b/bin/mozilla/kopf.pl
index 8f12b6191..eef8b77d0 100644
--- a/bin/mozilla/kopf.pl
+++ b/bin/mozilla/kopf.pl
@@ -115,8 +115,9 @@ print qq|
   <tr>
     <td  style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
       &nbsp;[<a href="JavaScript:top.main_window.print();" title="| . $locale->text('Hardcopy') . qq|">| . $locale->text('Print') . qq|</a>]
-      &nbsp;[<a HREF="login.pl" target="_blank" "title="| . $locale->text('Open a further Lx-Office Window or Tab') . qq|">| . $locale->text('New Win/Tab') . qq|</a>]
+      &nbsp;[<a HREF="login.pl" target="_blank" title="| . $locale->text('Open a further Lx-Office Window or Tab') . qq|">| . $locale->text('New Win/Tab') . qq|</a>]
       &nbsp;[<a href="Javascript:top.main_window.history.back();" title="| . $locale->text('Go one step back') . qq|">| . $locale->text('Back') . qq|</a>]
+      &nbsp;[<a href="Javascript:top.main_window.history.forward();" title="| . $locale->text('Go one step forward') . qq|">| . $locale->text('Fwd') . qq|</a>]
       <!-- is there a better solution for Back? Possibly with the callback variable? -->
     </td>
     <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>|
diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index d2bc685ce..5ca98cf53 100644
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -218,7 +218,7 @@ sub section_menu {
       } else {
         my $ml_ = $form->escape($ml);
         print
-          qq|<tr><td class="bg" height="22" align="left" valign="middle" ><a href="menu.pl?action=acc_menu&level=$ml_" class="nohover""><img src="image/$item.png" border="0" style="vertical-align:middle" titel="Hallo Welt">&nbsp;$label</a>&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>\n|;
+          qq|<tr><td class="bg" height="22" align="left" valign="middle" ><a href="menu.pl?action=acc_menu&level=$ml_" class="nohover""><img src="image/icons/24x24/$item.png" border="0" style="vertical-align:middle" titel="Hallo Welt">&nbsp;$label</a>&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>\n|;
         &section_menu($menu, $item);
 
         #print qq|<br>\n|;
diff --git a/image/icons/24x24/Productivity.png b/image/icons/24x24/Productivity.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfa0b5f9de37640af698ad198b3cc902e75ac4dc
GIT binary patch
literal 1720
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
O0000<MNUMnLSTZ_VLuK4

literal 0
HcmV?d00001

diff --git a/image/icons/24x24/Warehouse.png b/image/icons/24x24/Warehouse.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4ad3866adda223a8078d824f480bff82f0a4369
GIT binary patch
literal 1626
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
YFInBP1y{bzmH+?%07*qoM6N<$f@OsjbpQYW

literal 0
HcmV?d00001

diff --git a/locale/de/all b/locale/de/all
index 553729d25..52e558d64 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -761,6 +761,7 @@ $self->{texts} = {
   'From Date'                   => 'Von',
   'Full Access'                 => 'Vollzugriff',
   'Full access to all functions' => 'Vollzugriff auf alle Funktionen',
+  'Fwd'                         => 'Vorw&auml;rts',
   'GL Transaction'              => 'Dialogbuchung',
   'Gegenkonto'                  => 'Gegenkonto',
   'Gender'                      => 'Geschlecht',
@@ -772,6 +773,7 @@ $self->{texts} = {
   'Generic Tax Report'          => 'USTVA Bericht',
   'Given Name'                  => 'Vorname',
   'Go one step back'            => 'Einen Schritt zur&uuml;ck',
+  'Go one step forward'         => 'Einen Schritt vorw&auml;rts',
   'Greeting'                    => 'Anrede',
   'Greetings'                   => 'Anreden',
   'Group'                       => 'Warengruppe',
diff --git a/templates/webpages/login/company_logo.html b/templates/webpages/login/company_logo.html
index a30645605..f65f2ff0a 100644
--- a/templates/webpages/login/company_logo.html
+++ b/templates/webpages/login/company_logo.html
@@ -1,6 +1,13 @@
 [%- USE T8 %]
 [% USE HTML %][% USE LxERP %]<body>
  [%- DEFAULT myconfig_dbhost = 'localhost' %]
+   <noscript>
+   [% INCLUDE 'generic/information.html'
+     title_information = LxERP.t8('Your browser does not currently support Javascript.'),
+     label_information = LxERP.t8('A lot of the usability of Lx-Office has been enhanced with javascript. Although it is currently possible to use every aspect of Lx-Office without javascript, we strongly recommend it. In a future version this may change and javascript may be necessary to access advanced features.'),
+   %]
+   </noscript>
+ [%- todo_list %]
 
  <center>
   <a class="nomobile" href="http://www.lx-office.org" target="_top"><img src="image/lx-office-erp.png" border="0"></a>
@@ -39,16 +46,6 @@
      <th colspan="2" align="center"><a href="http://lx-office.org" target="blank">http://lx-office.org</a></th>
     </tr>
    </table>
-
-   <noscript>
-   [% INCLUDE 'generic/information.html'
-     title_information = LxERP.t8('Your browser does not currently support Javascript.'),
-     label_information = LxERP.t8('A lot of the usability of Lx-Office has been enhanced with javascript. Although it is currently possible to use every aspect of Lx-Office without javascript, we strongly recommend it. In a future version this may change and javascript may be necessary to access advanced features.'),
-   %]
-   </noscript>
  </center>
-
- [%- todo_list %]
-
 </body>
 </html>
diff --git a/xslt/xulmenu.xsl b/xslt/xulmenu.xsl
index 0263d042e..3427c7b14 100644
--- a/xslt/xulmenu.xsl
+++ b/xslt/xulmenu.xsl
@@ -260,7 +260,7 @@ https://developer.mozilla.org/en/XUL/Attribute/tooltiptext
 <xsl:template name="specialbuttons">
     <toolbarbutton image="image/icons/24x24/Batch Printing.png" oncommand="PrintW(event)" tooltiptext="Drucken"/>
     <toolbarbutton image="image/icons/24x24/Neues Fenster.png" tooltiptext="Neues Fenster" link="menuXML.pl?action=display" target="_top" oncommand="openLinkNewWindow(event)"/>
-    <toolbarbutton image="image/icons/24x24/Programm--Logout.png" link="{/*//item[@id='Programm--Logout']/@link}" target="_top" oncommand="openLink(event)" tooltiptext="Abmelden"/>
+    <toolbarbutton image="image/icons/24x24/Program--Logout.png" link="{/*//item[@id='Program--Logout']/@link}" target="_top" oncommand="openLink(event)" tooltiptext="Abmelden"/>
   <toolbarseparator/>
     <toolbarbutton image="image/icons/24x24/leftarrow_24.png" tooltiptext="Schritt zurück" oncommand="MyGoBack()"/>
     <toolbarbutton image="image/icons/24x24/rightarrow_24.png" tooltiptext="Schritt vor" oncommand="MyGoForward()"/>
-- 
2.20.1