Merge pull request #332 from MukurtuCMS/pjudge/327-CR-plus-carousel-t…

…weaks 327: Carousels final form
MukurtuCMS · May 10, 2024 · c9717dd · c9717dd
2 parents b3a63aa + fc888b9
commit c9717dd
Show file tree

Hide file tree

Showing 19 changed files with 232 additions and 85 deletions.
diff --git a/composer.json b/composer.json
@@ -24,12 +24,25 @@
         },
         "type": "drupal-library"
       }
+    },
+    {
+      "type": "package",
+      "package": {
+          "name": "mukurtu/colorbox",
+          "version": "1.6.4",
+          "dist": {
+              "url": "https://github.com/jackmoore/colorbox/archive/master.zip",
+              "type": "zip"
+          },
+          "type": "drupal-library"
+      }
     }
   ],
   "require": {
     "composer/installers": "^1.9",
     "cweagans/composer-patches": "^1.7",
     "drupal/blazy": "^2.24",
+    "drupal/colorbox": "^2.0",
     "drupal/config_pages": "^2.15",
     "drupal/console": "~1.0",
     "drupal/content_browser": "*",
@@ -72,6 +85,7 @@
     "drupal/twig_tweak": "^3.2",
     "drupal/views_bulk_operations": "*",
     "drush/drush": "^10",
+    "mukurtu/colorbox": "*",
     "mukurtu/masonry": "*",
     "sibyx/phpgpx": "@RC"
   },

diff --git a/config/install/colorbox.settings.yml b/config/install/colorbox.settings.yml
@@ -0,0 +1,32 @@
+dompurify_hide_warning: false
+custom:
+  style: example4
+  activate: 1
+  transition_type: elastic
+  transition_speed: 350
+  opacity: 0.85
+  text_current: '{current} of {total}'
+  text_previous: '« Prev'
+  text_next: 'Next »'
+  text_close: Close
+  maxwidth: 100%
+  maxheight: 2000px
+  initialwidth: 200px
+  initialheight: 200px
+  overlayclose: true
+  returnfocus: true
+  fixed: false
+  scrolling: true
+  slideshow:
+    slideshow: 0
+    auto: true
+    speed: 2500
+    text_start: 'start slideshow'
+    text_stop: 'stop slideshow'
+advanced:
+  unique_token: 1
+  mobile_detect: 1
+  mobile_device_width: 960px
+  caption_trim: 0
+  caption_trim_length: 75
+  compression_type: minified
diff --git a/config/install/core.entity_view_display.media.document.media_assets.yml b/config/install/core.entity_view_display.media.document.media_assets.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.media_assets
-    - image.style.medium_480px_w_
+    - image.style.large
     - media.type.document
   module:
     - file
@@ -30,7 +30,7 @@ content:
     label: hidden
     settings:
       image_link: ''
-      image_style: medium_480px_w_
+      image_style: large
       image_loading:
         attribute: lazy
     third_party_settings: {  }

diff --git a/config/install/core.entity_view_display.media.image.media_assets.yml b/config/install/core.entity_view_display.media.image.media_assets.yml
@@ -3,9 +3,10 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.media_assets
-    - image.style.medium_480px_w_
+    - image.style.large
     - media.type.image
   module:
+    - colorbox
     - image
     - layout_builder
 third_party_settings:
@@ -18,13 +19,16 @@ bundle: image
 mode: media_assets
 content:
   field_media_image:
-    type: image
+    type: colorbox
     label: hidden
     settings:
-      image_link: ''
-      image_style: medium_480px_w_
-      image_loading:
-        attribute: lazy
+      colorbox_node_style: large
+      colorbox_node_style_first: large
+      colorbox_image_style: ''
+      colorbox_gallery: none
+      colorbox_gallery_custom: ''
+      colorbox_caption: auto
+      colorbox_caption_custom: ''
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/config/install/core.entity_view_display.media.remote_video.media_assets.yml b/config/install/core.entity_view_display.media.remote_video.media_assets.yml
@@ -20,8 +20,8 @@ content:
     type: oembed
     label: hidden
     settings:
-      max_width: 480
-      max_height: 270
+      max_width: 900
+      max_height: 506
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/config/install/core.entity_view_display.media.video.media_assets.yml b/config/install/core.entity_view_display.media.video.media_assets.yml
@@ -26,8 +26,8 @@ content:
       loop: false
       multiple_file_display_type: tags
       muted: false
-      width: 480
-      height: 270
+      width: 900
+      height: 506
     third_party_settings:
       blazy:
         blazy: false

diff --git a/config/install/core.entity_view_display.node.digital_heritage.content_browser.yml b/config/install/core.entity_view_display.node.digital_heritage.content_browser.yml
@@ -8,7 +8,7 @@ dependencies:
     - field.field.node.digital_heritage.field_mukurtu_cluster_lat
     - field.field.node.digital_heritage.field_mukurtu_cluster_long
     - field.field.node.digital_heritage.field_mukurtu_geojson
-    - image.style.media_library
+    - image.style.carousel_thumbnail
     - node.type.digital_heritage
   module:
     - layout_builder
@@ -36,7 +36,7 @@ content:
     label: hidden
     settings:
       image_link: ''
-      image_style: media_library
+      image_style: carousel_thumbnail
       image_loading:
         attribute: lazy
     third_party_settings: {  }

diff --git a/config/install/core.entity_view_display.node.digital_heritage.full.yml b/config/install/core.entity_view_display.node.digital_heritage.full.yml
@@ -31,7 +31,6 @@ third_party_settings:
     group_metadata:
       children:
         - field_title
-        - field_related_content
         - field_communities
         - field_cultural_protocols
         - field_category
@@ -138,7 +137,7 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 25
+    weight: 24
     region: content
   field_citation:
     type: text_default
@@ -153,15 +152,15 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 23
+    weight: 22
     region: content
   field_contributor:
     type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    weight: 31
+    weight: 30
     region: content
   field_coverage:
     type: mukurtu_leaflet_formatter
@@ -246,15 +245,15 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 33
+    weight: 32
     region: content
   field_creator:
     type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    weight: 30
+    weight: 29
     region: content
   field_cultural_narrative:
     type: text_default
@@ -268,15 +267,15 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 24
+    weight: 23
     region: content
   field_date_description:
     type: string
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 29
+    weight: 28
     region: content
   field_description:
     type: text_default
@@ -295,7 +294,7 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
-    weight: 37
+    weight: 36
     region: content
   field_format:
     type: entity_reference_label
@@ -311,23 +310,23 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 39
+    weight: 38
     region: content
   field_in_collection:
     type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    weight: 27
+    weight: 26
     region: content
   field_keywords:
     type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    weight: 26
+    weight: 25
     region: content
   field_knowledge_keepers:
     type: entity_reference_revisions_entity_view
@@ -344,21 +343,21 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 32
+    weight: 31
     region: content
   field_local_contexts_labels_and_notices:
     type: local_contexts_label_and_notice
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 35
+    weight: 34
     region: content
   field_local_contexts_projects:
     type: local_contexts_project
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 34
+    weight: 33
     region: content
   field_location:
     type: entity_reference_label
@@ -378,11 +377,11 @@ content:
     weight: 33
     region: content
   field_original_date:
-    type: year_month_day_original_date_formatter
+    type: textual_month_day_year_original_date_formatter
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 28
+    weight: 27
     region: content
   field_people:
     type: entity_reference_label
@@ -398,16 +397,7 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 38
-    region: content
-  field_related_content:
-    type: entity_reference_entity_view
-    label: above
-    settings:
-      view_mode: teaser
-      link: false
-    third_party_settings: {  }
-    weight: 22
+    weight: 37
     region: content
   field_rights:
     type: basic_string
@@ -436,15 +426,15 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 36
+    weight: 35
     region: content
   field_subject:
     type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    weight: 40
+    weight: 39
     region: content
   field_summary:
     type: string
@@ -479,7 +469,7 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 41
+    weight: 40
     region: content
   flag_export_content:
     settings: {  }
@@ -495,6 +485,7 @@ hidden:
   field_mukurtu_original_record: true
   field_multipage_page_of: true
   field_protocol_control: true
+  field_related_content: true
   field_representative_media: true
   field_sequence_collection: true
   flag_email_node: true

diff --git a/modules/mukurtu_multipage_items/js/multipage-nav.js b/modules/mukurtu_multipage_items/js/multipage-nav.js
@@ -12,7 +12,6 @@
             }
             window.history.replaceState({}, '', newUrl);
           } catch (error) {
-            // console.log(error);
             return false;
           }
           return true;

diff --git a/mukurtu-gitpod-site.composer.json b/mukurtu-gitpod-site.composer.json
@@ -28,12 +28,25 @@
                 },
                 "type": "drupal-library"
             }
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "mukurtu/colorbox",
+                "version": "1.6.4",
+                "dist": {
+                    "url": "https://github.com/jackmoore/colorbox/archive/master.zip",
+                    "type": "zip"
+                },
+                "type": "drupal-library"
+            }
         }
     ],
     "require": {
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.7",
         "drupal/blazy": "^2.24",
+        "drupal/colorbox": "^2.0",
         "drupal/config_pages": "^2.15",
         "drupal/console": "~1.0",
         "drupal/content_browser": "*",
@@ -76,6 +89,7 @@
         "drupal/twig_tweak": "^3.2",
         "drupal/views_bulk_operations": "*",
         "drush/drush": "^10",
+        "mukurtu/colorbox": "*",
         "mukurtu/masonry": "*",
         "sibyx/phpgpx": "@RC"
     },