Commit 9d09b9e4 authored by haemmer's avatar haemmer
Browse files

Changed default background color and border color to match the harmos colors of the standalone WAYF

parent 22bbd60a
......@@ -78,12 +78,12 @@ var wayf_font_size = 12;
var wayf_font_color = '#000000';
// Border color
// [Optional, default: #00247D]
var wayf_border_color = '#00247D';
// [Optional, default: #969696]
var wayf_border_color = '#969696';
// Background color
// [Optional, default: #F4F7F7]
var wayf_background_color = '#F4F7F7';
// [Optional, default: #F0F0F0]
var wayf_background_color = '#F0F0F0';
// Whether to automatically log in user if he has a session/permanent redirect
// cookie set at central wayf
......
......@@ -306,12 +306,15 @@ function processIDPRoleDescriptor($IDPRoleDescriptorNode){
foreach( $SSOServices as $SSOService ){
if ($SSOService->getAttribute('Binding') == 'urn:mace:shibboleth:1.0:profiles:AuthnRequest'){
$IDP['SSO'] = $SSOService->getAttribute('Location');
break;
} else if ($SSOService->getAttribute('Binding') == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'){
$IDP['SSO'] = $SSOService->getAttribute('Location');
break;
}
}
// Set a default value for backward compatibility
if (!isset($IDP['SSO'])){
$IDP['SSO'] = 'https://no.saml1.sso.url.defined.com/error';
$IDP['SSO'] = 'https://no.saml1.or.saml2.sso.url.defined.com/error';
}
// First get MDUI name
......@@ -492,7 +495,6 @@ function getMDUIDisplayNames($RoleDescriptorNode){
$Entity = Array();
$MDUIDisplayNames = $RoleDescriptorNode->getElementsByTagNameNS('urn:oasis:names:tc:SAML:metadata:ui', 'DisplayName');
echo $MDUIDisplayNames->length."\n";
foreach( $MDUIDisplayNames as $MDUIDisplayName ){
$lang = $MDUIDisplayName->getAttributeNodeNS('http://www.w3.org/XML/1998/namespace', 'lang')->nodeValue;
$Entity[$lang] = $MDUIDisplayName->nodeValue;
......
......@@ -644,11 +644,11 @@ function decodeBase64(input) {
}
if(typeof(wayf_border_color) == "undefined"){
wayf_border_color = '#00247D';
wayf_border_color = '#969696';
}
if(typeof(wayf_background_color) == "undefined"){
wayf_background_color = '#F4F7F7';
wayf_background_color = '#F0F0F0';
}
if(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment