Skip to content

Commit

Permalink
Merge branch 'svg-titles' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanbutura committed Mar 21, 2024
2 parents 348a62e + 8207e5b commit 2a4961f
Show file tree
Hide file tree
Showing 35 changed files with 291 additions and 483 deletions.
28 changes: 0 additions & 28 deletions config/sync/block.block.exposedformcontent_eventspage_events.yml

This file was deleted.

28 changes: 0 additions & 28 deletions config/sync/block.block.exposedformnews_eventspage_news.yml

This file was deleted.

20 changes: 10 additions & 10 deletions config/sync/core.entity_view_display.node.basic_page.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,24 +65,24 @@ third_party_settings:
third_party_settings: { }
weight: 0
additional: { }
ab4d2751-d463-42cb-a76c-064342c0b6d6:
uuid: ab4d2751-d463-42cb-a76c-064342c0b6d6
1e1c9a40-d5e2-4d1c-8b53-fcacbb28016b:
uuid: 1e1c9a40-d5e2-4d1c-8b53-fcacbb28016b
region: content
configuration:
id: 'field_block:node:basic_page:field_svg_title'
id: 'field_block:node:basic_page:title'
label: Title
label_display: '0'
provider: layout_builder
context_mapping:
entity: layout_builder.entity
view_mode: view_mode
formatter:
type: media_thumbnail
type: string
label: hidden
settings:
image_link: ''
image_style: ''
image_loading:
attribute: lazy
link_to_entity: false
third_party_settings: { }
weight: 1
weight: 2
additional:
component_attributes:
block_attributes:
Expand All @@ -97,7 +97,7 @@ third_party_settings:
data: ''
block_content_attributes:
id: ''
class: 'container-fluid text-md-center'
class: ''
style: ''
data: ''
third_party_settings: { }
Expand Down
53 changes: 50 additions & 3 deletions config/sync/core.entity_view_display.node.page.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,57 @@ third_party_settings:
enabled: true
allow_custom: true
sections:
-
layout_id: layout_onecol
layout_settings:
label: Header
context_mapping: { }
layout_builder_styles_style:
background_green: 0
background_grey: 0
remove_horizontal_paddings: remove_horizontal_paddings
remove_top_padding: remove_top_padding
container: 0
container_fluid: 0
margin_bottom_5: 0
no_paddings: 0
remove_vertical_paddings: 0
components:
aaf72de7-3a26-42b6-846a-5dd643e3ffc5:
uuid: aaf72de7-3a26-42b6-846a-5dd643e3ffc5
region: content
configuration:
id: 'field_block:node:page:title'
label: Title
label_display: '0'
provider: layout_builder
context_mapping:
entity: layout_builder.entity
view_mode: view_mode
formatter:
type: string
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
weight: 0
additional: { }
third_party_settings: { }
-
layout_id: layout_onecol
layout_settings:
label: ''
context_mapping: { }
layout_builder_styles_style:
background_green: 0
background_grey: 0
remove_top_padding: remove_top_padding
container: 0
container_fluid: 0
margin_bottom_5: 0
no_paddings: 0
remove_horizontal_paddings: 0
remove_vertical_paddings: 0
components:
5e07bb6c-933e-4fd2-994e-ec361776d83f:
uuid: 5e07bb6c-933e-4fd2-994e-ec361776d83f
Expand All @@ -39,7 +86,7 @@ third_party_settings:
label: hidden
settings: { }
third_party_settings: { }
weight: 0
weight: -1
additional: { }
bb73e4f0-8d75-4d57-bed7-226baedfeb92:
uuid: bb73e4f0-8d75-4d57-bed7-226baedfeb92
Expand All @@ -49,7 +96,7 @@ third_party_settings:
label_display: '0'
context_mapping:
entity: layout_builder.entity
weight: 1
weight: 0
additional: { }
b3ff1fd8-afc8-4a59-a6c5-1d08add01505:
uuid: b3ff1fd8-afc8-4a59-a6c5-1d08add01505
Expand All @@ -64,7 +111,7 @@ third_party_settings:
label: above
settings: { }
third_party_settings: { }
weight: 3
weight: 1
additional: { }
third_party_settings: { }
_core:
Expand Down
2 changes: 1 addition & 1 deletion config/sync/simple_sitemap_engines.settings.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
_core:
default_config_hash: 33gg8hVdxE7nTswwBBOY_d2rH3XjAbBa4rw0XyMRh6Y
enabled: true
enabled: false
submission_interval: 24
index_now_enabled: true
index_now_preferred_engine: ''
Expand Down
2 changes: 1 addition & 1 deletion config/sync/views.view.content_events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,7 @@ display:
use_ajax: false
display_description: ''
header: { }
exposed_block: true
exposed_block: false
display_extenders:
ajax_history:
enable_history: false
Expand Down
17 changes: 2 additions & 15 deletions config/sync/views.view.deliverables.yml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions config/sync/views.view.news_events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ display:
display_plugin: page
position: 1
display_options:
title: 'All News'
title: News
pager:
type: infinite_scroll
options:
Expand Down Expand Up @@ -825,7 +825,7 @@ display:
use_ajax: true
display_description: ''
header: { }
exposed_block: true
exposed_block: false
display_extenders:
ajax_history:
enable_history: true
Expand Down
15 changes: 1 addition & 14 deletions config/sync/views.view.publications.yml

Large diffs are not rendered by default.

17 changes: 2 additions & 15 deletions config/sync/views.view.thematic_areas.yml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions web/modules/custom/parc_core/parc_core.module
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,9 @@ function parc_core_views_query_alter(ViewExecutable $view, QueryPluginBase $quer
}

/**
* Implements hook_preprocess_HOOK() for views_exposed_form__content_events__page_events.
* Implements hook_preprocess_HOOK() for views_view__content_events__page_events.
*/
function parc_core_preprocess_views_exposed_form__content_events__page_events(&$variables) {
function parc_core_preprocess_views_view__content_events__page_events(&$variables) {
/** @var \Drupal\parc_core\ParcEventsManager $events_manager */
$events_manager = \Drupal::service('parc_core.events_manager');
if ($events_manager->isTrainingEventsViewPage()) {
Expand Down
4 changes: 3 additions & 1 deletion web/modules/custom/parc_core/src/ParcSearchManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ public function getNodeSearchTeaserUrl(NodeInterface $node) {
return Url::fromUserInput('/laboratories?focus=' . $node->id());
case 'publications':
return Url::fromUserInput('/scientific-publications', [
'fragment' => 'article-' . $node->id(),
'query' => [
'publication' => $node->id(),
],
]);

default:
Expand Down
1 change: 1 addition & 0 deletions web/modules/custom/parc_zenodo_api/src/ZenodoApiHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ public function processKeywords(array $keywords) {

$keyword_terms = [];
foreach ($final_keywords as $keyword) {
$keyword = ucfirst($keyword);
$keyword_terms[] = $this->getTermByName($keyword, 'publications');
}
return $keyword_terms;
Expand Down
Loading

0 comments on commit 2a4961f

Please sign in to comment.