From: scantor Date: Tue, 26 Jun 2012 03:03:32 +0000 (+0000) Subject: Remove logo from defaults and templates X-Git-Tag: 2.5.0~41 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=1cc88932dfd5297bff638fe764d28b1dce714871 Remove logo from defaults and templates git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3717 cb58f699-b61c-0410-a6fe-9272a202ed29 --- diff --git a/Shibboleth.sln b/Shibboleth.sln index db7b93a..afcc275 100644 --- 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 --- a/configs/accessError.html +++ b/configs/accessError.html @@ -12,7 +12,9 @@ + Logo

Authorization Failed

diff --git a/configs/apache.config.in b/configs/apache.config.in index 0ad7307..54d64b6 100644 --- a/configs/apache.config.in +++ b/configs/apache.config.in @@ -29,11 +29,10 @@ SetHandler shib-handler # # -# Used for example logo and style sheet in error templates. +# Used for example style sheet in error templates. # Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css - Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg # diff --git a/configs/apache2.config.in b/configs/apache2.config.in index 565a135..4232d86 100644 --- 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. # Allow from all Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css - Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg # diff --git a/configs/apache22.config.in b/configs/apache22.config.in index 149409d..bdb7414ff 100644 --- 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. # Allow from all Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css - Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg # diff --git a/configs/apache24.config.in b/configs/apache24.config.in index 5475ed7..2d1a2c2 100644 --- 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. # Allow from all Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css - Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg # diff --git a/configs/attrChecker.html b/configs/attrChecker.html index c382db6..95b855f 100644 --- a/configs/attrChecker.html +++ b/configs/attrChecker.html @@ -12,7 +12,9 @@ + Logo +

We're sorry, but you cannot access this service at this time.

This service requires information about you that your identity provider @@ -39,8 +41,9 @@ You were trying to access the following URL:

For more information about this service, including what user information is required for access, -please visit our information page.

For more information about this service, including what user information is +required for access, please visit our +information page.

diff --git a/configs/discoveryTemplate.html b/configs/discoveryTemplate.html index 75f8d8d..244e1f5 100644 --- a/configs/discoveryTemplate.html +++ b/configs/discoveryTemplate.html @@ -29,6 +29,10 @@ + + + + diff --git a/configs/example-shibboleth2.xml b/configs/example-shibboleth2.xml index 22c4eb9..b7cdd1b 100644 --- a/configs/example-shibboleth2.xml +++ b/configs/example-shibboleth2.xml @@ -213,7 +213,6 @@ --> diff --git a/configs/sslError.html b/configs/sslError.html index 350d45a..1fe2467 100644 --- a/configs/sslError.html +++ b/configs/sslError.html @@ -12,7 +12,9 @@ + Logo

POST Failed

diff --git a/configs/win-shibboleth2.xml b/configs/win-shibboleth2.xml index df661a1..68aa802 100644 --- a/configs/win-shibboleth2.xml +++ b/configs/win-shibboleth2.xml @@ -110,7 +110,6 @@ --> diff --git a/doc/Makefile.am b/doc/Makefile.am index 0e2b83b..10386cd 100644 --- 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 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 --- a/msi/WiX/ShibbolethSP-noarch.wxs +++ b/msi/WiX/ShibbolethSP-noarch.wxs @@ -33,9 +33,6 @@ - - - diff --git a/schemas/shibboleth-2.0-native-sp-config.xsd b/schemas/shibboleth-2.0-native-sp-config.xsd index 43d86dc..7fb84f0 100644 --- a/schemas/shibboleth-2.0-native-sp-config.xsd +++ b/schemas/shibboleth-2.0-native-sp-config.xsd @@ -2,7 +2,7 @@ - - - -