From 2ec3d34ddf2de2177966542afc18bc9b1024925b Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Thu, 26 Jul 2018 13:01:45 -0300
Subject: [PATCH 1/9] Begins new layout changes Ref. #87.

---
 src/admin/admin.vue                           |  33 ++++---
 .../edition/collection-edition-form.vue       |   7 --
 .../components/edition/item-edition-form.vue  |   9 --
 src/admin/components/lists/filters-list.vue   |   7 --
 src/admin/components/lists/metadata-list.vue  |   7 --
 .../components/navigation/primary-menu.vue    |  41 +++++----
 ....vue => tainacan-collection-subheader.vue} |  36 ++------
 .../components/navigation/tainacan-header.vue |  60 +++++--------
 .../tainacan-repository-subheader.vue         |  85 ++++++++++++++++++
 src/admin/images/tainacan_logo_header.png     | Bin 5471 -> 11130 bytes
 src/admin/pages/lists/events-page.vue         |   6 --
 src/admin/pages/lists/items-page.vue          |  11 +--
 src/admin/pages/singles/collection-page.vue   |  22 ++---
 src/admin/pages/singles/export-page.vue       |  21 ++---
 src/admin/pages/singles/item-page.vue         |   5 --
 src/admin/scss/_inputs.scss                   |   8 ++
 src/admin/scss/_variables.scss                |   8 +-
 src/admin/scss/tainacan-admin.scss            |   8 +-
 18 files changed, 182 insertions(+), 192 deletions(-)
 rename src/admin/components/navigation/{tainacan-subheader.vue => tainacan-collection-subheader.vue} (92%)
 create mode 100644 src/admin/components/navigation/tainacan-repository-subheader.vue

diff --git a/src/admin/admin.vue b/src/admin/admin.vue
index 24ebdb48f..b4655fb58 100644
--- a/src/admin/admin.vue
+++ b/src/admin/admin.vue
@@ -10,9 +10,12 @@
                 @click="isMenuCompressed = !isMenuCompressed">
             <b-icon :icon="isMenuCompressed ? 'menu-right' : 'menu-left'" />
         </button>
-        <tainacan-header :is-menu-compressed="isMenuCompressed"/>
+        <tainacan-header />
+        <tainacan-repository-subheader 
+                :is-repository-level="isRepositoryLevel"
+                :is-menu-compressed="isMenuCompressed"/>
         <div class="column is-main-content">  
-            <router-view/> 
+            <router-view /> 
         </div>
     </div>
 </template>
@@ -20,28 +23,33 @@
 <script>
     import PrimaryMenu from './components/navigation/primary-menu.vue';
     import TainacanHeader from './components/navigation/tainacan-header.vue';
+    import TainacanRepositorySubheader from './components/navigation/tainacan-repository-subheader.vue';
 
     export default {
         name: "AdminPage",
         data(){
             return {
                 isMenuCompressed: false,
+                isRepositoryLevel : true,
                 activeRoute: '/collections'
             }
         },
         components: {
             PrimaryMenu,
-            TainacanHeader
+            TainacanHeader,
+            TainacanRepositorySubheader
         },
         created() {
             this.$userPrefs.init();
             this.isMenuCompressed = (this.$route.params.collectionId != undefined);
             this.activeRoute = this.$route.name;
+            this.isRepositoryLevel = this.$route.params.collectionId == undefined;
         },
         watch: {
             '$route' (to) {
                 this.isMenuCompressed = (to.params.collectionId != undefined);
                 this.activeRoute = to.name;
+                this.isRepositoryLevel = this.$route.params.collectionId == undefined;
             }
         }
     }
@@ -56,7 +64,6 @@
         margin-bottom: 0px;
         margin-top: 0px;
 
-
         @media screen and (max-width: 769px) {
             height: auto;
         }
@@ -80,10 +87,10 @@
 
     .is-secondary-content {
         padding: 0px;
-        margin: $header-height auto 0 auto;
+        margin: 94px auto 0 auto;
         position: relative;
         overflow-y: hidden;
-        height: calc(100% - 53px);
+        height: calc(100% - 94px);
 
         @media screen and (max-width: 769px) {
             
@@ -101,20 +108,20 @@
     #menu-compress-button {
         position: absolute;
         z-index: 99;
-        top: 70px;
-        max-width: 23px;
-        height: 21px;
-        width: 23px;
+        top: 208px;
+        max-width: 25px;
+        height: 20px;
+        width: 25px;
         border: none;
-        background-color: #c1dae0;
-        color: $secondary;
+        background-color: $blue5;
+        color: white;
         padding: 0px;
         border-top-right-radius: 2px;
         border-bottom-right-radius: 2px;
         cursor: pointer;
 
         .icon {
-            margin-top: -1px;
+            margin-top: -2px;
         }
     }
 
diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue
index e5a95dd77..f6e4a79cf 100644
--- a/src/admin/components/edition/collection-edition-form.vue
+++ b/src/admin/components/edition/collection-edition-form.vue
@@ -794,13 +794,6 @@ export default {
                 this.createNewCollection();
             }
         }
-    },
-    mounted() {
-        if (!this.$route.path.includes("new")) {
-            document.getElementById('collection-page-container').addEventListener('scroll', ($event) => {
-                this.$emit('onShrinkHeader', ($event.target.scrollTop > 53)); 
-            });
-        }
     }
 
 }
diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index 45b703661..f5d83ea71 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -857,11 +857,6 @@ export default {
         });
         this.cleanLastUpdated();
     },
-    mounted() {
-        document.getElementById('collection-page-container').addEventListener('scroll', ($event) => {
-            this.$emit('onShrinkHeader', ($event.target.scrollTop > 53)); 
-        });
-    },
     beforeRouteLeave ( to, from, next ) {
         if (this.item.status == 'auto-draft') {
             this.$modal.open({
@@ -909,10 +904,6 @@ export default {
         }
     }
 
-    .page-container-shrinked {
-        height: calc(100% - 118px) !important; // Bigger than the others due footer's height
-    }
-
     .page-container {
         padding: 25px 0px;
 
diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue
index d11ba4719..7e1b27bac 100644
--- a/src/admin/components/lists/filters-list.vue
+++ b/src/admin/components/lists/filters-list.vue
@@ -458,13 +458,6 @@ export default {
             .catch(() => {
                 this.isLoadingFilters = false;
             });
-    },
-    mounted() {
-        if (!this.isRepositoryLevel) {
-            document.getElementById('collection-page-container').addEventListener('scroll', ($event) => {
-                this.$emit('onShrinkHeader', ($event.target.scrollTop > 53)); 
-            });
-        }
     }
 }
 </script>
diff --git a/src/admin/components/lists/metadata-list.vue b/src/admin/components/lists/metadata-list.vue
index 1ac2711fc..2e75327cd 100644
--- a/src/admin/components/lists/metadata-list.vue
+++ b/src/admin/components/lists/metadata-list.vue
@@ -734,13 +734,6 @@ export default {
             .catch(() => {
                 this.isLoadingMetadatumMappers = false;
             });
-    },
-    mounted() {
-        if (!this.isRepositoryLevel) {
-            document.getElementById('collection-page-container').addEventListener('scroll', ($event) => {
-                this.$emit('onShrinkHeader', ($event.target.scrollTop > 53)); 
-            });
-        }
     }
 }
 </script>
diff --git a/src/admin/components/navigation/primary-menu.vue b/src/admin/components/navigation/primary-menu.vue
index f8c98db20..319f20853 100644
--- a/src/admin/components/navigation/primary-menu.vue
+++ b/src/admin/components/navigation/primary-menu.vue
@@ -8,6 +8,7 @@
         <aside class="menu">
 
             <ul class="menu-list">
+                <li class="repository-label"><span>{{ $i18n.get('repository') }}</span></li>
                 <li>
                     <router-link
                             tag="a"
@@ -97,8 +98,8 @@ export default {
     @import "../../scss/_variables.scss";
 
     #primary-menu {
-        background-color: $turquoise4;
-        padding: 100px 0px 0px 0px;
+        background-color: $blue4;
+        padding: 52px 0px 0px 0px;
         -webkit-transition: max-width 0.2s linear; /* Safari */
         transition: max-width 0.2s linear;
         max-width: $side-menu-width;
@@ -109,11 +110,24 @@ export default {
         }
 
         .menu {
-            padding-top: 10px;
+            padding-top: 0px;
+        }
+        .repository-label {
+            background-color: $blue5;
+            font-weight: bold;
+            font-size: 16px;
+            text-transform: uppercase;
+            color: white;
+            padding: 11px;
+            text-align: center;
+            opacity: 1;
+            visibility: visible;
+            transition: opacity 0.2s linear, visibility 0.2s linear;
+            -webkit-transition: opacity 0.2s linear, visibility 0.2s linear;
         }
         .separator {
             height: 2px;
-            background-color: $turquoise5;
+            background-color: transparent;
             width: 100%;
             margin: 24px 0;
         }
@@ -122,7 +136,7 @@ export default {
                 color: white;
                 white-space: nowrap;
                 overflow: hidden;
-                padding: 0.75em 1.8em;
+                padding: 13px 15px;
                 line-height: 1.5em;
                 border-radius: 0px;
                 -webkit-transition: padding 0.2s linear; /* Safari */
@@ -134,12 +148,7 @@ export default {
             }
 
             a:hover, a.is-active {
-                background-color: $turquoise4;
-                color: $blue5;
-
-                .activities-icon {
-                    fill: $blue5;
-                }
+                background-color: $blue3;
             }
             a:focus {
                 box-shadow: none;
@@ -154,12 +163,8 @@ export default {
         }
 
         &.is-compressed {
-            max-width: 45px;
-            a {
-                padding-left: 0.8em;
-                padding-right: 0.8em;
-            }
-            .menu-text {
+            max-width: 50px;
+            .menu-text, .repository-label>span {
                 visibility: hidden;
                 opacity: 0;
             }
@@ -177,7 +182,7 @@ export default {
                 display: flex;
                 align-items: stretch;
                 justify-content: space-evenly;
-                .separator {
+                .separator, .repository-label {
                     display: none;
                 }
                 a {
diff --git a/src/admin/components/navigation/tainacan-subheader.vue b/src/admin/components/navigation/tainacan-collection-subheader.vue
similarity index 92%
rename from src/admin/components/navigation/tainacan-subheader.vue
rename to src/admin/components/navigation/tainacan-collection-subheader.vue
index 6bba71cc2..a9975e37f 100644
--- a/src/admin/components/navigation/tainacan-subheader.vue
+++ b/src/admin/components/navigation/tainacan-collection-subheader.vue
@@ -4,7 +4,6 @@
             class="level secondary-page">
         <div class="level-left">
             <div class="level-item">
-                <h1>{{ getCollectionName() }}</h1>
                 <nav class="breadcrumbs">
                     <router-link 
                             tag="a" 
@@ -34,7 +33,6 @@
                     <b-icon 
                             size="is-small" 
                             icon="file-multiple"/>
-                    <br>
                     <span class="menu-text">{{ $i18n.get('items') }}</span>
                 </router-link>
             </li>
@@ -47,7 +45,6 @@
                     <b-icon 
                             size="is-small" 
                             icon="settings"/>
-                    <br>
                     <span class="menu-text">{{ $i18n.get('label_settings') }}</span>
                 </router-link>
             </li>
@@ -60,7 +57,6 @@
                     <b-icon 
                         size="is-small" 
                         icon="format-list-bulleted-type"/>
-                    <br>
                     <span class="menu-text">{{ $i18n.getFrom('metadata', 'name') }}</span>
                 </router-link>
             </li>
@@ -73,7 +69,6 @@
                     <b-icon 
                             size="is-small" 
                             icon="filter"/>
-                    <br>
                     <span class="menu-text">{{ $i18n.getFrom('filters', 'name') }}</span>
                 </router-link>
             </li>
@@ -84,7 +79,6 @@
                         :class="activeRoute == 'CollectionEventsPage' ? 'is-active':''"
                         :aria-label="$i18n.get('label_collection_events')">
                     <activities-icon />
-                    <br>
                     <span class="menu-text">{{ $i18n.get('events') }}</span>
                 </router-link>
             </li>
@@ -98,7 +92,7 @@ import { mapActions, mapGetters } from 'vuex';
 import ActivitiesIcon from '../other/activities-icon.vue';
 
 export default {
-    name: 'TainacanSubheader',
+    name: 'TainacanCollectionSubheader',
     data(){
         return {
             activeRoute: 'ItemsList',
@@ -212,7 +206,7 @@ export default {
     
     // Tainacan Header
     #tainacan-subheader {
-        background-color: $turquoise1;
+        background-color: $gray1;
         height: $subheader-height;
         max-height: $subheader-height;
         width: 100%;
@@ -228,27 +222,6 @@ export default {
         z-index: 9;
         transition: padding 0.3s, height 0.3s;
 
-        &.is-shrink {
-            height: $header-height;
-            max-height: $header-height;
-            padding-top: 12px;
-            padding-bottom: 12px;
-
-            h1 { margin-bottom: 4px;  }
-            li a {
-                line-height: 20px;
-                .menu-text { 
-                    visibility: hidden; 
-                    opacity: 0; 
-                    font-size: 0;
-                    line-height: 0;
-                    display: block;
-                    width: 0;
-                    height: 0;
-                }
-            }
-        }
-
         h1 {
             font-size: 18px;
             font-weight: 500;
@@ -281,7 +254,7 @@ export default {
             -webkit-transition: height 0.5s linear, padding 0.5s linear;
 
             a {
-                color: $blue5;
+                color: $gray4;
                 text-align: center;
                 white-space: nowrap;
                 overflow: hidden;
@@ -294,7 +267,8 @@ export default {
             }
             a:hover, 
             a.is-active {
-                background-color: #d1f1f2;
+                background-color: $turquoise4;
+                color: white;
                 text-decoration: none;
             }
             a:focus{
diff --git a/src/admin/components/navigation/tainacan-header.vue b/src/admin/components/navigation/tainacan-header.vue
index 54aaa8afe..501ab3bf4 100644
--- a/src/admin/components/navigation/tainacan-header.vue
+++ b/src/admin/components/navigation/tainacan-header.vue
@@ -1,8 +1,7 @@
 <template>
     <div
             id="tainacan-header"
-            class="level"
-            :class="{'menu-compressed': isMenuCompressed}">
+            class="level">
         <div class="level-left">
             <div class="level-item">
                 <router-link
@@ -65,14 +64,13 @@
             </div>
             <button
                     @click="showProcesses = !showProcesses"
-                    class="button is-small is-secondary level-item">
+                    class="button is-small is-gray1 level-item">
                 <b-icon icon="swap-vertical"/>
             </button>
             <processes-popup
                     v-if="showProcesses"
                     @closeProcessesPopup="showProcesses = false"/>
             <a
-                    :style="{color: 'white'}"
                     class="level-item"
                     :href="wordpressAdmin">
                 <b-icon icon="wordpress"/>
@@ -131,9 +129,6 @@
                 this.$eventBusSearch.setSearchQuery(this.futureSearchQuery);
             },
         },
-        props: {
-            isMenuCompressed: false
-        },
         created(){
 
             this.$root.$on('closeAdvancedSearchShortcut', () => {
@@ -159,7 +154,7 @@
 
     // Tainacan Header
     #tainacan-header {
-        background-color: $secondary;
+        background-color: $gray1;
         height: $header-height;
         max-height: $header-height;
         width: 100%;
@@ -169,49 +164,51 @@
         right: 0;
         position: absolute;
         z-index: 999;
-        color: white;
+        color: $blue5;
 
         .level-left {
             margin-left: -12px;
 
             .level-item {
                 height: $header-height;
-                width: 180px;
-                transition: width 0.15s, background-color 0.2s;
-                -webkit-transition: width 0.15s background-color 0.2s;
+                width: $side-menu-width;
                 cursor: pointer;
-                background-color: #257787;
 
                 &:focus {
                     box-shadow: none;
                 }
                 .tainacan-logo {
-                    max-height: 22px;
-                    padding: 0 24px;
-                    transition: padding 0.15s;
-                    -webkit-transition: padding linear 0.15s;
+                    height: 24px;
+                    padding: 0px;
+                    margin-left: 19px;
                 }
             }
         }
         .level-right {
-            padding-right: 12px;
+            padding-right: 14px;
+
+            .button, a {
+                color: $blue5 !important;
+            }
+            .button:hover, .button:active, .button:focus {
+                background-color: $gray1 !important;
+            }
+            
             .search-area {
                 display: flex;
                 align-items: center;
-                margin-right: 36px;
-
+                margin-right: 28px;
                 .control {
                     .search-header {
-                        border-width: 0 !important;
+                        border: 1px solid $gray2 !important;
                         height: 27px;
                         font-size: 11px;
-                        color: $gray4;
                         transition: width linear 0.15s;
                         -webkit-transition: width linear 0.15s;
-                        width: 160px;
+                        width: 220px;
                     }
                     .search-header:focus, .search-header:active {
-                        width: 220px !important;
+                        width: 372px !important;
                     }
                     .icon:not(.add-i) {
                         pointer-events: all;
@@ -249,7 +246,7 @@
                     .advanced-search-text {
                         margin: 0 12px;
                         font-size: 12px;
-                        color: white;
+                        color: $blue5;
                     }
 
                     .advanced-search-text-di {
@@ -267,20 +264,11 @@
                 }
             }
         }
-        &.menu-compressed {
-            .level-left .level-item {
-                width: 220px;
-                background-color: $secondary;
-                .tainacan-logo {
-                    padding: 0 42px;
-                }
-            }
-
-        }
 
         @media screen and (max-width: 769px) {
             padding: 0;
-            display: flex;
+            height: 104px;
+
             .level-left {
                 display: inline-block;
                 margin-left: 0 !important;
diff --git a/src/admin/components/navigation/tainacan-repository-subheader.vue b/src/admin/components/navigation/tainacan-repository-subheader.vue
new file mode 100644
index 000000000..4134651f3
--- /dev/null
+++ b/src/admin/components/navigation/tainacan-repository-subheader.vue
@@ -0,0 +1,85 @@
+<template>
+    <div
+            id="tainacan-repository-subheader" 
+            class="level secondary-page"
+            :class="{'is-menu-compressed': isMenuCompressed, 'is-repository-level' : isRepositoryLevel}">
+        <h1 v-if="isRepositoryLevel">Nome do Site</h1>
+        <h1 v-else>{{ collectionName }}</h1>
+    </div>
+</template>
+
+<script>
+import { mapActions, mapGetters } from 'vuex';
+
+export default {
+    name: 'TainacanRepositorySubheader',
+    props: {
+        isMenuCompressed: false,
+        isRepositoryLevel: true
+    },
+    computed: {
+        collectionName() {
+            return this.getCollectionName();
+        }
+    },
+    methods: {
+        ...mapActions('collection', [
+            'fetchCollectionName'
+        ]),
+        ...mapGetters('collection', [
+            'getCollectionName',
+        ])
+    },
+    mounted() {
+        this.fetchCollectionName();
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+
+    @import "../../scss/_variables.scss";
+    
+    // Tainacan Header
+    #tainacan-repository-subheader {
+        background-color: $turquoise5;
+        height: 42px;
+        max-height: 42px;
+        width: 100%;
+        overflow-y: hidden;
+        padding-top: 10px;
+        padding-bottom: 10px;
+        padding-right: $page-side-padding;
+        padding-left: calc((4.166666667% - 6.666666667px) + 160px);
+        margin: 0px;
+        vertical-align: middle; 
+        left: 0;
+        right: 0;
+        top: $header-height;
+        position: absolute;
+        z-index: 9;
+        transition: padding-left 0.2s linear, background-color 0.2s linear;
+
+        &.is-repository-level {
+            background-color: $blue5;
+        }
+
+        &.is-menu-compressed {     
+            padding-left: calc((4.166666667% - 2.083333333px)  + 50px);
+        }
+
+        h1 {
+            font-size: 18px;
+            font-weight: 500;
+            color: white;
+            line-height: 18px;
+            max-width: 100%;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;  
+            transition: all 0.2s linear;
+        }
+    }
+</style>
+
+
diff --git a/src/admin/images/tainacan_logo_header.png b/src/admin/images/tainacan_logo_header.png
index eaae2c0f58c17279d0ac7ef2855fa7ab8b3aa9df..18bbb385a07cc7bd6abb38317350af4b642f715a 100644
GIT binary patch
literal 11130
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
MlTwnb6gLd~Ke1r|XaE2J

delta 5461
zcmV-b6{_m`R^KWiiBL{Q4GJ0x0000DNk~Le000480000y2nGNE04kLN!jT~w3k*&G
z01Qq6e|L-{kwzzf6x>NfK~#90?VWkF9YvkTKfe$RO9n6yf~;W)i3^(|2n2|Npk|^t
zvM8GZqKtx|Fc4P+6(XQ;f+K;EEg%d*4u}K@LD6AVBOw7L$STAnkP!9|mb~x$@$2iW
zd*AKuyYyXNUVYAa=k)8UuBzL&@2{(V^;?WcBogUTBy9|Td=}UXcpoq#DOv)|1#Snf
zF|%hnGr~wD66xnidY`0gB)zSC-jZ~Mq<3|C+>uBm(r=LT4oN?iv?4{gE|>IrO4$pN
zz9h*y{W&6$NTjQgw3ej1D}?A0Ns}e*A!+rb-YSybE9uLU9;zaEua@+VPJf<ABogUL
zl9}yYfza%Kk#xSKwR5gBNuQGR&kCVCL(<R!#<i-X(UQhW+EcFTSgqN1Bauj?V@Nt9
z5SDLC`h1<&50`XPh0wiI(vSwmvZ<u+O1ekV8&zh|ZzV5>V<oLsZ~Ku*B+@Y?ZJ7wM
z5)&J2XON^zD}>|4bzHx@q-!h2lE-4XY9s26Baujd_ao_oK!DvZX_Y408YF3Ig-|>$
z=bFtWP0tamFH3qx>6>}KRskxENF)+z8IlG|dOi?b2NcleDw2K|wE32#4^*kQs-%gM
zUaKNN|0?NBNxLf9tV^yLB58X`=g6%hLhh6FZ_SQB5{X1wf_yWo#2YGTLrT)SBrOWs
zo~2-a<}7I=Nq?*&Xz!Kui5mM@OVY0@uAiYMX6TVfB+@eE8&4(vSa92W%dH(soRFN~
zRnmeAK{;R2ga-OBNvBt|^_{f(gC*?_)V-5e056-_pYke6dN;69L4B?OUIhMOW=re6
zSkm^udMU*V%<OL&*X|4yvD|nGc*e{Y70_0HALP5bV}YVJ0bT=^0*{;7+Xc0miKIcm
zroc#GaE+HeW@b;-*!~W{x(yAkFK^+`<Wpw$QoR>TS{2wG7*xPmp2eT77Yk^sRz?NK
zvx;ok%x;%-8E`~$>hxp=eHswj>0S<;(8%XDGf6rX7!4eloc^|?E2}<FRi@PKq9)&e
zXGu4=sQ*VKohs>_wccF0LO+e^IoB>Oc>GHw{X){-wT{2W&-ng=$64YvNjFN`x5)7(
zV>U^<N&1<jxk~p$%3^XI{mm`xuJqC)X^x~5C9P4%SVp&CERRe2v84Ak_Knnzq$`7d
z&uBsW>#MJ>wZt+>2j;g@Q$Ir`EezU!{&}@}MZ6XJD_aBK2j)roXottr2<rkz0W;+`
zfxC5jKsl@dOaN|`G);8~l{Dmn_Hf_{;4a{+z&1dCG)y;OTi_hvZ>qA%(?+%cP6p;k
z`lY1JTi91P(=2=iWM<C+r&cLi1dKDYX$AH3DljEDb%?5XyA5Q4TVj3SrhY1abW7|8
z+$m|2`iH{)0ARX&IouGEw!($%<+$o#Wnwen_i`0hCm94B3_K|5kQVjvW{cVl8D8=K
z0$}G_RGM`X+Wf8s>|9wP3S8$Mz*Ulp(#v%M15N>EsDGHIj03*c$c4%5?`~k%A_vrE
z3<a)L1D;YXU`^mkc~F_64g5oYz3HX}w~eF|fyzy+b%EtY_hn}DDgQj%RMv?Cx0m&R
zZ*_VQ1+W)zeV6=D^EgpbT^pi_UhximWwNrf74Vf#4<g{}z?lWN`E+nRy2yql9R-|S
zrDzE7#UlF(csw}n6D~3e+;WaoVC3A7*$cR&(}Spi)p0#^P00P$ucH`$YmffIS6VQu
zY=%=L75NhQdvIKsz)e(yQ|Ps}`8%#3FL8{dS}j=WA)M&+X@4+q22iWsZxrw!8ReJb
z%II3C)hz3mcx3lx83OD=6}?KpI=~*li~{<rhimc3^=Yh*>!EhVO@L~7P!5(f&CGsX
z=UAQreq84@X>0_H2eK@GK_&pF*Vx`9e6ur)6}WEq3E;UJ+XeW29d)Nr%<^|lU{9(n
zJp;A^-VLOh9Of_ycrv4WDE>X|1#DMin`cRyZf5^za7-bg9`&7)Mw{6q%`_-CC7nj^
z?_?41F<=>RJg_RT3I6O|-%MXs7!e%5&{Rv3_RBFR*|E8?ww7dnS9?;<XE-L~`c|2R
zeWQ-gFhbH4)fNf=X%%1%&<v6`QMtKHC5vlpXN<Cgio7A|EJ<m0(p`z%4fTqg?{R#_
z^?7DtSrd%PwziRUTTXi=>V1)C_4|*Y-LE&<);f|N4cdEIZZ};jzcwh#n&dRn_xdV#
zwCFQA9Z)I-GZSuqBJz4hwN2VIoQ5#7XU*&wU_accAd5|a{aZh(bdp?CSvIcgNm{dp
zroKh`%>D&nZ!<gD%$C$U#!g~pD}cP{SevzJEDxI5KKN#)a;i^|TZ$CHZNYI(Znf2r
zt6na{R|Vi^W}h*$*+I2X)%IaYMgHDDLAk@wpDQa2D1i%qU}kUN9yMvS<>77?GrI{F
zrad`T>xwJdBJ!MEGVi(EdL%8V$qL{=GrO~qfprNBagVb!3g5lY!pwdE{4lQ?aCkvo
z-WnY5uEt}`o&<a<_<y3A&8(<1liuI|AUr{3QG7Buez;m<%K;~Fleco#TP-ufd^cfc
zw*u$oR2!#%I=tyx#D{ar^L}6llJ3m#3o|QpY1jeA;(En2IuYdhG~nKxI-f46ubK3&
zI)?yt+x#YKgYYGBJ@C`YdWn1a{|2WHuD7q0{x=8yJven`wR!_e;7S^UZ&39I=YU!{
z6L>YFd=T*7HjSkWc__Q%$)9EC?ZRgT6{%+S({GS}v=eY?PPMjMDI}_n@8(n+qb8hJ
zg1%k`LY;8xK1wy@@e!_|*K6%D;D|(pSdCB^ZZBz6O1*kGh2EFu>%c|TDz(BaqGKdq
z{`$a%^ad{(32Y9G0k-Va*jj~|Es=BsaA-!gmf5Vzb53oT{Eejio^Oxu#5c>>l=Jh<
z?D3R;vaUdG4?P061PGtWk-&Rsv$~)j%<Q+4o+90oZ!j>7Y!zLtOr>{uzpbRPW_DLt
zL2j}+hTi9Eqon_>DW6ol0Q^YO65x5<TIEsvd0A#=vn0(++5*@&DQ^f#BY`gjr>;ud
zOX!yZS8hKy4)_SJAm0kV`2)ciz8W*h7Pw7+#}<&ZA-++!Eq=c@#|^t%YPXzhgro`W
zzo(pUJBeW37k@c~&*ZR9j;jD>0!L?*7ZtZ+Ca&u*srycpGz>SH+cx<dMQy9o4<>(=
z^dv8khbfQSun+LFMh2ZcpBK?<fBPoo_P%BGD}gIF`S~WUtnXLmKP@K9&ax@w(Y?NZ
zjmK-~gbHf4jDFi0MzAW$F86nVgXoN|wbiuj*$OeUw<Z0IUK{ZJlD{Guga_u?qT>AC
zlFr7}8uupZlv+6&2;;DvV`lTxD)$?KE9q;vfqcK&)M_Jj$M(%b(x!MYjzYsfHbB;l
zCeL)KWypgBeGm9AT0G0|Foi!`8C-;azr50NgDu4!K%T%~1n;5OdSwN^0k#x>Nw0&i
zcsIdS5L@7$Y}H)eSH~?JP68H7x)HbmxXsK`gX<(4@Zlc9<K$R(biKe$6ypCw_L6y^
zQ>fsPG!}QE9jGdrOeC!XT#b7#t?abzrDkR?N}5V}{D{kd8-dwjK<{L~=HZ}!-i3Lg
z7L%9cC|upJ6K+CQX|XgMcQ-!@cwW*Kz@=t3x1z1JlW~<+H9f$8npu{Oe|K9cBsXXp
zQP{Q(NxR_sv~Cf$Sv&M?pW!AOH!~O*!nPAkrd+=|)Xc80l0D%ldN;wJr-sOLX12o2
z=9$?QW_BF#-$C&b`p)Lp1x~<!;{x9&=|H(>;3~Lj*}H?fr&qE0?L$`!TztA-cb=gf
z7T`YBkqRVjhA*Xx4B-7H(2UQ0HwA71j~B92!EHW8w&TNqA&H}Kd2nifNqdBKl9yg+
zvi3tWd%l70!jwJ>ferB3A5-yERv|kB*We~+H&Xt>y`CE5fpo1(LDGkR@V84IZ{TJh
zr9dUil5;EYx7H$HKCWMxWo8Q{&BjfZBITS<Z8O`Y_<emHpJkRduU<>eFU0Tp96a#Q
zKEQ7p98=c_TuJ+r?(r7#I({EYGp1K@f%+EyOfJCh(LCTUiD};wip!JM-}yeSk1grO
zCrjEf$cgtQ+zb)?US8OLU_XBejz<AKW_B}hbE3*T5IB}{i-(bvo5}qZ_<V-VZy8-F
za1&FD^T__OJ%D?|%*fN5MDmg6M$1}Fyon3si_EMpb1bQ;m48<V+{Enbtek3pz@zWo
zVP<j0+8|~&U()$_nji2eX2$~O$rFSg8&p5D(cgcfGhToT@6~XB7xO2QvgP<pcWUCC
z@>Sq4`aX}V0w18pXmj1FQrL;?Fp5)w51QExQP>v7aT#SV;`yIWs#n;qL`=YKkJFe0
zeAvuxi^8@LCQ%;V@U+Ah{NwZnr&&UITAM})LqU#7sWS_Bh3YT=t%2W3x?EE3>abe{
z?&mVf?gNf$SIX^wfk0wlp0x>dgqh{})whbSnBkKBOkQth->h|68Og`YUcl|YORR;*
zMhGVc7Zxz#3ilWK#9B^N3)Ao!ZixlBD{<-jE(P-Wo1}fRI_p+}o0Up?VidN8Gmi4?
zsUdfn*$r(ROC=q*Qb<%>X+NYM+>bs|JQq?Pp!^_uzlXPfDYr6cl=;DN*$g!?|GO3V
zOmO-!V62%Pj(Zi(3Ch;R^}nfmPhBT)<*9|!;%qJe{;!S087RCbqwMOojiNf;usq*{
zbYuKkX4bGDek2_;>jAz@d1l|z3;0$uTUbChVF<;4ZCXm&8qXZEXHY%|*xk&YOvZN)
zup=I;xikrXTm?8+(nYG08ma39F1`bpwwX6KF56l{R<xu!8D;I@jf}D)0^`&|H{YL?
z8Z&!<>d9TF7SzQ*gX47pl1vSMraU0dEx;aTR+d7{%-%M$GjaFcu<U56#8l`;ftw{z
zv%(NY8Yk<X=Vg^>DT!-kS{k0LO{^k`&tzvg7k9>g2`MU_*UQ22`jXB9enoj)jLE=+
zB#dNL%<T8T`zg=A_zhL0&+0~jTWN3{vO(KMF|f!A0@DrmJT0l<4oNnMRuiAe4w9%A
zZmu|evZNw1PK29oyW_DjN~(Zm_=fTEwFI<DR2+K)4+W>s4jnhTPT-o^bCkbzLUxoi
zkWyrSw~MTpvg6t{hz!!QC=aI2VAT!sSVq|%iK}O%wd`5t+(n5idNZV1IXnV<$jmOQ
zr!g~IjAuYDMOhmJT#)Qdb)UdZxF_ZOYPgq4q*&7KH^7ly@RG~&Qky8LrGe$m>?Pcz
zs2UqlzKb0xn8ev3bnh+Y@f!l%C@E{xH>=%$YS}h~TSx3@W)C*fZZc^+4EJ^g-;_QH
zx>w+4{lHF>v|ZaqGBCKG^38*g;lPE-L*FUp0%;HbP~av>8?|^0H)fPgPQqD6TEn*V
z26BG}pLCV<>gxfw*ONh5(uR^Q#&foXZo4l4<IU_CGiypWZ)SH>?wNR^q&2!#;NC=k
z`bNc?z#Wnfs%CZ(sh`C1<ED%%p98LIgHWqVGQO-hqho+sk`8U*@;+-4Fao$c&*(kU
zFdqtzXPeo@l*d_l7c~f7Ny8=m1XmFqN#6<QEHk^Mhyf>@LvNt0VZf)lGM0jwJuPWE
z<ykO8-ie1t`+=leaD7QV5x`=QkiJZR!DkL>FR}fAk4d^6cXfQ0{1ojawrPHN{0cY0
zN?YA*fP4R(Bk5*50@tFHy4ASf%w}bj-v`VFc1S7T7?>ex4!)y4pLG3THHwVTwz3hb
z4DJUov&oXy#A8>0$3eJH(g9|6M|g3PB=UGX?^vZN;ZyVmqe-)dX$Ui0n#A{iE$uUm
z?@EE2@EzRaEGsMMD6(xNBQ;`X4@kO->=f0j;V;3o7h%gVvmQx@;P#PO85TwWM>NpI
z`ILw2tL$HrCgPq)Su3mUNPj6r8Y2|Avr7kNcBZ7a@TI%q6R8=Jj>Q9)Pr#prkJEQH
zdpjQdYCC%KnH7-?vyz$g3f%X9cdJSPGn)gP+Uao&Fuq2)=S^2(W`D&aMRmma#msI4
zF6czx1Dr6>cUf#@Gdl;5uTXj>R>e2H7UQd;@$?GY9z2uDE@t-8BrEXfpt)A$Z+jp(
z-neT8Zo(wsl1>j|pkQW8@dvb#V9ss9%r3!Gu+*x~D4MSW(>v7nfFsF&&>h-3FHFvx
zq%9>KfU9#VXQ!d#!ZP6Jz}9BAznR?^l!Xz(S|M;l8}1?9tWqc~<BrC|u!RQ6krrWQ
z4@w$`&kjcCRPP98Hbv56d?wRYeY}~ynFJ#LIgP0<BK5I8<?4WIB#i(zrFPfuvw_o6
z!UBZuyJ-$K%`hxDeyQ7kXSkSIkC~l<>vQMk)sHlfnLUJ?%lrgb-r?a?#muh5e=Jwg
zYwy^uzL%TXk$6UcET@r3^9--}e;lr2s3vS*#y!#=syKft@S7y1{l7@O6ib;SmeHE;
zGMuzL()9wjM3SIw2V4<;HRZvHBL!n-ubA0Mc;vQk;+qw16>NEbnAx*tb_hPkvvKEy
zc4nEq7XR@dgxl%9(yqP-5NR8v%W?ha)xe4P1Yww&jZcm%b?xKvc(o@bF>ayUdgh_T
zg}7)!r<l9yTB1wZ82Cg+m1~p0!EHg(=J=0o9o$r`2p+98D+&6WfZP04<1sV)U0S1(
zK1;b?DdZ1H^1OzBkTevxl}-CTZ!xo`H^U^Yfg7O@$M1JhrcBe!EGwQv%_LFxN8<+Z
z>ruNJD$gvemc9q!Rx=~<XL9Xk+6#EV%>GoZATf<PnDo!t)V-Co1s)%u8a=?3NjjRA
zAZY{OllaSiaq_nSn4cHlAc^`lg}$@o`M5dR>i8-S;9@g>`(lAZFU8Y+5`Pw;+@3fR
zi9}W|B&{cDs;aXhIR07-`aUmce|G*Akw_%65+La#l4hp}UP(GvQc)`sBz;;^Ptbmh
zw-Jd%1`d)2N&14M$5VvvtMW_@Y2Jjj_H(GD<w3i@RSZKAi9`k>k_JmUJZHxHfTSNu
z+C??S=a962jil=;+F7K)IwDHlNF*{~k+di7srE_I!w4(^{({@-&ciqDN=aAO#LW{w
zf@gdPSq$uLX3?BA5{X1gNZLTsL`jck%zEqLUd51|kw_$xj@)H<FG&|PD10B5beK}&
zM@N-HBoc|FAZar^WzMd^)_54mVZa)AoP_6bTibgaf$3@X(k1>M_6;l|RkG+{00000
LNkvXXu0mjfO38f&

diff --git a/src/admin/pages/lists/events-page.vue b/src/admin/pages/lists/events-page.vue
index 0718b3c5b..f6a82d918 100644
--- a/src/admin/pages/lists/events-page.vue
+++ b/src/admin/pages/lists/events-page.vue
@@ -301,12 +301,6 @@
                 }
                 this.loadProcesses();
             }
-
-            if (!this.isRepositoryLevel) {
-                document.getElementById('collection-page-container').addEventListener('scroll', ($event) => {
-                    this.$emit('onShrinkHeader', ($event.target.scrollTop > 53)); 
-                });
-            }
         }
     }
 </script>
diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue
index b8a3bccf3..6dd01b5e6 100644
--- a/src/admin/pages/lists/items-page.vue
+++ b/src/admin/pages/lists/items-page.vue
@@ -8,7 +8,7 @@
                 v-if="!openAdvancedSearch"
                 id="filter-menu-compress-button"
                 :class="{'filter-menu-compress-button-top-repo': isRepositoryLevel}"
-                :style="{ top: !isOnTheme ? (isHeaderShrinked ? '125px' : '152px') : (searchControlHeight + 6) + 'px' }"
+                :style="{ top: !isOnTheme ? '152px' : (searchControlHeight + 6) + 'px' }"
                 @click="isFiltersMenuCompressed = !isFiltersMenuCompressed">
             <b-icon :icon="isFiltersMenuCompressed ? 'menu-right' : 'menu-left'" />
         </button>
@@ -597,7 +597,6 @@
                 collapseAll: true,
                 isOnTheme: false,
                 futureSearchQuery: '',
-                isHeaderShrinked: false,
                 localDisplayedMetadata: [],
                 registeredViewModes: tainacan_plugin.registered_view_modes,
                 openAdvancedSearch: false,
@@ -1001,14 +1000,6 @@
                 else 
                     this.$eventBusSearch.setInitialAdminViewMode(this.$userPrefs.get(prefsAdminViewMode));
             }
-            
-            // Watch Scroll for shrinking header, only on Admin at collection level
-            if (!this.isRepositoryLevel && !this.isOnTheme) {
-                document.getElementById('items-list-area').addEventListener('scroll', ($event) => {
-                    this.isHeaderShrinked = ($event.target.scrollTop > 53);
-                    this.$emit('onShrinkHeader', this.isHeaderShrinked); 
-                });
-            }
 
             // Watches window resize to adjust filter's top position and compression on mobile 
             this.$nextTick(() => {
diff --git a/src/admin/pages/singles/collection-page.vue b/src/admin/pages/singles/collection-page.vue
index d0fcb9af7..1f349f436 100644
--- a/src/admin/pages/singles/collection-page.vue
+++ b/src/admin/pages/singles/collection-page.vue
@@ -1,44 +1,32 @@
 <template>
     <div class="columns is-fullheight">
         <section class="column is-secondary-content">
-            <tainacan-subheader 
-                    :class="{ 'is-shrink': shouldShrinkHeader }"
-                    :id="collectionId"/>
+            <tainacan-collection-subheader :id="collectionId"/>
             <router-view
-                    @onShrinkHeader="onUpdateShrinkHeader($event)"
                     id="collection-page-container"
                     :collection-id="collectionId" 
-                    class="page-container page-container-small"
-                    :class="{'page-container-shrinked': shouldShrinkHeader }"/>
+                    class="page-container page-container-small"/>
         </section>
     </div>
 </template>
 
 <script>
-import TainacanSubheader from '../../components/navigation/tainacan-subheader.vue';
+import TainacanCollectionSubheader from '../../components/navigation/tainacan-collection-subheader.vue';
 
 export default {
     name: 'CollectionPage',
     data(){
         return {
-            collectionId: Number,
-            shouldShrinkHeader: false
+            collectionId: Number
         }
     },
     components: {
-        TainacanSubheader
+        TainacanCollectionSubheader
     },
     created(){
         this.collectionId = parseInt(this.$route.params.collectionId);
         this.$eventBusSearch.setCollectionId(this.collectionId);
-    },
-    methods: {
-        onUpdateShrinkHeader(event) {
-            if (this.shouldShrinkHeader != event)
-                this.shouldShrinkHeader = event;
-        }
     }
-
 }
 </script>
 
diff --git a/src/admin/pages/singles/export-page.vue b/src/admin/pages/singles/export-page.vue
index 765033553..73bcff756 100644
--- a/src/admin/pages/singles/export-page.vue
+++ b/src/admin/pages/singles/export-page.vue
@@ -1,21 +1,17 @@
 <template>
     <div class="columns is-fullheight">
         <section class="column is-secondary-content">
-            <tainacan-subheader 
-                    :class="{ 'is-shrink': shouldShrinkHeader }"
-                    :id="collectionId"/>
+            <tainacan-collection-subheader :id="collectionId"/>
             <router-view
-                    @onShrinkHeader="onUpdateShrinkHeader($event)"
                     id="export-page-container"
                     :collection-id="collectionId" 
-                    class="page-container page-container-small"
-                    :class="{'page-container-shrinked': shouldShrinkHeader }"/>
+                    class="page-container page-container-small"/>
         </section>
     </div>
 </template>
 
 <script>
-import TainacanSubheader from '../../components/navigation/tainacan-subheader.vue';
+import TainacanCollectionSubheader from '../../components/navigation/tainacan-collection-subheader.vue';
 
 export default {
     name: 'ExportPage',
@@ -23,24 +19,17 @@ export default {
         return {
             collectionId: Number,
             itemId: Number,
-            selectedList: [],
-            shouldShrinkHeader: false
+            selectedList: []
         }
     },
     components: {
-        TainacanSubheader
+        TainacanCollectionSubheader
     },
     created(){
         this.collectionId = parseInt(this.$route.params.collectionId);
         this.itemId = parseInt(this.$route.params.itemId);
         this.selectedList = [],
         this.$eventBusSearch.setCollectionId(this.collectionId);
-    },
-    methods: {
-        onUpdateShrinkHeader(event) {
-            if (this.shouldShrinkHeader != event)
-                this.shouldShrinkHeader = event;
-        }
     }
 
 }
diff --git a/src/admin/pages/singles/item-page.vue b/src/admin/pages/singles/item-page.vue
index 17087087a..8a2c88268 100644
--- a/src/admin/pages/singles/item-page.vue
+++ b/src/admin/pages/singles/item-page.vue
@@ -285,11 +285,6 @@
             margin-right: 8px;
         }
     }
-
-    .page-container-shrinked {
-        height: calc(100% - 118px) !important; // Bigger than the others due footer's height
-    }
-
     .page-container {
         padding: 25px 0px;
 
diff --git a/src/admin/scss/_inputs.scss b/src/admin/scss/_inputs.scss
index c2d5d339c..efcf83615 100644
--- a/src/admin/scss/_inputs.scss
+++ b/src/admin/scss/_inputs.scss
@@ -13,4 +13,12 @@
         color: $gray4;
         background-color: $gray2;
     }
+    &::placeholder,
+    &::-ms-input-placeholder,
+    &:-ms-input-placeholder,
+    &:-moz-placeholder,
+    &::-moz-placeholder,
+    &::-webkit-input-placeholder {
+        color: $gray4 !important;
+    }
 }
diff --git a/src/admin/scss/_variables.scss b/src/admin/scss/_variables.scss
index 3fd902e28..43ce88144 100644
--- a/src/admin/scss/_variables.scss
+++ b/src/admin/scss/_variables.scss
@@ -114,12 +114,12 @@ $colors: map-merge($colors, $addColors);
 $size-small: 0.85em; // 0.75em on Bulma.
 
 // Tainacan Header and side menus
-$header-height: 53px;
-$subheader-height: 82px;
-$side-menu-width: 180px;
+$header-height: 52px;
+$subheader-height: 42px;
+$side-menu-width: 160px;
 $filter-menu-width: 16.666666667%;
 $filter-menu-width-theme: 20.833333333%;
-$page-height: calc(100% - 53px);
+$page-height: calc(100% - 94px);
 
 // Overall Pages padding:
 $page-side-padding: 4.166666667%;//82px;
diff --git a/src/admin/scss/tainacan-admin.scss b/src/admin/scss/tainacan-admin.scss
index c19a7f997..3f83bf5ad 100644
--- a/src/admin/scss/tainacan-admin.scss
+++ b/src/admin/scss/tainacan-admin.scss
@@ -66,7 +66,7 @@ a:hover {
 
 // Page settings
 .primary-page {
-    margin-top: $header-height; 
+    margin-top: 94px; 
     height: $page-height !important;
 
     @media screen and (max-width: 769px) {
@@ -82,14 +82,10 @@ a:hover {
 }
 // Used for pages with collection subheader
 .page-container-small {
-    height: calc(100% - 82px);
+    height: calc(100% - 42px);
     overflow-y: auto;
     transition: height 0.6s;
 }
-// Used for pages with shrinked collection subheader
-.page-container-shrinked {
-    height: calc(100% - 53px) !important;
-}
 // Used for pages with subheader in mobile
 .page-container-narrow{
     padding: $page-small-top-padding $page-small-side-padding;

From abbad9bd42b13fad2b8427bdb707023fa87324b0 Mon Sep 17 00:00:00 2001
From: Leo Germani <leogermani@gmail.com>
Date: Thu, 26 Jul 2018 14:19:25 -0300
Subject: [PATCH 2/9] add methods for bulk trash and delete #69

---
 src/classes/class-tainacan-bulk-edit.php | 67 ++++++++++++++++
 tests/test-bulkedit.php                  | 98 ++++++++++++++++++++++++
 2 files changed, 165 insertions(+)

diff --git a/src/classes/class-tainacan-bulk-edit.php b/src/classes/class-tainacan-bulk-edit.php
index c77b5bc09..aac4cec9e 100644
--- a/src/classes/class-tainacan-bulk-edit.php
+++ b/src/classes/class-tainacan-bulk-edit.php
@@ -261,6 +261,73 @@ class Bulk_Edit  {
 
 	}
 
+	public function trash_items() {
+		if (!$this->get_id()) {
+			return new \WP_Error( 'no_id', __( 'Bulk Edit group not initialized', 'tainacan' ) );
+		}
+
+		global $wpdb;
+
+		$select_q = $this->_build_select( 'post_id' );
+		
+		$select_insert = "SELECT ID, '_wp_trash_meta_status', post_status FROM $wpdb->posts WHERE ID IN ($select_q)";
+		$select_insert_time = $wpdb->prepare("SELECT ID, '_wp_trash_meta_time', %s FROM $wpdb->posts WHERE ID IN ($select_q)", time());
+
+		$query_original_status = "INSERT INTO $wpdb->postmeta (post_id, meta_key, meta_value) $select_insert";
+		$query_trash_time = "INSERT INTO $wpdb->postmeta (post_id, meta_key, meta_value) $select_insert_time";
+
+		$wpdb->query($query_original_status);
+		$wpdb->query($query_trash_time);
+
+		
+		$query = "UPDATE $wpdb->posts SET post_status = 'trash' WHERE ID IN ($select_q)";
+
+		// TODO trash comments?
+
+		return $wpdb->query($query);
+
+	}
+
+	public function untrash_items() {
+		if (!$this->get_id()) {
+			return new \WP_Error( 'no_id', __( 'Bulk Edit group not initialized', 'tainacan' ) );
+		}
+
+		global $wpdb;
+
+		$select_q = $this->_build_select( 'post_id' );
+
+		// restore status
+
+		$query_restore = "UPDATE $wpdb->posts SET post_status = (SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_status' AND post_id = ID) WHERE ID IN ($select_q)";
+		$query_delete_meta1 = "DELETE FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_status' AND post_id IN ( SELECT implicitTemp.post_id FROM ($select_q) implicitTemp )";
+		$query_delete_meta2 = "DELETE FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND post_id IN ( SELECT implicitTemp.post_id FROM ($select_q) implicitTemp )";
+
+		$affected = $wpdb->query( $query_restore );
+		$wpdb->query( $query_delete_meta1 );
+		$wpdb->query( $query_delete_meta2 );
+
+		// TODO untrash comments?
+
+		return $affected;
+
+	}
+
+	public function delete_items() {
+		if (!$this->get_id()) {
+			return new \WP_Error( 'no_id', __( 'Bulk Edit group not initialized', 'tainacan' ) );
+		}
+
+		global $wpdb;
+
+		$select_q = $this->_build_select( 'post_id' );
+
+		$query_delete = "DELETE FROM $wpdb->posts WHERE ID IN ($select_q)";
+
+		return $wpdb->query($query_delete);
+
+	}
+
 
 	/**
 	 * Adds a value to the current group of items
diff --git a/tests/test-bulkedit.php b/tests/test-bulkedit.php
index 3ff8b9a8d..41b87ec72 100644
--- a/tests/test-bulkedit.php
+++ b/tests/test-bulkedit.php
@@ -842,6 +842,104 @@ class BulkEdit extends TAINACAN_UnitApiTestCase {
 
 	}
 
+	/**
+	 * @group trash
+	 */
+	function test_trash() {
+
+		$ids = array_slice($this->items_ids, 2, 17);
+		
+		$bulk = new \Tainacan\Bulk_Edit([
+			'items_ids' => $ids,
+		]);
+
+		
+		$this->assertEquals( 17, $bulk->trash_items() );
+
+		$Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
+
+		$trashed = $Tainacan_Items->fetch_ids(['post_status' => 'trash', 'posts_per_page' => -1]);
+		$rest = $Tainacan_Items->fetch_ids(['posts_per_page' => -1]);
+
+		
+		$this->assertEquals(17, sizeof($trashed));
+		$this->assertEquals(40 - 17, sizeof($rest));
+		
+
+	}
+
+	/**
+	 * @group trash
+	 */
+	function test_untrash() {
+
+		$Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
+
+		$items = $Tainacan_Items->fetch(['posts_per_page' => -1], [], 'OBJECT');
+
+		// Lets set 17 as private
+		$i = 1;
+		foreach ($items as $item) {
+			
+			If ($i > 17) break;
+			
+			$item->set_status('private');
+			$item->validate();
+			$Tainacan_Items->update($item);
+			
+			$i++;
+		}
+
+		
+		$bulk = new \Tainacan\Bulk_Edit([
+			'items_ids' => $this->items_ids,
+		]);
+		
+		$this->assertEquals( 40, $bulk->trash_items() ); // trash all items
+
+		$trashed = $Tainacan_Items->fetch_ids(['post_status' => 'trash', 'posts_per_page' => -1]);
+		$rest = $Tainacan_Items->fetch_ids(['posts_per_page' => -1]);
+
+		$this->assertEquals(40, sizeof($trashed));
+		$this->assertEquals(0, sizeof($rest));
+
+		$this->assertEquals( 40, $bulk->untrash_items() ); // untrash all items
+		
+		$trashed = $Tainacan_Items->fetch_ids(['post_status' => 'trash', 'posts_per_page' => -1]);
+		$private = $Tainacan_Items->fetch_ids(['post_status' => 'private', 'posts_per_page' => -1]);
+		$public = $Tainacan_Items->fetch_ids(['post_status' => 'publish', 'posts_per_page' => -1]);
+
+		$this->assertEquals(0, sizeof($trashed));
+		$this->assertEquals(17, sizeof($private));
+		$this->assertEquals(40 - 17, sizeof($public));
+		
+
+	}
+
+	/**
+	 * @group trash
+	 */
+	function test_delete_items() {
+
+		$ids = array_slice($this->items_ids, 2, 17);
+		
+		$bulk = new \Tainacan\Bulk_Edit([
+			'items_ids' => $ids,
+		]);
+
+		$this->assertEquals( 17, $bulk->delete_items() );
+
+		$Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
+
+		$trashed = $Tainacan_Items->fetch_ids(['post_status' => 'trash', 'posts_per_page' => -1]);
+		$rest = $Tainacan_Items->fetch_ids(['posts_per_page' => -1]);
+
+		
+		$this->assertEquals(0, sizeof($trashed));
+		$this->assertEquals(40 - 17, sizeof($rest));
+		
+
+	}
 
 
 }
\ No newline at end of file

From 19899d0ed09af04b75083fac781ebc7c65a5e642 Mon Sep 17 00:00:00 2001
From: Leo Germani <leogermani@gmail.com>
Date: Thu, 26 Jul 2018 14:52:14 -0300
Subject: [PATCH 3/9] API endpoints for trash untrash and delete #69

---
 ...lass-tainacan-rest-bulkedit-controller.php | 84 +++++++++++++++++++
 src/classes/class-tainacan-bulk-edit.php      |  2 +-
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/src/api/endpoints/class-tainacan-rest-bulkedit-controller.php b/src/api/endpoints/class-tainacan-rest-bulkedit-controller.php
index fe816e4ea..9d9724649 100644
--- a/src/api/endpoints/class-tainacan-rest-bulkedit-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-bulkedit-controller.php
@@ -56,6 +56,33 @@ class REST_Bulkedit_Controller extends REST_Controller {
 				),
 			)
         );
+        register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/' . $this->rest_base . '/(?P<group_id>[0-9a-f]+)/trash',
+			array(
+				array(
+					'methods'             => \WP_REST_Server::CREATABLE,
+					'callback'            => array($this, 'trash_items'),
+					'permission_callback' => array($this, 'bulk_edit_permissions_check'),
+				),
+			)
+        );
+        register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/' . $this->rest_base . '/(?P<group_id>[0-9a-f]+)/untrash',
+			array(
+				array(
+					'methods'             => \WP_REST_Server::CREATABLE,
+					'callback'            => array($this, 'untrash_items'),
+					'permission_callback' => array($this, 'bulk_edit_permissions_check'),
+				),
+			)
+        );
+        register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/' . $this->rest_base . '/(?P<group_id>[0-9a-f]+)/delete_items',
+			array(
+				array(
+					'methods'             => \WP_REST_Server::CREATABLE,
+					'callback'            => array($this, 'delete_items'),
+					'permission_callback' => array($this, 'bulk_edit_permissions_check'),
+				),
+			)
+        );
         register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/' . $this->rest_base . '/(?P<group_id>[0-9a-f]+)/set',
 			array(
 				array(
@@ -196,6 +223,63 @@ class REST_Bulkedit_Controller extends REST_Controller {
 
     }
 
+    public function trash_items($request) {
+        $group_id = $request['group_id'];
+
+        $args = ['id' => $group_id];
+
+        $bulk = new \Tainacan\Bulk_Edit($args);
+
+        $action = $bulk->trash_items();
+
+        if ( is_wp_error($action) ) {
+            return new \WP_REST_Response([
+                'error_message' => $action->get_error_message(),
+            ], 400);
+        } else {
+            return new \WP_REST_Response($action, 200);
+        }
+
+    }
+
+    public function untrash_items($request) {
+        $group_id = $request['group_id'];
+
+        $args = ['id' => $group_id];
+
+        $bulk = new \Tainacan\Bulk_Edit($args);
+
+        $action = $bulk->untrash_items();
+
+        if ( is_wp_error($action) ) {
+            return new \WP_REST_Response([
+                'error_message' => $action->get_error_message(),
+            ], 400);
+        } else {
+            return new \WP_REST_Response($action, 200);
+        }
+
+    }
+
+    public function delete_items($request) {
+        $group_id = $request['group_id'];
+
+        $args = ['id' => $group_id];
+
+        $bulk = new \Tainacan\Bulk_Edit($args);
+
+        $action = $bulk->delete_items();
+
+        if ( is_wp_error($action) ) {
+            return new \WP_REST_Response([
+                'error_message' => $action->get_error_message(),
+            ], 400);
+        } else {
+            return new \WP_REST_Response($action, 200);
+        }
+
+    }
+
 
     private function generic_action($method, $request, $keys = ['value']) {
         $body = json_decode($request->get_body(), true);
diff --git a/src/classes/class-tainacan-bulk-edit.php b/src/classes/class-tainacan-bulk-edit.php
index aac4cec9e..b6c0a074e 100644
--- a/src/classes/class-tainacan-bulk-edit.php
+++ b/src/classes/class-tainacan-bulk-edit.php
@@ -299,7 +299,7 @@ class Bulk_Edit  {
 
 		// restore status
 
-		$query_restore = "UPDATE $wpdb->posts SET post_status = (SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_status' AND post_id = ID) WHERE ID IN ($select_q)";
+		$query_restore = "UPDATE $wpdb->posts SET post_status = (SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_status' AND post_id = ID) WHERE ID IN ($select_q) AND post_status = 'trash'";
 		$query_delete_meta1 = "DELETE FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_status' AND post_id IN ( SELECT implicitTemp.post_id FROM ($select_q) implicitTemp )";
 		$query_delete_meta2 = "DELETE FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND post_id IN ( SELECT implicitTemp.post_id FROM ($select_q) implicitTemp )";
 

From f8c82cc2ebb139727b8783e72cc53633576589b3 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Thu, 26 Jul 2018 15:50:53 -0300
Subject: [PATCH 4/9] More steps on implementing new navigation and color
 scheme. Ref. #87.

---
 src/admin/admin.vue                           |   2 +-
 .../components/navigation/primary-menu.vue    |   2 +-
 .../tainacan-collection-subheader.vue         | 163 +++++++++++-------
 .../components/navigation/tainacan-header.vue |   6 +-
 .../components/other/activities-icon.vue      |   6 +-
 src/admin/pages/lists/collections-page.vue    |   4 +-
 src/admin/pages/lists/events-page.vue         |   2 -
 src/admin/pages/lists/taxonomies-page.vue     |   4 +-
 8 files changed, 114 insertions(+), 75 deletions(-)

diff --git a/src/admin/admin.vue b/src/admin/admin.vue
index b4655fb58..ef83caa1f 100644
--- a/src/admin/admin.vue
+++ b/src/admin/admin.vue
@@ -108,7 +108,7 @@
     #menu-compress-button {
         position: absolute;
         z-index: 99;
-        top: 208px;
+        top: 192px;
         max-width: 25px;
         height: 20px;
         width: 25px;
diff --git a/src/admin/components/navigation/primary-menu.vue b/src/admin/components/navigation/primary-menu.vue
index 319f20853..9bbcaa87b 100644
--- a/src/admin/components/navigation/primary-menu.vue
+++ b/src/admin/components/navigation/primary-menu.vue
@@ -136,7 +136,7 @@ export default {
                 color: white;
                 white-space: nowrap;
                 overflow: hidden;
-                padding: 13px 15px;
+                padding: 9px 15px;
                 line-height: 1.5em;
                 border-radius: 0px;
                 -webkit-transition: padding 0.2s linear; /* Safari */
diff --git a/src/admin/components/navigation/tainacan-collection-subheader.vue b/src/admin/components/navigation/tainacan-collection-subheader.vue
index a9975e37f..3f93a7000 100644
--- a/src/admin/components/navigation/tainacan-collection-subheader.vue
+++ b/src/admin/components/navigation/tainacan-collection-subheader.vue
@@ -4,6 +4,15 @@
             class="level secondary-page">
         <div class="level-left">
             <div class="level-item">
+                <div class="back-button">
+                    <button     
+                            @click="$router.go(-1)"
+                            class="button is-turquoise4">
+                        <span class="icon">
+                            <i class="mdi mdi-chevron-left"/>
+                        </span>
+                    </button>
+                </div>
                 <nav class="breadcrumbs">
                     <router-link 
                             tag="a" 
@@ -24,59 +33,64 @@
             </div>
         </div>
         <ul class="menu-list level-right">
-            <li class="level-item">
+            <li 
+                    :class="activeRoute == 'ItemPage' || activeRoute == 'CollectionItemsPage' || activeRoute == 'ItemEditionForm' || activeRoute == 'ItemCreatePage' ? 'is-active':''" 
+                    class="level-item">
                 <router-link  
                         tag="a" 
                         :to="{ path: $routerHelper.getCollectionItemsPath(id, '') }" 
-                        :class="activeRoute == 'ItemPage' || activeRoute == 'CollectionItemsPage' || activeRoute == 'ItemEditionForm' || activeRoute == 'ItemCreatePage' ? 'is-active':''" 
                         :aria-label="$i18n.get('label_collection_items')">
-                    <b-icon 
-                            size="is-small" 
-                            icon="file-multiple"/>
+                    <span class="icon">
+                        <i class="mdi mdi-file-multiple"/>
+                    </span>
                     <span class="menu-text">{{ $i18n.get('items') }}</span>
                 </router-link>
             </li>
-            <li class="level-item">
+            <li 
+                    :class="activeRoute == 'CollectionEditionForm' ? 'is-active':''" 
+                    class="level-item">
                 <router-link
                         tag="a" 
                         :to="{ path: $routerHelper.getCollectionEditPath(id) }" 
-                        :class="activeRoute == 'CollectionEditionForm' ? 'is-active':''" 
                         :aria-label="$i18n.get('label_settings')">
-                    <b-icon 
-                            size="is-small" 
-                            icon="settings"/>
+                    <span class="icon">
+                        <i class="mdi mdi-settings"/>
+                    </span>
                     <span class="menu-text">{{ $i18n.get('label_settings') }}</span>
                 </router-link>
             </li>
-            <li class="level-item">
+            <li 
+                    :class="activeRoute == 'MetadataList' ? 'is-active':''"
+                    class="level-item">
                 <router-link 
                         tag="a" 
                         :to="{ path: $routerHelper.getCollectionMetadataPath(id) }"
-                        :class="activeRoute == 'MetadataList' ? 'is-active':''"
                         :aria-label="$i18n.get('label_collection_metadata')">
-                    <b-icon 
-                        size="is-small" 
-                        icon="format-list-bulleted-type"/>
+                    <span class="icon">
+                        <i class="mdi mdi-format-list-bulleted-type"/>
+                    </span>
                     <span class="menu-text">{{ $i18n.getFrom('metadata', 'name') }}</span>
                 </router-link>
             </li>
-            <li class="level-item">
+            <li 
+                    :class="activeRoute == 'FiltersList' ? 'is-active':''" 
+                    class="level-item">
                 <router-link
                         tag="a" 
                         :to="{ path: $routerHelper.getCollectionFiltersPath(id) }" 
-                        :class="activeRoute == 'FiltersList' ? 'is-active':''" 
                         :aria-label="$i18n.get('label_collection_filters')">
-                    <b-icon 
-                            size="is-small" 
-                            icon="filter"/>
+                    <span class="icon">
+                        <i class="mdi mdi-filter"/>
+                    </span>
                     <span class="menu-text">{{ $i18n.getFrom('filters', 'name') }}</span>
                 </router-link>
             </li>
-            <li class="level-item">
+            <li 
+                    :class="activeRoute == 'CollectionEventsPage' ? 'is-active':''"
+                    class="level-item">
                 <router-link 
                         tag="a" 
                         :to="{ path: $routerHelper.getCollectionEventsPath(id) }" 
-                        :class="activeRoute == 'CollectionEventsPage' ? 'is-active':''"
                         :aria-label="$i18n.get('label_collection_events')">
                     <activities-icon />
                     <span class="menu-text">{{ $i18n.get('events') }}</span>
@@ -206,7 +220,7 @@ export default {
     
     // Tainacan Header
     #tainacan-subheader {
-        background-color: $gray1;
+        background-color: $gray2;
         height: $subheader-height;
         max-height: $subheader-height;
         width: 100%;
@@ -214,7 +228,7 @@ export default {
         padding-top: 18px;
         padding-bottom: 18px;
         padding-right: $page-side-padding;
-        padding-left: $page-side-padding;
+        padding-left: 0;
         margin: 0px;
         vertical-align: middle; 
         left: 0;
@@ -236,67 +250,98 @@ export default {
             transition: margin-bottom 0.2s linear; 
         }
 
+        .back-button {
+            padding: 0;
+            margin: 0 12px 0 0;
+            height: 42px;
+            width: 42px;
+            background-color: $turquoise4;
+            color: white;
+            display: flex;
+            align-items: center;
+
+            button, 
+            button:hover, 
+            button:focus, 
+            button:active{
+                color: white;
+                background-color: transparent !important;
+                border: none;
+                .icon i {
+                    font-size: 34px;
+                }
+            }
+        }
+
         .breadcrumbs {
             font-size: 12px;
             line-height: 12px;
             color: #1d1d1d;
         }
 
-        .level-left {
-            .level-item {
-                display: inline-block;
-            }  
-        }
-
         li{
             margin-right: 0px;
-            transition: height 0.5s linear, padding 0.5s linear;
-            -webkit-transition: height 0.5s linear, padding 0.5s linear;
+            transition: max-width 0.4s linear, width 0.4s linear;
+            -webkit-transition: max-width 0.4s linear, width 0.4s linear;
+            overflow: hidden;
+            max-width: 50px;
 
+            &.is-active {
+                background-color: $turquoise4;
+                a { 
+                    background-color: $turquoise4;
+                    color: white;
+                    text-decoration: none;
+                }
+                svg.activities-icon {
+                    fill: white !important;
+                }
+            }
+            &:hover {
+                max-width: 100%;
+                transition: max-width 0.4s linear, width 0.4s linear;
+                -webkit-transition: max-width 0.4s linear, width 0.4s linear;
+                 a {
+                     background-color: transparent;
+                     text-decoration: none; 
+                 }
+                .menu-text {
+                    opacity: 1.0;
+                    width: 100%;
+                    visibility: visible;
+                    transition: opacity 0.2s linear, visibility 0.2s linear, width 0.4s linear;
+                    -webkit-transition: opacity 0.2s linear, visibility 0.2s linear, width 0.4s linear;
+                }
+            }
             a {
                 color: $gray4;
                 text-align: center;
                 white-space: nowrap;
-                overflow: hidden;
                 padding: 1.0em 10px;
-                min-width: 75px;
-                line-height: 1.5em;
+                min-width: 50px;
+                line-height: 22px;
                 border-radius: 0px;
                 position: relative;
-                overflow: inherit;
-            }
-            a:hover, 
-            a.is-active {
-                background-color: $turquoise4;
-                color: white;
-                text-decoration: none;
             }
             a:focus{
                 box-shadow: none;
             }
-            a.is-active:after {
-                position: absolute;
-                content: '';
-                width: 0;
-                height: 0;
-                bottom: -1px;
-                border-left: 10px solid transparent;
-                border-right: 10px solid transparent;
-                border-bottom: 11px solid white;
-                left: calc(50% - 10px);
-                -moz-transform: scale(0.999);
-                -webkit-backface-visibility: hidden;   
-            }
             .icon {
                 margin: 0;
                 padding: 0;
+
+                i {
+                    font-size: 19px !important;
+                }
             }
             .menu-text {
                 font-size: 14px;
-                opacity: 1;
-                visibility: visible;
-                transition: opacity 0.5s linear, visibility 0.5s linear, height 0.5s linear;
-                -webkit-transition: opacity 0.5s linear, visibility 0.5s linear, height 0.5s linear;
+                display: inline-flex;
+                width: 0px;
+                opacity: 0.0;
+                visibility: hidden;
+                transition: opacity 0.2s linear, visibility 0.2s linear, width 0.4s linear;
+                -webkit-transition: opacity 0.2s linear, visibility 0.2s linear, width 0.4s linear;
             }
         }
 
diff --git a/src/admin/components/navigation/tainacan-header.vue b/src/admin/components/navigation/tainacan-header.vue
index 501ab3bf4..606ec28c5 100644
--- a/src/admin/components/navigation/tainacan-header.vue
+++ b/src/admin/components/navigation/tainacan-header.vue
@@ -64,7 +64,7 @@
             </div>
             <button
                     @click="showProcesses = !showProcesses"
-                    class="button is-small is-gray1 level-item">
+                    class="button is-small is-gray2 level-item">
                 <b-icon icon="swap-vertical"/>
             </button>
             <processes-popup
@@ -154,7 +154,7 @@
 
     // Tainacan Header
     #tainacan-header {
-        background-color: $gray1;
+        background-color: $gray2;
         height: $header-height;
         max-height: $header-height;
         width: 100%;
@@ -191,7 +191,7 @@
                 color: $blue5 !important;
             }
             .button:hover, .button:active, .button:focus {
-                background-color: $gray1 !important;
+                background-color: $gray2 !important;
             }
             
             .search-area {
diff --git a/src/admin/components/other/activities-icon.vue b/src/admin/components/other/activities-icon.vue
index 1f3574067..fe80f448e 100644
--- a/src/admin/components/other/activities-icon.vue
+++ b/src/admin/components/other/activities-icon.vue
@@ -4,8 +4,8 @@
 xmlns="http://www.w3.org/2000/svg" 
 x="0px" 
 y="0px"
-width="20" 
-height="20" 
+width="22" 
+height="22" 
 viewBox="0 0 24 24" 
 class="activities-icon" 
 xml:space="preserve">
@@ -26,7 +26,7 @@ export default {
 
 	svg.activities-icon {
         margin-bottom: -5px;
-        fill:#1E2F56;
+        fill: #898d8f;
     }
     
 </style>
diff --git a/src/admin/pages/lists/collections-page.vue b/src/admin/pages/lists/collections-page.vue
index 52dee8dd1..1f9b9758d 100644
--- a/src/admin/pages/lists/collections-page.vue
+++ b/src/admin/pages/lists/collections-page.vue
@@ -255,11 +255,9 @@ export default {
 
     .sub-header {
         min-height: $subheader-height;
-        height: $subheader-height;
+        height: $header-height;
         margin-left: -$page-side-padding;
         margin-right: -$page-side-padding;
-        margin-top: -$page-top-padding;
-        padding-top: $page-small-top-padding;
         padding-left: $page-side-padding;
         padding-right: $page-side-padding;
         border-bottom: 1px solid #ddd;
diff --git a/src/admin/pages/lists/events-page.vue b/src/admin/pages/lists/events-page.vue
index f6a82d918..510666213 100644
--- a/src/admin/pages/lists/events-page.vue
+++ b/src/admin/pages/lists/events-page.vue
@@ -313,8 +313,6 @@
         height: $header-height;
         margin-left: -$page-small-side-padding;
         margin-right: -$page-small-side-padding;
-        margin-top: -$page-small-top-padding;
-        padding-top: $page-small-top-padding;
         padding-left: $page-small-side-padding;
         padding-right: $page-small-side-padding;
         border-bottom: 1px solid #ddd;
diff --git a/src/admin/pages/lists/taxonomies-page.vue b/src/admin/pages/lists/taxonomies-page.vue
index a275f1e33..08a60e644 100644
--- a/src/admin/pages/lists/taxonomies-page.vue
+++ b/src/admin/pages/lists/taxonomies-page.vue
@@ -198,11 +198,9 @@
 
     .sub-header {
         max-height: $subheader-height;
-        height: $subheader-height;
+        height: $header-height;
         margin-left: -$page-side-padding;
         margin-right: -$page-side-padding;
-        margin-top: -$page-top-padding;
-        padding-top: $page-small-top-padding;
         padding-left: $page-side-padding;
         padding-right: $page-side-padding;
         border-bottom: 1px solid #ddd;

From 7dd454901ba6a8abd7a2b831747a83168fdc79fb Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Thu, 26 Jul 2018 16:01:44 -0300
Subject: [PATCH 5/9] Replaces png Tainacan logo by SVG version

---
 .../components/navigation/tainacan-header.vue |   2 +-
 src/admin/images/tainacan_logo_header.png     | Bin 11130 -> 0 bytes
 src/admin/images/tainacan_logo_header.svg     | 123 ++++++++++++++++++
 3 files changed, 124 insertions(+), 1 deletion(-)
 delete mode 100644 src/admin/images/tainacan_logo_header.png
 create mode 100644 src/admin/images/tainacan_logo_header.svg

diff --git a/src/admin/components/navigation/tainacan-header.vue b/src/admin/components/navigation/tainacan-header.vue
index 606ec28c5..a4fdcf82d 100644
--- a/src/admin/components/navigation/tainacan-header.vue
+++ b/src/admin/components/navigation/tainacan-header.vue
@@ -88,7 +88,7 @@
         name: 'TainacanHeader',
         data() {
             return {
-                logoHeader: tainacan_plugin.base_url + '/admin/images/tainacan_logo_header.png',
+                logoHeader: tainacan_plugin.base_url + '/admin/images/tainacan_logo_header.svg',
                 wordpressAdmin: window.location.origin + window.location.pathname.replace('admin.php', ''),
                 searchQuery: '',
                 futureSearchQuery: '',
diff --git a/src/admin/images/tainacan_logo_header.png b/src/admin/images/tainacan_logo_header.png
deleted file mode 100644
index 18bbb385a07cc7bd6abb38317350af4b642f715a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11130
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
MlTwnb6gLd~Ke1r|XaE2J

diff --git a/src/admin/images/tainacan_logo_header.svg b/src/admin/images/tainacan_logo_header.svg
new file mode 100644
index 000000000..f9f708793
--- /dev/null
+++ b/src/admin/images/tainacan_logo_header.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="63.328629"
+   width="368.00058"
+   version="1.1"
+   viewBox="0 0 368.00058 63.328629"
+   data-name="Camada 1"
+   id="Camada_1">
+  <metadata
+     id="metadata47">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>marca webPrancheta 1</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#a4ccd6;}.cls-2{fill:#7db6c4;}.cls-3{fill:#56a0b0;}.cls-4{fill:#1f2f56;}</style>
+  </defs>
+  <title
+     id="title6">marca webPrancheta 1</title>
+  <path
+     style="fill:#a4ccd6"
+     id="path8"
+     d="m 340.31269,27.701908 a 71.83,71.83 0 0 1 12.05,4.39 q 1.76,0.82 3.32,1.7 c 8.73,-9.71 9.7,-18.81 3.56,-24.9400005 v 0 c -6.14,-6.14 -15.24,-5.16 -25,3.5900005 q 0.84,1.51 1.64,3.21 a 71.83,71.83 0 0 1 4.43,12.05 z"
+     class="cls-1" />
+  <path
+     style="fill:#7db6c4"
+     id="path10"
+     d="m 315.73269,41.301908 a 46.91,46.91 0 0 0 -2,13.07 47,47 0 0 0 13.08,-2 57,57 0 0 1 -5.87,-5.29 57.05,57.05 0 0 1 -5.21,-5.78 z"
+     class="cls-2" />
+  <path
+     style="fill:#a4ccd6"
+     id="path12"
+     d="m 323.00269,25.671908 a 71.08,71.08 0 0 1 9.3,-11.38 q 1,-1 2,-1.86 c -6.09,-10.9400005 -14.11,-14.7000005 -21.8,-11.1200005 v 0 c -8.39,3.91 -10.34,13.7700005 -4.09,27.1600005 l 0.17,0.35 -0.19,-0.5 a 47.76,47.76 0 0 1 14.61,-2.65 z"
+     class="cls-1" />
+  <path
+     style="fill:#a4ccd6"
+     id="path14"
+     d="m 355.69269,33.801908 q -0.89,1 -1.88,2 a 70.85,70.85 0 0 1 -11.48,9.36 47.71,47.71 0 0 1 -2.66,14.51 l -0.5,-0.19 0.35,0.17 c 13.39,6.25 23.25,4.3 27.16,-4.09 v 0 c 3.58,-7.68 -0.15,-15.68 -10.99,-21.76 z"
+     class="cls-1" />
+  <path
+     style="fill:#7db6c4"
+     id="path16"
+     d="m 308.36269,28.341908 0.19,0.5 a 48.24,48.24 0 0 0 7.19,12.46 l 0.08,-0.27 a 58.82,58.82 0 0 1 7.18,-15.36 47.76,47.76 0 0 0 -14.64,2.67 z"
+     class="cls-2" />
+  <path
+     style="fill:#56a0b0"
+     id="path18"
+     d="m 340.31269,27.701908 a 60,60 0 0 0 -17.29,-2 58.82,58.82 0 0 0 -7.2,15.36 l -0.08,0.27 a 57.05,57.05 0 0 0 5.21,5.77 57,57 0 0 0 5.87,5.29 l 0.27,-0.08 a 59,59 0 0 0 15.24,-7.15 59.92,59.92 0 0 0 -2.02,-17.46 z"
+     class="cls-3" />
+  <path
+     style="fill:#7db6c4"
+     id="path20"
+     d="m 340.31269,27.701908 a 71.83,71.83 0 0 0 -4.39,-12.05 q -0.79,-1.7 -1.64,-3.21 -1,0.88 -2,1.86 a 71.08,71.08 0 0 0 -9.28,11.37 60,60 0 0 1 17.31,2.03 z"
+     class="cls-2" />
+  <path
+     style="fill:#7db6c4"
+     id="path22"
+     d="m 342.33269,45.161908 a 59,59 0 0 1 -15.24,7.13 l -0.27,0.08 a 48.19,48.19 0 0 0 12.36,7.11 v 0 l 0.5,0.19 a 47.71,47.71 0 0 0 2.65,-14.51 z"
+     class="cls-2" />
+  <path
+     style="fill:#7db6c4"
+     id="path24"
+     d="m 353.80269,35.781908 q 1,-1 1.88,-2 v 0 q -1.56,-0.88 -3.32,-1.7 a 71.83,71.83 0 0 0 -12.05,-4.39 59.92,59.92 0 0 1 2,17.44 70.85,70.85 0 0 0 11.49,-9.35 z"
+     class="cls-2" />
+  <path
+     style="fill:#1f2f56"
+     id="path26"
+     d="m 87.13269,12.421908 h -7.31 a 0.29,0.29 0 0 0 -0.32,0.28 v 41.25 c 0,0.19 0.11,0.28 0.32,0.28 h 7.31 c 0.21,0 0.32,-0.09 0.32,-0.28 v -41.25 c 0,-0.16 -0.11,-0.25 -0.32,-0.28 z"
+     class="cls-4" />
+  <path
+     style="fill:#1f2f56"
+     id="path28"
+     d="m 185.69269,27.661908 a 8,8 0 0 1 8.15,-8.09 h 11.56 a 0.28,0.28 0 0 0 0.32,-0.32 v -6.51 c 0,-0.18 -0.11,-0.29 -0.32,-0.32 h -11.56 c -10.3,0.7 -13.58,7.54 -15.08,13.15 v 0 c -0.11,0.11 -0.12,3.93 -0.12,7.88 0.08,3.06 -0.2,6 0.29,8.26 1.74,8 8,12.52 14.92,12.52 h 11.55 a 0.28,0.28 0 0 0 0.32,-0.32 v -6.52 c 0,-0.19 -0.11,-0.29 -0.32,-0.32 h -11.49 a 7.92,7.92 0 0 1 -8.23,-8 c 0,-3.43 0.01,-5.68 0.01,-11.41 z"
+     class="cls-4" />
+  <path
+     style="fill:#1f2f56"
+     id="path30"
+     d="m 95.56269,12.421908 h 18.78 c 6.13,0 14,6.1 14,13.94 v 27.55 a 0.28,0.28 0 0 1 -0.32,0.32 h -7.31 a 0.28,0.28 0 0 1 -0.32,-0.32 v -25.09 a 9.24,9.24 0 0 0 -9.47,-9.4 h -7.92 v 34.5 a 0.28,0.28 0 0 1 -0.32,0.32 h -7.15 a 0.28,0.28 0 0 1 -0.32,-0.32 v -41.18 c 0.05,-0.21 0.16,-0.32 0.35,-0.32 z"
+     class="cls-4" />
+  <path
+     style="fill:#1f2f56"
+     id="path32"
+     d="M 14.45269,12.421908 H 0.23268961 c -0.13,0 -0.21,0.08 -0.23,0.23 v 6.7 a 0.2,0.2 0 0 0 0.23,0.23 H 12.36269 v 34.42 a 0.2,0.2 0 0 0 0.22,0.23 h 7.5 a 0.2,0.2 0 0 0 0.22,-0.23 v -36.51 a 6.19,6.19 0 0 0 -0.79,-3.27 q -1.09,-1.8 -5.06,-1.8 z"
+     class="cls-4" />
+  <path
+     style="fill:#1f2f56"
+     id="path34"
+     d="m 32.43269,12.421908 h -21.8 v 0.23 a 2.71,2.71 0 0 1 1.6,0.53 2.35,2.35 0 0 1 0.85,1 2.7,2.7 0 0 1 0.26,1.08 5.31,5.31 0 0 1 0,0.6 c 0,1.76 0,3.69 0,3.69 h 19.09 a 0.2,0.2 0 0 0 0.23,-0.23 v -6.7 c 0,-0.1 -0.08,-0.18 -0.23,-0.2 z"
+     class="cls-4" />
+  <path
+     style="fill:#1f2f56"
+     id="path36"
+     d="m 255.00269,12.421908 h 18.78 c 6.13,0 14,6.1 14,13.94 v 27.55 a 0.28,0.28 0 0 1 -0.32,0.32 h -7.31 a 0.28,0.28 0 0 1 -0.32,-0.32 v -25.09 a 9.24,9.24 0 0 0 -9.47,-9.4 h -7.86 v 34.5 a 0.28,0.28 0 0 1 -0.32,0.32 h -7.18 a 0.28,0.28 0 0 1 -0.32,-0.32 v -41.18 c -0.01,-0.21 0.09,-0.32 0.32,-0.32 z"
+     class="cls-4" />
+  <path
+     style="fill:#1f2f56"
+     id="path38"
+     d="m 247.00269,23.231908 a 28,28 0 0 0 -0.48,-4 q -2.11,-6.83 -9.22,-6.84 h -20 c -0.19,0 -0.29,0.11 -0.32,0.32 v 6.55 a 0.28,0.28 0 0 0 0.32,0.32 h 18.87 c 3.61,0 4.11,5.53 0,6 -3.47,0.46 -6.89,0.89 -9.13,1 -7.85,0.47 -13.18,6 -13.71,13.05 v 0.45 a 16.8,16.8 0 0 0 1.27,6.36 c 2,4.56 6.33,7.82 13,7.82 h 19.08 a 0.28,0.28 0 0 0 0.32,-0.32 v -30.18 0 c 0,-0.18 0,-0.35 0,-0.53 z m -19.79,23.85 c -9.15,0 -8.78,-13.48 0,-13.48 8.78,0 10,-0.86 11.82,-1.13 v 14.61 z"
+     class="cls-4" />
+  <path
+     style="fill:#1f2f56"
+     id="path40"
+     d="m 72.64269,23.231908 a 28,28 0 0 0 -0.48,-4 q -2.11,-6.83 -9.22,-6.84 h -20 c -0.19,0 -0.29,0.11 -0.32,0.32 v 6.55 a 0.28,0.28 0 0 0 0.32,0.32 h 18.84 c 3.61,0 4.11,5.53 0,6 -3.47,0.46 -6.89,0.89 -9.13,1 -7.85,0.47 -13.18,6 -13.71,13.05 v 0.45 a 16.8,16.8 0 0 0 1.27,6.36 c 2,4.56 6.33,7.82 13,7.82 h 19.08 a 0.28,0.28 0 0 0 0.32,-0.32 v -30.18 0 c 0.02,-0.18 0.03,-0.35 0.03,-0.53 z m -19.77,23.85 c -9.15,0 -8.78,-13.48 0,-13.48 8.78,0 10,-0.86 11.82,-1.13 v 14.61 z"
+     class="cls-4" />
+  <path
+     style="fill:#1f2f56"
+     id="path42"
+     d="m 170.46269,23.231908 a 28,28 0 0 0 -0.48,-4 q -2.11,-6.83 -9.22,-6.84 h -20 c -0.19,0 -0.29,0.11 -0.32,0.32 v 6.55 a 0.28,0.28 0 0 0 0.32,0.32 h 18.84 c 3.61,0 4.11,5.53 0,6 -3.47,0.46 -6.89,0.89 -9.13,1 -7.85,0.47 -13.18,6 -13.71,13.05 v 0.45 a 16.8,16.8 0 0 0 1.24,6.33 c 2,4.56 6.33,7.82 13,7.82 h 19.08 a 0.28,0.28 0 0 0 0.32,-0.32 v -30.15 0 c 0.05,-0.18 0.06,-0.35 0.06,-0.53 z m -19.77,23.85 c -9.15,0 -8.78,-13.48 0,-13.48 8.78,0 10,-0.86 11.82,-1.13 v 14.61 z"
+     class="cls-4" />
+</svg>

From 198a777d19c9465da8946bc9f3476414ec9aa35d Mon Sep 17 00:00:00 2001
From: weryques <weryques@outlook.com>
Date: Thu, 26 Jul 2018 17:02:11 -0300
Subject: [PATCH 6/9] Finder columns view mode for modal filter checkbox (issue
 #83)

---
 package-lock.json                             |  55 +---
 package.json                                  |   1 -
 .../other/checkbox-filter-modal.vue           | 300 ++++++++++++++----
 .../filter-types/taxonomy/Checkbox.vue        |  31 +-
 4 files changed, 265 insertions(+), 122 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5714c3d10..079dd89c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2934,11 +2934,6 @@
         "esutils": "^2.0.2"
       }
     },
-    "dom-walk": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
-      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg="
-    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -3876,24 +3871,6 @@
         "pinkie-promise": "^2.0.0"
       }
     },
-    "finderjs": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/finderjs/-/finderjs-1.2.1.tgz",
-      "integrity": "sha512-xzGJHGDELnut+4z44Y0gS/6QIEFIJ3LQVjOsVj8SpoMgKp4Da/TvBOxavUnPd6Ypo76HVxrZyxBaVPT7LDEHXA==",
-      "requires": {
-        "eventemitter3": "^2.0.3",
-        "global": "^4.3.0",
-        "x-is-array": "^0.1.0",
-        "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "eventemitter3": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
-          "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
-        }
-      }
-    },
     "flat-cache": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
@@ -4715,22 +4692,6 @@
         }
       }
     },
-    "global": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
-      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
-      "requires": {
-        "min-document": "^2.19.0",
-        "process": "~0.5.1"
-      },
-      "dependencies": {
-        "process": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
-          "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8="
-        }
-      }
-    },
     "global-dirs": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
@@ -6279,14 +6240,6 @@
       "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
       "dev": true
     },
-    "min-document": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
-      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
-      "requires": {
-        "dom-walk": "^0.1.0"
-      }
-    },
     "minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -10036,11 +9989,6 @@
         "mkdirp": "^0.5.1"
       }
     },
-    "x-is-array": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/x-is-array/-/x-is-array-0.1.0.tgz",
-      "integrity": "sha1-3lIBcdR7P0FvVYfWKbidJrEtwp0="
-    },
     "xregexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
@@ -10050,7 +9998,8 @@
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
     },
     "y18n": {
       "version": "3.2.1",
diff --git a/package.json b/package.json
index aae6e978c..600f77dff 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,6 @@
     "axios": "^0.18.0",
     "buefy": "^0.6.6",
     "bulma": "^0.7.1",
-    "finderjs": "^1.2.1",
     "mdi": "^2.2.43",
     "moment": "^2.22.2",
     "qs": "^6.5.2",
diff --git a/src/admin/components/other/checkbox-filter-modal.vue b/src/admin/components/other/checkbox-filter-modal.vue
index 48b99bdd5..458a4444b 100644
--- a/src/admin/components/other/checkbox-filter-modal.vue
+++ b/src/admin/components/other/checkbox-filter-modal.vue
@@ -1,52 +1,84 @@
 <template>
-    <form action="">
-        <div
-                class="tainacan-modal-content"
-                style="width: auto">
-            <header class="tainacan-modal-title">
-                <h2>{{ this.$i18n.get('filter') }} <em>{{ filter.name }}</em></h2>
-                <hr>
-            </header>
-            <section class="tainacan-form">
-                <section
-                        id="filter-modal-checkbox-body"
-                        class="modal-card-body">
-                    <ul>
-                        <li
-                                v-for="(optionLevel0, index) in optionsLevel0"
-                                :key="index">
-                            <b-checkbox
-                                    v-model="selected"
-                                    :native-value="optionLevel0.id"
-                            >{{ optionLevel0.name }}
-                            </b-checkbox>
-                        </li>
-                    </ul>
-                    <pre>{{ selected }}</pre>
-                </section>
-
-                <footer class="field is-grouped form-submit">
-                    <div class="control">
-                        <button
-                                class="button is-outlined"
-                                type="button"
-                                @click="$parent.close()">{{ $i18n.get('cancel') }}
-                        </button>
-                    </div>
-                    <div class="control">
-                        <button
-                                @click="applyFilter"
-                                class="button is-success">{{ $i18n.get('apply') }}</button>
-                    </div>
-                </footer>
+    <div
+            class="tainacan-modal-content"
+            style="width: auto">
+        <header class="tainacan-modal-title">
+            <h2>{{ this.$i18n.get('filter') }} <em>{{ filter.name }}</em></h2>
+            <hr>
+        </header>
+        <section class="tainacan-form">
+            <div class="is-clearfix tainacan-checkbox-search-section">
+                <input
+                        disabled
+                        autocomplete="on"
+                        :placeholder="$i18n.get('instruction_search')"
+                        class="input">
+                <span class="icon is-right">
+                    <i
+                            class="mdi mdi-magnify"/>
+                </span>
+            </div>
+            <section
+                    class="modal-card-body tainacan-finder-columns-container">
+                <ul
+                        class="tainacan-finder-column"
+                        v-for="(finderColumn, key) in finderColumns"
+                        :key="key">
+                    <li
+                            class="tainacan-li-checkbox-modal"
+                            v-for="(option, index) in finderColumn"
+                            :key="index">
+                        <b-checkbox
+                                v-model="selected"
+                                :native-value="option.id">
+                            {{ `${option.name} (${option.total_children})` }}
+                        </b-checkbox>
+                        <a @click="getOptionChildren(option, key)">
+                            <b-icon
+                                    class="is-pulled-right"
+                                    icon="menu-right"
+                                    />
+                        </a>
+                    </li>
+                    <li>
+                        <div
+                                @click="getMoreOptions(finderColumn, key)"
+                                class="tainacan-show-more">
+                            <b-icon
+                                    size="is-small"
+                                    icon="chevron-down"/>
+                        </div>
+                    </li>
+                    <b-loading
+                            :is-full-page="false"
+                            :active.sync="isColumnLoading"/>
+                </ul>
+                <!--<pre>{{ selected }}</pre>-->
             </section>
-        </div>
-    </form>
+
+            <footer class="field is-grouped form-submit">
+                <div class="control">
+                    <button
+                            class="button is-outlined"
+                            type="button"
+                            @click="$parent.close()">{{ $i18n.get('cancel') }}
+                    </button>
+                </div>
+                <div class="control">
+                    <button
+                            @click="applyFilter"
+                            type="button"
+                            class="button is-success">{{ $i18n.get('apply') }}
+                    </button>
+                </div>
+            </footer>
+        </section>
+    </div>
 </template>
 
 <script>
 
-    import finder from 'finderjs/index.js';
+    import {tainacan as axios} from '../../../js/axios/axios';
 
     export default {
         name: 'CheckboxFilterModal',
@@ -55,29 +87,101 @@
             parent: Number,
             taxonomy_id: Number,
             taxonomy: String,
-            optionsLevel0: Array,
+            collection_id: Number,
+            metadatum_id: Number,
             selected: Array,
         },
+        data() {
+            return {
+                finderColumns: [],
+                itemActive: false,
+                isColumnLoading: false,
+                loadingComponent: undefined,
+            }
+        },
         created() {
-
-            let container = document.getElementById('filter-modal-checkbox-body');
-
-            this.createFinder(container);
+            this.getOptionChildren();
         },
         methods: {
-            prepareDataForFinder(dataVanilla){
-                return true;
+            removeLevelsAfter(key){
+                if(key != undefined){
+                    this.finderColumns.splice(key+1);
+                }
             },
-            getOptionChildren(){
-                return true;
-            },
-            createFinder(container){
-                let F = finder(container, {}, {});
+            createColumn(children) {
+                if (children.length > 0) {
+                    let first = undefined;
 
-                console.log(F);
+                    for (let f in this.finderColumns) {
+                        if (this.finderColumns[f][0].id == children[0].id) {
+                            first = f;
+                            break;
+                        }
+                    }
+
+                    if (first != undefined) {
+                        this.finderColumns.splice(first, 1, children);
+                    } else {
+                        this.finderColumns.push(children);
+                    }
+                }
             },
-            applyFilter(){
-                this.$emit('input', {
+            appendMore(options, key) {
+                for (let option of options) {
+                    this.finderColumns[key].push(option)
+                }
+            },
+            getOptionChildren(option, key) {
+                let parent = 0;
+
+                if (option) {
+                    parent = option.id;
+                }
+
+                let query = `?hideempty=0&order=asc&parent=${parent}&number=100`;
+
+                this.isColumnLoading = true;
+
+                axios.get(`/taxonomy/${this.taxonomy_id}/terms${query}`)
+                    .then(res => {
+                        this.removeLevelsAfter(key);
+                        this.createColumn(res.data);
+
+                        this.isColumnLoading = false;
+                    })
+                    .catch(error => {
+                        this.$console.log(error);
+
+                        this.isColumnLoading = false;
+                    });
+
+            },
+            getMoreOptions(finderColumn, key) {
+                if (finderColumn.length > 0) {
+                    let parent = finderColumn[0].parent;
+                    let offset = finderColumn.length;
+
+                    let query = `?hideempty=0&order=asc&parent=${parent}&number=100&offset=${offset}`;
+
+                    this.isColumnLoading = true;
+
+                    axios.get(`/taxonomy/${this.taxonomy_id}/terms${query}`)
+                        .then(res => {
+                            this.appendMore(res.data, key);
+
+                            this.isColumnLoading = false;
+                        })
+                        .catch(error => {
+                            this.$console.log(error);
+
+                            this.isColumnLoading = false;
+                        });
+                }
+            },
+            applyFilter() {
+                this.$parent.close();
+
+                this.$eventBusSearch.$emit('input', {
                     filter: 'checkbox',
                     taxonomy: this.taxonomy,
                     compare: 'IN',
@@ -87,16 +191,24 @@
                 });
 
                 let onlyLabels = [];
-                for(let selected of this.selected) {
-                    let valueIndex = this.options.findIndex(option => option.id == selected );
-                    if (valueIndex >= 0)
-                        onlyLabels.push(this.options[valueIndex].name)
+
+                for (let selected of this.selected) {
+
+                    for(let i in this.finderColumns){
+                        let valueIndex = this.finderColumns[i].findIndex(option => option.id == selected);
+
+                        if (valueIndex >= 0) {
+                            onlyLabels.push(this.finderColumns[i][valueIndex].name);
+                        }
+                    }
                 }
 
-                this.$eventBusSearch.$emit("sendValuesToTags", {
+                this.$eventBusSearch.$emit('sendValuesToTags', {
                     filterId: this.filter.id,
-                    value: onlyLabels
+                    value: onlyLabels,
                 });
+
+                this.$root.$emit('appliedCheckBoxModal', onlyLabels);
             }
         }
     }
@@ -104,6 +216,66 @@
 
 <style lang="scss" scoped>
 
+    @import "../../scss/variables.scss";
+
+    .tainacan-show-more {
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        cursor: pointer;
+        border: 1px solid #f2f2f2;
+        margin-top: 10px;
+        margin-bottom: 0.2rem;
+    }
+
+    .tainacan-li-checkbox-modal:hover {
+        background-color: #e6f4ff;
+    }
+
+    .tainacan-finder-columns-container {
+        background-color: white;
+        border: solid 1px #f2f2f2;
+        display: flex;
+        overflow: auto;
+        padding: 0 !important;
+    }
+
+    .tainacan-finder-columns-container:focus {
+        outline: none;
+    }
+
+    .tainacan-finder-column {
+        border-right: solid 1px #f2f2f2;
+        max-height: 400px;
+        min-height: inherit;
+        min-width: 200px;
+        overflow-y: auto;
+        list-style: none;
+        padding: 0 0.2rem 0 1rem;
+    }
+
+    .tainacan-li-checkbox-modal:first-child {
+        margin-top: 0.7rem;
+    }
+
+    .tainacan-checkbox-search-section {
+        margin-bottom: 40px;
+        display: flex;
+        align-items: center;
+        position: relative;
+
+        .icon {
+            pointer-events: all;
+            color: $blue5;
+            cursor: pointer;
+            height: 27px;
+            font-size: 18px;
+            width: 30px !important;
+            position: absolute;
+            right: 0;
+        }
+    }
+
 </style>
 
 
diff --git a/src/classes/filter-types/taxonomy/Checkbox.vue b/src/classes/filter-types/taxonomy/Checkbox.vue
index 0ce8fde42..d4babb415 100644
--- a/src/classes/filter-types/taxonomy/Checkbox.vue
+++ b/src/classes/filter-types/taxonomy/Checkbox.vue
@@ -9,6 +9,7 @@
                     :style="{ paddingLeft: (option.level * 30) + 'px' }"
                     v-model="selected"
                     :native-value="option.id"
+                    v-if="!option.isChild"
             >{{ option.name }}</b-checkbox>
             <div
                     :style="{ paddingLeft: (option.level * 30) + 'px' }"
@@ -61,6 +62,12 @@
                     }
                 }
             });
+
+            this.$root.$on('appliedCheckBoxModal', (labels) => {
+                if(labels.length){
+                    this.selectedValues();
+                }
+            });
         },
         data(){
             return {
@@ -94,7 +101,7 @@
         },
         methods: {
             getValuesTaxonomy( taxonomy ){
-                return axios.get(`/taxonomy/${taxonomy}/terms?hideempty=0&order=asc&childrencounts=1&parent=0&number=${this.filter.max_options}`).then( res => {
+                return axios.get(`/taxonomy/${taxonomy}/terms?hideempty=0&order=asc&parent=0&number=${this.filter.max_options}`).then( res => {
                     for (let item of res.data) {
                         this.taxonomy = item.taxonomy;
                         this.options.push(item);
@@ -175,9 +182,25 @@
                 let onlyLabels = [];
                 for(let selected of this.selected) {
                     let valueIndex = this.options.findIndex(option => option.id == selected );
-                    if (valueIndex >= 0)
-                        onlyLabels.push(this.options[valueIndex].name)   
+
+                    if (valueIndex >= 0) {
+                        onlyLabels.push(this.options[valueIndex].name)
+                    } else {
+                        axios.get(`/taxonomy/${this.taxonomy_id}/terms/${selected}?fetch_only[0]=name&fetch_only[1]=id`)
+                            .then( res => {
+                                onlyLabels.push(res.data.name);
+                                this.options.push({
+                                    isChild: true,
+                                    name: res.data.name,
+                                    id: res.data.id
+                                })
+                            })
+                                .catch(error => {
+                                    this.$console.log(error);
+                                });
+                    }
                 }
+
                 this.$eventBusSearch.$emit("sendValuesToTags", {
                     filterId: this.filter.id,
                     value: onlyLabels
@@ -191,9 +214,9 @@
                         parent: parent,
                         filter: this.filter,
                         taxonomy_id: this.taxonomy_id,
-                        optionsLevel0: this.options,
                         selected: this.selected,
                         metadatum_id: this.metadatum,
+                        taxonomy: this.taxonomy,
                         collection_id: this.collection,
                     }
                 });

From 5b4a78a937b576f55f8b910fa2e46697c7bc4005 Mon Sep 17 00:00:00 2001
From: leogermani <leogermani@gmail.com>
Date: Thu, 26 Jul 2018 18:13:54 -0300
Subject: [PATCH 7/9] update search engine docs

---
 docs/search-engine.md | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/search-engine.md b/docs/search-engine.md
index ba00a7cb2..832abc890 100644
--- a/docs/search-engine.md
+++ b/docs/search-engine.md
@@ -6,14 +6,20 @@ By default, when using this option to search, WordPress searches only inside the
 
 There is'nt one silver bullet to solve this problem. In some cases, perhaps for small repositories, a simple change in the way WordPress queries for posts, including relation to metadata and taxonomies, can give users the results they were looking for. In other cases, repository managers may want to use sophisticated solutions such as Elastic Search or Solr to enable Full Text Search for their users.
 
-An intermediary approach could be creating index tables and tokenizing strings. This would allow even to order results based on relevance.
+An intermediary approach could be creating index tables and tokenizing strings. This would allow even to order results based on relevance. (There is at least one paid WordPress plugin that does that)
 
-Considering all these options, our current approach is not to touch in the way WordPress handles the search, and let it be overtaken by plugins.
+Considering all these options, our current approach was to filter the SQL query built by the WordPress WP_Query object and include all the joins and wheres needed to search also in metadata and taxonomies values. This approach is the same of the "Search Everything" plugin we mention below.
 
-Eventually we will develop our own search engine plugins, to replace the limited native WordPress approach, but for now we are investigating existing plugins that could work well with Tainacan. Since we made sure to build things in the "WordPress way", and since Tainacan search uses the native `WP_Query` class to make it queries, any plugin that filters its behavior might work with Tainacan.
+If you want to disable this change to the default WordPress behavior you can do this by adding the following line to you `wp-config.php`. You should do this if you are going to use another plugin for this purpose to avoid conflicts.
+
+```
+define('TAINACAN_DISABLE_DEFAULT_SEARCH_ENGINE', true);
+```
+
+Eventually we will develop our own search engine plugins, to replace this initial approach, but for now we are investigating existing plugins that could work well with Tainacan. Since we made sure to build things in the "WordPress way", and since Tainacan search uses the native `WP_Query` class to make it queries, any plugin that filters its behavior might work with Tainacan.
 
 We are only starting this investigation, and we will keep this page updated with our findings. This is not (yet) a list of recommendation.
 
-* [Search Everything](https://wordpress.org/plugins/search-everything/): Expands the native WordPress search to also search in taxonomies and metadata. It does so by joining tables in `WP_Query` and therefore might have performance issues for large repositories.
+* [Search Everything](https://wordpress.org/plugins/search-everything/): Expands the native WordPress search to also search in taxonomies and metadata. It does so by joining tables in `WP_Query` and therefore might have performance issues for large repositories. Its core funcionality is already present in Tainacan, but it does work very well with our plugin.
 
-* [ElasticPress](https://wordpress.org/plugins/elasticpress/): integrates WordPress with an Elastic Search server. We are starting to test Tainacan with this plugin.
\ No newline at end of file
+* [ElasticPress](https://wordpress.org/plugins/elasticpress/): integrates WordPress with an Elastic Search server. We are starting to test Tainacan with this plugin.

From bf201f96c1aaf183eb6acf66d332079cb950d738 Mon Sep 17 00:00:00 2001
From: Leo Germani <leogermani@gmail.com>
Date: Thu, 26 Jul 2018 18:20:30 -0300
Subject: [PATCH 8/9] fix search deactivation and cleaning #62

---
 src/classes/class-tainacan-search-engine.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/classes/class-tainacan-search-engine.php b/src/classes/class-tainacan-search-engine.php
index d76590f46..8483d930a 100644
--- a/src/classes/class-tainacan-search-engine.php
+++ b/src/classes/class-tainacan-search-engine.php
@@ -30,7 +30,7 @@ class Search_Engine {
 		$this->ajax_request = $ajax_query ? true : false;
 		$this->options = [];
 
-        if (!defined('TAINACAN_DISABLE_DEFAULT_SEARCH_ENGINE') || TAINACAN_DISABLE_DEFAULT_SEARCH_ENGINE !== false) {
+        if (!defined('TAINACAN_DISABLE_DEFAULT_SEARCH_ENGINE') || TAINACAN_DISABLE_DEFAULT_SEARCH_ENGINE !== true) {
             $this->search_hooks();
         }
 	}
@@ -76,7 +76,7 @@ class Search_Engine {
     
     function init_tainacan_search_vars() {
 
-        if (!$this->query_instance->is_search()) {
+		if (!$this->query_instance->is_search() || empty($this->query_instance->query_vars['s']) ) {
             $this->is_tainacan_search = false;
             return;
         }

From 97071537e1fec80077475894694f8fd50f9db771 Mon Sep 17 00:00:00 2001
From: eduardohumberto <eduardo.humberto1992@gmail.com>
Date: Thu, 26 Jul 2018 21:12:18 -0300
Subject: [PATCH 9/9] csv importer - start handle document fields (ref. #86 )

---
 src/importer/class-tainacan-csv.php | 108 +++++++++++++++++++++++++++-
 1 file changed, 107 insertions(+), 1 deletion(-)

diff --git a/src/importer/class-tainacan-csv.php b/src/importer/class-tainacan-csv.php
index 0e53a8d33..0d01dd38d 100644
--- a/src/importer/class-tainacan-csv.php
+++ b/src/importer/class-tainacan-csv.php
@@ -6,7 +6,8 @@ use Tainacan;
 class CSV extends Importer {
 
 	public function __construct($attributes = array()) {
-		parent::__construct($attributes);
+        parent::__construct($attributes);
+        $this->items_repo = \Tainacan\Repositories\Items::get_instance();
 		
 		$this->set_default_options([
             'delimiter' => ',',
@@ -119,9 +120,45 @@ class CSV extends Importer {
         }
         
         $this->add_log('Success to proccess index: ' . $index  );
+        $this->add_transient('actual_index', $index); // add reference for insert
         return $processedItem;
     }
 
+    /**
+     * insert processed item from source to Tainacan, adapted to insert their attachments and document
+     *
+     * @param array $processed_item Associative array with metadatum source's as index with
+     *                              its value or values
+     * @param integer $collection_index The index in the $this->collections array of the collection the item is beeing inserted into
+     * 
+     * @return Tainacan\Entities\Item Item inserted
+     */
+    public function insert( $processed_item, $collection_index ) {
+        $inserted_item = super::insert( $processed_item, $collection_index );
+
+        $column_document = $this->get_option('document_index');
+        $column_attachment = $this->get_option('attachment_index');
+
+        if( !empty($column_document) || !empty( $column_attachment ) ){
+            
+            $index = $this->get_transient('actual_index');
+            $file =  new \SplFileObject( $this->tmp_file, 'r' );
+            $file->setFlags(\SplFileObject::SKIP_EMPTY);
+            $file->seek( $index );
+            $values = str_getcsv( rtrim($file->fgets()), $this->get_option('delimiter'), $this->get_option('enclosure')  );
+
+            if( is_array($values) && !empty($column_document) ){
+                $this->handle_document( $values[$column_document], $inserted_item);
+            }
+
+            if( is_array($values) && !empty($column_attachment) ){
+                $this->handle_attachment( $values[$column_attachment], $inserted_item);
+            }
+        }
+
+        return $inserted_item;
+    }
+
     /**
      * @inheritdoc
      */
@@ -204,4 +241,73 @@ class CSV extends Importer {
                 return $string;
         }
     }
+
+    /**
+     * method responsible to insert the item document
+     */
+    private function handle_document($column_value, $item_inserted){
+        $TainacanMedia = \Tainacan\Media::get_instance();
+
+        if( strpos($column_value,'url:') === 0 ){
+            $correct_value = substr($column_value, 4);
+            $item_inserted->set_document( $correct_value );
+            $item_inserted->set_document_type( 'url' );
+
+            if( $item_inserted->validate() )
+                $this->items_repo->update($item_inserted);
+
+        } else if( strpos($column_value,'text:') === 0 ){
+            $correct_value = substr($column_value, 5);
+            $item_inserted->set_document( $correct_value );
+            $item_inserted->set_document_type( 'text' );
+            
+            if( $item_inserted->validate() )
+                $this->items_repo->update($item_inserted);
+
+        } else if( strpos($column_value,'file:') === 0 ){
+            $correct_value = substr($column_value, 5);
+            
+            if( filter_var($correct_value, FILTER_VALIDATE_URL) ){
+                $id = $TainacanMedia->insert_attachment_from_url($correct_value, $item_inserted->get_id());
+
+                if(!$id){
+                    $this->add_log('Error in Document file imported from URL ' . $correct_value);
+                    return false;
+                }
+
+                $item_inserted->set_document( $id );
+                $item_inserted->set_document_type( 'attachment' );
+                $this->add_log('Document file URL imported from ' . $correct_value);
+
+                if( $item_inserted->validate() )
+                    $this->items_repo->update($item_inserted);
+
+                return true;
+            } 
+
+            $server_path_files = $this->get_option('server_path');
+            $id = $TainacanMedia->insert_attachment_from_file($correct_value, $item_inserted->get_id());
+
+            if(!$id){
+                $this->add_log('Error in Document file imported from server ' . $correct_value);
+                return false;
+            }
+
+            $item_inserted->set_document( $id );
+            $item_inserted->set_document_type( 'attachment' );
+            $this->add_log('Document file in Server imported from ' . $correct_value);
+
+            if( $item_inserted->validate() )
+                $this->items_repo->update($item_inserted);
+
+            return true;
+        }
+    }
+
+    /**
+     * method responsible to insert the item document
+     */
+    private function handle_attachment( $column_value, $item_inserted){
+
+    }
 }
\ No newline at end of file