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/10/13 20:24:31 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/resources/css tabs.css
andreas 2003/10/13 11:24:31
Modified: src/webapp/lenya/xslt/navigation sitetree2nav.xsl
src/webapp/lenya/resources/javascript tree.js
src/webapp/lenya info.xmap
src/webapp/lenya/xslt/info sitetree2tree.xsl
src/webapp/lenya/resources/css tabs.css
Log:
adding AccessControlSitetreeTransformer
Revision Changes Path
1.15 +1 -0 cocoon-lenya/src/webapp/lenya/xslt/navigation/sitetree2nav.xsl
Index: sitetree2nav.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/navigation/sitetree2nav.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sitetree2nav.xsl 2 Oct 2003 17:27:00 -0000 1.14
+++ sitetree2nav.xsl 13 Oct 2003 18:24:31 -0000 1.15
@@ -71,6 +71,7 @@
<nav:node>
<xsl:copy-of select="@id"/>
+ <xsl:copy-of select="@protected"/>
<!-- basic url - for all nodes -->
1.12 +10 -5 cocoon-lenya/src/webapp/lenya/resources/javascript/tree.js
Index: tree.js
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/resources/javascript/tree.js,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tree.js 19 Sep 2003 12:19:21 -0000 1.11
+++ tree.js 13 Oct 2003 18:24:31 -0000 1.12
@@ -157,7 +157,10 @@
if (USETEXTLINKS)
{
docW = docW + this.linkHTML(true)
- docW = docW + this.desc + "</a>"
+ docW = docW + this.desc;
+ if (this.hreference) {
+ docW = docW + "</a>"
+ }
}
else
docW = docW + this.desc
@@ -285,8 +288,9 @@
docW = docW + ">"
}
- else
- docW = docW + "<a>"
+ else {
+// docW = docW + "<a>"
+ }
return docW;
}
@@ -410,8 +414,9 @@
docW = docW + this.blockStartHTML("item")
docW = docW + "<tr>" + leftSide + "<td valign=top>"
- if (USEICONS)
+ if (USEICONS && this.link != "undefined") {
docW = docW + "<a " + fullLink + " id=\"itemIconLink"+this.id+"\">" + "<img id='itemIcon"+this.id+"' " + "src='"+this.iconSrc+"' border=0>" + "</a>"
+ }
else
if (this.prependHTML == "")
docW = docW + "<img src=" + ICONPATH + "ftv2blank.gif height=2 width=3>"
@@ -421,7 +426,7 @@
else
docW = docW + "</td>"+this.prependHTML+"<td valign=middle nowrap width=100%>"
- if (USETEXTLINKS)
+ if (USETEXTLINKS && this.link != "undefined")
docW = docW + "<a " + fullLink + " id=\"itemTextLink"+this.id+"\">" + this.desc + "</a>"
else
docW = docW + this.desc
1.48 +5 -1 cocoon-lenya/src/webapp/lenya/info.xmap
Index: info.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/info.xmap,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- info.xmap 8 Oct 2003 15:45:07 -0000 1.47
+++ info.xmap 13 Oct 2003 18:24:31 -0000 1.48
@@ -39,6 +39,10 @@
<!-- {publication-id}/{area}/sitetree.xml -->
<map:match pattern="*/*/sitetree.xml">
<map:generate src="pubs/{1}/content/{2}/sitetree.xml"/>
+ <map:transform type="access-control-sitetree">
+ <map:parameter name="publication-id" value="{1}"/>
+ <map:parameter name="area" value="{2}"/>
+ </map:transform>
<map:transform src="xslt/info/sitetree2areatree.xsl">
<map:parameter name="area" value="{2}"/>
</map:transform>
@@ -56,7 +60,7 @@
<map:parameter name="chosenlanguage" value="{request-param:language}"/>
<map:parameter name="defaultlanguage" value="{page-envelope:default-language}"/>
</map:transform>
- <map:transform src="xslt/info/sitetree2tree.xsl" label="content">
+ <map:transform src="{fallback:xslt/info/sitetree2tree.xsl}" label="content">
<map:parameter name="contextprefix" value="{request:contextPath}"/>
<map:parameter name="publicationid" value="{1}"/>
<map:parameter name="chosenlanguage" value="{request-param:language}"/>
1.34 +37 -9 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sitetree2tree.xsl 13 Oct 2003 10:01:37 -0000 1.33
+++ sitetree2tree.xsl 13 Oct 2003 18:24:31 -0000 1.34
@@ -45,10 +45,24 @@
<xsl:if test="not($chosenlanguage = $defaultlanguage)">_<xsl:value-of select="$chosenlanguage"/></xsl:if>
</xsl:variable>
- <xsl:variable name="link"><xsl:value-of select="concat($contextprefix, '/', $publicationid, '/info-', @area, '/', $suffix)"/>?lenya.usecase=info-overview&lenya.step=showscreen</xsl:variable>
+ <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:text>?lenya.usecase=info-overview&lenya.step=showscreen</xsl:text>
+ <xsl:text>"</xsl:text>
+ </xsl:if>
+ </xsl:variable>
+
+ <xsl:variable name="protected-pre"><xsl:if test="@protected = 'true'"><span class=\"lenya-info-protected\"></xsl:if></xsl:variable>
+ <xsl:variable name="protected-post"><xsl:if test="@protected = 'true'"></span></xsl:if></xsl:variable>
+
+ <xsl:variable name="pre" select="$protected-pre"/>
+ <xsl:variable name="post" select="$protected-post"/>
+
<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="$link"/>"))</xsl:when>
- <xsl:otherwise>insDoc(foldersTree, gLnk("S", " <xsl:value-of select="@label"/> ", "<xsl:value-of select="$link"/>"))</xsl:otherwise>
+ <xsl:when test="descendant::s:node"><xsl:value-of select="generate-id(.)"/> = insFld(foldersTree, gFld(" <xsl:value-of select="$pre"/><xsl:value-of select="@label"/><xsl:value-of select="$post"/> " <xsl:value-of select="$link"/>))</xsl:when>
+ <xsl:otherwise>insDoc(foldersTree, gLnk("S", " <xsl:value-of select="$pre"/><xsl:value-of select="@label"/><xsl:value-of select="$post"/> " <xsl:value-of select="$link"/>))</xsl:otherwise>
</xsl:choose>
<xsl:apply-templates>
<xsl:with-param name="parentPath"><xsl:value-of select="@id"/></xsl:with-param>
@@ -58,29 +72,43 @@
<xsl:template match="s:node">
<xsl:param name="parentPath"/>
<xsl:variable name="tree-area" select="ancestor::s:site/@area"/>
- <xsl:variable name="link"><xsl:value-of select="concat($contextprefix, '/', $publicationid, '/info-', $tree-area, '/', @basic-url, @language-suffix, @suffix)"/>?lenya.usecase=info-overview&lenya.step=showscreen</xsl:variable>
+ <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:text>?lenya.usecase=info-overview&lenya.step=showscreen</xsl:text>
+ <xsl:text>"</xsl:text>
+ </xsl:if>
+ </xsl:variable>
<xsl:variable name="exists-language" select="s:label[lang($chosenlanguage)]"/>
+
+ <xsl:variable name="protected-pre"><xsl:if test="@protected = 'true'"><span class=\"lenya-info-protected\"></xsl:if></xsl:variable>
+ <xsl:variable name="protected-post"><xsl:if test="@protected = 'true'"></span></xsl:if></xsl:variable>
+
<xsl:variable name="no-language-pre"><xsl:if test="not($exists-language)"><span class=\"lenya-info-nolanguage\"></xsl:if></xsl:variable>
<xsl:variable name="no-language-post"><xsl:if test="not($exists-language)"></span></xsl:if></xsl:variable>
<xsl:variable name="cut-pre"><xsl:if test="$cutdocumentid = concat('/', @basic-url)"><span class='lenya-info-cut'>[</xsl:if></xsl:variable>
<xsl:variable name="cut-post"><xsl:if test="$cutdocumentid = concat('/', @basic-url)">]</span></xsl:if></xsl:variable>
+
+ <xsl:variable name="pre" select="concat($no-language-pre, $protected-pre, $cut-pre)"/>
+ <xsl:variable name="post" select="concat($cut-post, $protected-post, $no-language-post)"/>
<xsl:choose>
<xsl:when test="descendant::s:node">
<xsl:value-of select="generate-id(.)"/>
= insFld(
<xsl:value-of select="generate-id(..)"/>,
- gFld("<span style=\"padding: 0px 5px;\"><xsl:value-of select="$cut-pre"/><xsl:value-of select="$no-language-pre"/><xsl:call-template name="getLabel"/><xsl:value-of select="$no-language-post"/><xsl:value-of select="$cut-post"/></span>",
- "<xsl:value-of select="$link"/>")
+ gFld("<span style=\"padding: 0px 5px;\"><xsl:value-of select="$pre"/><xsl:call-template name="getLabel"/><xsl:value-of select="$post"/></span>"
+ <xsl:value-of select="$link"/>)
);
</xsl:when>
<xsl:otherwise>
insDoc(<xsl:value-of select="generate-id(..)"/>,
gLnk(
"S",
- "<span style=\"padding: 0px 5px;\"><xsl:value-of select="$cut-pre"/><xsl:value-of select="$no-language-pre"/><xsl:call-template name="getLabel"/><xsl:value-of select="$no-language-post"/><xsl:value-of select="$cut-post"/></span>",
- "<xsl:value-of select="$link"/>")
+ "<span style=\"padding: 0px 5px;\"><xsl:value-of select="$pre"/><xsl:call-template name="getLabel"/></span>"
+ <xsl:value-of select="$link"/>)
);
</xsl:otherwise>
</xsl:choose>
1.13 +5 -3 cocoon-lenya/src/webapp/lenya/resources/css/tabs.css
Index: tabs.css
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/resources/css/tabs.css,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tabs.css 5 Sep 2003 14:42:06 -0000 1.12
+++ tabs.css 13 Oct 2003 18:24:31 -0000 1.13
@@ -68,12 +68,14 @@
}
#lenya-info-tree td {
- font-family: verdana, helvetica, sans-serif;
+ font-family: verdana, helvetica, sans-serif;
+ font-size: small;
}
-
-#lenya-info-treecanvas a { font-size: small; color: #333333; text-decoration: none; }
+
+#lenya-info-treecanvas a { color: #333333; text-decoration: none; }
#lenya-info-treecanvas .lenya-info-nolanguage { color: #AAAAAA; }
#lenya-info-treecanvas .lenya-info-cut { color: #FFAAAA; font-style: italic; }
+#lenya-info-treecanvas .lenya-info-protected { color: #CC3333; }
#lenya-info-treecanvas a:hover { text-decoration: underline; }
#lenya-info-content {
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org