From 3305acd5bd1d6797fdb92d961e420b3eb5a81297 Mon Sep 17 00:00:00 2001
From: mateuswetah <mateus.m.luna@gmail.com>
Date: Tue, 8 Jun 2021 17:14:04 -0300
Subject: [PATCH 1/2] Fixes wrong access to  on some blocks editor side.

---
 src/readme.txt                                                | 2 +-
 src/tainacan.php                                              | 4 ++--
 .../tainacan-items/carousel-items-list/index.js               | 2 +-
 .../tainacan-items/dynamic-items-list/index.js                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/readme.txt b/src/readme.txt
index aa5d375a4..0ec08b332 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -4,7 +4,7 @@ Tags: museums, libraries, archives, GLAM, collections, repository
 Requires at least: 5.0
 Tested up to: 5.6
 Requires PHP: 5.6
-Stable tag: 0.18
+Stable tag: 0.18.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
diff --git a/src/tainacan.php b/src/tainacan.php
index 3d1d0ef07..33407213c 100644
--- a/src/tainacan.php
+++ b/src/tainacan.php
@@ -4,13 +4,13 @@ Plugin Name: Tainacan
 Plugin URI: https://tainacan.org/
 Description: Open source, powerful and flexible repository platform for WordPress. Manage and publish you digital collections as easily as publishing a post to your blog, while having all the tools of a professional repository platform.
 Author: Tainacan.org
-Version: 0.18
+Version: 0.18.1
 Text Domain: tainacan
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 */
 
-const TAINACAN_VERSION = '0.18';
+const TAINACAN_VERSION = '0.18.1';
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 $TAINACAN_BASE_URL = plugins_url('', __FILE__);
diff --git a/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/index.js b/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/index.js
index dfebfe71d..be69ca767 100644
--- a/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/index.js
+++ b/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/index.js
@@ -211,7 +211,7 @@ registerBlockType('tainacan/carousel-items-list', {
                         <img
                             src={ thumbHelper.getSrc(item['thumbnail'], (maxItemsPerScreen > 4 ? (!cropImagesToSquare ? 'tainacan-medium-full' : 'tainacan-medium') : 'large'), item['document_mimetype']) }
                             srcset={ thumbHelper.getSrcSet(item['thumbnail'], (maxItemsPerScreen > 4 ? (!cropImagesToSquare ? 'tainacan-medium-full' : 'tainacan-medium') : 'large'), item['document_mimetype']) }
-                            alt={ item.thumbnail_alt ? item.thumbnail_alt : (item && item.title ? item.title : $root.__( 'Thumbnail', 'tainacan' )) }/>
+                            alt={ item.thumbnail_alt ? item.thumbnail_alt : (item && item.title ? item.title : __( 'Thumbnail', 'tainacan' )) }/>
                         { !hideTitle ? <span>{ item.title ? item.title : '' }</span> : null }
                     </a>
                 </li>
diff --git a/src/views/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js b/src/views/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
index bc3a141cd..3317402d2 100644
--- a/src/views/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
+++ b/src/views/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
@@ -235,7 +235,7 @@ registerBlockType('tainacan/dynamic-items-list', {
                         <img
                             src={ thumbHelper.getSrc(item['thumbnail'], ( (layout == 'list' || cropImagesToSquare) ? 'tainacan-medium' : 'tainacan-medium-full'), item['document_mimetype']) }
                             srcSet={ thumbHelper.getSrcSet(item['thumbnail'], ( (layout == 'list' || cropImagesToSquare) ? 'tainacan-medium' : 'tainacan-medium-full'), item['document_mimetype']) }
-                            alt={ item.thumbnail_alt ? item.thumbnail_alt : (item && item.title ? item.title : $root.__( 'Thumbnail', 'tainacan' )) }/>
+                            alt={ item.thumbnail_alt ? item.thumbnail_alt : (item && item.title ? item.title : __( 'Thumbnail', 'tainacan' )) }/>
                         <span>{ item.title ? item.title : '' }</span>
                     </a>
                 </li>

From 37bf797045a51cb84ee72a91e9188a703ef213ee Mon Sep 17 00:00:00 2001
From: mateuswetah <mateus.m.luna@gmail.com>
Date: Tue, 8 Jun 2021 21:20:14 -0300
Subject: [PATCH 2/2] Adjusts cards, list and records view mode to avoid
 negative margin.

---
 src/views/admin/components/lists/items-list.vue           | 6 ++----
 src/views/admin/scss/_iframe_read_mode_overrides.scss     | 8 --------
 src/views/admin/scss/_view-mode-cards.scss                | 2 +-
 src/views/admin/scss/_view-mode-list.scss                 | 2 +-
 src/views/admin/scss/_view-mode-records.scss              | 2 +-
 .../carousel-collections-list/index.js                    | 6 +++---
 .../tainacan-items/carousel-items-list/index.js           | 2 +-
 .../tainacan-terms/carousel-terms-list/index.js           | 6 +++---
 src/views/theme-search/components/view-mode-cards.vue     | 1 -
 src/views/theme-search/components/view-mode-list.vue      | 1 -
 src/views/theme-search/components/view-mode-records.vue   | 1 -
 11 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/views/admin/components/lists/items-list.vue b/src/views/admin/components/lists/items-list.vue
index bf7a96b04..6e2df0da6 100644
--- a/src/views/admin/components/lists/items-list.vue
+++ b/src/views/admin/components/lists/items-list.vue
@@ -386,8 +386,7 @@
                     <!-- Title -->
                     <div
                             :style="{ 
-                                'padding-left': !collectionId || $route.query.readmode || !($route.query.iframemode || collection && collection.current_user_can_bulk_edit) ? '0.5em !important' : '2.75em',
-                                'margin-bottom': item.current_user_can_edit && !$route.query.iframemode ? '-26px' : '0px'
+                                'padding-left': !collectionId || $route.query.readmode || !($route.query.iframemode || collection && collection.current_user_can_bulk_edit) ? '0.5em !important' : '2.75em'
                             }"
                             class="metadata-title">
                         <p
@@ -568,8 +567,7 @@
                     <div
                             class="metadata-title"
                             :style="{
-                                'padding-left': !collectionId || !($route.query.iframemode || collection && collection.current_user_can_bulk_edit) || $route.query.readmode ? '1.5em !important' : '2.75em',    
-                                'margin-bottom': item.current_user_can_edit || $route.query.iframemode ? '-27px' : '0px'
+                                'padding-left': !collectionId || !($route.query.iframemode || collection && collection.current_user_can_bulk_edit) || $route.query.readmode ? '1.5em !important' : '2.75em'
                             }">
                         <p 
                                 v-tooltip="{
diff --git a/src/views/admin/scss/_iframe_read_mode_overrides.scss b/src/views/admin/scss/_iframe_read_mode_overrides.scss
index 737d7964b..161073c31 100644
--- a/src/views/admin/scss/_iframe_read_mode_overrides.scss
+++ b/src/views/admin/scss/_iframe_read_mode_overrides.scss
@@ -29,14 +29,6 @@
             }
         }
     }
-    #items-list-area {
-        .tainacan-record {
-            .metadata-title { min-height: 68px; }
-        }
-        .tainacan-card {
-            .metadata-title { margin-bottom: 0; }
-        }
-    }
 }
 #tainacan-admin-app.tainacan-admin-read-mode {
 
diff --git a/src/views/admin/scss/_view-mode-cards.scss b/src/views/admin/scss/_view-mode-cards.scss
index ae1d45d28..35857e172 100644
--- a/src/views/admin/scss/_view-mode-cards.scss
+++ b/src/views/admin/scss/_view-mode-cards.scss
@@ -70,6 +70,7 @@
             float: right;
             top: calc(-1 * var(--tainacan-container-padding));
             bottom: 0;
+            margin-bottom: -26px;
             padding-right: 12px;
             display: flex;
             justify-content: space-between;
@@ -130,7 +131,6 @@
         .metadata-title {
             flex-shrink: 0;
             padding: 0.6em 5em 0.5em 2.75em;
-            margin-bottom: -26px;
             min-height: 40px;
             position: relative;
             font-size: 1em !important; 
diff --git a/src/views/admin/scss/_view-mode-list.scss b/src/views/admin/scss/_view-mode-list.scss
index 306c268ce..ea0a04cd5 100644
--- a/src/views/admin/scss/_view-mode-list.scss
+++ b/src/views/admin/scss/_view-mode-list.scss
@@ -38,6 +38,7 @@
             float: right;
             top: calc(-1 * var(--tainacan-container-padding));
             bottom: 0;
+            margin-bottom: -25px;
             padding-right: 12px;
             display: flex;
             justify-content: space-between;
@@ -97,7 +98,6 @@
         .metadata-title {
             flex-shrink: 0;
             padding: 0.5em 4.75em 0.5em 2.75em;
-            margin-bottom: -25px;
             min-height: 40px;
             position: relative;
             font-size: 1em !important; 
diff --git a/src/views/admin/scss/_view-mode-records.scss b/src/views/admin/scss/_view-mode-records.scss
index 388bdfecc..2f57e3f33 100644
--- a/src/views/admin/scss/_view-mode-records.scss
+++ b/src/views/admin/scss/_view-mode-records.scss
@@ -45,6 +45,7 @@
             bottom: 0;
             padding-right: 12px;
             //width: 80px;
+            margin-bottom: -25px;
             display: flex;
             justify-content: space-between;
             visibility: hidden;
@@ -93,7 +94,6 @@
         .metadata-title {
             flex-shrink: 0;
             padding: 0.5em 4.75em 0.5em 2.75em;
-            margin-bottom: -25px;
             font-size: 1.0em !important; 
             min-height: 40px;
             position: relative;
diff --git a/src/views/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js b/src/views/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js
index 6edc49a55..a1e58b75a 100644
--- a/src/views/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js
+++ b/src/views/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js
@@ -185,15 +185,15 @@ registerBlockType('tainacan/carousel-collections-list', {
                             <div class="collection-items-grid">
                                 <img 
                                     src={ collectionItems[0] ? thumbHelper.getSrc(collectionItems[0]['thumbnail'], 'tainacan-medium', collectionItems[0]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
-                                    srcset={ collectionItems[0] ? thumbHelper.getSrcSet(collectionItems[0]['thumbnail'], 'tainacan-medium', collectionItems[0]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
+                                    srcSet={ collectionItems[0] ? thumbHelper.getSrcSet(collectionItems[0]['thumbnail'], 'tainacan-medium', collectionItems[0]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
                                     alt={ collectionItems[0] && collectionItems[0].thumbnail_alt ? collectionItems[0].thumbnail_alt : (collectionItems[0] && collectionItems[0].name ? collectionItems[0].name : __( 'Thumbnail', 'tainacan' )) } />
                                 <img 
                                         src={ collectionItems[1] ? thumbHelper.getSrc(collectionItems[1]['thumbnail'], 'tainacan-medium', collectionItems[1]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
-                                        srcset={ collectionItems[1] ? thumbHelper.getSrcSet(collectionItems[1]['thumbnail'], 'tainacan-medium', collectionItems[1]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
+                                        srcSet={ collectionItems[1] ? thumbHelper.getSrcSet(collectionItems[1]['thumbnail'], 'tainacan-medium', collectionItems[1]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
                                         alt={ collectionItems[1] && collectionItems[1].thumbnail_alt ? collectionItems[1].thumbnail_alt : (collectionItems[1] && collectionItems[1].name ? collectionItems[1].name : __( 'Thumbnail', 'tainacan' )) } />
                                 <img 
                                         src={ collectionItems[2] ? thumbHelper.getSrc(collectionItems[2]['thumbnail'], 'tainacan-medium', collectionItems[2]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
-                                        srcset={ collectionItems[2] ? thumbHelper.getSrcSet(collectionItems[2]['thumbnail'], 'tainacan-medium', collectionItems[2]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
+                                        srcSet={ collectionItems[2] ? thumbHelper.getSrcSet(collectionItems[2]['thumbnail'], 'tainacan-medium', collectionItems[2]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
                                         alt={ collectionItems[2] && collectionItems[2].thumbnail_alt ? collectionItems[2].thumbnail_alt : (collectionItems[2] && collectionItems[2].name ? collectionItems[2].name : __( 'Thumbnail', 'tainacan' )) } />
                             </div>
                             :
diff --git a/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/index.js b/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/index.js
index be69ca767..29bb82d92 100644
--- a/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/index.js
+++ b/src/views/gutenberg-blocks/tainacan-items/carousel-items-list/index.js
@@ -210,7 +210,7 @@ registerBlockType('tainacan/carousel-items-list', {
                         target="_blank">
                         <img
                             src={ thumbHelper.getSrc(item['thumbnail'], (maxItemsPerScreen > 4 ? (!cropImagesToSquare ? 'tainacan-medium-full' : 'tainacan-medium') : 'large'), item['document_mimetype']) }
-                            srcset={ thumbHelper.getSrcSet(item['thumbnail'], (maxItemsPerScreen > 4 ? (!cropImagesToSquare ? 'tainacan-medium-full' : 'tainacan-medium') : 'large'), item['document_mimetype']) }
+                            srcSet={ thumbHelper.getSrcSet(item['thumbnail'], (maxItemsPerScreen > 4 ? (!cropImagesToSquare ? 'tainacan-medium-full' : 'tainacan-medium') : 'large'), item['document_mimetype']) }
                             alt={ item.thumbnail_alt ? item.thumbnail_alt : (item && item.title ? item.title : __( 'Thumbnail', 'tainacan' )) }/>
                         { !hideTitle ? <span>{ item.title ? item.title : '' }</span> : null }
                     </a>
diff --git a/src/views/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js b/src/views/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js
index de0013d7b..f891bb1e7 100644
--- a/src/views/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js
+++ b/src/views/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js
@@ -181,15 +181,15 @@ registerBlockType('tainacan/carousel-terms-list', {
                             <div class="term-items-grid">
                                 <img 
                                     src={ termItems[0] ? thumbHelper.getSrc(termItems[0]['thumbnail'], 'tainacan-medium', termItems[0]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
-                                    srcset={ termItems[0] ? thumbHelper.getSrcSet(termItems[0]['thumbnail'], 'tainacan-medium', termItems[0]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
+                                    srcSet={ termItems[0] ? thumbHelper.getSrcSet(termItems[0]['thumbnail'], 'tainacan-medium', termItems[0]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
                                     alt={ termItems[0] && termItems[0].thumbnail_alt ? termItems[0].thumbnail_alt : (termItems[0] && termItems[0].name ? termItems[0].name : __( 'Thumbnail', 'tainacan' )) } />
                                 <img 
                                         src={ termItems[1] ? thumbHelper.getSrc(termItems[1]['thumbnail'], 'tainacan-medium', termItems[1]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
-                                        srcset={ termItems[1] ? thumbHelper.getSrcSet(termItems[1]['thumbnail'], 'tainacan-medium', termItems[1]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
+                                        srcSet={ termItems[1] ? thumbHelper.getSrcSet(termItems[1]['thumbnail'], 'tainacan-medium', termItems[1]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
                                         alt={ termItems[1] && termItems[1].thumbnail_alt ? termItems[1].thumbnail_alt : (termItems[1] && termItems[1].name ? termItems[1].name : __( 'Thumbnail', 'tainacan' )) } />
                                 <img 
                                         src={ termItems[2] ? thumbHelper.getSrc(termItems[2]['thumbnail'], 'tainacan-medium', termItems[2]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
-                                        srcset={ termItems[2] ? thumbHelper.getSrcSet(termItems[2]['thumbnail'], 'tainacan-medium', termItems[2]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
+                                        srcSet={ termItems[2] ? thumbHelper.getSrcSet(termItems[2]['thumbnail'], 'tainacan-medium', termItems[2]['document_mimetype']) :`${tainacan_blocks.base_url}/assets/images/placeholder_square.png` }
                                         alt={ termItems[2] && termItems[2].thumbnail_alt ? termItems[2].thumbnail_alt : (termItems[2] && termItems[2].name ? termItems[2].name : __( 'Thumbnail', 'tainacan' )) } />
                             </div>
                             :
diff --git a/src/views/theme-search/components/view-mode-cards.vue b/src/views/theme-search/components/view-mode-cards.vue
index 741e1759b..4f7552921 100644
--- a/src/views/theme-search/components/view-mode-cards.vue
+++ b/src/views/theme-search/components/view-mode-cards.vue
@@ -171,7 +171,6 @@ export default {
 
     .tainacan-cards-container .tainacan-card .metadata-title {
         padding: 0.6em 0.75em;
-        margin-bottom: 0px;
     }
 </style>
 
diff --git a/src/views/theme-search/components/view-mode-list.vue b/src/views/theme-search/components/view-mode-list.vue
index 1e0e1d070..373bc2f46 100644
--- a/src/views/theme-search/components/view-mode-list.vue
+++ b/src/views/theme-search/components/view-mode-list.vue
@@ -129,7 +129,6 @@ export default {
 
     .tainacan-list-container .tainacan-list .metadata-title {
         padding: 0.5em 0.875em;
-        margin-bottom: 0px;
     }
 </style>
 
diff --git a/src/views/theme-search/components/view-mode-records.vue b/src/views/theme-search/components/view-mode-records.vue
index ae0a17ef2..d64099deb 100644
--- a/src/views/theme-search/components/view-mode-records.vue
+++ b/src/views/theme-search/components/view-mode-records.vue
@@ -209,7 +209,6 @@ export default {
 
     .tainacan-records-container .tainacan-record .metadata-title {
         padding: 0.6em 0.875em;
-        margin-bottom: 0px;
     }
 </style>