From: Sven Donath <lxo@dexo.de>
Date: Fri, 9 Jul 2010 17:22:16 +0000 (+0200)
Subject: XUL - Menu für Firefox/Prism: Stylesheet geändert.
X-Git-Tag: release-2.6.2beta1~334
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c8c6d6d4bb71e6265dbc25e65d4d75297b016455;p=kivitendo-erp.git

XUL - Menu für Firefox/Prism: Stylesheet geändert.
Somit werden jetzt nur die Top-Menü-Beschriftungen vom Stylesheet gesteuert.
Das Aussehen der Menü-Unterpunkte wird vom GUI-Thema des OS des Anwenders bestimmt.
Gestestet unter Ubuntu 9.10 und Windows Vista Home.
Nochmal Änderungen an toolbarbutton tooltips gemacht. Werden trotzdem nicht angezeigt!?
Höhenbeschränkung der Suchbox aufgehoben, das Feld war zu niedrig unter Ubuntu.
---

diff --git a/xslt/style1.css b/xslt/style1.css
index 182fb6529..cddc7ba37 100644
--- a/xslt/style1.css
+++ b/xslt/style1.css
@@ -1,16 +1,8 @@
+/* toolbar style */
 toolbar{
  -moz-appearance:none !important;
  background: url('../image/fade.png');
  border-bottom:1px solid black;
- border-top:1px solid black
-}
-splitter{
- -moz-appearance:none !important;
- background:white url('../image/fade.png') no-repeat !important;
- border:0px
-}
-iframe{
- border-left:1px solid black !important
 }
 
 /* sidebar styles */
@@ -20,6 +12,7 @@ tree{
  padding-top:2px;
  background: white url('../image/fade.png') repeat-x;
 }
+
 #sidebar{
  background-image: url('../image/fade.png');
  max-width:450px;
@@ -35,33 +28,30 @@ menubar{
  background: url('../image/bg_titel.gif');
  border:0px
 }
+
 menu, 
 menuitem{
  font:12px Arial;
 }
-menu menuitem,
-menu menu{
- padding:2px
-}
-menubar menu,
-menubar menuitem{
+
+menubar menu{
  -moz-appearance: none !important;
- color:white
+ color:white;
+ background: url('../image/bg_titel.gif');
 }
-menubar menu:hover,
-menubar menuitem:hover{
+
+menubar menu:hover{
  -moz-appearance:none !important;
- background:lightblue;
- color:red
-}
-menu menu,
-menu menuitem{
- -moz-appearance: none !important;
- color:black
+ background:#4466cc;
+ color:yellow;
 }
-menu menu:hover,
-menu menuitem:hover{
+
+/* are splitter & iframe in use currently? */
+splitter{
  -moz-appearance:none !important;
- background:lightgrey;
- color:red
+ background:white url('../image/fade.png') no-repeat !important;
+ border:0px;
+}
+iframe{
+ border-left:1px solid black !important;
 }
diff --git a/xslt/xulmenu.xsl b/xslt/xulmenu.xsl
index cd3df0b35..0263d042e 100644
--- a/xslt/xulmenu.xsl
+++ b/xslt/xulmenu.xsl
@@ -253,17 +253,17 @@ document.getElementById("main_window").contentWindow.history.forward()
 <!-- ***************************************************************************  -->
 
 <!-- special buttons ( logout , print, open new window )
-The tooltips, like tooltip="Neues Fenster", do not appear in my Firefox/Prism browsers. Why?
+The tooltips, like tooltiptext="Neues Fenster", do not appear in my Firefox/Prism browsers. Why?
+https://developer.mozilla.org/en/XUL_Tutorial/Popup_Menus
+https://developer.mozilla.org/en/XUL/Attribute/tooltiptext
 ****************************************************************************  -->
 <xsl:template name="specialbuttons">
-  <toolbarbutton image="image/icons/24x24/Batch Printing.png" tooltip="Drucken" oncommand="PrintW(event)"/>
-  <toolbarbutton image="image/icons/24x24/Neues Fenster.png" tooltip="Neues Fenster" link="menuXML.pl?action=display" target="_top" oncommand="openLinkNewWindow(event)"/>
-  <toolbarbutton label="Logout" link="{/*//item[@id='Programm--Logout']/@link}" target="_top" oncommand="openLink(event)">
-    <image src="image/icons/24x24/Programm--Logout.png" width="24" height="24" />
-  </toolbarbutton>
-<toolbarseparator/>
-  <toolbarbutton image="image/icons/24x24/leftarrow_24.png" tooltip="Schritt zurück" oncommand="MyGoBack()"/>
-  <toolbarbutton image="image/icons/24x24/rightarrow_24.png" tooltip="Schritt vor" oncommand="MyGoForward()"/>
+    <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"/>
+  <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()"/>
 </xsl:template>
 <!-- ***************************************************************************  -->
 
@@ -273,10 +273,8 @@ The tooltips, like tooltip="Neues Fenster", do not appear in my Firefox/Prism br
 <xsl:template name="searchbox">
 <vbox style="padding-top:2px">
   <hbox>
-
-    <textbox height="22px" style="font-size:12px;margin-right:0px" width="200px" id="searchboxtext" onkeypress="checkEnter(event)"/>
-<toolbarbutton type="toolbar" width="20" height="20" style="padding:5px !important"
-image="image/icons/16x16/CRM--Schnellsuche.png" flex="0" oncommand="doSearch()"/>
+    <textbox style="font-size:11px;margin-right:0px" width="200px" id="searchboxtext" onkeypress="checkEnter(event)"/> 
+    <toolbarbutton type="toolbar" width="20" height="20" style="padding:5px !important" image="image/icons/16x16/CRM--Schnellsuche.png" flex="0" oncommand="doSearch()"/>
 </hbox>
 
 </vbox>