Skip to content

Commit 1976115

Browse files
committed
Merge remote-tracking branch 'origin/development' into feature/BKL-88-DateInEuropeanFormat
2 parents bb6b4a6 + e6612de commit 1976115

26 files changed

+476
-156
lines changed

config/sync/block.block.os2loop_theme_page_title.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ settings:
2222
visibility:
2323
request_path:
2424
id: request_path
25-
pages: "/node/add/*\r\n/user/*"
25+
pages: "/node/add/*\r\n/user/*\r\n/contacts"
2626
negate: false

config/sync/core.entity_form_display.node.os2loop_question.default.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,12 @@ content:
9292
weight: 8
9393
os2loop_shared_subject:
9494
settings:
95-
match_limit: '0'
96-
min_length: 0
97-
delimiter: ''
98-
not_found_message: 'The term ''@term'' will be added'
99-
no_empty_message: 'No terms could be found. Please type in order to add a new term.'
100-
not_found_message_allow: false
101-
new_terms: false
10295
match_operator: CONTAINS
103-
autocomplete_route_name: autocomplete_deluxe.autocomplete
96+
match_limit: 10
10497
size: 60
105-
selection_handler: default
98+
placeholder: ''
10699
third_party_settings: { }
107-
type: autocomplete_deluxe
100+
type: entity_reference_autocomplete
108101
region: content
109102
weight: 7
110103
os2loop_shared_tags:

config/sync/core.entity_form_display.user.user.default.yml

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,11 @@ third_party_settings:
8585
id: ''
8686
classes: ''
8787
label: Jobtitel
88-
group_member_list:
89-
children:
90-
- os2loop_user_internal_list
91-
- os2loop_user_external_list
92-
parent_name: ''
93-
weight: 5
94-
format_type: fieldset
95-
region: content
96-
format_settings:
97-
id: ''
98-
classes: ''
99-
description: ''
100-
required_fields: true
101-
label: Medlemsliste
10288
group_notifications:
10389
children:
10490
- os2loop_mail_notifications_intvl
10591
parent_name: ''
106-
weight: 6
92+
weight: 5
10793
format_type: fieldset
10894
region: content
10995
format_settings:
@@ -164,16 +150,9 @@ content:
164150
size: 60
165151
placeholder: ''
166152
third_party_settings: { }
167-
os2loop_user_external_list:
168-
weight: 20
169-
settings:
170-
display_label: true
171-
third_party_settings: { }
172-
type: boolean_checkbox
173-
region: content
174153
os2loop_user_family_name:
175154
type: string_textfield
176-
weight: 20
155+
weight: 11
177156
region: content
178157
settings:
179158
size: 60
@@ -200,13 +179,6 @@ content:
200179
collapsed: false
201180
third_party_settings: { }
202181
region: content
203-
os2loop_user_internal_list:
204-
weight: 10
205-
settings:
206-
display_label: true
207-
third_party_settings: { }
208-
type: boolean_checkbox
209-
region: content
210182
os2loop_user_job_title:
211183
type: string_textfield
212184
weight: 10
@@ -217,7 +189,7 @@ content:
217189
third_party_settings: { }
218190
os2loop_user_phone_number:
219191
type: string_textfield
220-
weight: 30
192+
weight: 13
221193
region: content
222194
settings:
223195
size: 60
@@ -260,4 +232,6 @@ hidden:
260232
account: true
261233
langcode: true
262234
language: true
235+
os2loop_user_external_list: true
236+
os2loop_user_internal_list: true
263237
timezone: true
Lines changed: 269 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,269 @@
1+
uuid: 8b25186d-4d33-4636-8495-3baa69bbbf98
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- core.entity_form_mode.media.inline_media_form
7+
- core.entity_form_mode.user.register
8+
- field.field.user.user.os2loop_mail_notifications_intvl
9+
- field.field.user.user.os2loop_user_address
10+
- field.field.user.user.os2loop_user_areas_of_expertise
11+
- field.field.user.user.os2loop_user_biography
12+
- field.field.user.user.os2loop_user_city
13+
- field.field.user.user.os2loop_user_external_list
14+
- field.field.user.user.os2loop_user_family_name
15+
- field.field.user.user.os2loop_user_given_name
16+
- field.field.user.user.os2loop_user_image
17+
- field.field.user.user.os2loop_user_internal_list
18+
- field.field.user.user.os2loop_user_job_title
19+
- field.field.user.user.os2loop_user_phone_number
20+
- field.field.user.user.os2loop_user_place
21+
- field.field.user.user.os2loop_user_postal_code
22+
- field.field.user.user.os2loop_user_professions
23+
module:
24+
- autocomplete_deluxe
25+
- field_group
26+
- inline_entity_form
27+
- user
28+
third_party_settings:
29+
field_group:
30+
group_user_personal_information:
31+
children:
32+
- os2loop_user_given_name
33+
- os2loop_user_family_name
34+
- os2loop_user_phone_number
35+
- account
36+
parent_name: ''
37+
weight: 0
38+
format_type: fieldset
39+
region: content
40+
format_settings:
41+
description: ''
42+
required_fields: true
43+
id: ''
44+
classes: ''
45+
label: 'Personlig information'
46+
group_description:
47+
children:
48+
- os2loop_user_biography
49+
parent_name: ''
50+
weight: 4
51+
format_type: fieldset
52+
region: content
53+
format_settings:
54+
description: ''
55+
required_fields: true
56+
id: ''
57+
classes: ''
58+
label: Beskrivelse
59+
group_location:
60+
children:
61+
- os2loop_user_place
62+
- os2loop_user_address
63+
- os2loop_user_postal_code
64+
- os2loop_user_city
65+
parent_name: ''
66+
weight: 3
67+
format_type: fieldset
68+
region: content
69+
format_settings:
70+
description: ''
71+
required_fields: true
72+
id: ''
73+
classes: ''
74+
label: Lokation
75+
group_job_title:
76+
children:
77+
- os2loop_user_job_title
78+
- os2loop_user_areas_of_expertise
79+
- os2loop_user_professions
80+
parent_name: ''
81+
weight: 2
82+
format_type: fieldset
83+
region: content
84+
format_settings:
85+
description: ''
86+
required_fields: true
87+
id: ''
88+
classes: ''
89+
label: Jobtitel
90+
group_member_list:
91+
children:
92+
- os2loop_user_internal_list
93+
- os2loop_user_external_list
94+
parent_name: ''
95+
weight: 5
96+
format_type: fieldset
97+
region: content
98+
format_settings:
99+
id: ''
100+
classes: ''
101+
description: ''
102+
required_fields: true
103+
label: Medlemsliste
104+
group_notifications:
105+
children:
106+
- os2loop_mail_notifications_intvl
107+
parent_name: ''
108+
weight: 6
109+
format_type: fieldset
110+
region: content
111+
format_settings:
112+
id: ''
113+
classes: ''
114+
description: ''
115+
required_fields: true
116+
label: Notifikationer
117+
id: user.user.register
118+
targetEntityType: user
119+
bundle: user
120+
mode: register
121+
content:
122+
account:
123+
weight: 17
124+
region: content
125+
settings: { }
126+
third_party_settings: { }
127+
os2loop_mail_notifications_intvl:
128+
weight: 10
129+
settings: { }
130+
third_party_settings: { }
131+
type: options_select
132+
region: content
133+
os2loop_user_address:
134+
type: string_textfield
135+
weight: 11
136+
region: content
137+
settings:
138+
size: 60
139+
placeholder: ''
140+
third_party_settings: { }
141+
os2loop_user_areas_of_expertise:
142+
type: autocomplete_deluxe
143+
weight: 11
144+
region: content
145+
settings:
146+
match_limit: '0'
147+
min_length: 0
148+
delimiter: ''
149+
not_found_message: 'The term ''@term'' will be added'
150+
no_empty_message: 'No terms could be found. Please type in order to add a new term.'
151+
not_found_message_allow: false
152+
new_terms: false
153+
match_operator: CONTAINS
154+
autocomplete_route_name: autocomplete_deluxe.autocomplete
155+
size: 60
156+
selection_handler: default
157+
third_party_settings: { }
158+
os2loop_user_biography:
159+
type: string_textarea
160+
weight: 10
161+
region: content
162+
settings:
163+
rows: 5
164+
placeholder: ''
165+
third_party_settings: { }
166+
os2loop_user_city:
167+
type: string_textfield
168+
weight: 13
169+
region: content
170+
settings:
171+
size: 60
172+
placeholder: ''
173+
third_party_settings: { }
174+
os2loop_user_external_list:
175+
weight: 20
176+
settings:
177+
display_label: true
178+
third_party_settings: { }
179+
type: boolean_checkbox
180+
region: content
181+
os2loop_user_family_name:
182+
type: string_textfield
183+
weight: 15
184+
region: content
185+
settings:
186+
size: 60
187+
placeholder: ''
188+
third_party_settings: { }
189+
os2loop_user_given_name:
190+
type: string_textfield
191+
weight: 14
192+
region: content
193+
settings:
194+
size: 60
195+
placeholder: ''
196+
third_party_settings: { }
197+
os2loop_user_image:
198+
type: inline_entity_form_simple
199+
weight: 1
200+
settings:
201+
form_mode: inline_media_form
202+
label_singular: ''
203+
label_plural: ''
204+
revision: false
205+
override_labels: false
206+
collapsible: false
207+
collapsed: false
208+
third_party_settings: { }
209+
region: content
210+
os2loop_user_internal_list:
211+
weight: 10
212+
settings:
213+
display_label: true
214+
third_party_settings: { }
215+
type: boolean_checkbox
216+
region: content
217+
os2loop_user_job_title:
218+
type: string_textfield
219+
weight: 10
220+
region: content
221+
settings:
222+
size: 60
223+
placeholder: ''
224+
third_party_settings: { }
225+
os2loop_user_phone_number:
226+
type: string_textfield
227+
weight: 16
228+
region: content
229+
settings:
230+
size: 60
231+
placeholder: ''
232+
third_party_settings: { }
233+
os2loop_user_place:
234+
type: string_textfield
235+
weight: 10
236+
region: content
237+
settings:
238+
size: 60
239+
placeholder: ''
240+
third_party_settings: { }
241+
os2loop_user_postal_code:
242+
type: string_textfield
243+
weight: 12
244+
region: content
245+
settings:
246+
size: 60
247+
placeholder: ''
248+
third_party_settings: { }
249+
os2loop_user_professions:
250+
type: autocomplete_deluxe
251+
weight: 12
252+
region: content
253+
settings:
254+
match_limit: '0'
255+
min_length: 0
256+
delimiter: ''
257+
not_found_message: 'The term ''@term'' will be added'
258+
no_empty_message: 'No terms could be found. Please type in order to add a new term.'
259+
not_found_message_allow: false
260+
new_terms: false
261+
match_operator: CONTAINS
262+
autocomplete_route_name: autocomplete_deluxe.autocomplete
263+
size: 60
264+
selection_handler: default
265+
third_party_settings: { }
266+
hidden:
267+
langcode: true
268+
language: true
269+
timezone: true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
label: 'Revisionsdato'
1+
label: Revisionsdato

config/sync/language/da/views.view.contact_list.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ display:
99
filters:
1010
combine:
1111
expose:
12-
label: 'Søg efter navn, e-mail eller telefonnummer'
12+
placeholder: 'Søg efter navn, e-mail eller telefonnummer'
1313
title: Kontaktliste
1414
empty:
1515
area:

0 commit comments

Comments
 (0)