diff --git a/README.md b/README.md new file mode 100644 index 0000000..367dcd8 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# Installation + +Install as you normally would. This module creates the following entity types: + + * Taxonomy vocabulary + * Licences (licenses) - Includes License Link and License Icon fields + * Paragraphs type + * License Attribution (license_attribution) + +# Use + diff --git a/config/optional/core.entity_form_display.paragraph.license_attribution.default.yml b/config/install/core.entity_form_display.paragraph.license_attribution.default.yml similarity index 100% rename from config/optional/core.entity_form_display.paragraph.license_attribution.default.yml rename to config/install/core.entity_form_display.paragraph.license_attribution.default.yml diff --git a/config/optional/core.entity_view_display.paragraph.license_attribution.default.yml b/config/install/core.entity_view_display.paragraph.license_attribution.default.yml similarity index 100% rename from config/optional/core.entity_view_display.paragraph.license_attribution.default.yml rename to config/install/core.entity_view_display.paragraph.license_attribution.default.yml diff --git a/config/optional/core.entity_view_display.taxonomy_term.licenses.default.yml b/config/install/core.entity_view_display.taxonomy_term.licenses.default.yml similarity index 90% rename from config/optional/core.entity_view_display.taxonomy_term.licenses.default.yml rename to config/install/core.entity_view_display.taxonomy_term.licenses.default.yml index de35ef8..43c67da 100644 --- a/config/optional/core.entity_view_display.taxonomy_term.licenses.default.yml +++ b/config/install/core.entity_view_display.taxonomy_term.licenses.default.yml @@ -8,14 +8,8 @@ dependencies: module: - image - link - - panelizer - text third_party_settings: - panelizer: - enable: false - custom: false - allow: false - default: default id: taxonomy_term.licenses.default targetEntityType: taxonomy_term bundle: licenses diff --git a/config/optional/core.entity_view_mode.paragraph.license_attribution.yml b/config/install/core.entity_view_mode.paragraph.license_attribution.yml similarity index 63% rename from config/optional/core.entity_view_mode.paragraph.license_attribution.yml rename to config/install/core.entity_view_mode.paragraph.license_attribution.yml index 8265b32..10cd071 100644 --- a/config/optional/core.entity_view_mode.paragraph.license_attribution.yml +++ b/config/install/core.entity_view_mode.paragraph.license_attribution.yml @@ -2,11 +2,7 @@ langcode: en status: true dependencies: module: - - lightning_core - paragraphs -third_party_settings: - lightning_core: - description: '' id: paragraph.license_attribution label: 'License attribution' targetEntityType: paragraph diff --git a/config/optional/field.field.media.image.field_image_attribution.yml b/config/install/field.field.media.image.field_image_attribution.yml similarity index 91% rename from config/optional/field.field.media.image.field_image_attribution.yml rename to config/install/field.field.media.image.field_image_attribution.yml index daed7c6..7d38835 100644 --- a/config/optional/field.field.media.image.field_image_attribution.yml +++ b/config/install/field.field.media.image.field_image_attribution.yml @@ -7,10 +7,7 @@ dependencies: - paragraphs.paragraphs_type.license_attribution module: - entity_reference_revisions - - require_on_publish third_party_settings: - require_on_publish: - require_on_publish: false id: media.image.field_image_attribution field_name: field_image_attribution entity_type: media diff --git a/config/optional/field.field.paragraph.license_attribution.field_attribution_author.yml b/config/install/field.field.paragraph.license_attribution.field_attribution_author.yml similarity index 84% rename from config/optional/field.field.paragraph.license_attribution.field_attribution_author.yml rename to config/install/field.field.paragraph.license_attribution.field_attribution_author.yml index 752761c..38b96d1 100644 --- a/config/optional/field.field.paragraph.license_attribution.field_attribution_author.yml +++ b/config/install/field.field.paragraph.license_attribution.field_attribution_author.yml @@ -6,10 +6,6 @@ dependencies: - paragraphs.paragraphs_type.license_attribution module: - link - - require_on_publish -third_party_settings: - require_on_publish: - require_on_publish: false id: paragraph.license_attribution.field_attribution_author field_name: field_attribution_author entity_type: paragraph diff --git a/config/optional/field.field.paragraph.license_attribution.field_attribution_source.yml b/config/install/field.field.paragraph.license_attribution.field_attribution_source.yml similarity index 85% rename from config/optional/field.field.paragraph.license_attribution.field_attribution_source.yml rename to config/install/field.field.paragraph.license_attribution.field_attribution_source.yml index b00fd49..c2b65ae 100644 --- a/config/optional/field.field.paragraph.license_attribution.field_attribution_source.yml +++ b/config/install/field.field.paragraph.license_attribution.field_attribution_source.yml @@ -6,10 +6,6 @@ dependencies: - paragraphs.paragraphs_type.license_attribution module: - link - - require_on_publish -third_party_settings: - require_on_publish: - require_on_publish: false id: paragraph.license_attribution.field_attribution_source field_name: field_attribution_source entity_type: paragraph diff --git a/config/optional/field.field.paragraph.license_attribution.field_license.yml b/config/install/field.field.paragraph.license_attribution.field_license.yml similarity index 85% rename from config/optional/field.field.paragraph.license_attribution.field_license.yml rename to config/install/field.field.paragraph.license_attribution.field_license.yml index f66f5df..3d68520 100644 --- a/config/optional/field.field.paragraph.license_attribution.field_license.yml +++ b/config/install/field.field.paragraph.license_attribution.field_license.yml @@ -5,11 +5,6 @@ dependencies: - field.storage.paragraph.field_license - paragraphs.paragraphs_type.license_attribution - taxonomy.vocabulary.licenses - module: - - require_on_publish -third_party_settings: - require_on_publish: - require_on_publish: false id: paragraph.license_attribution.field_license field_name: field_license entity_type: paragraph diff --git a/config/optional/field.field.taxonomy_term.licenses.field_license_icon.yml b/config/install/field.field.taxonomy_term.licenses.field_license_icon.yml similarity index 90% rename from config/optional/field.field.taxonomy_term.licenses.field_license_icon.yml rename to config/install/field.field.taxonomy_term.licenses.field_license_icon.yml index 28df4d0..4640b3b 100644 --- a/config/optional/field.field.taxonomy_term.licenses.field_license_icon.yml +++ b/config/install/field.field.taxonomy_term.licenses.field_license_icon.yml @@ -6,10 +6,6 @@ dependencies: - taxonomy.vocabulary.licenses module: - image - - require_on_publish -third_party_settings: - require_on_publish: - require_on_publish: false id: taxonomy_term.licenses.field_license_icon field_name: field_license_icon entity_type: taxonomy_term diff --git a/config/optional/field.field.taxonomy_term.licenses.field_license_link.yml b/config/install/field.field.taxonomy_term.licenses.field_license_link.yml similarity index 82% rename from config/optional/field.field.taxonomy_term.licenses.field_license_link.yml rename to config/install/field.field.taxonomy_term.licenses.field_license_link.yml index dc159db..250e28d 100644 --- a/config/optional/field.field.taxonomy_term.licenses.field_license_link.yml +++ b/config/install/field.field.taxonomy_term.licenses.field_license_link.yml @@ -6,10 +6,6 @@ dependencies: - taxonomy.vocabulary.licenses module: - link - - require_on_publish -third_party_settings: - require_on_publish: - require_on_publish: false id: taxonomy_term.licenses.field_license_link field_name: field_license_link entity_type: taxonomy_term diff --git a/config/optional/field.storage.media.field_image_attribution.yml b/config/install/field.storage.media.field_image_attribution.yml similarity index 81% rename from config/optional/field.storage.media.field_image_attribution.yml rename to config/install/field.storage.media.field_image_attribution.yml index c2701d0..724095b 100644 --- a/config/optional/field.storage.media.field_image_attribution.yml +++ b/config/install/field.storage.media.field_image_attribution.yml @@ -3,12 +3,8 @@ status: true dependencies: module: - entity_reference_revisions - - field_permissions - media - paragraphs -third_party_settings: - field_permissions: - permission_type: public id: media.field_image_attribution field_name: field_image_attribution entity_type: media diff --git a/config/optional/field.storage.paragraph.field_attribution_author.yml b/config/install/field.storage.paragraph.field_attribution_author.yml similarity index 77% rename from config/optional/field.storage.paragraph.field_attribution_author.yml rename to config/install/field.storage.paragraph.field_attribution_author.yml index 547d151..796ec85 100644 --- a/config/optional/field.storage.paragraph.field_attribution_author.yml +++ b/config/install/field.storage.paragraph.field_attribution_author.yml @@ -2,12 +2,8 @@ langcode: en status: true dependencies: module: - - field_permissions - link - paragraphs -third_party_settings: - field_permissions: - permission_type: public id: paragraph.field_attribution_author field_name: field_attribution_author entity_type: paragraph diff --git a/config/optional/field.storage.paragraph.field_attribution_source.yml b/config/install/field.storage.paragraph.field_attribution_source.yml similarity index 77% rename from config/optional/field.storage.paragraph.field_attribution_source.yml rename to config/install/field.storage.paragraph.field_attribution_source.yml index 4e2b584..a4b0038 100644 --- a/config/optional/field.storage.paragraph.field_attribution_source.yml +++ b/config/install/field.storage.paragraph.field_attribution_source.yml @@ -2,12 +2,8 @@ langcode: en status: true dependencies: module: - - field_permissions - link - paragraphs -third_party_settings: - field_permissions: - permission_type: public id: paragraph.field_attribution_source field_name: field_attribution_source entity_type: paragraph diff --git a/config/optional/field.storage.paragraph.field_license.yml b/config/install/field.storage.paragraph.field_license.yml similarity index 78% rename from config/optional/field.storage.paragraph.field_license.yml rename to config/install/field.storage.paragraph.field_license.yml index 4d6276b..37ad80b 100644 --- a/config/optional/field.storage.paragraph.field_license.yml +++ b/config/install/field.storage.paragraph.field_license.yml @@ -2,12 +2,8 @@ langcode: en status: true dependencies: module: - - field_permissions - paragraphs - taxonomy -third_party_settings: - field_permissions: - permission_type: public id: paragraph.field_license field_name: field_license entity_type: paragraph diff --git a/config/optional/field.storage.taxonomy_term.field_license_icon.yml b/config/install/field.storage.taxonomy_term.field_license_icon.yml similarity index 84% rename from config/optional/field.storage.taxonomy_term.field_license_icon.yml rename to config/install/field.storage.taxonomy_term.field_license_icon.yml index 8432170..8f13271 100644 --- a/config/optional/field.storage.taxonomy_term.field_license_icon.yml +++ b/config/install/field.storage.taxonomy_term.field_license_icon.yml @@ -2,13 +2,9 @@ langcode: en status: true dependencies: module: - - field_permissions - file - image - taxonomy -third_party_settings: - field_permissions: - permission_type: public id: taxonomy_term.field_license_icon field_name: field_license_icon entity_type: taxonomy_term diff --git a/config/optional/field.storage.taxonomy_term.field_license_link.yml b/config/install/field.storage.taxonomy_term.field_license_link.yml similarity index 77% rename from config/optional/field.storage.taxonomy_term.field_license_link.yml rename to config/install/field.storage.taxonomy_term.field_license_link.yml index 0005d1f..836b7f6 100644 --- a/config/optional/field.storage.taxonomy_term.field_license_link.yml +++ b/config/install/field.storage.taxonomy_term.field_license_link.yml @@ -2,12 +2,8 @@ langcode: en status: true dependencies: module: - - field_permissions - link - taxonomy -third_party_settings: - field_permissions: - permission_type: public id: taxonomy_term.field_license_link field_name: field_license_link entity_type: taxonomy_term diff --git a/config/optional/paragraphs.paragraphs_type.license_attribution.yml b/config/install/paragraphs.paragraphs_type.license_attribution.yml similarity index 100% rename from config/optional/paragraphs.paragraphs_type.license_attribution.yml rename to config/install/paragraphs.paragraphs_type.license_attribution.yml diff --git a/config/optional/taxonomy.vocabulary.licenses.yml b/config/install/taxonomy.vocabulary.licenses.yml similarity index 100% rename from config/optional/taxonomy.vocabulary.licenses.yml rename to config/install/taxonomy.vocabulary.licenses.yml diff --git a/config/optional/core.entity_form_display.taxonomy_term.licenses.default.yml b/config/optional similarity index 100% rename from config/optional/core.entity_form_display.taxonomy_term.licenses.default.yml rename to config/optional diff --git a/entity_embed_attribution.module b/entity_embed_attribution.module index 3b88551..76be9a9 100644 --- a/entity_embed_attribution.module +++ b/entity_embed_attribution.module @@ -36,40 +36,43 @@ function entity_embed_attribution_help($route_name, RouteMatchInterface $route_m * Add attribution form to media embed forms and view displays. */ function entity_embed_attribution_modules_installed($modules) { - foreach (['media_browser', 'default'] as $form_variant) { + + foreach (['default', 'media_browser'] as $form_variant) { $form_entity = EntityFormDisplay::load("media.image.$form_variant"); - $form_entity->setComponent('field_image_attribution', - [ - 'region' => 'content', - 'settings' => [ - 'title' => 'Paragraph', - 'title_plural' => 'Paragraphs', - 'edit_mode' => 'open', - 'closed_mode' => 'summary', - 'autocollapse' => 'none', - 'closed_mode_threshold' => 0, - 'add_mode' => 'dropdown', - 'form_display_mode' => 'default', - 'default_paragraph_type' => '', - 'features' => [ - 'duplicate' => 'duplicate', - 'collapse_edit_all' => 'collapse_edit_all', - ] - ], - 'type' => 'paragraphs', - ]) - ->save(); + if (!empty($form_entity)) { + $form_entity->setComponent('field_image_attribution', + [ + 'region' => 'content', + 'settings' => [ + 'title' => 'Paragraph', + 'title_plural' => 'Paragraphs', + 'edit_mode' => 'open', + 'closed_mode' => 'summary', + 'autocollapse' => 'none', + 'closed_mode_threshold' => 0, + 'add_mode' => 'dropdown', + 'form_display_mode' => 'default', + 'default_paragraph_type' => '', + 'features' => [ + 'duplicate' => 'duplicate', + 'collapse_edit_all' => 'collapse_edit_all', + ] + ], + 'type' => 'paragraphs', + ]) + ->save(); + } } - - foreach (['embedded', 'default'] as $entity_view_variant) { + foreach (['default', 'embedded'] as $entity_view_variant) { $view_entity = EntityViewDisplay::load("media.image.$entity_view_variant"); - $view_entity->setComponent('field_image_attribution', [ + if (!empty($view_entity)) { + $view_entity->setComponent('field_image_attribution', [ 'type' => 'entity_reference_revisions_entity_view', 'label' => 'hidden', 'settings' => ['view_mode' => 'default', 'link' => ''], ])->save(); + } } - // Load default license terms from the module config. entity_embed_attribution_load_default_licenses(); } @@ -118,7 +121,6 @@ function entity_embed_attribution_preprocess_entity_embed_container(&$variables) ]; } - // $attribution_string = \Drupal::render($attribution_text); $variables['children'] = [ 'first' => [