Skip to content

Commit f9210c8

Browse files
authored
Merge pull request #150 from UN-OCHA/iasc-561-common-design
IASC-561 common design
2 parents c562048 + ab02803 commit f9210c8

11 files changed

+70
-31
lines changed

config/core.entity_view_display.node.announcement.search_result.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ content:
3939
type: datetime_default
4040
weight: 0
4141
region: content
42-
label: hidden
42+
label: inline
4343
settings:
4444
timezone_override: ''
4545
format_type: published_date

config/core.entity_view_display.node.oa_wiki_page.search_result.yml

+15-3
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,21 @@ dependencies:
1111
- field.field.node.oa_wiki_page.field_document_type
1212
- field.field.node.oa_wiki_page.field_iasc_audience
1313
- field.field.node.oa_wiki_page.field_legacy_publish
14+
- field.field.node.oa_wiki_page.field_media_files
1415
- field.field.node.oa_wiki_page.field_oa_media
1516
- field.field.node.oa_wiki_page.field_oa_wiki_page_no_redirect
1617
- field.field.node.oa_wiki_page.field_product_thumbnail
1718
- field.field.node.oa_wiki_page.field_published_date
19+
- field.field.node.oa_wiki_page.field_section
20+
- field.field.node.oa_wiki_page.field_section_audience
1821
- field.field.node.oa_wiki_page.field_thumbnail
1922
- field.field.node.oa_wiki_page.oa_other_spaces_ref
2023
- field.field.node.oa_wiki_page.oa_section_ref
2124
- field.field.node.oa_wiki_page.og_group_ref
2225
- field.field.node.oa_wiki_page.og_vocabulary
2326
- node.type.oa_wiki_page
2427
module:
28+
- datetime
2529
- text
2630
- user
2731
id: node.oa_wiki_page.search_result
@@ -32,13 +36,22 @@ content:
3236
body:
3337
label: hidden
3438
type: text_summary_or_trimmed
35-
weight: 0
39+
weight: 1
3640
settings:
3741
trim_length: 600
3842
third_party_settings: { }
3943
region: content
44+
field_published_date:
45+
type: datetime_default
46+
weight: 0
47+
region: content
48+
label: inline
49+
settings:
50+
timezone_override: ''
51+
format_type: published_date
52+
third_party_settings: { }
4053
links:
41-
weight: 1
54+
weight: 2
4255
region: content
4356
settings: { }
4457
third_party_settings: { }
@@ -53,7 +66,6 @@ hidden:
5366
field_oa_media: true
5467
field_oa_wiki_page_no_redirect: true
5568
field_product_thumbnail: true
56-
field_published_date: true
5769
field_section: true
5870
field_section_audience: true
5971
field_thumbnail: true

config/facets.facet.changed.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,12 @@ show_only_one_result: false
1616
field_identifier: changed
1717
facet_source_id: 'search_api:views_page__iasc_group_content__page_documents'
1818
widget:
19-
type: links
19+
type: select2
2020
config:
2121
show_numbers: true
22-
soft_limit: 0
23-
soft_limit_settings:
24-
show_less_label: 'Show less'
25-
show_more_label: 'Show more'
26-
show_reset_link: false
27-
reset_text: 'Show all'
28-
hide_reset_when_no_selection: false
22+
width: 100%
23+
autocomplete: false
24+
match_operator: CONTAINS
2925
query_operator: or
3026
use_hierarchy: false
3127
expand_hierarchy: false

config/facets.facet.document_type_label.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,12 @@ show_only_one_result: false
1616
field_identifier: document_type_label
1717
facet_source_id: 'search_api:views_page__iasc_group_content__page_documents'
1818
widget:
19-
type: links
19+
type: select2
2020
config:
2121
show_numbers: false
22-
soft_limit: 0
23-
soft_limit_settings:
24-
show_less_label: 'Show less'
25-
show_more_label: 'Show more'
26-
show_reset_link: false
27-
reset_text: 'Show all'
28-
hide_reset_when_no_selection: false
22+
width: 100%
23+
autocomplete: false
24+
match_operator: CONTAINS
2925
query_operator: or
3026
use_hierarchy: false
3127
expand_hierarchy: false

config/facets.facet.product_category_label.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,12 @@ show_only_one_result: false
1616
field_identifier: product_category_label
1717
facet_source_id: 'search_api:views_page__iasc_group_content__page_documents'
1818
widget:
19-
type: links
19+
type: select2
2020
config:
2121
show_numbers: false
22-
soft_limit: 0
23-
soft_limit_settings:
24-
show_less_label: 'Show less'
25-
show_more_label: 'Show more'
26-
show_reset_link: false
27-
reset_text: 'Show all'
28-
hide_reset_when_no_selection: false
22+
width: 100%
23+
autocomplete: false
24+
match_operator: CONTAINS
2925
query_operator: or
3026
use_hierarchy: false
3127
expand_hierarchy: false

config/search_api.index.default_solr_index.yml

+9
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dependencies:
1515
- field.storage.group.field_description
1616
- field.storage.node.field_iasc_audience
1717
- field.storage.node.field_document_type
18+
- field.storage.node.field_oa_date
1819
- field.storage.node.field_media_files
1920
- field.storage.media.field_media_file
2021
- field.storage.node.field_category
@@ -149,6 +150,14 @@ field_settings:
149150
dependencies:
150151
config:
151152
- field.storage.node.field_iasc_audience
153+
field_oa_date:
154+
label: 'Event date'
155+
datasource_id: 'entity:node'
156+
property_path: field_oa_date
157+
type: date
158+
dependencies:
159+
config:
160+
- field.storage.node.field_oa_date
152161
label:
153162
label: Title
154163
datasource_id: 'entity:group'

config/views.view.iasc_group_content.yml

+26
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ display:
533533
filter_groups: false
534534
title: false
535535
header: false
536+
sorts: false
536537
filter_groups:
537538
operator: AND
538539
groups:
@@ -553,6 +554,31 @@ display:
553554
value: 'Meetings of {{ audience_label }}'
554555
format: basic_html
555556
plugin_id: text
557+
sorts:
558+
field_oa_date:
559+
id: field_oa_date
560+
table: search_api_index_default_solr_index
561+
field: field_oa_date
562+
relationship: none
563+
group_type: group
564+
admin_label: ''
565+
order: DESC
566+
exposed: false
567+
expose:
568+
label: ''
569+
plugin_id: search_api
570+
changed:
571+
id: changed
572+
table: search_api_index_default_solr_index
573+
field: changed
574+
relationship: none
575+
group_type: group
576+
admin_label: ''
577+
order: DESC
578+
exposed: false
579+
expose:
580+
label: ''
581+
plugin_id: search_api
556582
cache_metadata:
557583
max-age: -1
558584
contexts:

html/themes/custom/iasc_common_design/css/styles.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

html/themes/custom/iasc_common_design/css/styles.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

html/themes/custom/iasc_common_design/sass/components/node/_node--teaser.scss

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
.cd-teaser__date {
3535
padding: 0 0 1rem;
36-
min-height: 80px; // height of calendar icon, helps clear elements below.
3736
}
3837

3938
.cd-teaser__footer {

html/themes/custom/iasc_common_design/sass/components/node/_node.scss

+5
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,8 @@
7878
.node__meta {
7979
margin-bottom: 2rem;
8080
}
81+
82+
.node--type-oa-event.node--view-mode-full .cd-teaser__date {
83+
min-height: 80px; // height of calendar icon, helps clear elements below.
84+
margin-bottom: 1rem;
85+
}

0 commit comments

Comments
 (0)