svn commit: r389799 - in /lenya/branches/BRANCH_1_2_X/src/webapp: global-sitemap.xmap lenya/xslt/menu/menu2xhtml.xsl

Author: jann
Date: Wed Mar 29 06:17:20 2006
New Revision: 389799

URL: http://svn.apache.org/viewcvs?rev=389799&view=rev
Log:
Use the url defined in publication.xconf for the live area. It it is not set 
the respective input module construct the url from request parameters.

Modified:
    lenya/branches/BRANCH_1_2_X/src/webapp/global-sitemap.xmap
    lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/menu/menu2xhtml.xsl

Modified: lenya/branches/BRANCH_1_2_X/src/webapp/global-sitemap.xmap
URL: 
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/global-sitemap.xmap?rev=389799&r1=389798&r2=389799&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/global-sitemap.xmap (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/global-sitemap.xmap Wed Mar 29 
06:17:20 2006
@@ -297,6 +297,7 @@
               <map:parameter name="servertime" 
value="{date-i18n:currentDate}"/>
               <map:parameter name="workflowstate" value="{workflow:state}"/>
               <map:parameter name="islive" 
value="{workflow:variable.is_live}"/>
+              <map:parameter name="proxy-url-live" 
value="{proxy-url:live:{page-envelope:document-id}:{page-envelope:document-language}}"/>
             </map:transform>
           </map:otherwise>
         </map:select>

Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/menu/menu2xhtml.xsl
URL: 
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/menu/menu2xhtml.xsl?rev=389799&r1=389798&r2=389799&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/menu/menu2xhtml.xsl 
(original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/menu/menu2xhtml.xsl Wed 
Mar 29 06:17:20 2006
@@ -35,6 +35,7 @@
 <xsl:param name="servertime"/>
 <xsl:param name="workflowstate"/>
 <xsl:param name="islive"/>
+<xsl:param name="proxy-url-live"/>
 
 <xsl:variable name="image-prefix"><xsl:value-of 
select="$contextprefix"/>/lenya/menu/images</xsl:variable>
  
@@ -143,6 +144,9 @@
     </xsl:variable>
     
     <xsl:choose>
+      <xsl:when test="$tab-area='live'">
+        <li id="area-{$tab-area}"><a href="{$proxy-url-live}" target="_blank"> 
<span><i18n:text><xsl:value-of select="$tab-name"/></i18n:text></span></a></li>
+      </xsl:when>
       <xsl:when test="starts-with($completearea, $tab-area-prefix)">
         <li id="area-{$tab-area}-active"><a 
href="{$contextprefix}/{$publicationid}/{$tab-area}{normalize-space($tab-documenturl)}">
 <span><i18n:text><xsl:value-of select="$tab-name"/></i18n:text></span></a></li>
       </xsl:when>