diff --git a/assets/dsroot/config.php b/assets/dsroot/config.php index 254e5b1..de1cefe 100644 --- a/assets/dsroot/config.php +++ b/assets/dsroot/config.php @@ -267,7 +267,7 @@ //$smallLogoURL = 'http://ds.example.org/SWITCHwayf/images/small-federation-logo.png'; // Support contact email address -$supportContactEmail = 'admin@incommon.org'; +$supportContactEmail = 'collaboration-support@internet2.edu'; // Absolute URL to the logo of the organization operating this Discovery Service // Set to an empty string to hide the logo @@ -302,4 +302,4 @@ // on pages the SWITCHwayf generates $developmentMode = $cds_settings['CDS_DEVELOPMENTMODE']; -?> \ No newline at end of file +?> diff --git a/assets/dsroot/css/default-styles.css b/assets/dsroot/css/default-styles.css index 568ae80..7fe0032 100644 --- a/assets/dsroot/css/default-styles.css +++ b/assets/dsroot/css/default-styles.css @@ -1,57 +1,60 @@ /* Copyright (c) 2014, SWITCH */ h1 { - font-family:Verdana, sans-serif; - font-size: 13px; - padding-bottom: 6px; - text-align: left; + font-family:Verdana, sans-serif; + font-size: 13px; + padding-bottom: 6px; + text-align: left; } p { - font-family:Verdana, sans-serif; - font-size: 12px; - text-align: left; + font-family:Verdana, sans-serif; + font-size: 12px; + text-align: left; } a { - color: #00247D; - text-decoration: underline; + color: #00247D; + text-decoration: underline; } a:visited { - color: #00247D; - text-decoration: underline; + color: #00247D; + text-decoration: underline; } a:focus, a:hover, a:active { - color: #F39800; - text-decoration: underline; + color: #F39800; + text-decoration: underline; } pre { - text-align: left; + text-align: left; } .promptMessage { - margin-top: 0; + margin-top: 0; + font-family:Verdana, sans-serif; + font-size: 12px; + color: #696969; } .selectOptions { - margin-bottom: 0; + margin-bottom: 0; } .box { - width: 720px; - text-align: center; - background-color: #FFFFFF; - box-shadow: 1px 1px 8px #999999; - border-radius: 13px; - -webkit-box-shadow: 1px 1px 8px #999999; - -webkit-border-radius: 13px; - -moz-box-shadow: 1px 1px 8px #999999; - -moz-border-radius: 13px; - padding: 10px 24px 10px 24px; + width: 920px; + text-align: center; + background-color: #FFFFFF; + box-shadow: 1px 1px 8px #999999; + border-radius: 13px; + -webkit-box-shadow: 1px 1px 8px #999999; + -webkit-border-radius: 13px; + -moz-box-shadow: 1px 1px 8px #999999; + -moz-border-radius: 13px; + padding: 10px 24px 10px 24px; } @@ -64,124 +67,131 @@ pre { /* IE 8 hack */ @media \0screen { - .box { border: 2px #969696 solid; } + .box { border: 2px #969696 solid; } } .menu { - width: 100%; - padding-left: 2px; - margin-top: 10px; - margin-left: 0; - float: left; - background: url("{$imageURL}/dual_line.png") repeat-x scroll 0 100% transparent; - font-family: Verdana, sans-serif; - font-size: 12px; - line-height: 45px; + width: 100%; + padding-left: 2px; + margin-top: 10px; + margin-left: 0; + float: left; + background: url("{$imageURL}/dual_line.png") repeat-x scroll 0 100% transparent; + font-family: Verdana, sans-serif; + font-size: 12px; + line-height: 45px; } .menu li { - float: left; - list-style:none; - line-height:35px; - margin-right:10px; + float: left; + list-style:none; + line-height:35px; + margin-right:10px; } .menu li.last { - background: url("{$imageURL}/separator.png") no-repeat scroll left center transparent; - padding-left: 8px; - float: left; - list-style:none; + background: url("{$imageURL}/separator.png") no-repeat scroll left center transparent; + padding-left: 8px; + float: left; + list-style:none; } .serviceName { - font-weight: bold; + font-weight: bold; } .hostName { - font-weight: bold; + font-weight: bold; } #container, .container { - position: absolute; - left: 50%; - top: 50%; - margin-left: -370px; - margin-top: -200px; + position: absolute; + left: 50%; + top: 50%; + margin-left: -470px; + margin-top: -200px; } #content, .content { - width: 98%; + width: 98%; + font-family:Verdana, sans-serif; + font-size: 18px; + color: #696969; + text-align: left; } #header { - width: 100%; - display: inline-block; - text-align: left; + width: 100%; + display: inline-block; + text-align: left; + font-family: Verdana, sans-serif; + font-size: 30px; } #federationLogo { - border: 0; - float: left; + border: 0; + float: left; } #organisationLogo { - border: 0; - float: right; + border: 0; + float: right; } #userInputArea, .userInputArea { - width: 100%; - margin-left: auto; - margin-right: auto; - background-color: #F0F0F0; - border-color: #969696; - border-width: 1px; - border-style: solid; - padding: 6px; + width: 100%; + margin-left: auto; + margin-right: auto; + background-color: #F0F0F0; + border-color: #969696; + border-width: 1px; + border-style: solid; + padding: 6px; } #userIdPSelection, .userIdPSelection { - width: 480px; - font-size: 12px; + width: 480px; + font-size: 12px; } /* Device specific styles */ @media only screen and (max-device-width: 720px){ - .box { - width: auto; - box-shadow: none; - border-radius: 0; - -webkit-box-shadow: none; - -webkit-border-radius: 0; - -moz-box-shadow: none; - -moz-border-radius: 0; - padding: 0; - } - - #content, .content { - width: 96%; - } - - #container, .container { - width: 96%; - position: auto; - left: auto; - top: auto; - margin-left: 0; - margin-top: 0; - } - - #userIdPSelection, .userIdPSelection { - width: 60%; - } - - #userIdPSelection_iddwrap input { - width:90%!important; - } + .box { + width: auto; + box-shadow: none; + border-radius: 0; + -webkit-box-shadow: none; + -webkit-border-radius: 0; + -moz-box-shadow: none; + -moz-border-radius: 0; + padding: 0; + } + + #content, .content { + width: 96%; + } + + #container, .container { + width: 96%; + position: auto; + left: auto; + top: auto; + margin-left: 0; + margin-top: 0; + } + + #userIdPSelection, .userIdPSelection { + width: 60%; + } + + #userIdPSelection_iddwrap input { + width:90%!important; + } } html, body, form, fieldset, p, div, h1, h2, h3, h4, h5, h6 { -webkit-text-size-adjust:none; } + diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php index 76c0aa7..4ce0f8b 100644 --- a/assets/dsroot/custom-body.php +++ b/assets/dsroot/custom-body.php @@ -2,31 +2,41 @@ // CAF 2016 ?> -

+


+ +
+If you do not find your organization in this list, the other supported option is a Google account. You will find Google in the Identity Provider list. Please note that the old Internet2 SiteID is no longer available and those IDs no longer work. +
+
+
-
-

-
- - -
-
-

- name="session" id="rememberForSession" value="true"> -
- - - - - -

-
-
+
+

+
+ + +
+
+

+ name="session" id="rememberForSession" value="true"> +
+ + + + +

+ Help +
+ +

+
+
+ diff --git a/assets/dsroot/custom-header.php b/assets/dsroot/custom-header.php index 710356b..a58630e 100644 --- a/assets/dsroot/custom-header.php +++ b/assets/dsroot/custom-header.php @@ -3,104 +3,97 @@ - <?php echo getLocalString('title') ?> - - - - - - - - - + <?php echo getLocalString('title') ?> + + + + + + + + +
-
- -
- +
+ +
+ + diff --git a/assets/dsroot/custom-languages.php b/assets/dsroot/custom-languages.php index 85d210d..8a94315 100644 --- a/assets/dsroot/custom-languages.php +++ b/assets/dsroot/custom-languages.php @@ -28,14 +28,15 @@ // to an empty string in order to hide them if they are not needed. $langStrings['en']['about_federation'] = 'About Internet2 ICMP'; // This string can be hidden by setting it to '' $langStrings['en']['about_organisation'] = 'About Internet2'; // This string can be hidden by setting it to '' -$langStrings['en']['additional_info'] = 'Internet2 a member-owned advanced technology community founded by the nation’s leading higher education institutions in 1996.'; // This string can be hidden by setting it to '' +$langStrings['en']['additional_info'] = 'Internet2 a member-owned advanced technology community founded by the nationÂ’s leading higher education institutions in 1996.'; // This string can be hidden by setting it to '' // Generic strings $langStrings['en']['faq'] = 'FAQ'; // This string can be hidden by setting it to '' $langStrings['en']['help'] = 'Help';// This string can be hidden by setting it to '' $langStrings['en']['privacy'] = 'Data Privacy'; // This string can be hidden by setting it to '' $langStrings['en']['title'] = 'Institution Selection'; -$langStrings['en']['header'] = 'Select your institution'; +//$langStrings['en']['header'] = 'Select your institution'; +$langStrings['en']['header'] = 'Please select a trusted identity provider from the list below by beginning to type in the edit box.'; $langStrings['en']['make_selection'] = 'You must select an institution.'; $langStrings['en']['settings'] = 'Default organization for this web browser'; $langStrings['en']['permanent_select_header'] = 'Permanently set your organization'; @@ -47,7 +48,8 @@ $langStrings['en']['permanently_remember_selection'] = 'Remember selection permanently and bypass this step from now on.'; $langStrings['en']['confirm_permanent_selection'] = 'Are you sure you want to make the selected organization your default organization? Don\'t proceed if you have several user accounts from multiple organizations.'; $langStrings['en']['save_button'] = 'Save'; -$langStrings['en']['access_host'] = 'In order to access the service %s please select or search for the institution that you are affiliated with.'; +//$langStrings['en']['access_host'] = 'In order to access the service %s please select or search for the institution that you are affiliated with.'; +$langStrings['en']['access_host'] = 'Enter your organization\'s name'; $langStrings['en']['select_idp'] = 'Select the organization you are affiliated with.'; $langStrings['en']['search_idp'] = 'Enter the name of the organization you are affiliated with...'; $langStrings['en']['remember_selection'] = 'Remember selection for this web browser session.'; @@ -58,7 +60,7 @@ $langStrings['en']['valid_request_description'] = 'A valid request needs at least the arguments shire and target with valid values. Optionally the arguments providerID, origin and redirect can be supplied to automtically redirect the web browser to an organization and to do that automatically for the current web browser session'; $langStrings['en']['valid_saml2_request_description'] = 'A valid SAML2 request needs at least the arguments entityID and return with valid values. Instead of the return argument, metadata for the Service Provider can include a DiscoveryResponse endpoint. Optionally the arguments isPassive, policy and returnIDParam can be supplied to automtically redirect the web browser to an organization and to do that automatically for the current web browser session'; $langStrings['en']['invalid_query'] = 'Error: Invalid Query'; -$langStrings['en']['select_button'] = 'Select'; +$langStrings['en']['select_button'] = 'Continue'; $langStrings['en']['login'] = 'Login'; $langStrings['en']['login_with'] = 'Login with:'; $langStrings['en']['other_federation'] = 'From other federations'; @@ -71,4 +73,5 @@ $langStrings['en']['no_idp_available'] = 'No organization available'; $langStrings['en']['last_used'] = 'Last used'; -?> \ No newline at end of file +?> + diff --git a/assets/dsroot/images/logo-orig.png b/assets/dsroot/images/logo-orig.png new file mode 100644 index 0000000..f3a2d76 Binary files /dev/null and b/assets/dsroot/images/logo-orig.png differ diff --git a/assets/dsroot/images/logo.png b/assets/dsroot/images/logo.png index f3a2d76..75b3066 100644 Binary files a/assets/dsroot/images/logo.png and b/assets/dsroot/images/logo.png differ