diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css b/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css index 2e79500dc..0f7a64ac2 100644 --- a/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css +++ b/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css @@ -122,7 +122,7 @@ color: var(--tainacan-block-gray5, #454647); font-weight: bold; text-decoration: none; - padding: 8px 16px; + padding: 8px 12px; display: block; line-height: 1.2em; word-break: break-word; } diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css b/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css index de71369db..9f374daac 100644 --- a/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css +++ b/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css @@ -129,7 +129,7 @@ color: var(--tainacan-block-gray5, #454647); font-weight: bold; text-decoration: none; - padding: 8px 16px; + padding: 8px 12px; display: block; line-height: 1.2em; word-break: break-word; } diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-related-items.css b/src/assets/css/tainacan-gutenberg-block-carousel-related-items.css index 5e270bc4c..ea7dfd802 100644 --- a/src/assets/css/tainacan-gutenberg-block-carousel-related-items.css +++ b/src/assets/css/tainacan-gutenberg-block-carousel-related-items.css @@ -1,5 +1,5 @@ .wp-block-tainacan-carousel-related-items { - margin: 2em auto; + margin: 0.5em auto; width: 100%; } .wp-block-tainacan-carousel-related-items .spinner-container { min-height: 56px; diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-related-items.css.map b/src/assets/css/tainacan-gutenberg-block-carousel-related-items.css.map index 4e38ff4bf..a62d01597 100644 --- a/src/assets/css/tainacan-gutenberg-block-carousel-related-items.css.map +++ b/src/assets/css/tainacan-gutenberg-block-carousel-related-items.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAEA,yCAA0C;EACtC,MAAM,EAAE,QAAQ;EAChB,KAAK,EAAE,IAAI;EAGX,4DAAmB;IACf,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,MAAM;IACnB,KAAK,EAAE,oCAAmC;AAI9C,qCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,kCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,gCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,6BAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;EAErB,mDAAU;IACN,aAAa,EAAE,GAAG;IAClB,UAAU,EAAE,oCAAmC;IAE/C,iBAAiB,EAAE,qCAAqC;IACxD,cAAc,EAAE,qCAAqC;IACrD,YAAY,EAAE,qCAAqC;IACnD,SAAS,EAAE,qCAAqC;EAIpD,gFAAuC;IACnC,QAAQ,EAAE,QAAQ;IAElB,0FAAY;MACR,UAAU,EAAE,KAAK", +"mappings": "AAEA,yCAA0C;EACtC,MAAM,EAAE,UAAU;EAClB,KAAK,EAAE,IAAI;EAGX,4DAAmB;IACf,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,MAAM;IACnB,KAAK,EAAE,oCAAmC;AAI9C,qCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,kCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,gCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,6BAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;EAErB,mDAAU;IACN,aAAa,EAAE,GAAG;IAClB,UAAU,EAAE,oCAAmC;IAE/C,iBAAiB,EAAE,qCAAqC;IACxD,cAAc,EAAE,qCAAqC;IACrD,YAAY,EAAE,qCAAqC;IACnD,SAAS,EAAE,qCAAqC;EAIpD,gFAAuC;IACnC,QAAQ,EAAE,QAAQ;IAElB,0FAAY;MACR,UAAU,EAAE,KAAK", "sources": ["../../views/gutenberg-blocks/tainacan-items/carousel-related-items/carousel-related-items.scss"], "names": [], "file": "tainacan-gutenberg-block-carousel-related-items.css" diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css b/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css index 3d3b861ce..507137817 100644 --- a/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css +++ b/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css @@ -122,7 +122,7 @@ color: var(--tainacan-block-gray5, #454647); font-weight: bold; text-decoration: none; - padding: 8px 16px; + padding: 8px 12px; display: block; line-height: 1.2em; word-break: break-word; } diff --git a/src/classes/repositories/class-tainacan-items.php b/src/classes/repositories/class-tainacan-items.php index 5cea97d36..cbee28804 100644 --- a/src/classes/repositories/class-tainacan-items.php +++ b/src/classes/repositories/class-tainacan-items.php @@ -636,8 +636,8 @@ class Items extends Repository { $response[$metadata->get_id() . '_' . $collection->get_id()] = array( 'collection_id' => $collection->get_id(), 'collection_name' => $collection->get_name(), - 'url' => $collection->get_url(), - 'slug' => $collection->get_slug(), + 'collection_url' => $collection->get_url(), + 'collection_slug' => $collection->get_slug(), 'metadata_id' => $metadata->get_id(), 'metadata_name' => $metadata->get_name(), 'total_items' => $related_items['found_posts'], @@ -651,8 +651,8 @@ class Items extends Repository { $response[$metadata->get_id()] = array( 'collection_id' => $collection->get_id(), 'collection_name' => $collection->get_name(), - 'url' => $collection->get_url(), - 'slug' => $collection->get_slug(), + 'collection_url' => $collection->get_url(), + 'collection_slug' => $collection->get_slug(), 'metadata_id' => $metadata->get_id(), 'metadata_name' => $metadata->get_name(), 'total_items' => $related_items['found_posts'], diff --git a/src/classes/repositories/class-tainacan-metadata.php b/src/classes/repositories/class-tainacan-metadata.php index 9e2a838fc..ca73086ee 100644 --- a/src/classes/repositories/class-tainacan-metadata.php +++ b/src/classes/repositories/class-tainacan-metadata.php @@ -1695,7 +1695,7 @@ class Metadata extends Repository { $order = ( is_array( $order ) ) ? $order : unserialize( $order ); if( is_array($order) ) { foreach ($order as $metadata_order) { - if($metadata_order['id'] == $metadata->get_id()) { + if( $metadata_order['id'] == $metadata->get_id() || $metadata_order['id'] == $metadata->get_parent() ) { if($metadata_order['enabled'] == false) return false; return true; diff --git a/src/classes/theme-helper/class-tainacan-theme-helper.php b/src/classes/theme-helper/class-tainacan-theme-helper.php index 1b28fe14b..6127a867c 100644 --- a/src/classes/theme-helper/class-tainacan-theme-helper.php +++ b/src/classes/theme-helper/class-tainacan-theme-helper.php @@ -985,9 +985,9 @@ class Theme_Helper { // Always pass the default class; $output = '
'; - + foreach($related_items as $collection_id => $related_group) { - + if ( isset($related_group['items']) && isset($related_group['total_items']) && $related_group['total_items'] ) { // Adds a heading with the collection name @@ -1014,24 +1014,27 @@ class Theme_Helper { $carousel_div = $this->get_tainacan_items_carousel($carousel_args); } - if ( $related_group['total_items'] > 1 ) { - $output .= '
-
' . - $collection_heading . - $metadata_label . - $carousel_div . - '
-
- - ' . sprintf( __('View all (%s) related items', 'tainacan'), $related_group['total_items'] ) . ' - -
-
- + + $output .= '
+
' . + $collection_heading . + $metadata_label . + $carousel_div . + ( + $related_group['total_items'] > 1 ? + '
+
+ + ' . sprintf( __('View all %s related items', 'tainacan'), $related_group['total_items'] ) . ' + +
+
' + : '' + ) + . ' -
'; - } +
+
'; } } diff --git a/src/classes/theme-helper/template-tags.php b/src/classes/theme-helper/template-tags.php index 088e79bd1..42fdc285d 100644 --- a/src/classes/theme-helper/template-tags.php +++ b/src/classes/theme-helper/template-tags.php @@ -1054,7 +1054,7 @@ function tainacan_has_related_items($item_id = false) { return; // Then fetches related ones - $related_items = $item->get_related_items(); + $related_items = $item->get_related_items();// TODO: handle this inside the item so we don't have to load things here. if ( !$related_items || !is_array($related_items) || !count($related_items) ) return false; diff --git a/src/views/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss b/src/views/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss index df1b5c2bd..fe72f142b 100644 --- a/src/views/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss +++ b/src/views/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss @@ -142,7 +142,7 @@ color: var(--tainacan-block-gray5, $gray5); font-weight: bold; text-decoration: none; - padding: 8px 16px; + padding: 8px 12px; display: block; line-height: 1.2em; word-break: break-word; diff --git a/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss b/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss index a2bd9e46e..8bcc03cd2 100644 --- a/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss +++ b/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss @@ -154,7 +154,7 @@ color: var(--tainacan-block-gray5, $gray5); font-weight: bold; text-decoration: none; - padding: 8px 16px; + padding: 8px 12px; display: block; line-height: 1.2em; word-break: break-word; diff --git a/src/views/gutenberg-blocks/tainacan-items/carousel-related-items/carousel-related-items.scss b/src/views/gutenberg-blocks/tainacan-items/carousel-related-items/carousel-related-items.scss index ead82b0a9..49b9f786b 100644 --- a/src/views/gutenberg-blocks/tainacan-items/carousel-related-items/carousel-related-items.scss +++ b/src/views/gutenberg-blocks/tainacan-items/carousel-related-items/carousel-related-items.scss @@ -1,7 +1,7 @@ @import '../../gutenberg-blocks-variables.scss'; .wp-block-tainacan-carousel-related-items { - margin: 2em auto; + margin: 0.5em auto; width: 100%; // Spinner diff --git a/src/views/gutenberg-blocks/tainacan-items/carousel-related-items/index.js b/src/views/gutenberg-blocks/tainacan-items/carousel-related-items/index.js index 9f3fb6729..dc3265f8b 100644 --- a/src/views/gutenberg-blocks/tainacan-items/carousel-related-items/index.js +++ b/src/views/gutenberg-blocks/tainacan-items/carousel-related-items/index.js @@ -165,7 +165,7 @@ registerBlockType('tainacan/carousel-related-items', { ], [ 'core/spacer', - { height: 70 } + { height: 30 } ] ] ]); diff --git a/src/views/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss b/src/views/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss index 2c8c7aac3..e4b71fc44 100644 --- a/src/views/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss +++ b/src/views/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss @@ -142,7 +142,7 @@ color: var(--tainacan-block-gray5, $gray5); font-weight: bold; text-decoration: none; - padding: 8px 16px; + padding: 8px 12px; display: block; line-height: 1.2em; word-break: break-word;