From 0b3c96c4008948d28d6a88d311608ff915ee6265 Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Fri, 6 Jul 2018 15:38:32 -0300 Subject: [PATCH] Adds Clear all tags button. Adjustments on ItemEditionPage css and introdution of toasts notices to updated metadata. --- .../components/edition/item-edition-form.vue | 308 ++++++++++-------- .../other/checkbox-filter-modal.vue | 43 +++ src/admin/components/other/custom-dialog.vue | 2 +- src/admin/components/other/file-item.vue | 25 +- .../components/search/filters-tags-list.vue | 18 +- src/admin/pages/lists/items-page.vue | 1 - src/admin/scss/_buttons.scss | 2 +- src/admin/scss/_notices.scss | 18 + src/admin/scss/tainacan-admin.scss | 1 + src/admin/tainacan-admin-i18n.php | 5 + .../autocomplete/Autocomplete.vue | 32 +- .../filter-types/checkbox/Checkbox.vue | 22 +- .../custom-interval/CustomInterval.vue | 1 + .../relationship/Relationship.vue | 5 +- src/js/event-bus-search.js | 6 + src/js/store/modules/search/actions.js | 8 + src/js/store/modules/search/mutations.js | 8 + 17 files changed, 338 insertions(+), 167 deletions(-) create mode 100644 src/admin/components/other/checkbox-filter-modal.vue create mode 100644 src/admin/scss/_notices.scss diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue index 97f258956..d86097a0d 100644 --- a/src/admin/components/edition/item-edition-form.vue +++ b/src/admin/components/edition/item-edition-form.vue @@ -13,52 +13,6 @@
- -
- - * - -
- -

{{ ($i18n.get('info_updated_at') + ' ' + lastUpdated) }} - -   {{ $i18n.get('info_updating_metadata_values') }} -   {{ $i18n.get('info_editing_metadata_values') }} - -

-
-
- - - -
- -
-
-

- {{ $i18n.get('info_item_not_saved') }} -

-

{{ formErrorMessage }}

-
-
@@ -66,61 +20,84 @@ :title="$i18n.getHelperTitle('items', 'document')" :message="$i18n.getHelperMessage('items', 'document')"/>
-
+
- - +
+ + + + + + +
- - +
+ + + + + + +
- - +
+ + + + + + +
    @@ -229,16 +206,10 @@
- - - + + + - {{ $i18n.get('remove') }}
@@ -294,6 +274,53 @@
+ + +
+ + * + +
+ +

{{ ($i18n.get('info_updated_at') + ' ' + lastUpdated) }} + +   {{ $i18n.get('info_updating_metadata_values') }} +   {{ $i18n.get('info_editing_metadata_values') }} + +

+
+
+ + + +
+ +
+
+

+ {{ $i18n.get('info_item_not_saved') }} +

+

{{ formErrorMessage }}

+
+
{ this.isEditingValues = false; - }, 1000) + }, 2000) + this.$toast.open({ + duration: 2000, + message: this.$i18n.get('info_editing_metadata_values'), + position: 'is-bottom', + }) }); eventBus.$on('isUpdatingValue', (status) => { this.isUpdatingValues = status; + if (this.isUpdatingValues) { + this.$toast.open({ + duration: 2000, + message: this.$i18n.get('info_updating_metadata_values'), + position: 'is-bottom', + }) + } }); this.cleanLastUpdated(); }, @@ -784,7 +823,7 @@ export default { } .section-box { - border: 1px solid $draggable-border-color; + background-color: white; padding: 26px; margin-top: 16px; @@ -815,12 +854,8 @@ export default { .section-status{ padding: 16px 0; } - .section-thumbnail { - width: 174px; - padding-top: 0; - padding-bottom: 0; - } .section-attachments { + border: 1px solid $draggable-border-color; height: 250px; max-width: 100%; resize: vertical; @@ -836,8 +871,36 @@ export default { margin-right: -15px; } + .document-field { + + .document-buttons-row { + text-align: right; + top: -21px; + position: relative; + } + } + + #button-edit-thumbnail, + #button-edit-document, + #button-delete-thumbnail, + #button-delete-document { + + border-radius: 100px !important; + height: 30px !important; + width: 30px !important; + z-index: 99; + margin-left: 10px !important; + + .icon { + display: inherit; + padding: 0; + margin: 0; + margin-top: 1px; + font-size: 18px; + } + } + .thumbnail-field { - margin-top: -8px; .content { padding: 10px; @@ -859,36 +922,11 @@ export default { top: 38px; max-width: 90px; } - #button-edit-thumbnail { - - border-radius: 100px !important; - height: 40px !important; - width: 40px !important; - bottom: -20px; - left: -20px; - z-index: 99; - - .icon { - display: inherit; - padding: 0; - margin: 0; - margin-top: 1px; - } - } .thumbnail-buttons-row { - display: inline-block; - padding: 8px 0px; - border-radius: 0px 0px 0px 4px; - font-size: 14px; - a { color: $tainacan-input-color; } - .text { - top: -3px; - position: relative; - } - i.mdi-24px.mdi-set, i.mdi-24px.mdi::before { - font-size: 20px; - } + position: relative; + left: 90px; + bottom: 22px; } } diff --git a/src/admin/components/other/checkbox-filter-modal.vue b/src/admin/components/other/checkbox-filter-modal.vue new file mode 100644 index 000000000..60bcaa4f5 --- /dev/null +++ b/src/admin/components/other/checkbox-filter-modal.vue @@ -0,0 +1,43 @@ + + + + + + + + diff --git a/src/admin/components/other/custom-dialog.vue b/src/admin/components/other/custom-dialog.vue index 6b44849e2..d591511db 100644 --- a/src/admin/components/other/custom-dialog.vue +++ b/src/admin/components/other/custom-dialog.vue @@ -18,7 +18,7 @@
\ No newline at end of file diff --git a/src/classes/filter-types/custom-interval/CustomInterval.vue b/src/classes/filter-types/custom-interval/CustomInterval.vue index 54e94625b..d8b1096a3 100644 --- a/src/classes/filter-types/custom-interval/CustomInterval.vue +++ b/src/classes/filter-types/custom-interval/CustomInterval.vue @@ -9,6 +9,7 @@ @focus="isTouched = true" @input="validate_values()" icon="calendar-today"/> +

{{ $i18n.get('label_until') }}

-
+
diff --git a/src/js/event-bus-search.js b/src/js/event-bus-search.js index 30e1fb63e..967d933fe 100644 --- a/src/js/event-bus-search.js +++ b/src/js/event-bus-search.js @@ -323,6 +323,12 @@ export default { }, setCollectionId(collectionId) { this.collectionId = collectionId; + }, + clearAllFilters() { + this.$store.dispatch('search/cleanFilterTags'); + this.$store.dispatch('search/cleanMetaQueries'); + this.$store.dispatch('search/cleanTaxQueries'); + this.updateURLQueries(); }, /* Dev interfaces methods */ diff --git a/src/js/store/modules/search/actions.js b/src/js/store/modules/search/actions.js index 27d1c5810..9c4e83f85 100644 --- a/src/js/store/modules/search/actions.js +++ b/src/js/store/modules/search/actions.js @@ -127,3 +127,11 @@ export const removeFilterTag = ( { commit }, filterTag ) => { export const cleanFilterTags = ( { commit } ) => { commit('cleanFilterTags'); }; + +export const cleanMetaQueries = ( { commit } ) => { + commit('cleanMetaQueries'); +}; + +export const cleanTaxQueries = ({ commit }) => { + commit('cleanTaxQueries'); +}; diff --git a/src/js/store/modules/search/mutations.js b/src/js/store/modules/search/mutations.js index 08a1fb8c4..ce0f7cb77 100644 --- a/src/js/store/modules/search/mutations.js +++ b/src/js/store/modules/search/mutations.js @@ -154,4 +154,12 @@ export const removeFilterTag = ( state, filterTag ) => { export const cleanFilterTags = ( state ) => { state.filter_tags = []; +}; + +export const cleanMetaQueries = (state) => { + state.postquery.metaquery = []; +}; + +export const cleanTaxQueries = (state) => { + state.postquery.taxquery = []; }; \ No newline at end of file