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 2003/09/02 20:20:19 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/xslt/info sitetree2tree.xsl root.xsl
andreas 2003/09/02 11:20:19
Modified: src/webapp/lenya/xslt/info sitetree2tree.xsl root.xsl
Log:
removed iframes
Revision Changes Path
1.21 +4 -4 cocoon-lenya/src/webapp/lenya/xslt/info/sitetree2tree.xsl
Index: sitetree2tree.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/info/sitetree2tree.xsl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sitetree2tree.xsl 29 Aug 2003 15:44:50 -0000 1.20
+++ sitetree2tree.xsl 2 Sep 2003 18:20:19 -0000 1.21
@@ -24,7 +24,7 @@
//Environment variables are usually set at the top of this file.
USETEXTLINKS = 1
STARTALLOPEN = 0
-USEFRAMES = 1
+USEFRAMES = 0
USEICONS = 0
WRAPTEXT = 1
PERSERVESTATE = 1
@@ -40,7 +40,7 @@
<xsl:param name="parentPath"/>
<xsl:param name="lenyaarea"><xsl:value-of select="translate(@label, 'ALT', 'alt')"/></xsl:param>
<xsl:choose><xsl:when test="descendant::s:node"><xsl:value-of select="generate-id(.)"/> = insFld(foldersTree, gFld("<xsl:value-of select="@label"/>", "<xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$lenyaarea"/>/?lenya.usecase=info-overview&lenya.step=showscreen&lenya.area=<xsl:value-of select="$lenyaarea"/>"))</xsl:when>
-<xsl:otherwise>insDoc(foldersTree, gLnk("R", "<xsl:value-of select="@label"/>", "<xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$lenyaarea"/>/?lenya.usecase=info-overview&lenya.step=showscreen&lenya.area=<xsl:value-of select="$lenyaarea"/>"))</xsl:otherwise></xsl:choose>
+<xsl:otherwise>insDoc(foldersTree, gLnk("S", "<xsl:value-of select="@label"/>", "<xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$lenyaarea"/>/?lenya.usecase=info-overview&lenya.step=showscreen&lenya.area=<xsl:value-of select="$lenyaarea"/>"))</xsl:otherwise></xsl:choose>
<xsl:apply-templates>
<xsl:with-param name="parentPath"><xsl:value-of select="@id"/></xsl:with-param>
<xsl:with-param name="lenyaarea"><xsl:value-of select="$lenyaarea"/></xsl:with-param>
@@ -52,7 +52,7 @@
<xsl:param name="lenyaarea"/>
<xsl:choose><xsl:when test="descendant::s:node"><xsl:value-of select="generate-id(.)"/> = insFld(<xsl:value-of select="generate-id(..)"/>, gFld("<xsl:call-template name="getLabels"/>", "<xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$lenyaarea"/>/<xsl:value-of select="@basic-url"/><xsl:value-of select="@suffix"/>?lenya.usecase=info-overview&lenya.step=showscreen&lenya.area=<xsl:value-of select="$lenyaarea"/>"))</xsl:when>
- <xsl:otherwise>insDoc(<xsl:value-of select="generate-id(..)"/>, gLnk("R", "<xsl:call-template name="getLabels"/>", "<xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$lenyaarea"/>/<xsl:value-of select="@basic-url"/><xsl:value-of select="@suffix"/>?lenya.usecase=info-overview&lenya.step=showscreen&lenya.area=<xsl:value-of select="$lenyaarea"/>"))</xsl:otherwise></xsl:choose>
+ <xsl:otherwise>insDoc(<xsl:value-of select="generate-id(..)"/>, gLnk("S", "<xsl:call-template name="getLabels"/>", "<xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$lenyaarea"/>/<xsl:value-of select="@basic-url"/><xsl:value-of select="@suffix"/>?lenya.usecase=info-overview&lenya.step=showscreen&lenya.area=<xsl:value-of select="$lenyaarea"/>"))</xsl:otherwise></xsl:choose>
<xsl:apply-templates>
<xsl:with-param name="parentPath"><xsl:value-of select="$parentPath"/>/<xsl:value-of select="@id"/></xsl:with-param>
<xsl:with-param name="lenyaarea"><xsl:value-of select="$lenyaarea"/></xsl:with-param>
1.21 +23 -13 cocoon-lenya/src/webapp/lenya/xslt/info/root.xsl
Index: root.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/info/root.xsl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- root.xsl 22 Aug 2003 12:45:41 -0000 1.20
+++ root.xsl 2 Sep 2003 18:20:19 -0000 1.21
@@ -15,6 +15,7 @@
<xsl:param name="area"/>
<xsl:param name="tab"/>
<xsl:param name="documentid"/>
+<xsl:param name="documenturl"/>
<xsl:param name="chosenlanguage"/>
<xsl:param name="defaultlanguage"/>
@@ -23,13 +24,14 @@
<head>
<!-- These three scripts define the tree, do not remove-->
-<script src="ua.js"/>
-<script src="tree.js"/>
-<script src="lenyasitetree/{$chosenlanguage}"/>
-<script>// Load a page as if a node on the tree was clicked (synchronize frames)
+<script src="{$contextprefix}/{$publicationid}/{$area}/info-sitetree/ua.js"/>
+<script src="{$contextprefix}/{$publicationid}/{$area}/info-sitetree/tree.js"/>
+<script src="{$contextprefix}/{$publicationid}/{$area}/info-sitetree/sitetree.js?language={$chosenlanguage}"/>
+<script language="JavaScript">// Load a page as if a node on the tree was clicked (synchronize frames)
// (Highlights selection if highlight is available.)
function loadSynchPage(srclink)
{
+
var docObj;
var linkID;
linkID = findIDbyLink(srclink);
@@ -47,7 +49,8 @@
{
<![CDATA[
var i=0;
- for(i=0;i<nEntries&&indexOfEntries[i].link!=srclink;i++);
+
+ for (i = 0; i < nEntries && indexOfEntries[i].link.split('?')[0] != srclink; i++);
//FIXME: extend to allow for mapping of index.html to index_defaultlanguage.html
if (i >= nEntries) {
return 1; //example: node removed in DB
@@ -142,16 +145,23 @@
<!-- Build the tree. -->
<div id="lenya-info-tree">
- <div style="display:none;"><table border="0"><tr><td><a style="font-size:7pt;text-decoration:none;color:white" href="http://www.treemenu.net/" target="_blank">JavaScript Tree Menu</a></td></tr></table></div>
+ <div style="display:none;">
+ <table border="0">
+ <tr>
+ <td>
+ <a style="font-size:7pt;text-decoration:none;color:white" href="http://www.treemenu.net/" target="_blank">JavaScript Tree Menu</a>
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
- <script>initializeDocument();
- loadSynchPage('<xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$area"/>/<xsl:value-of select="$documentid"/><xsl:call-template name="selecttab"/>');
- </script>
-</div>
-<div id="lenya-info-content"><iframe src="" id="basefrm" name="basefrm" frameborder="0" width="100%" height="100%"></iframe>
<script>
- frames['basefrm'].location.href = '<xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$area"/>/<xsl:value-of select="$documentid"/><xsl:call-template name="selecttab"/>';
+ initializeDocument();
+ loadSynchPage('<xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$area"/><xsl:value-of select="$documenturl"/>');
</script>
+</div>
+<div id="lenya-info-content">
+ <xsl:copy-of select="*"/>
</div>
</body>
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org