You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/02/20 18:42:16 UTC
svn commit: r509677 - in /lenya/trunk/src:
pubs/default/modules/homepage/config/menus/homepage.xsp
webapp/global-sitemap.xmap webapp/lenya/xslt/menu/filter-menu.xsl
Author: andreas
Date: Tue Feb 20 09:42:15 2007
New Revision: 509677
URL: http://svn.apache.org/viewvc?view=rev&rev=509677
Log:
Fixed appearance of menu items in admin area
Modified:
lenya/trunk/src/pubs/default/modules/homepage/config/menus/homepage.xsp
lenya/trunk/src/webapp/global-sitemap.xmap
lenya/trunk/src/webapp/lenya/xslt/menu/filter-menu.xsl
Modified: lenya/trunk/src/pubs/default/modules/homepage/config/menus/homepage.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/modules/homepage/config/menus/homepage.xsp?view=diff&rev=509677&r1=509676&r2=509677
==============================================================================
--- lenya/trunk/src/pubs/default/modules/homepage/config/menus/homepage.xsp (original)
+++ lenya/trunk/src/pubs/default/modules/homepage/config/menus/homepage.xsp Tue Feb 20 09:42:15 2007
@@ -44,7 +44,7 @@
if (doc instanceof Document && ((Document) doc).exists()) {
String doctype = <input:get-attribute module="page-envelope" as="string" name="document-type"/>;
if ("homepage".equals(doctype)) {
- <block info="false">
+ <block areas="authoring">
<item wf:event="edit">
<xsp:attribute name="href">
<xsp:expr>"?lenya.module=kupu&lenya.step=open"</xsp:expr>
Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/global-sitemap.xmap?view=diff&rev=509677&r1=509676&r2=509677
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Tue Feb 20 09:42:15 2007
@@ -136,7 +136,7 @@
<map:transform src="lenya/xslt/menu/merge-menus.xsl"/>
<map:transform src="lenya/xslt/menu/filter-menu.xsl">
- <map:parameter name="usecase" value="{request-param:lenya.usecase}"/>
+ <map:parameter name="tabGroup" value="{usecase:tabGroup:{request-param:lenya.usecase}}"/>
</map:transform>
<map:call resource="i18n"/>
@@ -158,6 +158,7 @@
<map:parameter name="workflowstate" value="{workflow:state}"/>
<map:parameter name="islive" value="{workflow:variable.is_live}"/>
<map:parameter name="usecase" value="{request-param:lenya.usecase}"/>
+ <map:parameter name="tabGroup" value="{usecase:tabGroup:{request-param:lenya.usecase}}"/>
<map:parameter name="newMessages" value="{inbox:newMessageCount}"/>
</map:transform>
</map:when>
Modified: lenya/trunk/src/webapp/lenya/xslt/menu/filter-menu.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/xslt/menu/filter-menu.xsl?view=diff&rev=509677&r1=509676&r2=509677
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/menu/filter-menu.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/menu/filter-menu.xsl Tue Feb 20 09:42:15 2007
@@ -23,20 +23,18 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns:uc="http://apache.org/cocoon/lenya/usecase/1.0"
xmlns:menu="http://apache.org/cocoon/lenya/menubar/1.0"
xmlns="http://www.w3.org/1999/xhtml">
- <xsl:param name="usecase"/>
+ <xsl:param name="tabGroup"/>
<xsl:variable name="currentTab">
<xsl:choose>
- <xsl:when test="starts-with($usecase, 'admin.')">admin</xsl:when>
- <xsl:when test="starts-with($usecase, 'tab.')">site</xsl:when>
+ <xsl:when test="$tabGroup != ''"><xsl:value-of select="$tabGroup"/></xsl:when>
<xsl:otherwise>authoring</xsl:otherwise>
</xsl:choose>
</xsl:variable>
-
+
<xsl:template match="menu:block">
<xsl:if test="not(@areas) or contains(@areas, $currentTab)">
<xsl:copy>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org