From aed85b41a53e93ed00eeb9a5af89285ece06abdc Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Wed, 23 Nov 2016 14:22:52 +0200
Subject: [PATCH] Issue #2827824: Updated [Varbase 8.x-4.x] profile: Updated
[Varbase Media] feature: Switched file Upload interface to Dropzonejs.
---
composer.json | 1 +
drupal-org-core.make | 8 +++++
drupal-org.make | 4 +++
...y_browser.browser.editor_media_browser.yml | 24 ++++++++++-----
.../entity_browser.browser.image_browser.yml | 27 ++++++++++-------
.../entity_browser.browser.images_browser.yml | 29 +++++++++++--------
.../config/install/views.view.browser.yml | 6 ++--
.../varbase_media/varbase_media.info.yml | 3 +-
varbase.info.yml | 4 ++-
9 files changed, 70 insertions(+), 36 deletions(-)
diff --git a/composer.json b/composer.json
index 3342fa53..49de811e 100644
--- a/composer.json
+++ b/composer.json
@@ -122,6 +122,7 @@
"drupal/entity": "1.0-alpha3",
"drupal/entity_browser": "1.x-dev#b21ea1dae48fd18991f51ade07804c7cc59c3b4b",
"drupal/entity_browser_enhanced": "1.0-beta1",
+ "drupal/dropzonejs": "1.0-alpha3",
"drupal/entity_embed": "1.0-beta2",
"drupal/inline_entity_form": "1.0-beta1",
"drupal/media_entity": "1.5",
diff --git a/drupal-org-core.make b/drupal-org-core.make
index 0f4d1d0a..0cc0f6c8 100644
--- a/drupal-org-core.make
+++ b/drupal-org-core.make
@@ -4,3 +4,11 @@ api = 2
; Drupal Core
projects[drupal][type] = "core"
projects[drupal][version] = "8.2.3"
+
+;;;;;;;;;;;;;;;;;;;;;
+;; Libraries
+;;;;;;;;;;;;;;;;;;;;;
+
+libraries[dropzone][download][type] = "get"
+libraries[dropzone][subdir] = "libraries"
+libraries[dropzone][download][url] = "https://github.com/enyo/dropzone/archive/v4.3.0.tar.gz"
diff --git a/drupal-org.make b/drupal-org.make
index 767e347e..7e48da31 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -109,6 +109,10 @@ projects[entity_browser_enhanced][type] = module
projects[entity_browser_enhanced][subdir] = "contrib"
projects[entity_browser_enhanced][version] = 1.0-beta1
+projects[dropzonejs][type] = module
+projects[dropzonejs][subdir] = "contrib"
+projects[dropzonejs][version] = 1.0-alpha3
+
projects[entity_embed][type] = module
projects[entity_embed][subdir] = "contrib"
projects[entity_embed][version] = 1.0-beta2
diff --git a/modules/varbase_features/varbase_media/config/install/entity_browser.browser.editor_media_browser.yml b/modules/varbase_features/varbase_media/config/install/entity_browser.browser.editor_media_browser.yml
index 7f62b3ca..5ab54a01 100644
--- a/modules/varbase_features/varbase_media/config/install/entity_browser.browser.editor_media_browser.yml
+++ b/modules/varbase_features/varbase_media/config/install/entity_browser.browser.editor_media_browser.yml
@@ -1,7 +1,11 @@
langcode: en
status: true
dependencies:
+ config:
+ - media_entity.bundle.image
module:
+ - dropzonejs_eb_widget
+ - media_entity
- views
name: editor_media_browser
label: 'Editor Media Browser'
@@ -22,14 +26,18 @@ widgets:
view_display: editor_media_browser
submit_text: 'Select media'
uuid: 0ce5dbdc-76cf-4c4e-a020-03328ef20f1c
- weight: 1
+ weight: -9
label: Library
id: view
- 57cfc877-f12a-44fd-8b5a-c1033f397dea:
+ 6f017ab9-9cbd-43e3-8af6-9dc1e19c38c7:
settings:
- upload_location: 'public://'
- submit_text: 'Select files'
- uuid: 57cfc877-f12a-44fd-8b5a-c1033f397dea
- weight: 2
- label: upload
- id: upload
+ media_entity_bundle: image
+ upload_location: 'public://[date:custom:Y]-[date:custom:m]'
+ dropzone_description: 'Drop files here to upload them'
+ max_filesize: 32M
+ extensions: 'jpg jpeg gif png'
+ submit_text: 'Select media'
+ uuid: 6f017ab9-9cbd-43e3-8af6-9dc1e19c38c7
+ weight: -10
+ label: Upload
+ id: dropzonejs_media_entity
diff --git a/modules/varbase_features/varbase_media/config/install/entity_browser.browser.image_browser.yml b/modules/varbase_features/varbase_media/config/install/entity_browser.browser.image_browser.yml
index 5f97a6f3..149a6992 100644
--- a/modules/varbase_features/varbase_media/config/install/entity_browser.browser.image_browser.yml
+++ b/modules/varbase_features/varbase_media/config/install/entity_browser.browser.image_browser.yml
@@ -1,8 +1,11 @@
langcode: en
status: true
dependencies:
+ config:
+ - media_entity.bundle.image
module:
- - media_entity_image
+ - dropzonejs_eb_widget
+ - media_entity
- views
name: image_browser
label: 'Image Browser'
@@ -17,16 +20,6 @@ selection_display_configuration: { }
widget_selector: tabs
widget_selector_configuration: { }
widgets:
- 04f187e8-8c55-42d9-b8ef-3df1af8b24d1:
- settings:
- extensions: 'jpg jpeg png gif'
- media_bundle: image
- upload_location: 'public://'
- submit_text: 'Select files'
- uuid: 04f187e8-8c55-42d9-b8ef-3df1af8b24d1
- weight: 1
- label: Upload
- id: media_entity_image_upload
c9e40862-4975-43fc-9e06-64c1bc53e9a4:
settings:
view: browser
@@ -36,3 +29,15 @@ widgets:
weight: 2
label: Library
id: view
+ f71e3128-5112-4b12-9593-e981f35ba988:
+ settings:
+ media_entity_bundle: image
+ upload_location: 'public://[date:custom:Y]-[date:custom:m]'
+ dropzone_description: 'Drop image files here to upload them'
+ max_filesize: 32M
+ extensions: 'jpg jpeg gif png'
+ submit_text: 'Select Image'
+ uuid: f71e3128-5112-4b12-9593-e981f35ba988
+ weight: -10
+ label: Upload
+ id: dropzonejs_media_entity
diff --git a/modules/varbase_features/varbase_media/config/install/entity_browser.browser.images_browser.yml b/modules/varbase_features/varbase_media/config/install/entity_browser.browser.images_browser.yml
index 33106e07..00a5b5f2 100644
--- a/modules/varbase_features/varbase_media/config/install/entity_browser.browser.images_browser.yml
+++ b/modules/varbase_features/varbase_media/config/install/entity_browser.browser.images_browser.yml
@@ -1,8 +1,11 @@
langcode: en
status: true
dependencies:
+ config:
+ - media_entity.bundle.image
module:
- - media_entity_image
+ - dropzonejs_eb_widget
+ - media_entity
- views
name: images_browser
label: 'Images Browser'
@@ -17,22 +20,24 @@ selection_display_configuration: { }
widget_selector: tabs
widget_selector_configuration: { }
widgets:
- c8790d59-6e02-4e95-9a43-5dd0f5dc53ba:
- settings:
- extensions: 'jpg jpeg png gif'
- media_bundle: image
- upload_location: 'public://'
- submit_text: 'Select images'
- uuid: c8790d59-6e02-4e95-9a43-5dd0f5dc53ba
- weight: 1
- label: Upload
- id: media_entity_image_upload
c5fb0857-c353-41b5-a553-407d7b906e83:
settings:
view: browser
view_display: images_browser
submit_text: 'Select Images'
uuid: c5fb0857-c353-41b5-a553-407d7b906e83
- weight: 2
+ weight: -9
label: Library
id: view
+ 77cdc7ee-5d61-4f75-9450-6713b641ad97:
+ settings:
+ media_entity_bundle: image
+ upload_location: 'public://[date:custom:Y]-[date:custom:m]'
+ dropzone_description: 'Drop image files here to upload them'
+ max_filesize: 32M
+ extensions: 'jpg jpeg gif png'
+ submit_text: 'Select entities'
+ uuid: 77cdc7ee-5d61-4f75-9450-6713b641ad97
+ weight: -10
+ label: Upload
+ id: dropzonejs_media_entity
diff --git a/modules/varbase_features/varbase_media/config/install/views.view.browser.yml b/modules/varbase_features/varbase_media/config/install/views.view.browser.yml
index 44664993..0c1c24b5 100644
--- a/modules/varbase_features/varbase_media/config/install/views.view.browser.yml
+++ b/modules/varbase_features/varbase_media/config/install/views.view.browser.yml
@@ -598,7 +598,7 @@ display:
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
- element_wrapper_class: ''
+ element_wrapper_class: visually-hidden
element_default_classes: true
empty: ''
hide_empty: false
@@ -874,7 +874,7 @@ display:
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
- element_wrapper_class: ''
+ element_wrapper_class: visually-hidden
element_default_classes: false
empty: ''
hide_empty: false
@@ -1163,7 +1163,7 @@ display:
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
- element_wrapper_class: ''
+ element_wrapper_class: visually-hidden
element_default_classes: false
empty: ''
hide_empty: false
diff --git a/modules/varbase_features/varbase_media/varbase_media.info.yml b/modules/varbase_features/varbase_media/varbase_media.info.yml
index 2d03ff47..055b1d2e 100644
--- a/modules/varbase_features/varbase_media/varbase_media.info.yml
+++ b/modules/varbase_features/varbase_media/varbase_media.info.yml
@@ -4,6 +4,7 @@ type: module
package: Varbase
dependencies:
- content_translation
+ - dropzonejs_eb_widget
- ds
- embed
- entity_browser
@@ -31,4 +32,4 @@ dependencies:
version: 8.x-4.0
core: 8.x
project: varbase
-datestamp: 1479733744
+datestamp: 1479738851
diff --git a/varbase.info.yml b/varbase.info.yml
index 56094657..1b1a8cc8 100644
--- a/varbase.info.yml
+++ b/varbase.info.yml
@@ -50,6 +50,7 @@ dependencies:
- content_translation
# contrib modules
+ - libraries
- config_update
- ctools
- ctools_block
@@ -76,6 +77,8 @@ dependencies:
- embed
- entity_browser
- entity_browser_enhanced
+ - dropzonejs
+ - dropzonejs_eb_widget
- entity_embed
- inline_entity_form
- media_entity
@@ -89,7 +92,6 @@ dependencies:
- coffee
- diff
- masquerade
- - libraries
# Varbase core functionality.
- varbase_core
--
GitLab