bachir
/
materio-d9
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added home links as individual links, improved the home layout with field_group

This commit is contained in:
Bachir Soussi Chiadmi 2020-12-26 17:05:58 +01:00
parent ba503a97cb
commit c60d9c7316
18 changed files with 593 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@ -36,8 +36,10 @@
"drupal/content_sync": "2.x-dev@dev",
"drupal/core-composer-scaffold": "^9.0",
"drupal/debug_bar": "^1.4",
"drupal/editor_advanced_link": "^1.8",
"drupal/entity_clone": "^1.0",
"drupal/error_log": "^1.0",
"drupal/field_group": "3.x-dev@dev",
"drupal/field_permissions": "^1.0",
"drupal/flag_lists": "^4.0@beta",
"drupal/genpass": "^1.x-dev",
@ -143,6 +145,10 @@
},
"drupal/commerce_cart_api": {
"Error: Call to a member function hasRequirement() on null https://www.drupal.org/project/commerce_cart_api/issues/3116623" : "https://www.drupal.org/files/issues/2020-03-05/3116623-3.patch"
},
"drupal/field_group": {
"undefined index name 18 https://www.drupal.org/project/field_group/issues/3064890" : "https://www.drupal.org/files/issues/2020-10-01/field_group-undefined-index-name-3064890-18.patch",
"undefined index name 16 https://www.drupal.org/project/field_group/issues/3064890" : "https://www.drupal.org/files/issues/2020-08-10/field_group-undefined-index-name-3064890-16.patch"
}
},
"drupal-scaffold": {

71
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "d537c65dd030c043b106fe27f25a754a",
"content-hash": "3d12b27bce24c17b1d9786c4053a60b3",
"packages": [
{
"name": "alchemy/zippy",
@ -6092,6 +6092,50 @@
"issues": "https://www.drupal.org/project/issues/domain_site_settings"
}
},
{
"name": "drupal/editor_advanced_link",
"version": "1.8.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/editor_advanced_link.git",
"reference": "8.x-1.8"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/editor_advanced_link-8.x-1.8.zip",
"reference": "8.x-1.8",
"shasum": "510c3abff415933a34f4b8284d1440aaec2b95d9"
},
"require": {
"drupal/core": "^8 || ^9"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.8",
"datestamp": "1588757015",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "DuaelFr",
"homepage": "https://www.drupal.org/user/931394"
}
],
"description": "Add title, target etc. attributes to Text Editor's link dialog if the text format allows them.",
"homepage": "https://www.drupal.org/project/editor_advanced_link",
"support": {
"source": "https://git.drupalcode.org/project/editor_advanced_link"
}
},
{
"name": "drupal/email_registration",
"version": "1.1.0",
@ -6643,17 +6687,11 @@
},
{
"name": "drupal/field_group",
"version": "3.1.0",
"version": "dev-3.x",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/field_group.git",
"reference": "8.x-3.1"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.1.zip",
"reference": "8.x-3.1",
"shasum": "8a719eaea594f0ba874172831cb28da93c66b77a"
"reference": "9f59f951d92d1b20afae70940947769dc6c63a52"
},
"require": {
"drupal/core": "^8.8 || ^9"
@ -6663,12 +6701,15 @@
},
"type": "drupal-module",
"extra": {
"branch-alias": {
"dev-3.x": "3.x-dev"
},
"drupal": {
"version": "8.x-3.1",
"datestamp": "1591772567",
"version": "8.x-3.1+12-dev",
"datestamp": "1605118690",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
"status": "not-covered",
"message": "Dev releases are not covered by Drupal security advisories."
}
}
},
@ -6703,7 +6744,8 @@
"support": {
"source": "https://git.drupalcode.org/project/field_group",
"issues": "https://www.drupal.org/project/issues/field_group"
}
},
"time": "2020-11-11T18:37:27+00:00"
},
{
"name": "drupal/field_permissions",
@ -17859,6 +17901,7 @@
"drupal/commerce_variation_cart_form": 20,
"drupal/computed_field": 10,
"drupal/content_sync": 20,
"drupal/field_group": 20,
"drupal/flag_lists": 10,
"drupal/genpass": 20,
"drupal/graphql": 20,

128
config/sync/core.entity_form_display.node.frontpage.default.yml
View File

@ -5,12 +5,108 @@ dependencies:
config:
- field.field.node.frontpage.field_a_database
- field.field.node.frontpage.field_blabla
- field.field.node.frontpage.field_blabla_links
- field.field.node.frontpage.field_database_links
- field.field.node.frontpage.field_pricing
- field.field.node.frontpage.field_showroom_links
- field.field.node.frontpage.field_showrooms
- field.field.node.frontpage.field_what_is_materio
- node.type.frontpage
module:
- field_group
- link
- text
third_party_settings:
field_group:
group_htabs:
children:
- group_intro
- group_database
- group_showrooms
- group_blabla
- group_pricing
parent_name: ''
weight: 1
format_type: tabs
region: content
format_settings:
id: ''
classes: ''
direction: vertical
label: htabs
group_intro:
children:
- field_what_is_materio
parent_name: group_htabs
weight: 19
format_type: tab
region: content
format_settings:
id: ''
classes: ''
description: ''
formatter: open
required_fields: true
label: Intro
group_database:
children:
- field_a_database
- field_database_links
parent_name: group_htabs
weight: 20
format_type: tab
region: hidden
format_settings:
id: ''
classes: ''
description: ''
formatter: closed
required_fields: true
label: Database
group_showrooms:
children:
- field_showrooms
- field_showroom_links
parent_name: group_htabs
weight: 21
format_type: tab
region: hidden
format_settings:
id: ''
classes: ''
description: ''
formatter: closed
required_fields: true
label: Showrooms
group_blabla:
children:
- field_blabla
- field_blabla_links
parent_name: group_htabs
weight: 22
format_type: tab
region: hidden
format_settings:
id: ''
classes: ''
description: ''
formatter: closed
required_fields: true
label: Blabla
group_pricing:
children:
- field_pricing
parent_name: group_htabs
weight: 23
format_type: tab
region: hidden
format_settings:
id: ''
classes: ''
description: ''
formatter: closed
required_fields: true
label: Pricing
id: node.frontpage.default
targetEntityType: node
bundle: frontpage
@ -32,14 +128,38 @@ content:
third_party_settings: { }
type: text_textarea
region: content
field_blabla_links:
weight: 5
settings:
placeholder_url: ''
placeholder_title: ''
third_party_settings: { }
type: link_default
region: content
field_database_links:
weight: 3
settings:
placeholder_url: ''
placeholder_title: ''
third_party_settings: { }
type: link_default
region: content
field_pricing:
weight: 26
weight: 2
settings:
rows: 5
placeholder: ''
third_party_settings: { }
type: text_textarea
region: content
field_showroom_links:
weight: 4
settings:
placeholder_url: ''
placeholder_title: ''
third_party_settings: { }
type: link_default
region: content
field_showrooms:
weight: 3
settings:
@ -49,7 +169,7 @@ content:
type: text_textarea
region: content
field_what_is_materio:
weight: 1
weight: 20
settings:
rows: 5
placeholder: ''
@ -58,7 +178,7 @@ content:
region: content
langcode:
type: language_select
weight: 5
weight: 3
region: content
settings:
include_locked: true
@ -72,7 +192,7 @@ content:
placeholder: ''
third_party_settings: { }
translation:
weight: 6
weight: 4
region: content
settings: { }
third_party_settings: { }

176
config/sync/core.entity_view_display.node.frontpage.default.yml
View File

@ -5,12 +5,16 @@ dependencies:
config:
- field.field.node.frontpage.field_a_database
- field.field.node.frontpage.field_blabla
- field.field.node.frontpage.field_blabla_links
- field.field.node.frontpage.field_database_links
- field.field.node.frontpage.field_pricing
- field.field.node.frontpage.field_showroom_links
- field.field.node.frontpage.field_showrooms
- field.field.node.frontpage.field_what_is_materio
- node.type.frontpage
module:
- field_group
- link
- text
- user
third_party_settings:
@ -36,8 +40,8 @@ third_party_settings:
region: content
group_database:
children:
- field_a_database
- computed_materials_reference
- group_db_col_left
- group_db_col_right
parent_name: ''
weight: 1
format_type: html_element
@ -55,8 +59,8 @@ third_party_settings:
region: content
group_showrooms:
children:
- field_showrooms
- computed_showrooms_reference
- group_showroom_col_left
- group_showroom_col_right
parent_name: ''
weight: 2
format_type: html_element
@ -74,8 +78,8 @@ third_party_settings:
region: content
group_blabla:
children:
- field_blabla
- computed_articles_reference
- group_blabla_col_left
- group_blabla_col_right
parent_name: ''
weight: 3
format_type: html_element
@ -109,6 +113,117 @@ third_party_settings:
classes: home-pricing
label: pricing
region: content
group_db_col_left:
children:
- field_a_database
- field_database_links
parent_name: group_database
weight: 5
format_type: html_element
region: hidden
format_settings:
id: ''
classes: 'col left db'
element: div
show_label: false
label_element: h3
label_element_classes: ''
attributes: ''
effect: none
speed: fast
label: db-col-left
group_db_col_right:
children:
- computed_materials_reference
parent_name: group_database
weight: 8
format_type: html_element
region: hidden
format_settings:
id: ''
classes: 'col right db'
element: div
show_label: false
label_element: h3
label_element_classes: ''
attributes: ''
effect: none
speed: fast
label: db-col-right
group_showroom_col_left:
children:
- field_showrooms
- field_showroom_links
parent_name: group_showrooms
weight: 20
format_type: html_element
region: hidden
format_settings:
id: ''
classes: 'col left sowroom'
element: div
show_label: false
label_element: h3
label_element_classes: ''
attributes: ''
effect: none
speed: fast
label: showroom-col-left
group_showroom_col_right:
children:
- computed_showrooms_reference
parent_name: group_showrooms
weight: 21
format_type: html_element
region: hidden
format_settings:
id: ''
classes: 'col right sowroom'
element: div
show_label: false
label_element: h3
label_element_classes: ''
attributes: ''
effect: none
speed: fast
label: showroom-col-right
group_blabla_col_left:
children:
- field_blabla
- field_blabla_links
parent_name: group_blabla
weight: 20
format_type: html_element
region: hidden
format_settings:
id: ''
classes: 'col left blabla'
element: div
show_label: false
label_element: h3
label_element_classes: ''
attributes: ''
effect: none
speed: fast
label: blabla-col-left
group_blabla_col_right:
children:
- computed_articles_reference
parent_name: group_blabla
weight: 21
format_type: html_element
region: hidden
format_settings:
id: ''
classes: 'col right blabla'
element: div
show_label: false
label_element: h3
label_element_classes: ''
attributes: ''
effect: none
speed: fast
label: blabla-col-right
id: node.frontpage.default
targetEntityType: node
bundle: frontpage
@ -116,7 +231,7 @@ mode: default
content:
computed_articles_reference:
label: hidden
weight: 5
weight: 6
region: content
settings:
view_mode: card_medium
@ -124,7 +239,7 @@ content:
third_party_settings: { }
type: entity_reference_entity_view
computed_materials_reference:
weight: 3
weight: 9
region: content
settings:
view_mode: card_medium
@ -134,7 +249,7 @@ content:
label: hidden
computed_showrooms_reference:
label: hidden
weight: 4
weight: 6
region: content
settings:
view_mode: home
@ -142,7 +257,7 @@ content:
third_party_settings: { }
type: entity_reference_entity_view
field_a_database:
weight: 2
weight: 6
label: above
settings: { }
third_party_settings: { }
@ -155,6 +270,30 @@ content:
third_party_settings: { }
type: text_default
region: content
field_blabla_links:
weight: 5
label: hidden
settings:
trim_length: 80
url_only: false
url_plain: false
rel: ''
target: ''
third_party_settings: { }
type: link
region: content
field_database_links:
weight: 7
label: hidden
settings:
trim_length: 80
url_only: false
url_plain: false
rel: ''
target: ''
third_party_settings: { }
type: link
region: content
field_pricing:
weight: 5
label: above
@ -162,6 +301,18 @@ content:
third_party_settings: { }
type: text_default
region: content
field_showroom_links:
weight: 4
label: hidden
settings:
trim_length: 80
url_only: false
url_plain: false
rel: ''
target: ''
third_party_settings: { }
type: link
region: content
field_showrooms:
weight: 3
label: above
@ -176,6 +327,11 @@ content:
third_party_settings: { }
type: text_default
region: content
flag_flag_list_template_1:
weight: 10
region: content
settings: { }
third_party_settings: { }
title:
type: string
weight: 1

17
config/sync/core.entity_view_display.node.frontpage.teaser.yml
View File

@ -4,6 +4,14 @@ status: true
dependencies:
config:
- core.entity_view_mode.node.teaser
- field.field.node.frontpage.field_a_database
- field.field.node.frontpage.field_blabla
- field.field.node.frontpage.field_blabla_links
- field.field.node.frontpage.field_database_links
- field.field.node.frontpage.field_pricing
- field.field.node.frontpage.field_showroom_links
- field.field.node.frontpage.field_showrooms
- field.field.node.frontpage.field_what_is_materio
- node.type.frontpage
module:
- user
@ -36,6 +44,11 @@ content:
link: true
third_party_settings: { }
type: entity_reference_label
flag_flag_list_template_1:
weight: 10
settings: { }
third_party_settings: { }
region: content
links:
weight: 100
settings: { }
@ -52,7 +65,11 @@ content:
hidden:
field_a_database: true
field_blabla: true
field_blabla_links: true
field_database_links: true
field_pricing: true
field_showroom_links: true
field_showrooms: true
field_what_is_materio: true
langcode: true
search_api_excerpt: true

1
config/sync/core.extension.yml
View File

@ -61,6 +61,7 @@ module:
datetime_range: 0
dynamic_page_cache: 0
editor: 0
editor_advanced_link: 0
editors_menus: 0
email_registration: 0
embed: 0

23
config/sync/field.field.node.frontpage.field_blabla_links.yml Normal file
View File

@ -0,0 +1,23 @@
uuid: ebda730e-8b8c-4c98-833d-b232b7dc00de
langcode: en
status: true
dependencies:
config:
- field.storage.node.field_blabla_links
- node.type.frontpage
module:
- link
id: node.frontpage.field_blabla_links
field_name: field_blabla_links
entity_type: node
bundle: frontpage
label: 'Blabla links'
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
link_type: 17
title: 1
field_type: link

23
config/sync/field.field.node.frontpage.field_database_links.yml Normal file
View File

@ -0,0 +1,23 @@
uuid: 4c80f6de-37ed-4c43-bb96-21364bb7733f
langcode: en
status: true
dependencies:
config:
- field.storage.node.field_database_links
- node.type.frontpage
module:
- link
id: node.frontpage.field_database_links
field_name: field_database_links
entity_type: node
bundle: frontpage
label: 'Database Links'
description: ''
required: false
translatable: true
default_value: { }
default_value_callback: ''
settings:
link_type: 17
title: 1
field_type: link

23
config/sync/field.field.node.frontpage.field_showroom_links.yml Normal file
View File

@ -0,0 +1,23 @@
uuid: 5f212efb-d4ae-449b-8779-42dd21fc33e0
langcode: en
status: true
dependencies:
config:
- field.storage.node.field_showroom_links
- node.type.frontpage
module:
- link
id: node.frontpage.field_showroom_links
field_name: field_showroom_links
entity_type: node
bundle: frontpage
label: 'Showroom Links'
description: ''
required: false
translatable: true
default_value: { }
default_value_callback: ''
settings:
link_type: 17
title: 1
field_type: link

23
config/sync/field.storage.node.field_blabla_links.yml Normal file
View File

@ -0,0 +1,23 @@
uuid: b84596a8-e771-4449-a19f-1f87fb44a0f5
langcode: en
status: true
dependencies:
module:
- field_permissions
- link
- node
third_party_settings:
field_permissions:
permission_type: public
id: node.field_blabla_links
field_name: field_blabla_links
entity_type: node
type: link
settings: { }
module: link
locked: false
cardinality: -1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false

23
config/sync/field.storage.node.field_database_links.yml Normal file
View File

@ -0,0 +1,23 @@
uuid: 87a730f0-ed14-4cb3-acc8-3b414c358c0f
langcode: en
status: true
dependencies:
module:
- field_permissions
- link
- node
third_party_settings:
field_permissions:
permission_type: public
id: node.field_database_links
field_name: field_database_links
entity_type: node
type: link
settings: { }
module: link
locked: false
cardinality: -1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false

23
config/sync/field.storage.node.field_showroom_links.yml Normal file
View File

@ -0,0 +1,23 @@
uuid: 1da9fce3-c5f7-4441-85dd-a45e89ba4e0b
langcode: en
status: true
dependencies:
module:
- field_permissions
- link
- node
third_party_settings:
field_permissions:
permission_type: public
id: node.field_showroom_links
field_name: field_showroom_links
entity_type: node
type: link
settings: { }
module: link
locked: false
cardinality: -1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false

1
config/sync/language/fr/system.action.pathauto_update_alias_node.yml Normal file
View File

@ -0,0 +1 @@
label: 'Mettre à jour l''alias d''URL'

1
config/sync/language/fr/system.action.pathauto_update_alias_user.yml Normal file
View File

@ -0,0 +1 @@
label: 'Mettre à jour l''alias d''URL'

2
web/profiles/d8-starterkit-profile

@ -1 +1 @@
Subproject commit 1ffeb20a1ca2ffe092d883018ed0c2497b46d624
Subproject commit 51695cacd6979594b363390acf3840930fe75ecd

37
web/themes/custom/materiotheme/assets/dist/main.css vendored
View File

@ -1538,7 +1538,17 @@ article.node--type-frontpage > h2 {
article.node--type-frontpage .node__content > section.home-database {
background-color: #69cdcf; }
article.node--type-frontpage .node__content > section.home-database .field--name-field-a-database a.btn {
article.node--type-frontpage .node__content > section.home-database .field--name-field-database-links .field__item {
display: inline-block; }
article.node--type-frontpage .node__content > section.home-database .field--name-field-database-links .field__item a {
display: inline-block;
font-size: 0.9em;
font-weight: bold;
padding: 0.7em 1em;
margin-bottom: 0.3em;
background-color: #fff;
color: #000;
border-radius: 5px;
background-color: #fff;
color: #69cdcf; }
article.node--type-frontpage .node__content > section.home-database .cards-list-home {
@ -1574,7 +1584,17 @@ article.node--type-frontpage .node__content > section.home-database {
article.node--type-frontpage .node__content > section.home-showrooms {
background-color: #50aa3c; }
article.node--type-frontpage .node__content > section.home-showrooms .field--name-field-showrooms a.btn {
article.node--type-frontpage .node__content > section.home-showrooms .field--name-field-showroom-links .field__item {
display: inline-block; }
article.node--type-frontpage .node__content > section.home-showrooms .field--name-field-showroom-links .field__item a {
display: inline-block;
font-size: 0.9em;
font-weight: bold;
padding: 0.7em 1em;
margin-bottom: 0.3em;
background-color: #fff;
color: #000;
border-radius: 5px;
background-color: #fff;
color: #50aa3c; }
article.node--type-frontpage .node__content > section.home-showrooms .field--name-computed-showrooms-reference {
@ -1622,6 +1642,19 @@ article.node--type-frontpage .node__content > section.home-showrooms {
article.node--type-frontpage .node__content > section.home-blabla {
background-color: #9458aa; }
article.node--type-frontpage .node__content > section.home-blabla .field--name-field-blabla-links .field__item {
display: inline-block; }
article.node--type-frontpage .node__content > section.home-blabla .field--name-field-blabla-links .field__item a {
display: inline-block;
font-size: 0.9em;
font-weight: bold;
padding: 0.7em 1em;
margin-bottom: 0.3em;
background-color: #fff;
color: #000;
border-radius: 5px;
background-color: #fff;
color: #9458aa; }
article.node--type-frontpage .node__content > section.home-blabla .cards-list-home {
position: relative;
overflow-y: hidden; }

4
web/themes/custom/materiotheme/assets/dist/main.js vendored
View File

File diff suppressed because one or more lines are too long

38
web/themes/custom/materiotheme/assets/styles/main.scss
View File

@ -536,6 +536,17 @@ article.node--type-frontpage{
.node__content{
@mixin btn{
display: inline-block;
font-size: 0.9em;
font-weight: bold;
padding: 0.7em 1em;
margin-bottom: 0.3em;
background-color: #fff;
color: #000;
border-radius: 5px;
}
&>section{
&.home-intro{
@extend %part-centered-layout;
@ -544,11 +555,17 @@ article.node--type-frontpage{
background-color: $color-base;
@extend %part-columned-layout;
.field--name-field-a-database{
a.btn{
}
.field--name-field-database-links{
.field__item{
display: inline-block;
a{
@include btn;
background-color: #fff;
color: $color-base;
}
}
}
.cards-list-home{
position: relative;
// max-height: (130px*1.4)*3;
@ -585,12 +602,17 @@ article.node--type-frontpage{
&.home-showrooms{
background-color: $color-showrooms;
@extend %part-columned-layout;
.field--name-field-showrooms{
a.btn{
.field--name-field-showrooms{}
.field--name-field-showroom-links{
.field__item{
display: inline-block;
a{
@include btn;
background-color: #fff;
color: $color-showrooms;
}
}
}
.field--name-computed-showrooms-reference{
position:relative;
// height:550px;
@ -657,6 +679,16 @@ article.node--type-frontpage{
background-color: $color-blabla;
@extend %part-columned-layout;
.field--name-field-blabla-links{
.field__item{
display: inline-block;
a{
@include btn;
background-color: #fff;
color: $color-blabla;
}
}
}
.cards-list-home{
position: relative;
$bp: ($column_width*2 + $column_goutiere );