Skip to content
This repository has been archived by the owner on Jul 27, 2022. It is now read-only.

ISAICP-6694: Create the footer menus - allow moderator access #2610

Open
wants to merge 35 commits into
base: ISAICP-6415
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3ae710b
ISAICP-6694: Include default content in the project.
idimopoulos Oct 4, 2021
9b99e62
ISAICP-6694: Export configuration.
idimopoulos Oct 4, 2021
14920c6
ISAICP-6694: Export default links.
idimopoulos Oct 4, 2021
3823743
ISAICP-6694: Export all new common named about-us menu.
idimopoulos Oct 4, 2021
eb9cfe7
ISAICP-6694: Export one twig for each menu. Is this required for all …
idimopoulos Oct 4, 2021
bbb29b3
ISAICP-6694: Export an extra menu item.
idimopoulos Oct 4, 2021
c295d29
ISAICP-6694: Add a tour link to the footer too.
idimopoulos Oct 4, 2021
dc3dff9
ISAICP-6694: Allow moderators to edit the footer menus.
idimopoulos Oct 4, 2021
090012a
ISAICP-6694: Switch the 'Support menu' from admin toolbar to lead to …
idimopoulos Oct 4, 2021
12f5981
ISAICP-6694: Codesniffs for the joinup_default_content module.
idimopoulos Oct 4, 2021
2215532
Merge remote-tracking branch 'origin/ISAICP-6415' into ISAICP-6694
idimopoulos Oct 4, 2021
b58bf72
ISAICP-6415: Update the patch version of the css import optimizer.
idimopoulos Oct 4, 2021
0c7d793
Merge branch 'ISAICP-6415-cssoptimizer-new-patch' into ISAICP-6694
idimopoulos Oct 4, 2021
de3f3f7
ISAICP-6694: Include the joinup_default_content and default_content i…
idimopoulos Oct 5, 2021
69fe86a
ISAICP-6694: Include the new menus in the access tests.
idimopoulos Oct 5, 2021
146b787
ISAICP-6694: Convert the 'Contact Joinup Support' in a configuration …
idimopoulos Oct 5, 2021
6191c2a
ISAICP-6694: Fix the support menu test.
idimopoulos Oct 5, 2021
a56cf15
ISAICP-6694: Fix the site-menus test.
idimopoulos Oct 5, 2021
b65b48e
ISAICP-6694: The joinup_default_content module is meant to be enabled…
idimopoulos Oct 5, 2021
d024710
ISAICP-6694: Provide a sample test for the footer menus.
idimopoulos Oct 5, 2021
4300428
ISAICP-6694: Include a patch for the menu_link_destination module.
idimopoulos Oct 6, 2021
2667656
Merge remote-tracking branch 'origin/ISAICP-6415' into ISAICP-6694
idimopoulos Oct 7, 2021
32676fa
ISAICP-6694: hal module is required for the default content.
idimopoulos Oct 8, 2021
f04a525
Merge remote-tracking branch 'origin/ISAICP-6415' into ISAICP-6694
idimopoulos Oct 13, 2021
bd63423
Merge remote-tracking branch 'origin/ISAICP-6415' into ISAICP-6694
pfrenssen Oct 15, 2021
9b9ed41
ISAICP-6694: Restore styling of the social media menu: place it under…
pfrenssen Oct 15, 2021
9a9cb1b
ISAICP-6694: Fix typo.
pfrenssen Oct 15, 2021
0fa471b
ISAICP-6694: Update documentation.
pfrenssen Oct 15, 2021
3eefb03
ISAICP-6694: Remove duplicate menu.
pfrenssen Oct 15, 2021
55779e5
ISAICP-6694: Explain a bit more in detail how default content works.
pfrenssen Oct 15, 2021
25b6ddd
ISAICP-6694: Restore exact styling of the footer menus.
pfrenssen Oct 15, 2021
42c099c
Merge remote-tracking branch 'origin/ISAICP-6415' into ISAICP-6694
pfrenssen Oct 18, 2021
ff813f7
Merge remote-tracking branch 'origin/ISAICP-6415' into ISAICP-6694
pfrenssen Oct 22, 2021
6e0da12
Merge branch 'ISAICP-6694' of github.com:ec-europa/joinup-dev into IS…
idimopoulos Oct 27, 2021
8af4847
Merge remote-tracking branch 'origin/ISAICP-6415' into ISAICP-6694
idimopoulos Oct 27, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"drupal/config_readonly": "^1.0",
"drupal/core": "~8.9",
"drupal/core-composer-scaffold": "~8.9",
"drupal/default_content": "^2.0@alpha",
"drupal/diff": "~1.0",
"drupal/digital_size_formatter": "~2.0",
"drupal/dynamic_entity_reference": "~2.0",
Expand Down Expand Up @@ -308,6 +309,9 @@
"drupal/matomo_reporting_api": {
"Ensure backward compatibility with Piwik @see https://www.drupal.org/project/matomo_reporting_api/issues/3080854": "https://www.drupal.org/files/issues/2019-09-18/3080854-7.patch"
},
"drupal/menu_link_destination": {
"Array to string conversion @see https://www.drupal.org/project/menu_link_destination/issues/3240983": "https://git.drupalcode.org/project/menu_link_destination/-/merge_requests/1.diff"
},
"drupal/message_digest": {
"MessageDigestSubcontext is deprecated @see https://www.drupal.org/project/message_digest/issues/3168495": "https://www.drupal.org/files/issues/2020-09-01/3168495-2.patch"
},
Expand Down
128 changes: 104 additions & 24 deletions composer.lock

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

Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
uuid: 1acef884-058e-450c-bc67-505d3a3fd838
uuid: 8f2ad8e0-8d6f-4885-a094-79f176363562
langcode: en
status: true
dependencies:
config:
- system.menu.footer
- system.menu.footer-about-us
module:
- system
theme:
- ventuno
_core:
default_config_hash: IBAuorDvEPLpOEBTV6rOAnCmaW1fezbLLj0dtgQI2G0
id: ventuno_footer_menu
id: aboutus
theme: ventuno
region: footer
weight: -16
weight: -27
provider: null
plugin: 'system_menu_block:footer'
plugin: 'system_menu_block:footer-about-us'
settings:
id: 'system_menu_block:footer'
id: 'system_menu_block:footer-about-us'
label: 'About us'
provider: system
label_display: visible
Expand Down
25 changes: 25 additions & 0 deletions config/sync/block.block.europeancommission.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
uuid: d516d818-3d5b-4165-9c28-097f3d30a5a4
langcode: en
status: true
dependencies:
config:
- system.menu.footer-european-commission
module:
- system
theme:
- ventuno
id: europeancommission
theme: ventuno
region: footer
weight: -25
provider: null
plugin: 'system_menu_block:footer-european-commission'
settings:
id: 'system_menu_block:footer-european-commission'
label: 'European Commission'
provider: system
label_display: visible
level: 1
depth: 0
expand_all_items: false
visibility: { }
25 changes: 25 additions & 0 deletions config/sync/block.block.followus.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
uuid: 3c616799-451c-4e41-a80f-53005908a1e2
langcode: en
status: true
dependencies:
config:
- system.menu.footer-follow-us
module:
- system
theme:
- ventuno
id: followus
theme: ventuno
region: footer
weight: -24
provider: null
plugin: 'system_menu_block:footer-follow-us'
settings:
id: 'system_menu_block:footer-follow-us'
label: 'Follow us'
provider: system
label_display: visible
level: 1
depth: 0
expand_all_items: false
visibility: { }
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
uuid: d6b3e8ba-af9b-417a-a18e-861ab66e1292
uuid: eefc933f-d7e0-4283-940b-0bf08b427977
langcode: en
status: true
dependencies:
config:
- system.menu.support
- system.menu.footer-help-and-support
module:
- system
theme:
- ventuno
id: help_and_support_footer
id: helpandsupport
theme: ventuno
region: footer
weight: 0
weight: -26
provider: null
plugin: 'system_menu_block:support'
plugin: 'system_menu_block:footer-help-and-support'
settings:
id: 'system_menu_block:support'
id: 'system_menu_block:footer-help-and-support'
label: 'Help and support'
provider: system
label_display: visible
Expand Down
25 changes: 25 additions & 0 deletions config/sync/block.block.socialmedia.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
uuid: 7202a38b-0b30-4f16-b17e-5adbd97924c1
langcode: en
status: true
dependencies:
config:
- system.menu.footer-social-media
module:
- system
theme:
- ventuno
id: socialmedia
theme: ventuno
region: footer
weight: -23
provider: null
plugin: 'system_menu_block:footer-social-media'
settings:
id: 'system_menu_block:footer-social-media'
label: 'Social media'
provider: system
label_display: visible
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the design mockup, the Social Media menu does not have a label. We can hide it by toggling the label_display option.

level: 1
depth: 0
expand_all_items: false
visibility: { }
Loading