diff --git a/package.json b/package.json index 9e90b95e3..e415c9d67 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "vue": "^2.5.17", "vue-router": "^3.0.1", "vue-the-mask": "^0.11.1", + "vue2-hammer": "^1.0.7", "vuedraggable": "^2.16.0", "vuex": "^3.0.1" }, diff --git a/src/admin/components/advanced-search/advanced-search.vue b/src/admin/components/advanced-search/advanced-search.vue index 13c6d85ae..f2e735abb 100644 --- a/src/admin/components/advanced-search/advanced-search.vue +++ b/src/admin/components/advanced-search/advanced-search.vue @@ -642,4 +642,47 @@ } + .advanced-search-header-dropdown { + height: 27px !important; + + .dropdown-content { + width: 800px !important; + } + + .dropdown-item:hover { + background-color: unset !important; + } + + @media screen and (min-width: 1087px) { + .dropdown-menu { + top: 0 !important; + } + } + + .dropdown-item { + span.icon:not(.is-right) { + position: relative !important; + } + } + + .advanced-search-text { + margin: 0 12px; + font-size: 12px; + color: $blue5; + } + + .advanced-search-text-di { + font-size: 14px; + font-weight: 500; + color: #01295c; + margin-top: 4px; + } + + .advanced-search-hr { + height: 1px; + margin: 8px 0; + background-color: #298596; + } + } + \ No newline at end of file diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue index 393431cef..4c1230333 100644 --- a/src/admin/components/edition/collection-edition-form.vue +++ b/src/admin/components/edition/collection-edition-form.vue @@ -908,6 +908,9 @@ export default { padding: 4px 6px; .icon { font-size: 20px; } &.disabled { + pointer-events: none; + cursor: not-allowed; + .icon { color: $gray2; } } } diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue index 5834de864..adcc21bc4 100644 --- a/src/admin/components/lists/filters-list.vue +++ b/src/admin/components/lists/filters-list.vue @@ -694,7 +694,7 @@ export default { font-weight: bold; margin-left: 0.4em; display: inline-block; - max-width: 200px; + max-width: 180px; } &:after, &:before { diff --git a/src/admin/components/lists/terms-list.vue b/src/admin/components/lists/terms-list.vue index b67166176..2fa32f4af 100644 --- a/src/admin/components/lists/terms-list.vue +++ b/src/admin/components/lists/terms-list.vue @@ -1,32 +1,50 @@ - diff --git a/src/js/store/modules/taxonomy/actions.js b/src/js/store/modules/taxonomy/actions.js index e008ea444..9708a3d5a 100644 --- a/src/js/store/modules/taxonomy/actions.js +++ b/src/js/store/modules/taxonomy/actions.js @@ -181,6 +181,8 @@ export const fetchTerms = ({ commit }, {taxonomyId, fetchOnly, search, all, orde query = `?order=${order}&${qs.stringify(fetchOnly)}&${qs.stringify(search)}`; } else if(fetchOnly && search && all ){ query = `?hideempty=0&order=${order}&${qs.stringify(fetchOnly)}&${qs.stringify(search)}`; + } else if(search && !all && !fetchOnly){ + query = `?hideempty=0&order=${order}&${qs.stringify(search)}`; } else { query =`?hideempty=0&order=${order}`; } @@ -205,12 +207,15 @@ export const fetchChildTerms = ({ commit }, { parentId, taxonomyId, fetchOnly, s order = 'asc'; } - if (fetchOnly && search && !all) { + if(fetchOnly && search && !all ){ query = `?order=${order}&${qs.stringify(fetchOnly)}&${qs.stringify(search)}`; - } else if (fetchOnly && search && all) { + } else if(fetchOnly && search && all ){ query = `?hideempty=0&order=${order}&${qs.stringify(fetchOnly)}&${qs.stringify(search)}`; + } else if(search && !all && !fetchOnly){ + console.log(search) + query = `?hideempty=0&order=${order}&${qs.stringify(search)}`; } else { - query = `?hideempty=0&order=${order}`; + query =`?hideempty=0&order=${order}`; } query += '&parent=' + parentId;