git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3717
cb58f699-b61c-0410-a6fe-
9272a202ed29
21 files changed:
doc\FASTCGI.LICENSE = doc\FASTCGI.LICENSE
doc\LICENSE.txt = doc\LICENSE.txt
doc\LOG4CPP.LICENSE = doc\LOG4CPP.LICENSE
doc\FASTCGI.LICENSE = doc\FASTCGI.LICENSE
doc\LICENSE.txt = doc\LICENSE.txt
doc\LOG4CPP.LICENSE = doc\LOG4CPP.LICENSE
- doc\logo.jpg = doc\logo.jpg
doc\main.css = doc\main.css
doc\Makefile.am = doc\Makefile.am
doc\NOTICE.txt = doc\NOTICE.txt
doc\main.css = doc\main.css
doc\Makefile.am = doc\Makefile.am
doc\NOTICE.txt = doc\NOTICE.txt
+<shibmlpif logoLocation>
<img src="<shibmlp logoLocation/>" alt="Logo" />
<img src="<shibmlp logoLocation/>" alt="Logo" />
<h1>Authorization Failed</h1>
<p>
<h1>Authorization Failed</h1>
<p>
-# Used for example logo and style sheet in error templates.
+# Used for example style sheet in error templates.
#
<IfModule mod_alias.c>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
#
<IfModule mod_alias.c>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
- Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
#
LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
#
-# Used for example logo and style sheet in error templates.
+# Used for example style sheet in error templates.
#
<IfModule mod_alias.c>
<Location /shibboleth-sp>
Allow from all
</Location>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
#
<IfModule mod_alias.c>
<Location /shibboleth-sp>
Allow from all
</Location>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
- Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_22.so
#
LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_22.so
#
-# Used for example logo and style sheet in error templates.
+# Used for example style sheet in error templates.
#
<IfModule mod_alias.c>
<Location /shibboleth-sp>
Allow from all
</Location>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
#
<IfModule mod_alias.c>
<Location /shibboleth-sp>
Allow from all
</Location>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
- Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_24.so
#
LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_24.so
#
-# Used for example logo and style sheet in error templates.
+# Used for example style sheet in error templates.
#
<IfModule mod_alias.c>
<Location /shibboleth-sp>
Allow from all
</Location>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
#
<IfModule mod_alias.c>
<Location /shibboleth-sp>
Allow from all
</Location>
Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
- Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
+<shibmlpif logoLocation>
<img src="<shibmlp logoLocation/>" alt="Logo" />
<img src="<shibmlp logoLocation/>" alt="Logo" />
<h3>We're sorry, but you cannot access this service at this time.</h3>
<p>This service requires information about you that your identity provider
<h3>We're sorry, but you cannot access this service at this time.</h3>
<p>This service requires information about you that your identity provider
</p>
<shibmlpif helpLocation>
</p>
<shibmlpif helpLocation>
-<p>For more information about this service, including what user information is required for access,
-please visit <a href="<shibmlp helpLocation />">our information page</a>.</p>
+<p>For more information about this service, including what user information is
+required for access, please visit <a href="<shibmlp helpLocation />">our
+information page</a>.</p>
<input type="hidden" name="authnContextClassRef" value="<shibmlp authnContextClassRef/>"/>
</shibmlpif>
<input type="hidden" name="authnContextClassRef" value="<shibmlp authnContextClassRef/>"/>
</shibmlpif>
+ <shibmlpif authnContextDeclRef>
+ <input type="hidden" name="authnContextDeclRef" value="<shibmlp authnContextDeclRef/>"/>
+ </shibmlpif>
+
<shibmlpif authnContextComparison>
<input type="hidden" name="authnContextComparison" value="<shibmlp authnContextComparison/>"/>
</shibmlpif>
<shibmlpif authnContextComparison>
<input type="hidden" name="authnContextComparison" value="<shibmlp authnContextComparison/>"/>
</shibmlpif>
-->
<Errors supportContact="root@localhost"
helpLocation="/about.html"
-->
<Errors supportContact="root@localhost"
helpLocation="/about.html"
- logoLocation="/shibboleth-sp/logo.jpg"
styleSheet="/shibboleth-sp/main.css"/>
<!--
styleSheet="/shibboleth-sp/main.css"/>
<!--
+<shibmlpif logoLocation>
<img src="<shibmlp logoLocation/>" alt="Logo" />
<img src="<shibmlp logoLocation/>" alt="Logo" />
<h1>Global Logout</h1>
<p><strong>Status of Global Logout:</strong> <shibmlp logoutStatus/></p>
<h1>Global Logout</h1>
<p><strong>Status of Global Logout:</strong> <shibmlp logoutStatus/></p>
+
+<shibmlpif logoLocation>
<img src="<shibmlp logoLocation/>" alt="Logo" />
<img src="<shibmlp logoLocation/>" alt="Logo" />
<h1>Local Logout</h1>
<strong>Status of Local Logout:</strong> <shibmlp logoutStatus/>
<h1>Local Logout</h1>
<strong>Status of Local Logout:</strong> <shibmlp logoutStatus/>
+<shibmlpif logoLocation>
<img src="<shibmlp logoLocation/>" alt="Logo" />
<img src="<shibmlp logoLocation/>" alt="Logo" />
<h1>Unknown or Unusable Identity Provider</h1>
<p>The identity provider supplying your login credentials is not authorized
<h1>Unknown or Unusable Identity Provider</h1>
<p>The identity provider supplying your login credentials is not authorized
+<shibmlpif logoLocation>
<img src="<shibmlp logoLocation/>" alt="Logo" />
<img src="<shibmlp logoLocation/>" alt="Logo" />
<h1>Partial Logout</h1>
<p>You remain logged into one or more applications accessed during your session.
<h1>Partial Logout</h1>
<p>You remain logged into one or more applications accessed during your session.
+<shibmlpif logoLocation>
<img src="<shibmlp logoLocation/>" alt="Logo" />
<img src="<shibmlp logoLocation/>" alt="Logo" />
<h1><shibmlp errorType/></h1>
<p>The system encountered an error at <shibmlp now /></p>
<h1><shibmlp errorType/></h1>
<p>The system encountered an error at <shibmlp now /></p>
-->
<Errors supportContact="root@localhost"
helpLocation="/about.html"
-->
<Errors supportContact="root@localhost"
helpLocation="/about.html"
- logoLocation="/shibboleth-sp/logo.jpg"
styleSheet="/shibboleth-sp/main.css"/>
<!-- Example of remotely supplied batch of signed metadata. -->
styleSheet="/shibboleth-sp/main.css"/>
<!-- Example of remotely supplied batch of signed metadata. -->
+<shibmlpif logoLocation>
<img src="<shibmlp logoLocation/>" alt="Logo" />
<img src="<shibmlp logoLocation/>" alt="Logo" />
-->
<Errors supportContact="root@localhost"
helpLocation="/about.html"
-->
<Errors supportContact="root@localhost"
helpLocation="/about.html"
- logoLocation="/shibboleth-sp/logo.jpg"
styleSheet="/shibboleth-sp/main.css"/>
<!-- Example of remotely supplied batch of signed metadata. -->
styleSheet="/shibboleth-sp/main.css"/>
<!-- Example of remotely supplied batch of signed metadata. -->
OPENSSL.LICENSE \
LOG4CPP.LICENSE
OPENSSL.LICENSE \
LOG4CPP.LICENSE
-webfiles = main.css logo.jpg
pkgdoc_DATA = $(docfiles)
pkgdoc_DATA = $(docfiles)
<Component Id='main.css' Guid='{EA1366EE-0FD1-42E7-9F3F-C19E6C0D12D6}'>\r
<File KeyPath='yes' Name='main.css' />\r
</Component>\r
<Component Id='main.css' Guid='{EA1366EE-0FD1-42E7-9F3F-C19E6C0D12D6}'>\r
<File KeyPath='yes' Name='main.css' />\r
</Component>\r
- <Component Id='logo.jpg' Guid='{7F05E91A-A390-4A72-B4DC-1A4FE950B30A}'>\r
- <File KeyPath='yes' Name='logo.jpg' />\r
- </Component>\r
<Component Id='CREDITS.txt' Guid='{9A792E0C-61F1-4D08-9672-BE82FFB6B7F1}'>\r
<File KeyPath='yes' Name='CREDITS.txt' />\r
</Component>\r
<Component Id='CREDITS.txt' Guid='{9A792E0C-61F1-4D08-9672-BE82FFB6B7F1}'>\r
<File KeyPath='yes' Name='CREDITS.txt' />\r
</Component>\r
<schema targetNamespace="urn:mace:shibboleth:2.0:native:sp:config"
xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:conf="urn:mace:shibboleth:2.0:native:sp:config"
<schema targetNamespace="urn:mace:shibboleth:2.0:native:sp:config"
xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:conf="urn:mace:shibboleth:2.0:native:sp:config"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+ xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
<attribute name="localLogout" type="anyURI"/>
<attribute name="globalLogout" type="anyURI"/>
<attribute name="partialLogout" type="anyURI"/>
<attribute name="localLogout" type="anyURI"/>
<attribute name="globalLogout" type="anyURI"/>
<attribute name="partialLogout" type="anyURI"/>
- <attribute name="supportContact" type="conf:string"/>
- <attribute name="logoLocation" type="anyURI"/>
- <attribute name="helpLocation" type="anyURI"/>
- <attribute name="styleSheet" type="anyURI"/>
<anyAttribute namespace="##any" processContents="lax"/>
</complexType>
<anyAttribute namespace="##any" processContents="lax"/>
</complexType>