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 2008/05/06 10:31:44 UTC
svn commit: r653707 - in /lenya/branches/branch_1_2_x_shibboleth/src/webapp:
lenya/resources/i18n/cmsui.xml lenya/resources/i18n/cmsui_de.xml
lenya/xslt/ac/login-shibboleth.xsl lenya/xslt/ac/login-user.xsl sitemap.xmap
Author: andreas
Date: Tue May 6 01:31:43 2008
New Revision: 653707
URL: http://svn.apache.org/viewvc?rev=653707&view=rev
Log:
Adding link from Shibboleth login screen to homepage.
Modified:
lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui.xml
lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui_de.xml
lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/xslt/ac/login-shibboleth.xsl
lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/xslt/ac/login-user.xsl
lenya/branches/branch_1_2_x_shibboleth/src/webapp/sitemap.xmap
Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui.xml?rev=653707&r1=653706&r2=653707&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui.xml (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui.xml Tue May 6 01:31:43 2008
@@ -109,6 +109,7 @@
<message key="shibboleth-delete-cookies">
If you want to log in with a different account, please delete the cookies in your browser.
</message>
+ <message key="link-to-publication-homepage">Back to publication homepage</message>
<!-- logout screen -->
<message key="logout-from-pub">LOGOUT from the {0} Publication</message>
Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui_de.xml?rev=653707&r1=653706&r2=653707&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui_de.xml (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/resources/i18n/cmsui_de.xml Tue May 6 01:31:43 2008
@@ -109,6 +109,7 @@
<message key="shibboleth-delete-cookies">
Wenn Sie sich mit einem anderen Account anmelden wollen, löschen Sie bitte die Cookies in Ihrem Browser.
</message>
+ <message key="link-to-publication-homepage">Zurück zur Homepage der Publikation</message>
<!-- logout screen -->
<message key="logout-from-pub">Abmelden von der {0} Publikation</message>
Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/xslt/ac/login-shibboleth.xsl
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/xslt/ac/login-shibboleth.xsl?rev=653707&r1=653706&r2=653707&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/xslt/ac/login-shibboleth.xsl (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/xslt/ac/login-shibboleth.xsl Tue May 6 01:31:43 2008
@@ -25,12 +25,19 @@
<xsl:import href="login-user.xsl"/>
+ <xsl:param name="homepageUrl"/>
+
<xsl:template name="loginFormWrapper">
<xsl:if test="not(/page/body/login/errors/error[normalize-space() = 'shibboleth-delete-cookies'])">
<xsl:call-template name="loginForm"/>
<br/>
</xsl:if>
- <a href="?lenya.usecase=shibboleth&lenya.step=wayf">Login via Shibboleth</a>
+ <p>
+ <a href="{$homepageUrl}"><i18n:text>link-to-publication-homepage</i18n:text></a>
+ </p>
+ <p>
+ <a href="?lenya.usecase=shibboleth&lenya.step=wayf">Login via Shibboleth</a>
+ </p>
</xsl:template>
Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/xslt/ac/login-user.xsl
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/xslt/ac/login-user.xsl?rev=653707&r1=653706&r2=653707&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/xslt/ac/login-user.xsl (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/xslt/ac/login-user.xsl Tue May 6 01:31:43 2008
@@ -26,6 +26,8 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output indent="yes" version="1.0" />
<xsl:param name="publication_name" />
+ <xsl:param name="contextprefix" />
+ <xsl:param name="area" />
<xsl:variable name="copyright">Copyright © 2003-2005 The Apache Software Foundation</xsl:variable>
<xsl:template match="/">
<xsl:apply-templates />
Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/sitemap.xmap?rev=653707&r1=653706&r2=653707&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/sitemap.xmap (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/sitemap.xmap Tue May 6 01:31:43 2008
@@ -487,6 +487,7 @@
<map:transform src="{fallback:xslt/ac/login-{access-control:authenticator-type}.xsl}">
<map:parameter name="publication_name" value="{page-envelope:publication-id}"/>
<map:parameter name="contextprefix" value="{request:contextPath}"/>
+ <map:parameter name="homepageUrl" value="{proxy-url:{page-envelope:area}:/index:{page-envelope:document-language}}"/>
</map:transform>
<map:call resource="style-cms-page"/>
</map:match>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org