From: Sven Donath <lxo@dexo.de>
Date: Wed, 11 Aug 2010 23:19:19 +0000 (+0200)
Subject: Seitliches Menü mit den Icons des XUL-Menüs in 24x24 versehen.
X-Git-Tag: release-2.6.2beta1~189
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=38e7a330463acef3f5856985353faba026ecf7f9;p=kivitendo-erp.git

Seitliches Menü mit den Icons des XUL-Menüs in 24x24 versehen.
Reparatur an XUL-Menü nach "Programm->Program"-Änderung.
Anführungszeichen in kopf.pl und Vorwärts-Link.
Falls die 24x24-Icons okay sind, können die alten Icons (direkt unterhalb images/) gelöscht werden.
---

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 000000000..bfa0b5f9d
Binary files /dev/null and b/image/icons/24x24/Productivity.png differ
diff --git a/image/icons/24x24/Warehouse.png b/image/icons/24x24/Warehouse.png
new file mode 100644
index 000000000..d4ad3866a
Binary files /dev/null and b/image/icons/24x24/Warehouse.png differ
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()"/>