Skip to content

Commit

Permalink
Merge pull request #21 from itk-dev/feature/siteimprove
Browse files Browse the repository at this point in the history
Site improve
  • Loading branch information
yepzdk authored Jun 21, 2024
2 parents cf98e88 + a38c8d2 commit 8fa11f3
Show file tree
Hide file tree
Showing 13 changed files with 108 additions and 30 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* [PR-21](https://github.com/itk-dev/cfia/pull/21)
Added site improve

## 2.1.1

* [PR-20](https://github.com/itk-dev/cfia/pull/20)
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"drupal/viewsreference": "^2.0@beta",
"drupal/webform": "6.2.x-dev@dev",
"drush/drush": "^11 || ^12",
"itk-dev/itk_siteimprove": "^1.3",
"itk-dev/web_accessibility_statement": "^1.1",
"wikimedia/composer-merge-plugin": "^2.1"
},
Expand Down
31 changes: 30 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 14 additions & 5 deletions config/sync/core.entity_form_display.node.blog_post.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ dependencies:
- field.field.node.blog_post.field_banner_image
- field.field.node.blog_post.field_category
- field.field.node.blog_post.field_contact_person
- field.field.node.blog_post.field_fil_til_download
- field.field.node.blog_post.field_image
- field.field.node.blog_post.field_section
- node.type.blog_post
module:
- entity_browser
- file
- paragraphs
- paragraphs_ee
- paragraphs_features
Expand All @@ -25,7 +27,7 @@ mode: default
content:
body:
type: text_textarea_with_summary
weight: 10
weight: 11
region: content
settings:
rows: 9
Expand Down Expand Up @@ -55,20 +57,27 @@ content:
third_party_settings: { }
field_category:
type: options_buttons
weight: 12
weight: 14
region: content
settings: { }
third_party_settings: { }
field_contact_person:
type: entity_reference_autocomplete
weight: 22
weight: 15
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
field_fil_til_download:
type: file_generic
weight: 10
region: content
settings:
progress_indicator: throbber
third_party_settings: { }
field_image:
type: entity_browser_file
weight: 9
Expand All @@ -85,7 +94,7 @@ content:
third_party_settings: { }
field_section:
type: paragraphs
weight: 11
weight: 13
region: content
settings:
title: Paragraph
Expand Down Expand Up @@ -154,7 +163,7 @@ content:
placeholder: ''
third_party_settings: { }
translation:
weight: 10
weight: 12
region: content
settings: { }
third_party_settings: { }
Expand Down
18 changes: 14 additions & 4 deletions config/sync/core.entity_view_display.node.blog_post.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ dependencies:
- field.field.node.blog_post.field_banner_image
- field.field.node.blog_post.field_category
- field.field.node.blog_post.field_contact_person
- field.field.node.blog_post.field_fil_til_download
- field.field.node.blog_post.field_image
- field.field.node.blog_post.field_section
- node.type.blog_post
module:
- entity_reference_revisions
- file
- image
- text
- user
Expand All @@ -33,7 +35,7 @@ content:
settings:
link: true
third_party_settings: { }
weight: 1
weight: 2
region: content
field_contact_person:
type: entity_reference_entity_view
Expand All @@ -42,7 +44,15 @@ content:
view_mode: default
link: true
third_party_settings: { }
weight: 14
weight: 5
region: content
field_fil_til_download:
type: file_default
label: above
settings:
use_description_as_link_text: true
third_party_settings: { }
weight: 1
region: content
field_image:
type: image
Expand All @@ -53,7 +63,7 @@ content:
image_loading:
attribute: lazy
third_party_settings: { }
weight: 2
weight: 3
region: content
field_section:
type: entity_reference_revisions_entity_view
Expand All @@ -62,7 +72,7 @@ content:
view_mode: default
link: ''
third_party_settings: { }
weight: 3
weight: 4
region: content
hidden:
addtoany: true
Expand Down
12 changes: 11 additions & 1 deletion config/sync/core.entity_view_display.node.blog_post.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ dependencies:
- field.field.node.blog_post.field_banner_image
- field.field.node.blog_post.field_category
- field.field.node.blog_post.field_contact_person
- field.field.node.blog_post.field_fil_til_download
- field.field.node.blog_post.field_image
- field.field.node.blog_post.field_section
- node.type.blog_post
module:
- entity_reference_revisions
- file
- image
- layout_builder
- text
Expand Down Expand Up @@ -48,7 +50,15 @@ content:
view_mode: default
link: true
third_party_settings: { }
weight: 12
weight: 5
region: content
field_fil_til_download:
type: file_default
label: above
settings:
use_description_as_link_text: true
third_party_settings: { }
weight: 4
region: content
field_image:
type: image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- field.field.node.blog_post.field_banner_image
- field.field.node.blog_post.field_category
- field.field.node.blog_post.field_contact_person
- field.field.node.blog_post.field_fil_til_download
- field.field.node.blog_post.field_image
- field.field.node.blog_post.field_section
- node.type.blog_post
Expand Down Expand Up @@ -37,6 +38,7 @@ hidden:
field_banner_image: true
field_category: true
field_contact_person: true
field_fil_til_download: true
field_image: true
field_section: true
langcode: true
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- field.field.node.blog_post.field_banner_image
- field.field.node.blog_post.field_category
- field.field.node.blog_post.field_contact_person
- field.field.node.blog_post.field_fil_til_download
- field.field.node.blog_post.field_image
- field.field.node.blog_post.field_section
- node.type.blog_post
Expand Down Expand Up @@ -56,5 +57,6 @@ hidden:
addtoany: true
field_banner_image: true
field_contact_person: true
field_fil_til_download: true
field_section: true
langcode: true
1 change: 1 addition & 0 deletions config/sync/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ module:
history: 0
honeypot: 0
image: 0
itk_siteimprove: 0
jquery_ui: 0
jquery_ui_datepicker: 0
jquery_ui_slider: 0
Expand Down
27 changes: 27 additions & 0 deletions config/sync/field.field.node.blog_post.field_fil_til_download.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
uuid: d4b3d2dd-2aad-4aa8-9afd-9bf270a79000
langcode: da
status: true
dependencies:
config:
- field.storage.node.field_fil_til_download
- node.type.blog_post
module:
- file
id: node.blog_post.field_fil_til_download
field_name: field_fil_til_download
entity_type: node
bundle: blog_post
label: 'Fil til download'
description: 'Fil relateret til portfolio.'
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
handler: 'default:file'
handler_settings: { }
file_directory: portfolio_documents
file_extensions: 'doc docx pdf'
max_filesize: '50 MB'
description_field: true
field_type: file
14 changes: 0 additions & 14 deletions config/sync/update.settings.yml

This file was deleted.

2 changes: 1 addition & 1 deletion config/sync/views.view.cases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1535,7 +1535,7 @@ display:
type: full
options:
offset: 0
items_per_page: 9
items_per_page: 0
total_pages: null
id: 0
tags:
Expand Down
6 changes: 2 additions & 4 deletions web/sites/default/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -820,10 +820,8 @@
*
* Keep this code block at the end of this file to take full effect.
*/
#
# if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
# include $app_root . '/' . $site_path . '/settings.local.php';
# }
if (file_exists($app_root . "/" . $site_path . "/settings.local.php")) {
include $app_root . "/" . $site_path . "/settings.local.php";
}

$settings['config_sync_directory'] = '../config/sync';

0 comments on commit 8fa11f3

Please sign in to comment.