View modes adjustments and checkbox filter fixes for #794.
This commit is contained in:
parent
c71129a597
commit
00cade5740
|
@ -251,7 +251,7 @@
|
||||||
props: {
|
props: {
|
||||||
parent: parent,
|
parent: parent,
|
||||||
filter: this.filter,
|
filter: this.filter,
|
||||||
taxonomy_id: this.taxonomyId,
|
taxonomyId: this.taxonomyId,
|
||||||
selected: this.selected,
|
selected: this.selected,
|
||||||
metadatumId: this.metadatumId,
|
metadatumId: this.metadatumId,
|
||||||
taxonomy: this.taxonomy,
|
taxonomy: this.taxonomy,
|
||||||
|
|
|
@ -2110,6 +2110,9 @@ export default {
|
||||||
if ( this.viewMode == 'map' && this.selectedGeocoordinateMetadatum.slug && this.items ) {
|
if ( this.viewMode == 'map' && this.selectedGeocoordinateMetadatum.slug && this.items ) {
|
||||||
for (let item of this.items) {
|
for (let item of this.items) {
|
||||||
|
|
||||||
|
if ( !item.metadata )
|
||||||
|
continue;
|
||||||
|
|
||||||
let selectedItemMetadatum = item.metadata[this.selectedGeocoordinateMetadatum.slug];
|
let selectedItemMetadatum = item.metadata[this.selectedGeocoordinateMetadatum.slug];
|
||||||
|
|
||||||
// Handle compound metadata child first, as they will not appear in this list by default (they are inside their parents value)
|
// Handle compound metadata child first, as they will not appear in this list by default (they are inside their parents value)
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<div class="table-container">
|
<div class="table-container">
|
||||||
<b-loading
|
<b-loading
|
||||||
v-model="displayLoading"
|
v-model="displayLoading"
|
||||||
is-full-page="false" />
|
:is-full-page="false" />
|
||||||
<div class="table-wrapper">
|
<div class="table-wrapper">
|
||||||
<div class="related-items-list">
|
<div class="related-items-list">
|
||||||
<div
|
<div
|
||||||
|
|
|
@ -451,10 +451,14 @@
|
||||||
|
|
||||||
this.isSelectedTermsLoading = true;
|
this.isSelectedTermsLoading = true;
|
||||||
|
|
||||||
axios.get(`/taxonomy/${this.taxonomy_id}/terms/?${qs.stringify({ hideempty: 0, include: selected})}`)
|
axios.get(`/taxonomy/${this.taxonomyId}/terms/?${qs.stringify({ hideempty: 0, include: selected})}`)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
for (const term of res.data)
|
for (const term of res.data)
|
||||||
this.saveSelectedTagName(term.id, term.name, term.url);
|
this.saveSelectedTagName(
|
||||||
|
term.id,
|
||||||
|
term.name,
|
||||||
|
term.url
|
||||||
|
);
|
||||||
|
|
||||||
this.isSelectedTermsLoading = false;
|
this.isSelectedTermsLoading = false;
|
||||||
})
|
})
|
||||||
|
|
|
@ -2,7 +2,6 @@ import axios from 'axios';
|
||||||
import { SnackbarProgrammatic, ModalProgrammatic } from '@ntohq/buefy-next';
|
import { SnackbarProgrammatic, ModalProgrammatic } from '@ntohq/buefy-next';
|
||||||
import CustomDialog from '../components/other/custom-dialog.vue'
|
import CustomDialog from '../components/other/custom-dialog.vue'
|
||||||
|
|
||||||
|
|
||||||
// Simpler version of the i18n plugin to translate error feedback messages
|
// Simpler version of the i18n plugin to translate error feedback messages
|
||||||
const i18nGet = function (key) {
|
const i18nGet = function (key) {
|
||||||
let string = tainacan_plugin.i18n[key];
|
let string = tainacan_plugin.i18n[key];
|
||||||
|
@ -15,8 +14,6 @@ const tainacanSanitize = function(htmlString) {
|
||||||
|
|
||||||
export const tainacanErrorHandler = function(error) {
|
export const tainacanErrorHandler = function(error) {
|
||||||
|
|
||||||
const self = getCurrentInstance();
|
|
||||||
|
|
||||||
if (error.response && error.response.status) {
|
if (error.response && error.response.status) {
|
||||||
// The request was made and the server responded with a status code
|
// The request was made and the server responded with a status code
|
||||||
// that falls out of the range of 2xx
|
// that falls out of the range of 2xx
|
||||||
|
|
|
@ -29,6 +29,10 @@
|
||||||
text-decoration: none !important;
|
text-decoration: none !important;
|
||||||
transition: background-color 0.2s ease;
|
transition: background-color 0.2s ease;
|
||||||
|
|
||||||
|
:deep(img) {
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
|
||||||
&.selected-card {
|
&.selected-card {
|
||||||
background-color: var(--tainacan-turquoise1);
|
background-color: var(--tainacan-turquoise1);
|
||||||
.metadata-title {
|
.metadata-title {
|
||||||
|
|
|
@ -23,6 +23,10 @@
|
||||||
text-align: center;
|
text-align: center;
|
||||||
transition: background-color 0.2s ease;
|
transition: background-color 0.2s ease;
|
||||||
|
|
||||||
|
:deep(img) {
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: var(--tainacan-item-heading-hover-background-color);
|
background-color: var(--tainacan-item-heading-hover-background-color);
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,10 @@
|
||||||
display: block;
|
display: block;
|
||||||
transition: background-color 0.2s ease;
|
transition: background-color 0.2s ease;
|
||||||
|
|
||||||
|
:deep(img) {
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: var(--tainacan-item-hover-background-color) !important;
|
background-color: var(--tainacan-item-hover-background-color) !important;
|
||||||
a {
|
a {
|
||||||
|
|
|
@ -69,6 +69,10 @@
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
transition: background-color 0.2s ease;
|
transition: background-color 0.2s ease;
|
||||||
|
|
||||||
|
:deep(img) {
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
|
||||||
&:hover:not(.skeleton) {
|
&:hover:not(.skeleton) {
|
||||||
background-color: var(--tainacan-item-heading-hover-background-color);
|
background-color: var(--tainacan-item-heading-hover-background-color);
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,6 +39,10 @@
|
||||||
display: block;
|
display: block;
|
||||||
transition: background-color 0.2s ease;
|
transition: background-color 0.2s ease;
|
||||||
|
|
||||||
|
:deep(img) {
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: var(--tainacan-item-hover-background-color) !important;
|
background-color: var(--tainacan-item-hover-background-color) !important;
|
||||||
}
|
}
|
||||||
|
|
|
@ -391,6 +391,12 @@ export default {
|
||||||
mixins: [
|
mixins: [
|
||||||
viewModesMixin
|
viewModesMixin
|
||||||
],
|
],
|
||||||
|
props: {
|
||||||
|
isRepositoryLevel: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
|
}
|
||||||
|
},
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
selectedGeocoordinateMetadatumId: false,
|
selectedGeocoordinateMetadatumId: false,
|
||||||
|
@ -416,6 +422,9 @@ export default {
|
||||||
if ( this.selectedGeocoordinateMetadatum.slug && this.items ) {
|
if ( this.selectedGeocoordinateMetadatum.slug && this.items ) {
|
||||||
for (let item of this.items) {
|
for (let item of this.items) {
|
||||||
|
|
||||||
|
if ( !item.metadata )
|
||||||
|
continue;
|
||||||
|
|
||||||
let selectedItemMetadatum = item.metadata[this.selectedGeocoordinateMetadatum.slug];
|
let selectedItemMetadatum = item.metadata[this.selectedGeocoordinateMetadatum.slug];
|
||||||
|
|
||||||
// Handle compound metadata child first, as they will not appear in this list by default (they are inside their parents value)
|
// Handle compound metadata child first, as they will not appear in this list by default (they are inside their parents value)
|
||||||
|
|
|
@ -13,6 +13,7 @@ import {
|
||||||
Checkbox,
|
Checkbox,
|
||||||
Radio,
|
Radio,
|
||||||
Tag,
|
Tag,
|
||||||
|
Icon,
|
||||||
Loading,
|
Loading,
|
||||||
Dropdown,
|
Dropdown,
|
||||||
Modal,
|
Modal,
|
||||||
|
@ -175,6 +176,7 @@ export default (element) => {
|
||||||
VueItemsList.use(Checkbox);
|
VueItemsList.use(Checkbox);
|
||||||
VueItemsList.use(Radio);
|
VueItemsList.use(Radio);
|
||||||
VueItemsList.use(Tag);
|
VueItemsList.use(Tag);
|
||||||
|
VueItemsList.use(Icon);
|
||||||
VueItemsList.use(Tabs);
|
VueItemsList.use(Tabs);
|
||||||
VueItemsList.use(Loading);
|
VueItemsList.use(Loading);
|
||||||
VueItemsList.use(Dropdown);
|
VueItemsList.use(Dropdown);
|
||||||
|
|
|
@ -602,7 +602,8 @@
|
||||||
:total-items="totalItems"
|
:total-items="totalItems"
|
||||||
:is-loading="showLoading"
|
:is-loading="showLoading"
|
||||||
:enabled-view-modes="enabledViewModes"
|
:enabled-view-modes="enabledViewModes"
|
||||||
:initial-item-position="initialItemPosition">
|
:initial-item-position="initialItemPosition"
|
||||||
|
:is-repository-level="isRepositoryLevel">
|
||||||
|
|
||||||
|
|
||||||
<!-- Empty Placeholder, rendered in a slot inside the view modes -->
|
<!-- Empty Placeholder, rendered in a slot inside the view modes -->
|
||||||
|
@ -988,7 +989,7 @@
|
||||||
},
|
},
|
||||||
openAdvancedSearch(newValue){
|
openAdvancedSearch(newValue){
|
||||||
if (newValue == false){
|
if (newValue == false){
|
||||||
this.$eventBusSearchEmitter.$emit('closeAdvancedSearch');
|
this.$eventBusSearchEmitter.emit('closeAdvancedSearch');
|
||||||
|
|
||||||
if ( !this.isMobileScreen )
|
if ( !this.isMobileScreen )
|
||||||
this.isFiltersModalActive = !this.startWithFiltersHidden;
|
this.isFiltersModalActive = !this.startWithFiltersHidden;
|
||||||
|
@ -1680,7 +1681,7 @@
|
||||||
|
|
||||||
// Vue Blurhash transtition effect
|
// Vue Blurhash transtition effect
|
||||||
@import '../../../../../node_modules/another-vue3-blurhash/dist/style.css';
|
@import '../../../../../node_modules/another-vue3-blurhash/dist/style.css';
|
||||||
:deep(canvas.child) {
|
canvas.child {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue