diff --git a/resources/css/style.css b/resources/css/style.css
index 9050ce4e65fa1e97b1a6f58eb48075e3c09b907a..3ea13c33488b9730095a99b7b0a576a41edb1a1b 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -216,36 +216,37 @@ button:hover, .button:hover{
align-items: stretch;
}
-.accounts_profile > div {
- flex: 1 0 20em;
+.accounts_profile > div.tbl {
+ flex: 0 0 22em;
display: block; /* IE fix */
margin-right:1em;
}
-.accounts_profile div table{
+.accounts_profile div.tbl table{
width:100%;
margin-top:2rem;
table-layout: fixed;
word-wrap: break-word;
}
-.accounts_profile div table tr th:nth-child(1){
+.accounts_profile div.tbl table tr th:nth-child(1){
width:40%;
}
-.accounts_profile div table tr:nth-child(3) div{
+.accounts_profile div.tbl table tr:nth-child(3) div{
display:flex;
margin:0;
padding:0;
- height:10em;
+ height:7em;
overflow-y:scroll;
}
-.accounts_profile div table tr:nth-child(3) div p{
- margin:auto;
+.accounts_profile div.tbl table tr:nth-child(3) div p{
+ margin:auto 0;
display: block; /* IE fix */
font-size: 0.875rem;
- line-height: 1.125;
+ line-height: 1.3;
+ text-align:left;
}
.show_account_details{
diff --git a/resources/images/edugain_favicon.png b/resources/images/edugain_favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..af0cbffcb4586c0a8ae02f94468dceaf9b0152ae
Binary files /dev/null and b/resources/images/edugain_favicon.png differ
diff --git a/resources/images/favicon.png b/resources/images/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..af0cbffcb4586c0a8ae02f94468dceaf9b0152ae
Binary files /dev/null and b/resources/images/favicon.png differ
diff --git a/resources/images/favicon_geant.ico b/resources/images/favicon_geant.ico
new file mode 100644
index 0000000000000000000000000000000000000000..3c4e5e503600db409e09f1cb6904eb55237c9ee3
Binary files /dev/null and b/resources/images/favicon_geant.ico differ
diff --git a/templates/web/index.tt2.html b/templates/web/index.tt2.html
index c44430a818294be4c48f2032911ee270b85ca63b..cd8fcf59608c9ba719f1f223eefb114e8431509f 100644
--- a/templates/web/index.tt2.html
+++ b/templates/web/index.tt2.html
@@ -9,7 +9,7 @@ html1/DTD/xhtml1-transitional.dtd">
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-<link rel="icon" type="image/png" href="/images/favicon.png" />
+<link rel="icon" type="image/png" href="resources/images/favicon.png" />
<!-- Foundation css -->
<link rel="stylesheet" type="text/css" href="resources/foundation/css/normalize.css">
@@ -25,7 +25,6 @@ html1/DTD/xhtml1-transitional.dtd">
<script type="text/javascript" src="resources/jquery.cookie-1.4.1.min.js"></script>
<script type="text/javascript" src="resources/jquery.steps.1.1.0.min.js"></script>
-
<SCRIPT TYPE="text/javascript">
<!--
diff --git a/templates/web/validate_token.tt2.html b/templates/web/validate_token.tt2.html
index fac501ad3344971af74216ada849fff60d836bc1..83683dd39ebf0df2612ad224dc15d4f0b2bb11e2 100644
--- a/templates/web/validate_token.tt2.html
+++ b/templates/web/validate_token.tt2.html
@@ -1,28 +1,3 @@
-<script type="text/javascript">
-
-jQuery(document).ready(function($){
- $( ".account_details" ).dialog({
- title: "Account details",
- autoOpen: false,
- width: 0.8*$(window).width(),
- buttons: {
- Ok: function() {
- $( this ).dialog( "close" );
- }
- }
- });
- $( ".show_account_details" ).on('click', function(e) {
- var id = $(this).attr('id').substr(5);
- $("#" + id).dialog( "open" );
- e.stopPropagation();
- e.preventDefault();
- return false;
- });
-});
-
-</script>
-
-
<div class="row">
<h2>Test Accounts</h2>
@@ -33,11 +8,21 @@ jQuery(document).ready(function($){
<h3>The following test accounts with different profiles were created for you:</h3>
+ <p>You can now use these test accounts to login at your federated service.<br/>
+<strong>To do so, select the "[% conf.idp_displayname %]" when choosing an organisation to login at.</strong></p>
+ <p><strong>Please keep a record of the above user names and passwords</strong> because currently there is no mecanism to retrieve the above credentials once you close this page. If you forget the username and passowrds, you can however request new test accounts.</p>
+
+<div class="alert-box warning radius">
+ <p>Note that these test accounts will automatically expire in [% conf.accounts_validity_period %] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[% sp_entityid %]</strong>.</p>
+</div>
+
+</div>
+
<div class="accounts_profile">
[% FOREACH account IN test_accounts %]
[% PROCESS "${account.get('account_profile')}.tt2" %]
- <div>
+ <div class="tbl">
<table>
<caption>Account profile: [% account_profile.type %]</caption>
<tr>
@@ -47,7 +32,7 @@ jQuery(document).ready(function($){
<th>user password:</th><td>[% account.get('user_password') %]</td>
</tr>
<tr>
- <th>comment:</th><td><div><p>[% account_profile.comment %]</p></div></td>
+ <td colspan="2"><strong>comment:</strong><div><p>[% account_profile.comment %]</p></div></td>
</tr>
<tr>
<td colspan=2 class="align-center" ><button data-reveal-id="account_details_[% account.get('id') %]" class="show_account_details" id="show_account_details_[% account.get('id') %]">show account details</button></td>
@@ -75,18 +60,7 @@ jQuery(document).ready(function($){
[% END %]
</table>
</div>
-<!--
- <ul>
- [% FOREACH attribute IN account_profile.pairs -%]
- [% NEXT IF attribute.key.match('^(type|comment)$') %]
- [% IF attribute.value.isa('SCALAR') -%]
- <li>[% attribute.key %]: [% attribute.value %]</li>
- [% ELSE -%]
- <li>[% attribute.key %]: [% attribute.value.join(",") %]</li>
- [% END %]
- [% END %]
- </ul>
--->
+
<div class="alert-box info radius">If you a customized test account with additionnal user attributes, you should contact <a href="mailto:[% conf.support_email %]">[% conf.support_email %]</a>.</div>
<a class="close-reveal-modal">×</a>
</div>
@@ -97,13 +71,6 @@ jQuery(document).ready(function($){
</div>
-<div class="alert-box info radius">
- <p>You can now use these test accounts to login at your federated service.<br/>
-To do so, select the "[% conf.idp_displayname %]" when choosing an organisation to login at.</p>
- <p>Please keep a record of the above user names and passwords because currently there is no mecanism to retrieve the above credentials once you close this page. If you forget the username and passowrds, you can however request new test accounts.</p>
-</div>
-<div class="alert-box warning radius">
- <p>Note that these test accounts will automatically expire in [% conf.accounts_validity_period %] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[% sp_entityid %]</strong>.</p>
-</div>
<p class="align-center"><Strong>Thank you for using the [% conf.app_name %]</strong></p>
-</div>
+
+