You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/01/21 15:09:29 UTC
cvs commit: cocoon-lenya/src/webapp sitemap.xmap
gregor 2004/01/21 06:09:29
Modified: src/webapp/lenya/xslt/ac logout.xsl login.xsl
src/webapp sitemap.xmap
Log:
show publication name for login and logout screens
Revision Changes Path
1.10 +4 -4 cocoon-lenya/src/webapp/lenya/xslt/ac/logout.xsl
Index: logout.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/ac/logout.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- logout.xsl 25 Jul 2003 18:50:42 -0000 1.9
+++ logout.xsl 21 Jan 2004 14:09:29 -0000 1.10
@@ -7,10 +7,10 @@
xmlns="http://www.w3.org/1999/xhtml"
>
-<xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
+<xsl:output version="1.0" indent="yes"/>
<xsl:param name="publication_name"/>
-<xsl:variable name="copyright">copyright © 2003 Lenya, Apache Software Foundation</xsl:variable>
+<xsl:variable name="copyright">copyright © 2003-2004 Apache Software Foundation</xsl:variable>
<xsl:template match="/">
<xsl:apply-templates/>
@@ -18,7 +18,7 @@
<xsl:template match="page">
<page:page>
- <page:title><xsl:call-template name="html-title"/> <!-- FIXME: <xsl:value-of select="$publication_name"/> --></page:title>
+ <page:title><xsl:call-template name="html-title"/></page:title>
<page:body>
<h2><xsl:value-of select="$publication_name"/></h2>
@@ -36,7 +36,7 @@
</xsl:template>
<xsl:template name="html-title">
-LOGOUT
+LOGOUT from <xsl:value-of select="$publication_name"/>
</xsl:template>
<xsl:template match="logout">
1.14 +6 -25 cocoon-lenya/src/webapp/lenya/xslt/ac/login.xsl
Index: login.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/ac/login.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- login.xsl 25 Jul 2003 18:50:42 -0000 1.13
+++ login.xsl 21 Jan 2004 14:09:29 -0000 1.14
@@ -6,11 +6,11 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>
- <xsl:output encoding="ISO-8859-1" indent="yes" version="1.0"/>
+ <xsl:output indent="yes" version="1.0"/>
<xsl:param name="publication_name"/>
- <xsl:variable name="copyright">copyright © 2003 Apache Lenya, Apache Software Foundation</xsl:variable>
+ <xsl:variable name="copyright">copyright © 2003-2004 Apache Software Foundation</xsl:variable>
<xsl:template match="/">
<xsl:apply-templates/>
@@ -20,8 +20,8 @@
<xsl:template match="page">
<page:page>
<page:title>
- <xsl:call-template name="html-title"/> <!-- FIXME: <xsl:value-of select="$publication_name"/> -->
- </page:title>
+ <xsl:call-template name="html-title"/>
+ </page:title>
<page:body>
<xsl:apply-templates select="body"/>
<p>
@@ -34,22 +34,16 @@
</xsl:template>
- <xsl:template name="html-title">LOGIN</xsl:template>
+ <xsl:template name="html-title">LOGIN to <xsl:value-of select="$publication_name"/></xsl:template>
<xsl:template match="login">
<p>
<xsl:apply-templates select="authentication_failed"/>
<xsl:apply-templates select="protected_destination"/>
-<!--
- <xsl:apply-templates select="no_protected_destination"/>
--->
<xsl:apply-templates select="current_username"/>
<xsl:apply-templates select="no_username_yet"/>
<xsl:apply-templates select="authenticator"/>
-<!--
- <xsl:apply-templates select="no_authenticator_id_yet"/>
--->
</p>
<p>
<b>NOTE:</b> try user "lenya" and password "levi"
@@ -100,12 +94,6 @@
<br/>No username yet
</xsl:template>
-
- <xsl:template match="no_authenticator_id_yet">
- <br/>No authenticator id yet
- </xsl:template>
-
-
<xsl:template match="protected_destination">
<br/>Request for protected uri: <a>
<xsl:attribute name="href">
@@ -115,14 +103,7 @@
</a>
</xsl:template>
-
- <xsl:template match="no_protected_destination">
- <br/>
- <font color="red">Exception:</font> No protected destination
- </xsl:template>
-
-
- <xsl:template match="authentication_failed">
+ <xsl:template match="authentication_failed">
<br/>
<font color="red">Authentication failed</font>
</xsl:template>
1.112 +2 -2 cocoon-lenya/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/sitemap.xmap,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- sitemap.xmap 17 Dec 2003 12:59:17 -0000 1.111
+++ sitemap.xmap 21 Jan 2004 14:09:29 -0000 1.112
@@ -221,7 +221,7 @@
<map:match type="step" pattern="showscreen">
<map:generate type="serverpages" src="lenya/content/ac/login.xsp"/>
<map:transform src="lenya/xslt/ac/login.xsl">
- <map:parameter name="publication_name" value="Unknown Publication"/>
+ <map:parameter name="publication_name" value="{page-envelope:publication-id}"/>
</map:transform>
<map:call resource="style-cms-page"/>
</map:match>
@@ -238,7 +238,7 @@
<map:match type="usecase" pattern="logout">
<map:generate type="serverpages" src="lenya/content/ac/logout.xsp"/>
<map:transform src="lenya/xslt/ac/logout.xsl">
- <map:parameter name="publication_name" value="Unknown Publication"/>
+ <map:parameter name="publication_name" value="{page-envelope:publication-id}"/>
</map:transform>
<map:call resource="style-cms-page"/>
</map:match>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org