Skip to content
Snippets Groups Projects
Commit a055c633 authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg
Browse files

UI Improvements to SLO 

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1260 44740490-163a-0410-bde0-09ae8108e29a
parent 9dc392d8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
templates/frontpage.php
+ 81
− 87
View file @ a055c633
......@@ -38,69 +38,69 @@ if ($this->data['isadmin']) {
<div id="welcome">
<div class="enablebox mini">
<table>
<div class="enablebox mini">
<table>
<?php
$icon_enabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/accept.png" alt="enabled" />';
$icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="disabled" />';
?>
<tr class="<?php echo $this->data['enablematrix']['saml20-sp'] ? 'enabled' : 'disabled'; ?>"><td>SAML 2.0 SP</td>
<td><?php echo $this->data['enablematrix']['saml20-sp'] ? $icon_enabled : $icon_disabled; ?></td></tr>
<tr class="<?php echo $this->data['enablematrix']['saml20-idp'] ? 'enabled' : 'disabled'; ?>"><td>SAML 2.0 IdP</td>
<td><?php echo $this->data['enablematrix']['saml20-idp'] ? $icon_enabled : $icon_disabled; ?></td></tr>
<tr class="<?php echo $this->data['enablematrix']['shib13-sp'] ? 'enabled' : 'disabled'; ?>"><td>Shib 1.3 SP</td>
<td><?php echo $this->data['enablematrix']['shib13-sp'] ? $icon_enabled : $icon_disabled; ?></td></tr>
<tr class="<?php echo $this->data['enablematrix']['shib13-idp'] ? 'enabled' : 'disabled'; ?>"><td>Shib 1.3 IdP</td>
<td><?php echo $this->data['enablematrix']['shib13-idp'] ? $icon_enabled : $icon_disabled; ?></td></tr>
</table>
</div>
<?php
$icon_enabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/accept.png" alt="enabled" />';
$icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="disabled" />';
?>
<tr class="<?php echo $this->data['enablematrix']['saml20-sp'] ? 'enabled' : 'disabled'; ?>"><td>SAML 2.0 SP</td>
<td><?php echo $this->data['enablematrix']['saml20-sp'] ? $icon_enabled : $icon_disabled; ?></td></tr>
<tr class="<?php echo $this->data['enablematrix']['saml20-idp'] ? 'enabled' : 'disabled'; ?>"><td>SAML 2.0 IdP</td>
<td><?php echo $this->data['enablematrix']['saml20-idp'] ? $icon_enabled : $icon_disabled; ?></td></tr>
<tr class="<?php echo $this->data['enablematrix']['shib13-sp'] ? 'enabled' : 'disabled'; ?>"><td>Shib 1.3 SP</td>
<td><?php echo $this->data['enablematrix']['shib13-sp'] ? $icon_enabled : $icon_disabled; ?></td></tr>
<tr class="<?php echo $this->data['enablematrix']['shib13-idp'] ? 'enabled' : 'disabled'; ?>"><td>Shib 1.3 IdP</td>
<td><?php echo $this->data['enablematrix']['shib13-idp'] ? $icon_enabled : $icon_disabled; ?></td></tr>
<p><?php echo $this->t('intro'); ?></p>
<h2><?php echo $this->t('useful_links_header'); ?></h2>
<ul>
<?php
</table>
</div>
<p><?php echo $this->t('intro'); ?></p>
<h2><?php echo $this->t('useful_links_header'); ?></h2>
<ul>
<?php
foreach ($this->data['links'] AS $link) {
echo '<li><a href="' . htmlspecialchars($link['href']) . '">' . $this->t($link['text']) . '</a></li>';
}
?>
</ul>
foreach ($this->data['links'] AS $link) {
echo '<li><a href="' . htmlspecialchars($link['href']) . '">' . $this->t($link['text']) . '</a></li>';
}
?>
</ul>
<h2><?php echo $this->t('doc_header'); ?></h2>
<ul>
<?php
foreach ($this->data['links_doc'] AS $link) {
echo '<li><a href="' . htmlspecialchars($link['href']) . '">' . $this->t($link['text']) . '</a></li>';
}
?>
</ul>
<h2><?php echo $this->t('about_header'); ?></h2>
<p><?php echo $this->t('about_text'); ?></p>
<h2><?php echo $this->t('doc_header'); ?></h2>
<ul>
<?php
foreach ($this->data['links_doc'] AS $link) {
echo '<li><a href="' . htmlspecialchars($link['href']) . '">' . $this->t($link['text']) . '</a></li>';
}
?>
</ul>
<h2><?php echo $this->t('about_header'); ?></h2>
<p><?php echo $this->t('about_text'); ?></p>
</div> <!-- #welcome -->
<div id="configuration">
<div>
<code style="background: white; border: 1px solid #ccc; padding: 1em; color: #555" ><?php
echo $this->data['directory'] . ' (' . $this->data['version'] . ')';
?></code>
</div>
<h2><?php echo $this->t('configuration'); ?></h2>
<div>
<code style="background: white; border: 1px solid #ccc; padding: 1em; color: #555" ><?php
echo $this->data['directory'] . ' (' . $this->data['version'] . ')';
?></code>
</div>
<h2><?php echo $this->t('configuration'); ?></h2>
<ul>
<?php
......@@ -109,42 +109,40 @@ if ($this->data['isadmin']) {
}
?>
</ul>
<?php
if (array_key_exists('warnings', $this->data) && is_array($this->data['warnings']) && !empty($this->data['warnings'])) {
echo '<h2>' . $this->t('warnings') . '</h2>';
foreach($this->data['warnings'] AS $warning) {
echo '<div class="caution">' . $this->t($warning) . '</div>';
<?php
if (array_key_exists('warnings', $this->data) && is_array($this->data['warnings']) && !empty($this->data['warnings'])) {
echo '<h2>' . $this->t('warnings') . '</h2>';
foreach($this->data['warnings'] AS $warning) {
echo '<div class="caution">' . $this->t($warning) . '</div>';
}
}
?>
<?php
if ($this->data['isadmin']) {
echo '<h2>'. $this->t('checkphp') . '</h2>';
echo '<div class="enablebox"><table>';
$icon_enabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/accept.png" alt="enabled" />';
$icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="disabled" />';
foreach ($this->data['funcmatrix'] AS $func) {
echo '<tr class="' . ($func['enabled'] ? 'enabled' : 'disabled') . '"><td>' . ($func['enabled'] ? $icon_enabled : $icon_disabled) . '</td>
<td>' . $this->t($func['required']) . '</td><td>' . $func['descr'] . '</td></tr>';
}
echo('</table></div>');
}
?>
<?php
if ($this->data['isadmin']) {
echo '<h2>'. $this->t('checkphp') . '</h2>';
echo '<div class="enablebox"><table>';
?>
$icon_enabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/accept.png" alt="enabled" />';
$icon_disabled = '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="disabled" />';
foreach ($this->data['funcmatrix'] AS $func) {
echo '<tr class="' . ($func['enabled'] ? 'enabled' : 'disabled') . '"><td>' . ($func['enabled'] ? $icon_enabled : $icon_disabled) . '</td>
<td>' . $this->t($func['required']) . '</td><td>' . $func['descr'] . '</td></tr>';
}
}
?>
</table>
</div>
</div> <!-- #configuration -->
<div id="metadata">
......@@ -169,7 +167,7 @@ function mtype($set) {
echo '<dl>';
if (is_array($this->data['metaentries']['hosted']) && count($this->data['metaentries']['hosted']) > 0)
foreach ($this->data['metaentries']['hosted'] AS $hm) {
echo '<dt>' . $this->t(mtype($hm['metadata-set'])) . '</tt></dt>';
echo '<dt>' . $this->t(mtype($hm['metadata-set'])) . '</dt>';
echo '<dd>';
echo '<p>Entity ID: ' . $hm['entityid'];
if ($hm['entityid'] !== $hm['metadata-index'])
......@@ -224,10 +222,6 @@ foreach($this->data['metaentries']['remote'] AS $setkey => $set) {
</div> <!-- #metadata -->
......
templates/includes/footer.php
+ 2
− 2
View file @ a055c633
......@@ -8,9 +8,9 @@
<br style="clear: right" />
</div>
</div><!-- #content -->
</div>
</div><!-- #wrap -->
</body>
</html>
\ No newline at end of file
templates/logout-iframe.php
+ 23
− 23
View file @ a055c633
......@@ -16,7 +16,7 @@
$this->data['head'] .= '
<script type="text/javascript" language="JavaScript">
<!--
$(document).ready(function() {
......@@ -36,7 +36,7 @@ $(document).ready(function() {
sendResponse();
});
' . ($nologoutSPs ? '$("div#incapablesps").show();' : '$("div#incapablesps").hide();') . '
' . ($nologoutSPs ? '$("#incapablesps").show();' : '$("#incapablesps").hide();') . '
});
......@@ -49,7 +49,7 @@ function startslo() {
$("#confirmation").hide();
$("#hiddeniframecontainer").html("' . str_replace('"', '\"', $iframehtml) . '");
$("table#slostatustable tr.onhold").removeClass("onhold").addClass("inprogress");
$("div.completedButWarnings").show();
/* $("div.completedButWarnings").show(); */
setTimeout("toolong()", 16000);
}
......@@ -70,6 +70,7 @@ function slocompleted() {
function sendResponse() {
window.location = "' . $this->data['logoutresponse'] . '";
}
// -->
</script>';
$this->includeAtTemplateBase('includes/header.php');
......@@ -107,7 +108,7 @@ function sendResponse() {
<?php
echo('<div><img style="float: left; margin-right: 12px" src="/' . $this->data['baseurlpath'] . 'resources/icons/gn/success-l.png" alt="Successful logout" />');
echo('<div><img style="float: left; margin-right: 12px" src="/' . $this->data['baseurlpath'] . 'resources/icons/checkmark48.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>');
......@@ -150,14 +151,14 @@ function sendResponse() {
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="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/service.png" alt="SP SLO on hold" />' . "\n";
echo ' <img class="onhold" src="/' . $this->data['baseurlpath'] . 'resources/icons/bullet16_grey.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";
......@@ -171,7 +172,7 @@ function sendResponse() {
// echo '<div class="inprogress" id="e' . sha1($spentityid) . '">
// <img style="float: left; margin: 3px" src="/' . $this->data['baseurlpath'] . 'resources/progress.gif" alt="Progress bar" />Wait... is logging out from <strong>' . $spname . '</strong></div>' . "\n";
}
echo '</table>';
echo '</table></div>';
$completed = ' class="allcompleted"';
if (count($this->data['sparray']) > 0) {
......@@ -181,14 +182,26 @@ function sendResponse() {
?>
<p id="confirmation" style="margin-top: 1em" ><?php echo $this->t('{logout:logout_all_question}'); ?> <br />
<div 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>
<p id="incapablesps" >
<?php echo($this->t('{logout:incapablesps}')); ?>
</p>
</div>
<div id="interrupt" style="margin-top: 1em; border: 1px solid #ccc; padding: 1em; background: #eaeaea" >
<p style="margin: 0px; padding; 0px">
<img src="/<?php echo($this->data['baseurlpath']); ?>resources/icons/timeout.png"
alt="Timeout"
style="float: left; margin: 0px 5px 0px 0px"
/>
<?php echo $this->t('{logout:respond_info}'); ?> <br />
......@@ -196,24 +209,11 @@ function sendResponse() {
</p>
</div>
<div id="incapablesps" style="margin-top: 1em; border: 1px solid #ccc; padding: 1em; background: #eaeaea" >
<p style="margin: 0px; padding; 0px">
<img src="/<?php echo($this->data['baseurlpath']); ?>resources/icons/caution.png"
style="float: left; margin: 0px 5px 0px 0px"
/>
One or more of the services you are logged into <i>do not support logout</i>. To ensure that all your sessions are closed, you are encouraged to <i>close your webbrowser</i>.
</p>
<div class="completedButWarnings">
<input type="button" id="returnanyway" name="ok" value="<?php echo $this->t('{logout:return}'); ?>" />
</div>
</div>
<div id="hiddeniframecontainer" style="margin: 0px; padding: 0px;"></div>
</div>
</div> <!-- requirejavascript -->
<!--
<script type="text/javascript" language="JavaScript">
......
www/resources/icons/bullet16_grey.png 0 → 100644
+ 0
− 0
View file @ a055c633
www/resources/icons/bullet16_grey.png

279 B

www/resources/icons/checkmark48.png 0 → 100644
+ 0
− 0
View file @ a055c633
www/resources/icons/checkmark48.png

1.77 KiB

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