projects / shibboleth / sp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b2a22ca)
Remove logo from defaults and templates
authorscantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Tue, 26 Jun 2012 03:03:32 +0000 (03:03 +0000)
committerscantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Tue, 26 Jun 2012 03:03:32 +0000 (03:03 +0000)
git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3717 cb58f699-b61c-0410-a6fe-9272a202ed29

21 files changed:
Shibboleth.sln patch | blob | history
configs/accessError.html patch | blob | history
configs/apache.config.in patch | blob | history
configs/apache2.config.in patch | blob | history
configs/apache22.config.in patch | blob | history
configs/apache24.config.in patch | blob | history
configs/attrChecker.html patch | blob | history
configs/discoveryTemplate.html patch | blob | history
configs/example-shibboleth2.xml patch | blob | history
configs/globalLogout.html patch | blob | history
configs/localLogout.html patch | blob | history
configs/metadataError.html patch | blob | history
configs/partialLogout.html patch | blob | history
configs/sessionError.html patch | blob | history
configs/shibboleth2.xml patch | blob | history
configs/sslError.html patch | blob | history
configs/win-shibboleth2.xml patch | blob | history
doc/Makefile.am patch | blob | history
doc/logo.jpg [deleted file] patch | blob | history
msi/WiX/ShibbolethSP-noarch.wxs patch | blob | history
schemas/shibboleth-2.0-native-sp-config.xsd patch | blob | history

diff --git a/Shibboleth.sln b/Shibboleth.sln
index db7b93a..afcc275 100644 (file)
--- a/Shibboleth.sln
+++ b/Shibboleth.sln
@@ -91,7 +91,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{6ED5E3E7-1B0
                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
diff --git a/configs/accessError.html b/configs/accessError.html
index ee25974..7e0a7fd 100644 (file)
--- a/configs/accessError.html
+++ b/configs/accessError.html
@@ -12,7 +12,9 @@
 
 <body>
 
+<shibmlpif logoLocation>
 <img src="<shibmlp logoLocation/>" alt="Logo" />
+</shibmlpif>
 <h1>Authorization Failed</h1>
 
 <p>
diff --git a/configs/apache.config.in b/configs/apache.config.in
index 0ad7307..54d64b6 100644 (file)
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -29,11 +29,10 @@ SetHandler shib-handler
 # </Location>
 
 #
-# 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
-  Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
 </IfModule>
 
 #
diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index 565a135..4232d86 100644 (file)
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -13,14 +13,13 @@
 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
-  Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
 </IfModule>
 
 #
diff --git a/configs/apache22.config.in b/configs/apache22.config.in
index 149409d..bdb7414 100644 (file)
--- a/configs/apache22.config.in
+++ b/configs/apache22.config.in
@@ -13,14 +13,13 @@
 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
-  Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
 </IfModule>
 
 #
diff --git a/configs/apache24.config.in b/configs/apache24.config.in
index 5475ed7..2d1a2c2 100644 (file)
--- a/configs/apache24.config.in
+++ b/configs/apache24.config.in
@@ -13,14 +13,13 @@
 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
-  Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
 </IfModule>
 
 #
diff --git a/configs/attrChecker.html b/configs/attrChecker.html
index c382db6..95b855f 100644 (file)
--- a/configs/attrChecker.html
+++ b/configs/attrChecker.html
@@ -12,7 +12,9 @@
 
 <body>
 
+<shibmlpif logoLocation>
 <img src="<shibmlp logoLocation/>" alt="Logo" />
+</shibmlpif>
 <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
@@ -39,8 +41,9 @@ You were trying to access the following URL:
 </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>
 </shibmlpif>
 
 </body>
diff --git a/configs/discoveryTemplate.html b/configs/discoveryTemplate.html
index 75f8d8d..244e1f5 100644 (file)
--- a/configs/discoveryTemplate.html
+++ b/configs/discoveryTemplate.html
@@ -29,6 +29,10 @@
                 <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>
diff --git a/configs/example-shibboleth2.xml b/configs/example-shibboleth2.xml
index 22c4eb9..b7cdd1b 100644 (file)
--- a/configs/example-shibboleth2.xml
+++ b/configs/example-shibboleth2.xml
@@ -213,7 +213,6 @@
         -->
         <Errors supportContact="root@localhost"
             helpLocation="/about.html"
-            logoLocation="/shibboleth-sp/logo.jpg"
             styleSheet="/shibboleth-sp/main.css"/>
         
         <!--
diff --git a/configs/globalLogout.html b/configs/globalLogout.html
index 64b3bdc..86f2050 100644 (file)
--- a/configs/globalLogout.html
+++ b/configs/globalLogout.html
@@ -12,7 +12,9 @@
 
 <body>
 
+<shibmlpif logoLocation>
 <img src="<shibmlp logoLocation/>" alt="Logo" />
+</shibmlpif>
 <h1>Global Logout</h1>
 
 <p><strong>Status of Global Logout:</strong> <shibmlp logoutStatus/></p>
diff --git a/configs/localLogout.html b/configs/localLogout.html
index 5d749a9..75bd3e1 100644 (file)
--- a/configs/localLogout.html
+++ b/configs/localLogout.html
@@ -11,7 +11,10 @@
 </head>
 
 <body>
+
+<shibmlpif logoLocation>
 <img src="<shibmlp logoLocation/>" alt="Logo" />
+</shibmlpif>
 <h1>Local Logout</h1>
 
 <strong>Status of Local Logout:</strong> <shibmlp logoutStatus/>
diff --git a/configs/metadataError.html b/configs/metadataError.html
index 3144e1c..e0e6a1b 100644 (file)
--- a/configs/metadataError.html
+++ b/configs/metadataError.html
@@ -12,7 +12,9 @@
 
 <body>
 
+<shibmlpif logoLocation>
 <img src="<shibmlp logoLocation/>" alt="Logo" />
+</shibmlpif>
 <h1>Unknown or Unusable Identity Provider</h1>
 
 <p>The identity provider supplying your login credentials is not authorized
diff --git a/configs/partialLogout.html b/configs/partialLogout.html
index daafda6..fe24a7c 100644 (file)
--- a/configs/partialLogout.html
+++ b/configs/partialLogout.html
@@ -12,7 +12,9 @@
 
 <body>
 
+<shibmlpif logoLocation>
 <img src="<shibmlp logoLocation/>" alt="Logo" />
+</shibmlpif>
 <h1>Partial Logout</h1>
 
 <p>You remain logged into one or more applications accessed during your session.
diff --git a/configs/sessionError.html b/configs/sessionError.html
index fbfe9e5..7ccf17b 100644 (file)
--- a/configs/sessionError.html
+++ b/configs/sessionError.html
@@ -12,7 +12,9 @@
 
 <body>
 
+<shibmlpif logoLocation>
 <img src="<shibmlp logoLocation/>" alt="Logo" />
+</shibmlpif>
 <h1><shibmlp errorType/></h1>
 
 <p>The system encountered an error at <shibmlp now /></p>
diff --git a/configs/shibboleth2.xml b/configs/shibboleth2.xml
index 2c6ac2a..bb3879c 100644 (file)
--- a/configs/shibboleth2.xml
+++ b/configs/shibboleth2.xml
@@ -67,7 +67,6 @@
         -->
         <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. -->
diff --git a/configs/sslError.html b/configs/sslError.html
index 350d45a..1fe2467 100644 (file)
--- a/configs/sslError.html
+++ b/configs/sslError.html
@@ -12,7 +12,9 @@
 
 <body>
 
+<shibmlpif logoLocation>
 <img src="<shibmlp logoLocation/>" alt="Logo" />
+</shibmlpif>
 <h1>POST Failed</h1>
 
 <p>
diff --git a/configs/win-shibboleth2.xml b/configs/win-shibboleth2.xml
index df661a1..68aa802 100644 (file)
--- a/configs/win-shibboleth2.xml
+++ b/configs/win-shibboleth2.xml
@@ -110,7 +110,6 @@
         -->
         <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. -->
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0e2b83b..10386cd 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,7 +19,7 @@ docfiles = \
        OPENSSL.LICENSE \
        LOG4CPP.LICENSE
 
-webfiles = main.css logo.jpg
+webfiles = main.css
 
 pkgdoc_DATA = $(docfiles)
 
diff --git a/doc/logo.jpg b/doc/logo.jpg
deleted file mode 100644 (file)
index c021e7f..0000000
Binary files a/doc/logo.jpg and /dev/null differ
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 7343d13..0768644 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -33,9 +33,6 @@
           <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
diff --git a/schemas/shibboleth-2.0-native-sp-config.xsd b/schemas/shibboleth-2.0-native-sp-config.xsd
index 43d86dc..7fb84f0 100644 (file)
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -2,7 +2,7 @@
 <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"
@@ -654,10 +654,6 @@
     <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>
 
Shibboleth SP