diff --git a/dictionaries/logout.php b/dictionaries/logout.php
index 0b9a6cdc2372fba59d1c6062541226af1af711ff..cd28b90d2cf67fbba25215b2809f58bcf23047a5 100644
--- a/dictionaries/logout.php
+++ b/dictionaries/logout.php
@@ -50,14 +50,24 @@ $lang = array(
'pt-BR' => 'Voltar a instalação do simpleSAMLphp',
),
'loggedoutfrom' => array (
+ 'no' => 'Du er nĂĄ logget ut fra %SP%.',
+ 'en' => 'You are now successfully logged out from %SP%.',
),
'also_from' => array (
+ 'no' => 'Du er ogsĂĄ logget inn pĂĄ disse tjenestene:',
+ 'en' => 'You are also logged in on these services:',
),
'logout_all_question' => array (
+ 'no' => 'Vil du logge ut fra alle tjenestene ovenfor?',
+ 'en' => 'Do you want to logout from all the services above?',
),
'logout_all' => array (
+ 'no' => 'Ja, alle tjenestene over',
+ 'en' => 'Yes, all services',
),
'logout_only' => array (
+ 'no' => 'Nei, bare %SP%',
+ 'en' => 'No, only %SP%',
),
'description' => array (
'no' => 'Du har startet en <strong>global utlogging</strong> fra tjenesten <strong>%REQUESTERNAME%</strong>. Global utlogging betyr at du vil bli logget ut fra alle tjenestene vist nedenfor.',
diff --git a/templates/logout-iframe.php b/templates/logout-iframe.php
index e6b41e32d658bcd9d9889211bef9c8153155218a..9fa46c6e2803c57ac1dd74122d9be03391185176 100644
--- a/templates/logout-iframe.php
+++ b/templates/logout-iframe.php
@@ -81,19 +81,17 @@ function sendResponse() {
<div id="nojavascriptframe">
<iframe style="margin: 1em; width: 90%; height: 5em; border: 1px solid #eee" src="SingleLogoutServiceiFrameNoJavascript.php?response=<?php echo urlencode($this->data['logoutresponse']); ?>"></iframe>
</div>
-
<?php
-
foreach ($this->data['sparray'] AS $sp) {
echo '<iframe class="hiddeniframe" onload="xajax_updateslostatus()" style="border: 1px solid #888; width: 80%; height: 100px"
src="' . htmlentities($sp['url']) . '" ></iframe>' . "\n";
}
-
?>
-
</noscript>
+
+
<div id="requirejavascript" style="display: none">
<?php
@@ -101,18 +99,26 @@ function sendResponse() {
$requestername = is_array($this->data['requesterName']) ?
$this->getTranslation($this->data['requesterName']) : $this->data['requesterName'];
- echo('<p>' . $this->t('{logout:description}', array('%REQUESTERNAME%' => $requestername)) . '</p>');
+ #echo('<p>' . $this->t('{logout:description}', array('%REQUESTERNAME%' => $requestername)) . '</p>');
?>
<!-- <div class="loggedout"><?php echo($this->t('{logout:logged_out}', array('%REQUESTERNAME%' => $requestername))); ?></div> -->
<?php
-
-
+
+ echo('<div><img style="float: left; margin-right: 12px" src="/' . $this->data['baseurlpath'] . 'resources/icons/gn/success-l.png" alt="Successful logout" />');
+ echo('<p style="padding-top: 16px; ">' . $this->t('{logout:loggedoutfrom}', array('%SP%' => '<strong>' .$requestername.'</strong>')) . '</p>');
+ echo('<p style="height: 0px; clear: left;"></p>');
+ echo('</div>');
+
+ echo('<div style="margin-top: 3em; clear: both">');
+ echo('<p style="margin-bottom: .5em">' . $this->t('{logout:also_from}') . '</p>');
echo '<table id="slostatustable">';
+
+/** Remove initiated from. showed above instead
echo '<tr class="initiated" id="e_initiated">' . "\n";
echo ' <td><img style="float: left; margin: 3px" src="/' . $this->data['baseurlpath'] .
@@ -121,15 +127,16 @@ function sendResponse() {
echo ' <td>' . $requestername . '</td>' ."\n";
echo '</tr>' . "\n";
-
+ */
foreach ($this->data['sparrayNoLogout'] AS $spentityid => $sp) {
$spname = is_array($sp['name']) ? $this->getTranslation($sp['name']) : $sp['name'];
echo '<tr class="initiated" id="e' . sha1($spentityid) . '">' . "\n";
- echo ' <td><img style="float: left; margin: 3px" src="/' . $this->data['baseurlpath'] .
+ echo ' <td class="statustext">Logout not supported</td>';
+ echo ' <td ><img style="" src="/' . $this->data['baseurlpath'] .
'resources/icons/silk/delete.png" alt="Initiated from" /></td>' . "\n";
- echo ' <td>Logout not supported</td>';
+
echo ' <td>' . $spname . '</td>' ."\n";
echo '</tr>' . "\n";
}
@@ -140,19 +147,23 @@ function sendResponse() {
echo '<tr class="ready onhold" id="e' . sha1($spentityid) . '">' . "\n";
+ echo ' <td class="statustext">';
+ echo ' <span class="completed">' . $this->t('{logout:completed}') . '</span>' . "\n";
+# echo ' <span class="onhold">' . $this->t('{logout:hold}') . '</span>' . "\n";
+ echo ' <span class="onhold"></span>' . "\n";
+ echo ' <span class="inprogress">' . $this->t('{logout:progress}') . '</span>' . "\n";
+ echo ' <span class="failed">' . $this->t('{logout:failed}') . '</span>' . "\n";
+ echo ' </td>';
+
echo ' <td class="icons">';
echo ' <img class="completed" src="/' . $this->data['baseurlpath'] . 'resources/icons/silk/accept.png" alt="Completed" />' . "\n";
- echo ' <img class="onhold" src="/' . $this->data['baseurlpath'] . 'resources/icons/silk/control_pause.png" alt="SP SLO on hold" />' . "\n";
+ echo ' <img class="onhold" src="/' . $this->data['baseurlpath'] . 'resources/icons/service.png" alt="SP SLO on hold" />' . "\n";
echo ' <img class="inprogress" src="/' . $this->data['baseurlpath'] . 'resources/progress.gif" alt="Progress bar" />' . "\n";
echo ' <img class="failed" src="/' . $this->data['baseurlpath'] . 'resources/icons/silk/exclamation.png" alt="Failed" />' . "\n";
echo ' </td>' . "\n";
- echo ' <td class="statustext">';
- echo ' <span class="completed">' . $this->t('{logout:completed}') . '</span>' . "\n";
- echo ' <span class="onhold">' . $this->t('{logout:hold}') . '</span>' . "\n";
- echo ' <span class="inprogress">' . $this->t('{logout:progress}') . '</span>' . "\n";
- echo ' <span class="failed">' . $this->t('{logout:failed}') . '</span>' . "\n";
- echo ' </td>';
+
+
echo ' <td>' . $spname . '</td>' ."\n";
echo '</tr>' . "\n";
@@ -170,9 +181,9 @@ function sendResponse() {
?>
- <p id="confirmation" style="margin-top: 1em" ><?php echo $this->t('{logout:continue}'); ?> <br />
- <input type="button" id="ok" name="ok" value="<?php echo $this->t('{logout:do_continue}'); ?>" />
- <input type="button" id="cancel" name="cancel" value="<?php echo $this->t('{logout:cancel}'); ?>" />
+ <p id="confirmation" style="margin-top: 1em" ><?php echo $this->t('{logout:logout_all_question}'); ?> <br />
+ <input type="button" id="ok" name="ok" value="<?php echo $this->t('{logout:logout_all}'); ?>" />
+ <input type="button" id="cancel" name="cancel" value="<?php echo $this->t('{logout:logout_only}', array('%SP%' => $requestername)); ?>" />
</p>
<div id="interrupt" style="margin-top: 1em; border: 1px solid #ccc; padding: 1em; background: #eaeaea" >
diff --git a/www/resources/icons/gn/notice-l.png b/www/resources/icons/gn/notice-l.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e93a6a10244c148cf53d21430510788004664ef
Binary files /dev/null and b/www/resources/icons/gn/notice-l.png differ
diff --git a/www/resources/icons/gn/stop-l.png b/www/resources/icons/gn/stop-l.png
new file mode 100644
index 0000000000000000000000000000000000000000..6006309186909ae9b6d165130051bd12ebbcbff9
Binary files /dev/null and b/www/resources/icons/gn/stop-l.png differ
diff --git a/www/resources/icons/gn/success-l.png b/www/resources/icons/gn/success-l.png
new file mode 100644
index 0000000000000000000000000000000000000000..2617e2012e3a909a22de1ee0ae2c79d83e563c68
Binary files /dev/null and b/www/resources/icons/gn/success-l.png differ
diff --git a/www/resources/icons/gn/warning-l.png b/www/resources/icons/gn/warning-l.png
new file mode 100644
index 0000000000000000000000000000000000000000..c81c9359c3e3a6b0ceecfde3e49f3086f3e5ccd5
Binary files /dev/null and b/www/resources/icons/gn/warning-l.png differ
diff --git a/www/resources/icons/service.png b/www/resources/icons/service.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b8a8859dee94b3f009a0355a9249163b5fff1ed
Binary files /dev/null and b/www/resources/icons/service.png differ
diff --git a/www/resources/slo.css b/www/resources/slo.css
index 7bf8578ef1f82d9bc2ee4c8bfa80a3dab9c7d353..58d5b4d066f57ddfd403f797e8193364ed8a1ee8 100644
--- a/www/resources/slo.css
+++ b/www/resources/slo.css
@@ -1,9 +1,15 @@
table#slostatustable {
- width: 100%;
+/* width: 100%; */
border-collapse: collapse;
+ margin-bottom: 1em;
}
table#slostatustable tr td {
- border-top: 1px solid #ccc;
+/* border-top: 1px solid #ccc; */
+ padding-left: 4px;
+ padding-right: 4px;
+}
+table#slostatustable tr td.statustext {
+ min-width: 5em;
}
@@ -14,7 +20,7 @@ table#slostatustable tr.inprogress td.statustext span.inprogress { display: inli
table#slostatustable tr.failed td.statustext span.failed { display: inline; }
table#slostatustable tr td.icons img {
- margin: 3px;
+/* margin: 3px; */
display: none;
}
table#slostatustable tr.completed td.icons img.completed { display: inline; }
diff --git a/www/saml2/idp/SingleLogoutServiceiFrame.php b/www/saml2/idp/SingleLogoutServiceiFrame.php
index dcef2cb2f694c5b430e61c6994c0916b2bfcbbbc..2985f746f791829a4833d8153591af77166aeebd 100644
--- a/www/saml2/idp/SingleLogoutServiceiFrame.php
+++ b/www/saml2/idp/SingleLogoutServiceiFrame.php
@@ -359,7 +359,7 @@ if (array_key_exists('name', $spmeta)) $spname = $spmeta['name'];
$et = new SimpleSAML_XHTML_Template($config, 'logout-iframe.php');
-$et->data['header'] = 'Global logout';
+$et->data['header'] = 'Logout';
$et->data['sparray'] = $sparray;
$et->data['sparrayNoLogout'] = $sparrayNoLogout;
diff --git a/www/saml2/sp/SingleLogoutService.php b/www/saml2/sp/SingleLogoutService.php
index 6db72f0cd467fe802a7edf6326420b8ba019bb6e..037e39b49563dc4aaffd38524b5031712fe8c596 100644
--- a/www/saml2/sp/SingleLogoutService.php
+++ b/www/saml2/sp/SingleLogoutService.php
@@ -22,7 +22,7 @@ if (isset($session) ) {
$session->clean();
}
-# sleep(max(0, rand(-5,15)));
+ sleep(max(0, rand(-3,5))*5);
if (isset($_GET['SAMLRequest'])) {