Merge branch 'develop' of https://github.com/tainacan/tainacan into develop

This commit is contained in:
weryques 2018-08-06 18:32:18 -03:00
commit a341f1d28e
7 changed files with 64 additions and 5 deletions

View File

@ -543,6 +543,7 @@
:collection-id="collectionId"
:displayed-metadata="displayedMetadata"
:items="items"
:has-filtered="hasFiltered"
:is-loading="isLoadingItems"
:is="registeredViewModes[viewMode] != undefined ? registeredViewModes[viewMode].component : ''"/>

View File

@ -20,7 +20,7 @@
text-align: center;
&:hover {
background-color: $gray1;
background-color: $gray2;
}
.grid-item-checkbox {

View File

@ -22,7 +22,7 @@
text-decoration: none;
&:hover {
background-color: $gray1;
background-color: $gray2;
}
.masonry-item-checkbox {

View File

@ -1,6 +1,19 @@
<template>
<div class="table-container">
<div class="table-wrapper">
<!-- Empty result placeholder -->
<section
v-if="!isLoading && items.length <= 0"
class="section">
<div class="content has-text-gray4 has-text-centered">
<p>
<b-icon
icon="file-multiple"
size="is-large"/>
</p>
<p v-if="status == undefined || status == ''">{{ hasFiltered ? $i18n.get('info_no_item_found') : $i18n.get('info_no_item_created') }}</p>
</div>
</section>
<!-- CARDS VIEW MODE -->
<div class="tainacan-cards-container">
<div
@ -73,7 +86,8 @@ export default {
collectionId: Number,
displayedMetadata: Array,
items: Array,
isLoading: false
isLoading: false,
hasFiltered: false
},
data () {
return {

View File

@ -1,6 +1,19 @@
<template>
<div class="table-container">
<div class="table-wrapper">
<!-- Empty result placeholder -->
<section
v-if="!isLoading && items.length <= 0"
class="section">
<div class="content has-text-gray4 has-text-centered">
<p>
<b-icon
icon="file-multiple"
size="is-large"/>
</p>
<p v-if="status == undefined || status == ''">{{ hasFiltered ? $i18n.get('info_no_item_found') : $i18n.get('info_no_item_created') }}</p>
</div>
</section>
<!-- RECORDS VIEW MODE -->
<masonry
:cols="{default: 7, 1919: 6, 1407: 5, 1215: 4, 1023: 3, 767: 2, 343: 1}"
@ -36,6 +49,7 @@ export default {
displayedMetadata: Array,
items: Array,
isLoading: false,
hasFiltered: false
},
data () {
return {

View File

@ -1,6 +1,19 @@
<template>
<div class="table-container">
<div class="table-wrapper">
<!-- Empty result placeholder -->
<section
v-if="!isLoading && items.length <= 0"
class="section">
<div class="content has-text-gray4 has-text-centered">
<p>
<b-icon
icon="file-multiple"
size="is-large"/>
</p>
<p v-if="status == undefined || status == ''">{{ hasFiltered ? $i18n.get('info_no_item_found') : $i18n.get('info_no_item_created') }}</p>
</div>
</section>
<!-- RECORDS VIEW MODE -->
<div class="tainacan-records-container">
<div
@ -74,6 +87,7 @@ export default {
displayedMetadata: Array,
items: Array,
isLoading: false,
hasFiltered: false
},
data () {
return {

View File

@ -1,7 +1,22 @@
<template>
<div class="table-container">
<div class="table-wrapper">
<table class="tainacan-table">
<!-- Empty result placeholder -->
<section
v-if="!isLoading && items.length <= 0"
class="section">
<div class="content has-text-gray4 has-text-centered">
<p>
<b-icon
icon="file-multiple"
size="is-large"/>
</p>
<p v-if="status == undefined || status == ''">{{ hasFiltered ? $i18n.get('info_no_item_found') : $i18n.get('info_no_item_created') }}</p>
</div>
</section>
<table
v-show="items.length > 0"
class="tainacan-table">
<thead>
<tr>
<!-- Displayed Metadata -->
@ -92,7 +107,8 @@ export default {
collectionId: Number,
displayedMetadata: Array,
items: Array,
isLoading: false
isLoading: false,
hasFiltered: false
},
data () {
return {