lenya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andr...@apache.org
Subject svn commit: r178294 - in /lenya/trunk/src/webapp/lenya: resources/javascript/tree.js usecases/tab/sitetree.jx xslt/info/sitetree2tree.xsl
Date Tue, 24 May 2005 21:49:53 GMT
Author: andreas
Date: Tue May 24 14:49:52 2005
New Revision: 178294

URL: http://svn.apache.org/viewcvs?rev=178294&view=rev
Log:
remove info- area prefix from sitetree

Modified:
    lenya/trunk/src/webapp/lenya/resources/javascript/tree.js
    lenya/trunk/src/webapp/lenya/usecases/tab/sitetree.jx
    lenya/trunk/src/webapp/lenya/xslt/info/sitetree2tree.xsl

Modified: lenya/trunk/src/webapp/lenya/resources/javascript/tree.js
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/resources/javascript/tree.js?rev=178294&r1=178293&r2=178294&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/javascript/tree.js (original)
+++ lenya/trunk/src/webapp/lenya/resources/javascript/tree.js Tue May 24 14:49:52 2005
@@ -828,7 +828,7 @@
 // useful e.g. for link lookup in xopus or bxe.
 var makeHref = function makeDefaultHref(area, link)
 {
-  return CONTEXT_PREFIX+'/'+PUBLICATION_ID+"/info-"+area+"/"+link+"?lenya.usecase=tab.overview";

+  return CONTEXT_PREFIX+'/'+PUBLICATION_ID+"/"+area+"/"+link+"?lenya.usecase=tab.overview";

 }
 
 function addNodesRec(parentNode, parentFolder, area)

Modified: lenya/trunk/src/webapp/lenya/usecases/tab/sitetree.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/sitetree.jx?rev=178294&r1=178293&r2=178294&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/sitetree.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/sitetree.jx Tue May 24 14:49:52 2005
@@ -34,15 +34,15 @@
         <jx:set var="languageVersion"
                 value="${document.getIdentityMap().getLanguageVersion(document, language)}"/>
         <jx:set var="languageUrl"
-                value="${request.contextPath + '/' + publicationId + '/info-' + area + languageVersion.getCanonicalDocumentURL()}"/>
+                value="${request.contextPath + '/' + publicationId + '/' + area + languageVersion.getCanonicalDocumentURL()}"/>
         
         <td>
           <jx:choose>
             <jx:when test="${language.equals(document.getLanguage())}">
-              <a id="${language}" class="lenya-tablink-active" href="${languageUrl}"><jx:out
value="${language}"/></a>
+              <a id="${language}" class="lenya-tablink-active" href="${languageUrl}?lenya.usecase=${usecase.getName()}"><jx:out
value="${language}"/></a>
             </jx:when>
             <jx:otherwise>
-              <a id="${language}" class="lenya-tablink" href="${languageUrl}"><jx:out
value="${language}"/></a>
+              <a id="${language}" class="lenya-tablink" href="${languageUrl}?lenya.usecase=${usecase.getName()}"><jx:out
value="${language}"/></a>
             </jx:otherwise>
           </jx:choose>
         </td>
@@ -61,7 +61,7 @@
         </tr>
       </table>
     </div>
-    <jx:set var="url" value="${request.contextPath + '/' + publicationId + '/info-' +
area + document.getCanonicalDocumentURL()}"/>
+    <jx:set var="url" value="${request.contextPath + '/' + publicationId + '/' + area
+ document.getCanonicalDocumentURL()}"/>
       <script>
       initializeDocument('<jx:out value="${area}"/>', '<jx:out value="${document.getId()}"/>');
       loadSynchPage('<jx:out value="${url}"/>');

Modified: lenya/trunk/src/webapp/lenya/xslt/info/sitetree2tree.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/info/sitetree2tree.xsl?rev=178294&r1=178293&r2=178294&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/info/sitetree2tree.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/info/sitetree2tree.xsl Tue May 24 14:49:52 2005
@@ -89,7 +89,7 @@
   <xsl:variable name="link">
     <xsl:if test="not(@protected = 'true')">
       <xsl:text>, "</xsl:text>
-      <xsl:value-of select="concat($contextprefix, '/', $publicationid, '/info-', @area,
'/', $suffix)"/>
+      <xsl:value-of select="concat($contextprefix, '/', $publicationid, '/', @area, '/',
$suffix)"/>
       <xsl:text>?lenya.usecase=tab.overview</xsl:text>
       <xsl:text>"</xsl:text>
     </xsl:if>
@@ -116,7 +116,7 @@
   <xsl:variable name="link">
     <xsl:if test="not(@protected = 'true')">
       <xsl:text>, "</xsl:text>
-      <xsl:value-of select="concat($contextprefix, '/', $publicationid, '/info-', $tree-area,
'/', @basic-url, @language-suffix, @suffix)"/>
+      <xsl:value-of select="concat($contextprefix, '/', $publicationid, '/', $tree-area,
'/', @basic-url, @language-suffix, @suffix)"/>
       <xsl:text>?lenya.usecase=tab.overview</xsl:text>
       <xsl:text>"</xsl:text>
     </xsl:if>



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


Mime
View raw message