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

Merge branch 'develop' into feature/compount-metadata-type-refactor

This commit is contained in:
mateuswetah 2020-03-27 15:02:34 -03:00
parent bb4f48f956 8c67b65790
commit 94cfec7d21
3 changed files with 18 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/admin/components/edition/term-edition-form.vue
View File

@ -251,6 +251,7 @@
this.$nextTick()
.then(() => {
this.updateExtraFormData(this.editForm);
document.getElementById('termEditForm').scrollIntoView();
});
this.showCheckboxesWarning = false;

83
src/views/admin/components/navigation/tainacan-collection-subheader.vue
View File

@ -28,17 +28,7 @@
<ul class="menu-list level-right">
<li
:class="activeRoute == 'ItemPage' || activeRoute == 'CollectionItemsPage' || activeRoute == 'ItemEditionForm' || activeRoute == 'ItemCreatePage' ? 'is-active':''"
class="level-item"
v-tooltip="{
delay: {
show: 500,
hide: 100,
},
content: $i18n.get('items'),
autoHide: false,
placement: 'bottom-start',
classes: ['header-tooltips']
}">
class="level-item">
<router-link
tag="a"
:to="{ path: collection && collection.id ? $routerHelper.getCollectionItemsPath(collection.id, '') : '' }"
@ -52,17 +42,7 @@
<li
v-if="collection && collection.current_user_can_edit"
:class="activeRoute == 'CollectionEditionForm' ? 'is-active':''"
class="level-item"
v-tooltip="{
delay: {
show: 500,
hide: 100,
},
content: $i18n.get('label_settings'),
autoHide: false,
placement: 'bottom-start',
classes: ['header-tooltips']
}">
class="level-item">
<router-link
tag="a"
:to="{ path: collection && collection.id ? $routerHelper.getCollectionEditPath(collection.id) : '' }"
@ -77,17 +57,7 @@
<li
v-if="collection && collection.current_user_can_edit_metadata"
:class="activeRoute == 'CollectionMetadataPage' ? 'is-active':''"
class="level-item"
v-tooltip="{
delay: {
show: 500,
hide: 100,
},
content: $i18n.getFrom('metadata', 'name'),
autoHide: false,
placement: 'bottom-start',
classes: ['header-tooltips']
}">
class="level-item">
<router-link
tag="a"
:to="{ path: collection && collection.id ? $routerHelper.getCollectionMetadataPath(collection.id) : '' }"
@ -101,17 +71,7 @@
<li
v-if="collection && collection.current_user_can_edit_filters"
:class="activeRoute == 'CollectionFiltersPage' ? 'is-active':''"
class="level-item"
v-tooltip="{
delay: {
show: 500,
hide: 100,
},
content: $i18n.getFrom('filters', 'name'),
autoHide: false,
placement: 'bottom-start',
classes: ['header-tooltips']
}">
class="level-item">
<router-link
tag="a"
:to="{ path: collection && collection.id ? $routerHelper.getCollectionFiltersPath(collection.id) : ''}"
@ -125,17 +85,7 @@
<li
v-if="$userCaps.hasCapability('tnc_rep_read_logs')"
:class="activeRoute == 'CollectionActivitiesPage' ? 'is-active':''"
class="level-item"
v-tooltip="{
delay: {
show: 500,
hide: 100,
},
content: $i18n.get('activities'),
autoHide: false,
placement: 'bottom-start',
classes: ['header-tooltips']
}">
class="level-item">
<router-link
tag="a"
:to="{ path: collection && collection.id ? $routerHelper.getCollectionActivitiesPath(collection.id) : '' }"
@ -149,17 +99,7 @@
<li
v-if="collection && collection.current_user_can_edit_users"
:class="activeRoute == 'CollectionCapabilitiesPage' ? 'is-active':''"
class="level-item"
v-tooltip="{
delay: {
show: 500,
hide: 100,
},
content: $i18n.get('capabilities'),
autoHide: false,
placement: 'bottom-start',
classes: ['header-tooltips']
}">
class="level-item">
<router-link
tag="a"
:to="{ path: collection && collection.id ? $routerHelper.getCollectionCapabilitiesPath(collection.id) : '' }"
@ -217,17 +157,6 @@ export default {
<style lang="scss" scoped>
@import "../../scss/_variables.scss";
.header-tooltips .tooltip-inner {
color: turquoise5;
text-shadow: none;
background-color: var(--tainacan-turquoise2);
font-weight: 400;
padding: 10px 14px;
}
.header-tooltips .tooltip-arrow {
border-color: var(--tainacan-turquoise2);
}
// Tainacan Header
#tainacan-subheader {

12
src/views/admin/pages/lists/items-page.vue
View File

@ -4,7 +4,8 @@
'repository-level-page': isRepositoryLevel,
'is-filters-menu-open': isFiltersModalActive && !openAdvancedSearch
}"
aria-live="polite">
aria-live="polite"
ref="items-page-container">
<!-- PAGE TITLE --------------------- -->
<tainacan-title
@ -747,6 +748,15 @@
this.$eventBusSearch.updateStoreFromURL();
this.$eventBusSearch.$on('isLoadingItems', isLoadingItems => {
if (isLoadingItems != this.isLoadingItems && this.$refs['items-page-container'] && this.$refs['search-control']) {
if ((this.$refs['search-control'].classList.contains('floating-search-control')))
this.$refs['search-control'].classList.remove('floating-search-control');
this.$refs['items-page-container'].scrollTo({ top: this.$refs['search-control'].offsetTop - (this.isRepositoryLevel ? 94 : 42), behavior: 'smooth'});
}
this.isLoadingItems = isLoadingItems;
});