Commit bfc3b2ad authored by haemmer's avatar haemmer
Browse files

Removed tables

Improved IE compatibility
parent 9d09b9e4
...@@ -4,7 +4,6 @@ h1 { ...@@ -4,7 +4,6 @@ h1 {
font-size: 13px; font-size: 13px;
padding-bottom: 6px; padding-bottom: 6px;
text-align: left; text-align: left;
} }
p { p {
...@@ -28,17 +27,6 @@ a:focus, a:hover, a:active { ...@@ -28,17 +27,6 @@ a:focus, a:hover, a:active {
text-decoration: underline; text-decoration: underline;
} }
select {
max-width: 480px;
}
.container {
position: absolute;
left: 50%;
top: 50%;
margin-left: -320px;
margin-top: -200px;
}
.box { .box {
width:600px; width:600px;
...@@ -78,7 +66,6 @@ select { ...@@ -78,7 +66,6 @@ select {
line-height: 45px; line-height: 45px;
} }
.menu li { .menu li {
float: left; float: left;
list-style:none; list-style:none;
...@@ -93,24 +80,32 @@ select { ...@@ -93,24 +80,32 @@ select {
list-style:none; list-style:none;
} }
.content { #container {
position: absolute;
left: 50%;
top: 50%;
margin-left: -320px;
margin-top: -200px;
}
#content {
width: 100%; width: 100%;
float:left; float:left;
} }
.federationLogo { #federationLogo {
float:left; float:left;
margin-top: 32px; margin-top: 32px;
margin-left: 2px; margin-left: 2px;
border:0; border:0;
} }
.organisationLogo { #organisationLogo {
float:right; float:right;
border:0; border:0;
} }
.userInputArea { #userInputArea {
width: 100%; width: 100%;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
...@@ -121,15 +116,6 @@ select { ...@@ -121,15 +116,6 @@ select {
padding: 6px; padding: 6px;
} }
.selectedIdP #userIdPSelection {
{ width: 400px;
font-family:Verdana, sans-serif; }
font-size: 13px; \ No newline at end of file
width: 380px;
background-color: white;
border-color: black;
border-style: solid;
margin: 2px;
border-width: 1px;
text-align: center;
}
...@@ -3,39 +3,28 @@ ...@@ -3,39 +3,28 @@
<!-- Identity Provider Selection: Start --> <!-- Identity Provider Selection: Start -->
<h1><?php echo getLocalString('header'); ?></h1> <h1><?php echo getLocalString('header'); ?></h1>
<form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>"> <form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>">
<table class="userInputArea" width="500"> <div id="userInputArea">
<tr> <p><?php echo $promptMessage ?></p>
<td> <div align="center">
<p><?php echo $promptMessage ?></p> <select name="user_idp" id="userIdPSelection">
<div align="center"> <option value="-" <?php echo $defaultSelected ?>><?php echo getLocalString('select_idp') ?> ...</option>
<select name="user_idp"> <?php printDropDownList($IDProviders, $selectedIDP) ?>
<option value="-" <?php echo $defaultSelected ?>><?php echo getLocalString('select_idp') ?> ...</option> </select>
<?php printDropDownList($IDProviders, $selectedIDP) ?> <input type="submit" name="Select" accesskey="s" value="<?php echo getLocalString('select_button') ?>">
</select> </div>
<input type="submit" name="Select" accesskey="s" value="<?php echo getLocalString('select_button') ?>"> <div align="left">
</div> <p>
<div align="left"> <input type="checkbox" <?php echo $rememberSelectionChecked ?> name="session" id="rememberForSession" value="true">
<p> <label for="rememberForSession"><?php echo getLocalString('remember_selection') ?></label><br>
<input type="checkbox" <?php echo $rememberSelectionChecked ?> name="session" id="rememberForSession" value="true"> <?php if ($showPermanentSetting) : ?>
<label for="rememberForSession"><?php echo getLocalString('remember_selection') ?></label><br> <!-- Value permanent must be a number which is equivalent to the days the cookie shall be valid -->
<?php if ($showPermanentSetting) : ?> <input type="checkbox" name="permanent" id="rememberPermanent" value="100">
<!-- Value permanent must be a number which is equivalent to the days the cookie shall be valid --> <label for="rememberPermanent" /><?php echo getLocalString('permanently_remember_selection') ?></label>
<input type="checkbox" name="permanent" id="rememberPermanent" value="100"> <?php endif ?>
<label for="rememberPermanent" /><?php echo getLocalString('permanently_remember_selection') ?></label> </p>
<?php endif ?> </div>
</p> </div>
</div>
</td>
</tr>
</table>
</form> </form>
<p><?php echo getLocalString('additional_info') ?></p>
<table border="0" cellpadding="1" cellspacing="0">
<tr>
<td valign="top">
<p><?php echo getLocalString('additional_info') ?></p>
</td>
</tr>
</table>
<!-- Identity Provider Selection: End --> <!-- Identity Provider Selection: End -->
...@@ -60,16 +60,16 @@ function checkForm(){ ...@@ -60,16 +60,16 @@ function checkForm(){
--> -->
</script> </script>
<div class="container"> <div id="container">
<div class="box"> <div class="box">
<div class="header"> <div class="header">
<a href="http://www.switch.ch/aai"><img src="<?php echo $logoURL ?>" alt="SWITCHaai" class="federationLogo"></a><a href="http://www.switch.ch/"><img src="<?php echo $imageURL ?>/switch-logo.png" alt="SWITCH" class="organisationLogo" align="right"></a> <a href="http://www.switch.ch/aai"><img src="<?php echo $logoURL ?>" alt="SWITCHaai" id="federationLogo"></a><a href="http://www.switch.ch/"><img src="<?php echo $imageURL ?>/switch-logo.png" alt="SWITCH" id="organisationLogo" align="right"></a>
</div> </div>
<div class="content"> <div id="content">
<ul class="menu"> <ul class="menu">
<li><a href="http://www.switch.ch/<?php echo $language ?>/aai/about/"><?php echo getLocalString('about_federation'); ?></a></li> <li><a href="http://www.switch.ch/<?php echo $language ?>/aai/about/"><?php echo getLocalString('about_federation'); ?></a></li>
<li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/faq/"><?php echo getLocalString('faq') ?></a></li> <li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/faq/"><?php echo getLocalString('faq') ?></a></li>
<li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/help/"><?php echo getLocalString('help') ?></a></li> <li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/help/"><?php echo getLocalString('help') ?></a></li>
<li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/privacy/"><?php echo getLocalString('privacy') ?></a></li> <li class="last"><a href="http://www.switch.ch/<?php echo $language ?>/aai/privacy/"><?php echo getLocalString('privacy') ?></a></li>
</ul> </ul>
<!-- Body: Start --> <!-- Body: Start -->
...@@ -3,30 +3,19 @@ ...@@ -3,30 +3,19 @@
<!-- Identity Provider Selection: Start --> <!-- Identity Provider Selection: Start -->
<h1><?php echo getLocalString('settings'); ?></h1> <h1><?php echo getLocalString('settings'); ?></h1>
<form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>"> <form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>">
<table class="userInputArea" width="500"> <div id="userInputArea">
<tr> <p><?php echo getLocalString('permanent_cookie_notice'); ?></p>
<td> <div align="center">
<p><?php echo getLocalString('permanent_cookie_notice'); ?></p> <select name="permanent_user_idp" id="userIdPSelection" disabled="disabled">
<div align="center"> <option value="-"><?php echo $permanentUserIdPName ?></option>
<div class="selectedIdP" style="float: left"> </select>
<?php echo $permanentUserIdPName ?> <input type="submit" accesskey="c" name="clear_user_idp" value="<?php echo getLocalString('delete_permanent_cookie_button') ?>">
</div> <?php if (isValidShibRequest()) : ?>
<input style="float: left" type="submit" accesskey="c" name="clear_user_idp" value="<?php echo getLocalString('delete_permanent_cookie_button') ?>"> <input type="submit" accesskey="s" name="Select" name="permanent" value="<?php echo getLocalString('goto_sp') ?>" onClick="showPermanentConfirmation()">
<?php if (isValidShibRequest()) : ?> <?php endif ?>
<input style="float: left" type="submit" accesskey="s" name="Select" name="permanent" value="<?php echo getLocalString('goto_sp') ?>" onClick="showPermanentConfirmation()"> </div>
<?php endif ?> </div>
</div>
</td>
</tr>
</table>
</form> </form>
<p><?php echo getLocalString('additional_info') ?></p>
<table border="0" cellpadding="1" cellspacing="0">
<tr>
<td valign="top">
<p><?php echo getLocalString('additional_info') ?></p>
</td>
</tr>
</table>
<!-- Identity Provider Selection: End --> <!-- Identity Provider Selection: End -->
...@@ -3,30 +3,19 @@ ...@@ -3,30 +3,19 @@
<!-- Identity Provider Selection: Start --> <!-- Identity Provider Selection: Start -->
<h1><?php echo getLocalString('permanent_select_header'); ?></h1> <h1><?php echo getLocalString('permanent_select_header'); ?></h1>
<form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>"> <form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>">
<table class="userInputArea" width="500"> <div id="userInputArea">
<tr> <p><?php echo getLocalString('permanently_remember_selection') ?></p>
<td> <div align="center">
<!-- Value permanent must be a number which is equivalent to the days the cookie shall be valid --> <select name="user_idp" id="userIdPSelection">
<input name="permanent" type="hidden" value="100"> <option value="-" <?php echo $defaultSelected ?>><?php echo getLocalString('select_idp') ?> ...</option>
<p><?php echo getLocalString('permanently_remember_selection') ?></p> <?php printDropDownList($IDProviders, $selectedIDP) ?>
<p> </select>
<select name="user_idp"> <input type="submit" name="Select" accesskey="s" value="<?php echo getLocalString('save_button') ?>" >
<option value="-" <?php echo $defaultSelected ?>><?php echo getLocalString('select_idp') ?> ...</option> </div>
<?php printDropDownList($IDProviders, $selectedIDP) ?> <!-- Value permanent must be a number which is equivalent to the days the cookie shall be valid -->
</select> <input name="permanent" type="hidden" value="100">
<input type="submit" name="Select" accesskey="s" value="<?php echo getLocalString('save_button') ?>" > </div>
</p>
</td>
</tr>
</table>
</form> </form>
<p><?php echo getLocalString('additional_info') ?></p>
<table border="0" cellpadding="1" cellspacing="0">
<tr>
<td valign="top">
<p><?php echo getLocalString('additional_info') ?></p>
</td>
</tr>
</table>
<!-- Identity Provider Selection: End --> <!-- Identity Provider Selection: End -->
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