Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1 from TIER/golive 
merge Golive branch
@pcaskey
pcaskey committed Nov 4, 2020
2 parents 2a53e0a + fd3a367 commit de151e6
Showing 7 changed files with 240 additions and 224 deletions.
4 changes: 2 additions & 2 deletions assets/dsroot/config.php
View file
@@ -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'];

?>
?>
210 changes: 110 additions & 100 deletions assets/dsroot/css/default-styles.css
View file
@@ -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;
}

54 changes: 32 additions & 22 deletions assets/dsroot/custom-body.php
View file
@@ -2,31 +2,41 @@
// CAF 2016 ?>

<!-- Identity Provider Selection: Start -->
<h1><?php echo getLocalString('header'); ?></h1>
<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.
</div>
<br />

<form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>">
<div id="userInputArea">
<p class="promptMessage"><?php echo $promptMessage ?></p>
<div style="text-align: center">
<select name="user_idp" id="userIdPSelection">
<option value="-" <?php echo $defaultSelected ?>><?php echo getLocalString('select_idp') ?> ...</option>
<?php printDropDownList($IDProviders, $selectedIDP) ?>
</select>
<input type="submit" name="Select" accesskey="s" value="<?php echo getLocalString('select_button') ?>">
</div>
<div style="text-align: left">
<p class="selectOptions">
<input type="checkbox" <?php echo $rememberSelectionChecked ?> 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 -->
<input type="checkbox" name="permanent" id="rememberPermanent" value="100">
<label for="rememberPermanent"><?php echo getLocalString('permanently_remember_selection') ?></label>
<?php endif ?>
</p>
</div>
</div>
<div id="userInputArea">
<p class="promptMessage"><?php echo $promptMessage ?></p>
<div style="text-align: center">
<select name="user_idp" id="userIdPSelection" style="width:600px">
<option value="-" <?php echo $defaultSelected ?>><?php echo getLocalString('select_idp') ?> ...</option>
<?php printDropDownList($IDProviders, $selectedIDP) ?>
</select>
<input type="submit" style="background-color:#26A69A;color:white;width:15em;height:3em;" name="Select" accesskey="s" value="<?php echo getLocalString('select_button') ?>">
</div>
<div style="text-align: left">
<p class="selectOptions">
<input type="checkbox" <?php echo $rememberSelectionChecked ?> 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 -->
<input type="checkbox" name="permanent" id="rememberPermanent" value="100">
<label for="rememberPermanent"><?php echo getLocalString('permanently_remember_selection') ?></label>
<div style="text-align: right">
<a href="https://www.internet2.edu/about-us/contact-us/" target="_blank">Help</a>
</div>
<?php endif ?>
</p>
</div>
</div>
</form>

<!-- no message -->

<!-- Identity Provider Selection: End -->

0 comments on commit de151e6

Please sign in to comment.