Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • perun/perun-proxyidp/v1/simplesamlphp-module-elixir
1 result
Select Git revision
Show changes
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 644 additions and 761 deletions
lib/stats/Templates.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
namespace SimpleSAML\Module\elixir\stats;
......@@ -133,9 +135,12 @@ class Templates
); // indexed from 0
$t->data['tabsAttributes'] = [
'PROXY' => 'id="tab-1" href="' . Module::getModuleURL('elixir/summary.php') . '?lastDays=' . $lastDays . '"',
'IDP' => 'id="tab-2" href="' . Module::getModuleURL('elixir/identityProviders.php') . '?lastDays=' . $lastDays . '"',
'SP' => 'id="tab-3" href="' . Module::getModuleURL('elixir/serviceProviders.php') . '?lastDays=' . $lastDays . '"',
'PROXY' => 'id="tab-1" href="' . Module::getModuleURL('elixir/summary.php') .
'?lastDays=' . $lastDays . '"',
'IDP' => 'id="tab-2" href="' . Module::getModuleURL('elixir/identityProviders.php') .
'?lastDays=' . $lastDays . '"',
'SP' => 'id="tab-3" href="' . Module::getModuleURL('elixir/serviceProviders.php') .
'?lastDays=' . $lastDays . '"',
];
$mode = $config->getMode();
if (Config::MODE_PROXY !== $mode) {
......
lib/stats/Utils.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
namespace SimpleSAML\Module\elixir\stats;
......
package.json deleted 100644 → 0
View file @ fab16ea3
{
"name": "simplesamlphp-module-elixir",
"private": true,
"devDependencies": {
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/git": "^9.0.0",
"semantic-release": "^17.4.2"
}
}
phpcs.xml deleted 100644 → 0
View file @ fab16ea3
<?xml version="1.0"?>
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PSR2" xsi:noNamespaceSchemaLocation="../../../phpcs.xsd">
<description>The PSR-2 coding standard.</description>
<arg name="tab-width" value="4"/>
<!-- 2. General -->
<!-- 2.1 Basic Coding Standard -->
<!-- Include the whole PSR-1 standard -->
<rule ref="PSR1"/>
<!-- 2.2 Files -->
<!-- All PHP files MUST use the Unix LF (linefeed) line ending. -->
<rule ref="Generic.Files.LineEndings">
<properties>
<property name="eolChar" value="\n"/>
</properties>
</rule>
<!-- All PHP files MUST end with a single blank line. -->
<!-- checked by PSR2.Files.EndFileNewline -->
<!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
<!-- checked by PSR2.Files.ClosingTag -->
<!-- 2.3 Lines -->
<!-- The soft limit on line length MUST be 120 characters; automated style checkers MUST warn but MUST NOT error at the soft limit. -->
<rule ref="Generic.Files.LineLength">
<properties>
<property name="lineLimit" value="120"/>
<property name="absoluteLineLimit" value="0"/>
</properties>
</rule>
<!-- There MUST NOT be trailing whitespace at the end of non-blank lines. -->
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
<properties>
<property name="ignoreBlankLines" value="true"/>
</properties>
</rule>
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile">
<severity>0</severity>
</rule>
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EndFile">
<severity>0</severity>
</rule>
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines">
<severity>0</severity>
</rule>
<!-- There MUST NOT be more than one statement per line. -->
<rule ref="Generic.Formatting.DisallowMultipleStatements"/>
<!-- 2.4 Indenting -->
<!-- Code MUST use an indent of 4 spaces, and MUST NOT use tabs for indenting. -->
<rule ref="Generic.WhiteSpace.ScopeIndent">
<properties>
<property name="ignoreIndentationTokens" type="array">
<element value="T_COMMENT"/>
<element value="T_DOC_COMMENT_OPEN_TAG"/>
</property>
</properties>
</rule>
<rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
<!-- 2.5 Keywords and True/False/Null -->
<!-- PHP keywords MUST be in lower case. -->
<rule ref="Generic.PHP.LowerCaseKeyword"/>
<!-- The PHP constants true, false, and null MUST be in lower case. -->
<rule ref="Generic.PHP.LowerCaseConstant"/>
<!-- 3. Namespace and Use Declarations -->
<!-- When present, there MUST be one blank line after the namespace declaration. -->
<!-- checked by PSR2.Namespaces.NamespaceDeclaration -->
<!-- When present, all use declarations MUST go after the namespace declaration.
There MUST be one use keyword per declaration.
There MUST be one blank line after the use block. -->
<!-- checked by PSR2.Namespaces.UseDeclaration -->
<!-- 4. Classes, Properties, and Methods -->
<!-- 4.1. Extends and Implements -->
<!-- The extends and implements keywords MUST be declared on the same line as the class name.
The opening brace for the class go MUST go on its own line; the closing brace for the class MUST go on the next line after the body.
Lists of implements MAY be split across multiple lines, where each subsequent line is indented once. When doing so, the first item in the list MUST be on the next line, and there MUST be only one interface per line. -->
<!-- checked by PSR2.Classes.ClassDeclaration -->
<!-- 4.2. Properties -->
<!-- Visibility MUST be declared on all properties.
The var keyword MUST NOT be used to declare a property.
There MUST NOT be more than one property declared per statement.
Property names SHOULD NOT be prefixed with a single underscore to indicate protected or private visibility. -->
<!-- checked by PSR2.Classes.PropertyDeclaration -->
<!-- 4.3 Methods -->
<!-- Visibility MUST be declared on all methods. -->
<rule ref="Squiz.Scope.MethodScope"/>
<rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
<!-- Method names SHOULD NOT be prefixed with a single underscore to indicate protected or private visibility. -->
<!-- checked by PSR2.Methods.MethodDeclaration -->
<!-- Method names MUST NOT be declared with a space after the method name. The opening brace MUST go on its own line, and the closing brace MUST go on the next line following the body. There MUST NOT be a space after the opening parenthesis, and there MUST NOT be a space before the closing parenthesis. -->
<!-- checked by PSR2.Methods.FunctionClosingBrace -->
<rule ref="Squiz.Functions.FunctionDeclaration"/>
<rule ref="Squiz.Functions.LowercaseFunctionKeywords"/>
<!-- 4.4 Method Arguments -->
<!-- In the argument list, there MUST NOT be a space before each comma, and there MUST be one space after each comma. -->
<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
<properties>
<property name="equalsSpacing" value="1"/>
</properties>
</rule>
<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint">
<severity>0</severity>
</rule>
<!-- Method arguments with default values MUST go at the end of the argument list. -->
<rule ref="PEAR.Functions.ValidDefaultValue"/>
<!-- Argument lists MAY be split across multiple lines, where each subsequent line is indented once. When doing so, the first item in the list MUST be on the next line, and there MUST be only one argument per line. When the argument list is split across multiple lines, the closing parenthesis and opening brace MUST be placed together on their own line with one space between them. -->
<rule ref="Squiz.Functions.MultiLineFunctionDeclaration"/>
<!-- 4.5 abstract, final, and static -->
<!-- When present, the abstract and final declarations MUST precede the visibility declaration.
When present, the static declaration MUST come after the visibility declaration. -->
<!-- checked by PSR2.Methods.MethodDeclaration -->
<!-- 4.6 Method and Function Calls -->
<!-- When making a method or function call, there MUST NOT be a space between the method or function name and the opening parenthesis, there MUST NOT be a space after the opening parenthesis, and there MUST NOT be a space before the closing parenthesis. In the argument list, there MUST NOT be a space before each comma, and there MUST be one space after each comma.
Argument lists MAY be split across multiple lines, where each subsequent line is indented once. When doing so, the first item in the list MUST be on the next line, and there MUST be only one argument per line. -->
<rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
<rule ref="PSR2.Methods.FunctionCallSignature.SpaceAfterCloseBracket">
<severity>0</severity>
</rule>
<rule ref="PSR2.Methods.FunctionCallSignature.OpeningIndent">
<severity>0</severity>
</rule>
<!-- 5. Control Structures -->
<!-- The general style rules for control structures are as follows:
There MUST be one space after the control structure keyword
There MUST NOT be a space after the opening parenthesis
There MUST NOT be a space before the closing parenthesis
There MUST be one space between the closing parenthesis and the opening brace
The structure body MUST be indented once
The closing brace MUST be on the next line after the body -->
<rule ref="Squiz.ControlStructures.ControlSignature"/>
<rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen"/>
<rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose"/>
<rule ref="Squiz.WhiteSpace.ScopeClosingBrace"/>
<rule ref="Squiz.ControlStructures.ForEachLoopDeclaration"/>
<rule ref="Squiz.ControlStructures.ForLoopDeclaration"/>
<rule ref="Squiz.ControlStructures.ForLoopDeclaration.SpacingAfterOpen">
<severity>0</severity>
</rule>
<rule ref="Squiz.ControlStructures.ForLoopDeclaration.SpacingBeforeClose">
<severity>0</severity>
</rule>
<rule ref="Squiz.ControlStructures.LowercaseDeclaration"/>
<!-- checked by PSR2.ControlStructures.ControlStructureSpacing -->
<!-- exclude this message as it is already checked Generic.PHP.LowerCaseKeyword -->
<rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.AsNotLower">
<severity>0</severity>
</rule>
<!-- The body of each structure MUST be enclosed by braces. This standardizes how the structures look, and reduces the likelihood of introducing errors as new lines get added to the body. -->
<rule ref="Generic.ControlStructures.InlineControlStructure"/>
<!-- 5.1. if, elseif, else -->
<!-- The keyword elseif SHOULD be used instead of else if so that all control keywords look like single words. -->
<!-- checked by PSR2.ControlStructures.ElseIfDeclaration -->
<!-- 5.2. switch, case -->
<!-- The case statement MUST be indented once from switch, and the break keyword (or other terminating keyword) MUST be indented at the same level as the case body. There MUST be a comment such as // no break when fall-through is intentional in a non-empty case body. -->
<!-- checked by PSR2.ControlStructures.SwitchDeclaration -->
<!-- 6. Closures -->
<!-- Closures MUST be declared with a space after the function keyword, and a space before and after the use keyword.
The opening brace MUST go on the same line, and the closing brace MUST go on the next line following the body.
There MUST NOT be a space after the opening parenthesis of the argument list or variable list, and there MUST NOT be a space before the closing parenthesis of the argument list or variable list.
In the argument list and variable list, there MUST NOT be a space before each comma, and there MUST be one space after each comma.
Closure arguments with default values MUST go at the end of the argument list.
Argument lists and variable lists MAY be split across multiple lines, where each subsequent line is indented once. When doing so, the first item in the list MUST be on the next line, and there MUST be only one argument or variable per line.
When the ending list (whether or arguments or variables) is split across multiple lines, the closing parenthesis and opening brace MUST be placed together on their own line with one space between them. -->
<!-- checked in Squiz.Functions.MultiLineFunctionDeclaration -->
</ruleset>
renovate.json 0 → 100644
View file @ 1aba6688
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["local>perun-proxy-aai/renovate-config"]
}
themes/elixir/consent/consentform.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
use SimpleSAML\Module\elixir\ConsentHelper;
......@@ -17,7 +19,8 @@ $this->includeAtTemplateBase('includes/header.php');
The service <strong><?php echo $dstName; ?></strong> requires access to your personal data.
<?php
if (false !== $this->data['sppp']) {
echo 'Please, read the <a target="_blank" href="' . $this->data['sppp'] . '">Privacy Policy</a> of the service to learn more about its commitments to protect your data.';
echo 'Please, read the <a target="_blank" href="' . $this->data['sppp']
. '">Privacy Policy</a> of the service to learn more about its commitments to protect your data.';
}
?>
</p>
......@@ -32,7 +35,8 @@ $this->includeAtTemplateBase('includes/header.php');
<div class="section">
<div class="card-header" id="headingOne">
<h5 class="mb-0">
<button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
<button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapseOne"
aria-expanded="true" aria-controls="collapseOne">
User Information
</button>
</h5>
......@@ -44,7 +48,8 @@ $this->includeAtTemplateBase('includes/header.php');
</div>
<div class="card-header" id="headingThree">
<h5 class="mb-0">
<button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapseThree" aria-expanded="true" aria-controls="collapseThree">
<button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapseThree"
aria-expanded="true" aria-controls="collapseThree">
Technical Information
</button>
</h5>
......@@ -66,7 +71,9 @@ $this->includeAtTemplateBase('includes/header.php');
?>
<div class="outro">
<p>For withdrawing consent, contact <a href="mailto:support@aai.lifescience-ri.eu">support@aai.lifescience-ri.eu</a></p>
<p>For withdrawing consent, contact <a href="mailto:support@aai.lifescience-ri.eu">
support@aai.lifescience-ri.eu</a>
</p>
</div>
<div class="footer-buttons">
<div class="remember">
......
themes/elixir/default/includes/footer-full.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
use SimpleSAML\Module;
......@@ -13,7 +15,8 @@ if (!empty($this->data['htmlinject']['htmlContentPost'])) {
</div> <!-- ENDCOL -->
</div> <!-- ENDROW -->
<footer>
<div class="footer offset-1 col-10 offset-sm-1 col-sm-10 offset-md-2 col-md-8 offset-lg-3 col-lg-6 offset-xl-3 col-xl-6">
<div class="footer offset-1 col-10 offset-sm-1 col-sm-10 offset-md-2 col-md-8 offset-lg-3
col-lg-6 offset-xl-3 col-xl-6">
<div class="footer-contact">
<a class="contact-link" href="mailto:support@aai.lifescience-ri.eu">Contact us</a>
</div>
......@@ -26,9 +29,9 @@ if (!empty($this->data['htmlinject']['htmlContentPost'])) {
<script type="text/javascript" src="<?php echo Module::getModuleURL('elixir/res/js/bootstrap.min.js'); ?>"></script>
<script type="text/javascript" src="<?php echo Module::getModuleURL('elixir/res/js/cmservice.js'); ?>"></script>
<?php
if (array_key_exists('scripts', $this->data)) {
echo $this->data['scripts'];
}
if (array_key_exists('scripts', $this->data)) {
echo $this->data['scripts'];
}
?>
</body>
</html>
themes/elixir/default/includes/footer.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
use SimpleSAML\Module;
......@@ -15,7 +17,8 @@ if (!empty($this->data['htmlinject']['htmlContentPost'])) {
</div> <!-- ENDCOL -->
</div> <!-- ENDROW -->
<footer>
<div class="footer offset-1 col-10 offset-sm-1 col-sm-10 offset-md-2 col-md-8 offset-lg-3 col-lg-6 offset-xl-3 col-xl-6">
<div class="footer offset-1 col-10 offset-sm-1 col-sm-10 offset-md-2 col-md-8
offset-lg-3 col-lg-6 offset-xl-3 col-xl-6">
<div class="footer-contact">
<a class="contact-link" href="mailto:support@aai.lifescience-ri.eu">Contact us</a>
</div>
......@@ -28,9 +31,9 @@ if (!empty($this->data['htmlinject']['htmlContentPost'])) {
<script type="text/javascript" src="<?php echo Module::getModuleURL('elixir/res/js/bootstrap.min.js'); ?>"></script>
<script type="text/javascript" src="<?php echo Module::getModuleURL('elixir/res/js/cmservice.js'); ?>"></script>
<?php
if (array_key_exists('scripts', $this->data)) {
echo $this->data['scripts'];
}
if (array_key_exists('scripts', $this->data)) {
echo $this->data['scripts'];
}
?>
</body>
</html>
themes/elixir/default/includes/header-full.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
use SimpleSAML\Module;
......@@ -43,9 +45,12 @@ header('X-Frame-Options: SAMEORIGIN');
<html lang="en">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link href="<?php echo Module::getModuleUrl('elixir/res/css/bootstrap.min.css'); ?>" rel="stylesheet" type="text/css"/>
<link href="<?php echo Module::getModuleUrl('elixir/res/css/eduteams.css'); ?>" rel="stylesheet" type="text/css"/>
<link href="<?php echo Module::getModuleUrl('elixir/res/css/cmservice.css'); ?>" rel="stylesheet" type="text/css"/>
<link href="<?php echo Module::getModuleUrl('elixir/res/css/bootstrap.min.css'); ?>"
rel="stylesheet" type="text/css"/>
<link href="<?php echo Module::getModuleUrl('elixir/res/css/eduteams.css'); ?>"
rel="stylesheet" type="text/css"/>
<link href="<?php echo Module::getModuleUrl('elixir/res/css/cmservice.css'); ?>"
rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="/<?php echo $this->data['baseurlpath']; ?>resources/script.js"></script>
<title><?php echo (array_key_exists('header', $this->data)) ? $this->data['header'] : 'SimpleSAMLphp'; ?></title>
<?php
......@@ -57,7 +62,8 @@ header('X-Frame-Options: SAMEORIGIN');
?>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;
0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
<?php
if (array_key_exists('head', $this->data)) {
echo '<!-- head -->' . $this->data['head'] . '<!-- /head -->';
......@@ -68,14 +74,15 @@ header('X-Frame-Options: SAMEORIGIN');
<div class="row">
<div class="offset-1 col-10 offset-sm-1 col-sm-10 offset-md-2 col-md-8 offset-lg-3 col-lg-6 offset-xl-3 col-xl-6">
<div class="text-center">
<img class="card-img-top" src="<?php echo Module::getModuleURL('elixir/res/img/lsaai_logo.png'); ?>" alt="Life Science Login logo">
<img class="card-img-top" src="<?php echo Module::getModuleURL('elixir/res/img/lsaai_logo.png'); ?>"
alt="Life Science Login logo">
<div class="card-body">
<?php
if (isset($this->data['header'])) {
echo '<h1>' . PHP_EOL;
echo $this->data['header'];
echo '</h1>' . PHP_EOL;
}
if (isset($this->data['header'])) {
echo '<h1>' . PHP_EOL;
echo $this->data['header'];
echo '</h1>' . PHP_EOL;
}
?>
</div>
</div>
......
themes/elixir/default/includes/header.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
use SimpleSAML\Module;
......@@ -43,11 +45,16 @@ header('X-Frame-Options: SAMEORIGIN');
<html lang="en">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link href="<?php echo Module::getModuleUrl('elixir/res/css/bootstrap.min.css'); ?>" rel="stylesheet" type="text/css"/>
<link href="<?php echo Module::getModuleUrl('elixir/res/css/eduteams.css'); ?>" rel="stylesheet" type="text/css"/>
<link href="<?php echo Module::getModuleUrl('elixir/res/css/cmservice.css'); ?>" rel="stylesheet" type="text/css"/>
<link href="<?php echo Module::getModuleUrl('elixir/res/css/bootstrap.min.css'); ?>"
rel="stylesheet" type="text/css"/>
<link href="<?php echo Module::getModuleUrl('elixir/res/css/eduteams.css'); ?>"
rel="stylesheet" type="text/css"/>
<link href="<?php echo Module::getModuleUrl('elixir/res/css/cmservice.css'); ?>"
rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="/<?php echo $this->data['baseurlpath']; ?>resources/script.js"></script>
<title><?php echo (array_key_exists('header', $this->data)) ? $this->data['header'] : 'SimpleSAMLphp'; ?></title>
<title>
<?php echo (array_key_exists('header', $this->data)) ? $this->data['header'] : 'SimpleSAMLphp'; ?>
</title>
<?php
if (!empty($this->data['htmlinject']['htmlContentHead'])) {
foreach ($this->data['htmlinject']['htmlContentHead'] as $c) {
......@@ -57,7 +64,8 @@ header('X-Frame-Options: SAMEORIGIN');
?>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;
0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
<?php
if (array_key_exists('head', $this->data)) {
echo '<!-- head -->' . $this->data['head'] . '<!-- /head -->';
......@@ -68,7 +76,8 @@ header('X-Frame-Options: SAMEORIGIN');
<div class="row">
<div class="offset-1 col-10 offset-sm-1 col-sm-10 offset-md-2 col-md-8 offset-lg-3 col-lg-6 offset-xl-3 col-xl-6">
<div class="card">
<img class="card-img-top" src="<?php echo Module::getModuleURL('elixir/res/img/lsaai_logo.png'); ?>" alt="Life Science Login logo">
<img class="card-img-top" src="<?php echo Module::getModuleURL('elixir/res/img/lsaai_logo.png'); ?>"
alt="Life Science Login logo">
<div class="card-body">
<?php
if (isset($this->data['header'])) {
......
themes/elixir/elixir/disco-tpl.php
View file @ 1aba6688
......@@ -15,46 +15,44 @@ if (isset($_POST['accepted'])) {
$idpEntityId = null;
$authContextClassRef = null;
$warningAttributes = $this->data[Disco::WARNING_ATTRIBUTES];
$continueUrl = $this->data[Disco::CONTINUE_URL];
$warningConfiguration = $this->data[Disco::WARNING] ?? null;
$preventUserContinue = WarningConfiguration::WARNING_TYPE_ERROR === $warningAttributes->getType();
if (!$warningAttributes->isEnabled() || ($warningAccepted && !$preventUserContinue)) {
if (empty($warningConfiguration) || ! $warningConfiguration->isEnabled()) {
HTTP::redirectTrustedURL($continueUrl);
}
if ($warningAttributes->isEnabled()) {
$this->data['header'] = $this->t('{perun:disco:warning}');
$preventUserContinue = WarningConfiguration::WARNING_TYPE_ERROR === $warningConfiguration->getType();
if (!$preventUserContinue && $warningAccepted) {
HTTP::redirectTrustedURL($continueUrl);
}
$this->data['header'] = $this->t('{elixir:disco:warning_header}');
$this->data['jquery'] = [
'core' => true,
'ui' => true,
'css' => true,
];
$this->includeAtTemplateBase('includes/header.php');
if ($warningAttributes->isEnabled()) {
$this->includeInlineTranslation('{perun:disco:warning_title}', $warningAttributes->getTitle());
$this->includeInlineTranslation('{perun:disco:warning_text}', $warningAttributes->getText());
if (WarningConfiguration::WARNING_TYPE_INFO === $warningAttributes->getType()) {
echo '<div class="alert alert-info">';
} elseif (WarningConfiguration::WARNING_TYPE_WARNING === $warningAttributes->getType()) {
echo '<div class="alert alert-warning">';
} elseif (WarningConfiguration::WARNING_TYPE_ERROR === $warningAttributes->getType()) {
echo '<div class="alert alert-danger">';
}
echo '<h4><strong>' . $this->t('{perun:disco:warning_title}') . '</strong> </h4>';
echo $this->t('{perun:disco:warning_text}');
echo '</div>';
if (!$preventUserContinue) {
echo '<form method="POST">';
echo '<input class="btn btn-lg btn-primary btn-block" type="submit" name="accepted" value="Continue" />';
echo '</form>';
}
} else {
$warningAccepted = true;
$this->includeInlineTranslation('{elixir:disco:warning_title}', $warningConfiguration->getTitle());
$this->includeInlineTranslation('{elixir:disco:warning_text}', $warningConfiguration->getText());
if (WarningConfiguration::WARNING_TYPE_INFO === $warningConfiguration->getType()) {
echo '<div class="alert alert-info">';
} elseif (WarningConfiguration::WARNING_TYPE_WARNING === $warningConfiguration->getType()) {
echo '<div class="alert alert-warning">';
} elseif (WarningConfiguration::WARNING_TYPE_ERROR === $warningConfiguration->getType()) {
echo '<div class="alert alert-danger">';
}
echo '<h4><strong>' . $this->t('{elixir:disco:warning_title}') . '</strong> </h4>';
echo $this->t('{elixir:disco:warning_text}');
echo '</div>';
if (!$preventUserContinue) {
echo '<form method="POST">';
echo '<input class="btn btn-lg btn-primary btn-block" type="submit" name="accepted" value="' .
$this->t('{elixir:disco:warning_continue}') . '" />';
echo '</form>';
}
$this->includeAtTemplateBase('includes/footer.php');
themes/elixir/proxystatistics/detail-tpl.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
use SimpleSAML\Module\elixir\stats\Templates;
......@@ -22,8 +24,12 @@ $this->includeAtTemplateBase('includes/header-full.php');
<div class="row mt-5">
<div class="col-12">
<h3><?php echo $this->t('{proxystatistics:stats:' . $this->data['side'] . 'Detail_dashboard_header}'); ?></h3>
<p><?php echo $this->t('{proxystatistics:stats:' . $this->data['side'] . 'Detail_dashboard_legend}'); ?></p>
<h3>
<?php echo $this->t('{proxystatistics:stats:' . $this->data['side'] . 'Detail_dashboard_header}'); ?>
</h3>
<p>
<?php echo $this->t('{proxystatistics:stats:' . $this->data['side'] . 'Detail_dashboard_legend}'); ?>
</p>
</div>
<div class="col-12">
<?php Templates::loginsDashboard(); ?>
......@@ -32,8 +38,12 @@ $this->includeAtTemplateBase('includes/header-full.php');
<div class="row mt-5 mb-4">
<div class="col-12">
<h3><?php echo $this->t('{proxystatistics:stats:' . $this->data['side'] . 'Detail_graph_header}'); ?></h3>
<p><?php echo $this->t('{proxystatistics:stats:' . $this->data['side'] . 'Detail_graph_legend}'); ?></p>
<h3>
<?php echo $this->t('{proxystatistics:stats:' . $this->data['side'] . 'Detail_graph_header}'); ?>
</h3>
<p>
<?php echo $this->t('{proxystatistics:stats:' . $this->data['side'] . 'Detail_graph_legend}'); ?>
</p>
</div>
<div class="col-12">
<div class="row">
......
themes/elixir/proxystatistics/loginsDashboard-tpl.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
?>
......
themes/elixir/proxystatistics/providers-tpl.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
use SimpleSAML\Module\elixir\stats\Templates;
......
themes/elixir/proxystatistics/summary-tpl.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
use SimpleSAML\Module\elixir\stats\Templates;
use SimpleSAML\Module\proxystatistics\Config;
......
themes/elixir/proxystatistics/timeRange-tpl.php
View file @ 1aba6688
<?php declare(strict_types=1);
<?php
declare(strict_types=1);
?>
<div class="timeRange">
......
www/res/css/cmservice.css
View file @ 1aba6688
/* universal - with new colors vars*/
:root {
--color-blue: #003f5e;
--color-blue: #003f5e;
--color-orange: #f0893b;
--color-white: #ffffff;
--color-red: #dc3545;
--color-red-light: #fef7f1;
--color-orange: #f0893b;
--color-white: #ffffff;
--color-red: #dc3545;
--color-red-light: #fef7f1;
/* add for cm service*/
--color-blue-light: #e0e3ef;
--color-grey: #ddd;
--color-grey-light: #eee;
--color-grey-lighter: #f2f2f2;
/* add for cm service*/
/* add for cm service*/
--color-blue-light: #e0e3ef;
--color-grey: #ddd;
--color-grey-light: #eee;
--color-grey-lighter: #f2f2f2;
/* add for cm service*/
}
html {
background: var(--color-white);
background: var(--color-white);
}
body {
background: var(--color-white);
font-family: "Roboto", sans-serif; /*added*/
background: var(--color-white);
font-family: "Roboto", sans-serif; /*added*/
}
a:not([class~="btn"]):link,
a:not([class~="btn"]):hover,
a:not([class~="btn"]):focus,
a:not([class~="btn"]):visited {
color: var(--color-orange);
outline: none;
color: var(--color-orange);
outline: none;
}
a:focus {
text-decoration:underline;
text-decoration: underline;
}
.card {
box-shadow: 0rem 1rem 3rem 0.5rem rgba(0, 0, 0, 0.15);
margin-bottom: 5rem;
max-width: 970px;
margin-left: auto;
margin-right: auto;
box-shadow: 0rem 1rem 3rem 0.5rem rgba(0, 0, 0, 0.15);
margin-bottom: 5rem;
max-width: 970px;
margin-left: auto;
margin-right: auto;
}
footer {
background-color: var(--color-blue);
color: var(--color-white);
font-size: 0.9rem;
font-family: "Roboto", sans-serif;
padding: 0.5rem;
background-color: var(--color-blue);
color: var(--color-white);
font-size: 0.9rem;
font-family: "Roboto", sans-serif;
padding: 0.5rem;
}
.footer {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: baseline;
flex-wrap: wrap;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: baseline;
flex-wrap: wrap;
}
.footer-policy {
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: baseline;
flex-wrap: wrap;
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: baseline;
flex-wrap: wrap;
}
.footer-policy img {
width: auto;
height: 2rem;
margin-left: 0.5rem;
margin-right: 0.5rem;
width: auto;
height: 2rem;
margin-left: 0.5rem;
margin-right: 0.5rem;
}
.footer-policy-img {
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: baseline;
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: baseline;
}
.footer-policy-img p {
white-space: nowrap;
white-space: nowrap;
}
.footer-policy-link {
margin-left: 0.5rem;
margin-left: 0.5rem;
}
.contact-link {
font-weight: bold;
font-weight: bold;
}
/*universal*/
......@@ -99,212 +99,212 @@ footer {
/*cm service main content*/
.attribute-row {
display: flex;
flex-direction: row;
display: flex;
flex-direction: row;
}
.attribute-row code {
color: var(--color-blue);
color: var(--color-blue);
}
.attribute-name p {
font-size: 0.9rem;
font-weight: bold;
word-break: break-all;
font-size: 0.9rem;
font-weight: bold;
word-break: break-all;
}
.attribute {
display: flex;
flex-direction: column;
flex: 0 0 12rem;
margin-right: 1rem;
display: flex;
flex-direction: column;
flex: 0 0 12rem;
margin-right: 1rem;
}
.attribute-choose {
margin-bottom: 8px;
margin-bottom: 8px;
}
.attribute-values {
display: flex;
flex-direction: column;
flex: 0 1 auto;
overflow-x: auto;
/* break down string at any place */
/*word-break: break-all;*/
/* preserve string in one scrollable line */
white-space: nowrap;
display: flex;
flex-direction: column;
flex: 0 1 auto;
overflow-x: auto;
/* break down string at any place */
/*word-break: break-all;*/
/* preserve string in one scrollable line */
white-space: nowrap;
}
.aas-message,
form > #accordion,
form > .footer-buttons,
form > .alert {
margin-bottom: 2rem;
margin-top: 2rem;
margin-bottom: 2rem;
margin-top: 2rem;
}
form #accordion p {
margin-bottom: 0px;
margin-bottom: 0px;
}
form .footer-buttons {
display: flex;
flex-direction: row;
align-items: baseline;
display: flex;
flex-direction: row;
align-items: baseline;
}
form .remember,
form .consent-button {
display: flex;
flex-direction: row;
align-items: baseline;
display: flex;
flex-direction: row;
align-items: baseline;
}
form .consent-button {
margin-left: auto;
margin-left: auto;
}
form .consent-button #abort {
margin-right: 10px;
margin-right: 10px;
}
form #submit {
background-color: var(--color-blue);
border: 0;
background-color: var(--color-blue);
border: 0;
}
form #submit:not([disabled]):hover {
background-color: var(--color-orange);
border: 0;
background-color: var(--color-orange);
border: 0;
}
form .alert label,
form .remember label {
font-size: 0.9rem;
font-size: 0.9rem;
}
form .remember label {
color: var(--color-blue);
margin-right: 10px;
color: var(--color-blue);
margin-right: 10px;
}
form .remember select.amount,
form .remember select.amount:focus,
form .remember select.amount:active {
color: var(--color-blue);
background-color: var(--color-blue-light);
border: 0;
box-shadow: none;
color: var(--color-blue);
background-color: var(--color-blue-light);
border: 0;
box-shadow: none;
}
/*cm service main content*/
.footer-contact {
margin-top: 1rem;
margin-bottom: 1rem;
margin-top: 1rem;
margin-bottom: 1rem;
}
@media (max-width: 1150px) {
.footer {
padding-top: 0.5rem;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
}
.footer-contact {
text-align: center;
margin-bottom: 0.8rem;
}
.footer {
padding-top: 0.5rem;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
}
.footer-contact {
text-align: center;
margin-bottom: 0.8rem;
}
}
@media (min-width: 992px) and (max-width: 1150px) {
.attribute-row {
flex-direction: column;
flex: 0 0 auto;
}
.attribute-row {
flex-direction: column;
flex: 0 0 auto;
}
.attribute {
display: flex;
flex-direction: column;
flex: 0 0 auto;
margin-right: 0;
}
.attribute {
display: flex;
flex-direction: column;
flex: 0 0 auto;
margin-right: 0;
}
.attribute-values {
margin-top: 0.5rem;
}
.attribute-values {
margin-top: 0.5rem;
}
}
@media (max-width: 767px) {
.attribute-row {
flex-direction: column;
flex: 0 0 auto;
}
.attribute-row {
flex-direction: column;
flex: 0 0 auto;
}
.attribute {
display: flex;
flex-direction: column;
flex: 0 0 auto;
margin-right: 0;
}
.attribute {
display: flex;
flex-direction: column;
flex: 0 0 auto;
margin-right: 0;
}
}
@media (max-width: 576px) {
.footer-contact {
text-align: center;
margin-bottom: 0.8rem;
}
/*add for cm service*/
form .footer-buttons {
flex-direction: column;
}
/* # XXX */
.consent-button {
margin-left: 0;
}
.consent-input {
padding-top: 0.5rem;
padding-bottom: 0.5rem;
} /*add for cm service*/
.footer-contact {
text-align: center;
margin-bottom: 0.8rem;
}
/*add for cm service*/
form .footer-buttons {
flex-direction: column;
}
/* # XXX */
.consent-button {
margin-left: 0;
}
.consent-input {
padding-top: 0.5rem;
padding-bottom: 0.5rem;
} /*add for cm service*/
}
.wrap {
width: 100%;
height: 188px;
position: absolute;
overflow: hidden;
color: white;
text-transform: uppercase;
font-weight: bold;
width: 100%;
height: 188px;
position: absolute;
overflow: hidden;
color: white;
text-transform: uppercase;
font-weight: bold;
}
.ribbon {
width: 200px;
height: 40px;
line-height: 40px;
position: absolute;
top: 30px;
right: -50px;
z-index: 2;
overflow: hidden;
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
box-shadow: 0 0 0 3px #eb3814, 0px 21px 5px -18px rgba(0,0,0,0.6);
background: #eb3814;
text-align: center;
width: 200px;
height: 40px;
line-height: 40px;
position: absolute;
top: 30px;
right: -50px;
z-index: 2;
overflow: hidden;
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
box-shadow: 0 0 0 3px #eb3814, 0px 21px 5px -18px rgba(0, 0, 0, 0.6);
background: #eb3814;
text-align: center;
}
@media (max-width: 350px) {
.footer-policy {
display: flex;
flex-direction: column;
justify-content: flex-end;
align-items: center;
}
.line {
display: none;
}
/*add for cm service*/
form .footer-buttons .remember {
flex-direction: column;
} /*add for cm service*/
.footer-policy {
display: flex;
flex-direction: column;
justify-content: flex-end;
align-items: center;
}
.line {
display: none;
}
/*add for cm service*/
form .footer-buttons .remember {
flex-direction: column;
} /*add for cm service*/
}
www/res/css/eduteams.css
View file @ 1aba6688
This diff is collapsed.
www/res/css/elixir.css
View file @ 1aba6688
body {
}
.ui-widget-content {
border: 0px solid #ddd;
border: 0px solid #ddd;
}
#header {
background: transparent;
background: transparent;
}
#header h1 {
line-height: 32px;
font-size: 28px;
color: #222;
line-height: 32px;
font-size: 28px;
color: #222;
}
#header img {
width: 170px;
margin: -16px auto 0 auto;
width: 170px;
margin: -16px auto 0 auto;
}
#wrap {
margin: 2em auto;
max-width: 720px;
margin: 2em auto;
max-width: 720px;
}
#content {
margin-top: 0px;
margin-top: 0px;
}
.btn:hover {
background-image: none;
background-image: none;
}
.ui-widget-header {
border-width: 0px;
border-bottom: 1px solid #ddd;
background: transparent;
border-width: 0px;
border-bottom: 1px solid #ddd;
background: transparent;
}
.ui-widget-header .ui-state-default {
border: 0px;
background: #fff;
color: #337ab7;
border: 0px;
background: #fff;
color: #337ab7;
}
.ui-widget-header .ui-state-default:hover {
background: #eee;
color: #23527c;
background: #eee;
color: #23527c;
}
.ui-widget-header .ui-state-active {
border: 1px solid #ddd;
border: 1px solid #ddd;
}
.ui-widget-header .ui-state-active:hover {
background: #fff;
background: #fff;
}
hr {
border-top: 1px solid #ddd;
border-top: 1px solid #ddd;
}
#footer {
margin-top: 64px;
border-top: 1px solid #ddd;
text-align: left;
padding: 16px;
margin-top: 64px;
border-top: 1px solid #ddd;
text-align: left;
padding: 16px;
}
#footer img {
margin: 0px 16px;
margin: 0px 16px;
}
www/res/css/stats.css
View file @ 1aba6688
#loginsDashboard {
height: 500px;
height: 500px;
}
#dateSelector label{
font-weight: normal;
#dateSelector label {
font-weight: normal;
}
.legend-container, .canvas-container, .table-container {
height: 90vh;
max-height: 500px;
width: 100%;
.legend-container,
.canvas-container,
.table-container {
height: 90vh;
max-height: 500px;
width: 100%;
}
.hidden {
display: none;
display: none;
}
.pie-chart-container .legend-container, .table-container {
overflow-y: auto;
.pie-chart-container .legend-container,
.table-container {
overflow-y: auto;
}
.chart-legend .item {
display: inline-block;
text-indent: -2.5em;
margin-left: 2.5em;
display: inline-block;
text-indent: -2.5em;
margin-left: 2.5em;
}
.chart-legend li .item:before {
content: '';
display: inline-block;
width: 2em;
height: 0.7em;
margin-right: 0.5em;
}
.chart-legend li:nth-child(20n+1) .item:before { background-color: #3366CC; }
.chart-legend li:nth-child(20n+2) .item:before { background-color: #DC3912; }
.chart-legend li:nth-child(20n+3) .item:before { background-color: #FF9900; }
.chart-legend li:nth-child(20n+4) .item:before { background-color: #109618; }
.chart-legend li:nth-child(20n+5) .item:before { background-color: #990099; }
.chart-legend li:nth-child(20n+6) .item:before { background-color: #3B3EAC; }
.chart-legend li:nth-child(20n+7) .item:before { background-color: #0099C6; }
.chart-legend li:nth-child(20n+8) .item:before { background-color: #DD4477; }
.chart-legend li:nth-child(20n+9) .item:before { background-color: #66AA00; }
.chart-legend li:nth-child(20n+10) .item:before { background-color: #B82E2E; }
.chart-legend li:nth-child(20n+11) .item:before { background-color: #316395; }
.chart-legend li:nth-child(20n+12) .item:before { background-color: #994499; }
.chart-legend li:nth-child(20n+13) .item:before { background-color: #22AA99; }
.chart-legend li:nth-child(20n+14) .item:before { background-color: #AAAA11; }
.chart-legend li:nth-child(20n+15) .item:before { background-color: #6633CC; }
.chart-legend li:nth-child(20n+16) .item:before { background-color: #E67300; }
.chart-legend li:nth-child(20n+17) .item:before { background-color: #8B0707; }
.chart-legend li:nth-child(20n+18) .item:before { background-color: #329262; }
.chart-legend li:nth-child(20n+19) .item:before { background-color: #5574A6; }
.chart-legend li:nth-child(20n) .item:before { background-color: #3B3EAC; }
.chart-legend li.other .item:before { background-color: #DDDDDD; }
content: "";
display: inline-block;
width: 2em;
height: 0.7em;
margin-right: 0.5em;
}
.chart-legend li:nth-child(20n + 1) .item:before {
background-color: #3366cc;
}
.chart-legend li:nth-child(20n + 2) .item:before {
background-color: #dc3912;
}
.chart-legend li:nth-child(20n + 3) .item:before {
background-color: #ff9900;
}
.chart-legend li:nth-child(20n + 4) .item:before {
background-color: #109618;
}
.chart-legend li:nth-child(20n + 5) .item:before {
background-color: #990099;
}
.chart-legend li:nth-child(20n + 6) .item:before {
background-color: #3b3eac;
}
.chart-legend li:nth-child(20n + 7) .item:before {
background-color: #0099c6;
}
.chart-legend li:nth-child(20n + 8) .item:before {
background-color: #dd4477;
}
.chart-legend li:nth-child(20n + 9) .item:before {
background-color: #66aa00;
}
.chart-legend li:nth-child(20n + 10) .item:before {
background-color: #b82e2e;
}
.chart-legend li:nth-child(20n + 11) .item:before {
background-color: #316395;
}
.chart-legend li:nth-child(20n + 12) .item:before {
background-color: #994499;
}
.chart-legend li:nth-child(20n + 13) .item:before {
background-color: #22aa99;
}
.chart-legend li:nth-child(20n + 14) .item:before {
background-color: #aaaa11;
}
.chart-legend li:nth-child(20n + 15) .item:before {
background-color: #6633cc;
}
.chart-legend li:nth-child(20n + 16) .item:before {
background-color: #e67300;
}
.chart-legend li:nth-child(20n + 17) .item:before {
background-color: #8b0707;
}
.chart-legend li:nth-child(20n + 18) .item:before {
background-color: #329262;
}
.chart-legend li:nth-child(20n + 19) .item:before {
background-color: #5574a6;
}
.chart-legend li:nth-child(20n) .item:before {
background-color: #3b3eac;
}
.chart-legend li.other .item:before {
background-color: #dddddd;
}
.legend-container ul, .legend-container li {
list-style-type: none;
.legend-container ul,
.legend-container li {
list-style-type: none;
}
.table-container.scrolling th {
background-color: white;
box-shadow: 0 4px 5px -5px #666;
background-color: white;
box-shadow: 0 4px 5px -5px #666;
}
.table-container a, .chart-legend a {
border: 0;
.table-container a,
.chart-legend a {
border: 0;
}
.table-container a:not(:hover):not(:focus):not(:active),
.chart-legend a:not(:hover):not(:focus):not(:active) {
text-decoration: none;
text-decoration: none;
}