Skip to content

Commit

Permalink
Merge branch 'develop' into feature/ssp2-nag-twig
Browse files Browse the repository at this point in the history
  • Loading branch information
@briskt
briskt committed Jun 28, 2024
2 parents 1feb51c + e964970 commit 9116f33
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 66 deletions.
1 change: 1 addition & 0 deletions features/bootstrap/MfaContext.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,7 @@ public function iShouldSeeAPromptForAManagerRescueCode()
$pageHtml = $page->getHtml();
Assert::assertContains('Ask Your Recovery Contact for Help', $pageHtml);
Assert::assertContains('Enter code', $pageHtml);
Assert::assertContains('m*****r@e******.c**', $pageHtml);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions modules/material/themes/material/default/header.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

{% if not (analyticsTrackingId ?? null) is empty %}
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id={{ trackingId }}"></script>
<script async src="https://www.googletagmanager.com/gtag/js?id={{ analyticsTrackingId }}"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '{{ trackingId }}');
gtag('config', '{{ analyticsTrackingId }}');
</script>
{% endif %}

Expand Down
18 changes: 9 additions & 9 deletions modules/material/themes/material/default/selectidp-links.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
const idpInput = document.createElement('input');
idpInput.type = 'hidden';
idpInput.name = '{{ returnIDParam|e }}';
idpInput.name = '{{ returnIDParam|e('js')|raw }}';
idpInput.value = id;
document.querySelector('form').appendChild(idpInput);
Expand Down Expand Up @@ -39,7 +39,7 @@

{% if not helpCenterUrl ?? '' is empty %}
<nav class="mdl-navigation">
<a href="{{ helpCenterUrl }}" target="_blank" rel="noopener" class="mdl-navigation__link">
<a href="{{ helpCenterUrl|e(html_attr) }}" target="_blank" rel="noopener" class="mdl-navigation__link">
{{ '{selectidp-links:help}'|trans }}
</a>
</nav>
Expand All @@ -51,9 +51,9 @@
{% include 'announcement.twig' %}

<form layout-children="row" child-spacing="space-around">
<input type="hidden" name="entityID" value="{{ entityID|e }}"/>
<input type="hidden" name="return" value="{{ return|e }}"/>
<input type="hidden" name="returnIDParam" value="{{ returnIDParam|e }}"/>
<input type="hidden" name="entityID" value="{{ entityID|e('html_attr') }}"/>
<input type="hidden" name="return" value="{{ return|e('html_attr') }}"/>
<input type="hidden" name="returnIDParam" value="{{ returnIDParam|e('html_attr') }}"/>

{% for idp in idplist %}
<div
Expand All @@ -63,14 +63,14 @@
<div class="mdl-card__media white-bg fixed-height">
<button
class="mdl-button logo-container fill-parent"
onclick="setSelectedIdp('{{ idp.entityid|e }}')"
name="idp_{{ idp.entityid }}"
onclick="setSelectedIdp('{{ idp.entityid|e('js')|raw }}')"
name="idp_{{ idp.entityid|e('html_attr') }}"
>
<div class="image-wrapper">
<img
class="logo"
id="{{ idp.entityid|e }}"
src="{{ idp.iconurl is defined ? idp.iconurl : 'default-logo.png' }}"
id="{{ idp.entityid|e('html_attr') }}"
src="{{ idp.iconurl is defined ? idp.iconurl|e('html_attr') : 'default-logo.png' }}"
>
</div>
</button>
Expand Down
64 changes: 32 additions & 32 deletions modules/material/themes/material/expirychecker/about2expire.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,45 @@
{% include 'header.twig' %}
</head>
<body>
<div class="mdl-layout mdl-layout--fixed-header fill-viewport">
<header class="mdl-layout__header">
<div class="mdl-layout__header-row">
<div class="mdl-layout mdl-layout--fixed-header fill-viewport">
<header class="mdl-layout__header">
<div class="mdl-layout__header-row">
<span class="mdl-layout-title">
{{ '{about2expire:header}'|trans }}
</span>
</div>
</header>
<main class="mdl-layout__content" layout-children="column">
<form layout-children="column">
{% for name, value in formData %}
<input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
{% endfor %}
</div>
</header>
<main class="mdl-layout__content" layout-children="column">
<form layout-children="column">
{% for name, value in formData %}
<input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
{% endfor %}

<p class="mdl-typography--title margin">
{% if daysLeft < 2 %}
{{ '{about2expire:expiring_in_a_day}'|trans }}
{% else %}
{{ '{about2expire:expiring_soon}'|trans({'%daysLeft%': daysLeft}) }}
{% endif %}
</p>
<p class="mdl-typography--title margin">
{% if daysLeft < 2 %}
{{ '{about2expire:expiring_in_a_day}'|trans }}
{% else %}
{{ '{about2expire:expiring_soon}'|trans({'%daysLeft%': daysLeft}) }}
{% endif %}
</p>

<p class="mdl-typography--body-1">
{{ '{about2expire:change_now}'|trans }}
</p>
<p class="mdl-typography--body-1">
{{ '{about2expire:change_now}'|trans }}
</p>

<div class="fill-parent" layout-children="row" child-spacing="space-around">
<button name="continue" class="mdl-button mdl-button--raised">
{{ '{about2expire:button_continue}'|trans }}
</button>
<div class="fill-parent" layout-children="row" child-spacing="space-around">
<button name="continue" type="submit" class="mdl-button mdl-button--raised">
{{ '{about2expire:button_continue}'|trans }}
</button>

<button name="changepwd" class="mdl-button mdl-button--raised mdl-button--primary">
{{ '{about2expire:button_change}'|trans }}
</button>
</div>
</form>
</main>
<button name="changepwd" type="submit" class="mdl-button mdl-button--raised mdl-button--primary">
{{ '{about2expire:button_change}'|trans }}
</button>
</div>
</form>
</main>

{% include 'footer.twig' %}
</div>
{% include 'footer.twig' %}
</div>
</body>
</html>
40 changes: 20 additions & 20 deletions modules/material/themes/material/expirychecker/expired.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@
{% include 'header.twig' %}
</head>
<body>
<div class="mdl-layout mdl-layout--fixed-header fill-viewport">
<header class="mdl-layout__header mdl-color--red">
<div class="mdl-layout__header-row">
<div class="mdl-layout mdl-layout--fixed-header fill-viewport">
<header class="mdl-layout__header mdl-color--red">
<div class="mdl-layout__header-row">
<span class="mdl-layout-title">
{{ '{expired:header}'|trans }}
</span>
</div>
</header>
<main class="mdl-layout__content" layout-children="column">
<form layout-children="column">
{% for name, value in formData %}
<input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
{% endfor %}
</div>
</header>
<main class="mdl-layout__content" layout-children="column">
<form layout-children="column">
{% for name, value in formData %}
<input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
{% endfor %}

<p class="mdl-typography--title margin">
{{ '{expired:expired}'|trans }}
</p>
<p class="mdl-typography--title margin">
{{ '{expired:expired}'|trans }}
</p>

<button name="changepwd" class="mdl-button mdl-button--raised mdl-button--primary">
{{ '{expired:button_change}'|trans }}
</button>
</form>
</main>
<button name="changepwd" type="submit" class="mdl-button mdl-button--raised mdl-button--primary">
{{ '{expired:button_change}'|trans }}
</button>
</form>
</main>

{% include 'footer.twig' %}
</div>
{% include 'footer.twig' %}
</div>
</body>
</html>
4 changes: 2 additions & 2 deletions modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<div class="mdl-card__title center">
<p class="mdl-card__subtitle-text">
{{ '{mfa:manager_sent}'|trans({'{managerEmail': managerEmail}) }}
{{ '{mfa:manager_sent}'|trans({'%managerEmail%': managerEmail}) }}
</p>
</div>

Expand Down Expand Up @@ -60,7 +60,7 @@

<div class="mdl-card__actions" layout-children="row">
<span flex></span>
<button name="submitMfa" class="mdl-button mdl-button--raised mdl-button--primary">
<button name="submitMfa" type="submit" class="mdl-button mdl-button--raised mdl-button--primary">
{{ '{mfa:button_verify}'|trans }}
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

<div class="mdl-card__actions" layout-children="row">
<span flex></span>
<button name="submitMfa" class="mdl-button mdl-button--raised mdl-button--primary">
<button name="submitMfa" type="submit" class="mdl-button mdl-button--raised mdl-button--primary">
{{ '{mfa:button_verify}'|trans }}
</button>
</div>
Expand Down

0 comments on commit 9116f33

Please sign in to comment.