Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2985551 by shaal, imalabya, kjay, Sam152, MaddieC, markconroy, Gábor Hojtsy, Gvert: Style and show content moderation form in Umami

merge-requests/1119/head
Gábor Hojtsy 2019-05-14 15:21:00 +02:00
parent 50a5f02e2e
commit 298fddc645
6 changed files with 99 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml
View File

@ -24,6 +24,11 @@ content:
settings: { } settings: { }
third_party_settings: { } third_party_settings: { }
label: hidden label: hidden
content_moderation_control:
weight: 4
region: content
settings: { }
third_party_settings: { }
field_image: field_image:
type: responsive_image type: responsive_image
weight: 1 weight: 1
@ -47,5 +52,4 @@ content:
settings: { } settings: { }
third_party_settings: { } third_party_settings: { }
hidden: hidden:
content_moderation_control: true
langcode: true langcode: true

12
core/profiles/demo_umami/config/install/core.entity_view_display.node.page.default.yml
View File

@ -15,13 +15,19 @@ content:
body: body:
label: hidden label: hidden
type: text_default type: text_default
weight: 100 weight: 0
region: content
settings: { }
third_party_settings: { }
content_moderation_control:
weight: 2
region: content region: content
settings: { } settings: { }
third_party_settings: { } third_party_settings: { }
links: links:
weight: 101 weight: 1
region: content region: content
settings: { }
third_party_settings: { }
hidden: hidden:
content_moderation_control: true
langcode: true langcode: true

86
core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml
View File

@ -30,8 +30,8 @@ third_party_settings:
layout_id: layout_onecol layout_id: layout_onecol
layout_settings: { } layout_settings: { }
components: components:
3edf9c3e-2dfd-475e-9418-fce6b371b8b7: 44801518-fe93-421a-bdcb-550493c7925d:
uuid: 3edf9c3e-2dfd-475e-9418-fce6b371b8b7 uuid: 44801518-fe93-421a-bdcb-550493c7925d
region: content region: content
configuration: configuration:
label_display: '0' label_display: '0'
@ -45,8 +45,8 @@ third_party_settings:
type: text_default type: text_default
additional: { } additional: { }
weight: 0 weight: 0
2dd1b920-bc1b-46ea-a4d2-d800aeadf2fe: 0eff9e1d-4e73-4748-b910-e5568df1d5aa:
uuid: 2dd1b920-bc1b-46ea-a4d2-d800aeadf2fe uuid: 0eff9e1d-4e73-4748-b910-e5568df1d5aa
region: content region: content
configuration: configuration:
label_display: '0' label_display: '0'
@ -60,9 +60,25 @@ third_party_settings:
third_party_settings: { } third_party_settings: { }
type: entity_reference_label type: entity_reference_label
additional: { } additional: { }
weight: 1
eadd557c-6414-40e5-9a95-355720385477:
uuid: eadd557c-6414-40e5-9a95-355720385477
region: content
configuration:
label_display: '0'
context_mapping:
entity: layout_builder.entity
id: 'field_block:node:recipe:field_tags'
formatter:
label: inline
settings:
link: true
third_party_settings: { }
type: entity_reference_label
additional: { }
weight: 2 weight: 2
56d1c2c3-ad14-4776-a96a-5ece52e3e74c: e57c136c-2758-4d90-86e5-2d3e8be9881a:
uuid: 56d1c2c3-ad14-4776-a96a-5ece52e3e74c uuid: e57c136c-2758-4d90-86e5-2d3e8be9881a
region: content region: content
configuration: configuration:
label_display: '0' label_display: '0'
@ -77,9 +93,9 @@ third_party_settings:
third_party_settings: { } third_party_settings: { }
type: responsive_image type: responsive_image
additional: { } additional: { }
weight: 4 weight: 3
16a466cf-ac16-4245-bafd-192a4aab0cfe: 00488840-db50-4afe-9c30-a123e6707fa9:
uuid: 16a466cf-ac16-4245-bafd-192a4aab0cfe uuid: 00488840-db50-4afe-9c30-a123e6707fa9
region: content region: content
configuration: configuration:
label_display: '0' label_display: '0'
@ -94,9 +110,9 @@ third_party_settings:
third_party_settings: { } third_party_settings: { }
type: number_integer type: number_integer
additional: { } additional: { }
weight: 5 weight: 4
470e921c-baf5-419d-8cc7-32680baec10b: f91febc6-d924-47a2-8ffd-b71d3b2597c7:
uuid: 470e921c-baf5-419d-8cc7-32680baec10b uuid: f91febc6-d924-47a2-8ffd-b71d3b2597c7
region: content region: content
configuration: configuration:
label_display: '0' label_display: '0'
@ -111,9 +127,9 @@ third_party_settings:
third_party_settings: { } third_party_settings: { }
type: number_integer type: number_integer
additional: { } additional: { }
weight: 6 weight: 5
5e9bb5f4-eab9-4682-ba59-fff7ad7f7619: a2d450d0-08ce-4123-bca0-411bfa1da132:
uuid: 5e9bb5f4-eab9-4682-ba59-fff7ad7f7619 uuid: a2d450d0-08ce-4123-bca0-411bfa1da132
region: content region: content
configuration: configuration:
label_display: '0' label_display: '0'
@ -128,9 +144,9 @@ third_party_settings:
third_party_settings: { } third_party_settings: { }
type: number_integer type: number_integer
additional: { } additional: { }
weight: 7 weight: 6
7f882d25-f4d2-4693-a6a9-a7ba374206fd: df8bfafc-210c-4d86-9745-e47081ab0fd4:
uuid: 7f882d25-f4d2-4693-a6a9-a7ba374206fd uuid: df8bfafc-210c-4d86-9745-e47081ab0fd4
region: content region: content
configuration: configuration:
label_display: '0' label_display: '0'
@ -143,9 +159,9 @@ third_party_settings:
third_party_settings: { } third_party_settings: { }
type: list_default type: list_default
additional: { } additional: { }
weight: 8 weight: 7
65889db5-1611-4324-8d0f-1d54e74afd21: 6924bf2e-8baa-4081-803a-7a2d3b7d8e14:
uuid: 65889db5-1611-4324-8d0f-1d54e74afd21 uuid: 6924bf2e-8baa-4081-803a-7a2d3b7d8e14
region: content region: content
configuration: configuration:
label_display: '0' label_display: '0'
@ -159,9 +175,9 @@ third_party_settings:
third_party_settings: { } third_party_settings: { }
type: string type: string
additional: { } additional: { }
weight: 9 weight: 8
7b39285b-a320-4852-979d-976939608d76: f61cae40-5865-4c4c-98fa-14b8234e7b98:
uuid: 7b39285b-a320-4852-979d-976939608d76 uuid: f61cae40-5865-4c4c-98fa-14b8234e7b98
region: content region: content
configuration: configuration:
label_display: '0' label_display: '0'
@ -174,23 +190,17 @@ third_party_settings:
third_party_settings: { } third_party_settings: { }
type: text_default type: text_default
additional: { } additional: { }
weight: 10 weight: 9
de19ef93-0d31-41ea-8cd8-0da398c4be32: d4b753a7-e1b1-4062-a1d0-a2666362693e:
uuid: de19ef93-0d31-41ea-8cd8-0da398c4be32 uuid: d4b753a7-e1b1-4062-a1d0-a2666362693e
region: content region: content
configuration: configuration:
label_display: '0' label_display: '0'
context_mapping: context_mapping:
entity: layout_builder.entity entity: layout_builder.entity
id: 'field_block:node:recipe:field_tags' id: 'extra_field_block:node:recipe:content_moderation_control'
formatter:
label: inline
settings:
link: true
third_party_settings: { }
type: entity_reference_label
additional: { } additional: { }
weight: 3 weight: 10
third_party_settings: { } third_party_settings: { }
allow_custom: true allow_custom: true
enabled: true enabled: true
@ -199,6 +209,11 @@ targetEntityType: node
bundle: recipe bundle: recipe
mode: full mode: full
content: content:
content_moderation_control:
weight: 10
region: content
settings: { }
third_party_settings: { }
field_cooking_time: field_cooking_time:
weight: 5 weight: 5
label: inline label: inline
@ -281,7 +296,6 @@ content:
type: entity_reference_label type: entity_reference_label
region: content region: content
hidden: hidden:
content_moderation_control: true
langcode: true langcode: true
layout_builder__layout: true layout_builder__layout: true
links: true links: true

13
core/profiles/demo_umami/themes/umami/css/base.css
View File

@ -213,6 +213,19 @@ img {
height: auto; height: auto;
} }
.form-select {
margin: 0.25rem 0;
color: #000;
border: 2px solid #767775;
background: #fff;
font-size: 1rem;
}
.form-select:focus {
margin-bottom: 2px;
border: 2px solid #00836d;
}
input { input {
min-width: 100%; min-width: 100%;
max-width: 100%; max-width: 100%;

21
core/profiles/demo_umami/themes/umami/css/components/forms/content-moderation.css Normal file
View File

@ -0,0 +1,21 @@
/**
* @file
* This file is used to style the content moderation form.
*/
.entity-moderation-form {
padding-top: 0.5em;
padding-right: 1em;
}
.entity-moderation-form .form-item,
.entity-moderation-form .form-submit {
margin: 0.5em 0;
}
.entity-moderation-form__item .form-text {
width: 100%;
}
.entity-moderation-form__item:last-child {
width: 100%;
}
.entity-moderation-form input[type="submit"] {
margin-bottom: 1em;
}

1
core/profiles/demo_umami/themes/umami/umami.libraries.yml
View File

@ -15,6 +15,7 @@ global:
css/components/blocks/search/search-results.css: {} css/components/blocks/search/search-results.css: {}
css/components/blocks/articles-aside/articles-aside.css: {} css/components/blocks/articles-aside/articles-aside.css: {}
css/components/forms/contact.css: {} css/components/forms/contact.css: {}
css/components/forms/content-moderation.css: {}
css/components/content/node.css: {} css/components/content/node.css: {}
css/components/content/full/node-full.css: {} css/components/content/full/node-full.css: {}
css/components/content-types/recipe/recipe.css: {} css/components/content-types/recipe/recipe.css: {}