Merge pull request #8 from TIER/ds-v0.3.5-dev

Ds v0.3.5 dev

README.md

@@ -1,2 +1,15 @@
 # CDS_Overlay
-Contains UI/Overlay files for the SWITCHWAYF container
+Contains UI/Overlay files for the SWITCHWAYF container for https://github.internet2.edu/ICP-OPs/ds.at.internet2.edu
+
+# Branches
+Create branches that maps to its corresponding branch container at https://github.internet2.edu/ICP-OPs/ds.at.internet2.edu
+
+e.g.:
+
+
+ds-v0.3.5-dev
+
+ds-v0.3.5-staging
+
+ds-v0.3.5-prod
+

assets/dsroot/custom-body.php

@@ -1,12 +1,36 @@
 <?php // Copyright (c) 2016, SWITCH 
 // CAF 2016 ?>
+<strong> DEV </strong>
+<script>
+function setCirrusIDP() {
+   document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA; path=/";
+   document.cookie = "_icmpwayf_redirection_state=checked; path=/";
+   document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp; path=/";
+   window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
+}
+
+function setGoogleIDP() {
+   document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9nb29nbGUuY2lycnVzaWRlbnRpdHkuY29tL2dhdGV3YXk; path=/";
+   document.cookie = "_icmpwayf_redirection_state=checked; path=/";
+   document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway; path=/";
+   window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
+}
+</script>
 
 <!-- Identity Provider Selection: Start -->
 <br /><?php echo getLocalString('header'); ?> <br /><br />
-
 <div style="text-align:left;font-size:14px">
-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.
+ If you do not find your organization in this list, there are two options:<br />
+ <ol>
+  <li>You can <a href="#" onclick="setGoogleIDP();return false;">login with your Google account</a>.<br /></li>
+  <li>You can <a href="#" onclick="setCirrusIDP();return false;">login with your Internet2 Guest account</a>. 
+   If you are new, you may <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index?returnUrl=https%3A%2F%2Fcomanage.at.internet2.edu%2Fregistry%2Fpages%2Fpublic%2Fclosetab' target='_blank'>create an Internet2 Guest account</a> 
+   (see <a href='https://spaces.at.internet2.edu/x/HpcbDQ'>Guest Account Guide</a>).<br /></li>
+ </ol>
 </div>
+
+
+
 <br />
 
 <form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>">
@@ -21,7 +45,7 @@
                 </div>
                 <div  style="text-align: left">
                         <p class="selectOptions">
-                                <input type="checkbox" <?php echo $rememberSelectionChecked ?> name="session" id="rememberForSession" value="true">
+                                <input type="checkbox" checked name="session" id="rememberForSession" value="true">
                                 <label for="rememberForSession"><?php echo getLocalString('remember_selection') ?></label><br>
                                 <?php if ($showPermanentSetting) : ?>
                                 <!-- Value permanent must be a number which is equivalent to the days the cookie should be valid -->
@@ -36,6 +60,8 @@
         </div>
 </form>
 
+<br />
+<input type="button" value="I'm having trouble logging in" href="#" onClick="script:window.open('https://spaces.at.internet2.edu/x/EQO6Bw');return false;">
 <!-- no message -->
 
 <!-- Identity Provider Selection: End -->