Return-Path: 
 <commits-return-6779-apmail-lenya-commits-archive=lenya.apache.org@lenya.apache.org>
Delivered-To: apmail-lenya-commits-archive@www.apache.org
Received: (qmail 33462 invoked from network); 24 May 2005 21:30:07 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 24 May 2005 21:30:07 -0000
Received: (qmail 26609 invoked by uid 500); 24 May 2005 21:30:06 -0000
Delivered-To: apmail-lenya-commits-archive@lenya.apache.org
Received: (qmail 26542 invoked by uid 500); 24 May 2005 21:30:05 -0000
Mailing-List: contact commits-help@lenya.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@lenya.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@lenya.apache.org>
List-Post: <mailto:commits@lenya.apache.org>
List-Id: <commits.lenya.apache.org>
Reply-To: dev@lenya.apache.org
Delivered-To: mailing list commits@lenya.apache.org
Received: (qmail 26517 invoked by uid 99); 24 May 2005 21:30:04 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 24 May 2005 14:30:04 -0700
Received: (qmail 33362 invoked by uid 65534); 24 May 2005 21:30:02 -0000
Message-ID: <20050524213002.33361.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r178289 - in /lenya/trunk/src:
 java/org/apache/lenya/cms/usecase/AbstractUsecase.java
 webapp/global-sitemap.xmap webapp/lenya/xslt/menu/menu2xhtml.xsl
Date: Tue, 24 May 2005 21:30:02 -0000
To: commits@lenya.apache.org
From: andreas@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: andreas
Date: Tue May 24 14:30:01 2005
New Revision: 178289

URL: http://svn.apache.org/viewcvs?rev=3D178289&view=3Drev
Log:
don't use info- area prefix in menu2xhtml.xsl, add lenya.exitUsecase parame=
ter

Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
    lenya/trunk/src/webapp/global-sitemap.xmap
    lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl

Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase=
.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cm=
s/usecase/AbstractUsecase.java?rev=3D178289&r1=3D178288&r2=3D178289&view=3D=
diff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java =
(original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java =
Tue May 24 14:30:01 2005
@@ -690,6 +690,12 @@
                 queryString +=3D "&" + key + "=3D" + value;
             }
         }
+        else {
+            String exitUsecase =3D getParameterAsString("lenya.exitUsecase=
");
+            if (exitUsecase !=3D null && !"".equals(exitUsecase)) {
+                queryString =3D "?lenya.usecase=3D" + exitUsecase;
+            }
+        }
         return queryString;
     }
 }

Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/global-sitemap.xm=
ap?rev=3D178289&r1=3D178288&r2=3D178289&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Tue May 24 14:30:01 2005
@@ -216,28 +216,28 @@
             <map:transform src=3D"fallback://lenya/xslt/menu/menu2xul.xsl">
               <map:parameter name=3D"contextprefix" value=3D"{request:cont=
extPath}"/>
               <map:parameter name=3D"publicationid" value=3D"{1}"/>
-              <map:parameter name=3D"completearea" value=3D"{2}"/>
-              <map:parameter name=3D"documentarea" value=3D"{page-envelope=
:area}"/>
+              <map:parameter name=3D"area" value=3D"{2}"/>
               <map:parameter name=3D"documenturl" value=3D"{page-envelope:=
document-url}"/>
               <map:parameter name=3D"documentid" value=3D"{page-envelope:d=
ocument-id}"/>
               <map:parameter name=3D"userid" value=3D"{access-control:user=
-id}"/>
               <map:parameter name=3D"servertime" value=3D"{date-i18n:curre=
ntDate}"/>
               <map:parameter name=3D"workflowstate" value=3D"{workflow:sta=
te}"/>
               <map:parameter name=3D"islive" value=3D"{workflow:variable.i=
s_live}"/>
+              <map:parameter name=3D"usecase" value=3D"{request-param:leny=
a=2Eusecase}"/>
             </map:transform>
           </map:when>
           <map:otherwise>
             <map:transform src=3D"fallback://lenya/xslt/menu/menu2xhtml.xs=
l">
               <map:parameter name=3D"contextprefix" value=3D"{request:cont=
extPath}"/>
               <map:parameter name=3D"publicationid" value=3D"{1}"/>
-              <map:parameter name=3D"completearea" value=3D"{2}"/>
-              <map:parameter name=3D"documentarea" value=3D"{page-envelope=
:area}"/>
+              <map:parameter name=3D"area" value=3D"{2}"/>
               <map:parameter name=3D"documenturl" value=3D"{page-envelope:=
document-url}"/>
               <map:parameter name=3D"documentid" value=3D"{page-envelope:d=
ocument-id}"/>
               <map:parameter name=3D"userid" value=3D"{access-control:user=
-id}"/>
               <map:parameter name=3D"servertime" value=3D"{date-i18n:curre=
ntDate}"/>
               <map:parameter name=3D"workflowstate" value=3D"{workflow:sta=
te}"/>
               <map:parameter name=3D"islive" value=3D"{workflow:variable.i=
s_live}"/>
+              <map:parameter name=3D"usecase" value=3D"{request-param:leny=
a=2Eusecase}"/>
             </map:transform>
           </map:otherwise>
         </map:select>

Modified: lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/menu/m=
enu2xhtml.xsl?rev=3D178289&r1=3D178288&r2=3D178289&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/menu/menu2xhtml.xsl Tue May 24 14:30:=
01 2005
@@ -27,14 +27,22 @@
  =20
 <xsl:param name=3D"contextprefix"/>
 <xsl:param name=3D"publicationid"/>
-<xsl:param name=3D"documentarea"/>
-<xsl:param name=3D"completearea"/>
+<xsl:param name=3D"area"/>
 <xsl:param name=3D"documenturl"/>
 <xsl:param name=3D"documentid"/>
 <xsl:param name=3D"userid"/>
 <xsl:param name=3D"servertime"/>
 <xsl:param name=3D"workflowstate"/>
 <xsl:param name=3D"islive"/>
+<xsl:param name=3D"usecase"/>
+
+<xsl:variable name=3D"currentTab">
+  <xsl:choose>
+    <xsl:when test=3D"starts-with($usecase, 'admin.')">admin</xsl:when>
+    <xsl:when test=3D"starts-with($usecase, 'tab.')">site</xsl:when>
+    <xsl:otherwise>authoring</xsl:otherwise>
+  </xsl:choose>
+</xsl:variable>
=20
 <xsl:variable name=3D"image-prefix"><xsl:value-of select=3D"$contextprefix=
"/>/lenya/menu/images</xsl:variable>
 =20
@@ -50,32 +58,34 @@
     <!-- The main tabs for the different areas of Lenya -->
     <div id=3D"lenya-areas">
       <ul>
- =20
+       =20
         <!-- ADMIN TAB -->
         <xsl:if test=3D"not(menu:tabs/menu:tab[@label =3D 'admin']/@show =
=3D 'false')">
           <xsl:call-template name=3D"area-tab">
             <xsl:with-param name=3D"tab-area">admin</xsl:with-param>
+            <xsl:with-param name=3D"tabName">admin</xsl:with-param>
           </xsl:call-template>
         </xsl:if>
          =20
-        <!-- INFO/SITE TAB -->
         <xsl:variable name=3D"info-area">
           <xsl:choose>
-            <xsl:when test=3D"not(starts-with($documentarea, 'info-'))">in=
fo-authoring</xsl:when>
-            <xsl:otherwise><xsl:value-of select=3D"$documentarea"/></xsl:o=
therwise>
+            <xsl:when test=3D"$area =3D 'admin'">authoring</xsl:when>
+            <xsl:otherwise><xsl:value-of select=3D"$area"/></xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
          =20
         <xsl:if test=3D"not(menu:tabs/menu:tab[@label =3D 'info']/@show =
=3D 'false')">
           <xsl:call-template name=3D"area-tab">
             <xsl:with-param name=3D"tab-area" select=3D"$info-area"/>
-            <xsl:with-param name=3D"tab-area-prefix">info</xsl:with-param>
+            <xsl:with-param name=3D"queryString">?lenya.usecase=3Dtab.over=
view</xsl:with-param>
+            <xsl:with-param name=3D"tabName">site</xsl:with-param>
           </xsl:call-template>
         </xsl:if>
          =20
         <!-- AUTHORING TAB -->
         <xsl:call-template name=3D"area-tab">
           <xsl:with-param name=3D"tab-area">authoring</xsl:with-param>
+          <xsl:with-param name=3D"tabName">authoring</xsl:with-param>
         </xsl:call-template>
          =20
         <!-- STAGING TAB -->
@@ -90,6 +100,7 @@
           <xsl:call-template name=3D"area-tab">
             <xsl:with-param name=3D"tab-area">live</xsl:with-param>
             <xsl:with-param name=3D"target">_blank</xsl:with-param>
+            <xsl:with-param name=3D"tabName">live</xsl:with-param>
           </xsl:call-template>
         </xsl:if>
          =20
@@ -123,31 +134,24 @@
     <xsl:param name=3D"tab-area"/>
     <xsl:param name=3D"tab-area-prefix" select=3D"$tab-area"/>
     <xsl:param name=3D"target" select=3D"'_self'"/>
+    <xsl:param name=3D"queryString"/>
+    <xsl:param name=3D"tabName"/>
    =20
     <xsl:variable name=3D"tab-documenturl">
       <xsl:choose>
         <!-- index.html for link from/to admin area -->
-        <xsl:when test=3D"$tab-area =3D 'admin' or $documentarea =3D 'admi=
n'">/index.html</xsl:when>
-        <xsl:when test=3D"starts-with($completearea, 'info') and $document=
id =3D '/'">/index.html</xsl:when>
+        <xsl:when test=3D"$tab-area =3D 'admin' or $area =3D 'admin'">/ind=
ex.html</xsl:when>
+        <xsl:when test=3D"($currentTab =3D 'site') and $documentid =3D '/'=
">/index.html</xsl:when>
         <xsl:otherwise><xsl:value-of select=3D"$documenturl"/></xsl:otherw=
ise>
       </xsl:choose>
     </xsl:variable>
=20
-    <xsl:variable name=3D"tab-name">
-      <xsl:choose>
-        <xsl:when test=3D"starts-with($tab-area, 'info')">Site</xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select=3D"$tab-area"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-   =20
     <xsl:choose>
-      <xsl:when test=3D"starts-with($completearea, $tab-area-prefix)">
-        <li id=3D"area-{$tab-area}-active"><a href=3D"{$contextprefix}/{$p=
ublicationid}/{$tab-area}{normalize-space($tab-documenturl)}" target=3D"{$t=
arget}"><span><i18n:text><xsl:value-of select=3D"$tab-name"/></i18n:text></=
span></a></li>
+      <xsl:when test=3D"$tabName =3D $currentTab">
+        <li id=3D"area-{$tab-area}-active"><a href=3D"{$contextprefix}/{$p=
ublicationid}/{$tab-area}{normalize-space($tab-documenturl)}{$queryString}"=
 target=3D"{$target}"><span><i18n:text><xsl:value-of select=3D"$tabName"/><=
/i18n:text></span></a></li>
       </xsl:when>
       <xsl:otherwise>
-        <li id=3D"area-{$tab-area}"><a href=3D"{$contextprefix}/{$publicat=
ionid}/{$tab-area}{normalize-space($tab-documenturl)}" target=3D"{$target}"=
><span><i18n:text><xsl:value-of select=3D"$tab-name"/></i18n:text></span></=
a></li>
+        <li id=3D"area-{$tab-area}"><a href=3D"{$contextprefix}/{$publicat=
ionid}/{$tab-area}{normalize-space($tab-documenturl)}{$queryString}" target=
=3D"{$target}"><span><i18n:text><xsl:value-of select=3D"$tabName"/></i18n:t=
ext></span></a></li>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -170,7 +174,7 @@
   <xsl:template match=3D"menu:menu" mode=3D"nav">
     <li id=3D"nav{position()}"><xsl:value-of select=3D"@name"/>
       <ul id=3D"menu{position()}">
-        <xsl:apply-templates select=3D"menu:block[not(@info =3D 'false') a=
nd starts-with($completearea, 'info') or not(@*[local-name() =3D $completea=
rea] =3D 'false') and not(starts-with($completearea, 'info'))]"/>
+        <xsl:apply-templates select=3D"menu:block[not(@info =3D 'false') a=
nd ($currentTab =3D 'site') or not(@*[local-name() =3D $currentTab] =3D 'fa=
lse') and not($currentTab =3D 'site')]"/>
       </ul>
     </li>
   </xsl:template>
@@ -184,7 +188,7 @@
   <!-- match blocks with not area=3D'false' -->
   <xsl:template match=3D"menu:block">
     <xsl:apply-templates select=3D"menu:title"/>
-    <xsl:apply-templates select=3D"menu:item[not(@info =3D 'false') and st=
arts-with($completearea, 'info') or not(@*[local-name() =3D $completearea] =
=3D 'false') and not(starts-with($completearea, 'info'))]"/>
+    <xsl:apply-templates select=3D"menu:item[not(@info =3D 'false') and ($=
currentTab =3D 'site') or not(@*[local-name() =3D $currentTab] =3D 'false')=
 and not($currentTab =3D 'site')]"/>
 	=09
     <xsl:if test=3D"position() !=3D last()">
       <li class=3D"lenya-menu-separator"></li>
@@ -205,7 +209,7 @@
             <xsl:value-of select=3D"@href"/>
             <xsl:apply-templates select=3D"@*[local-name() !=3D 'href']"/>
             <xsl:text/>
-            <xsl:if test=3D"starts-with($completearea, 'info-')">
+            <xsl:if test=3D"$currentTab =3D 'site'">
               <xsl:choose>
                 <xsl:when test=3D"contains(@href, '?')">
                   <xsl:text>&amp;</xsl:text>
@@ -214,7 +218,6 @@
                   <xsl:text>?</xsl:text>
                 </xsl:otherwise>
               </xsl:choose>
-              <xsl:text>lenya.area=3Dinfo</xsl:text>
             </xsl:if>
           </xsl:attribute>
           <span><xsl:value-of select=3D"."/></span>
@@ -234,6 +237,9 @@
       <xsl:otherwise>?</xsl:otherwise>
     </xsl:choose>
     <xsl:text/>lenya.usecase=3D<xsl:value-of select=3D"normalize-space(.)"=
/><xsl:text/>
+    <xsl:if test=3D"$usecase !=3D ''">
+      <xsl:text>&amp;lenya.exitUsecase=3D</xsl:text><xsl:value-of select=
=3D"$usecase"/><xsl:text/>
+    </xsl:if>
   </xsl:template>
  =20
   <xsl:template match=3D"menu:item/@uc:step">



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org