From abd7c5e7fa70aaec53e8acf7fe6fefd4e5bf68f2 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 18 Oct 2018 18:58:58 +0200
Subject: [PATCH] www: PSR2 + whitespace
---
www/_include.php | 2 +-
www/admin/metadata-converter.php | 1 -
www/assets/css/src/default-rtl.css | 138 ++++-----
www/assets/js/src/language.js | 7 +-
www/assets/js/src/script.js | 47 +--
www/assets/js/src/side_menu.js | 10 +-
www/module.php | 1 -
www/resources/default-rtl.css | 38 +--
www/resources/default.css | 475 ++++++++++++++---------------
www/resources/post.js | 4 +-
www/resources/script.js | 37 +--
www/resources/slo.css | 77 +++--
www/saml2/idp/metadata.php | 6 +-
13 files changed, 420 insertions(+), 423 deletions(-)
diff --git a/www/_include.php b/www/_include.php
index 74eb6b219..1809291af 100644
--- a/www/_include.php
+++ b/www/_include.php
@@ -16,7 +16,7 @@ function SimpleSAML_exception_handler($exception)
} elseif ($exception instanceof \Exception) {
$e = new \SimpleSAML\Error\Error('UNHANDLEDEXCEPTION', $exception);
$e->show();
- } else if (class_exists('Error') && $exception instanceof \Error) {
+ } elseif (class_exists('Error') && $exception instanceof \Error) {
$code = $exception->getCode();
$errno = ($code > 0) ? $code : E_ERROR;
$errstr = $exception->getMessage();
diff --git a/www/admin/metadata-converter.php b/www/admin/metadata-converter.php
index e88dff061..5ce928ac5 100644
--- a/www/admin/metadata-converter.php
+++ b/www/admin/metadata-converter.php
@@ -34,7 +34,6 @@ if (!empty($xmldata)) {
foreach ($output as $type => &$entities) {
$text = '';
foreach ($entities as $entityId => $entityMetadata) {
-
if ($entityMetadata === null) {
continue;
}
diff --git a/www/assets/css/src/default-rtl.css b/www/assets/css/src/default-rtl.css
index abce8dcdf..3df1c9ce8 100644
--- a/www/assets/css/src/default-rtl.css
+++ b/www/assets/css/src/default-rtl.css
@@ -2,173 +2,173 @@
/* THE BIG GUYS */
html {
- direction: rtl;
+ direction: rtl;
}
#header{
- background: linear-gradient(-141deg, #b8002c 0%, #db0100 51%, #e8410c 75%);
+ background: linear-gradient(-141deg, #b8002c 0%, #db0100 51%, #e8410c 75%);
}
#footer{
- background: linear-gradient(-141deg, #b8002c 0%, #db0100 51%, #e8410c 75%);
+ background: linear-gradient(-141deg, #b8002c 0%, #db0100 51%, #e8410c 75%);
}
/* LISTS */
ul {
- margin: .3em 2em 1.5em 0;
+ margin: .3em 2em 1.5em 0;
}
li {
- margin-right: 2em;
+ margin-right: 2em;
}
/* TYPOGRAPHY */
dl dd {
- margin-right: 3em;
+ margin-right: 3em;
}
.efieldlist {
- border-right: 1px solid #e6e6e6;
+ border-right: 1px solid #e6e6e6;
}
div.caution {
- padding: .2em 60px .2em .2em;
- background-position: right;
+ padding: .2em 60px .2em .2em;
+ background-position: right;
}
th.rowtitle {
- text-align: right;
+ text-align: right;
}
.enablebox table {
- margin-right: 1em;
+ margin-right: 1em;
}
.enablebox.mini table {
- float: left;
+ float: left;
}
.enablebox tr td {
- padding: .5px .5em 1px 1em;
+ padding: .5px .5em 1px 1em;
}
/* Attribute presentation in example page */
table.attributes td.attrname {
- text-align: left;
+ text-align: left;
}
fieldset.fancyfieldset {
- margin: 2em 0px 1em 1em;
+ margin: 2em 0px 1em 1em;
}
fieldset.fancyfieldset legend {
- margin-right: 2em;
+ margin-right: 2em;
}
/* Reverse Float Left <-> Right */
.right {
- float: left;
+ float: left;
}
.left {
- float: right;
+ float: right;
}
.v-center-right{
- right: 0;
+ right: 0;
}
.logo-footer-right{
- left:0;
- right: auto;
+ left:0;
+ right: auto;
}
.message-box {
- border-left-style: initial;
- border-left-width: 0;
- border-left-color: none;
- border-right-style: solid;
- border-right-width: 0.3125rem;
+ border-left-style: initial;
+ order-left-width: 0;
+ border-left-color: none;
+ border-right-style: solid;
+ border-right-width: 0.3125rem;
}
.message-box.error{
- border-right-color: #cc4b37;
+ border-right-color: #cc4b37;
}
.message-box.success{
- border-right-color: #46cc48;
+ border-right-color: #46cc48;
}
.code-box-title .clipboard-btn {
- right: auto;
- left: 0;
- margin-left: 4px;
- margin-right: auto;
+ right: auto;
+ left: 0;
+ margin-left: 4px;
+ margin-right: auto;
}
/*selectize elements*/
div .item{
- float: right;
+ float: right;
}
.selectize-input{
- padding-right:8px;
+ padding-right:8px;
}
.selectize-input:after{
- transform: translate(-8px, 0);
+ transform: translate(-8px, 0);
}
/*purecss elements*/
.pure-form-aligned .pure-control-group label {
- text-align: left;
- margin: 0 0 0 1em;
+ text-align: left;
+ margin: 0 0 0 1em;
}
@media only screen and (max-width : 480px) {
- .pure-form-aligned .pure-control-group label {
- text-align: right;
- }
+ .pure-form-aligned .pure-control-group label {
+ text-align: right;
+ }
}
.pure-form-aligned .pure-controls {
- margin: 1.5em 11em 0 0;
+ margin: 1.5em 11em 0 0;
}
.pure-form .pure-help-inline,
.pure-form-message-inline {
- padding-left: 0;
- padding-right: 0.3em;
+ padding-left: 0;
+ padding-right: 0.3em;
}
.pure-select{
- float: left;
+ float: left;
}
.pure-table-attributes ul{
- margin:0;
+ margin:0;
}
.pure-table-attributes li{
- margin:0;
+ margin:0;
}
/* language side menu on medium and small screens*/
#layout.active #menu {
- right: initial;
- left: 11em;
+ right: initial;
+ left: 11em;
}
#layout.active .menu-link {
- right: initial;
- left: 11em;
+ right: initial;
+ left: 11em;
}
#menu {
- right: initial;
- margin-right: 0;
- margin-left: -11em; /* "#menu" width */
- left: 0;
+ right: initial;
+ margin-right: 0;
+ margin-left: -11em; /* "#menu" width */
+ left: 0;
}
#menu a {
- padding: 0.6em 0.6em 0.6em 0em;
+ padding: 0.6em 0.6em 0.6em 0em;
}
.menu-link {
- right: initial;
- left: 0; /* "#menu width" */
+ right: initial;
+ left: 0; /* "#menu width" */
}
/* -- Responsive Styles (Media Queries) ------------------------------------- */
@media screen and (max-width: 0em), screen and (min-width: 40em) {
- #layout.active {
- right: auto;
- left: 11em;
- }
- #menuLink.menu-link.active {
- right: auto;
- left: 13em;
- }
- #foot.active {
- margin-right: auto;
- margin-left: 11em;
- }
+ #layout.active {
+ right: auto;
+ left: 11em;
+ }
+ #menuLink.menu-link.active {
+ right: auto;
+ left: 13em;
+ }
+ #foot.active {
+ margin-right: auto;
+ margin-left: 11em;
+ }
}
diff --git a/www/assets/js/src/language.js b/www/assets/js/src/language.js
index 6666a5504..0f4484728 100644
--- a/www/assets/js/src/language.js
+++ b/www/assets/js/src/language.js
@@ -1,7 +1,7 @@
-$(document).ready(function() {
+$(document).ready(function () {
// get available languages
- var languages = $.map($('#language_selector option') ,function(option) {
+ var languages = $.map($('#language_selector option') ,function (option) {
return option.text.toLowerCase();
});
@@ -9,8 +9,7 @@ $(document).ready(function() {
if (-1 !== $.inArray(
$('#language_selector-selectized').prev().text().toLowerCase(),
languages
- )
- ) {
+ )) {
e.currentTarget.submit();
}
});
diff --git a/www/assets/js/src/script.js b/www/assets/js/src/script.js
index 7748abb05..61e710f17 100644
--- a/www/assets/js/src/script.js
+++ b/www/assets/js/src/script.js
@@ -3,11 +3,12 @@
*
* @param id The id of the element which should receive focus.
*/
-function SimpleSAML_focus(id) {
- element = document.getElementById(id);
- if(element != null) {
- element.focus();
- }
+function SimpleSAML_focus(id)
+{
+ element = document.getElementById(id);
+ if (element != null) {
+ element.focus();
+ }
}
@@ -16,13 +17,14 @@ function SimpleSAML_focus(id) {
*
* @param id The id of the element which should be shown.
*/
-function SimpleSAML_show(id) {
- element = document.getElementById(id);
- if (element == null) {
- return;
- }
+function SimpleSAML_show(id)
+{
+ element = document.getElementById(id);
+ if (element == null) {
+ return;
+ }
- element.style.display = 'block';
+ element.style.display = 'block';
}
@@ -31,38 +33,39 @@ function SimpleSAML_show(id) {
*
* @param id The id of the element which should be hidden.
*/
-function SimpleSAML_hide(id) {
- element = document.getElementById(id);
- if (element == null) {
- return;
- }
+function SimpleSAML_hide(id)
+{
+ element = document.getElementById(id);
+ if (element == null) {
+ return;
+ }
- element.style.display = 'none';
+ element.style.display = 'none';
}
// Attach the `fileselect` event to all file inputs on the page
-$(document).on('change', ':file', function() {
+$(document).on('change', ':file', function () {
var input = $(this),
numFiles = input.get(0).files ? input.get(0).files.length : 1,
label = input.val().replace(/\\/g, '/').replace(/.*\//, '');
input.trigger('fileselect', [numFiles, label]);
});
-$(document).ready(function() {
+$(document).ready(function () {
$('.language-menu').selectize();
$('#organization').selectize();
new ClipboardJS('.clipboard-btn');
// Watch for custom `fileselect` event
- $(':file').on('fileselect', function(event, numFiles, label) {
+ $(':file').on('fileselect', function (event, numFiles, label) {
var input = $(this).parents('.pure-button-group').find(':text'),
log = numFiles > 1 ? numFiles + ' files selected' : label;
- if( input.length ) {
+ if (input.length) {
input.val(log);
} else {
- if( log ) {
+ if (log) {
document.getElementById('show-file').innerHTML = log;
}
}
diff --git a/www/assets/js/src/side_menu.js b/www/assets/js/src/side_menu.js
index 4ba1b214b..ef8194643 100644
--- a/www/assets/js/src/side_menu.js
+++ b/www/assets/js/src/side_menu.js
@@ -6,12 +6,13 @@
content = document.getElementById('content');
footer = document.getElementById('foot');
- function toggleClass(element, className) {
+ function toggleClass(element, className)
+ {
var classes = element.className.split(/\s+/),
length = classes.length,
i = 0;
- for(; i < length; i++) {
+ for (; i < length; i++) {
if (classes[i] === className) {
classes.splice(i, 1);
break;
@@ -25,7 +26,8 @@
element.className = classes.join(' ');
}
- function toggleAll(e) {
+ function toggleAll(e)
+ {
var active = 'active';
e.preventDefault();
@@ -39,7 +41,7 @@
toggleAll(e);
};
- content.onclick = function(e) {
+ content.onclick = function (e) {
if (menu.className.indexOf('active') !== -1) {
toggleAll(e);
}
diff --git a/www/module.php b/www/module.php
index c53d595f6..caac395fb 100644
--- a/www/module.php
+++ b/www/module.php
@@ -81,7 +81,6 @@ $moduleDir = SimpleSAML\Module::getModuleDir($module).'/www/';
// check for '.php/' in the path, the presence of which indicates that another php-script should handle the request
for ($phpPos = strpos($url, '.php/'); $phpPos !== false; $phpPos = strpos($url, '.php/', $phpPos + 1)) {
-
$newURL = substr($url, 0, $phpPos + 4);
$param = substr($url, $phpPos + 4);
diff --git a/www/resources/default-rtl.css b/www/resources/default-rtl.css
index 0113f82f1..df092c3d2 100644
--- a/www/resources/default-rtl.css
+++ b/www/resources/default-rtl.css
@@ -2,69 +2,69 @@
/* THE BIG GUYS */
html {
- direction: rtl;
+ direction: rtl;
}
/* LISTS */
ul {
- margin: .3em 2em 1.5em 0;
+ margin: .3em 2em 1.5em 0;
}
li {
- margin-right: 2em;
+ margin-right: 2em;
}
#wrap {
- text-align: right;
+ text-align: right;
}
/* TYPOGRAPHY */
dl dd {
- margin-right: 3em;
+ margin-right: 3em;
}
.efieldlist {
- border-right: 1px solid #e6e6e6;
+ border-right: 1px solid #e6e6e6;
}
div.caution {
- padding: .2em 60px .2em .2em;
- background-position: right;
+ padding: .2em 60px .2em .2em;
+ background-position: right;
}
th.rowtitle {
- text-align: right;
+ text-align: right;
}
.enablebox table {
- margin-right: 1em;
+ margin-right: 1em;
}
.enablebox.mini table {
- float: left;
+ float: left;
}
.enablebox tr td {
- padding: .5px .5em 1px 1em;
+ padding: .5px .5em 1px 1em;
}
/* Attribute presentation in example page */
table.attributes td.attrname {
- text-align: left;
+ text-align: left;
}
fieldset.fancyfieldset {
- margin: 2em 0px 1em 1em;
+ margin: 2em 0px 1em 1em;
}
fieldset.fancyfieldset legend {
- margin-right: 2em;
+ margin-right: 2em;
}
-.ui-tabs .ui-tabs-nav li {
- float: right;
+.ui-tabs .ui-tabs-nav li {
+ float: right;
}
/* Reverse Float Left <-> Right */
.float-r {
- float: left;
+ float: left;
}
.float-l {
- float: right;
+ float: right;
}
diff --git a/www/resources/default.css b/www/resources/default.css
index 3c0371bb5..f033b7716 100644
--- a/www/resources/default.css
+++ b/www/resources/default.css
@@ -2,474 +2,467 @@
/* THE BIG GUYS */
* {
- margin: 0;
- padding: 0;
+ margin: 0;
+ padding: 0;
}
body {
- text-align: center;
- padding: 10px 0;
- background: #1c1c1c;
-/* background-image: url(icons/ssplogo-fish.png);
- background-repeat: no-repeat; */
- color: #333;
- font: 83%/1.5 arial,tahoma,verdana,sans-serif;
+ text-align: center;
+ padding: 10px 0;
+ background: #1c1c1c;
+/* background-image: url(icons/ssplogo-fish.png); */
+/* background-repeat: no-repeat; */
+ color: #333;
+ font: 83%/1.5 arial,tahoma,verdana,sans-serif;
}
.body-embed {
- padding: 0;
- background: #ffffff;
- font: 83%/1.5 arial,tahoma,verdana,sans-serif;
+ padding: 0;
+ background: #ffffff;
+ font: 83%/1.5 arial,tahoma,verdana,sans-serif;
}
img {
- border: none;
- display: block;
+ border: none;
+ display: block;
}
hr {
- margin: 1em 0;
- background: #eee;
- height: 1px;
- color: #eee;
- border: none;
- clear: both;
+ margin: 1em 0;
+ background: #eee;
+ height: 1px;
+ color: #eee;
+ border: none;
+ clear: both;
}
/* LINKS */
a, a:link, a:link, a:link, a:hover {
-
- text-decoration: none;
- color: #777;
- border-bottom: 1px dotted #ccc;
- font-weight: normal;
+ text-decoration: none;
+ color: #777;
+ border-bottom: 1px dotted #ccc;
+ font-weight: normal;
}
-
a:link, a:visited {
- text-decoration: none;
- color: #777;
- border-bottom: 1px dotted #ccc;
- font-weight: normal;
+ text-decoration: none;
+ color: #777;
+ border-bottom: 1px dotted #ccc;
+ font-weight: normal;
}
.ui-tabs-nav a {
- border: none ! important;
- text-decoration: none;
+ border: none ! important;
+ text-decoration: none;
}
a:visited {
- color: #999;
+ color: #999;
}
a:hover, a:active {
- color: #069;
- text-decoration: none;
- color: #333;
- border-bottom: 1px solid #333;
+ color: #069;
+ text-decoration: none;
+ color: #333;
+ border-bottom: 1px solid #333;
}
#header a {
- color: #fff;
- text-decoration: none;
+ color: #fff;
+ text-decoration: none;
}
/* LISTS */
ul {
- margin: .3em 0 1.5em 2em;
+ margin: .3em 0 1.5em 2em;
}
ul.related {
- margin-top: -1em;
+ margin-top: -1em;
}
li {
- margin-left: 2em;
+ margin-left: 2em;
}
dt {
- font-weight: bold;
+ font-weight: bold;
}
#wrap {
- background: #fff;
+ background: #fff;
- border: 1px solid #fff;
- position: relative;
- text-align: left;
+ border: 1px solid #fff;
+ position: relative;
+ text-align: left;
- margin: 20px 75px 2em 75px;
- max-width: 950px;
+ margin: 20px 75px 2em 75px;
+ max-width: 950px;
}
#languagebar {
- padding-left: 10px;
- padding-right: 10px;
+ padding-left: 10px;
+ padding-right: 10px;
}
#languagebar a:link, #languagebar a:visited {
- text-decoration: none;
- color: #777;
- border-bottom: 1px dotted #ccc;
- font-weight: normal;
+ text-decoration: none;
+ color: #777;
+ border-bottom: 1px dotted #ccc;
+ font-weight: normal;
}
#languagebar a:hover {
- text-decoration: none;
- color: #333;
- border-bottom: 1px solid #333;
-
+ text-decoration: none;
+ color: #333;
+ border-bottom: 1px solid #333;
}
#header {
- background: #666 url("header-bkg.png") repeat-x 0 100%;
- margin: 0px;
- padding: 0 0 8px;
+ background: #666 url("header-bkg.png") repeat-x 0 100%;
+ margin: 0px;
+ padding: 0 0 8px;
}
#header h1 {
- color: #fff;
- font-size: 145%;
- padding: 20px 20px 12px;
+ color: #fff;
+ font-size: 145%;
+ padding: 20px 20px 12px;
}
-
#content, #footer {
- padding: 0 20px;
+ padding: 0 20px;
}
/* TYPOGRAPHY */
p, ul, ol {
- margin: 0 0 1.5em;
+ margin: 0 0 1.5em;
}
h1, h2, h3, h4, h5, h6 {
- letter-spacing: -1px;
- font-family: arial,verdana,sans-serif;
- margin: 1.2em 0 .3em;
- color: #000;
- border-bottom: 1px solid #eee;
- padding-bottom: .1em;
+ letter-spacing: -1px;
+ font-family: arial,verdana,sans-serif;
+ margin: 1.2em 0 .3em;
+ color: #000;
+ border-bottom: 1px solid #eee;
+ padding-bottom: .1em;
}
h1 {
- font-size: 196%;
- margin-top: 0;
- border: none;
+ font-size: 196%;
+ margin-top: 0;
+ border: none;
}
h2 {
- font-size: 136%;
+ font-size: 136%;
}
h3 {
- font-size: 126%;
+ font-size: 126%;
}
h4 {
- font-size: 116%;
- font-weight: bold;
+ font-size: 116%;
+ font-weight: bold;
}
h5 {
- font-size: 106%;
+ font-size: 106%;
}
h6 {
- font-size: 96%;
+ font-size: 96%;
}
input {
- border: 1px solid #ddd;
- border-radius: 3px;
- padding: 5px;
- line-height: 1.5em;
+ border: 1px solid #ddd;
+ border-radius: 3px;
+ padding: 5px;
+ line-height: 1.5em;
}
h1 a {
- text-decoration: none;
- border: none ! important;
- color: white;
+ text-decoration: none;
+ border: none ! important;
+ color: white;
}
h1 a:hover {
- border-bottom: 1px dotted #eee;
+ border-bottom: 1px dotted #eee;
}
#content {
- margin-top: 2em;
+ margin-top: 2em;
}
.old {
- text-decoration: line-through;
+ text-decoration: line-through;
}
dl dt {
- color: #333;
+ color: #333;
}
dl dd {
- color: #666;
- margin-left: 3em;
-/* font-family: monospace; */
+ color: #666;
+ margin-left: 3em;
+/* font-family: monospace; */
}
.efieldlist {
- padding: .4em;
- margin: .8em;
- border-top: 1px solid #e6e6e6;
- border-left: 1px solid #e6e6e6;
+ padding: .4em;
+ margin: .8em;
+ border-top: 1px solid #e6e6e6;
+ border-left: 1px solid #e6e6e6;
}
.efieldlist.warning {
- background-color: #922;
- border: 1px solid #333;
- color: white;
+ background-color: #922;
+ border: 1px solid #333;
+ color: white;
}
.efieldlist.warning h5 {
- color: white;
+ color: white;
}
.efieldlist h5 {
- font-weight: bold;
- color: #200;
- margin: .3em;
+ font-weight: bold;
+ color: #200;
+ margin: .3em;
}
.trackidtext {
- border: 1px dashed #aaa;
- background: #eaeaea;
- padding: .6em;
- margin: .4em;
+ border: 1px dashed #aaa;
+ background: #eaeaea;
+ padding: .6em;
+ margin: .4em;
}
.trackidtext .trackid {
- border: 1px solid #ccc;
- background: #eee;
- margin: .4em;
- padding: .4em;
- font-family: monospace;
- font-size: large;
+ border: 1px solid #ccc;
+ background: #eee;
+ margin: .4em;
+ padding: .4em;
+ font-family: monospace;
+ font-size: large;
}
div.caution {
- background-color: #FF9;
- background-image: url('icons/experience/gtk-dialog-warning.48x48.png');
- background-repeat: no-repeat;
- border: thin solid #444;
- padding: .2em .2em .2em 60px;
- margin: 1em 0px 1em 0px;
+ background-color: #FF9;
+ background-image: url('icons/experience/gtk-dialog-warning.48x48.png');
+ background-repeat: no-repeat;
+ border: thin solid #444;
+ padding: .2em .2em .2em 60px;
+ margin: 1em 0px 1em 0px;
}
th.rowtitle {
- text-align: left;
+ text-align: left;
}
.enablebox table {
- border: 1px solid #eee;
-
- margin-left: 1em;
+ border: 1px solid #eee;
+ margin-left: 1em;
}
.enablebox.mini table {
- float: right;
+ float: right;
}
.enablebox tr td {
- padding: .5px 1em 1px .5em;
- margin: 0px;
+ padding: .5px 1em 1px .5em;
+ margin: 0px;
}
.enablebox {
- font-size: 85%;
+ font-size: 85%;
}
.enablebox tr.enabled td {
- background: #eee;
+ background: #eee;
}
.enablebox tr.disabled td {
- background: #ccc;
+ background: #ccc;
}
.metadatabox {
- overflow: scroll;
- border: 1px solid #eee;
- padding: 0.5em;
- border-radius: 3px;
+ overflow: scroll;
+ border: 1px solid #eee;
+ padding: 0.5em;
+ border-radius: 3px;
}
div.preferredidp {
- border: 1px dashed #ccc;
- background: #eee;
- padding: 2px 2em 2px 2em;
+ border: 1px dashed #ccc;
+ background: #eee;
+ padding: 2px 2em 2px 2em;
}
table.modules {
- border-collapse: collapse;
+ border-collapse: collapse;
}
table.modules tr td {
- border-bottom: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
}
table.modules tr.even td {
- background: #f0f0f0;
+ background: #f0f0f0;
}
/* Attribute presentation in example page */
table.attributes {
- width: 100%;
- margin: 0px;
- border: 1px solid #bbb;
- border-collapse: collapse;
+ width: 100%;
+ margin: 0px;
+ border: 1px solid #bbb;
+ border-collapse: collapse;
}
table.attributes td.attrname {
- text-align: right;
+ text-align: right;
}
table.attributes tr.even td {
- background: #eee;
+ background: #eee;
}
table.attributes tr td {
- border-bottom: 1px solid #bbb;
- border-left: 0px;
- border-right: 0px;
- background: #fff;
- padding-top: 5px;
- padding-left: 1em;
- padding-right: 1em;
-
- vertical-align: top;
+ border-bottom: 1px solid #bbb;
+ border-left: 0px;
+ border-right: 0px;
+ background: #fff;
+ padding-top: 5px;
+ padding-left: 1em;
+ padding-right: 1em;
+ vertical-align: top;
}
.attrvalue {
- word-break: break-all;
- word-wrap: break-word;
+ word-break: break-all;
+ word-wrap: break-word;
}
table#table_with_attributes tr:last-child td {
- border-bottom: none;
+ border-bottom: none;
}
fieldset.fancyfieldset {
- margin: 2em 1em 1em 0px;
- border: 1px solid #bbb;
+ margin: 2em 1em 1em 0px;
+ border: 1px solid #bbb;
}
fieldset.fancyfieldset legend {
- margin-left: 2em;
- padding: 3px 2em 3px 2em;
- border: 1px solid #bbb;
+ margin-left: 2em;
+ padding: 3px 2em 3px 2em;
+ border: 1px solid #bbb;
}
div#confirmation input {
- margin-top: .5em;
- margin-bottom: .5em;
+ margin-top: .5em;
+ margin-bottom: .5em;
}
div#confirmation {
- border: 1px solid #aaa;
- background: #eee;
- padding: .6em 1em .1em 1em;
+ border: 1px solid #aaa;
+ background: #eee;
+ padding: .6em 1em .1em 1em;
}
caption {
- display: none;
+ display: none;
}
/* Left-to-Right CSS for RTL (Right to Left Support) */
.float-r {
- float: right;
+ float: right;
}
.float-l {
- float: left;
+ float: left;
}
#mobile_remember_username, #mobile_remember_me {
- display: none;
+ display: none;
}
@media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 480px) {
- #header, #languagebar, #footer, .erroricon, .loginicon, .logintext,
- #regular_remember_username, #regular_remember_me {
- display: none;
- }
- body {
- font-size: 20px;
- }
- #wrap {
- margin: 0;
- }
- h1,h2,h3,h4 {
- font-size: 110%;
- }
-
- #content {
- margin-bottom: 10px;
- padding: 0;
- padding-left: 5px;
- }
- input[type="text"], input[type="password"] {
- height: 1.5em;
- font-size: 1em;
- }
- .youareadmin {
- font-size: 50%;
- }
- #mobilesubmit, #mobile_remember_username, #mobile_remember_me {
- display: table-row;
- }
+ #header, #languagebar, #footer, .erroricon, .loginicon, .logintext,
+ #regular_remember_username, #regular_remember_me {
+ display: none;
+ }
+ body {
+ font-size: 20px;
+ }
+ #wrap {
+ margin: 0;
+ }
+ h1,h2,h3,h4 {
+ font-size: 110%;
+ }
+
+ #content {
+ margin-bottom: 10px;
+ padding: 0;
+ padding-left: 5px;
+ }
+ input[type="text"], input[type="password"] {
+ height: 1.5em;
+ font-size: 1em;
+ }
+ .youareadmin {
+ font-size: 50%;
+ }
+ #mobilesubmit, #mobile_remember_username, #mobile_remember_me {
+ display: table-row;
+ }
}
.btn, .btnaddonright {
- color: #000000;
- border: 1px solid #eee;
- border-radius: 3px;
- background-color: #eee;
- background-image: linear-gradient(#fcfcfc, #eee);
- text-align: center;
- padding: 5px;
- cursor: hand;
+ color: #000000;
+ border: 1px solid #eee;
+ border-radius: 3px;
+ background-color: #eee;
+ background-image: linear-gradient(#fcfcfc, #eee);
+ text-align: center;
+ padding: 5px;
+ cursor: hand;
}
.btn:hover, .btnaddonright:hover {
- border-color: #ccc;
- background-color: #ddd;
- background-image: linear-gradient(#eee, #ddd);
-
+ border-color: #ccc;
+ background-color: #ddd;
+ background-image: linear-gradient(#eee, #ddd);
}
.btn img,
.btnaddonright img {
- max-height: 15px;
- max-width: 15px;
+ max-height: 15px;
+ max-width: 15px;
}
.topright {
- position: absolute;
- right: 2em;
+ position: absolute;
+ right: 2em;
}
.input-group {
- display: table;
+ display: table;
}
.input-group pre {
- background: white;
- position: relative;
- width: 100%;
- vertical-align: middle;
- border: 1px solid #eee;
- padding: 0.5em;
- display: table-cell;
+ background: white;
+ position: relative;
+ width: 100%;
+ vertical-align: middle;
+ border: 1px solid #eee;
+ padding: 0.5em;
+ display: table-cell;
}
.input-group .btnaddonright {
- position: relative;
- display: inline-block;
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 3px;
- border-top-left-radius: 0;
- border-top-right-radius: 3px;
- border-left: none;
+ position: relative;
+ display: inline-block;
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 3px;
+ border-top-left-radius: 0;
+ border-top-right-radius: 3px;
+ border-left: none;
}
.input-group .btnaddonright:hover {
- border-left: 1px solid #ccc;
+ border-left: 1px solid #ccc;
}
.input-group .input-left {
- border-bottom-left-radius: 3px;
- border-bottom-right-radius: 0;
- border-top-left-radius: 3px;
- border-top-right-radius: 0;
+ border-bottom-left-radius: 3px;
+ border-bottom-right-radius: 0;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 0;
}
diff --git a/www/resources/post.js b/www/resources/post.js
index f55173651..043bec733 100644
--- a/www/resources/post.js
+++ b/www/resources/post.js
@@ -2,6 +2,6 @@
* Automatically click the input button to redirect the user to
* the SSO
*/
-window.onload = function(){
+window.onload = function () {
document.getElementById('postLoginSubmitButton').click();
-};
\ No newline at end of file
+};
diff --git a/www/resources/script.js b/www/resources/script.js
index 3adf1b1f8..a195c24cb 100644
--- a/www/resources/script.js
+++ b/www/resources/script.js
@@ -3,11 +3,12 @@
*
* @param id The id of the element which should receive focus.
*/
-function SimpleSAML_focus(id) {
- element = document.getElementById(id);
- if(element != null) {
- element.focus();
- }
+function SimpleSAML_focus(id)
+{
+ element = document.getElementById(id);
+ if (element != null) {
+ element.focus();
+ }
}
@@ -16,13 +17,14 @@ function SimpleSAML_focus(id) {
*
* @param id The id of the element which should be shown.
*/
-function SimpleSAML_show(id) {
- element = document.getElementById(id);
- if (element == null) {
- return;
- }
+function SimpleSAML_show(id)
+{
+ element = document.getElementById(id);
+ if (element == null) {
+ return;
+ }
- element.style.display = 'block';
+ element.style.display = 'block';
}
@@ -31,11 +33,12 @@ function SimpleSAML_show(id) {
*
* @param id The id of the element which should be hidden.
*/
-function SimpleSAML_hide(id) {
- element = document.getElementById(id);
- if (element == null) {
- return;
- }
+function SimpleSAML_hide(id)
+{
+ element = document.getElementById(id);
+ if (element == null) {
+ return;
+ }
- element.style.display = 'none';
+ element.style.display = 'none';
}
diff --git a/www/resources/slo.css b/www/resources/slo.css
index f1ac2fd4d..13946bcba 100644
--- a/www/resources/slo.css
+++ b/www/resources/slo.css
@@ -1,19 +1,18 @@
table#slostatustable {
-/* width: 100%; */
- border-collapse: collapse;
- margin-bottom: 1em;
+/* width: 100%; */
+ border-collapse: collapse;
+ margin-bottom: 1em;
}
table#slostatustable tr td {
-/* border-top: 1px solid #ccc; */
- padding-left: 4px;
- padding-right: 4px;
+/* border-top: 1px solid #ccc; */
+ padding-left: 4px;
+ padding-right: 4px;
}
table#slostatustable tr td.statustext {
- min-width: 5em;
- padding-left: 0px;
+ min-width: 5em;
+ padding-left: 0px;
}
-
table#slostatustable tr td.statustext span { display: none; }
table#slostatustable tr.completed td.statustext span.completed { display: inline; }
table#slostatustable tr.onhold td.statustext span.onhold { display: inline; }
@@ -21,66 +20,62 @@ 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; */
- display: none;
+/* margin: 3px; */
+ display: none;
}
table#slostatustable tr.completed td.icons img.completed { display: inline; }
table#slostatustable tr.onhold td.icons img.onhold { display: inline; }
table#slostatustable tr.inprogress td.icons img.inprogress { display: inline; }
table#slostatustable tr.failed td.icons img.failed { display: inline; }
-
iframe.hiddeniframe {
- display: none;
+ display: none;
}
/* From old CSS
-
-
div.allcompleted#interrupt {
- display: none;
+ display: none;
}
div#interrupt a:link {
- color: #036;
- border-bottom: 1px dotted #036;
- text-decoration: none;
+ color: #036;
+ border-bottom: 1px dotted #036;
+ text-decoration: none;
}
div#interrupt a:hover {
- border-bottom: 1px solid #036;
+ border-bottom: 1px solid #036;
}
div#interrupt {
- display: block;
- border: 3px solid #036;
- background: #39F;
- padding: 1em;
- margin: .2em;
+ display: block;
+ border: 3px solid #036;
+ background: #39F;
+ padding: 1em;
+ margin: .2em;
}
div#iscompleted {
- display: none;
- border: 3px solid #993;
- background: #FF9;
- padding: 1em;
- margin: .2em;
+ display: none;
+ border: 3px solid #993;
+ background: #FF9;
+ padding: 1em;
+ margin: .2em;
}
div.allcompleted#iscompleted {
- display: block ! important;
+ display: block ! important;
}
div.inprogress, div.loggedout {
-
- background: #eee;
- color: #444;
- padding: .2em 1em;
- margin: .2em;
+ background: #eee;
+ color: #444;
+ padding: .2em 1em;
+ margin: .2em;
}
div.inprogress {
- border: 1px dotted #888;
+ border: 1px dotted #888;
}
div.loggedout {
- border: 1px solid #888;
- background: #9f9 ! important ;
+ border: 1px solid #888;
+ background: #9f9 ! important;
}
iframe.hiddeniframe {
- display: none;
+ display: none;
}
- */
+*/
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index a1779bf09..4d2532a75 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -222,7 +222,11 @@ try {
foreach (array_keys($availableCerts) as $availableCert) {
$certdata[$availableCert]['name'] = $availableCert;
$certdata[$availableCert]['url'] = SimpleSAML\Module::getModuleURL('saml/idp/certs.php').'/'.$availableCert;
- $certdata[$availableCert]['comment'] = ($availableCerts[$availableCert]['certFingerprint'][0] === 'afe71c28ef740bc87425be13a2263d37971da1f9' ? 'This is the default certificate. Generate a new certificate if this is a production system.' : '');
+ $certdata[$availableCert]['comment'] = (
+ $availableCerts[$availableCert]['certFingerprint'][0] === 'afe71c28ef740bc87425be13a2263d37971da1f9' ?
+ 'This is the default certificate. Generate a new certificate if this is a production system.' :
+ ''
+ );
}
$t->data['certdata'] = $certdata;
$t->data['header'] = 'saml20-idp'; // TODO: Replace with headerString in 2.0
--
GitLab