tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/0.20.0' of github.com:tainacan/tainacan into release/0.20.0

This commit is contained in:
vnmedeiros 2023-02-10 09:20:14 -03:00
parent ee0a384314 115caa19ea
commit 93528b7d7c
6 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/geocoordinate_preview.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 67 KiB

27
src/views/admin/components/lists/items-list.vue
View File

@ -1585,6 +1585,27 @@
</option> </option>
</b-select> </b-select>
</div> </div>
<section
v-else
class="section">
<div class="content has-text-grey has-text-centered">
<p style="margin-bottom: 0px">
<span class="icon is-large">
<i>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="var(--tainacan-info-color, #555758)"
width="2.875em"
height="2.875em">
<path d="M15,19L9,16.89V5L15,7.11M20.5,3C20.44,3 20.39,3 20.34,3L15,5.1L9,3L3.36,4.9C3.15,4.97 3,5.15 3,5.38V20.5A0.5,0.5 0 0,0 3.5,21C3.55,21 3.61,21 3.66,20.97L9,18.9L15,21L20.64,19.1C20.85,19 21,18.85 21,18.62V3.5A0.5,0.5 0 0,0 20.5,3Z" />
</svg>
</i>
</span>
</p>
<p>{{ $i18n.get('info_empty_geocoordinate_metadata_list') }}</p>
</div>
</section>
</div> </div>
</l-control> </l-control>
<l-control <l-control
@ -1784,7 +1805,11 @@
v-for="(column, metadatumIndex) in displayedMetadata" v-for="(column, metadatumIndex) in displayedMetadata"
:key="metadatumIndex" :key="metadatumIndex"
:class="{ 'metadata-type-textarea': column.metadata_type_object != undefined && column.metadata_type_object.component == 'tainacan-textarea' }" :class="{ 'metadata-type-textarea': column.metadata_type_object != undefined && column.metadata_type_object.component == 'tainacan-textarea' }"
v-if="renderMetadata(item.metadata, column) != '' && column.display && column.slug != 'thumbnail' && column.metadata_type_object != undefined && (column.metadata_type_object.related_mapped_prop != 'title')"> v-if="renderMetadata(item.metadata, column) != '' &&
column.display && column.slug != 'thumbnail' &&
column.metadata_type_object != undefined &&
(column.metadata_type_object.related_mapped_prop != 'title') &&
(column.metadata_type != 'Tainacan\\Metadata_Types\\GeoCoordinate')">
<h3 class="metadata-label">{{ column.name }}</h3> <h3 class="metadata-label">{{ column.name }}</h3>
<p <p
v-html="renderMetadata(item.metadata, column)" v-html="renderMetadata(item.metadata, column)"

2
src/views/admin/components/metadata-types/compound/class-tainacan-compound.php
View File

@ -234,7 +234,7 @@ class Compound extends Metadata_Type {
if ($meta instanceof Item_Metadata_Entity && !empty($meta->get_value_as_html())) { if ($meta instanceof Item_Metadata_Entity && !empty($meta->get_value_as_html())) {
ob_start(); ob_start();
?> ?>
<div class="tainacan-metadatum"> <div class="tainacan-metadatum metadata-type-<?php echo $meta->get_metadatum()->get_metadata_type_object()->get_slug() ?>">
<h4 class="label"> <h4 class="label">
<?php echo esc_html($meta->get_metadatum()->get_name()); ?> <?php echo esc_html($meta->get_metadatum()->get_name()); ?>
</h4> </h4>

2
src/views/admin/components/metadata-types/geocoordinate/class-tainacan-geocoordinate.php
View File

@ -31,7 +31,7 @@ class GeoCoordinate extends Metadata_Type {
$this->set_preview_template(' $this->set_preview_template('
<div> <div>
<div class="control"> <div class="control">
!!POINT IN MAP!! <img src="' . plugin_dir_url( __FILE__ ) . '/../../../../../../assets/images/geocoordinate_preview.png" alt="' . __('Image of a marker in a map.' , 'tainacan' ) . '" />
</div> </div>
</div> </div>
'); ');

2
src/views/admin/scss/_view-mode-map.scss
View File

@ -30,7 +30,7 @@
/deep/ .leaflet-marker-pane { /deep/ .leaflet-marker-pane {
filter: hue-rotate(-22deg); filter: hue-rotate(-22deg);
} }
/deep/ div.tainacan-metadatum.metadata-type-geocoordinate,
/deep/ span[data-module="geocoordinate-item-metadatum"], /deep/ span[data-module="geocoordinate-item-metadatum"],
/deep/ span[data-module="geocoordinate-item-metadatum"]+br { /deep/ span[data-module="geocoordinate-item-metadatum"]+br {
display: none; display: none;

19
src/views/gutenberg-blocks/blocks/faceted-search/theme-search/components/view-mode-map.vue
View File

@ -154,9 +154,18 @@
v-else v-else
class="section"> class="section">
<div class="content has-text-grey has-text-centered"> <div class="content has-text-grey has-text-centered">
<p> <p style="margin-bottom: 0px">
<span class="icon is-large"> <span class="icon is-large">
<i class="tainacan-icon tainacan-icon-30px tainacan-icon-public" /> <i>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="var(--tainacan-info-color, #555758)"
width="2.875em"
height="2.875em">
<path d="M15,19L9,16.89V5L15,7.11M20.5,3C20.44,3 20.39,3 20.34,3L15,5.1L9,3L3.36,4.9C3.15,4.97 3,5.15 3,5.38V20.5A0.5,0.5 0 0,0 3.5,21C3.55,21 3.61,21 3.66,20.97L9,18.9L15,21L20.64,19.1C20.85,19 21,18.85 21,18.62V3.5A0.5,0.5 0 0,0 20.5,3Z" />
</svg>
</i>
</span> </span>
</p> </p>
<p>{{ $i18n.get('info_empty_geocoordinate_metadata_list') }}</p> <p>{{ $i18n.get('info_empty_geocoordinate_metadata_list') }}</p>
@ -291,7 +300,11 @@
v-for="(column, metadatumIndex) in displayedMetadata" v-for="(column, metadatumIndex) in displayedMetadata"
:key="metadatumIndex" :key="metadatumIndex"
:class="{ 'metadata-type-textarea': column.metadata_type_object.component == 'tainacan-textarea' }" :class="{ 'metadata-type-textarea': column.metadata_type_object.component == 'tainacan-textarea' }"
v-if="renderMetadata(item, column) != '' && column.display && column.slug != 'thumbnail' && column.metadata_type_object != undefined && (column.metadata_type_object.related_mapped_prop != 'title')"> v-if="renderMetadata(item, column) != '' &&
column.display && column.slug != 'thumbnail' &&
column.metadata_type_object != undefined &&
(column.metadata_type_object.related_mapped_prop != 'title') &&
(column.metadata_type != 'Tainacan\\Metadata_Types\\GeoCoordinate') ">
<h3 class="metadata-label">{{ column.name }}</h3> <h3 class="metadata-label">{{ column.name }}</h3>
<p <p
v-html="renderMetadata(item, column)" v-html="renderMetadata(item, column)"