You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2005/01/05 23:52:18 UTC
svn commit: r124291 - /lenya/trunk/src/webapp/lenya/xslt/menu/menu2xsltwithxul.xsl /lenya/trunk/src/webapp/lenya/xslt/menu/menu2xul.xsl
Author: michi
Date: Wed Jan 5 14:52:15 2005
New Revision: 124291
URL: http://svn.apache.org/viewcvs?view=rev&rev=124291
Log:
XUL menus fixed
Modified:
lenya/trunk/src/webapp/lenya/xslt/menu/menu2xsltwithxul.xsl
lenya/trunk/src/webapp/lenya/xslt/menu/menu2xul.xsl
Modified: lenya/trunk/src/webapp/lenya/xslt/menu/menu2xsltwithxul.xsl
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/menu/menu2xsltwithxul.xsl?view=diff&rev=124291&p1=lenya/trunk/src/webapp/lenya/xslt/menu/menu2xsltwithxul.xsl&r1=124290&p2=lenya/trunk/src/webapp/lenya/xslt/menu/menu2xsltwithxul.xsl&r2=124291
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/menu/menu2xsltwithxul.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/menu/menu2xsltwithxul.xsl Wed Jan 5 14:52:15 2005
@@ -18,9 +18,9 @@
<!-- $Id$ -->
<xsl:stylesheet version="1.0"
- xmlns:xhtml="http://www.w3.org/1999/xhtml"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xso="http://apache.org/cocoon/lenya/xslt/1.0"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
>
<xsl:param name="contextprefix"/>
@@ -36,7 +36,12 @@
<xso:stylesheet version="1.0"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
- xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ >
+ <!--
+ exclude-result-prefixes="xhtml">
+ -->
<!--
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"-->
<!-- exclude-result-prefixes="xhtml"-->
@@ -56,7 +61,7 @@
<xso:apply-templates select="xhtml:html/xhtml:head/xhtml:link"/>
<xul:window
- xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -73,10 +78,9 @@
<xul:spacer flex="1" />
<xul:box style="overflow: auto;" flex="100" id="lenya-content-box">
<xul:vbox flex="1">
- <html>
- <body>
- <xso:apply-templates select="xhtml:html/xhtml:body/node()"/>
- </body></html>
+ <xhtml:html>
+ <xso:apply-templates select="xhtml:html/xhtml:body"/>
+ </xhtml:html>
</xul:vbox>
</xul:box>
</xul:window>
Modified: lenya/trunk/src/webapp/lenya/xslt/menu/menu2xul.xsl
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/menu/menu2xul.xsl?view=diff&rev=124291&p1=lenya/trunk/src/webapp/lenya/xslt/menu/menu2xul.xsl&r1=124290&p2=lenya/trunk/src/webapp/lenya/xslt/menu/menu2xul.xsl&r2=124291
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/menu/menu2xul.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/menu/menu2xul.xsl Wed Jan 5 14:52:15 2005
@@ -196,27 +196,32 @@
<!-- match items with not area='false' -->
<xsl:template match="menu:item" mode="menu">
- <xsl:choose>
- <xsl:when test="@href">
- <xul:menuitem label="{.}">
- <xsl:attribute name="value">
- <xsl:value-of select="@href"/>
- <xsl:apply-templates select="@*[local-name() != 'href']"/>
- <xsl:text/>
+ <xsl:choose>
+ <xsl:when test="@href">
+ <xul:menuitem label="{.}">
+
+ <!-- For whatever reason the value, event, loadURL mechanism doesn't work anymore -->
+ <!--
+ <xsl:attribute name="value">
+ -->
+ <xsl:attribute name="oncommand">
+ window.location = '<xsl:value-of select="@href"/>
+ <xsl:apply-templates select="@*[local-name() != 'href']"/>
+ <xsl:text/>
<xsl:if test="starts-with($completearea, 'info-')">
<xsl:choose>
<xsl:when test="contains(@href, '?')"><xsl:text>&</xsl:text></xsl:when>
<xsl:otherwise><xsl:text>?</xsl:text></xsl:otherwise>
</xsl:choose>
<xsl:text>lenya.area=info</xsl:text>
- </xsl:if>
- </xsl:attribute>
- </xul:menuitem>
- </xsl:when>
- <xsl:otherwise>
- <xul:menuitem label="{.}" disabled="true"/>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:if>'
+ </xsl:attribute>
+ </xul:menuitem>
+ </xsl:when>
+ <xsl:otherwise>
+ <xul:menuitem label="{.}" disabled="true"/>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org