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

Commit 032ca15

Browse files
author
Dominik František Bučík
authored
Dev new wayf new (#142)
* New version of WAYF design
1 parent e01fe5b commit 032ca15

19 files changed

+1316
-867
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
All notable changes to this project will be documented in this file.
33

44
## [Unreleased]
5+
### Changed
6+
- Refactored Disco page. See the config template for example configuration.
57

68
#### Added
79
- Added extended PerunEntitlements

‎config-templates/module_perun.php‎

Lines changed: 85 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,12 @@
5656
'entitlementPrefix' => 'prefix',
5757
'entitlementAuthority' => 'authority',
5858

59-
/**
60-
* specify if disco module should filter out IdPs which are not whitelisted neither commited to CoCo or RaS.
61-
* default is false.
62-
*/
63-
//'disco.disableWhitelisting' => true,
64-
6559
/**
6660
* specify which type of IdPListService will be used
6761
* Expected values: csv, db
6862
*/
6963
'idpListServiceType' => '',
7064

71-
/**
72-
* Specify prefix for filtering AuthnContextClassRef
73-
* All AuthnContextClassRef values starts with this prefix will be removed before the request will be send to IdP
74-
*/
75-
'disco.removeAuthnContextClassRefPrefix' => 'urn:cesnet:proxyidp:',
76-
7765
/**
7866
*****************************************
7967
* Part of configuration for status page *
@@ -196,49 +184,92 @@
196184

197185
/**
198186
********************************************
199-
* Part of configuration for Warning on DS *
187+
* Part of configuration for DS *
200188
********************************************
201189
*/
202190

203-
/**
204-
* Choose one of allowed sources: CONFIG/FILE/URL
205-
* If FILE or URL is chosen, please read the 'warning_file_or_url' file to see how it should look
206-
*/
207-
'disco.warning.source' => '',
208-
209-
/**
210-
* Specify the absolute path to configuration file
211-
* REQUIRED ONLY FOR TYPE FILE
212-
*/
213-
'disco.warning.file' => '/etc/simplesamlphp/cesnet/config/warning',
214-
215-
/**
216-
* Specify the url to configuration file
217-
* REQUIRED ONLY FOR TYPE URL
218-
*/
219-
'disco.warning.url' => 'url to configuration file',
220-
221-
/**
222-
* When true, the config file is switched on.
223-
* REQUIRED ONLY FOR TYPE CONFIG
224-
*/
225-
'disco.warning.isOn' => true,
226-
227-
/**
228-
* Choose one of allowed types: INFO/WARNING/ERROR.
229-
* REQUIRED ONLY FOR TYPE CONFIG
230-
*/
231-
'disco.warning.type' => 'INFO',
232-
233-
/**
234-
* Title of the warning. It is possible to use HTML.
235-
* REQUIRED ONLY FOR TYPE CONFIG
236-
*/
237-
'disco.warning.title' => '',
238-
239-
/**
240-
* Text of the warning. It is possible to use HTML.
241-
* REQUIRED ONLY FOR TYPE CONFIG
242-
*/
243-
'disco.warning.text' => '',
191+
'wayf_config' => [
192+
/**
193+
* specify if disco module should filter out IdPs which are not whitelisted neither commited to CoCo or RaS.
194+
* default is false.
195+
*/
196+
'disable_white_listing',
197+
/**
198+
* Specify translate module
199+
*/
200+
'translate_module' => 'disco',
201+
/**
202+
* Specify prefix for filtering AuthnContextClassRef
203+
* All AuthnContextClassRef values starts with this prefix will be removed before the request will be send to IdP
204+
*/
205+
'remove_authn_context_class_ref_prefix' => 'urn:cesnet:proxyidp:',
206+
/**
207+
* Add insitution configuration. The block has to specify email and url
208+
*/
209+
'add_institution_config' => [
210+
'url' => 'https://login.elixir-czech.org/add-institution/',
211+
'email' => '[email protected]',
212+
],
213+
/**
214+
* Warning configuration
215+
* The configuration can be loaded from file, url or directly formt his config. All possibilities has to follow
216+
* the structure under the "config" key.
217+
*/
218+
'warning_config' => [
219+
# IF SOURCE === FILE
220+
# 'file' => '/etc/perun/simplesamlphp/elixir/config/warning.php',
221+
# IF SOURCE === URL
222+
# 'url' => 'https://test.com',
223+
# IF SOURCE === CONFIG
224+
'config' => [
225+
'enabled' => FALSE,
226+
'type' => 'INFO',
227+
'title' => [
228+
'en' => 'Sample text',
229+
'cs' => 'ukázkový text'
230+
],
231+
'text' => [
232+
'en' => 'Sample warning text',
233+
'cs' => 'ukázkový text',
234+
]
235+
],
236+
],
237+
// enable box shaodw around the wrap element
238+
'boxed' => TRUE,
239+
// block of IDPs
240+
'idp_blocks_config' => [
241+
[
242+
// type has to be 'inlinesearch' for displaying eduGAIN entries or 'tagged' for custom IDPs
243+
'type' => 'inlinesearch',
244+
// name that will be used in some classes and translation keys
245+
'name' => 'eduGAIN',
246+
//enable displaying of the texts
247+
'text_enabled' => TRUE,
248+
/* Translation for the hint above the entry. Leave out option to disable it if text_enabled is true
249+
'hint_translation' => [
250+
'en' => 'You can log in using your institutional account or another account you have on the web (e.g. Apple).',
251+
],
252+
*/
253+
/* Translation for the placeholder in the search box. Leave out option to disable it if text_enabled is true
254+
'placeholder_translation' => [
255+
'en' => 'Type name of your institute or an online account',
256+
],
257+
/*
258+
/* Translation for the note under the entry. Leave out option to disable it if text_enabled is true
259+
'note_translation' => [
260+
'en' => 'Note text',
261+
],
262+
*/
263+
],
264+
[
265+
'type' => 'tagged',
266+
'name' => 'social_idps',
267+
'text_enabled' => FALSE,
268+
//tags to include in the list
269+
'tags' => ['social'],
270+
// specific IDP entity IDs to include in the list
271+
'entityIds' => [],
272+
],
273+
],
274+
],
244275
];

‎dictionaries/disco.definition.json‎

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
{
2-
"add_institution": {
3-
"en": "Add your institution",
4-
"cs": "Přidat vaši instituci"
5-
},
6-
"find_institution_contact": {
7-
"en": "Still can't find your institution? Contact us at",
8-
"cs": "Stále nemůžete nalézt vaši instituci? Kontaktujte nás na"
9-
},
10-
"find_institution_extended": {
11-
"en": "Can't find your institution? Select it in extended list and help us",
12-
"cs": "Nemůžete nalézt vaši instituci? Vyberte ji z rozšířeného seznamu institucí a pomožte nám"
2+
"header": {
3+
"en": "Choose how to log in",
4+
"cs": "Vyberte čím se chcete přihlásit"
135
},
146
"institutional_account": {
157
"en": "your institutional account",
@@ -20,19 +12,59 @@
2012
"cs": "Přihlásit se účtem jiné instituce"
2113
},
2214
"previous_selection": {
23-
"en": "your previous selection",
15+
"en": "use your previous selection",
2416
"cs": "vaše předchozí volba"
2517
},
2618
"sign_in_with": {
2719
"en": "Sign in with ",
2820
"cs": "Přihlásit se pomocí "
2921
},
30-
"type_name_institution": {
31-
"en": "Type the name of your institution",
32-
"cs": "Zadejte název instituce"
33-
},
3422
"warning": {
3523
"en": "Warning!",
3624
"cs": "Varování!"
25+
},
26+
"preferred_idps_hint": {
27+
"en": "Use one of the preferred options",
28+
"cs": "Použijte některou z preferovaných možností"
29+
},
30+
"social_idps_hint" : {
31+
"en": "Use one of the social identity providers",
32+
"cs": "Použijte některého ze sociálných poskytovatelů identit "
33+
},
34+
"institution_search_hint": {
35+
"en": "You can log in using your institutional account or another account you have on the web.",
36+
"cs": "K přihlášení můžete využít Váš institucionální účet nebo jiný účet."
37+
},
38+
"institution_search_input_placeholder": {
39+
"en": "Type the name of your institute",
40+
"cs": "Zadejte název instituce"
41+
},
42+
"institution_search_display_too_much_entries_header": {
43+
"en": "Too many (<COUNT_HTML>) entries match the given criteria. Try to specify your query a bit more.",
44+
"cs": "Příliš mnoho (<COUNT_HTML>) položek odpovídá Vašemu zadání. Více specifikujte Váš dotaz."
45+
},
46+
"institution_search_display_too_much_entries_btn": {
47+
"en": "Display results anyway",
48+
"cs": "Zobrazit všechny výsledky"
49+
},
50+
"institution_search_no_entries_header": {
51+
"en": "No entries match the given query.",
52+
"cs": "Nebyly nalezeny žádne odpovídající záznamy."
53+
},
54+
"institution_search_no_entries_add_institution_text": {
55+
"en": "Cannot find your institution? ",
56+
"cs": "Nemúžete nalézt vaši organizaci?"
57+
},
58+
"institution_search_no_entries_add_institution_btn": {
59+
"en": "Try to find it in the list of not yet integrated options",
60+
"cs": "Zkuste ji najít v seznamu dosud neintegrovaných možností"
61+
},
62+
"add_institution": {
63+
"en": "Add your institution",
64+
"cs": "Přidat vaši instituci"
65+
},
66+
"add_institution_no_entries_contact_us": {
67+
"en": "Still can't find your institution? Contact us at",
68+
"cs": "Stále nemůžete nalézt vaši instituci? Kontaktujte nás na"
3769
}
3870
}

0 commit comments

Comments
 (0)