makemode.make ist ein Textfeld und darf nicht mit ids (integers) geunioned werden.

[kivitendo-erp.git] / xslt / xulmenu.xsl

diff --git a/xslt/xulmenu.xsl b/xslt/xulmenu.xsl
index f5aca7c..dd8a1b5 100644 (file)
--- a/xslt/xulmenu.xsl
+++ b/xslt/xulmenu.xsl
@@ -52,8 +52,8 @@ name="xml-stylesheet">href="xslt/style1.css" type="text/css"</xsl:processing-ins
         <xsl:call-template name="ArtikelSuche"/>
         <!--<iframe src="xslt/trans.xml" flex="1" id="uhr"/>-->
       </vbox>
-      <splitter/>
-          <html:iframe id="main_window" src="{/*//item[@id='Programm--Version']/@link}" flex="1" style="border:0px"/>
+      <splitter state="open" collapse="before" resizeafter="farthest"><grippy/></splitter>
+          <html:iframe id="main_window" src="login.pl?action=company_logo" flex="1" style="border:0px"/>
     </hbox>
   </window>
 </xsl:template>
@@ -100,7 +100,20 @@ 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>
 <!-- ***************************************************************************  -->
 
 
@@ -190,7 +203,7 @@ window.open(path,"_new","")
   function openLinkNewWindow(event)
     {
       var path=event.target.getAttribute("link")
-      window.open(path,"_new","")
+      window.open(path,"_blank","")
     }
   
   function openTreeLink(event)