Skip to content
This repository has been archived by the owner on Jun 22, 2020. It is now read-only.

Feature/liveblog #261

Merged
merged 26 commits into from
Mar 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e18900c
Include liveblog with thunder
tjwelde Mar 6, 2017
baf9593
Liveblog: use newer version for make workflow
tjwelde Mar 6, 2017
b38e5fa
moved liveblog_paragraphs into the distribution.
tjwelde Mar 6, 2017
09ec0f5
Liveblog: install Pusher by default
tjwelde Mar 6, 2017
acb5359
Add Liveblog to the OptionalModules.
tjwelde Mar 6, 2017
b3b8c5b
sort optional modules by weight.
tjwelde Mar 6, 2017
9e6f8ed
added pusher library to make workflow
tjwelde Mar 6, 2017
0b48f40
required core version was missing
tjwelde Mar 6, 2017
f7440dd
liveblog has a dependeny to simple_gmap
tjwelde Mar 6, 2017
6800c45
only use pusher as notification channel, if necessary config is set
tjwelde Mar 6, 2017
d003c7a
fixed phpcs issues
tjwelde Mar 6, 2017
cdd73a8
fix phpcs issues with project prefixing
tjwelde Mar 7, 2017
64e8bc0
added readme to thunder_liveblog
tjwelde Mar 7, 2017
9224066
add permissions for liveblog
tjwelde Mar 7, 2017
d2e254a
use for-loop for adding permissions
tjwelde Mar 8, 2017
0554a29
added info about noting down cluster info
tjwelde Mar 8, 2017
daa9e63
update liveblog
tjwelde Mar 8, 2017
ba19362
Liveblog integration: replace body with paragraphs
tjwelde Mar 8, 2017
e5a8eca
Added testing of configuration for Live Blog integraton
mtodor Mar 9, 2017
c7ba264
Liveblog: resolve schema issues
tjwelde Mar 9, 2017
fca6096
removed thunder_liveblog from the schema check
tjwelde Mar 9, 2017
050f61d
convert optional module sorting from callback to sorting function
tjwelde Mar 13, 2017
72d29ad
fix index region missing
tjwelde Mar 16, 2017
67c010b
hide labels for filed_paragraphs and field_embed_media
tjwelde Mar 16, 2017
f4bbde7
update liveblog (node-description / show pusher errors)
tjwelde Mar 16, 2017
c24f385
Merge branch 'develop' into feature/liveblog
chrfritsch Mar 21, 2017
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
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
"drupal/ivw_integration": "^1.0",
"drupal/libraries": "dev-3.x",
"drupal/linkit": "^4.0",
"drupal/liveblog": "^1.0",
"drupal/media_entity": "1.6",
"drupal/media_entity_instagram": "1.2",
"drupal/media_entity_image": "^1.0",
Expand Down
8 changes: 8 additions & 0 deletions drupal-org.make
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ projects[libraries][download][revision] = 3ea00f23e31a5cd7cd4fed633a675f864b0b1e
projects[libraries][download][branch] = 8.x-3.x
projects[linkit][type] = module
projects[linkit][version] = 4.2
projects[liveblog][type] = module
projects[liveblog][version] = 1.0-alpha6
projects[media_entity][type] = module
projects[media_entity][version] = 1.6
projects[media_entity][patch][] = https://www.drupal.org/files/issues/2813685-21.patch
Expand Down Expand Up @@ -89,6 +91,8 @@ projects[shariff][type] = module
projects[shariff][version] = 1.1
projects[shariff][patch][] = https://www.drupal.org/files/issues/2842631.patch
projects[shariff][patch][] = https://www.drupal.org/files/issues/2845000_2.patch
projects[simple_gmap][type] = module
projects[simple_gmap][version] = 1.2
projects[simple_sitemap][type] = module
projects[simple_sitemap][version] = 2.8
projects[slick][type] = module
Expand Down Expand Up @@ -130,3 +134,7 @@ libraries[slick_lib][type] = library
libraries[slick_lib][directory_name] = slick
libraries[slick_lib][download][type] = get
libraries[slick_lib][download][url] = https://github.com/kenwheeler/slick/archive/1.6.0.zip
libraries[pusher][type] = library
libraries[pusher][directory_name] = pusher
libraries[pusher][download][type] = get
libraries[pusher][download][url] = https://github.com/pusher/pusher-http-php/archive/master.zip
15 changes: 15 additions & 0 deletions drupal-org.make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ projects:
type: "module"
version: "4.2"

liveblog:
type: "module"
version: "1.0-alpha6"

media_entity:
type: "module"
version: "1.6"
Expand Down Expand Up @@ -176,6 +180,10 @@ projects:
- "https://www.drupal.org/files/issues/2842631.patch"
- "https://www.drupal.org/files/issues/2845000_2.patch"

simple_gmap:
type: "module"
version: "1.2"

simple_sitemap:
type: "module"
version: "2.8"
Expand Down Expand Up @@ -254,3 +262,10 @@ libraries:
download:
type: "get"
url: "https://github.com/kenwheeler/slick/archive/1.6.0.zip"

pusher:
type: "library"
directory_name: "pusher"
download:
type: "get"
url: "https://github.com/pusher/pusher-http-php/archive/master.zip"
5 changes: 5 additions & 0 deletions modules/thunder_liveblog/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Thunder Liveblog

This module integrates the liveblog module into Thunder.

It adds social media paragraphs to the liveblog post form and installs all necessary modules.
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
langcode: en
status: true
dependencies:
config:
- field.storage.liveblog_post.field_embed_media
- paragraphs.paragraphs_type.instagram
- paragraphs.paragraphs_type.twitter
module:
- entity_reference_revisions
- liveblog
id: liveblog_post.liveblog_post.field_embed_media
field_name: field_embed_media
entity_type: liveblog_post
bundle: liveblog_post
label: 'Embed media'
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
handler: 'default:paragraph'
handler_settings:
target_bundles:
instagram: instagram
twitter: twitter
target_bundles_drag_drop:
gallery:
weight: 8
enabled: false
instagram:
enabled: true
weight: 9
link:
weight: 10
enabled: false
media:
weight: 11
enabled: false
quote:
weight: 12
enabled: false
text:
weight: 13
enabled: false
twitter:
enabled: true
weight: 14
field_type: entity_reference_revisions
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
langcode: en
status: true
dependencies:
config:
- field.storage.node.field_paragraphs
- node.type.liveblog
- paragraphs.paragraphs_type.gallery
- paragraphs.paragraphs_type.image
- paragraphs.paragraphs_type.instagram
- paragraphs.paragraphs_type.link
- paragraphs.paragraphs_type.quote
- paragraphs.paragraphs_type.text
- paragraphs.paragraphs_type.twitter
- paragraphs.paragraphs_type.video
module:
- entity_reference_revisions
id: node.liveblog.field_paragraphs
field_name: field_paragraphs
entity_type: node
bundle: liveblog
label: Paragraphs
description: ''
required: false
translatable: true
default_value: { }
default_value_callback: ''
settings:
handler: 'default:paragraph'
handler_settings:
target_bundles:
gallery: gallery
image: image
instagram: instagram
link: link
quote: quote
text: text
twitter: twitter
video: video
target_bundles_drag_drop:
gallery:
enabled: true
weight: 9
image:
enabled: true
weight: 10
instagram:
enabled: true
weight: 11
link:
enabled: true
weight: 12
quote:
enabled: true
weight: 13
text:
enabled: true
weight: 14
twitter:
enabled: true
weight: 15
video:
enabled: true
weight: 16
field_type: entity_reference_revisions
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
langcode: en
status: true
dependencies:
module:
- entity_reference_revisions
- liveblog
- paragraphs
id: liveblog_post.field_embed_media
field_name: field_embed_media
entity_type: liveblog_post
type: entity_reference_revisions
settings:
target_type: paragraph
module: entity_reference_revisions
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
langcode: en
status: true
dependencies:
module:
- hal
- paragraphs
- serialization
- user
id: entity.paragraph
plugin_id: 'entity:paragraph'
granularity: method
configuration:
GET:
supported_formats:
- hal_json
- json
supported_auth:
- cookie
POST:
supported_formats:
- hal_json
- json
supported_auth:
- cookie
DELETE:
supported_formats:
- hal_json
- json
supported_auth:
- cookie
PATCH:
supported_formats:
- hal_json
- json
supported_auth:
- cookie
17 changes: 17 additions & 0 deletions modules/thunder_liveblog/thunder_liveblog.info.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: 'Thunder Liveblog'
Copy link
Member

Choose a reason for hiding this comment

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

Add a "Liveblog" paragraph into thunder_liveblog to make it possible to integrate a liveblog into an article

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hmm, this wasn't planned like that, since the liveblog lazyloads, so it must be always added to the end and it should be easily possible to set the "live" flag.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I would propose adding paragraphs to the Liveblog Content Type

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Or I could add an entity reference to liveblog at the end of an article. The downside of this could be that you can't easily mark your liveblogs in a special way on the frontpage, or make a view with all articles which have a liveblog.

description: 'Integrates with the Paragraphs module and Thunder for media embeding'
type: module
core: 8.x
dependencies:
- entity_reference_revisions:entity_reference_revisions
- drupal:field
- drupal:link
- liveblog:liveblog
- liveblog:liveblog_pusher
- drupal:options
- paragraphs:paragraphs
- simple_gmap:simple_gmap
- drupal:text
- thunder:thunder
- thunder:thunder_paragraphs
- drupal:user
Loading