Skip to content

Commit 0c30160

Browse files
author
Boy Baukema
committed
Merge pull request #197 from OpenConext/develop
EB 4.6.2
2 parents bb2d9a5 + 7addda0 commit 0c30160

File tree

23 files changed

+146
-125
lines changed

23 files changed

+146
-125
lines changed

‎application/layouts/scripts/default.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<?php endif; ?>
9898
</ul>
9999
</div>
100-
<a class="burger" href="#footer"><img src="/images/burger.svg"></a>
100+
<a class="burger" href="#footer"><img src="/images/burger.svg" alt="&#9776;"></a>
101101
</div>
102102

103103
<div class="l-container<?php if ($this->layout()->wide === true):?> wide<?php endif; ?>">

‎application/modules/Api/View/Index/Index.phtml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?php /* This file is generated. Please edit the files of the appropriate theme in the 'theme/' directory. */ ?>
12
<?php
23
/** @var Zend_Layout $layout */
34
$layout = $this->layout();

‎application/modules/Authentication/View/Proxy/consent.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ $inlineScriptHelper->appendScript('
7979
<div class="box">
8080
<div class="mod-content">
8181
<header>
82-
<img src="/images/user.svg" alt="user">
82+
<img src="/images/user.svg" alt="user" />
8383
<h1><?= $this->t('consent_header_info'); ?></h1>
8484
</header>
8585

‎application/modules/Authentication/View/Proxy/debugidpresponse.phtml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ $validationResult = EngineBlock_ApplicationSingleton::getInstance()
3232
<?php if (isset($_POST['mail']) && $_POST['mail'] === 'true'):?>
3333
<table class="comp-table">
3434
<tr>
35-
<td><img src="/images/checkmark.svg" class="c-icon c-icon-checkmark" /><?= $this->t('attributes_data_mailed'); ?></td>
35+
<td><img src="/images/checkmark.svg" class="c-icon c-icon-checkmark" alt="&#9989;" /><?= $this->t('attributes_data_mailed'); ?></td>
3636
</tr>
3737
</table>
3838
<?php endif; ?>
3939

4040
<h1><?php echo $this->t('idp_debugging_title'); ?></h1>
4141
<p>
4242
<?php if ($validationResult->isValid()) : ?>
43-
<img src="/images/checkmark.svg" class="c-icon c-icon-checkmark" />
43+
<img src="/images/checkmark.svg" class="c-icon c-icon-checkmark" alt="&#9989;" />
4444
<?= $this->t('attributes_validation_succeeded'); ?>
4545
<?php else: ?>
4646
<?php if (count($validationResult->getErrors()) > 0): ?>
47-
<img src="/images/warning.svg" class="c-icon c-icon-warning" />
47+
<img src="/images/warning.svg" class="c-icon c-icon-warning" alt="&#9888;" />
4848
<?php else: ?>
49-
<img src="/images/warning.svg" class="c-icon c-icon-warning" />
49+
<img src="/images/warning.svg" class="c-icon c-icon-warning" alt="&#9888;" />
5050
<?php endif; ?>
5151

5252
<?= $this->t('attributes_validation_failed'); ?>
@@ -66,7 +66,7 @@ $validationResult = EngineBlock_ApplicationSingleton::getInstance()
6666
Logo
6767
</th>
6868
<td>
69-
<img class="logo" src="<?= $idp->logo ? $idp->logo->url : '/images/placeholder.png' ?>" />
69+
<img class="logo" src="<?= $idp->logo ? $idp->logo->url : '/images/placeholder.png' ?>" alt="IdP logo" />
7070
</td>
7171
</tr>
7272
<tr>
@@ -112,13 +112,13 @@ $validationResult = EngineBlock_ApplicationSingleton::getInstance()
112112
<h2><?= $this->t('attributes') ?></h2>
113113
<?php foreach ($validationResult->getErrorsForMissingAttributes() as $error): ?>
114114
<p class="error">
115-
<img src="/images/warning.svg" class="c-icon c-icon-warning" /> <?php
115+
<img src="/images/warning.svg" class="c-icon c-icon-warning" alt="&#9888;" /> <?php
116116
echo EngineBlock_View::htmlSpecialCharsText(call_user_func_array(array($this, 'translate'), $error));
117117
?></p>
118118
<?php endforeach; ?>
119119
<?php foreach ($validationResult->getWarningsForMissingAttributes() as $warning): ?>
120120
<p class="warning">
121-
<img src="/images/warning.svg" class="c-icon c-icon-warning" /> <?php
121+
<img src="/images/warning.svg" class="c-icon c-icon-warning" alt="&#9888;" /> <?php
122122
echo EngineBlock_View::htmlSpecialCharsText(call_user_func_array(array($this, 'translate'), $warning));
123123
?></p>
124124
<?php endforeach; ?>
@@ -162,17 +162,17 @@ $validationResult = EngineBlock_ApplicationSingleton::getInstance()
162162
</td>
163163
<td>
164164
<?php if ($validationResult->isValid($attributeName)): ?>
165-
<img src="/images/checkmark.svg" class="c-icon c-icon-checkmark" />
165+
<img src="/images/checkmark.svg" class="c-icon c-icon-checkmark" alt="&#9989;" />
166166
<?php else:
167167
foreach ($validationResult->getErrors($attributeName) as $error) {
168168
echo '<p class="error">' .
169-
'<img src="/images/warning.svg" class="c-icon c-icon-warning" /> ' .
169+
'<img src="/images/warning.svg" class="c-icon c-icon-warning" alt="&#9888;" /> ' .
170170
EngineBlock_View::htmlSpecialCharsText(call_user_func_array(array($this, 'translate'), $error)) .
171171
'</p>';
172172
}
173173
foreach ($validationResult->getWarnings($attributeName) as $warning) {
174174
echo '<p class="warning">'.
175-
'<img src="/images/warning.svg" class="c-icon c-icon-warning" /> ' .
175+
'<img src="/images/warning.svg" class="c-icon c-icon-warning" alt="&#9888;" /> ' .
176176
EngineBlock_View::htmlSpecialCharsText(call_user_func_array(array($this, 'translate'), $warning)) .
177177
'</p>';
178178
}

‎application/modules/Authentication/View/Proxy/discover.phtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ $layout->assign('helpLink', '/authentication/idp/help-discover?lang=' . $lang);
116116

117117
<div class="loading spinner hidden">
118118
<div class="logo">
119-
<img class="rotate-img" src="/images/spinner.svg">
119+
<img class="rotate-img" src="/images/spinner.svg" alt="" />
120120
</div>
121121
<?=$this->t('loading_idps');?>
122122
</div>
@@ -125,10 +125,10 @@ $layout->assign('helpLink', '/authentication/idp/help-discover?lang=' . $lang);
125125
<?php $idpKeywords = $idp['Keywords'] === 'Undefined' ? array() : array_values((array) $idp['Keywords']) ?>
126126
<a class="result active access" href="#" tabindex="-1" data-idp="<?= EngineBlock_View::htmlSpecialCharsAttributeValue($idp['EntityID']); ?>" data-keywords="<?= EngineBlock_View::htmlSpecialCharsAttributeValue(json_encode($idpKeywords)); ?>">
127127
<div class="logo">
128-
<img class="logo" src="/images/placeholder.png" data-original="<?= $idp['Logo'] ?>" />
128+
<img class="logo" src="/images/placeholder.png" data-original="<?= $idp['Logo'] ?>" alt="" />
129129
</div>
130130
<h3><?= EngineBlock_View::htmlSpecialCharsAttributeValue($idp['Name_' . $lang]); ?></h3>
131-
<button class="c-button white action" data-toggle-text="<img class='deleteable' src='/images/cross.svg'>"><?php echo $this->t('press_enter_to_select'); ?></button>
131+
<span class="c-button white action" data-toggle-text="<img class='deleteable' src='/images/cross.svg' alt='delete' />"><?php echo $this->t('press_enter_to_select'); ?></span>
132132
<noscript>
133133
<button type="submit" class="c-button white" name="idp" value="<?= EngineBlock_View::htmlSpecialCharsAttributeValue($idp['EntityID']); ?>">Login</button>
134134
</noscript>

‎application/modules/Authentication/View/Proxy/form.phtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ $layout->title = $layout->title. ' - '. $this->t('post_data');
3535
</head>
3636
<body class="index" <?php if (!$trace): ?>onload="document.forms[0].submit()"<?php endif; ?>>
3737
<div class="mod-redirect">
38-
<img class="rotate-img" src="/images/spinner.svg" />
38+
<img class="rotate-img" src="/images/spinner.svg" alt="" />
3939
<h1><?= $this->t('processing'); ?></h1>
4040
<p><?= $this->t('processing_waiting'); ?></p>
41-
<p><?= $this->t('processing_long'); ?> <a href="javascript:history.back(-2)"><?= $this->t('go_back'); ?></a>.</p>
41+
<p><?= $this->t('processing_long'); ?></p>
4242
<noscript>
4343
<p>
4444
<strong><?= $this->t('note'); ?>:</strong>

‎application/modules/Profile/View/Index/Index.phtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ foreach ($spList as $spId => $sp) {
8383
<?php if (!empty($_GET['mailSend'])): ?>
8484
<table class="comp-table">
8585
<tr>
86-
<td><img src="/images/checkmark.svg" class="c-icon c-icon-checkmark" /><?= $this->t('attributes_data_mailed'); ?></td>
86+
<td><img src="/images/checkmark.svg" class="c-icon c-icon-checkmark" alt="&#9989;" /><?= $this->t('attributes_data_mailed'); ?></td>
8787
</tr>
8888
</table>
8989
<?php endif ?>
@@ -152,7 +152,7 @@ foreach ($spList as $spId => $sp) {
152152
<tr class="sp-row">
153153
<td>
154154
<a href="#" class="sp-display-name expand">
155-
<img src="/images/triangle.svg" class="c-icon c-icon-triangle">
155+
<img src="/images/triangle.svg" class="c-icon c-icon-triangle" alt="" />
156156
<span><?= EngineBlock_View::htmlSpecialCharsText($this->getDisplayName($sp)); ?></span>
157157
</a>
158158
</td>

‎docs/release_notes/4.6.1.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# OpenConext EngineBlock v4.6.1 Release Notes #
2+
3+
Improvements to new Material UI.
4+
* On the WAYF, search in IdP keywords in a case-insensitive manner.
5+
* Open TOS in new browser window as to not disturb WAYF.
6+
* Remove not so useful 'go back' from waiting page.
7+
* Ensure clicking "Press enter to select" location forwards to IdP.
8+
* Remove old-style logging in Material theme footer.
9+
* When removing a previous-choice IdP, move it to the regular IdP list.
10+
* Center consent approve and reject buttons on mobile devices.
11+
* Remove excessive DOM reading and writing during every mouse move.

‎languages/en.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'post_data' => 'POST Data',
1111
'processing' => 'Connecting to the service',
1212
'processing_waiting' => 'Waiting for a response from the service.',
13-
'processing_long' => 'Taking too long?',
13+
'processing_long' => 'Please be patient, it may take a while...',
1414
'note' => 'Note',
1515
'note_no_script' => 'Since your browser does not support JavaScript, you must press the button below to proceed.',
1616
'go_back' => '&lt;&lt; Go back',
@@ -51,7 +51,7 @@
5151
// Footer
5252
'service_by' => 'This is a service connected through',
5353
'serviceprovider_link' => '<a href="https://www.surfconext.nl/" target="_blank">SURFconext</a>',
54-
'terms_of_service_link' => '<a href="https://wiki.surfnet.nl/display/conextsupport/Terms+of+Service+%28EN%29">Terms of Service</a>',
54+
'terms_of_service_link' => '<a href="https://wiki.surfnet.nl/display/conextsupport/Terms+of+Service+%28EN%29" target="_blank">Terms of Service</a>',
5555
'footer' => '<a href="https://www.surfconext.nl/" target="_blank">SURFconext</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="https://wiki.surfnet.nl/display/conextsupport/Terms+of+Service+%28EN%29">Terms of Service</a>',
5656

5757
// Help

‎languages/nl.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'post_data' => 'POST Data',
1111
'processing' => 'Verbinden met de dienst',
1212
'processing_waiting' => 'Wachten op een reactie van de dienst.',
13-
'processing_long' => 'Duurt het te lang?',
13+
'processing_long' => 'Wees a.u.b. geduldig, het kan even duren...',
1414
'note' => 'Mededeling',
1515
'note_no_script' => 'Jouw browser ondersteunt geen JavaScript. Je moet op de onderstaande knop drukken om door te gaan.',
1616
'go_back' => '&lt;&lt; Ga terug',
@@ -50,7 +50,7 @@
5050
//Footer
5151
'service_by' => 'Deze dienst is verbonden via',
5252
'serviceprovider_link' => '<a href="https://www.surfconext.nl/" target="_blank">SURFconext</a>',
53-
'terms_of_service_link' => '<a href="https://wiki.surfnet.nl/display/conextsupport/Terms+of+Service+%28NL%29">Gebruiksvoorwaarden</a>',
53+
'terms_of_service_link' => '<a href="https://wiki.surfnet.nl/display/conextsupport/Terms+of+Service+%28NL%29" target="_blank">Gebruiksvoorwaarden</a>',
5454
'footer' => '<a href="https://www.surfconext.nl/" target="_blank">SURFconext</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="https://wiki.surfnet.nl/display/conextsupport/Terms+of+Service+%28NL%29">Gebruiksvoorwaarden</a>',
5555

5656
//Help
@@ -273,14 +273,14 @@
273273
<br />
274274
</p>',
275275

276-
'error_received_error_status_code' => 'Error - Instellingsfout',
276+
'error_received_error_status_code' => 'Error - Identity Provider-fout',
277277
'error_received_error_status_code_desc'=> '<p>
278-
Jouw instelling stuurde een authenticatie respons met een fout code.
278+
Jouw instelling stuurde een authenticatierespons met een foutcode.
279279
</p>',
280-
'error_received_invalid_response' => 'Error - Ongeldig antwoord van instelling',
281-
'error_received_invalid_signed_response' => 'Error - Ongeldige handtekening op instellingsantwoord',
280+
'error_received_invalid_response' => 'Error - Ongeldig antwoord van identity provider',
281+
'error_received_invalid_signed_response' => 'Error - Ongeldige handtekening op identity provider-antwoord',
282282
'error_received_status_code_desc'=> '<p>
283-
Jouw instelling stuurde een ongeldig authenticatie respons terug.
283+
Jouw instelling stuurde een ongeldig authenticatierespons terug.
284284
</p>',
285285

286286
/**

0 commit comments

Comments
 (0)