Skip to content
Snippets Groups Projects
Commit 0ec3fb74 authored by Yasmeen Abuerrub's avatar Yasmeen Abuerrub Committed by Rajab Natshah
Browse files

Issue #2938940 by yasmeensalah: Varbase Blog Enhancements.

* BLOG Enhancements
* Fix
* Blog Enhancements
* Add page manager patch Issue #2665328: Variants take entity label not the variant title
parent 515eecb0
No related branches found
No related tags found
No related merge requests found
Showing
with 156 additions and 234 deletions
...@@ -244,7 +244,9 @@ ...@@ -244,7 +244,9 @@
}, },
"drupal/page_manager": { "drupal/page_manager": {
"Issue #2624972: No configuration possible in UI for 301, 303, etc. HTTP responses": "Issue #2624972: No configuration possible in UI for 301, 303, etc. HTTP responses":
"https://www.drupal.org/files/issues/page_manager-redirect_location-2624972-30.patch" "https://www.drupal.org/files/issues/page_manager-redirect_location-2624972-30.patch",
"Issue #2665328: Variants take entity label not the variant title":
"https://www.drupal.org/files/issues/2665328-57.patch"
}, },
"drupal/coffee": { "drupal/coffee": {
"Issue #2815381: Coffee breaks whole page when using right to left (rtl) languages in drupal 8": "Issue #2815381: Coffee breaks whole page when using right to left (rtl) languages in drupal 8":
......
...@@ -29,6 +29,8 @@ projects[page_manager][type] = module ...@@ -29,6 +29,8 @@ projects[page_manager][type] = module
projects[page_manager][version] = 4.0-beta2 projects[page_manager][version] = 4.0-beta2
;; Issue #2624972: No configuration possible in UI for 301, 303, etc. HTTP responses ;; Issue #2624972: No configuration possible in UI for 301, 303, etc. HTTP responses
projects[page_manager][patch][] = https://www.drupal.org/files/issues/page_manager-redirect_location-2624972-30.patch projects[page_manager][patch][] = https://www.drupal.org/files/issues/page_manager-redirect_location-2624972-30.patch
;; Issue #2665328: Variants take entity label not the variant title
projects[page_manager][patch][] = https://www.drupal.org/files/issues/2665328-57.patch
projects[panels][type] = module projects[panels][type] = module
projects[panels][version] = 4.2 projects[panels][version] = 4.2
......
...@@ -5,7 +5,7 @@ dependencies: ...@@ -5,7 +5,7 @@ dependencies:
- views.view.blog_entry - views.view.blog_entry
module: module:
- block_class - block_class
- ctools - system
- views - views
theme: theme:
- vartheme_material - vartheme_material
...@@ -25,11 +25,10 @@ settings: ...@@ -25,11 +25,10 @@ settings:
label_display: visible label_display: visible
views_label: '' views_label: ''
items_per_page: none items_per_page: none
context_mapping: { }
visibility: visibility:
'entity_bundle:node': request_path:
id: 'entity_bundle:node' id: request_path
bundles: pages: "/blog\r\n/blog/*"
varbase_blog: varbase_blog
negate: false negate: false
context_mapping: context_mapping: { }
node: '@node.node_route_context:node'
...@@ -5,7 +5,7 @@ dependencies: ...@@ -5,7 +5,7 @@ dependencies:
- views.view.blog_entry - views.view.blog_entry
module: module:
- block_class - block_class
- ctools - system
- views - views
theme: theme:
- vartheme_material - vartheme_material
...@@ -25,11 +25,10 @@ settings: ...@@ -25,11 +25,10 @@ settings:
label_display: visible label_display: visible
views_label: '' views_label: ''
items_per_page: none items_per_page: none
context_mapping: { }
visibility: visibility:
'entity_bundle:node': request_path:
id: 'entity_bundle:node' id: request_path
bundles: pages: "/blog\r\n/blog/*"
varbase_blog: varbase_blog
negate: false negate: false
context_mapping: context_mapping: { }
node: '@node.node_route_context:node'
langcode: en
status: true
dependencies:
config:
- views.view.blog_entry
module:
- block_class
- ctools
- views
theme:
- vartheme_material
third_party_settings:
block_class:
classes: ''
id: views_block__blog_entry_related_blogs
theme: vartheme_material
region: content
weight: 0
provider: null
plugin: 'views_block:blog_entry-related_blogs'
settings:
id: 'views_block:blog_entry-related_blogs'
label: ''
provider: views
label_display: visible
views_label: ''
items_per_page: none
context_mapping: { }
visibility:
'entity_bundle:node':
id: 'entity_bundle:node'
bundles:
varbase_blog: varbase_blog
negate: false
context_mapping:
node: '@node.node_route_context:node'
...@@ -93,12 +93,13 @@ content: ...@@ -93,12 +93,13 @@ content:
weight: 10 weight: 10
settings: settings:
entity_browser: image_browser entity_browser: image_browser
field_widget_display: label field_widget_display: rendered_entity
field_widget_edit: true field_widget_edit: true
field_widget_remove: true field_widget_remove: true
open: true open: true
selection_mode: selection_append selection_mode: selection_append
field_widget_display_settings: { } field_widget_display_settings:
view_mode: field_preview
third_party_settings: { } third_party_settings: { }
type: entity_browser_entity_reference type: entity_browser_entity_reference
region: content region: content
......
...@@ -122,14 +122,14 @@ content: ...@@ -122,14 +122,14 @@ content:
type: smart_trim type: smart_trim
weight: 10 weight: 10
settings: settings:
trim_length: '30' trim_length: 30
trim_type: words trim_type: words
trim_suffix: ' ...' trim_suffix: ' ...'
more_link: '0' more_link: false
more_text: More more_text: More
summary_handler: ignore summary_handler: ignore
trim_options: trim_options:
text: text text: true
more_class: more-link more_class: more-link
third_party_settings: third_party_settings:
ds: ds:
......
...@@ -4,7 +4,7 @@ dependencies: ...@@ -4,7 +4,7 @@ dependencies:
config: config:
- field.storage.node.field_categories - field.storage.node.field_categories
- node.type.varbase_blog - node.type.varbase_blog
- taxonomy.vocabulary.categories - taxonomy.vocabulary.blog_categories
id: node.varbase_blog.field_categories id: node.varbase_blog.field_categories
field_name: field_categories field_name: field_categories
entity_type: node entity_type: node
...@@ -19,10 +19,10 @@ settings: ...@@ -19,10 +19,10 @@ settings:
handler: 'default:taxonomy_term' handler: 'default:taxonomy_term'
handler_settings: handler_settings:
target_bundles: target_bundles:
categories: categories blog_categories: blog_categories
sort: sort:
field: name field: name
direction: asc direction: asc
auto_create: false auto_create: false
auto_create_bundle: '' auto_create_bundle: blog_categories
field_type: entity_reference field_type: entity_reference
...@@ -2,7 +2,15 @@ langcode: en ...@@ -2,7 +2,15 @@ langcode: en
status: true status: true
dependencies: { } dependencies: { }
id: node__varbase_blog id: node__varbase_blog
label: 'Content: Blog' label: 'Content: Blog post'
tags: tags:
description: '[node:summary]' schema_article_type: Article
title: '[node:title] | [site:name]' schema_article_publisher: 'a:7:{s:5:"@type";s:12:"Organization";s:3:"@id";s:10:"[site:url]";s:4:"name";s:11:"[site:name]";s:3:"url";s:10:"[site:url]";s:6:"sameAs";s:0:"";s:4:"logo";a:0:{}s:5:"pivot";s:0:"";}'
schema_article_date_published: '[node:created:html_datetime]'
schema_article_about: '[node:field_tags]'
schema_article_main_entity_of_page: '[current-page:url]'
schema_article_image: 'a:4:{s:5:"@type";s:11:"ImageObject";s:3:"url";s:50:"[node:field_image:entity:field_image:1200x630:url]";s:5:"width";s:4:"1200";s:6:"height";s:3:"630";}'
schema_article_date_modified: '[node:changed:html_datetime]'
schema_article_author: 'a:7:{s:5:"@type";s:6:"Person";s:3:"@id";s:0:"";s:4:"name";s:25:"[node:author:display-nam]";s:3:"url";s:17:"[node:author:url]";s:6:"sameAs";s:0:"";s:4:"logo";a:0:{}s:5:"pivot";s:0:"";}'
schema_article_headline: '[node:title]'
schema_article_description: '[node:summary]'
...@@ -7,7 +7,7 @@ third_party_settings: ...@@ -7,7 +7,7 @@ third_party_settings:
menu_ui: menu_ui:
available_menus: { } available_menus: { }
parent: '' parent: ''
name: Blog name: 'Blog post'
type: varbase_blog type: varbase_blog
description: 'Use <em>Blog</em> to publish blog post by different authors in the Blog section of the site.' description: 'Use <em>Blog</em> to publish blog post by different authors in the Blog section of the site.'
help: '' help: ''
......
langcode: en langcode: en
status: true status: true
dependencies: { } dependencies:
module:
- ctools
id: term_view id: term_view
label: 'Term View' label: 'Term View'
description: '' description: ''
use_admin_theme: false use_admin_theme: false
path: '/taxonomy/term/{taxonomy_term}' path: '/taxonomy/term/{taxonomy_term}'
access_logic: and access_logic: and
access_conditions: { } access_conditions:
-
id: 'entity_bundle:taxonomy_term'
bundles:
blog_categories: blog_categories
tags: tags
negate: false
context_mapping:
taxonomy_term: taxonomy_term
parameters: parameters:
taxonomy_term: taxonomy_term:
machine_name: taxonomy_term machine_name: taxonomy_term
......
...@@ -10,7 +10,7 @@ dependencies: ...@@ -10,7 +10,7 @@ dependencies:
- panels - panels
- views - views
id: blog-panels_variant-0 id: blog-panels_variant-0
label: Panels label: Blog
variant: panels_variant variant: panels_variant
variant_settings: variant_settings:
blocks: blocks:
...@@ -21,32 +21,10 @@ variant_settings: ...@@ -21,32 +21,10 @@ variant_settings:
label_display: '0' label_display: '0'
views_label: '' views_label: ''
items_per_page: none items_per_page: none
region: left region: main
weight: 0 weight: 1
uuid: 873b549c-160c-402a-9c0c-2ad55bc2fcad uuid: 873b549c-160c-402a-9c0c-2ad55bc2fcad
context_mapping: { } context_mapping: { }
20d97dad-31df-4687-9f6e-10fa8886135b:
id: 'views_block:blog_entry-most_popular'
label: ''
provider: views
label_display: visible
views_label: ''
items_per_page: none
region: right
weight: -1
uuid: 20d97dad-31df-4687-9f6e-10fa8886135b
context_mapping: { }
b7044fa9-b541-46fa-be4f-b973e32afcb8:
id: 'views_block:blog_entry-most_recent_blog'
label: ''
provider: views
label_display: visible
views_label: ''
items_per_page: none
region: right
weight: 0
uuid: b7044fa9-b541-46fa-be4f-b973e32afcb8
context_mapping: { }
5c3a518c-3c89-4349-8527-d6b8efcd38e8: 5c3a518c-3c89-4349-8527-d6b8efcd38e8:
id: 'menu_block:blog-menu' id: 'menu_block:blog-menu'
label: 'Blog menu' label: 'Blog menu'
...@@ -57,7 +35,7 @@ variant_settings: ...@@ -57,7 +35,7 @@ variant_settings:
expand: 0 expand: 0
parent: 'blog-menu:' parent: 'blog-menu:'
suggestion: blog_menu suggestion: blog_menu
region: top region: main
weight: 0 weight: 0
uuid: 5c3a518c-3c89-4349-8527-d6b8efcd38e8 uuid: 5c3a518c-3c89-4349-8527-d6b8efcd38e8
context_mapping: { } context_mapping: { }
...@@ -65,43 +43,9 @@ variant_settings: ...@@ -65,43 +43,9 @@ variant_settings:
uuid: 7c767761-a0e2-4046-9613-578466538075 uuid: 7c767761-a0e2-4046-9613-578466538075
label: null label: null
weight: 0 weight: 0
layout: bs_2col_stacked layout: bs_1col
layout_settings: layout_settings: { }
layout: page_title: Blog
wrapper: div
classes:
row: row
add_layout_class: 1
attributes: ''
regions:
top:
wrapper: div
classes:
col-sm-12: col-sm-12
col-md-9: col-md-9
add_region_classes: 1
attributes: ''
left:
wrapper: div
classes:
col-sm-12: col-sm-12
col-md-9: col-md-9
add_region_classes: 1
attributes: ''
right:
wrapper: div
classes:
col-sm-12: col-sm-12
col-md-3: col-md-3
add_region_classes: 1
attributes: ''
bottom:
wrapper: div
classes:
col-sm-12: col-sm-12
add_region_classes: 1
attributes: ''
page_title: ''
storage_type: page_manager storage_type: page_manager
storage_id: blog-panels_variant-0 storage_id: blog-panels_variant-0
builder: standard builder: standard
......
langcode: en
status: true
dependencies:
config:
- page_manager.page.node_view
- views.view.blog_entry
module:
- ctools
- panels
- views
id: node_view-panels_variant-0
label: 'Blog post'
variant: panels_variant
variant_settings:
blocks:
c105e14e-08ed-4fa4-a772-e4804f037d89:
id: 'entity_view:node'
label: 'Entity view (Content)'
provider: ctools
label_display: '0'
view_mode: full
region: main
weight: 0
uuid: c105e14e-08ed-4fa4-a772-e4804f037d89
context_mapping:
entity: node
39ef7088-0505-45f5-8e35-35e69b275fb1:
id: 'views_block:blog_entry-related_blogs'
label: ''
provider: views
label_display: visible
views_label: ''
items_per_page: none
region: main
weight: 0
uuid: 39ef7088-0505-45f5-8e35-35e69b275fb1
context_mapping: { }
id: panels_variant
uuid: c6b40163-8926-46e8-88dc-e19df2a93db2
label: null
weight: 0
layout: bs_1col
layout_settings:
layout:
wrapper: div
classes:
row: row
add_layout_class: 1
attributes: ''
regions:
main:
wrapper: div
classes:
col-sm-12: col-sm-12
add_region_classes: 1
attributes: ''
page_title: '[node:title]'
storage_type: page_manager
storage_id: node_view-panels_variant-0
builder: ipe
page: node_view
weight: 0
selection_criteria:
-
id: 'entity_bundle:node'
bundles:
varbase_blog: varbase_blog
negate: false
context_mapping:
node: node
selection_logic: and
static_context: { }
...@@ -6,6 +6,7 @@ dependencies: ...@@ -6,6 +6,7 @@ dependencies:
- system.menu.blog-menu - system.menu.blog-menu
- views.view.blog_entry - views.view.blog_entry
module: module:
- ctools
- menu_block - menu_block
- panels - panels
- views - views
...@@ -21,32 +22,10 @@ variant_settings: ...@@ -21,32 +22,10 @@ variant_settings:
label_display: '0' label_display: '0'
views_label: '' views_label: ''
items_per_page: none items_per_page: none
region: left region: main
weight: 0 weight: 0
uuid: 27499fc7-af2a-4e39-8532-3ab9df76e2c8 uuid: 27499fc7-af2a-4e39-8532-3ab9df76e2c8
context_mapping: { } context_mapping: { }
7c8cc70f-f819-44ed-bbb8-666cb2cf2dca:
id: 'views_block:blog_entry-most_popular'
label: ''
provider: views
label_display: visible
views_label: ''
items_per_page: none
region: right
weight: -1
uuid: 7c8cc70f-f819-44ed-bbb8-666cb2cf2dca
context_mapping: { }
628b1275-8998-4a3f-9c9a-c4ad0dcb8ade:
id: 'views_block:blog_entry-most_recent_blog'
label: ''
provider: views
label_display: visible
views_label: ''
items_per_page: none
region: right
weight: 0
uuid: 628b1275-8998-4a3f-9c9a-c4ad0dcb8ade
context_mapping: { }
30550b6f-3c0a-442f-a4f2-328386a287a7: 30550b6f-3c0a-442f-a4f2-328386a287a7:
id: 'menu_block:blog-menu' id: 'menu_block:blog-menu'
label: 'Blog menu' label: 'Blog menu'
...@@ -57,7 +36,7 @@ variant_settings: ...@@ -57,7 +36,7 @@ variant_settings:
expand: 0 expand: 0
parent: 'blog-menu:' parent: 'blog-menu:'
suggestion: blog_menu suggestion: blog_menu
region: top region: main
weight: 0 weight: 0
uuid: 30550b6f-3c0a-442f-a4f2-328386a287a7 uuid: 30550b6f-3c0a-442f-a4f2-328386a287a7
context_mapping: { } context_mapping: { }
...@@ -65,48 +44,22 @@ variant_settings: ...@@ -65,48 +44,22 @@ variant_settings:
uuid: 1b7acb0d-3c4d-4314-82f5-931eed2b0ecc uuid: 1b7acb0d-3c4d-4314-82f5-931eed2b0ecc
label: null label: null
weight: 0 weight: 0
layout: bs_2col_stacked layout: bs_1col
layout_settings: layout_settings: { }
layout:
wrapper: div
classes:
row: row
add_layout_class: 1
attributes: ''
regions:
top:
wrapper: div
classes:
col-sm-12: col-sm-12
col-md-9: col-md-9
add_region_classes: 1
attributes: ''
left:
wrapper: div
classes:
col-sm-12: col-sm-12
col-md-9: col-md-9
add_region_classes: 1
attributes: ''
right:
wrapper: div
classes:
col-sm-12: col-sm-12
col-md-3: col-md-3
add_region_classes: 1
attributes: ''
bottom:
wrapper: div
classes:
col-sm-12: col-sm-12
add_region_classes: 1
attributes: ''
page_title: '[term:name]' page_title: '[term:name]'
storage_type: page_manager storage_type: page_manager
storage_id: term_view-panels_variant-0 storage_id: term_view-panels_variant-0
builder: standard builder: standard
page: term_view page: term_view
weight: 0 weight: 0
selection_criteria: { } selection_criteria:
-
id: 'entity_bundle:taxonomy_term'
bundles:
blog_categories: blog_categories
tags: tags
negate: false
context_mapping:
taxonomy_term: taxonomy_term
selection_logic: and selection_logic: and
static_context: { } static_context: { }
...@@ -9,14 +9,14 @@ label: 'Blog categories' ...@@ -9,14 +9,14 @@ label: 'Blog categories'
type: 'canonical_entities:taxonomy_term' type: 'canonical_entities:taxonomy_term'
pattern: 'blog/categories/[term:name]' pattern: 'blog/categories/[term:name]'
selection_criteria: selection_criteria:
ef5cf146-5a71-4f4e-96b7-9506ed0f0524: a352f2a3-fc08-4a3e-b764-1a8b8f5c05b7:
id: 'entity_bundle:taxonomy_term' id: 'entity_bundle:taxonomy_term'
bundles: bundles:
categories: categories blog_categories: blog_categories
negate: false negate: false
context_mapping: context_mapping:
taxonomy_term: taxonomy_term taxonomy_term: taxonomy_term
uuid: ef5cf146-5a71-4f4e-96b7-9506ed0f0524 uuid: a352f2a3-fc08-4a3e-b764-1a8b8f5c05b7
selection_logic: and selection_logic: and
weight: -5 weight: -5
relationships: { } relationships: { }
...@@ -2,7 +2,7 @@ langcode: en ...@@ -2,7 +2,7 @@ langcode: en
status: true status: true
dependencies: { } dependencies: { }
name: 'Blog Categories' name: 'Blog Categories'
vid: categories vid: blog_categories
description: '' description: ''
hierarchy: 0 hierarchy: 0
weight: 0 weight: 0
...@@ -3,11 +3,13 @@ status: true ...@@ -3,11 +3,13 @@ status: true
dependencies: dependencies:
config: config:
- system.menu.blog-menu - system.menu.blog-menu
- taxonomy.vocabulary.categories - taxonomy.vocabulary.blog_categories
id: blog_categories_menu id: blog_categories_menu
label: 'Blog categories Menu' label: 'Blog categories Menu'
vocabulary: categories vocabulary: blog_categories
menu: blog-menu menu: blog-menu
expanded: false expanded: false
depth: 0 depth: 0
menu_parent: 'admin:node.add.varbase_blog' menu_parent: 'admin:node.add.varbase_blog'
description_field_name: ''
use_term_weight_order: true
...@@ -6,7 +6,7 @@ dependencies: ...@@ -6,7 +6,7 @@ dependencies:
- core.entity_view_mode.node.text_teaser_small - core.entity_view_mode.node.text_teaser_small
- core.entity_view_mode.node.vertical_media_teaser_medium - core.entity_view_mode.node.vertical_media_teaser_medium
- node.type.varbase_blog - node.type.varbase_blog
- taxonomy.vocabulary.categories - taxonomy.vocabulary.blog_categories
- taxonomy.vocabulary.tags - taxonomy.vocabulary.tags
module: module:
- ds - ds
...@@ -931,7 +931,7 @@ display: ...@@ -931,7 +931,7 @@ display:
node: true node: true
limit: true limit: true
vids: vids:
categories: categories blog_categories: blog_categories
anyall: + anyall: +
term_page: '0' term_page: '0'
default_argument_skip_url: false default_argument_skip_url: false
...@@ -1021,6 +1021,7 @@ display: ...@@ -1021,6 +1021,7 @@ display:
options: options:
items_per_page: 3 items_per_page: 3
offset: 0 offset: 0
block_hide_empty: true
cache_metadata: cache_metadata:
max-age: -1 max-age: -1
contexts: contexts:
......
...@@ -2,7 +2,7 @@ langcode: en ...@@ -2,7 +2,7 @@ langcode: en
status: true status: true
dependencies: dependencies:
config: config:
- taxonomy.vocabulary.categories - taxonomy.vocabulary.blog_categories
- taxonomy.vocabulary.tags - taxonomy.vocabulary.tags
module: module:
- node - node
...@@ -256,7 +256,7 @@ display: ...@@ -256,7 +256,7 @@ display:
admin_label: '' admin_label: ''
operator: in operator: in
value: value:
categories: categories blog_categories: blog_categories
group: 1 group: 1
exposed: false exposed: false
expose: expose:
......
langcode: en
status: true
dependencies:
config:
- views.view.blog_entry
module:
- block_class
- ctools
- views
theme:
- vartheme
third_party_settings:
block_class:
classes: ''
id: views_block__blog_entry_most_popular
theme: vartheme
region: sidebar_second
weight: -7
provider: null
plugin: 'views_block:blog_entry-most_popular'
settings:
id: 'views_block:blog_entry-most_popular'
label: ''
provider: views
label_display: visible
views_label: ''
items_per_page: none
visibility:
'entity_bundle:node':
id: 'entity_bundle:node'
bundles:
varbase_blog: varbase_blog
negate: false
context_mapping:
node: '@node.node_route_context:node'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment