Skip to content
This repository was archived by the owner on Sep 19, 2022. It is now read-only.

Commit 74660e4

Browse files
vyskocilpavelvyskocilpavel
committed
Changed the texts and visual form of pages
 * Changed the texts and visual form of pages: perun_identity_choose_vo_and_group.php and unauthorized_access_go_to_registration.php
1 parent 7b0f8a7 commit 74660e4

File tree

6 files changed

+85
-23
lines changed

6 files changed

+85
-23
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ All notable changes to this project will be documented in this file.
77

88
[Changed]
99
- Changed design of ListOfSps
10-
10+
- Changed the texts and visual form of pages: perun_identity_choose_vo_and_group.php and unauthorized_access_go_to_registration.php
11+
1112
[Fixed]
1213
- Fixed resend SPMetadata from request to unauthorized-access-go-to-registration page
1314
- Fixed url encoding in PerunGroups

‎dictionaries/perun.definition.json‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"choose-vo-and-group-tpl_header": {
3-
"en": "Access forbidden",
4-
"cs": "Přístup odepřen"
2+
"choose-vo-and-group-tpl_header-part1": {
3+
"en": "Access to the service ",
4+
"cs": "Přístup ke službě "
55
},
6-
"choose-vo-and-group-tpl_text": {
7-
"en": "You don't meet the prerequisites for accessing the service: ",
8-
"cs": "Nesplňujete prerekvizity pro přístup ke službě: "
6+
"choose-vo-and-group-tpl_header-part2": {
7+
"en": " has been forbidden",
8+
"cs": " byl zamítnut"
99
},
1010
"choose-vo-and-group-tpl_message": {
1111
"en": "To access the service it is necessary to have a valid membership in one of the following groups. Please proceed with selection of organization and group for registration.",
12-
"cs": "Pro získání přístupu k dané službě je nutné se zaregistrovat do jedné z následujících skupin. Pokračujte výběrem příslušné organizace a skupiny."
12+
"cs": "Pro získání přístupu k dané službě je nutné být členem jedné z následujících skupin. Pokračujte výběrem příslušné organizace a skupiny."
1313
},
1414
"choose-vo-and-group-tpl_select-vo": {
1515
"en": "Select virtual organization for registration: ",
@@ -20,8 +20,20 @@
2020
"cs": "Vyberte skupinu pro registraci: "
2121
},
2222
"choose-vo-and-group-tpl_continue": {
23-
"en": "Continue",
24-
"cs": "Pokračovat"
23+
"en": "Continue to the registration page for selected group",
24+
"cs": "Pokračovat na registrační stránku do vybrané skupiny"
25+
},
26+
"go-to-registration_header1" : {
27+
"en": "Your activity is necessary to access the ",
28+
"cs": "Pro přístup ke službě "
29+
},
30+
"go-to-registration_header2" : {
31+
"en": " service",
32+
"cs": " je vyžadována Vaše aktivita"
33+
},
34+
"go-to-registration_continue" : {
35+
"en": "Continue to a page with additional information",
36+
"cs": "Pokračovat na stránku s doplňujícími informacemi"
2537
},
2638
"disco-tpl_previous-selection": {
2739
"en": "your previous selection",

‎templates/choose-vo-and-group-tpl.php‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
$this->data['head'] = '<link rel="stylesheet" media="screen" type="text/css" href="' . SimpleSAML\Module::getModuleUrl('perun/res/css/perun_identity_choose_vo_and_group.css') . '" />';
1313

14-
$this->data['header'] = $this->t('{perun:perun:choose-vo-and-group-tpl_header}');
1514
$vos = $this->data['vos'];
1615
$groups = $this->data['groups'];
1716
$registerUrlBase = $this->data['registerUrlBase'];
@@ -28,6 +27,8 @@
2827
$informationURL = $spMetadata['InformationURL']['en'];
2928
}
3029

30+
$this->data['header'] = "";
31+
3132
$this->includeAtTemplateBase('includes/header.php');
3233

3334
if (isset($_POST['selectedGroup'])) {
@@ -48,8 +49,20 @@
4849
\SimpleSAML\Utils\HTTP::redirectTrustedURL($registerUrlBase, $params);
4950
}
5051

51-
echo '<p>' . $this->t('{perun:perun:choose-vo-and-group-tpl_text}') . '<a href="' . $informationURL . '">' .$serviceName . '</a> </p>';
52-
echo '<p>' . $this->t('{perun:perun:choose-vo-and-group-tpl_message}') . '</p>'
52+
$header = $this->t('{perun:perun:choose-vo-and-group-tpl_header-part1}');
53+
if (!empty($serviceName) && !empty($informationURL)) {
54+
$header .= '<a href="' . $informationURL . '">' . $serviceName . '</a>';
55+
} elseif (!empty($serviceName)) {
56+
$header .= $serviceName;
57+
}
58+
$header .= $this->t('{perun:perun:choose-vo-and-group-tpl_header-part2}');
59+
60+
echo '<div id="head">';
61+
echo '<h1>' . $header. '</h1>';
62+
echo '</div>';
63+
64+
echo '<div class="msg">' . $this->t('{perun:perun:choose-vo-and-group-tpl_message}'). '</div>';
65+
5366
?>
5467

5568
<div class="list-group">

‎templates/unauthorized-access-go-to-registration-tpl.php‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
*/
99

1010

11-
$this->data['header'] = $this->t('{perun:perun:choose-vo-and-group-tpl_header}');
11+
$this->data['header'] = "";
12+
$this->data['head'] = '<link rel="stylesheet" media="screen" type="text/css" href="' . SimpleSAML\Module::getModuleUrl('perun/res/css/perun_identity_go_to_registration.css') . '" />';
13+
1214
$spMetadata = $this->data['SPMetadata'];
1315
$serviceName = '';
1416
$informationURL = '';
@@ -27,20 +29,22 @@
2729

2830
$this->includeAtTemplateBase('includes/header.php');
2931

32+
$header = $this->t('{perun:perun:go-to-registration_header1}');
33+
if (!empty($serviceName) && !empty($informationURL)) {
34+
$header .= '<a href="' . $informationURL . '">' . $serviceName . '</a>';
35+
} elseif (!empty($serviceName)) {
36+
$header .= $serviceName;
37+
}
38+
$header .= $this->t('{perun:perun:go-to-registration_header2}');
3039

31-
echo '<p>' . $this->t('{perun:perun:choose-vo-and-group-tpl_text}') . '<a href="' . $informationURL . '">' .$serviceName . '</a> </p>';
32-
echo '<p>' . $this->t('{perun:perun:choose-vo-and-group-tpl_message}') . '</p>'
40+
echo '<div id="head">';
41+
echo '<h1>' . $header . '</h1>';
42+
echo '</div>';
3343
?>
34-
35-
36-
37-
3844
<form method="post">
3945
</hr>
4046
</br>
41-
<h4> <?php echo $this->t('{perun:perun:unauthorized-access_redirect_to_registration}')?> </h4>
42-
43-
<input type="submit" name="continueToRegistration" value="<?php echo $this->t('{perun:perun:continue}')?>" class="btn btn-lg btn-primary btn-block">
47+
<input type="submit" name="continueToRegistration" value="<?php echo $this->t('{perun:perun:go-to-registration_continue}')?>" class="btn btn-lg btn-primary btn-block">
4448
<div class="form-group">
4549
</div>
4650
</form>

‎www/res/css/perun_identity_choose_vo_and_group.css‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
#head a, #head a:link, #head a:visited{
2+
color: #005b99 !important;
3+
}
4+
5+
#head a:hover {
6+
border-bottom: 1px #005b99 solid !important;
7+
}
8+
9+
#content, #languagebar {
10+
max-width: 960px !important;
11+
}
12+
13+
.msg {
14+
padding-top: 30px;
15+
padding-bottom: 20px;
16+
}
17+
118
select {
219
margin-bottom: 20px;
320
}

‎www/res/css/perun_identity_go_to_registration.css‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#head a, #head a:link, #head a:visited{
2+
color: #005b99 !important;
3+
}
4+
5+
#head a:hover {
6+
border-bottom: 1px #005b99 solid !important;
7+
}
8+
9+
#content, #languagebar {
10+
max-width: 960px !important;
11+
}
12+
13+
.msg {
14+
padding-top: 30px;
15+
}

0 commit comments

Comments
 (0)