From: Holger Will <holger@treebuilder.de>
Date: Mon, 12 Nov 2007 18:18:08 +0000 (+0000)
Subject: xulmenu fixes fuer Geko 1.9
X-Git-Tag: release-2.6.0beta1~416
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=285c47953e1b3af93a220d0a25886b558bcd6a34;p=kivitendo-erp.git

xulmenu fixes fuer Geko 1.9
---

diff --git a/xslt/xulmenu.xsl b/xslt/xulmenu.xsl
index 81d82c703..27b8e3282 100644
--- a/xslt/xulmenu.xsl
+++ b/xslt/xulmenu.xsl
@@ -2,10 +2,11 @@
     xmlns:html="http://www.w3.org/1999/xhtml" 
     xmlns:svg="http://www.w3.org/2000/svg"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
+<xsl:output media-type="application/vnd.mozilla.xul+xml"/>
 <xsl:template match="/">
   <xsl:choose>
     <xsl:when test="system-property('xsl:vendor')='Transformiix'">
+
       <xsl:apply-templates/>
     </xsl:when>
     <xsl:otherwise>
@@ -46,7 +47,7 @@ name="xml-stylesheet">href="xslt/style1.css" type="text/css"</xsl:processing-ins
     <hbox flex="1">
       <vbox id="sidebar" style="overflow:hidden">
 
-        <xsl:apply-templates mode="tree"/>
+        <xsl:apply-templates mode="tree" select="menu"/>
 
         <xsl:call-template name="ArtikelSuche"/>
         <!--<iframe src="xslt/trans.xml" flex="1" id="uhr"/>-->
@@ -61,13 +62,7 @@ name="xml-stylesheet">href="xslt/style1.css" type="text/css"</xsl:processing-ins
 
 <!-- the top menu -->
 <!-- ******************************************************************* -->
-<xsl:template match="menu">
-<!--<div style="background:grey">-->
-  <menubar id="sample-menubar">
-    <xsl:apply-templates/>
-  </menubar>
-<!--</div>-->
-</xsl:template>
+<xsl:template match="menu"><menubar id="sample-menubar" flex="1"><xsl:apply-templates/></menubar></xsl:template>
 <!-- ******************************************************************* -->
 
 
@@ -105,20 +100,7 @@ name="xml-stylesheet">href="xslt/style1.css" type="text/css"</xsl:processing-ins
 
 <!-- template for the top menu items
 *********************************************************************************  -->
-<xsl:template match="item">
-  <xsl:choose>
-    <xsl:when test="item">
-        <menu id="{@name}_menu" label="{@name}" class="menu-iconic" image="image/icons/16x16/{@id}.png">
-          <menupopup id="file-popup">
-    <xsl:apply-templates/>
-          </menupopup>
-        </menu>
-    </xsl:when>
-    <xsl:otherwise>
-    <menuitem target="{@target}" link="{@link}" label="{@name}" oncommand="openLink(event)" class="menuitem-iconic" image="image/icons/16x16/{@id}.png" lxid="{@id}" onclick="openLinkNewTab(event)"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
+<xsl:template match="item"><xsl:choose><xsl:when test="item"><menu id="{@name}_menu" label="{@name}" class="menu-iconic" image="image/icons/16x16/{@id}.png"><menupopup id="file-popup"><xsl:apply-templates/></menupopup></menu></xsl:when><xsl:otherwise><menuitem target="{@target}" link="{@link}" label="{@name}" oncommand="openLink(event)" class="menuitem-iconic" image="image/icons/16x16/{@id}.png" lxid="{@id}" onclick="openLinkNewTab(event)"/></xsl:otherwise></xsl:choose></xsl:template>
 <!-- ***************************************************************************  -->
 
 
@@ -184,7 +166,7 @@ name="xml-stylesheet">href="xslt/style1.css" type="text/css"</xsl:processing-ins
       }
       else
       {
-        var bf=document.getElementsByTagName("iframe").item(0)
+        var bf=document.getElementsByTagNameNS("http://www.w3.org/1999/xhtml","iframe").item(0)
         bf.setAttribute("src",path)
       }
     }