From f70ff57303d3e7dee35a60063d80052eef9c4984 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Mon, 30 Jul 2018 17:19:26 -0400 Subject: [PATCH 1/9] update for go live --- assets/dsroot/custom-body.php | 4 +++- assets/dsroot/custom-header.php | 10 +--------- assets/dsroot/custom-languages.php | 10 ++++++---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php index 76c0aa7..b24cb60 100644 --- a/assets/dsroot/custom-body.php +++ b/assets/dsroot/custom-body.php @@ -11,7 +11,7 @@ - +

@@ -21,6 +21,8 @@ +
+ Help

diff --git a/assets/dsroot/custom-header.php b/assets/dsroot/custom-header.php index 710356b..561b516 100644 --- a/assets/dsroot/custom-header.php +++ b/assets/dsroot/custom-header.php @@ -91,15 +91,7 @@ function init(){
diff --git a/assets/dsroot/custom-languages.php b/assets/dsroot/custom-languages.php index 85d210d..5d92edb 100644 --- a/assets/dsroot/custom-languages.php +++ b/assets/dsroot/custom-languages.php @@ -35,7 +35,8 @@ $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,4 @@ $langStrings['en']['no_idp_available'] = 'No organization available'; $langStrings['en']['last_used'] = 'Last used'; -?> \ No newline at end of file +?> From 5f38ad6f42c0068137217c6af23b7a900e8c769d Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Tue, 31 Jul 2018 00:08:40 -0400 Subject: [PATCH 2/9] bug fix --- assets/dsroot/custom-languages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/dsroot/custom-languages.php b/assets/dsroot/custom-languages.php index 5d92edb..040d9a8 100644 --- a/assets/dsroot/custom-languages.php +++ b/assets/dsroot/custom-languages.php @@ -49,7 +49,7 @@ $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'] = 'Enter your organization's name'; +$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.'; From ac58cc3721bc5d0322aaeaeb8f414f535e8f8a39 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Tue, 31 Jul 2018 14:09:23 -0400 Subject: [PATCH 3/9] change email addr --- assets/dsroot/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 +?> From 4526ffaf10511867e3a68ff3abde905a6a99765d Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Tue, 31 Jul 2018 13:31:14 -0500 Subject: [PATCH 4/9] add new logo --- logo-i2cp.png | Bin 0 -> 7959 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 logo-i2cp.png diff --git a/logo-i2cp.png b/logo-i2cp.png new file mode 100644 index 0000000000000000000000000000000000000000..75b30665aa1ddcc62e51009b926ada3b5b6296d2 GIT binary patch literal 7959 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 b>lcMqk{fOMy+X<4w9{iXUDbkz|GfV%p!|J( literal 0 HcmV?d00001 From 47746f862b0d48551f2c4145ca2a7216696f42e2 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Tue, 31 Jul 2018 17:10:22 -0400 Subject: [PATCH 5/9] add new image --- assets/dsroot/images/logo.png | Bin 9129 -> 7959 bytes logo-i2cp.png | Bin 7959 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 logo-i2cp.png diff --git a/assets/dsroot/images/logo.png b/assets/dsroot/images/logo.png index f3a2d76fa1bfdf0190a8975980c3a935185bf2c5..75b30665aa1ddcc62e51009b926ada3b5b6296d2 100644 GIT binary patch literal 7959 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 b>lcMqk{fOMy+X<4w9{iXUDbkz|GfV%p!|J( literal 9129 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 diff --git a/logo-i2cp.png b/logo-i2cp.png deleted file mode 100644 index 75b30665aa1ddcc62e51009b926ada3b5b6296d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7959 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 b>lcMqk{fOMy+X<4w9{iXUDbkz|GfV%p!|J( From f70830fb6d6c13389f0bb38ece1b9c1e735da6d1 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Wed, 1 Aug 2018 15:13:12 -0400 Subject: [PATCH 6/9] UI updates --- assets/dsroot/css/default-styles.css | 210 ++++++++++++++------------- assets/dsroot/custom-body.php | 50 ++++--- assets/dsroot/custom-header.php | 175 +++++++++++----------- assets/dsroot/custom-languages.php | 3 +- 4 files changed, 226 insertions(+), 212 deletions(-) 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 b24cb60..a34374d 100644 --- a/assets/dsroot/custom-body.php +++ b/assets/dsroot/custom-body.php @@ -2,33 +2,35 @@ // CAF 2016 ?> -

+


-
-

-
- - -
-
-

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

-
-
+
+

+
+ + +
+
+

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

+ Help +
+ +

+
+
+ diff --git a/assets/dsroot/custom-header.php b/assets/dsroot/custom-header.php index 561b516..a58630e 100644 --- a/assets/dsroot/custom-header.php +++ b/assets/dsroot/custom-header.php @@ -3,96 +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 040d9a8..8a94315 100644 --- a/assets/dsroot/custom-languages.php +++ b/assets/dsroot/custom-languages.php @@ -28,7 +28,7 @@ // 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 '' @@ -74,3 +74,4 @@ $langStrings['en']['last_used'] = 'Last used'; ?> + From 043a1b2dfb4afc157553b066776e55b6e57671b7 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Wed, 1 Aug 2018 15:23:58 -0400 Subject: [PATCH 7/9] UI update --- assets/dsroot/custom-body.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php index a34374d..822ac7f 100644 --- a/assets/dsroot/custom-body.php +++ b/assets/dsroot/custom-body.php @@ -3,6 +3,15 @@


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

From 9188d4bab602c8db065bae465eb31d3a5a3e4759 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Wed, 1 Aug 2018 15:46:56 -0400 Subject: [PATCH 8/9] old logo --- assets/dsroot/images/logo-orig.png | Bin 0 -> 9129 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 assets/dsroot/images/logo-orig.png diff --git a/assets/dsroot/images/logo-orig.png b/assets/dsroot/images/logo-orig.png new file mode 100644 index 0000000000000000000000000000000000000000..f3a2d76fa1bfdf0190a8975980c3a935185bf2c5 GIT binary patch literal 9129 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 literal 0 HcmV?d00001 From fd3a3678139ec6b10866a24975956d6fcbe261d0 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Wed, 1 Aug 2018 16:35:54 -0400 Subject: [PATCH 9/9] bugfix --- assets/dsroot/custom-body.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php index 822ac7f..4ce0f8b 100644 --- a/assets/dsroot/custom-body.php +++ b/assets/dsroot/custom-body.php @@ -5,10 +5,7 @@


-If you do not find your organization in this list, the other supported option iss - a Google account. You will find Google in the Identity Provider list. Please noo -te that the old Internet2 SiteID is no longer available and those IDs no longer -work. +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.