From eacd65d68d96fc6cb5fa0aec90c137165238ee93 Mon Sep 17 00:00:00 2001
From: Jacson Passold <jacson@passold.com.br>
Date: Tue, 28 Aug 2018 00:19:39 -0300
Subject: [PATCH 01/31] add allow comments meta prop to collection

---
 .../entities/class-tainacan-collection.php    | 20 ++++++++++++++++++-
 .../entities/class-tainacan-entity.php        |  2 +-
 .../class-tainacan-collections.php            | 10 +++++++++-
 .../repositories/class-tainacan-items.php     |  4 ++--
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/classes/entities/class-tainacan-collection.php b/src/classes/entities/class-tainacan-collection.php
index 47aa9bbec..c38eba22b 100644
--- a/src/classes/entities/class-tainacan-collection.php
+++ b/src/classes/entities/class-tainacan-collection.php
@@ -34,7 +34,8 @@ class Collection extends Entity {
         $header_image_id,
 	    $header_image,
         $moderators_ids,
-        $comment_status;
+        $comment_status,
+        $allow_comments;
 
     /**
 	 * {@inheritDoc}
@@ -501,6 +502,14 @@ class Collection extends Entity {
 	public function get_comment_status() {
 	    return $this->get_mapped_property('comment_status');
 	}
+	
+	/**
+	 * Checks if comments are allowed for the current Collection Items.
+	 * @return bool
+	 */
+	public function get_allow_comments() {
+	    return $this->get_mapped_property('allow_comments');
+	}
 
 	/**
 	 * Set the collection name
@@ -702,6 +711,15 @@ class Collection extends Entity {
 	public function set_comment_status( $value ) {
 	    $this->set_mapped_property('comment_status', $value);
 	}
+	
+	/**
+	 * Sets if comments are allowed for the current Collection Items.
+	 *
+	 * @param $value bool
+	 */
+	public function set_allow_comments( $value ) {
+	    $this->set_mapped_property('allow_comments', $value );
+	}
 
 	// Moderators methods
 
diff --git a/src/classes/entities/class-tainacan-entity.php b/src/classes/entities/class-tainacan-entity.php
index baac8f5d3..a9503a4f9 100644
--- a/src/classes/entities/class-tainacan-entity.php
+++ b/src/classes/entities/class-tainacan-entity.php
@@ -154,7 +154,7 @@ class Entity {
      * @return mixed property value
      */
     public function get_mapped_property($prop) {
-    	if (isset($this->$prop) ){
+    	if ( isset($this->$prop) ){
     		return $this->$prop;
     	}
 
diff --git a/src/classes/repositories/class-tainacan-collections.php b/src/classes/repositories/class-tainacan-collections.php
index 6ac854542..4f9e0d9bb 100644
--- a/src/classes/repositories/class-tainacan-collections.php
+++ b/src/classes/repositories/class-tainacan-collections.php
@@ -199,9 +199,17 @@ class Collections extends Repository {
 	            'map'         => 'comment_status',
 	            'title'       => __( 'Comment Status', 'tainacan' ),
 	            'type'        => 'string',
-	            'description' => __( 'The status of collection comment, if is "open" the comments are allowed for collection items, or is "closed" for deny comments to items.', 'tainacan' ),
+	            'description' => __( 'The status of collection comment, if is "open" the comments are allowed, or is "closed" for deny comments.', 'tainacan' ),
 		        'default'     => get_default_comment_status(Entities\Collection::get_post_type()),
 		        'validation' => v::optional(v::stringType()->in( [ 'open', 'closed' ] )),
+		    ],
+		    'allow_comments'  => [
+		        'map'         => 'meta',
+		        'title'       => __( 'Allow Items Comments', 'tainacan' ),
+		        'type'        => 'string',
+		        'description' => __( 'Collection items comment is allowed, if is "open" the comments are allowed for collection items, or is "closed" for deny comments to items.', 'tainacan' ),
+		        'default'     => 'open',
+		        'validation' => v::optional(v::stringType()->in( [ 'open', 'closed' ] )),
 		    ]
 
 		] );
diff --git a/src/classes/repositories/class-tainacan-items.php b/src/classes/repositories/class-tainacan-items.php
index 5b1b9268c..6c8e1c71f 100644
--- a/src/classes/repositories/class-tainacan-items.php
+++ b/src/classes/repositories/class-tainacan-items.php
@@ -398,7 +398,7 @@ class Items extends Repository {
 	/**
 	 * Get a default thumbnail ID from the item document.
 	 *
-	 * @param  EntitiesItem $item The item
+	 * @param  Entities\Item $item The item
 	 *
 	 * @return int|null           The thumbnail ID or null if it was not possible to find a thumbnail
 	 */
@@ -491,7 +491,7 @@ class Items extends Repository {
 	    
 	    if($item != false && $item instanceof Entities\Item) {
     	    $collection = $item->get_collection();
-    	    if($collection->get_comment_status() !== 'open' ) return false;
+    	    if( $collection->get_allow_comments() !== 'open' ) return false;
 	    }
 	    
 	    return $open_comment;

From add549b8818247ede6e2daae76bc819e98ae0ce1 Mon Sep 17 00:00:00 2001
From: Jacson Passold <jacson@passold.com.br>
Date: Tue, 28 Aug 2018 00:19:55 -0300
Subject: [PATCH 02/31] fix item comment open test

---
 tests/test-items.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test-items.php b/tests/test-items.php
index 818365dff..2c4ffeb8b 100644
--- a/tests/test-items.php
+++ b/tests/test-items.php
@@ -279,7 +279,7 @@ class Items extends TAINACAN_UnitTestCase {
             'collection',
             array(
                 'name'   => 'collectionComments',
-                'comment_status' => 'closed'
+                'allow_comments' => 'closed'
             ),
             true,
             true
@@ -303,8 +303,8 @@ class Items extends TAINACAN_UnitTestCase {
         $this->assertFalse(comments_open($item->get_id()));
         
         $collections = \Tainacan\Repositories\Collections::get_instance();
-        $collection->set('comment_status', 'open');
-        $collection->validate();
+        $collection->set('allow_comments', 'open');
+        $this->assertTrue($collection->validate());
         $collections->update($collection);
         
         $this->assertTrue(comments_open($item->get_id()));
@@ -312,7 +312,7 @@ class Items extends TAINACAN_UnitTestCase {
         $items = \Tainacan\Repositories\Items::get_instance();
         
         $item->set('comment_status', 'closed');
-        $item->validate();
+        $this->assertTrue($item->validate());
         $items->update($item);
         
         $this->assertFalse(comments_open($item->get_id()));

From 8910ad2ab85e96902866163de752e045b92778a1 Mon Sep 17 00:00:00 2001
From: Jacson Passold <jacson@passold.com.br>
Date: Tue, 28 Aug 2018 00:20:52 -0300
Subject: [PATCH 03/31] add allow_commets prop to collection module

---
 src/js/store/modules/collection/actions.js   | 23 +++++++++++++++++---
 src/js/store/modules/collection/getters.js   |  4 ++++
 src/js/store/modules/collection/index.js     |  3 ++-
 src/js/store/modules/collection/mutations.js |  8 +++++++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/js/store/modules/collection/actions.js b/src/js/store/modules/collection/actions.js
index adc8918e0..04bb6575d 100644
--- a/src/js/store/modules/collection/actions.js
+++ b/src/js/store/modules/collection/actions.js
@@ -174,6 +174,20 @@ export const fetchCollectionCommentStatus = ({ commit }, id) => {
     });
 };
 
+export const fetchCollectionAllowComments = ({ commit }, id) => {
+    return new Promise((resolve, reject) =>{ 
+        axios.tainacan.get('/collections/' + id + '?fetch_only=allow_comments')
+        .then(res => {
+            let collectionAllowComments = res.data;
+            commit('setCollectionAllowComments', collectionAllowComments.allow_comments);
+            resolve( collectionAllowComments.allow_comments );
+        })
+        .catch(error => {
+            reject(error);
+        })
+    });
+};
+
 export const fetchCollectionNameAndURL = ({ commit }, id) => {
     //commit('cleanCollectionName');
     return new Promise((resolve, reject) =>{ 
@@ -223,7 +237,8 @@ export const updateCollection = ({ commit }, {
         parent,
         enabled_view_modes,
         default_view_mode,
-        comment_status
+        comment_status,
+        allow_comments
     }) => {
     return new Promise((resolve, reject) => {
         axios.tainacan.patch('/collections/' + collection_id, {
@@ -237,7 +252,8 @@ export const updateCollection = ({ commit }, {
             parent: parent,
             enabled_view_modes: enabled_view_modes,
             default_view_mode: default_view_mode,
-            comment_status: comment_status
+            comment_status: comment_status,
+            allow_comments: allow_comments
         }).then( res => {
             commit('setCollection', { 
                 id: collection_id, 
@@ -251,7 +267,8 @@ export const updateCollection = ({ commit }, {
                 parent: parent,
                 enabled_view_modes: enabled_view_modes,
                 default_view_mode: default_view_mode,
-                comment_status: comment_status
+                comment_status: comment_status,
+                allow_comments: allow_comments
             });
             commit('setCollectionName', res.data.name);
             commit('setCollectionURL', res.data.url);
diff --git a/src/js/store/modules/collection/getters.js b/src/js/store/modules/collection/getters.js
index bb72d0a10..3abd562ae 100644
--- a/src/js/store/modules/collection/getters.js
+++ b/src/js/store/modules/collection/getters.js
@@ -28,4 +28,8 @@ export const getAttachments =  state => {
 
 export const getCollectionCommentStatus = state => {
     return state.collectionCommentStatus;
+}
+
+export const getCollectionAllowComments = state => {
+    return state.collectionAllowComments;
 }
\ No newline at end of file
diff --git a/src/js/store/modules/collection/index.js b/src/js/store/modules/collection/index.js
index 7692ce1bb..6f67b9c12 100644
--- a/src/js/store/modules/collection/index.js
+++ b/src/js/store/modules/collection/index.js
@@ -11,7 +11,8 @@ const state = {
     collectionName: '',
     collectionURL: '',
     attachments: [],
-    collectionCommentStatus: ''
+    collectionCommentStatus: '',
+    collectionAllowComments: ''
 };
 
 export default {
diff --git a/src/js/store/modules/collection/mutations.js b/src/js/store/modules/collection/mutations.js
index 535b9f2dc..4ac1e814c 100644
--- a/src/js/store/modules/collection/mutations.js
+++ b/src/js/store/modules/collection/mutations.js
@@ -77,4 +77,12 @@ export const setCollectionCommentStatus = (state, collectionCommentStatus) => {
 
 export const cleanCollectionCommentStatus = (state) => {
     state.collectionCommentStatus = '';
+}
+
+export const setCollectionAllowComments = (state, collectionAllowComments) => {
+    state.collectionAllowComments = collectionAllowComments;
+}
+
+export const cleanCollectionAllowComments = (state) => {
+    state.collectionAllowComments = '';
 }
\ No newline at end of file

From a8cbdd304a5699be864cc94492a415ee5366e1bc Mon Sep 17 00:00:00 2001
From: Jacson Passold <jacson@passold.com.br>
Date: Tue, 28 Aug 2018 00:22:15 -0300
Subject: [PATCH 04/31] use allow comments instead of comment status in
 collection

---
 .../edition/collection-edition-form.vue          | 16 ++++++++--------
 .../components/edition/item-edition-form.vue     | 12 ++++++------
 src/admin/pages/singles/item-page.vue            | 10 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue
index 70ad0bdf2..9c0a1a58b 100644
--- a/src/admin/components/edition/collection-edition-form.vue
+++ b/src/admin/components/edition/collection-edition-form.vue
@@ -236,10 +236,10 @@
                                 size="is-small"
                                 true-value="open" 
                                 false-value="closed"
-                                v-model="form.comment_status" />
+                                v-model="form.allow_comments" />
                         <help-button 
-                                :title="$i18n.getHelperTitle('collections', 'comment_status')" 
-                                :message="$i18n.getHelperMessage('collections', 'comment_status')"/>
+                                :title="$i18n.getHelperTitle('collections', 'allow_comments')" 
+                                :message="$i18n.getHelperMessage('collections', 'allow_comments')"/>
                     </b-field>
                 </div>
                 <div class="column is-1" />
@@ -440,7 +440,7 @@ export default {
                 moderators_ids: [],
                 enabled_view_modes: [],
                 default_view_mode: [],
-                comment_status: ''
+                allow_comments: ''
             },
             thumbnail: {},
             cover: {},
@@ -543,7 +543,7 @@ export default {
                 parent: this.form.parent,
                 enabled_view_modes: this.form.enabled_view_modes,
                 default_view_mode: this.form.default_view_mode,
-                comment_status: this.form.comment_status
+                allow_comments: this.form.allow_comments
             };
             this.updateCollection(data).then(updatedCollection => {    
                 
@@ -558,7 +558,7 @@ export default {
                 this.form.enable_cover_page = this.collection.enable_cover_page;
                 this.form.enabled_view_modes = this.collection.enabled_view_modes;
                 this.form.default_view_mode = this.collection.default_view_mode;
-                this.form.comment_status = this.collection.comment_status;
+                this.form.allow_comments = this.collection.allow_comments;
 
                 this.isLoading = false;
                 this.formErrorMessage = '';
@@ -603,7 +603,7 @@ export default {
                 this.form.default_view_mode = this.collection.default_view_mode;
                 this.form.enabled_view_modes = [];
                 this.moderators = [];
-                this.form.comment_status = this.collection.comment_status;
+                this.form.allow_comments = this.collection.allow_comments;
 
                 // Pre-fill status with publish to incentivate it
                 this.form.status = 'publish';
@@ -790,7 +790,7 @@ export default {
                 this.form.default_view_mode = this.collection.default_view_mode;
                 this.form.enabled_view_modes = JSON.parse(JSON.stringify(this.collection.enabled_view_modes));
                 this.moderators = JSON.parse(JSON.stringify(this.collection.moderators));
-                this.form.comment_status = this.collection.comment_status;
+                this.form.allow_comments = this.collection.allow_comments;
                  
                 // Generates CoverPage from current cover_page_id info
                 if (this.form.cover_page_id != undefined && this.form.cover_page_id != '') {
diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index 7d198aa83..036f3b027 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -254,7 +254,7 @@
                     <b-field
                             :addons="false" 
                             :label="$i18n.get('label_comment_status')"
-                            v-if="collectionCommentStatus == 'open'">
+                            v-if="collectionAllowComments == 'open'">
                         <b-switch
                                 id="tainacan-checkbox-comment-status" 
                                 size="is-small"
@@ -485,7 +485,7 @@ export default {
             textLink: '',
             isUpdatingValues: false,
             collectionName: '',
-            collectionCommentStatus: ''
+            collectionAllowComments: ''
         }
     },
     computed: {
@@ -524,7 +524,7 @@ export default {
         ]),
         ...mapActions('collection', [
             'fetchCollectionName',
-            'fetchCollectionCommentStatus',
+            'fetchCollectionAllowComments',
             'deleteItem',
         ]),
         onSubmit(status) {
@@ -827,9 +827,9 @@ export default {
             this.collectionName = collectionName;
         });
         
-        // Obtains collection name
-        this.fetchCollectionCommentStatus(this.collectionId).then((collectionCommentStatus) => {
-            this.collectionCommentStatus = collectionCommentStatus;
+        // Obtains if collection allow items comments
+        this.fetchCollectionAllowComments(this.collectionId).then((collectionAllowComments) => {
+            this.collectionAllowComments = collectionAllowComments;
         });
 
         // Sets feedback variables
diff --git a/src/admin/pages/singles/item-page.vue b/src/admin/pages/singles/item-page.vue
index 2aaddeaa0..0cc3bc7d6 100644
--- a/src/admin/pages/singles/item-page.vue
+++ b/src/admin/pages/singles/item-page.vue
@@ -87,7 +87,7 @@
                     <b-field
                             :addons="false" 
                             :label="$i18n.get('label_comment_status')"
-                            v-if="collectionCommentStatus == 'open'">
+                            v-if="collectionAllowComments == 'open'">
                         <b-switch
                                 id="tainacan-checkbox-comment-status" 
                                 size="is-small"
@@ -271,7 +271,7 @@
                 collectionName: '',
                 thumbPlaceholderPath: tainacan_plugin.base_url + '/admin/images/placeholder_square.png',
                 urls_open: false,
-                collectionCommentStatus: ''
+                collectionAllowComments: ''
             }
         },
         components: {
@@ -285,7 +285,7 @@
             ]),
             ...mapActions('collection', [
                 'fetchCollectionName',
-                'fetchCollectionCommentStatus'
+                'fetchCollectionAllowComments'
             ]),
             ...mapGetters('item', [
                 'getItem',
@@ -370,8 +370,8 @@
             this.fetchAttachments(this.itemId);
             
             // Obtains collection Comment Status
-            this.fetchCollectionCommentStatus(this.collectionId).then((collectionCommentStatus) => {
-                this.collectionCommentStatus = collectionCommentStatus;
+            this.fetchCollectionAllowComments(this.collectionId).then((collectionAllowComments) => {
+                this.collectionAllowComments = collectionAllowComments;
             });
         }
 

From 98538468c3a52b7d9511c15427e0d8f113d99c0c Mon Sep 17 00:00:00 2001
From: weryques <weryques@outlook.com>
Date: Fri, 31 Aug 2018 17:32:52 -0300
Subject: [PATCH 05/31] Fixes overflow in checkbox modal

---
 src/admin/components/bulk-edition/bulk-edition-modal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/admin/components/bulk-edition/bulk-edition-modal.vue b/src/admin/components/bulk-edition/bulk-edition-modal.vue
index ec072277b..0cbdba644 100644
--- a/src/admin/components/bulk-edition/bulk-edition-modal.vue
+++ b/src/admin/components/bulk-edition/bulk-edition-modal.vue
@@ -9,7 +9,7 @@
             <hr>
         </header>
         <div class="tainacan-form">
-            <div class="modal-card-body">
+            <div class="modal-card-body no-overflow-modal-card-body">
                 <div
                         v-for="criterion in editionCriteria"
                         :key="criterion"
@@ -501,7 +501,7 @@
         border-radius: 10px;
     }
 
-    .modal-card-body {
+    .no-overflow-modal-card-body {
         padding: 0 !important;
         overflow: unset !important;
     }

From bb5fa1478cf241f3668e273e3d13c5397186c67a Mon Sep 17 00:00:00 2001
From: weryques <weryques@outlook.com>
Date: Mon, 3 Sep 2018 11:28:41 -0300
Subject: [PATCH 06/31] Fixes not exhibition of view all button and adds close
 button in bulk edit modal

---
 .../bulk-edition/bulk-edition-modal.vue        | 18 +++++++++++++++---
 src/admin/tainacan-admin-i18n.php              |  1 +
 .../repositories/class-tainacan-metadata.php   |  8 +++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/admin/components/bulk-edition/bulk-edition-modal.vue b/src/admin/components/bulk-edition/bulk-edition-modal.vue
index 0cbdba644..7416cec2e 100644
--- a/src/admin/components/bulk-edition/bulk-edition-modal.vue
+++ b/src/admin/components/bulk-edition/bulk-edition-modal.vue
@@ -229,13 +229,25 @@
             </div>
             <!--<pre>{{ bulkEditionProcedures }}</pre>-->
 
-            <footer class="field form-submit">
-                <div class="control is-pulled-right">
+            <footer class="field is-grouped form-submit">
+                <div class="control">
+                    <button
+                            @click="$parent.close()"
+                            :disabled="(Object.keys(bulkEditionProcedures).length &&
+                             bulkEditionProcedures[editionCriteria[editionCriteria.length-1]].isExecuting) ||
+                              (dones.every((item) => item === true) === true)"
+                            type="button"
+                            class="button">
+                        {{ $i18n.get('close') }}
+                    </button>
+                </div>
+                <div class="control">
                     <button
                             :disabled="dones.every((item) => item === true) === false"
                             class="button is-success"
                             type="button"
-                            @click="$parent.close()">{{ $i18n.get('conclude') }}
+                            @click="$parent.close()">
+                        {{ $i18n.get('conclude') }}
                     </button>
                 </div>
             </footer>
diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php
index c82b3a6a6..7b4bcfc1e 100644
--- a/src/admin/tainacan-admin-i18n.php
+++ b/src/admin/tainacan-admin-i18n.php
@@ -33,6 +33,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'processes'                                      => __( 'Processes', 'tainacan' ),
 
 	// Actions
+	'close'                                          => __( 'Close', 'tainacan' ),
 	'edit'                                           => __( 'Edit', 'tainacan' ),
 	'settings'                                       => __( 'Settings', 'tainacan' ),
 	'new'                                            => __( 'New', 'tainacan' ),
diff --git a/src/classes/repositories/class-tainacan-metadata.php b/src/classes/repositories/class-tainacan-metadata.php
index a3c7da332..b48298f4a 100644
--- a/src/classes/repositories/class-tainacan-metadata.php
+++ b/src/classes/repositories/class-tainacan-metadata.php
@@ -1054,7 +1054,13 @@ class Metadata extends Repository {
 			}
 		}
 
-		return $this->unique_multidimensional_array( $results, 'mvalue' );
+		$spliced = $this->unique_multidimensional_array( $results, 'mvalue' );
+
+		if($number > 0 && count($spliced) > $number){
+			array_splice($spliced, (int) $number);
+		}
+
+		return $spliced;
 	}
 
 	/**

From 451d1d99a6e858ee589662f3e87be977b9347b5a Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Mon, 3 Sep 2018 11:30:35 -0300
Subject: [PATCH 07/31] Updated modal padding size.

---
 src/admin/components/navigation/tainacan-header.vue | 1 -
 src/admin/scss/_modals.scss                         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/admin/components/navigation/tainacan-header.vue b/src/admin/components/navigation/tainacan-header.vue
index 4ca50091a..d13506a74 100644
--- a/src/admin/components/navigation/tainacan-header.vue
+++ b/src/admin/components/navigation/tainacan-header.vue
@@ -211,7 +211,6 @@
                     .search-header {
                         border: 1px solid $gray2 !important;
                         height: 27px;
-                        font-size: 11px;
                         transition: width linear 0.15s;
                         -webkit-transition: width linear 0.15s;
                         width: 220px;
diff --git a/src/admin/scss/_modals.scss b/src/admin/scss/_modals.scss
index de8d6ae47..c1ce9efd3 100644
--- a/src/admin/scss/_modals.scss
+++ b/src/admin/scss/_modals.scss
@@ -37,7 +37,7 @@
 }
 .tainacan-modal-content {
     background-color: white;
-    padding: 52px 8.3333333%;
+    padding: 40px 50px;
     position: relative;
 
     figure {

From 2db1e96d92354942df5e6614d82f1547b7ec9702 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Mon, 3 Sep 2018 12:45:39 -0300
Subject: [PATCH 08/31] Updates on empty state placeholders according to
 interactions document.

---
 src/admin/components/lists/events-list.vue | 16 ++++++++++------
 src/admin/components/lists/terms-list.vue  | 13 ++++++++-----
 src/admin/pages/lists/collections-page.vue |  4 +---
 src/admin/pages/lists/events-page.vue      | 13 +++++++++----
 src/admin/pages/lists/items-page.vue       |  4 +---
 src/admin/pages/lists/taxonomies-page.vue  | 12 ++++++++----
 src/admin/pages/lists/term-items-page.vue  |  4 +---
 7 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/admin/components/lists/events-list.vue b/src/admin/components/lists/events-list.vue
index 71009b9d8..23e81031d 100644
--- a/src/admin/components/lists/events-list.vue
+++ b/src/admin/components/lists/events-list.vue
@@ -103,9 +103,7 @@
             <section class="section">
                 <div class="content has-text-grey has-text-centered">
                     <p>
-                        <b-icon
-                                icon="inbox"
-                                size="is-large"/>
+                        <activities-icon />
                     </p>
                     <p>{{ $i18n.get('info_no_events') }}</p>
                 </div>
@@ -115,7 +113,7 @@
 </template>
 
 <script>
-    // import { mapActions } from 'vuex'
+    import ActivitiesIcon from '../other/activities-icon.vue';
 
     export default {
         name: 'EventsList',
@@ -124,6 +122,9 @@
                 selectedEvents: []
             }
         },
+        components: {
+            ActivitiesIcon
+        },
         props: {
             isLoading: false,
             totalEvents: 0,
@@ -149,6 +150,9 @@
     }
 </script>
 
-<style>
-
+<style scoped>
+    .activities-icon {
+        height: 24px;
+        width: 24px;
+    }
 </style>
diff --git a/src/admin/components/lists/terms-list.vue b/src/admin/components/lists/terms-list.vue
index 8a8573733..4cb82ba20 100644
--- a/src/admin/components/lists/terms-list.vue
+++ b/src/admin/components/lists/terms-list.vue
@@ -112,9 +112,7 @@
         <section class="section">
             <div class="content has-text-grey has-text-centered">
                 <p>
-                    <b-icon
-                            icon="inbox"
-                            size="is-large"/>
+                    <taxonomies-icon class="taxonomies-term-icon"/>
                 </p>
                 <p>{{ $i18n.get('info_no_terms_created_on_taxonomy') }}</p>
                 <button
@@ -134,6 +132,7 @@ import { mapActions, mapGetters } from 'vuex';
 import TermEditionForm from '../edition/term-edition-form.vue';
 import RecursiveTermItem from './recursive-term-item.vue'
 import BasicTermItem from './basic-term-item.vue'
+import TaxonomiesIcon from '../other/taxonomies-icon.vue';
 import t from 't';
 
 export default {
@@ -180,7 +179,8 @@ export default {
     components: {
         RecursiveTermItem,
         BasicTermItem,
-        TermEditionForm
+        TermEditionForm,
+        TaxonomiesIcon
     },
     methods: {
         ...mapActions('taxonomy', [
@@ -391,7 +391,10 @@ export default {
 </script>
 
 <style lang="scss">
-
+    .taxonomies-term-icon {
+        height: 24px;
+        width: 24px;
+    }
     @import "../../scss/_variables.scss";
 
     .columns {
diff --git a/src/admin/pages/lists/collections-page.vue b/src/admin/pages/lists/collections-page.vue
index 7bcb43060..3f957c27f 100644
--- a/src/admin/pages/lists/collections-page.vue
+++ b/src/admin/pages/lists/collections-page.vue
@@ -76,9 +76,7 @@
                     <section class="section">
                         <div class="content has-text-grey has-text-centered">
                             <p>
-                                <b-icon
-                                        icon="inbox"
-                                        size="is-large"/>
+                                <b-icon icon="folder-multiple"/>
                             </p>
                             <p v-if="status == undefined || status == ''">{{ $i18n.get('info_no_collection_created') }}</p>
                             <p v-if="status == 'draft'">{{ $i18n.get('info_no_collection_draft') }}</p>
diff --git a/src/admin/pages/lists/events-page.vue b/src/admin/pages/lists/events-page.vue
index c8f1ba577..b22c369f4 100644
--- a/src/admin/pages/lists/events-page.vue
+++ b/src/admin/pages/lists/events-page.vue
@@ -45,9 +45,7 @@
                     <section class="section">
                         <div class="content has-text-grey has-text-centered">
                             <p>
-                                <b-icon
-                                        icon="inbox"
-                                        size="is-large"/>
+                                <activities-icon />
                             </p>
                             <p v-if="status == undefined || status == ''">{{ $i18n.get('info_no_process') }}</p>
                         </div>
@@ -137,6 +135,7 @@
 <script>
     import EventsList from "../../components/lists/events-list.vue";
     import ProcessesList from "../../components/lists/processes-list.vue";
+    import ActivitiesIcon from '../../components/other/activities-icon.vue';
     import { mapActions, mapGetters } from 'vuex';
     import moment from 'moment'
 
@@ -156,7 +155,8 @@
         },
         components: {
             EventsList,
-            ProcessesList
+            ProcessesList,
+            ActivitiesIcon
         },
         methods: {
             ...mapActions('event', [
@@ -314,6 +314,11 @@
 <style lang="scss" scoped>
     @import '../../scss/_variables.scss';
 
+    .activities-icon {
+        height: 24px;
+        width: 24px;
+    }
+
     .sub-header {
         max-height: $header-height;
         height: $header-height;
diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue
index 421e80d96..f22aa11ad 100644
--- a/src/admin/pages/lists/items-page.vue
+++ b/src/admin/pages/lists/items-page.vue
@@ -561,9 +561,7 @@
                         class="section">
                     <div class="content has-text-grey has-text-centered">
                         <p>
-                            <b-icon
-                                    icon="inbox"
-                                    size="is-large"/>
+                            <b-icon icon="file-multiple"/>
                         </p>
                         <p v-if="status == undefined || status == ''">{{ hasFiltered ? $i18n.get('info_no_item_found_filter') : $i18n.get('info_no_item_created') }}</p>
                         <p v-if="status == 'draft'">{{ $i18n.get('info_no_item_draft') }}</p>
diff --git a/src/admin/pages/lists/taxonomies-page.vue b/src/admin/pages/lists/taxonomies-page.vue
index 31573b784..f017874c3 100644
--- a/src/admin/pages/lists/taxonomies-page.vue
+++ b/src/admin/pages/lists/taxonomies-page.vue
@@ -48,9 +48,7 @@
                         <section class="section">
                             <div class="content has-text-grey has-text-centered">
                                 <p>
-                                    <b-icon
-                                            icon="inbox"
-                                            size="is-large"/>
+                                    <taxonomies-icon class="taxonomies-term-icon"/>
                                 </p>
                                 <p v-if="status == undefined || status == ''">{{ $i18n.get('info_no_taxonomy_created') }}</p>
                                 <p v-if="status == 'draft'">{{ $i18n.get('info_no_taxonomy_draft') }}</p>
@@ -112,6 +110,7 @@
 
 <script>
     import TaxonomiesList from "../../components/lists/taxonomies-list.vue";
+    import TaxonomiesIcon from '../../components/other/taxonomies-icon.vue';
     import { mapActions, mapGetters } from 'vuex';
     //import moment from 'moment'
 
@@ -127,7 +126,8 @@
             }
         },
         components: {
-            TaxonomiesList
+            TaxonomiesList,
+            TaxonomiesIcon
         },
         methods: {
             ...mapActions('taxonomy', [
@@ -198,6 +198,10 @@
 </script>
 
 <style lang="scss" scoped>
+    .taxonomies-icon {
+        height: 24px;
+        width: 24px;
+    }
     @import '../../scss/_variables.scss';
 
     .sub-header {
diff --git a/src/admin/pages/lists/term-items-page.vue b/src/admin/pages/lists/term-items-page.vue
index ed630a00e..f3ea3fc33 100644
--- a/src/admin/pages/lists/term-items-page.vue
+++ b/src/admin/pages/lists/term-items-page.vue
@@ -557,9 +557,7 @@
                         class="section">
                     <div class="content has-text-grey has-text-centered">
                         <p>
-                            <b-icon
-                                    icon="inbox"
-                                    size="is-large"/>
+                            <b-icon icon="file-multiple"/>
                         </p>
                         <p v-if="status == undefined || status == ''">{{ hasFiltered ? $i18n.get('info_no_item_found_filter') : $i18n.get('info_no_item_created') }}</p>
                         <p v-if="status == 'draft'">{{ $i18n.get('info_no_item_draft') }}</p>

From a597c46d6a228fbb6b30beb5c7a1a9de9dfda9eb Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Mon, 3 Sep 2018 15:21:46 -0300
Subject: [PATCH 09/31] Fixes term hover at parent leve.

---
 src/admin/components/lists/terms-list.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/admin/components/lists/terms-list.vue b/src/admin/components/lists/terms-list.vue
index 4cb82ba20..3c6804bf5 100644
--- a/src/admin/components/lists/terms-list.vue
+++ b/src/admin/components/lists/terms-list.vue
@@ -79,7 +79,8 @@
             <div    
                     v-if="searchQuery == undefined || searchQuery == ''"
                     v-for="(term, index) in localTerms"
-                    :key="term.id">
+                    :key="term.id"
+                    class="parent-term">
                 
                 <recursive-term-item 
                         :term="term"
@@ -444,6 +445,17 @@ export default {
         }
     }
 
+    .parent-term>div>.term-item:first-child:hover {
+        background-color: $gray1 !important;
+        .controls {
+            visibility: visible;
+            opacity: 1.0;
+        }
+        &::before {
+            border-color: transparent transparent transparent $gray2 !important;
+        }
+    }
+
     .view-more-terms-level-0 {
         font-size: 0.875rem;
         margin: 0;

From 756639ba4b62891552c7444c5b768638972364b8 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Mon, 3 Sep 2018 16:18:30 -0300
Subject: [PATCH 10/31] Makes Bulk Edition cause reload on list after it's
 conclusion.

---
 src/admin/components/bulk-edition/bulk-edition-modal.vue | 5 +++--
 src/admin/components/lists/terms-list.vue                | 1 +
 src/admin/pages/lists/items-page.vue                     | 5 +----
 src/js/event-bus-search.js                               | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/admin/components/bulk-edition/bulk-edition-modal.vue b/src/admin/components/bulk-edition/bulk-edition-modal.vue
index 7416cec2e..f5aeeeecb 100644
--- a/src/admin/components/bulk-edition/bulk-edition-modal.vue
+++ b/src/admin/components/bulk-edition/bulk-edition-modal.vue
@@ -21,7 +21,8 @@
                             class="tainacan-bulk-edition-field tainacan-bulk-edition-field-not-last"
                             :placeholder="$i18n.get('instruction_select_a_metadatum')"
                             @input="addToBulkEditionProcedures($event, 'metadatumID', criterion)">
-                        <template v-for="(metadatum, index) in metadata">
+                        <template 
+                                v-for="(metadatum, index) in metadata">
                             <option
                                     v-if="metadatum.id"
                                     :value="metadatum.id">
@@ -246,7 +247,7 @@
                             :disabled="dones.every((item) => item === true) === false"
                             class="button is-success"
                             type="button"
-                            @click="$parent.close()">
+                            @click="$eventBusSearch.loadItems(); $parent.close();">
                         {{ $i18n.get('conclude') }}
                     </button>
                 </div>
diff --git a/src/admin/components/lists/terms-list.vue b/src/admin/components/lists/terms-list.vue
index 3c6804bf5..62a9c1791 100644
--- a/src/admin/components/lists/terms-list.vue
+++ b/src/admin/components/lists/terms-list.vue
@@ -347,6 +347,7 @@ export default {
             this.deleteTerm({taxonomyId: this.taxonomyId, termId: term.id })
                 .then(() => {
                     this.searchTerms(this.offset);
+                    this.totalTerms--;
                 })
                 .catch((error) => {
                     this.$console.log(error);
diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue
index f22aa11ad..b7b5d8fc5 100644
--- a/src/admin/pages/lists/items-page.vue
+++ b/src/admin/pages/lists/items-page.vue
@@ -147,12 +147,9 @@
                         <b-dropdown-item disabled>
                             {{ $i18n.get('add_items_bulk') + ' (Not ready)' }}
                         </b-dropdown-item>
-                        <b-dropdown-item disabled>
-                            {{ $i18n.get('add_items_external_source') + ' (Not ready)' }}
-                        </b-dropdown-item>
                         <b-dropdown-item>
                             <div
-                                    id="a-import-collection"
+                                    id="a-import-items"
                                     tag="div"
                                     @click="onOpenImportersModal">
                                 {{ $i18n.get('label_import_items') }}
diff --git a/src/js/event-bus-search.js b/src/js/event-bus-search.js
index 32904f960..9be18447f 100644
--- a/src/js/event-bus-search.js
+++ b/src/js/event-bus-search.js
@@ -297,7 +297,6 @@ export default {
                     this.$store.dispatch('search/set_postquery', this.$route.query);
                 },
                 loadItems(to) {
-                    
                     this.$emit( 'isLoadingItems', true);
 
                     // Forces fetch_only to be filled before any search happens

From 87d5deb00d8e4bf08a91cc91268420e3a8542c2a Mon Sep 17 00:00:00 2001
From: weryques <weryques@outlook.com>
Date: Mon, 3 Sep 2018 16:24:14 -0300
Subject: [PATCH 11/31] Fixes comportament of close button

---
 .../components/bulk-edition/bulk-edition-modal.vue     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/admin/components/bulk-edition/bulk-edition-modal.vue b/src/admin/components/bulk-edition/bulk-edition-modal.vue
index 7416cec2e..246a5763f 100644
--- a/src/admin/components/bulk-edition/bulk-edition-modal.vue
+++ b/src/admin/components/bulk-edition/bulk-edition-modal.vue
@@ -234,8 +234,7 @@
                     <button
                             @click="$parent.close()"
                             :disabled="(Object.keys(bulkEditionProcedures).length &&
-                             bulkEditionProcedures[editionCriteria[editionCriteria.length-1]].isExecuting) ||
-                              (dones.every((item) => item === true) === true)"
+                             bulkEditionProcedures[editionCriteria[editionCriteria.length-1]].isExecuting) || false"
                             type="button"
                             class="button">
                         {{ $i18n.get('close') }}
@@ -511,6 +510,11 @@
 
     .tainacan-modal-content {
         border-radius: 10px;
+        min-height: 400px;
+    }
+
+    .tainacan-modal-content .form-submit {
+        padding: 120px 0 0.4em 0 !important;
     }
 
     .no-overflow-modal-card-body {
@@ -584,7 +588,7 @@
                         max-width: 100% !important;
                     }
 
-                    &:hover {
+                    &:hover, .tag {
                         background-color: white !important;
                     }
                 }

From 333600dea1299e2308aaddb7fa5c9009aaee10dd Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Tue, 4 Sep 2018 08:43:41 -0300
Subject: [PATCH 12/31] Corrects style for numeric range filter.

---
 src/admin/components/other/checkbox-filter-modal.vue      | 1 -
 .../filter-types/custom-interval/CustomInterval.vue       | 7 ++-----
 src/classes/filter-types/tainacan-filter-item.vue         | 2 +-
 src/classes/filter-types/taxonomy/Checkbox.vue            | 8 +++-----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/admin/components/other/checkbox-filter-modal.vue b/src/admin/components/other/checkbox-filter-modal.vue
index 8c616da29..1009ccc25 100644
--- a/src/admin/components/other/checkbox-filter-modal.vue
+++ b/src/admin/components/other/checkbox-filter-modal.vue
@@ -447,7 +447,6 @@
                         terms: this.selected
                     });
 
-
                     for (let selected of this.selected) {
 
                         for(let i in this.finderColumns){
diff --git a/src/classes/filter-types/custom-interval/CustomInterval.vue b/src/classes/filter-types/custom-interval/CustomInterval.vue
index 61bb434a2..b82769a67 100644
--- a/src/classes/filter-types/custom-interval/CustomInterval.vue
+++ b/src/classes/filter-types/custom-interval/CustomInterval.vue
@@ -20,23 +20,20 @@
         </div>
 
         <!-- Numeric -->
-        <div
-                class="columns"
-                v-else>
+        <div v-else>
             <b-input
                     size="is-small"
                     type="number"
                     step="any"
                     @input="validate_values()"
-                    class="column"
                     v-model="value_init"/>
+            <p class="is-size-7 has-text-centered is-marginless">{{ $i18n.get('label_until') }}</p>
             <b-input
                     size="is-small"
                     type="number"
                     step="any"
                     @input="validate_values()"
                     @focus="isTouched = true"
-                    class="column"
                     v-model="value_end"/>
         </div>
     </div>
diff --git a/src/classes/filter-types/tainacan-filter-item.vue b/src/classes/filter-types/tainacan-filter-item.vue
index 6cfff88b9..8876b85d2 100644
--- a/src/classes/filter-types/tainacan-filter-item.vue
+++ b/src/classes/filter-types/tainacan-filter-item.vue
@@ -145,7 +145,7 @@
                         padding: 0.2rem 0.1rem !important;
                     }
                 }
-
+                
                 .select {
                     select {
                         display: unset;
diff --git a/src/classes/filter-types/taxonomy/Checkbox.vue b/src/classes/filter-types/taxonomy/Checkbox.vue
index c232cd5fa..cfb7ab126 100644
--- a/src/classes/filter-types/taxonomy/Checkbox.vue
+++ b/src/classes/filter-types/taxonomy/Checkbox.vue
@@ -35,7 +35,6 @@
 
                     let selectedOption = this.options.find(option => option.name == filterTag.singleValue);
                     if(selectedOption) {
-                    
                         let selectedIndex = this.selected.findIndex(option => option == selectedOption.id);
                         if (selectedIndex >= 0) {
 
@@ -106,7 +105,6 @@
                             this.taxonomy = item.taxonomy;
                             this.options.push(item);
                         }
-
                     })
                     .catch(error => {
                         this.$console.log(error);
@@ -203,9 +201,9 @@
                                     id: res.data.id
                                 })
                             })
-                                .catch(error => {
-                                    this.$console.log(error);
-                                });
+                            .catch(error => {
+                                this.$console.log(error);
+                            });
                     }
                 }
 

From f20d4b29fa49c50fe53c135c6c477583824a0373 Mon Sep 17 00:00:00 2001
From: weryques <weryques@outlook.com>
Date: Tue, 4 Sep 2018 10:52:02 -0300
Subject: [PATCH 13/31] Display checked child on checkbox filter in sidebar

---
 src/classes/filter-types/taxonomy/Checkbox.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/classes/filter-types/taxonomy/Checkbox.vue b/src/classes/filter-types/taxonomy/Checkbox.vue
index c232cd5fa..02b6c08e0 100644
--- a/src/classes/filter-types/taxonomy/Checkbox.vue
+++ b/src/classes/filter-types/taxonomy/Checkbox.vue
@@ -8,11 +8,10 @@
             <b-checkbox
                     v-model="selected"
                     :native-value="option.id"
-                    v-if="!option.isChild"
             >{{ option.name }}</b-checkbox>
             <div
                     class="see-more-container"
-                    v-if="option.seeMoreLink"
+                    v-if="option.seeMoreLink && index == options.length-1"
                     @click="openCheckboxModal(option.parent)"
                     v-html="option.seeMoreLink"/>
         </div>

From 7c7349eb638cf5d17d46056173cf716f6fdef879 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Mon, 27 Aug 2018 17:15:01 -0300
Subject: [PATCH 14/31] Begins implementation of form hooks.

---
 src/admin/class-tainacan-admin.php            | 23 ++++++-
 .../edition/collection-edition-form.vue       | 57 ++++++++++++++++--
 .../edition/metadatum-edition-form.vue        | 25 ++++++++
 .../edition/taxonomy-edition-form.vue         | 41 +++++++++----
 .../components/edition/term-edition-form.vue  | 46 +++++++++++---
 src/admin/js/mixins.js                        | 33 ++++++++++
 src/js/store/modules/bgprocess/actions.js     |  2 +-
 src/js/store/modules/collection/actions.js    | 60 ++++---------------
 src/js/store/modules/taxonomy/actions.js      | 46 ++++----------
 9 files changed, 221 insertions(+), 112 deletions(-)

diff --git a/src/admin/class-tainacan-admin.php b/src/admin/class-tainacan-admin.php
index 74b0084bb..1a1467324 100644
--- a/src/admin/class-tainacan-admin.php
+++ b/src/admin/class-tainacan-admin.php
@@ -203,7 +203,28 @@ class Admin {
         foreach ( $metadata_types as $index => $metadata_type){
 		    $class = new $metadata_type;
             $settings['i18n']['helpers_label'][$class->get_component()] = $class->get_form_labels();
-        }
+		}
+		
+		$settings['form_hooks'] = [
+			'form-collection' => [
+				'begin-left' => '<input type="text" name="collection-background-color" value="blue" />',
+				'end-left' => '<input type="text" name="collection-color" value="red" />',
+				'begin-right' => '<input type="text" name="collection-border-color" value="black" />',
+				'end-right' => '<input type="text" name="collection-highlight-color" value="green" />'
+			],
+			'form-taxonomy' => [
+				'begin' => '<input type="text" name="taxonomy-background-color" value="blue" />',
+				'end' => '<input type="text" name="taxonomy-color" value="red" />'
+			],
+			'form-term' => [
+				'begin' => '<input type="text" name="term-background-color" value="blue" />',
+				'end' => '<input type="text" name="term-color" value="red" />'
+			],
+			'form-metadatum' => [
+				'begin' => '<input type="text" name="metadatum-background-color" value="blue" />',
+				'end' => '<input type="text" name="metadatum-color" value="red" />'
+			]
+		];
 		
 		return $settings;
 		
diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue
index 91dcde00c..5ec545acb 100644
--- a/src/admin/components/edition/collection-edition-form.vue
+++ b/src/admin/components/edition/collection-edition-form.vue
@@ -27,6 +27,15 @@
                                 @blur="updateSlug"
                                 @focus="clearErrors('name')"/>
                     </b-field>
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['form-collection'] != undefined &&
+                                formHooks['form-collection']['begin-left'] != undefined">  
+                        <form 
+                            id="form-collection-begin-left"
+                            v-html="formHooks['form-collection']['begin-left']"/>
+                    </template>
 
                     <!-- Thumbnail -------------------------------- --> 
                     <b-field :addons="false">
@@ -221,10 +230,31 @@
                                 :title="$i18n.getHelperTitle('collections', 'allow_comments')" 
                                 :message="$i18n.getHelperMessage('collections', 'allow_comments')"/>
                     </b-field>
+
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['form-collection'] != undefined &&
+                                formHooks['form-collection']['end-left'] != undefined">  
+                        <form 
+                            id="form-collection-end-left"
+                            v-html="formHooks['form-collection']['end-left'] "/>
+                    </template>
+
                 </div>
                 <div class="column is-1" />
                 <div class="column">
 
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['form-collection'] != undefined &&
+                                formHooks['form-collection']['begin-right'] != undefined">  
+                        <form 
+                            id="form-collection-begin-right"
+                            v-html="formHooks['form-collection']['begin-right']"/>
+                    </template>
+
                     <!-- Status -------------------------------- --> 
                     <b-field
                             :addons="false" 
@@ -385,7 +415,18 @@
                                 v-model="form.slug"
                                 @focus="clearErrors('slug')"/>
                     </b-field>
+
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['form-collection'] != undefined &&
+                                formHooks['form-collection']['end-right'] != undefined">  
+                        <form 
+                            id="form-collection-end-right"
+                            v-html="formHooks['form-collection']['end-right']"/>
+                    </template>
                 </div>
+
             </div>
 
             <!-- Form submit -------------------------------- --> 
@@ -418,11 +459,11 @@ import { mapActions } from 'vuex';
 import wpMediaFrames from '../../js/wp-media-frames';
 import FileItem from '../other/file-item.vue';
 import EyeIcon from '../other/eye-icon.vue';
-import { wpAjax } from '../../js/mixins';
+import { wpAjax, formHooks } from '../../js/mixins';
 
 export default {
     name: 'CollectionEditionForm',
-    mixins: [ wpAjax ],
+    mixins: [ wpAjax, formHooks ],
     data(){
         return {
             collectionId: Number,
@@ -481,7 +522,7 @@ export default {
             viewModesList: [],
             fromImporter: '',
             newPagePath: tainacan_plugin.admin_url + 'post-new.php?post_type=page',
-            isUpdatingSlug: false,
+            isUpdatingSlug: false
         }
     },
     components: {
@@ -526,8 +567,8 @@ export default {
                 });
         }, 500),
         onSubmit() {
+           
             this.isLoading = true;
-
             this.form.moderators_ids = [];
             for (let moderator of this.moderators)
                 this.form.moderators_ids.push(moderator.id);
@@ -546,7 +587,9 @@ export default {
                 default_view_mode: this.form.default_view_mode,
                 allow_comments: this.form.allow_comments
             };
-            this.updateCollection(data).then(updatedCollection => {    
+            this.fillExtraFormData(data, 'collection');
+
+            this.updateCollection({collection_id: this.collectionId, collection: data }).then(updatedCollection => {    
                 
                 this.collection = updatedCollection;
 
@@ -586,6 +629,8 @@ export default {
 
             // Creates draft Collection
             let data = { name: '', description: '', status: 'auto-draft', mapper: (this.isMapped && this.mapper != false ? this.mapper : false ) };
+            this.fillExtraFormData(data, 'collection');
+            
             this.sendCollection(data).then(res => {
 
                 this.collectionId = res.id;
@@ -758,7 +803,7 @@ export default {
             }
         }
     },
-    created(){
+    mounted(){
 
         if (this.$route.query.fromImporter != undefined) 
             this.fromImporter = this.$route.query.fromImporter;
diff --git a/src/admin/components/edition/metadatum-edition-form.vue b/src/admin/components/edition/metadatum-edition-form.vue
index 4c988066a..3ee87178f 100644
--- a/src/admin/components/edition/metadatum-edition-form.vue
+++ b/src/admin/components/edition/metadatum-edition-form.vue
@@ -5,6 +5,16 @@
             :class="{ 'inCollapse': !isOnModal }"
             @submit.prevent="saveEdition(editForm)">
 
+        <!-- Hook for extra Form options -->
+        <template 
+                v-if="formHooks != undefined && 
+                    formHooks['form-metadatum'] != undefined &&
+                    formHooks['form-metadatum']['begin'] != undefined">  
+            <form 
+                id="form-metadatum-begin"
+                v-html="formHooks['form-metadatum']['begin']"/>
+        </template>
+
         <b-field
                 :addons="false"
                 :type="formErrors['name'] != undefined ? 'is-danger' : ''"
@@ -206,6 +216,16 @@
                 v-html="editForm.edit_form"
                 v-else/>
 
+        <!-- Hook for extra Form options -->
+        <template 
+                v-if="formHooks != undefined && 
+                    formHooks['form-metadatum'] != undefined &&
+                    formHooks['form-metadatum']['end'] != undefined">  
+            <form 
+                id="form-metadatum-end"
+                v-html="formHooks['form-metadatum']['end']"/>
+        </template>
+
         <div class="field is-grouped form-submit">
             <div class="control">
                 <button
@@ -228,9 +248,11 @@
 
 <script>
     import {mapActions} from 'vuex';
+    import { formHooks } from "../../js/mixins";
 
     export default {
         name: 'MetadatumEditionForm',
+        mixins: [ formHooks ],
         data() {
             return {
                 editForm: {},
@@ -275,6 +297,8 @@
             saveEdition(metadatum) {
 
                 if ((metadatum.metadata_type_object && metadatum.metadata_type_object.form_component) || metadatum.edit_form == '') {
+                    
+                    this.fillExtraFormData(this.editForm, 'metadatum');
 
                     this.updateMetadatum({
                         collectionId: this.collectionId,
@@ -309,6 +333,7 @@
                     for (let [key, value] of formData.entries())
                         formObj[key] = value;
 
+                    this.fillExtraFormData(formObj, 'metadatum');
                     this.updateMetadatum({
                         collectionId: this.collectionId,
                         metadatumId: metadatum.id,
diff --git a/src/admin/components/edition/taxonomy-edition-form.vue b/src/admin/components/edition/taxonomy-edition-form.vue
index 8b210bc14..611b5d8c6 100644
--- a/src/admin/components/edition/taxonomy-edition-form.vue
+++ b/src/admin/components/edition/taxonomy-edition-form.vue
@@ -9,6 +9,16 @@
                             class="tainacan-form" 
                             label-width="120px">
 
+                        <!-- Hook for extra Form options -->
+                        <template 
+                                v-if="formHooks != undefined && 
+                                    formHooks['form-taxonomy'] != undefined &&
+                                    formHooks['form-taxonomy']['begin'] != undefined">  
+                            <form 
+                                id="form-taxonomy-begin"
+                                v-html="formHooks['form-taxonomy']['begin']"/>
+                        </template>
+
                         <!-- Name -------------------------------- -->
                         <b-field
                                 :addons="false"
@@ -99,6 +109,16 @@
                             </div>
                         </b-field>
 
+                        <!-- Hook for extra Form options -->
+                        <template 
+                                v-if="formHooks != undefined && 
+                                    formHooks['form-taxonomy'] != undefined &&
+                                    formHooks['form-taxonomy']['end'] != undefined">  
+                            <form 
+                                id="form-taxonomy-end"
+                                v-html="formHooks['form-taxonomy']['end']"/>
+                        </template>
+
                         <!-- Submit -->
                         <div class="field is-grouped form-submit">
                             <div class="control">
@@ -133,14 +153,14 @@
 </template>
 
 <script>
-    import { wpAjax } from "../../js/mixins";
+    import { wpAjax, formHooks } from "../../js/mixins";
     import { mapActions, mapGetters } from 'vuex';
     import TermsList from '../lists/terms-list.vue';
     import CustomDialog from '../other/custom-dialog.vue';
 
     export default {
         name: 'TaxonomyEditionForm',
-        mixins: [ wpAjax ],
+        mixins: [ wpAjax, formHooks ],
         data(){
             return {
                 taxonomyId: String,
@@ -169,8 +189,7 @@
                     label: this.$i18n.get('trash')
                 }],
                 editFormErrors: {},
-                formErrorMessage: '',
-                // baseUrl: tainacan_plugin.base_url,
+                formErrorMessage: ''
             }
         },
         components: {
@@ -225,11 +244,11 @@
                     taxonomyId: this.taxonomyId,
                     name: this.form.name,
                     description: this.form.description,
-                    slug: this.form.slug,
+                    slug: this.form.slug ? this.form.slug : '',
                     status: this.form.status,
-                    allowInsert: this.form.allowInsert
+                    allow_insert: this.form.allowInsert
                 };
-
+                this.fillExtraFormData(data, 'taxonomy');
                 this.updateTaxonomy(data)
                     .then(updatedTaxonomy => {
 
@@ -291,9 +310,9 @@
                     description: '',
                     status: 'auto-draft',
                     slug: '',
-                    allowInsert: '',
+                    allow_insert: '',
                 };
-
+                this.fillExtraFormData(data, 'taxonomy');
                 this.createTaxonomy(data)
                     .then(res => {
 
@@ -324,8 +343,8 @@
                 return ( this.form.allowInsert === 'yes' ) ? this.$i18n.get('label_yes') : this.$i18n.get('label_no');
             }
         },
-        created(){
-
+        mounted(){
+  
             if (this.$route.fullPath.split("/").pop() === "new") {
                 this.createNewTaxonomy();
             } else if (this.$route.fullPath.split("/").pop() === "edit" || this.$route.fullPath.split("/").pop() === "terms") {
diff --git a/src/admin/components/edition/term-edition-form.vue b/src/admin/components/edition/term-edition-form.vue
index 8e696d658..db00c511a 100644
--- a/src/admin/components/edition/term-edition-form.vue
+++ b/src/admin/components/edition/term-edition-form.vue
@@ -8,6 +8,16 @@
             <hr>
         </div>
 
+        <!-- Hook for extra Form options -->
+        <template 
+                v-if="formHooks != undefined && 
+                    formHooks['form-term'] != undefined &&
+                    formHooks['form-term']['begin'] != undefined">  
+            <form 
+                id="form-term-begin"
+                v-html="formHooks['form-term']['begin']"/>
+        </template>
+
         <!-- Header Image -------------------------------- -->
         <b-field
                 :addons="false"
@@ -122,6 +132,16 @@
             </transition>
         </b-field>
 
+        <!-- Hook for extra Form options -->
+        <template 
+                v-if="formHooks != undefined && 
+                    formHooks['form-term'] != undefined &&
+                    formHooks['form-term']['end'] != undefined">  
+            <form 
+                id="form-term-end"
+                v-html="formHooks['form-term']['end']"/>
+        </template>
+
         <!-- Submit buttons -------------- -->
         <div class="field is-grouped form-submit">
             <div class="control">
@@ -154,11 +174,13 @@
 </template>
 
 <script>
+    import { formHooks } from "../../js/mixins";
     import {mapActions, mapGetters} from 'vuex';
     import wpMediaFrames from '../../js/wp-media-frames';
 
     export default {
         name: 'TermEditionForm',
+        mixins: [ formHooks ],
         data() {
             return {
                 formErrors: {},
@@ -190,12 +212,16 @@
             saveEdition(term) {
 
                 if (term.id === 'new') {
-                    this.sendChildTerm({
-                        taxonomyId: this.taxonomyId,
+                    let data = {
                         name: this.editForm.name,
                         description: this.editForm.description,
                         parent: this.hasParent ? this.editForm.parent : 0,
-                        headerImageId: this.editForm.header_image_id,
+                        header_image_id: this.editForm.header_image_id,
+                    };
+                    this.fillExtraFormData(data, 'term');
+                    this.sendChildTerm({
+                        taxonomyId: this.taxonomyId,
+                        term: data
                     })
                         .then((term) => {
                             this.$emit('onEditionFinished', {term: term, hasChangedParent: this.hasChangedParent });
@@ -213,13 +239,17 @@
 
                 } else {
 
-                    this.updateChildTerm({
-                        taxonomyId: this.taxonomyId,
-                        termId: this.editForm.id,
+                    let data = {
+                        term_id: this.editForm.id,
                         name: this.editForm.name,
                         description: this.editForm.description,
                         parent: this.hasParent ? this.editForm.parent : 0,
-                        headerImageId: this.editForm.header_image_id,
+                        header_image_id: this.editForm.header_image_id,
+                    }
+                    this.fillExtraFormData(data, 'term');
+                    this.updateChildTerm({
+                        taxonomyId: this.taxonomyId,
+                        term: data
                     })
                         .then((term) => {
                             this.formErrors = {};
@@ -358,7 +388,7 @@
         }
     }
 
-    form {
+    form#termEditForm {
         padding: 1.7rem 0 1.5rem 1.5rem;
         border-left: 1px solid $gray2;
         margin-left: 0.75rem;
diff --git a/src/admin/js/mixins.js b/src/admin/js/mixins.js
index df28960dc..2e3de00e0 100644
--- a/src/admin/js/mixins.js
+++ b/src/admin/js/mixins.js
@@ -46,4 +46,37 @@ export const dateInter = {
             return format.replace(/[\w]/g, '#');
         }
     }
+};
+
+// Used for filling extra form data on hooks
+export const formHooks = {
+    data() {
+        return { 
+            formHooks: tainacan_plugin['form_hooks'] 
+        }
+    },
+    methods: {
+        fillExtraFormData(data, entity) {
+            let positions  =  [
+                'begin-left', 
+                'begin-right',
+                'begin',
+                'end-left',
+                'end-right',
+                'end'
+            ];
+            // Gets data from existing extra form hooks
+            for (let position of positions) {
+                if (this.formHooks['form-' + entity][position] && this.formHooks['form-' + entity][position] != undefined) {
+                    let formElement = document.getElementById('form-' + entity + '-' + position);
+                    if (formElement) {
+                        let formData = new FormData(formElement);   
+                        for (let [key, value] of formData.entries()) {
+                            data[key] = value;
+                        }
+                    }
+                }
+            }
+        }
+    }
 };
\ No newline at end of file
diff --git a/src/js/store/modules/bgprocess/actions.js b/src/js/store/modules/bgprocess/actions.js
index 7efa36f8e..c91154b47 100644
--- a/src/js/store/modules/bgprocess/actions.js
+++ b/src/js/store/modules/bgprocess/actions.js
@@ -3,7 +3,7 @@ import axios from '../../../axios/axios';
 // Actions related to background processes
 export const fetchProcesses = ({ commit }, {page, processesPerPage}) => {
     return new Promise((resolve, reject) => {
-        let endpoint = '/bg-processes?';
+        let endpoint = '/bg-processes?all_users=1';
 
         if (page != undefined)
             endpoint += 'paged=' + page;
diff --git a/src/js/store/modules/collection/actions.js b/src/js/store/modules/collection/actions.js
index 04bb6575d..4878af031 100644
--- a/src/js/store/modules/collection/actions.js
+++ b/src/js/store/modules/collection/actions.js
@@ -227,49 +227,11 @@ export const deleteCollection = ({ commit }, { collectionId, isPermanently }) =>
 
 export const updateCollection = ({ commit }, { 
         collection_id, 
-        name, 
-        description, 
-        slug, 
-        status, 
-        enable_cover_page, 
-        cover_page_id,
-        moderators_ids, 
-        parent,
-        enabled_view_modes,
-        default_view_mode,
-        comment_status,
-        allow_comments
+        collection
     }) => {
     return new Promise((resolve, reject) => {
-        axios.tainacan.patch('/collections/' + collection_id, {
-            name: name,
-            description: description,
-            status: status,
-            slug: slug,
-            cover_page_id: "" + cover_page_id,
-            enable_cover_page: enable_cover_page,
-            moderators_ids: moderators_ids,
-            parent: parent,
-            enabled_view_modes: enabled_view_modes,
-            default_view_mode: default_view_mode,
-            comment_status: comment_status,
-            allow_comments: allow_comments
-        }).then( res => {
-            commit('setCollection', { 
-                id: collection_id, 
-                name: name, 
-                description: description, 
-                slug: slug, 
-                status: status, 
-                enable_cover_page: enable_cover_page, 
-                cover_page_id: cover_page_id,
-                moderators_ids: moderators_ids,
-                parent: parent,
-                enabled_view_modes: enabled_view_modes,
-                default_view_mode: default_view_mode,
-                comment_status: comment_status,
-                allow_comments: allow_comments
-            });
+        axios.tainacan.patch('/collections/' + collection_id, collection).then( res => {
+            commit('setCollection', collection);
             commit('setCollectionName', res.data.name);
             commit('setCollectionURL', res.data.url);
             resolve( res.data );
@@ -280,18 +242,16 @@ export const updateCollection = ({ commit }, {
     });
 };
 
-export const sendCollection = ( { commit }, { name, description, status, mapper }) => {
+export const sendCollection = ( { commit }, collection) => {
     return new Promise(( resolve, reject ) => {
-        var param = {
-            name: name,
-            description: description,
-            status: status,
-        };
-        param[tainacan_plugin.exposer_mapper_param] = mapper;
+        var param = collection;
+        param['mapper'] = null;
+        param[tainacan_plugin.exposer_mapper_param] = collection.mapper;
         axios.tainacan.post('/collections/', param)
             .then( res => {
-                commit('setCollection', { name: name, description: description, status: status, mapper: mapper });
-                resolve( res.data );
+                let collection = res.data;
+                commit('setCollection', collection);
+                resolve( collection );
             })
             .catch(error => {
                 reject( error.response );
diff --git a/src/js/store/modules/taxonomy/actions.js b/src/js/store/modules/taxonomy/actions.js
index a5f8d1701..bb1a73669 100644
--- a/src/js/store/modules/taxonomy/actions.js
+++ b/src/js/store/modules/taxonomy/actions.js
@@ -4,13 +4,7 @@ import qs from 'qs'
 // TAXONOMIES
 export const createTaxonomy = ({commit}, taxonomy) => {
     return new Promise(( resolve, reject ) => {
-        axios.tainacan.post('/taxonomies', {
-            name: taxonomy.name,
-            description: taxonomy.description,
-            status: taxonomy.status,
-            slug: taxonomy.slug,
-            allow_insert: taxonomy.allowInsert
-        })
+        axios.tainacan.post('/taxonomies', taxonomy)
             .then( res => {
                 let taxonomy = res.data;
                 commit('setTaxonomy', taxonomy);
@@ -39,18 +33,10 @@ export const deleteTaxonomy = ({ commit }, { taxonomyId, isPermanently }) => {
 
 export const updateTaxonomy = ({ commit }, taxonomy) => {
     return new Promise(( resolve, reject ) => {
-        axios.tainacan.patch(`/taxonomies/${taxonomy.taxonomyId}`, {
-            name: taxonomy.name,
-            description: taxonomy.description,
-            status: taxonomy.status,
-            slug: taxonomy.slug ? taxonomy.slug : '',
-            allow_insert: taxonomy.allowInsert
-        })
+        axios.tainacan.patch(`/taxonomies/${taxonomy.taxonomyId}`, taxonomy)
             .then( res => {
                 let taxonomy = res.data;
-
                 commit('setTaxonomy', taxonomy);
-
                 resolve( taxonomy );
             })
             .catch(error => {
@@ -239,18 +225,13 @@ export const fetchChildTerms = ({ commit }, { parentId, taxonomyId, fetchOnly, s
     });
 };
 
-export const sendChildTerm = ({ commit }, { taxonomyId, name, description, parent, headerImageId }) => {
+export const sendChildTerm = ({ commit }, { taxonomyId, term }) => {
     return new Promise(( resolve, reject ) => {
-        axios.tainacan.post(`/taxonomy/${taxonomyId}/terms/`, {
-            name: name,
-            description: description,
-            parent: parent,
-            header_image_id: headerImageId,
-        })
+        axios.tainacan.post(`/taxonomy/${taxonomyId}/terms/`, term)
             .then( res => {
-                let term = res.data;
-                commit('addChildTerm', {term: term, parent: parent });
-                resolve( term );
+                let newTerm = res.data;
+                commit('addChildTerm', {term: newTerm, parent: term.parent });
+                resolve( newTerm );
             })
             .catch(error => {
                 reject({ error_message: error['response']['data'].error_message, errors: error['response']['data'].errors });
@@ -258,17 +239,12 @@ export const sendChildTerm = ({ commit }, { taxonomyId, name, description, paren
     });
 };
 
-export const updateChildTerm = ({ commit }, { taxonomyId, termId, name, description, parent, headerImageId, oldParent }) => {
+export const updateChildTerm = ({ commit }, { taxonomyId, term }) => {
     return new Promise(( resolve, reject ) => {
-        axios.tainacan.patch(`/taxonomy/${taxonomyId}/terms/${termId}`, {
-            name: name,
-            description: description,
-            parent: parent,
-            header_image_id: headerImageId,
-        })
+        axios.tainacan.patch(`/taxonomy/${taxonomyId}/terms/${term.term_id}`, term)
             .then( res => {
-                let term = res.data;
-                commit('updateChildTerm', { term: term, parent: parent, oldParent: oldParent });
+                let updatedTerm = res.data;
+                commit('updateChildTerm', { term: updatedTerm, parent: updatedTerm.parent, oldParent: term.parent });
                 resolve( term );
             })
             .catch(error => {

From 75286dbcb5530f416deb2f2b3c07ce599cdcf390 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Tue, 28 Aug 2018 09:35:10 -0300
Subject: [PATCH 15/31] Adds hooks to Filter Edition Form. Adds hooks to Item
 Edition form and visualization hooks to Item Page.

---
 src/admin/class-tainacan-admin.php            | 16 +++++
 .../edition/filter-edition-form.vue           | 29 +++++++++-
 .../components/edition/item-edition-form.vue  | 58 ++++++++++++++++---
 .../edition/metadatum-edition-form.vue        |  1 -
 src/admin/components/lists/filters-list.vue   |  6 --
 src/admin/pages/singles/item-page.vue         | 49 +++++++++++++++-
 src/js/store/modules/item/actions.js          | 14 ++---
 7 files changed, 146 insertions(+), 27 deletions(-)

diff --git a/src/admin/class-tainacan-admin.php b/src/admin/class-tainacan-admin.php
index 1a1467324..2b1e09a89 100644
--- a/src/admin/class-tainacan-admin.php
+++ b/src/admin/class-tainacan-admin.php
@@ -212,6 +212,18 @@ class Admin {
 				'begin-right' => '<input type="text" name="collection-border-color" value="black" />',
 				'end-right' => '<input type="text" name="collection-highlight-color" value="green" />'
 			],
+			'form-item' => [
+				'begin-left' => '<input type="text" name="item-background-color" value="blue" />',
+				'end-left' => '<input type="text" name="item-color" value="red" />',
+				'begin-right' => '<input type="text" name="item-border-color" value="black" />',
+				'end-right' => '<input type="text" name="item-highlight-color" value="green" />'
+			],
+			'view-item' => [
+				'begin-left' => '<p>blue</p>',
+				'end-left' => '<p>black</p>',
+				'begin-right' => '<p>red</p>',
+				'end-right' => '<p>green</p>',
+			],
 			'form-taxonomy' => [
 				'begin' => '<input type="text" name="taxonomy-background-color" value="blue" />',
 				'end' => '<input type="text" name="taxonomy-color" value="red" />'
@@ -223,6 +235,10 @@ class Admin {
 			'form-metadatum' => [
 				'begin' => '<input type="text" name="metadatum-background-color" value="blue" />',
 				'end' => '<input type="text" name="metadatum-color" value="red" />'
+			],
+			'form-filter' => [
+				'begin' => '<input type="text" name="filter-background-color" value="blue" />',
+				'end' => '<input type="text" name="filter-color" value="red" />'
 			]
 		];
 		
diff --git a/src/admin/components/edition/filter-edition-form.vue b/src/admin/components/edition/filter-edition-form.vue
index e10661511..83be68971 100644
--- a/src/admin/components/edition/filter-edition-form.vue
+++ b/src/admin/components/edition/filter-edition-form.vue
@@ -2,7 +2,18 @@
     <form 
             id="filterEditForm" 
             class="tainacan-form" 
-            @submit.prevent="saveEdition(editForm)">     
+            @submit.prevent="saveEdition(editForm)">
+
+        <!-- Hook for extra Form options -->
+        <template 
+                v-if="formHooks != undefined && 
+                    formHooks['form-filter'] != undefined &&
+                    formHooks['form-filter']['begin'] != undefined">  
+            <form 
+                id="form-filter-begin"
+                v-html="formHooks['form-filter']['begin']"/>
+        </template>
+
         <b-field 
                 :addons="false"
                 :type="formErrors['name'] != undefined ? 'is-danger' : ''" 
@@ -135,6 +146,16 @@
         <div 
                 v-html="editForm.edit_form" 
                 v-else/>
+    
+        <!-- Hook for extra Form options -->
+        <template 
+                v-if="formHooks != undefined && 
+                    formHooks['form-filter'] != undefined &&
+                    formHooks['form-filter']['end'] != undefined">  
+            <form 
+                id="form-filter-end"
+                v-html="formHooks['form-filter']['end']"/>
+        </template>
 
         <div class="field is-grouped form-submit">
             <div class="control">
@@ -156,9 +177,11 @@
 
 <script>
 import { mapActions } from 'vuex';
+import { formHooks } from "../../js/mixins";
 
 export default {
     name: 'FilterEditionForm',
+    mixins: [ formHooks ],
     data(){
         return {
             editForm: {},
@@ -201,6 +224,7 @@ export default {
 
             if ((filter.filter_type_object && filter.filter_type_object.form_component) || filter.edit_form == '') {
                 
+                this.fillExtraFormData(this.editForm, 'filter');
                 this.updateFilter({ filterId: filter.id, index: this.index, options: this.editForm})
                     .then(() => {
                         this.editForm = {};
@@ -229,6 +253,7 @@ export default {
                     formObj[key] = value;
                 }
 
+                this.fillExtraFormData(formObj, 'filter');
                 this.updateFilter({ filterId: filter.id, index: this.index, options: formObj})
                     .then(() => {
                         this.editForm = {};
@@ -265,7 +290,7 @@ export default {
 
     @import "../../scss/_variables.scss";
  
-    form {
+    form#filterEditForm {
         padding: 1.0em 2.0em;
         border-top: 1px solid $gray2;
         border-bottom: 1px solid $gray2;
diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index 2fa8aea75..0686cbe74 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -16,6 +16,16 @@
             <div class="columns">
                 <div class="column is-5-5">
 
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['form-item'] != undefined &&
+                                formHooks['form-item']['begin-left'] != undefined">  
+                        <form 
+                            id="form-item-begin-left"
+                            v-html="formHooks['form-item']['begin-left']"/>
+                    </template>
+
                     <!-- Document -------------------------------- -->
                     <div class="section-label">
                         <label>{{ form.document != undefined && form.document != null && form.document != '' ? $i18n.get('label_document') : $i18n.get('label_document_empty') }}</label>
@@ -292,11 +302,31 @@
                         </div>
                     </div>
 
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['form-item'] != undefined &&
+                                formHooks['form-item']['end-left'] != undefined">  
+                        <form 
+                            id="form-item-end-left"
+                            v-html="formHooks['form-item']['end-left'] "/>
+                    </template>
+
                 </div>
                 <div 
                         class="column is-4-5"
                         v-show="!isMetadataColumnCompressed">
 
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['form-item'] != undefined &&
+                                formHooks['form-item']['begin-right'] != undefined">  
+                        <form 
+                            id="form-item-begin-right"
+                            v-html="formHooks['form-item']['begin-right']"/>
+                    </template>
+
                     
                     <!-- Visibility (status public or private) -------------------------------- -->
                     <div class="section-label">
@@ -341,16 +371,14 @@
 
                     <!-- Metadata from Collection-------------------------------- -->
                     <span class="section-label">
-                        <label >{{ $i18n.get('metadata') }}</label>
+                        <label>{{ $i18n.get('metadata') }}</label>
                     </span>
                     <br>
                     <a
                             class="collapse-all"
                             @click="toggleCollapseAll()">
                         {{ collapseAll ? $i18n.get('label_collapse_all') : $i18n.get('label_expand_all') }}
-                        <b-icon
-                                type="is-turoquoise5"
-                                :icon=" collapseAll ? 'menu-down' : 'menu-right'" />
+                        <b-icon :icon=" collapseAll ? 'menu-down' : 'menu-right'" />
                     </a>
                     <tainacan-form-item
                             v-for="(metadatum, index) of metadatumList"
@@ -359,6 +387,15 @@
                             :is-collapsed="metadatumCollapses[index]"
                             @changeCollapse="onChangeCollapse($event, index)"/>
 
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['form-item'] != undefined &&
+                                formHooks['form-item']['end-right'] != undefined">  
+                        <form 
+                            id="form-item-end-right"
+                            v-html="formHooks['form-item']['end-right']"/>
+                    </template>
                 </div>
             </div>
             <div class="footer">
@@ -443,9 +480,11 @@ import wpMediaFrames from '../../js/wp-media-frames';
 import FileItem from '../other/file-item.vue';
 import DocumentItem from '../other/document-item.vue';
 import CustomDialog from '../other/custom-dialog.vue';
+import { formHooks } from '../../js/mixins';
 
 export default {
     name: 'ItemEditionForm',
+    mixins: [ formHooks ],
     data(){
         return {
             pageTitle: '',
@@ -540,8 +579,8 @@ export default {
             let previousStatus = this.form.status;
             this.form.status = status;
 
-            let data = {item_id: this.itemId, status: this.form.status, comment_status: this.form.comment_status};
-
+            let data = {id: this.itemId, status: this.form.status, comment_status: this.form.comment_status};
+            this.fillExtraFormData(data, 'item');
             this.updateItem(data).then(updatedItem => {
 
                 this.item = updatedItem;
@@ -582,6 +621,7 @@ export default {
 
             // Creates draft Item
             let data = {collection_id: this.form.collectionId, status: 'auto-draft', comment_status: this.form.comment_status};
+            this.fillExtraFormData(data, 'item');
             this.sendItem(data).then(res => {
 
                 this.itemId = res.id;
@@ -907,6 +947,10 @@ export default {
     .page-container {
         padding: 25px 0px;
 
+        &>.tainacan-form {
+            margin-bottom: 110px;
+        }
+
         .tainacan-page-title {
             padding-left: $page-side-padding;
             padding-right: $page-side-padding;
@@ -945,7 +989,7 @@ export default {
         label {
             font-size: 16px !important;
             font-weight: 500 !important;
-            color: $blue5 !important;
+            color: $gray5 !important;
             line-height: 1.2em;
         }
     }
diff --git a/src/admin/components/edition/metadatum-edition-form.vue b/src/admin/components/edition/metadatum-edition-form.vue
index 3ee87178f..e16a18edb 100644
--- a/src/admin/components/edition/metadatum-edition-form.vue
+++ b/src/admin/components/edition/metadatum-edition-form.vue
@@ -299,7 +299,6 @@
                 if ((metadatum.metadata_type_object && metadatum.metadata_type_object.form_component) || metadatum.edit_form == '') {
                     
                     this.fillExtraFormData(this.editForm, 'metadatum');
-
                     this.updateMetadatum({
                         collectionId: this.collectionId,
                         metadatumId: metadatum.id,
diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue
index 95d23c36c..2980c6eea 100644
--- a/src/admin/components/lists/filters-list.vue
+++ b/src/admin/components/lists/filters-list.vue
@@ -583,12 +583,6 @@ export default {
                 }
             }
 
-            form {
-                padding: 1.0em 2.0em;
-                border-top: 1px solid $gray2;
-                border-bottom: 1px solid $gray2;
-                margin-top: 1.0em;
-            }
             &.not-sortable-item, &.not-sortable-item:hover {
                 cursor: default;
                 background-color: white !important;
diff --git a/src/admin/pages/singles/item-page.vue b/src/admin/pages/singles/item-page.vue
index 374e0f9c1..7e4696d09 100644
--- a/src/admin/pages/singles/item-page.vue
+++ b/src/admin/pages/singles/item-page.vue
@@ -13,6 +13,16 @@
             <div class="columns">
                 <div class="column is-5-5">
 
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['view-item'] != undefined &&
+                                formHooks['view-item']['begin-left'] != undefined">  
+                        <div 
+                            id="view-item-begin-left"
+                            v-html="formHooks['view-item']['begin-left']"/>
+                    </template>
+
                     <!-- Document -------------------------------- -->
                     <div class="section-label">
                         <label>{{ item.document !== undefined && item.document !== null && item.document !== '' ?
@@ -156,11 +166,32 @@
                             </b-collapse>
                         </div>
                     </div>
+
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['view-item'] != undefined &&
+                                formHooks['view-item']['end-left'] != undefined">  
+                        <div 
+                            id="view-item-end-left"
+                            v-html="formHooks['view-item']['end-left']"/>
+                    </template>
+
                 </div>
                 <div 
                         v-show="!isMetadataColumnCompressed"
                         class="column is-4-5">
                     
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['view-item'] != undefined &&
+                                formHooks['view-item']['begin-right'] != undefined">  
+                        <div 
+                            id="view-item-begin-right"
+                            v-html="formHooks['view-item']['begin-right']"/>
+                    </template>
+
                     <!-- Visibility (status public or private) -------------------------------- -->
                     <div class="section-label">
                         <label>{{ $i18n.get('label_visibility') }}</label>
@@ -235,6 +266,16 @@
                             </b-collapse>
                         </div>
                     </div>
+
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['view-item'] != undefined &&
+                                formHooks['view-item']['end-right'] != undefined">  
+                        <div 
+                            id="view-item-end-right"
+                            v-html="formHooks['view-item']['end-right']"/>
+                    </template>
                 </div>
             </div>
             <div class="footer">
@@ -260,9 +301,11 @@
     import {mapActions, mapGetters} from 'vuex'
     import FileItem from '../../components/other/file-item.vue';
     import DocumentItem from '../../components/other/document-item.vue';
+    import { formHooks } from '../../js/mixins';
 
     export default {
         name: 'ItemPage',
+        mixins: [ formHooks ],
         data() {
             return {
                 collectionId: Number,
@@ -411,6 +454,10 @@
     .page-container {
         padding: 25px 0;
 
+        &>.tainacan-form {
+            margin-bottom: 110px;
+        }
+
         .tainacan-page-title {
             padding-left: $page-side-padding;
             padding-right: $page-side-padding;
@@ -472,7 +519,7 @@
         label {
             font-size: 16px !important;
             font-weight: 500 !important;
-            color: $blue5 !important;
+            color: $gray5 !important;
             line-height: 1.2em;
         }
     }
diff --git a/src/js/store/modules/item/actions.js b/src/js/store/modules/item/actions.js
index da3938442..a1340b512 100644
--- a/src/js/store/modules/item/actions.js
+++ b/src/js/store/modules/item/actions.js
@@ -92,12 +92,9 @@ export const fetchItemTitle = ({ commit }, id) => {
     });
 }
 
-export const sendItem = ( { commit }, { collection_id, status, comment_status }) => {
+export const sendItem = ( { commit }, item) => {
     return new Promise(( resolve, reject ) => {
-        axios.tainacan.post('/collection/'+ collection_id + '/items/', {
-            status: status,
-            comment_status: comment_status
-        })
+        axios.tainacan.post('/collection/'+ item.collection_id + '/items/', item)
             .then( res => {
                 commit('setItem', res.data);
                 commit('setLastUpdated');
@@ -109,13 +106,10 @@ export const sendItem = ( { commit }, { collection_id, status, comment_status })
     });
 };
  
-export const updateItem = ({ commit }, { item_id, status, comment_status }) => {
+export const updateItem = ({ commit }, item) => {
 
     return new Promise((resolve, reject) => {
-        axios.tainacan.patch('/items/' + item_id, {
-            status: status,
-            comment_status: comment_status
-        }).then( res => {
+        axios.tainacan.patch('/items/' + item.id, item).then( res => {
             commit('setItem', res.data);
             commit('setLastUpdated');
             resolve( res.data );

From c0c1bcae2c1e686a0c0578c424be28a338d451dd Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Tue, 28 Aug 2018 17:56:46 -0300
Subject: [PATCH 16/31] Joins html arrays in form hook. First tests with
 updating form hook from API.

---
 src/admin/class-tainacan-admin.php            | 43 ++++++++++---------
 .../edition/collection-edition-form.vue       | 24 +++++++----
 .../edition/filter-edition-form.vue           |  4 +-
 .../components/edition/item-edition-form.vue  |  8 ++--
 .../edition/metadatum-edition-form.vue        |  4 +-
 .../edition/taxonomy-edition-form.vue         |  4 +-
 .../components/edition/term-edition-form.vue  |  4 +-
 src/admin/js/mixins.js                        | 25 ++++++++++-
 src/admin/pages/singles/item-page.vue         |  8 ++--
 9 files changed, 78 insertions(+), 46 deletions(-)

diff --git a/src/admin/class-tainacan-admin.php b/src/admin/class-tainacan-admin.php
index 2b1e09a89..116083cf8 100644
--- a/src/admin/class-tainacan-admin.php
+++ b/src/admin/class-tainacan-admin.php
@@ -207,38 +207,41 @@ class Admin {
 		
 		$settings['form_hooks'] = [
 			'form-collection' => [
-				'begin-left' => '<input type="text" name="collection-background-color" value="blue" />',
-				'end-left' => '<input type="text" name="collection-color" value="red" />',
-				'begin-right' => '<input type="text" name="collection-border-color" value="black" />',
-				'end-right' => '<input type="text" name="collection-highlight-color" value="green" />'
+				'begin-left' => [
+					'<input type="text" name="collection-background-color" value="blue" /><input type="text" name="collection-background-color1" value="blue" />',
+					'<input type="text" name="collection-background-color2" value="blue" />'
+				],
+				'end-left' => ['<input type="text" name="collection-color" value="red" />'],
+				'begin-right' => ['<input type="text" name="collection-border-color" value="black" />'],
+				'end-right' => ['<input type="text" name="collection-highlight-color" value="green" />']
 			],
 			'form-item' => [
-				'begin-left' => '<input type="text" name="item-background-color" value="blue" />',
-				'end-left' => '<input type="text" name="item-color" value="red" />',
-				'begin-right' => '<input type="text" name="item-border-color" value="black" />',
-				'end-right' => '<input type="text" name="item-highlight-color" value="green" />'
+				'begin-left' => ['<input type="text" name="item-background-color" value="blue" />'],
+				'end-left' => ['<input type="text" name="item-color" value="red" />'],
+				'begin-right' => ['<input type="text" name="item-border-color" value="black" />'],
+				'end-right' => ['<input type="text" name="item-highlight-color" value="green" />']
 			],
 			'view-item' => [
-				'begin-left' => '<p>blue</p>',
-				'end-left' => '<p>black</p>',
-				'begin-right' => '<p>red</p>',
-				'end-right' => '<p>green</p>',
+				'begin-left' => ['<p>blue</p>'],
+				'end-left' => ['<p>black</p>'],
+				'begin-right' => ['<p>red</p>'],
+				'end-right' => ['<p>green</p>'],
 			],
 			'form-taxonomy' => [
-				'begin' => '<input type="text" name="taxonomy-background-color" value="blue" />',
-				'end' => '<input type="text" name="taxonomy-color" value="red" />'
+				'begin' => ['<input type="text" name="taxonomy-background-color" value="blue" />'],
+				'end' => ['<input type="text" name="taxonomy-color" value="red" />']
 			],
 			'form-term' => [
-				'begin' => '<input type="text" name="term-background-color" value="blue" />',
-				'end' => '<input type="text" name="term-color" value="red" />'
+				'begin' => ['<input type="text" name="term-background-color" value="blue" />'],
+				'end' => ['<input type="text" name="term-color" value="red" />']
 			],
 			'form-metadatum' => [
-				'begin' => '<input type="text" name="metadatum-background-color" value="blue" />',
-				'end' => '<input type="text" name="metadatum-color" value="red" />'
+				'begin' => ['<input type="text" name="metadatum-background-color" value="blue" />'],
+				'end' => ['<input type="text" name="metadatum-color" value="red" />']
 			],
 			'form-filter' => [
-				'begin' => '<input type="text" name="filter-background-color" value="blue" />',
-				'end' => '<input type="text" name="filter-color" value="red" />'
+				'begin' => ['<input type="text" name="filter-background-color" value="blue" />'],
+				'end' => ['<input type="text" name="filter-color" value="red" />']
 			]
 		];
 		
diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue
index 5ec545acb..78023429d 100644
--- a/src/admin/components/edition/collection-edition-form.vue
+++ b/src/admin/components/edition/collection-edition-form.vue
@@ -34,7 +34,7 @@
                                 formHooks['form-collection']['begin-left'] != undefined">  
                         <form 
                             id="form-collection-begin-left"
-                            v-html="formHooks['form-collection']['begin-left']"/>
+                            v-html="this.formHooks['form-collection']['begin-left'].join('')"/>
                     </template>
 
                     <!-- Thumbnail -------------------------------- --> 
@@ -238,7 +238,7 @@
                                 formHooks['form-collection']['end-left'] != undefined">  
                         <form 
                             id="form-collection-end-left"
-                            v-html="formHooks['form-collection']['end-left'] "/>
+                            v-html="formHooks['form-collection']['end-left'].join('')"/>
                     </template>
 
                 </div>
@@ -252,7 +252,7 @@
                                 formHooks['form-collection']['begin-right'] != undefined">  
                         <form 
                             id="form-collection-begin-right"
-                            v-html="formHooks['form-collection']['begin-right']"/>
+                            v-html="formHooks['form-collection']['begin-right'].join('')"/>
                     </template>
 
                     <!-- Status -------------------------------- --> 
@@ -423,7 +423,7 @@
                                 formHooks['form-collection']['end-right'] != undefined">  
                         <form 
                             id="form-collection-end-right"
-                            v-html="formHooks['form-collection']['end-right']"/>
+                            v-html="formHooks['form-collection']['end-right'].join('')"/>
                     </template>
                 </div>
 
@@ -593,6 +593,9 @@ export default {
                 
                 this.collection = updatedCollection;
 
+                // Fills hook forms with it's real values 
+                this.updateExtraFormData('collection', this.collection);
+                
                 // Fill this.form data with current data.
                 this.form.name = this.collection.name;
                 this.form.slug = this.collection.slug;
@@ -608,10 +611,10 @@ export default {
                 this.formErrorMessage = '';
                 this.editFormErrors = {};
 
-                if (this.fromImporter)
-                    this.$router.go(-1);
-                else
-                    this.$router.push(this.$routerHelper.getCollectionPath(this.collectionId));
+                // if (this.fromImporter)
+                //     this.$router.go(-1);
+                // else
+                //     this.$router.push(this.$routerHelper.getCollectionPath(this.collectionId));
             })
             .catch((errors) => {
                 for (let error of errors.errors) {     
@@ -638,7 +641,7 @@ export default {
 
                 // Initializes Media Frames now that collectonId exists
                 this.initializeMediaFrames();
-
+        
                 // Fill this.form data with current data.
                 this.form.name = this.collection.name;
                 this.form.description = this.collection.description;
@@ -825,6 +828,9 @@ export default {
                 // Initializes Media Frames now that collectonId exists
                 this.initializeMediaFrames();
 
+                // Fills hook forms with it's real values 
+                this.updateExtraFormData('collection', this.collection);
+  
                 // Fill this.form data with current data.
                 this.form.name = this.collection.name;
                 this.form.description = this.collection.description;
diff --git a/src/admin/components/edition/filter-edition-form.vue b/src/admin/components/edition/filter-edition-form.vue
index 83be68971..73dfb2626 100644
--- a/src/admin/components/edition/filter-edition-form.vue
+++ b/src/admin/components/edition/filter-edition-form.vue
@@ -11,7 +11,7 @@
                     formHooks['form-filter']['begin'] != undefined">  
             <form 
                 id="form-filter-begin"
-                v-html="formHooks['form-filter']['begin']"/>
+                v-html="formHooks['form-filter']['begin'].join('')"/>
         </template>
 
         <b-field 
@@ -154,7 +154,7 @@
                     formHooks['form-filter']['end'] != undefined">  
             <form 
                 id="form-filter-end"
-                v-html="formHooks['form-filter']['end']"/>
+                v-html="formHooks['form-filter']['end'].join('')"/>
         </template>
 
         <div class="field is-grouped form-submit">
diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index 0686cbe74..739f55cd9 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -23,7 +23,7 @@
                                 formHooks['form-item']['begin-left'] != undefined">  
                         <form 
                             id="form-item-begin-left"
-                            v-html="formHooks['form-item']['begin-left']"/>
+                            v-html="formHooks['form-item']['begin-left'].join('')"/>
                     </template>
 
                     <!-- Document -------------------------------- -->
@@ -309,7 +309,7 @@
                                 formHooks['form-item']['end-left'] != undefined">  
                         <form 
                             id="form-item-end-left"
-                            v-html="formHooks['form-item']['end-left'] "/>
+                            v-html="formHooks['form-item']['end-left'].join('')"/>
                     </template>
 
                 </div>
@@ -324,7 +324,7 @@
                                 formHooks['form-item']['begin-right'] != undefined">  
                         <form 
                             id="form-item-begin-right"
-                            v-html="formHooks['form-item']['begin-right']"/>
+                            v-html="formHooks['form-item']['begin-right'].join('')"/>
                     </template>
 
                     
@@ -394,7 +394,7 @@
                                 formHooks['form-item']['end-right'] != undefined">  
                         <form 
                             id="form-item-end-right"
-                            v-html="formHooks['form-item']['end-right']"/>
+                            v-html="formHooks['form-item']['end-right'].join('')"/>
                     </template>
                 </div>
             </div>
diff --git a/src/admin/components/edition/metadatum-edition-form.vue b/src/admin/components/edition/metadatum-edition-form.vue
index e16a18edb..4b58eeada 100644
--- a/src/admin/components/edition/metadatum-edition-form.vue
+++ b/src/admin/components/edition/metadatum-edition-form.vue
@@ -12,7 +12,7 @@
                     formHooks['form-metadatum']['begin'] != undefined">  
             <form 
                 id="form-metadatum-begin"
-                v-html="formHooks['form-metadatum']['begin']"/>
+                v-html="formHooks['form-metadatum']['begin'].join('')"/>
         </template>
 
         <b-field
@@ -223,7 +223,7 @@
                     formHooks['form-metadatum']['end'] != undefined">  
             <form 
                 id="form-metadatum-end"
-                v-html="formHooks['form-metadatum']['end']"/>
+                v-html="formHooks['form-metadatum']['end'].join('')"/>
         </template>
 
         <div class="field is-grouped form-submit">
diff --git a/src/admin/components/edition/taxonomy-edition-form.vue b/src/admin/components/edition/taxonomy-edition-form.vue
index 611b5d8c6..a8706d993 100644
--- a/src/admin/components/edition/taxonomy-edition-form.vue
+++ b/src/admin/components/edition/taxonomy-edition-form.vue
@@ -16,7 +16,7 @@
                                     formHooks['form-taxonomy']['begin'] != undefined">  
                             <form 
                                 id="form-taxonomy-begin"
-                                v-html="formHooks['form-taxonomy']['begin']"/>
+                                v-html="formHooks['form-taxonomy']['begin'].join('')"/>
                         </template>
 
                         <!-- Name -------------------------------- -->
@@ -116,7 +116,7 @@
                                     formHooks['form-taxonomy']['end'] != undefined">  
                             <form 
                                 id="form-taxonomy-end"
-                                v-html="formHooks['form-taxonomy']['end']"/>
+                                v-html="formHooks['form-taxonomy']['end'].join('')"/>
                         </template>
 
                         <!-- Submit -->
diff --git a/src/admin/components/edition/term-edition-form.vue b/src/admin/components/edition/term-edition-form.vue
index db00c511a..adc19d1e4 100644
--- a/src/admin/components/edition/term-edition-form.vue
+++ b/src/admin/components/edition/term-edition-form.vue
@@ -15,7 +15,7 @@
                     formHooks['form-term']['begin'] != undefined">  
             <form 
                 id="form-term-begin"
-                v-html="formHooks['form-term']['begin']"/>
+                v-html="formHooks['form-term']['begin'].join('')"/>
         </template>
 
         <!-- Header Image -------------------------------- -->
@@ -139,7 +139,7 @@
                     formHooks['form-term']['end'] != undefined">  
             <form 
                 id="form-term-end"
-                v-html="formHooks['form-term']['end']"/>
+                v-html="formHooks['form-term']['end'].join('')"/>
         </template>
 
         <!-- Submit buttons -------------- -->
diff --git a/src/admin/js/mixins.js b/src/admin/js/mixins.js
index 2e3de00e0..b75e977ef 100644
--- a/src/admin/js/mixins.js
+++ b/src/admin/js/mixins.js
@@ -52,7 +52,7 @@ export const dateInter = {
 export const formHooks = {
     data() {
         return { 
-            formHooks: tainacan_plugin['form_hooks'] 
+            formHooks: JSON.parse(JSON.stringify(tainacan_plugin['form_hooks'])) 
         }
     },
     methods: {
@@ -77,6 +77,29 @@ export const formHooks = {
                     }
                 }
             }
+        },
+        updateExtraFormData(entity, entityObject) {
+            let positions  =  [
+                'begin-left', 
+                'begin-right',
+                'begin',
+                'end-left',
+                'end-right',
+                'end'
+            ];
+            // Gets data from existing extra form hooks
+            for (let position of positions) {
+                if (this.formHooks['form-' + entity][position] && this.formHooks['form-' + entity][position] != undefined) {
+                    let formElement = document.getElementById('form-' + entity + '-' + position);
+                    if (formElement) {
+                        let formData = new FormData(formElement);   
+                        for (let [key, value] of formData.entries()) {
+                            if (entityObject[key] != undefined && entityObject[key] != null)
+                                value = entityObject[key];
+                        }
+                    }
+                }
+            }
         }
     }
 };
\ No newline at end of file
diff --git a/src/admin/pages/singles/item-page.vue b/src/admin/pages/singles/item-page.vue
index 7e4696d09..b025811d2 100644
--- a/src/admin/pages/singles/item-page.vue
+++ b/src/admin/pages/singles/item-page.vue
@@ -20,7 +20,7 @@
                                 formHooks['view-item']['begin-left'] != undefined">  
                         <div 
                             id="view-item-begin-left"
-                            v-html="formHooks['view-item']['begin-left']"/>
+                            v-html="formHooks['view-item']['begin-left'].join('')"/>
                     </template>
 
                     <!-- Document -------------------------------- -->
@@ -174,7 +174,7 @@
                                 formHooks['view-item']['end-left'] != undefined">  
                         <div 
                             id="view-item-end-left"
-                            v-html="formHooks['view-item']['end-left']"/>
+                            v-html="formHooks['view-item']['end-left'].join('')"/>
                     </template>
 
                 </div>
@@ -189,7 +189,7 @@
                                 formHooks['view-item']['begin-right'] != undefined">  
                         <div 
                             id="view-item-begin-right"
-                            v-html="formHooks['view-item']['begin-right']"/>
+                            v-html="formHooks['view-item']['begin-right'].join('')"/>
                     </template>
 
                     <!-- Visibility (status public or private) -------------------------------- -->
@@ -274,7 +274,7 @@
                                 formHooks['view-item']['end-right'] != undefined">  
                         <div 
                             id="view-item-end-right"
-                            v-html="formHooks['view-item']['end-right']"/>
+                            v-html="formHooks['view-item']['end-right'].join('')"/>
                     </template>
                 </div>
             </div>

From 8b381fed93422d8797e9a0ab5b7605400d2733b4 Mon Sep 17 00:00:00 2001
From: Leo Germani <leogermani@gmail.com>
Date: Tue, 28 Aug 2018 18:18:31 -0300
Subject: [PATCH 17/31] admin hooks - work in progress #96

---
 src/admin/class-tainacan-admin-hooks.php      | 57 +++++++++++++++++++
 ...s-tainacan-rest-collections-controller.php |  4 +-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 src/admin/class-tainacan-admin-hooks.php

diff --git a/src/admin/class-tainacan-admin-hooks.php b/src/admin/class-tainacan-admin-hooks.php
new file mode 100644
index 000000000..818b4cc8a
--- /dev/null
+++ b/src/admin/class-tainacan-admin-hooks.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Tainacan;
+
+
+class AdminHooks {
+
+
+    public $registered_plugins = [];
+
+    private static $instance = null;
+
+	public static function get_instance() {
+		if ( ! isset( self::$instance ) ) {
+			self::$instance = new self();
+		}
+
+		return self::$instance;
+	}
+
+	private function __construct() {
+
+        do_action('tainacan-register-admin-hooks');
+        do_action('tainacan-register-meta');
+
+    }
+    
+    /**
+     * 
+     * @param string $context The context to add the hook to (collection, metadatum, item, taxonomy, term or filter)
+     * @param string $position The position inside the page to hook. (begin, end, begin-left, begin-right, end-left, end-right)
+     * @param callable $callback The callback that will output the form HTML
+     */
+    public function register( $context, $position, $callback ) {
+        $result = call_user_func($callback);
+        if (is_string($result)){
+            $this->registered_hooks[$context][$position][] = $result;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 
+     * @param string $context The context to add the metahook to (collection, metadatum, item, taxonomy, term or filter)
+     * @param string $meta_key The unique name of a meta where information about the entity will be saved using add_post_meta()
+     */
+    public function register_meta( $context, $meta_key ) {
+        if (is_string($meta_key)){
+            $this->registered_meta[$context][] = $meta_key;
+            return true;
+        }
+        return false;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/api/endpoints/class-tainacan-rest-collections-controller.php b/src/api/endpoints/class-tainacan-rest-collections-controller.php
index d7583ab84..b056ce825 100644
--- a/src/api/endpoints/class-tainacan-rest-collections-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-collections-controller.php
@@ -203,7 +203,9 @@ class REST_Collections_Controller extends REST_Controller {
 				$item_arr['total_items']['private'] = $total_items->private;
 			}
 
-            return $item_arr;
+			$extra_metadata = apply_filters('tainacan-api-response-collection-meta', []);
+			
+			return $item_arr;
         }
 
         return $item;

From af2ce16dfba08a5938b80650d16e6c29bc6a43bc Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Wed, 29 Aug 2018 08:52:14 -0300
Subject: [PATCH 18/31] Adds updateFormHook to all available forms.

---
 src/admin/components/edition/filter-edition-form.vue    | 6 +++++-
 src/admin/components/edition/item-edition-form.vue      | 6 ++++++
 src/admin/components/edition/metadatum-edition-form.vue | 3 +++
 src/admin/components/edition/taxonomy-edition-form.vue  | 6 ++++++
 src/admin/components/edition/term-edition-form.vue      | 3 +++
 src/admin/pages/singles/item-page.vue                   | 3 +++
 6 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/admin/components/edition/filter-edition-form.vue b/src/admin/components/edition/filter-edition-form.vue
index 73dfb2626..b86c0b4b8 100644
--- a/src/admin/components/edition/filter-edition-form.vue
+++ b/src/admin/components/edition/filter-edition-form.vue
@@ -204,6 +204,10 @@ export default {
         this.formErrorMessage = this.editForm.formErrors != undefined ? this.editForm.formErrorMessage : ''; 
 
         this.oldForm = JSON.parse(JSON.stringify(this.originalFilter));
+
+        // Fills hook forms with it's real values 
+        this.updateExtraFormData('filter', this.editForm);
+  
     },
     beforeDestroy() {
         if (this.closedByForm) {
@@ -224,7 +228,7 @@ export default {
 
             if ((filter.filter_type_object && filter.filter_type_object.form_component) || filter.edit_form == '') {
                 
-                this.fillExtraFormData(this.editForm, 'filter');
+                // this.fillExtraFormData(this.editForm, 'filter');
                 this.updateFilter({ filterId: filter.id, index: this.index, options: this.editForm})
                     .then(() => {
                         this.editForm = {};
diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index 739f55cd9..1e25d7907 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -585,6 +585,9 @@ export default {
 
                 this.item = updatedItem;
 
+                // Fills hook forms with it's real values 
+                this.updateExtraFormData('item', this.item);
+
                 // Fill this.form data with current data.
                 this.form.status = this.item.status;
                 this.form.document = this.item.document;
@@ -846,6 +849,9 @@ export default {
             this.fetchItem(this.itemId).then(res => {
                 this.item = res;
 
+                // Fills hook forms with it's real values 
+                this.updateExtraFormData('item', this.item);
+
                 // Fill this.form data with current data.
                 this.form.status = this.item.status;
                 this.form.document = this.item.document;
diff --git a/src/admin/components/edition/metadatum-edition-form.vue b/src/admin/components/edition/metadatum-edition-form.vue
index 4b58eeada..e2bdebf7d 100644
--- a/src/admin/components/edition/metadatum-edition-form.vue
+++ b/src/admin/components/edition/metadatum-edition-form.vue
@@ -278,6 +278,9 @@
 
             this.oldForm = JSON.parse(JSON.stringify(this.originalMetadatum));
 
+            // Fills hook forms with it's real values 
+            this.updateExtraFormData('metadatum', this.editForm);
+
         },
         beforeDestroy() {
             if (this.closedByForm) {
diff --git a/src/admin/components/edition/taxonomy-edition-form.vue b/src/admin/components/edition/taxonomy-edition-form.vue
index a8706d993..69b3999cd 100644
--- a/src/admin/components/edition/taxonomy-edition-form.vue
+++ b/src/admin/components/edition/taxonomy-edition-form.vue
@@ -254,6 +254,9 @@
 
                         this.taxonomy = updatedTaxonomy;
 
+                        // Fills hook forms with it's real values 
+                        this.updateExtraFormData('taxonomy', this.taxonomy);
+
                         // Fill this.form data with current data.
                         this.form.name = this.taxonomy.name;
                         this.form.slug = this.taxonomy.slug;
@@ -358,6 +361,9 @@
                 this.fetchTaxonomy(this.taxonomyId).then(res => {
                     this.taxonomy = res.taxonomy;
 
+                    // Fills hook forms with it's real values 
+                    this.updateExtraFormData('taxonomy', this.taxonomy);
+
                     // Fill this.form data with current data.
                     this.form.name = this.taxonomy.name;
                     this.form.description = this.taxonomy.description;
diff --git a/src/admin/components/edition/term-edition-form.vue b/src/admin/components/edition/term-edition-form.vue
index adc19d1e4..0aeeebc2f 100644
--- a/src/admin/components/edition/term-edition-form.vue
+++ b/src/admin/components/edition/term-edition-form.vue
@@ -342,6 +342,9 @@
         },
         mounted() {
             
+            // Fills hook forms with it's real values 
+            this.updateExtraFormData('term', this.editForm);
+ 
             this.showCheckboxesWarning = false;
             this.hasParent = this.editForm.parent != undefined && this.editForm.parent > 0;
             this.initialParentId = this.editForm.parent;
diff --git a/src/admin/pages/singles/item-page.vue b/src/admin/pages/singles/item-page.vue
index b025811d2..98f16f199 100644
--- a/src/admin/pages/singles/item-page.vue
+++ b/src/admin/pages/singles/item-page.vue
@@ -372,6 +372,9 @@
         },
         computed: {
             item() {
+                // Fills hook forms with it's real values 
+                this.updateExtraFormData('item', this.getItem());
+
                 return this.getItem();
             },
             metadatumList() {

From 1406ee8f359e1440d89cc6b7e2dbb2d401e0f2ca Mon Sep 17 00:00:00 2001
From: Leo Germani <leogermani@gmail.com>
Date: Wed, 29 Aug 2018 14:57:44 -0300
Subject: [PATCH 19/31] admin plugins backend structure #96

---
 src/admin/admin-hooks-functions.php           |  9 ++++
 src/admin/class-tainacan-admin-hooks.php      | 45 +++++++++++--------
 src/admin/class-tainacan-admin.php            | 40 +----------------
 ...s-tainacan-rest-collections-controller.php | 13 +++++-
 ...class-tainacan-rest-filters-controller.php | 13 ++++++
 .../class-tainacan-rest-items-controller.php  | 13 ++++++
 ...lass-tainacan-rest-metadata-controller.php | 13 ++++++
 ...ss-tainacan-rest-taxonomies-controller.php | 13 ++++++
 .../class-tainacan-rest-terms-controller.php  | 13 ++++++
 src/classes/tainacan-creator.php              |  4 ++
 10 files changed, 118 insertions(+), 58 deletions(-)
 create mode 100644 src/admin/admin-hooks-functions.php

diff --git a/src/admin/admin-hooks-functions.php b/src/admin/admin-hooks-functions.php
new file mode 100644
index 000000000..de68e9af4
--- /dev/null
+++ b/src/admin/admin-hooks-functions.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @see \Tainacan\Admin_Hooks->register()
+ */
+function register_admin_hook( $context, $callback, $position = 'end-left' ) {
+    $admin_hooks = \Tainacan\Admin_Hooks::get_instance();
+    return $admin_hooks->register( $context, $callback, $position );
+}
\ No newline at end of file
diff --git a/src/admin/class-tainacan-admin-hooks.php b/src/admin/class-tainacan-admin-hooks.php
index 818b4cc8a..3da667876 100644
--- a/src/admin/class-tainacan-admin-hooks.php
+++ b/src/admin/class-tainacan-admin-hooks.php
@@ -3,10 +3,10 @@
 namespace Tainacan;
 
 
-class AdminHooks {
+class Admin_Hooks {
 
 
-    public $registered_plugins = [];
+    private $registered_hooks = [];
 
     private static $instance = null;
 
@@ -19,19 +19,40 @@ class AdminHooks {
 	}
 
 	private function __construct() {
+        add_action('init', [$this, 'init']);
+    }
 
+    function init() {
         do_action('tainacan-register-admin-hooks');
-        do_action('tainacan-register-meta');
+    }
 
+    public function get_available_positions() {
+        return apply_filters('tainacan-admin-hooks-positions', ['begin-left', 'begin-right', 'end-left', 'end-right']);
+    }
+
+    public function get_available_contexts() {
+        return apply_filters('tainacan-admin-hooks-contexts', ['collection', 'metadatum', 'item', 'taxonomy', 'term', 'filter']);
     }
     
+    public function get_registered_hooks() {
+        return $this->registered_hooks;
+    }
+
     /**
      * 
      * @param string $context The context to add the hook to (collection, metadatum, item, taxonomy, term or filter)
      * @param string $position The position inside the page to hook. (begin, end, begin-left, begin-right, end-left, end-right)
      * @param callable $callback The callback that will output the form HTML
      */
-    public function register( $context, $position, $callback ) {
+    public function register( $context, $callback, $position = 'end-left' ) {
+        
+        $contexts = $this->get_available_contexts();
+        $positions = $this->get_available_positions();
+        
+        if ( !in_array($context, $contexts) || !in_array($position, $positions) ) {
+            return false;
+        }
+                
         $result = call_user_func($callback);
         if (is_string($result)){
             $this->registered_hooks[$context][$position][] = $result;
@@ -39,19 +60,7 @@ class AdminHooks {
         }
         return false;
     }
+   
 
-    /**
-     * 
-     * @param string $context The context to add the metahook to (collection, metadatum, item, taxonomy, term or filter)
-     * @param string $meta_key The unique name of a meta where information about the entity will be saved using add_post_meta()
-     */
-    public function register_meta( $context, $meta_key ) {
-        if (is_string($meta_key)){
-            $this->registered_meta[$context][] = $meta_key;
-            return true;
-        }
-        return false;
-    }
+}
 
-
-}
\ No newline at end of file
diff --git a/src/admin/class-tainacan-admin.php b/src/admin/class-tainacan-admin.php
index 116083cf8..432ec9dbd 100644
--- a/src/admin/class-tainacan-admin.php
+++ b/src/admin/class-tainacan-admin.php
@@ -205,45 +205,7 @@ class Admin {
             $settings['i18n']['helpers_label'][$class->get_component()] = $class->get_form_labels();
 		}
 		
-		$settings['form_hooks'] = [
-			'form-collection' => [
-				'begin-left' => [
-					'<input type="text" name="collection-background-color" value="blue" /><input type="text" name="collection-background-color1" value="blue" />',
-					'<input type="text" name="collection-background-color2" value="blue" />'
-				],
-				'end-left' => ['<input type="text" name="collection-color" value="red" />'],
-				'begin-right' => ['<input type="text" name="collection-border-color" value="black" />'],
-				'end-right' => ['<input type="text" name="collection-highlight-color" value="green" />']
-			],
-			'form-item' => [
-				'begin-left' => ['<input type="text" name="item-background-color" value="blue" />'],
-				'end-left' => ['<input type="text" name="item-color" value="red" />'],
-				'begin-right' => ['<input type="text" name="item-border-color" value="black" />'],
-				'end-right' => ['<input type="text" name="item-highlight-color" value="green" />']
-			],
-			'view-item' => [
-				'begin-left' => ['<p>blue</p>'],
-				'end-left' => ['<p>black</p>'],
-				'begin-right' => ['<p>red</p>'],
-				'end-right' => ['<p>green</p>'],
-			],
-			'form-taxonomy' => [
-				'begin' => ['<input type="text" name="taxonomy-background-color" value="blue" />'],
-				'end' => ['<input type="text" name="taxonomy-color" value="red" />']
-			],
-			'form-term' => [
-				'begin' => ['<input type="text" name="term-background-color" value="blue" />'],
-				'end' => ['<input type="text" name="term-color" value="red" />']
-			],
-			'form-metadatum' => [
-				'begin' => ['<input type="text" name="metadatum-background-color" value="blue" />'],
-				'end' => ['<input type="text" name="metadatum-color" value="red" />']
-			],
-			'form-filter' => [
-				'begin' => ['<input type="text" name="filter-background-color" value="blue" />'],
-				'end' => ['<input type="text" name="filter-color" value="red" />']
-			]
-		];
+		$settings['form_hooks'] = Admin_Hooks::get_instance()->get_registered_hooks();
 		
 		return $settings;
 		
diff --git a/src/api/endpoints/class-tainacan-rest-collections-controller.php b/src/api/endpoints/class-tainacan-rest-collections-controller.php
index b056ce825..6c839cc94 100644
--- a/src/api/endpoints/class-tainacan-rest-collections-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-collections-controller.php
@@ -203,7 +203,18 @@ class REST_Collections_Controller extends REST_Controller {
 				$item_arr['total_items']['private'] = $total_items->private;
 			}
 
-			$extra_metadata = apply_filters('tainacan-api-response-collection-meta', []);
+			/**
+			 * Use this filter to add additional post_meta to the api response
+			 * Use the $request object to get the context of the request and other variables
+			 * For example, id context is edit, you may want to add your meta or not.
+			 * 
+			 * Also take care to do any permissions verification before exposing the data
+			 */
+			$extra_metadata = apply_filters('tainacan-api-response-collection-meta', [], $request);
+
+			foreach ($extra_metadata as $extra_meta) {
+				$item_arr[$extra_meta] = get_post_meta($item_arr['id'], $extra_meta, true);
+			}
 			
 			return $item_arr;
         }
diff --git a/src/api/endpoints/class-tainacan-rest-filters-controller.php b/src/api/endpoints/class-tainacan-rest-filters-controller.php
index 83c13fc8c..739abcc0a 100644
--- a/src/api/endpoints/class-tainacan-rest-filters-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-filters-controller.php
@@ -331,6 +331,19 @@ class REST_Filters_Controller extends REST_Controller {
 
 			$item_arr['filter_type_object'] = $item->get_filter_type_object() ? $item->get_filter_type_object()->_toArray() : $item->get_filter_type_object();
 
+			/**
+			 * Use this filter to add additional post_meta to the api response
+			 * Use the $request object to get the context of the request and other variables
+			 * For example, id context is edit, you may want to add your meta or not.
+			 * 
+			 * Also take care to do any permissions verification before exposing the data
+			 */
+			$extra_metadata = apply_filters('tainacan-api-response-filter-meta', [], $request);
+
+			foreach ($extra_metadata as $extra_meta) {
+				$item_arr[$extra_meta] = get_post_meta($item_arr['id'], $extra_meta, true);
+			}
+			
 			return $item_arr;
 		}
 
diff --git a/src/api/endpoints/class-tainacan-rest-items-controller.php b/src/api/endpoints/class-tainacan-rest-items-controller.php
index 298bcd385..de30eabdd 100644
--- a/src/api/endpoints/class-tainacan-rest-items-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-items-controller.php
@@ -183,6 +183,19 @@ class REST_Items_Controller extends REST_Controller {
 			$item_arr['url'] = get_permalink( $item_arr['id'] );
 			$item_arr['exposer_urls'] = \Tainacan\Exposers\Exposers::get_exposer_urls(get_rest_url(null, "{$this->namespace}/{$this->rest_base}/{$item->get_id()}/"));
 			
+			/**
+			 * Use this filter to add additional post_meta to the api response
+			 * Use the $request object to get the context of the request and other variables
+			 * For example, id context is edit, you may want to add your meta or not.
+			 * 
+			 * Also take care to do any permissions verification before exposing the data
+			 */
+			$extra_metadata = apply_filters('tainacan-api-response-item-meta', [], $request);
+
+			foreach ($extra_metadata as $extra_meta) {
+				$item_arr[$extra_meta] = get_post_meta($item_arr['id'], $extra_meta, true);
+			}
+			
 			return $item_arr;
 		}
 
diff --git a/src/api/endpoints/class-tainacan-rest-metadata-controller.php b/src/api/endpoints/class-tainacan-rest-metadata-controller.php
index 3ee3c3f39..0f53071cc 100644
--- a/src/api/endpoints/class-tainacan-rest-metadata-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-metadata-controller.php
@@ -321,6 +321,19 @@ class REST_Metadata_Controller extends REST_Controller {
 				$item_arr['enabled'] = $item->get_enabled_for_collection();
 			}
 
+			/**
+			 * Use this filter to add additional post_meta to the api response
+			 * Use the $request object to get the context of the request and other variables
+			 * For example, id context is edit, you may want to add your meta or not.
+			 * 
+			 * Also take care to do any permissions verification before exposing the data
+			 */
+			$extra_metadata = apply_filters('tainacan-api-response-metadatum-meta', [], $request);
+
+			foreach ($extra_metadata as $extra_meta) {
+				$item_arr[$extra_meta] = get_post_meta($item_arr['id'], $extra_meta, true);
+			}
+			
 			return $item_arr;
 		}
 
diff --git a/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php b/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
index a9c5d64e2..11318daaf 100644
--- a/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
@@ -106,6 +106,19 @@ class REST_Taxonomies_Controller extends REST_Controller {
 				$item_arr = $this->filter_object_by_attributes($item, $attributes_to_filter);
 			}
 
+			/**
+			 * Use this filter to add additional post_meta to the api response
+			 * Use the $request object to get the context of the request and other variables
+			 * For example, id context is edit, you may want to add your meta or not.
+			 * 
+			 * Also take care to do any permissions verification before exposing the data
+			 */
+			$extra_metadata = apply_filters('tainacan-api-response-taxonomy-meta', [], $request);
+
+			foreach ($extra_metadata as $extra_meta) {
+				$item_arr[$extra_meta] = get_post_meta($item_arr['id'], $extra_meta, true);
+			}
+			
 			return $item_arr;
 		}
 
diff --git a/src/api/endpoints/class-tainacan-rest-terms-controller.php b/src/api/endpoints/class-tainacan-rest-terms-controller.php
index 08833e23c..2049cb0f3 100644
--- a/src/api/endpoints/class-tainacan-rest-terms-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-terms-controller.php
@@ -277,6 +277,19 @@ class REST_Terms_Controller extends REST_Controller {
 				$item_arr = $this->filter_object_by_attributes($item, $attributes_to_filter);
 			}
 
+			/**
+			 * Use this filter to add additional term_meta to the api response
+			 * Use the $request object to get the context of the request and other variables
+			 * For example, id context is edit, you may want to add your meta or not.
+			 * 
+			 * Also take care to do any permissions verification before exposing the data
+			 */
+			$extra_metadata = apply_filters('tainacan-api-response-term-meta', [], $request);
+
+			foreach ($extra_metadata as $extra_meta) {
+				$item_arr[$extra_meta] = get_term_meta($item_arr['id'], $extra_meta, true);
+			}
+			
 			return $item_arr;
 		}
 
diff --git a/src/classes/tainacan-creator.php b/src/classes/tainacan-creator.php
index 527e1fdea..e435f7f72 100644
--- a/src/classes/tainacan-creator.php
+++ b/src/classes/tainacan-creator.php
@@ -131,6 +131,10 @@ $Tainacan_Embed = \Tainacan\Embed::get_instance();
 require_once(__DIR__ . '/../admin/class-tainacan-admin.php');
 $Tainacan_Admin = \Tainacan\Admin::get_instance();
 
+require_once(__DIR__ . '/../admin/class-tainacan-admin-hooks.php');
+require_once(__DIR__ . '/../admin/admin-hooks-functions.php');
+$Tainacan_Admin_Hooks = \Tainacan\Admin_Hooks::get_instance();
+
 require_once(__DIR__ . '/../theme-helper/class-tainacan-theme-helper.php');
 require_once(__DIR__ . '/../theme-helper/template-tags.php');
 $Tainacan_Theme_Helper = \Tainacan\Theme_Helper::get_instance();

From 4131ff935953406797805c00fd40729185370569 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Thu, 30 Aug 2018 08:54:41 -0300
Subject: [PATCH 20/31] Continues implementation of plugins.

---
 .../edition/collection-edition-form.vue       | 44 ++++++++++---------
 .../edition/filter-edition-form.vue           | 12 ++---
 .../components/edition/item-edition-form.vue  | 24 +++++-----
 .../edition/metadatum-edition-form.vue        | 12 ++---
 .../edition/taxonomy-edition-form.vue         | 12 ++---
 .../components/edition/term-edition-form.vue  | 12 ++---
 src/admin/js/mixins.js                        | 30 ++++++++-----
 7 files changed, 79 insertions(+), 67 deletions(-)

diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue
index 78023429d..f5fad9dc7 100644
--- a/src/admin/components/edition/collection-edition-form.vue
+++ b/src/admin/components/edition/collection-edition-form.vue
@@ -30,11 +30,11 @@
                     <!-- Hook for extra Form options -->
                     <template 
                             v-if="formHooks != undefined && 
-                                formHooks['form-collection'] != undefined &&
-                                formHooks['form-collection']['begin-left'] != undefined">  
+                                formHooks['collection'] != undefined &&
+                                formHooks['collection']['begin-left'] != undefined">  
                         <form 
                             id="form-collection-begin-left"
-                            v-html="this.formHooks['form-collection']['begin-left'].join('')"/>
+                            v-html="this.formHooks['collection']['begin-left'].join('')"/>
                     </template>
 
                     <!-- Thumbnail -------------------------------- --> 
@@ -234,11 +234,12 @@
                     <!-- Hook for extra Form options -->
                     <template 
                             v-if="formHooks != undefined && 
-                                formHooks['form-collection'] != undefined &&
-                                formHooks['form-collection']['end-left'] != undefined">  
-                        <form 
+                                formHooks['collection'] != undefined &&
+                                formHooks['collection']['end-left'] != undefined">  
+                        <form
+                            ref="form-collection-end-left" 
                             id="form-collection-end-left"
-                            v-html="formHooks['form-collection']['end-left'].join('')"/>
+                            v-html="formHooks['collection']['end-left'].join('')"/>
                     </template>
 
                 </div>
@@ -248,11 +249,11 @@
                     <!-- Hook for extra Form options -->
                     <template 
                             v-if="formHooks != undefined && 
-                                formHooks['form-collection'] != undefined &&
-                                formHooks['form-collection']['begin-right'] != undefined">  
+                                formHooks['collection'] != undefined &&
+                                formHooks['collection']['begin-right'] != undefined">  
                         <form 
                             id="form-collection-begin-right"
-                            v-html="formHooks['form-collection']['begin-right'].join('')"/>
+                            v-html="formHooks['collection']['begin-right'].join('')"/>
                     </template>
 
                     <!-- Status -------------------------------- --> 
@@ -419,11 +420,11 @@
                     <!-- Hook for extra Form options -->
                     <template 
                             v-if="formHooks != undefined && 
-                                formHooks['form-collection'] != undefined &&
-                                formHooks['form-collection']['end-right'] != undefined">  
+                                formHooks['collection'] != undefined &&
+                                formHooks['collection']['end-right'] != undefined">  
                         <form 
                             id="form-collection-end-right"
-                            v-html="formHooks['form-collection']['end-right'].join('')"/>
+                            v-html="formHooks['collection']['end-right'].join('')"/>
                     </template>
                 </div>
 
@@ -611,10 +612,10 @@ export default {
                 this.formErrorMessage = '';
                 this.editFormErrors = {};
 
-                // if (this.fromImporter)
-                //     this.$router.go(-1);
-                // else
-                //     this.$router.push(this.$routerHelper.getCollectionPath(this.collectionId));
+                if (this.fromImporter)
+                    this.$router.go(-1);
+                else
+                    this.$router.push(this.$routerHelper.getCollectionPath(this.collectionId));
             })
             .catch((errors) => {
                 for (let error of errors.errors) {     
@@ -827,9 +828,12 @@ export default {
 
                 // Initializes Media Frames now that collectonId exists
                 this.initializeMediaFrames();
-
-                // Fills hook forms with it's real values 
-                this.updateExtraFormData('collection', this.collection);
+                this.$nextTick()
+                .then(() => {
+                     // Fills hook forms with it's real values 
+                    this.updateExtraFormData('collection', this.collection);
+                });
+               
   
                 // Fill this.form data with current data.
                 this.form.name = this.collection.name;
diff --git a/src/admin/components/edition/filter-edition-form.vue b/src/admin/components/edition/filter-edition-form.vue
index b86c0b4b8..6a4f6fa55 100644
--- a/src/admin/components/edition/filter-edition-form.vue
+++ b/src/admin/components/edition/filter-edition-form.vue
@@ -7,11 +7,11 @@
         <!-- Hook for extra Form options -->
         <template 
                 v-if="formHooks != undefined && 
-                    formHooks['form-filter'] != undefined &&
-                    formHooks['form-filter']['begin'] != undefined">  
+                    formHooks['filter'] != undefined &&
+                    formHooks['filter']['begin-left'] != undefined">  
             <form 
                 id="form-filter-begin"
-                v-html="formHooks['form-filter']['begin'].join('')"/>
+                v-html="formHooks['filter']['begin-left'].join('')"/>
         </template>
 
         <b-field 
@@ -150,11 +150,11 @@
         <!-- Hook for extra Form options -->
         <template 
                 v-if="formHooks != undefined && 
-                    formHooks['form-filter'] != undefined &&
-                    formHooks['form-filter']['end'] != undefined">  
+                    formHooks['filter'] != undefined &&
+                    formHooks['filter']['end-left'] != undefined">  
             <form 
                 id="form-filter-end"
-                v-html="formHooks['form-filter']['end'].join('')"/>
+                v-html="formHooks['filter']['end-left'].join('')"/>
         </template>
 
         <div class="field is-grouped form-submit">
diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index 1e25d7907..bf3ce754d 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -19,11 +19,11 @@
                     <!-- Hook for extra Form options -->
                     <template 
                             v-if="formHooks != undefined && 
-                                formHooks['form-item'] != undefined &&
-                                formHooks['form-item']['begin-left'] != undefined">  
+                                formHooks['item'] != undefined &&
+                                formHooks['item']['begin-left'] != undefined">  
                         <form 
                             id="form-item-begin-left"
-                            v-html="formHooks['form-item']['begin-left'].join('')"/>
+                            v-html="formHooks['item']['begin-left'].join('')"/>
                     </template>
 
                     <!-- Document -------------------------------- -->
@@ -305,11 +305,11 @@
                     <!-- Hook for extra Form options -->
                     <template 
                             v-if="formHooks != undefined && 
-                                formHooks['form-item'] != undefined &&
-                                formHooks['form-item']['end-left'] != undefined">  
+                                formHooks['item'] != undefined &&
+                                formHooks['item']['end-left'] != undefined">  
                         <form 
                             id="form-item-end-left"
-                            v-html="formHooks['form-item']['end-left'].join('')"/>
+                            v-html="formHooks['item']['end-left'].join('')"/>
                     </template>
 
                 </div>
@@ -320,11 +320,11 @@
                     <!-- Hook for extra Form options -->
                     <template 
                             v-if="formHooks != undefined && 
-                                formHooks['form-item'] != undefined &&
-                                formHooks['form-item']['begin-right'] != undefined">  
+                                formHooks['item'] != undefined &&
+                                formHooks['item']['begin-right'] != undefined">  
                         <form 
                             id="form-item-begin-right"
-                            v-html="formHooks['form-item']['begin-right'].join('')"/>
+                            v-html="formHooks['item']['begin-right'].join('')"/>
                     </template>
 
                     
@@ -390,11 +390,11 @@
                     <!-- Hook for extra Form options -->
                     <template 
                             v-if="formHooks != undefined && 
-                                formHooks['form-item'] != undefined &&
-                                formHooks['form-item']['end-right'] != undefined">  
+                                formHooks['item'] != undefined &&
+                                formHooks['item']['end-right'] != undefined">  
                         <form 
                             id="form-item-end-right"
-                            v-html="formHooks['form-item']['end-right'].join('')"/>
+                            v-html="formHooks['item']['end-right'].join('')"/>
                     </template>
                 </div>
             </div>
diff --git a/src/admin/components/edition/metadatum-edition-form.vue b/src/admin/components/edition/metadatum-edition-form.vue
index e2bdebf7d..b98a6a030 100644
--- a/src/admin/components/edition/metadatum-edition-form.vue
+++ b/src/admin/components/edition/metadatum-edition-form.vue
@@ -8,11 +8,11 @@
         <!-- Hook for extra Form options -->
         <template 
                 v-if="formHooks != undefined && 
-                    formHooks['form-metadatum'] != undefined &&
-                    formHooks['form-metadatum']['begin'] != undefined">  
+                    formHooks['metadatum'] != undefined &&
+                    formHooks['metadatum']['begin-left'] != undefined">  
             <form 
                 id="form-metadatum-begin"
-                v-html="formHooks['form-metadatum']['begin'].join('')"/>
+                v-html="formHooks['metadatum']['begin-left'].join('')"/>
         </template>
 
         <b-field
@@ -219,11 +219,11 @@
         <!-- Hook for extra Form options -->
         <template 
                 v-if="formHooks != undefined && 
-                    formHooks['form-metadatum'] != undefined &&
-                    formHooks['form-metadatum']['end'] != undefined">  
+                    formHooks['metadatum'] != undefined &&
+                    formHooks['metadatum']['end-left'] != undefined">  
             <form 
                 id="form-metadatum-end"
-                v-html="formHooks['form-metadatum']['end'].join('')"/>
+                v-html="formHooks['metadatum']['end-left'].join('')"/>
         </template>
 
         <div class="field is-grouped form-submit">
diff --git a/src/admin/components/edition/taxonomy-edition-form.vue b/src/admin/components/edition/taxonomy-edition-form.vue
index 69b3999cd..01c9e38fb 100644
--- a/src/admin/components/edition/taxonomy-edition-form.vue
+++ b/src/admin/components/edition/taxonomy-edition-form.vue
@@ -12,11 +12,11 @@
                         <!-- Hook for extra Form options -->
                         <template 
                                 v-if="formHooks != undefined && 
-                                    formHooks['form-taxonomy'] != undefined &&
-                                    formHooks['form-taxonomy']['begin'] != undefined">  
+                                    formHooks['taxonomy'] != undefined &&
+                                    formHooks['taxonomy']['begin-left'] != undefined">  
                             <form 
                                 id="form-taxonomy-begin"
-                                v-html="formHooks['form-taxonomy']['begin'].join('')"/>
+                                v-html="formHooks['taxonomy']['begin-left'].join('')"/>
                         </template>
 
                         <!-- Name -------------------------------- -->
@@ -112,11 +112,11 @@
                         <!-- Hook for extra Form options -->
                         <template 
                                 v-if="formHooks != undefined && 
-                                    formHooks['form-taxonomy'] != undefined &&
-                                    formHooks['form-taxonomy']['end'] != undefined">  
+                                    formHooks['taxonomy'] != undefined &&
+                                    formHooks['taxonomy']['end-left'] != undefined">  
                             <form 
                                 id="form-taxonomy-end"
-                                v-html="formHooks['form-taxonomy']['end'].join('')"/>
+                                v-html="formHooks['taxonomy']['end-left'].join('')"/>
                         </template>
 
                         <!-- Submit -->
diff --git a/src/admin/components/edition/term-edition-form.vue b/src/admin/components/edition/term-edition-form.vue
index 0aeeebc2f..410b972e6 100644
--- a/src/admin/components/edition/term-edition-form.vue
+++ b/src/admin/components/edition/term-edition-form.vue
@@ -11,11 +11,11 @@
         <!-- Hook for extra Form options -->
         <template 
                 v-if="formHooks != undefined && 
-                    formHooks['form-term'] != undefined &&
-                    formHooks['form-term']['begin'] != undefined">  
+                    formHooks['term'] != undefined &&
+                    formHooks['term']['begin-left'] != undefined">  
             <form 
                 id="form-term-begin"
-                v-html="formHooks['form-term']['begin'].join('')"/>
+                v-html="formHooks['term']['begin-left'].join('')"/>
         </template>
 
         <!-- Header Image -------------------------------- -->
@@ -135,11 +135,11 @@
         <!-- Hook for extra Form options -->
         <template 
                 v-if="formHooks != undefined && 
-                    formHooks['form-term'] != undefined &&
-                    formHooks['form-term']['end'] != undefined">  
+                    formHooks['term'] != undefined &&
+                    formHooks['term']['end-left'] != undefined">  
             <form 
                 id="form-term-end"
-                v-html="formHooks['form-term']['end'].join('')"/>
+                v-html="formHooks['term']['end-left'].join('')"/>
         </template>
 
         <!-- Submit buttons -------------- -->
diff --git a/src/admin/js/mixins.js b/src/admin/js/mixins.js
index b75e977ef..047788145 100644
--- a/src/admin/js/mixins.js
+++ b/src/admin/js/mixins.js
@@ -60,14 +60,12 @@ export const formHooks = {
             let positions  =  [
                 'begin-left', 
                 'begin-right',
-                'begin',
                 'end-left',
-                'end-right',
-                'end'
+                'end-right'
             ];
             // Gets data from existing extra form hooks
             for (let position of positions) {
-                if (this.formHooks['form-' + entity][position] && this.formHooks['form-' + entity][position] != undefined) {
+                if (this.formHooks[entity][position] && this.formHooks[entity][position] != undefined) {
                     let formElement = document.getElementById('form-' + entity + '-' + position);
                     if (formElement) {
                         let formData = new FormData(formElement);   
@@ -82,20 +80,30 @@ export const formHooks = {
             let positions  =  [
                 'begin-left', 
                 'begin-right',
-                'begin',
                 'end-left',
-                'end-right',
-                'end'
+                'end-right'
             ];
             // Gets data from existing extra form hooks
             for (let position of positions) {
-                if (this.formHooks['form-' + entity][position] && this.formHooks['form-' + entity][position] != undefined) {
+                if (this.formHooks[entity][position] && this.formHooks[entity][position] != undefined) {
                     let formElement = document.getElementById('form-' + entity + '-' + position);
+                    console.log(formElement.elements);
                     if (formElement) {
-                        let formData = new FormData(formElement);   
+
+                        for (let element of formElement.elements) {
+                            console.log(entityObject);
+                            for (let key of Object.keys(entityObject)) {
+                                console.log(key, entityObject[key]);
+                                if (element['name'] == key)
+                                    element['value'] = entityObject[key];
+                            }
+                        }
+
+                        let formData = new FormData(formElement); 
                         for (let [key, value] of formData.entries()) {
-                            if (entityObject[key] != undefined && entityObject[key] != null)
-                                value = entityObject[key];
+                            console.log(key, value);
+                            // if (entityObject[key] != undefined && entityObject[key] != null)
+                            //     formData.set(key, entityObject[key]);
                         }
                     }
                 }

From 1ff3e89248422d7f7db6d93d70fb5d0d30c0b904 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Thu, 30 Aug 2018 09:52:22 -0300
Subject: [PATCH 21/31] Handling receiving values from api.

---
 src/admin/js/mixins.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/admin/js/mixins.js b/src/admin/js/mixins.js
index 047788145..8af18deff 100644
--- a/src/admin/js/mixins.js
+++ b/src/admin/js/mixins.js
@@ -87,24 +87,16 @@ export const formHooks = {
             for (let position of positions) {
                 if (this.formHooks[entity][position] && this.formHooks[entity][position] != undefined) {
                     let formElement = document.getElementById('form-' + entity + '-' + position);
-                    console.log(formElement.elements);
                     if (formElement) {
 
                         for (let element of formElement.elements) {
-                            console.log(entityObject);
+                            // console.log(entityObject);
                             for (let key of Object.keys(entityObject)) {
-                                console.log(key, entityObject[key]);
+                                // console.log(key, entityObject[key]);
                                 if (element['name'] == key)
                                     element['value'] = entityObject[key];
                             }
                         }
-
-                        let formData = new FormData(formElement); 
-                        for (let [key, value] of formData.entries()) {
-                            console.log(key, value);
-                            // if (entityObject[key] != undefined && entityObject[key] != null)
-                            //     formData.set(key, entityObject[key]);
-                        }
                     }
                 }
             }

From 14c5206c2161520297d14f9c82eeae06632e8980 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Thu, 30 Aug 2018 15:49:08 -0300
Subject: [PATCH 22/31] Experiments with multiple values to form input.

---
 src/admin/js/mixins.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/admin/js/mixins.js b/src/admin/js/mixins.js
index 8af18deff..88f99cb05 100644
--- a/src/admin/js/mixins.js
+++ b/src/admin/js/mixins.js
@@ -70,6 +70,7 @@ export const formHooks = {
                     if (formElement) {
                         let formData = new FormData(formElement);   
                         for (let [key, value] of formData.entries()) {
+                            console.log(key, value)
                             data[key] = value;
                         }
                     }
@@ -90,12 +91,20 @@ export const formHooks = {
                     if (formElement) {
 
                         for (let element of formElement.elements) {
-                            // console.log(entityObject);
+                            console.log(element['name'], element['value'], element['checked']);
+                            element['value'] = null;
                             for (let key of Object.keys(entityObject)) {
                                 // console.log(key, entityObject[key]);
-                                if (element['name'] == key)
-                                    element['value'] = entityObject[key];
+                                if (element['name'] == key)  {
+                                    if (Array.isArray(entityObject[key])) {
+                                        element['value'].length != undefined ? element['value'] = [] : null;
+                                        element['value'].push(entityObject[key]);
+                                    } else
+                                        element['value'] = entityObject[key];
+                                
+                                }
                             }
+                            console.log(element['name'], element['value'], element['checked']);
                         }
                     }
                 }

From 51d12bffcb51da49bad9a9da260a0d571b9d7ac7 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Mon, 3 Sep 2018 10:34:09 -0300
Subject: [PATCH 23/31] Makes extra form hooks functional for checkboxes and
 radio buttons.

---
 .../edition/collection-edition-form.vue       | 11 ++---
 src/admin/js/mixins.js                        | 44 ++++++++++++-------
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue
index f5fad9dc7..a238d411e 100644
--- a/src/admin/components/edition/collection-edition-form.vue
+++ b/src/admin/components/edition/collection-edition-form.vue
@@ -590,7 +590,8 @@ export default {
             };
             this.fillExtraFormData(data, 'collection');
 
-            this.updateCollection({collection_id: this.collectionId, collection: data }).then(updatedCollection => {    
+            this.updateCollection({collection_id: this.collectionId, collection: data })
+            .then(updatedCollection => {    
                 
                 this.collection = updatedCollection;
 
@@ -829,10 +830,10 @@ export default {
                 // Initializes Media Frames now that collectonId exists
                 this.initializeMediaFrames();
                 this.$nextTick()
-                .then(() => {
-                     // Fills hook forms with it's real values 
-                    this.updateExtraFormData('collection', this.collection);
-                });
+                    .then(() => {
+                        // Fills hook forms with it's real values 
+                        this.updateExtraFormData('collection', this.collection);
+                    });
                
   
                 // Fill this.form data with current data.
diff --git a/src/admin/js/mixins.js b/src/admin/js/mixins.js
index 88f99cb05..dbd8bf923 100644
--- a/src/admin/js/mixins.js
+++ b/src/admin/js/mixins.js
@@ -67,11 +67,21 @@ export const formHooks = {
             for (let position of positions) {
                 if (this.formHooks[entity][position] && this.formHooks[entity][position] != undefined) {
                     let formElement = document.getElementById('form-' + entity + '-' + position);
-                    if (formElement) {
-                        let formData = new FormData(formElement);   
-                        for (let [key, value] of formData.entries()) {
-                            console.log(key, value)
-                            data[key] = value;
+                    
+                    if (formElement) {  
+                        for (let element of formElement.elements) {
+                            if (element.type == "checkbox" || (element.type == "select" && element.multiple != undefined && element.multiple == true)) {
+                                if (element.checked && element.name != undefined && element.name != '') {
+                                    if (!Array.isArray(data[element.name]))
+                                        data[element.name] = [];
+                                    data[element.name].push(element.value);
+                                }
+                            } else if (element.type == "radio") {
+                                if (element.checked && element.name != undefined && element.name != '')
+                                    data[element.name] = element.value;
+                            } else {
+                                data[element.name] = element.value;
+                            }
                         }
                     }
                 }
@@ -88,23 +98,25 @@ export const formHooks = {
             for (let position of positions) {
                 if (this.formHooks[entity][position] && this.formHooks[entity][position] != undefined) {
                     let formElement = document.getElementById('form-' + entity + '-' + position);
-                    if (formElement) {
-
+                    
+                    if (formElement) {   
                         for (let element of formElement.elements) {
-                            console.log(element['name'], element['value'], element['checked']);
-                            element['value'] = null;
                             for (let key of Object.keys(entityObject)) {
-                                // console.log(key, entityObject[key]);
                                 if (element['name'] == key)  {
                                     if (Array.isArray(entityObject[key])) {
-                                        element['value'].length != undefined ? element['value'] = [] : null;
-                                        element['value'].push(entityObject[key]);
-                                    } else
-                                        element['value'] = entityObject[key];
-                                
+                                        let obj = entityObject[key].find((value) => { return value == element['value'] });
+                                        element['checked'] = obj != undefined ? true : false;
+                                    } else {
+                                        if (entityObject[key] != null && entityObject[key] != undefined && entityObject[key] != ''){
+                                            if (element.type == "radio")
+                                                element['checked'] = entityObject[key] == element['value'] ? true : false;
+                                            else 
+                                                element['value'] = entityObject[key];
+                                        }
+                                            
+                                    }
                                 }
                             }
-                            console.log(element['name'], element['value'], element['checked']);
                         }
                     }
                 }

From c8183b79ad19e594a9ebe4892cdb9b9be8c770fe Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Mon, 3 Sep 2018 15:01:31 -0300
Subject: [PATCH 24/31] Allows other form hooks to receive current
 updatedExtraFormData

---
 .../edition/collection-edition-form.vue       | 22 ++++++-------
 .../edition/filter-edition-form.vue           | 31 ++++++++++---------
 .../components/edition/item-edition-form.vue  |  7 +++--
 .../edition/metadatum-edition-form.vue        | 30 ++++++++++--------
 .../edition/taxonomy-edition-form.vue         | 27 +++++++++-------
 .../components/edition/term-edition-form.vue  | 29 +++++++++--------
 src/admin/js/mixins.js                        |  1 -
 7 files changed, 81 insertions(+), 66 deletions(-)

diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue
index a238d411e..a702b6e43 100644
--- a/src/admin/components/edition/collection-edition-form.vue
+++ b/src/admin/components/edition/collection-edition-form.vue
@@ -246,16 +246,6 @@
                 <div class="column is-1" />
                 <div class="column">
 
-                    <!-- Hook for extra Form options -->
-                    <template 
-                            v-if="formHooks != undefined && 
-                                formHooks['collection'] != undefined &&
-                                formHooks['collection']['begin-right'] != undefined">  
-                        <form 
-                            id="form-collection-begin-right"
-                            v-html="formHooks['collection']['begin-right'].join('')"/>
-                    </template>
-
                     <!-- Status -------------------------------- --> 
                     <b-field
                             :addons="false" 
@@ -315,7 +305,17 @@
                             </div>     
                         </div>
                     </b-field>
-                        
+                    
+                    <!-- Hook for extra Form options -->
+                    <template 
+                            v-if="formHooks != undefined && 
+                                formHooks['collection'] != undefined &&
+                                formHooks['collection']['begin-right'] != undefined">  
+                        <form 
+                            id="form-collection-begin-right"
+                            v-html="formHooks['collection']['begin-right'].join('')"/>
+                    </template>
+
                     <!-- Description -------------------------------- --> 
                     <b-field
                             :addons="false" 
diff --git a/src/admin/components/edition/filter-edition-form.vue b/src/admin/components/edition/filter-edition-form.vue
index 6a4f6fa55..d0612eabf 100644
--- a/src/admin/components/edition/filter-edition-form.vue
+++ b/src/admin/components/edition/filter-edition-form.vue
@@ -4,16 +4,6 @@
             class="tainacan-form" 
             @submit.prevent="saveEdition(editForm)">
 
-        <!-- Hook for extra Form options -->
-        <template 
-                v-if="formHooks != undefined && 
-                    formHooks['filter'] != undefined &&
-                    formHooks['filter']['begin-left'] != undefined">  
-            <form 
-                id="form-filter-begin"
-                v-html="formHooks['filter']['begin-left'].join('')"/>
-        </template>
-
         <b-field 
                 :addons="false"
                 :type="formErrors['name'] != undefined ? 'is-danger' : ''" 
@@ -33,6 +23,16 @@
                     @focus="clearErrors('name')"/>
         </b-field>
 
+        <!-- Hook for extra Form options -->
+        <template 
+                v-if="formHooks != undefined && 
+                    formHooks['filter'] != undefined &&
+                    formHooks['filter']['begin-left'] != undefined">  
+            <form 
+                id="form-filter-begin-left"
+                v-html="formHooks['filter']['begin-left'].join('')"/>
+        </template>
+
         <b-field
                 :addons="false" 
                 :type="formErrors['description'] != undefined ? 'is-danger' : ''" 
@@ -153,7 +153,7 @@
                     formHooks['filter'] != undefined &&
                     formHooks['filter']['end-left'] != undefined">  
             <form 
-                id="form-filter-end"
+                id="form-filter-end-left"
                 v-html="formHooks['filter']['end-left'].join('')"/>
         </template>
 
@@ -204,10 +204,13 @@ export default {
         this.formErrorMessage = this.editForm.formErrors != undefined ? this.editForm.formErrorMessage : ''; 
 
         this.oldForm = JSON.parse(JSON.stringify(this.originalFilter));
-
+    },
+    mounted() {
         // Fills hook forms with it's real values 
-        this.updateExtraFormData('filter', this.editForm);
-  
+        this.$nextTick()
+            .then(() => {
+                this.updateExtraFormData('filter', this.editForm);
+            });
     },
     beforeDestroy() {
         if (this.closedByForm) {
diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index bf3ce754d..c0434b2c4 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -850,8 +850,11 @@ export default {
                 this.item = res;
 
                 // Fills hook forms with it's real values 
-                this.updateExtraFormData('item', this.item);
-
+                this.$nextTick()
+                    .then(() => {
+                        this.updateExtraFormData('item', this.item);
+                    });
+                    
                 // Fill this.form data with current data.
                 this.form.status = this.item.status;
                 this.form.document = this.item.document;
diff --git a/src/admin/components/edition/metadatum-edition-form.vue b/src/admin/components/edition/metadatum-edition-form.vue
index b98a6a030..f35caee8c 100644
--- a/src/admin/components/edition/metadatum-edition-form.vue
+++ b/src/admin/components/edition/metadatum-edition-form.vue
@@ -5,16 +5,6 @@
             :class="{ 'inCollapse': !isOnModal }"
             @submit.prevent="saveEdition(editForm)">
 
-        <!-- Hook for extra Form options -->
-        <template 
-                v-if="formHooks != undefined && 
-                    formHooks['metadatum'] != undefined &&
-                    formHooks['metadatum']['begin-left'] != undefined">  
-            <form 
-                id="form-metadatum-begin"
-                v-html="formHooks['metadatum']['begin-left'].join('')"/>
-        </template>
-
         <b-field
                 :addons="false"
                 :type="formErrors['name'] != undefined ? 'is-danger' : ''"
@@ -34,6 +24,16 @@
                     @focus="clearErrors('name')"/>
         </b-field>
 
+        <!-- Hook for extra Form options -->
+        <template 
+                v-if="formHooks != undefined && 
+                    formHooks['metadatum'] != undefined &&
+                    formHooks['metadatum']['begin-left'] != undefined">  
+            <form 
+                id="form-metadatum-begin-left"
+                v-html="formHooks['metadatum']['begin-left'].join('')"/>
+        </template>
+
         <b-field
                 :addons="false"
                 :type="formErrors['description'] != undefined ? 'is-danger' : ''"
@@ -222,7 +222,7 @@
                     formHooks['metadatum'] != undefined &&
                     formHooks['metadatum']['end-left'] != undefined">  
             <form 
-                id="form-metadatum-end"
+                id="form-metadatum-end-left"
                 v-html="formHooks['metadatum']['end-left'].join('')"/>
         </template>
 
@@ -278,9 +278,13 @@
 
             this.oldForm = JSON.parse(JSON.stringify(this.originalMetadatum));
 
+        },
+        mounted() {
             // Fills hook forms with it's real values 
-            this.updateExtraFormData('metadatum', this.editForm);
-
+            this.$nextTick()
+                .then(() => {
+                    this.updateExtraFormData('metadatum', this.editForm);
+                });
         },
         beforeDestroy() {
             if (this.closedByForm) {
diff --git a/src/admin/components/edition/taxonomy-edition-form.vue b/src/admin/components/edition/taxonomy-edition-form.vue
index 01c9e38fb..e1411c879 100644
--- a/src/admin/components/edition/taxonomy-edition-form.vue
+++ b/src/admin/components/edition/taxonomy-edition-form.vue
@@ -9,16 +9,6 @@
                             class="tainacan-form" 
                             label-width="120px">
 
-                        <!-- Hook for extra Form options -->
-                        <template 
-                                v-if="formHooks != undefined && 
-                                    formHooks['taxonomy'] != undefined &&
-                                    formHooks['taxonomy']['begin-left'] != undefined">  
-                            <form 
-                                id="form-taxonomy-begin"
-                                v-html="formHooks['taxonomy']['begin-left'].join('')"/>
-                        </template>
-
                         <!-- Name -------------------------------- -->
                         <b-field
                                 :addons="false"
@@ -35,6 +25,16 @@
                                     @blur="updateSlug()"/>
                         </b-field>
 
+                        <!-- Hook for extra Form options -->
+                        <template 
+                                v-if="formHooks != undefined && 
+                                    formHooks['taxonomy'] != undefined &&
+                                    formHooks['taxonomy']['begin-left'] != undefined">  
+                            <form 
+                                id="form-taxonomy-begin-left"
+                                v-html="formHooks['taxonomy']['begin-left'].join('')"/>
+                        </template>
+
                         <!-- Description -------------------------------- -->
                         <b-field
                                 :addons="false"
@@ -115,7 +115,7 @@
                                     formHooks['taxonomy'] != undefined &&
                                     formHooks['taxonomy']['end-left'] != undefined">  
                             <form 
-                                id="form-taxonomy-end"
+                                id="form-taxonomy-end-left"
                                 v-html="formHooks['taxonomy']['end-left'].join('')"/>
                         </template>
 
@@ -362,7 +362,10 @@
                     this.taxonomy = res.taxonomy;
 
                     // Fills hook forms with it's real values 
-                    this.updateExtraFormData('taxonomy', this.taxonomy);
+                    this.$nextTick()
+                        .then(() => {
+                            this.updateExtraFormData('taxonomy', this.taxonomy);
+                        });
 
                     // Fill this.form data with current data.
                     this.form.name = this.taxonomy.name;
diff --git a/src/admin/components/edition/term-edition-form.vue b/src/admin/components/edition/term-edition-form.vue
index 410b972e6..830202541 100644
--- a/src/admin/components/edition/term-edition-form.vue
+++ b/src/admin/components/edition/term-edition-form.vue
@@ -8,16 +8,6 @@
             <hr>
         </div>
 
-        <!-- Hook for extra Form options -->
-        <template 
-                v-if="formHooks != undefined && 
-                    formHooks['term'] != undefined &&
-                    formHooks['term']['begin-left'] != undefined">  
-            <form 
-                id="form-term-begin"
-                v-html="formHooks['term']['begin-left'].join('')"/>
-        </template>
-
         <!-- Header Image -------------------------------- -->
         <b-field
                 :addons="false"
@@ -73,6 +63,16 @@
                     @focus="clearErrors({ name: 'name', repeated: 'repeated' })"/>
         </b-field>
 
+        <!-- Hook for extra Form options -->
+        <template 
+                v-if="formHooks != undefined && 
+                    formHooks['term'] != undefined &&
+                    formHooks['term']['begin-left'] != undefined">  
+            <form 
+                id="form-term-begin-left"
+                v-html="formHooks['term']['begin-left'].join('')"/>
+        </template>
+
         <!-- Description -------------- -->
         <b-field
                 :addons="false"
@@ -138,7 +138,7 @@
                     formHooks['term'] != undefined &&
                     formHooks['term']['end-left'] != undefined">  
             <form 
-                id="form-term-end"
+                id="form-term-end-left"
                 v-html="formHooks['term']['end-left'].join('')"/>
         </template>
 
@@ -343,8 +343,11 @@
         mounted() {
             
             // Fills hook forms with it's real values 
-            this.updateExtraFormData('term', this.editForm);
- 
+            this.$nextTick()
+                .then(() => {
+                    this.updateExtraFormData('term', this.editForm);
+                });
+
             this.showCheckboxesWarning = false;
             this.hasParent = this.editForm.parent != undefined && this.editForm.parent > 0;
             this.initialParentId = this.editForm.parent;
diff --git a/src/admin/js/mixins.js b/src/admin/js/mixins.js
index dbd8bf923..1565d3aaa 100644
--- a/src/admin/js/mixins.js
+++ b/src/admin/js/mixins.js
@@ -67,7 +67,6 @@ export const formHooks = {
             for (let position of positions) {
                 if (this.formHooks[entity][position] && this.formHooks[entity][position] != undefined) {
                     let formElement = document.getElementById('form-' + entity + '-' + position);
-                    
                     if (formElement) {  
                         for (let element of formElement.elements) {
                             if (element.type == "checkbox" || (element.type == "select" && element.multiple != undefined && element.multiple == true)) {

From c777a677e2791552bd6480a72aaf54b8bf86e68b Mon Sep 17 00:00:00 2001
From: Leo Germani <leogermani@hacklab.com.br>
Date: Tue, 4 Sep 2018 14:09:19 -0300
Subject: [PATCH 25/31] Add /items rewrite rule to list all items in repository
 #118

---
 docs/custom-templates.md                      |  7 ++-
 src/migrations.php                            |  5 ++
 .../class-tainacan-theme-helper.php           | 56 +++++++++++++++++++
 src/theme-helper/template-tags.php            |  6 +-
 4 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/docs/custom-templates.md b/docs/custom-templates.md
index ebbdfc44b..5c25c0c11 100644
--- a/docs/custom-templates.md
+++ b/docs/custom-templates.md
@@ -2,15 +2,16 @@
 
 Notes for a future documentation
 
-Tainacan uses the ordinary WordPress template hierarchy for its templates. It adds only 3 additional templates in your hierarchy
+Tainacan uses the ordinary WordPress template hierarchy for its templates. It adds additional templates in the hierarchy
 
 * `tainacan/single-items.php` - Used in the single template for any item of any collection
-* `tainacan/arhive-items.php` - Used in the list of items of any collection
+* `tainacan/arhive-items.php` - Used in the list of items of any collection (e.g. both archive-tnc_col_4_item.php and archive-tnc_col_5_item.php)
 * `tainacan/archive-taxonomy.php` - Used as a template for all Tainacan Taxonomies (list items based on a term)
+* `tainacan/archive-repository.php` - Used in the `/items/` URL, which is added by the Tainacan plugin, and lists all items of all collections
 
 Since each collection is a new custom post type, these templates are usefull to create a template that will be used by all collections.
 
-Nevertheless, you are still able to create more specific templates, using the standar WordPress hierarchy.
+Nevertheless, you are still able to create more specific templates, using the standard WordPress hierarchy.
 
 Examples:
 
diff --git a/src/migrations.php b/src/migrations.php
index 7467d4e69..181add03e 100644
--- a/src/migrations.php
+++ b/src/migrations.php
@@ -279,6 +279,11 @@ class Migrations {
 		flush_rewrite_rules(false);
 	}
 	
+	static function refresh_rewrite_rules_items() {
+		// needed after we added the /items rewrite rule
+		flush_rewrite_rules(false);
+	}
+	
 }
 
 
diff --git a/src/theme-helper/class-tainacan-theme-helper.php b/src/theme-helper/class-tainacan-theme-helper.php
index c773f3525..b957e8a28 100644
--- a/src/theme-helper/class-tainacan-theme-helper.php
+++ b/src/theme-helper/class-tainacan-theme-helper.php
@@ -49,6 +49,13 @@ class Theme_Helper {
 		add_filter('get_the_archive_title', array($this, 'filter_archive_title'));
 
 		add_shortcode( 'tainacan-search', array($this, 'search_shortcode'));
+		
+		add_action( 'generate_rewrite_rules', array( &$this, 'rewrite_rules' ), 10, 1 );
+		add_filter( 'query_vars', array( &$this, 'rewrite_rules_query_vars' ) );
+		add_filter( 'template_include', array( &$this, 'rewrite_rule_template_include' ) );
+		add_action( 'pre_get_posts', array($this, 'archive_repository_pre_get_posts'));
+		// TODO: fix the WP Title 
+		// add_filter( 'wp_title', array($this, 'archive_repository_wp_title'), 10, 3);
 
 		$this->register_view_mode('table', [
 			'label' => __('Table', 'tainacan'),
@@ -112,7 +119,12 @@ class Theme_Helper {
 			if (in_array($current_post_type, $collections_post_types)) {
 				$title = sprintf( __( 'Collection: %s' ), post_type_archive_title( '', false ) );
 			}
+		} elseif (is_archive()) {
+			if (get_query_var('tainacan_repository_archive') == 1) {
+				$title = __( 'All items in repository', 'tainacan' );
+			}
 		}
+		
 		return $title;
 	}
 
@@ -323,6 +335,50 @@ class Theme_Helper {
 		return "<div id='tainacan-items-page' $params ></div>";
 
 
+	}
+	
+	function rewrite_rules( &$wp_rewrite ) {
+        
+        /* Translators: The Items slug - will be the URL for the repository archive */
+		$items_base = sanitize_title(_x('items', 'Slug: the string that will be used to build the URL to list all items of the repository', 'tainacan'));
+		
+		$new_rules = array(
+            $items_base . "/?$"               => "index.php?tainacan_repository_archive=1",
+			$items_base . "/page/([0-9]+)/?$" => 'index.php?tainacan_repository_archive=1&paged=$matches[1]'
+        );
+
+        $wp_rewrite->rules = $new_rules + $wp_rewrite->rules;
+    }
+
+    function rewrite_rules_query_vars( $public_query_vars ) {
+        $public_query_vars[] = "tainacan_repository_archive";
+        return $public_query_vars;
+    }
+
+    function rewrite_rule_template_include( $template ) {
+        global $wp_query;
+        if ( $wp_query->get( 'tainacan_repository_archive' ) == 1 ) {
+
+            $templates = apply_filters('tainacan_repository_archive_template_hierarchy', ['tainacan/archive-repository.php', 'index.php']);
+			
+			return locate_template($templates, false);
+			
+        }
+        return $template;
+    }
+	
+	function archive_repository_pre_get_posts($wp_query) {
+		if (!$wp_query->is_main_query() || $wp_query->get( 'tainacan_repository_archive' ) != 1)
+			return;
+		
+		$wp_query->set( 'is_archive', true );
+		$wp_query->set( 'is_post_type_archive', false );
+		$wp_query->set( 'is_home', false );
+		$wp_query->is_home = false;
+		$wp_query->is_post_type_archive = false;
+		$wp_query->is_archive = true;
+		$wp_query->set( 'post_type', \Tainacan\Repositories\Repository::get_collections_db_identifiers() );
+		
 	}
 
 	/**
diff --git a/src/theme-helper/template-tags.php b/src/theme-helper/template-tags.php
index cd53d40c3..6ff069918 100644
--- a/src/theme-helper/template-tags.php
+++ b/src/theme-helper/template-tags.php
@@ -1,3 +1,4 @@
+
 <?php 
 
 use \Tainacan\Entities;
@@ -181,7 +182,6 @@ function tainacan_the_collection_description() {
 function tainacan_the_faceted_search() {
 
 	$props = ' ';
-	$id = '';
 	
 	// if in a collection page
 	$collection_id = tainacan_get_collection_id();
@@ -190,7 +190,6 @@ function tainacan_the_faceted_search() {
 		$collection = new  \Tainacan\Entities\Collection($collection_id);
 		$props .= 'default-view-mode="' . $collection->get_default_view_mode() . '" ';
 		$props .= 'enabled-view-modes="' . implode(',', $collection->get_enabled_view_modes()) . '" ';
-		$id = 'tainacan-items-page';
 	}
 	
 	// if in a tainacan taxonomy
@@ -198,10 +197,9 @@ function tainacan_the_faceted_search() {
 	if ($term) {
 		$props .= 'term-id="' . $term->term_id . '" ';
 		$props .= 'taxonomy="' . $term->taxonomy . '" ';
-		$id = 'tainacan-items-page';
 	}
 
-	echo "<div id='$id' $props ></div>";
+	echo "<div id='tainacan-items-page' $props ></div>";
 
 }
 

From 930c1ca479b3b3618fb917ec7dd293a9c206dd5f Mon Sep 17 00:00:00 2001
From: weryques <weryques@outlook.com>
Date: Tue, 4 Sep 2018 15:20:31 -0300
Subject: [PATCH 26/31] A lot of improvements in bulk edition modal (#18):

add the number of items to the label: Select all 123 items
add more margin to the left
in the actions dropdown: edit selected first, send to trash below
redefine. change label to "set new value". should have only one input text
add "value" to all action labels. Set new value, Add value, Remove value
---
 .../bulk-edition/bulk-edition-modal.vue       | 77 ++++++++++++++++---
 src/admin/components/lists/items-list.vue     | 25 +++---
 src/admin/tainacan-admin-i18n.php             | 16 ++--
 .../filter-types/checkbox/Checkbox.vue        |  6 +-
 4 files changed, 91 insertions(+), 33 deletions(-)

diff --git a/src/admin/components/bulk-edition/bulk-edition-modal.vue b/src/admin/components/bulk-edition/bulk-edition-modal.vue
index 3c00ec6e8..88aea6397 100644
--- a/src/admin/components/bulk-edition/bulk-edition-modal.vue
+++ b/src/admin/components/bulk-edition/bulk-edition-modal.vue
@@ -16,6 +16,7 @@
                         class="tainacan-bulk-edition-inline-fields">
 
                     <b-select
+                            :loading="metadataIsLoading"
                             :class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
                             :disabled="!!bulkEditionProcedures[criterion].metadatumID"
                             class="tainacan-bulk-edition-field tainacan-bulk-edition-field-not-last"
@@ -56,6 +57,7 @@
                             <option
                                     v-for="(edtAct, key) in editionActionsForNotMultiple"
                                     :value="edtAct"
+                                    :selected="Object.keys(editionActionsForNotMultiple).length === 1"
                                     :key="key">
                                 {{ edtAct }}
                             </option>
@@ -140,7 +142,7 @@
                                  .metadata_type_options.allow_new_terms === 'yes'"
                                 :maxtags="1"
                                 :class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
-                                :disabled="bulkEditionProcedures[criterion].isDone"
+                                :disabled="bulkEditionProcedures[criterion].isDone || bulkEditionProcedures[criterion].isExecuting"
                                 :id="getMetadataByID(bulkEditionProcedures[criterion].metadatumID).metadata_type_object.component +
                              '-' + getMetadataByID(bulkEditionProcedures[criterion].metadatumID).slug"
                                 :is="getMetadataByID(bulkEditionProcedures[criterion].metadatumID).metadata_type_object.component"
@@ -173,7 +175,11 @@
                                 class="is-pulled-right">
                             <b-tooltip
                                     class="is-success"
-                                    :label="actionResult.constructor.name !== 'Object' && actionResult === 1 ? `${actionResult} ${$i18n.get('info_item_edited')}` : `${actionResult} ${$i18n.get('info_items_edited')}`">
+                                    size="is-small"
+                                    position="is-left"
+                                    animated
+                                    multilined
+                                    :label="actionResult.constructor.name !== 'Object' && actionResult === 1 ? `${actionResult} ${$i18n.get('info_item_affected')}` : `${actionResult} ${$i18n.get('info_items_affected')}`">
                                 <b-icon
                                         type="is-success"
                                         icon="check-circle"/>
@@ -184,6 +190,10 @@
                                 class="is-pulled-right">
                             <b-tooltip
                                     class="is-danger"
+                                    size="is-small"
+                                    position="is-left"
+                                    animated
+                                    multilined
                                     :label="actionResult.constructor.name === 'Object' ? (actionResult.error_message ? actionResult.error_message : actionResult.message) : ''">
                                 <b-icon
                                         type="is-danger"
@@ -191,6 +201,7 @@
                             </b-tooltip>
                         </div>
                         <button
+                                :disabled="!groupID"
                                 v-if="!bulkEditionProcedures[criterion].isDone &&
                                  !bulkEditionProcedures[criterion].isExecuting &&
                                    bulkEditionProcedures[criterion].metadatumID &&
@@ -233,11 +244,11 @@
             <footer class="field is-grouped form-submit">
                 <div class="control">
                     <button
-                            @click="$parent.close()"
+                            @click="$eventBusSearch.loadItems(); $parent.close()"
                             :disabled="(Object.keys(bulkEditionProcedures).length &&
                              bulkEditionProcedures[editionCriteria[editionCriteria.length-1]].isExecuting) || false"
                             type="button"
-                            class="button">
+                            class="button is-outlined">
                         {{ $i18n.get('close') }}
                     </button>
                 </div>
@@ -247,7 +258,7 @@
                             class="button is-success"
                             type="button"
                             @click="$eventBusSearch.loadItems(); $parent.close();">
-                        {{ $i18n.get('conclude') }}
+                        {{ $i18n.get('done') }}
                     </button>
                 </div>
             </footer>
@@ -264,18 +275,38 @@
             modalTitle: String,
             totalItems: Array,
             objectType: String,
-            metadata: Array,
             selectedForBulk: Object,
             collectionID: Number,
         },
         created(){
+            if(!this.collectionID){
+                // is repository level
+
+            } else {
+                this.metadataIsLoading = true;
+
+                this.fetchMetadata({
+                    collectionId: this.collectionID,
+                    isRepositoryLevel: false,
+                    isContextEdit: true,
+                    includeDisabled: true,
+                }).then(() => {
+                    this.metadataIsLoading = false;
+                });
+            }
+
             this.createEditGroup({
                 object: this.selectedForBulk,
-                collectionID: this.collectionID
+                collectionID: this.collectionID ? this.collectionID : 'default'
             }).then(() => {
                 this.groupID = this.getGroupID();
             });
         },
+        computed: {
+            metadata() {
+                return this.getMetadata();
+            }
+        },
         data() {
             return {
                 statuses: {
@@ -285,13 +316,13 @@
                 },
                 editionCriteria: [1],
                 editionActionsForMultiple: {
-                    add: this.$i18n.get('add'),
-                    redefine: this.$i18n.get('redefine'),
-                    remove: this.$i18n.get('remove'),
-                    replace: this.$i18n.get('replace'),
+                    add: this.$i18n.get('add_value'),
+                    redefine: this.$i18n.get('set_new_value'),
+                    remove: this.$i18n.get('remove_value'),
+                    replace: this.$i18n.get('replace_value'),
                 },
                 editionActionsForNotMultiple: {
-                    redefine: this.$i18n.get('redefine'),
+                    redefine: this.$i18n.get('set_new_value'),
                 },
                 bulkEditionProcedures: {
                     1: {
@@ -304,6 +335,7 @@
                 dones: [false],
                 totalItemsEditedWithSuccess: 0,
                 actionResult: '',
+                metadataIsLoading: false,
             }
         },
         methods: {
@@ -320,6 +352,12 @@
                 'setStatusInBulk',
                 'removeValueInBulk'
             ]),
+            ...mapActions('metadata', [
+                'fetchMetadata'
+            ]),
+            ...mapGetters('metadata', [
+                'getMetadata'
+            ]),
             finalizeProcedure(criterion, withError){
                 this.$set(this.bulkEditionProcedures[criterion], 'isDone', !withError);
                 this.$set(this.bulkEditionProcedures[criterion], 'isDoneWithError', withError);
@@ -509,6 +547,21 @@
 
     @import '../../scss/_variables.scss';
 
+    @media screen and (max-width: 768px) {
+        .tainacan-bulk-edition-inline-fields {
+            flex-direction: column !important;
+
+            .tainacan-bulk-edition-field:not(:first-child) {
+                padding-left: 0 !important;
+            }
+
+            .buttons-r-bulk {
+                margin-left: 0 !important;
+                justify-content: center !important;
+            }
+        }
+    }
+
     .tainacan-modal-content {
         border-radius: 10px;
         min-height: 400px;
diff --git a/src/admin/components/lists/items-list.vue b/src/admin/components/lists/items-list.vue
index 2b9c5ce40..7229d3ec5 100644
--- a/src/admin/components/lists/items-list.vue
+++ b/src/admin/components/lists/items-list.vue
@@ -6,14 +6,19 @@
                 <span>
                     <b-checkbox
                             @click.native="selectAllItemsOnPage()"
-                            :value="allItemsOnPageSelected">{{ $i18n.get('label_select_all_items_page') }}</b-checkbox>
+                            :value="allItemsOnPageSelected">
+                        {{ $i18n.get('label_select_all_items_page') }}
+                    </b-checkbox>
                 </span>
 
-                <span v-if="allItemsOnPageSelected">
+                <span
+                        style="margin-left: 10px"
+                        v-if="allItemsOnPageSelected && items.length > 1">
                     <b-checkbox
                             @click.native="selectAllItems()"
-                            v-model="isAllItemsSelected">{{ $i18n.get('label_select_all_items') }}</b-checkbox>
-                    <small v-if="isAllItemsSelected">{{ `(${ totalItems } ${ $i18n.get('info_items_selected') })` }}</small>
+                            v-model="isAllItemsSelected">
+                        {{ `${$i18n.get('label_select_all')} ${totalItems} ${$i18n.get('items').toLowerCase()}` }}
+                    </b-checkbox>
                 </span>
             </div>
             <div class="field is-pulled-right">
@@ -28,17 +33,18 @@
                             slot="trigger">
                         <span>{{ $i18n.get('label_bulk_actions') }}</span>
                         <b-icon icon="menu-down"/>
-                    </button> 
+                    </button>
 
+                    <b-dropdown-item
+                            v-if="$route.params.collectionId && $userCaps.hasCapability('edit_others_posts')"
+                            @click="openBulkEditionModal()">
+                        {{ $i18n.get('label_edit_selected_items') }}
+                    </b-dropdown-item>
                     <b-dropdown-item 
                             @click="deleteSelectedItems()"
                             id="item-delete-selected-items">
                         {{ isOnTrash ? $i18n.get('label_delete_permanently') : $i18n.get('label_send_to_trash') }}
                     </b-dropdown-item>
-                    <b-dropdown-item
-                            @click="openBulkEditionModal()">
-                        {{ $i18n.get('label_edit_selected_items') }}
-                    </b-dropdown-item>
                 </b-dropdown>
             </div>
         </div>
@@ -624,7 +630,6 @@ export default {
                     totalItems: Object.keys(this.queryAllItemsSelected).length ? this.totalItems : this.selectedItemsIDs.filter(item => item !== false).length,
                     selectedForBulk: Object.keys(this.queryAllItemsSelected).length ? this.queryAllItemsSelected : this.selectedItemsIDs.filter(item => item !== false),
                     objectType: this.$i18n.get('items'),
-                    metadata: this.tableMetadata,
                     collectionID: this.$route.params.collectionId,
                 },
                 width: 'calc(100% - 8.333333333%)',
diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php
index 7b4bcfc1e..92d9544a7 100644
--- a/src/admin/tainacan-admin-i18n.php
+++ b/src/admin/tainacan-admin-i18n.php
@@ -37,11 +37,11 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'edit'                                           => __( 'Edit', 'tainacan' ),
 	'settings'                                       => __( 'Settings', 'tainacan' ),
 	'new'                                            => __( 'New', 'tainacan' ),
-	'add'                                            => __( 'Add', 'tainacan' ),
+	'add_value'                                      => __( 'Add value', 'tainacan' ),
 	'import'                                         => __( 'Import', 'tainacan' ),
 	'export'                                         => __( 'Export', 'tainacan' ),
 	'cancel'                                         => __( 'Cancel', 'tainacan' ),
-	'remove'                                         => __( 'Remove', 'tainacan' ),
+	'remove_value'                                   => __( 'Remove value', 'tainacan' ),
 	'save'                                           => __( 'Save', 'tainacan' ),
 	'next'                                           => __( 'Next', 'tainacan' ),
 	'back'                                           => __( 'Back', 'tainacan' ),
@@ -67,9 +67,9 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'apply'                                          => __( 'Apply', 'tainacan' ),
 	'add_another_edition_criterion'                  => __( 'Add another edition criterion', 'tainacan' ),
 	'add_one_edition_criterion'                      => __( 'Add one edition criterion', 'tainacan' ),
-	'redefine'                                       => __( 'Redefine', 'tainacan' ),
-	'replace'                                        => __( 'Replace', 'tainacan' ),
-	'conclude'                                       => __( 'Conclude', 'tainacan' ),
+	'set_new_value'                                  => __( 'Set new value', 'tainacan' ),
+	'replace_value'                                  => __( 'Replace value', 'tainacan' ),
+	'done'                                           => __( 'Done', 'tainacan' ),
 	'select_to_create'                               => __( 'select to create', 'tainacan' ),
 
 	// Wordpress Status
@@ -292,7 +292,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'label_log_file'                                 => __( 'Log file', 'tainacan' ),
 	'label_error_log_file'	                     	 => __( 'Error Log file', 'tainacan' ),
 	'label_import_items'	                     	 => __( 'Import items', 'tainacan' ),
-	'label_select_all_items'                         => __( 'Select all items', 'tainacan' ),
+	'label_select_all'                               => __( 'Select all', 'tainacan' ),
 
 	// Instructions. More complex sentences to guide user and placeholders
 	'instruction_delete_selected_collections'        => __( 'Delete selected collections', 'tainacan' ),
@@ -430,8 +430,8 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_editing_items_in_bulk'                     => __( 'Editing items in bulk', 'tainacan' ),
 	'info_by_inner'                                  => __( 'by', 'tainacan' ),
 	'info_items_selected'                            => __( 'items selected', 'tainacan' ),
-	'info_items_edited'                              => __( 'items edited', 'tainacan' ),
-	'info_item_edited'                               => __( 'item edited', 'tainacan'),
+	'info_items_affected'                            => __( 'items affected', 'tainacan' ),
+	'info_item_affected'                             => __( 'item affected', 'tainacan'),
 	'info_no_parent_term_found'                      => __( 'No valid parent term was found with this name.', 'tainacan' ),
 	'info_warning_changing_parent_term'              => __( 'Warning! Changing parent term will reload the terms list, thus uncheking any selection.', 'tainacan' ),
 
diff --git a/src/classes/filter-types/checkbox/Checkbox.vue b/src/classes/filter-types/checkbox/Checkbox.vue
index 52324600a..3ee12a258 100644
--- a/src/classes/filter-types/checkbox/Checkbox.vue
+++ b/src/classes/filter-types/checkbox/Checkbox.vue
@@ -156,10 +156,10 @@
 
                 if(!isNaN(this.selected[0])){
                     for (let option of this.options) {
-                        let valueIndex = this.selected.findIndex(item => item == option.value);
+                        let value = this.selected.find(item => item == option.value);
 
-                        if (valueIndex >= 0) {
-                            onlyLabels.push(this.options[valueIndex].label);
+                        if (value != undefined) {
+                            onlyLabels.push(option.label);
                         }
                     }
                 }

From 591625d1ffb7e7855b1a9556e0806abd04d68648 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Tue, 4 Sep 2018 14:15:02 -0300
Subject: [PATCH 27/31] Adjusts selec arrow in filters list.

---
 src/classes/filter-types/tainacan-filter-item.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/classes/filter-types/tainacan-filter-item.vue b/src/classes/filter-types/tainacan-filter-item.vue
index 8876b85d2..f634b2e2f 100644
--- a/src/classes/filter-types/tainacan-filter-item.vue
+++ b/src/classes/filter-types/tainacan-filter-item.vue
@@ -162,9 +162,6 @@
                 }
             }
         }
-        .select:not(.is-loading)::after {
-            margin-top: -12px !important;
-        }
 
         .collapse-trigger {
             margin-left: -5px;

From 94144763ed7684b5146853fb22b0d2c1d4c3663d Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Tue, 4 Sep 2018 15:23:26 -0300
Subject: [PATCH 28/31] Begins implementation of repository level items list on
 theme.

---
 src/admin/js/theme-main.js     | 6 +++---
 src/admin/theme-items-list.vue | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/admin/js/theme-main.js b/src/admin/js/theme-main.js
index 0c03e8ad9..9bdfaa462 100644
--- a/src/admin/js/theme-main.js
+++ b/src/admin/js/theme-main.js
@@ -110,9 +110,9 @@ export const ThemeItemsListing =  new Vue({
     },
     render: h => h(ThemeItemsList),
     beforeMount () {
-
-        if (this.$el.attributes['collection-id'] != undefined)
-            this.collectionId = this.$el.attributes['collection-id'].value;
+        console.log("oie")
+        //if (this.$el.attributes['collection-id'] != undefined)
+        this.collectionId = this.$el.attributes['collection-id'].value;
         if (this.$el.attributes['default-view-mode'] != undefined)
             this.defaultViewMode = this.$el.attributes['default-view-mode'].value;
         if (this.$el.attributes['enabled-view-modes'] != undefined)
diff --git a/src/admin/theme-items-list.vue b/src/admin/theme-items-list.vue
index 6617e5dc8..d443bd966 100644
--- a/src/admin/theme-items-list.vue
+++ b/src/admin/theme-items-list.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
     <items-page
-            v-if="$root.collectionId != undefined && $root.collectionId != ''"
+            v-if="$root.termId == undefined || $root.termId == ''"
             class="theme-items-list"
             :enabled-view-modes="$root.enabledViewModes" 
             :default-view-mode="$root.defaultViewMode"
@@ -20,6 +20,7 @@
 export default {
     name: "ThemeItemsList",
     created() {
+        console.log("oi")
         this.$userPrefs.init(); 
     }
 }

From f6ad2f32756047fb8af4597cea841800577e402c Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Tue, 4 Sep 2018 16:25:48 -0300
Subject: [PATCH 29/31] Prevents breaking form hooks when theme is not updated.
 Bulk edition second select now automatically selects when only one option is
 available.

---
 .../components/bulk-edition/bulk-edition-modal.vue   | 12 +++++++++++-
 src/admin/js/mixins.js                               |  4 ++--
 src/admin/js/theme-main.js                           |  5 ++---
 src/admin/theme-items-list.vue                       |  1 -
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/admin/components/bulk-edition/bulk-edition-modal.vue b/src/admin/components/bulk-edition/bulk-edition-modal.vue
index 88aea6397..b3364819a 100644
--- a/src/admin/components/bulk-edition/bulk-edition-modal.vue
+++ b/src/admin/components/bulk-edition/bulk-edition-modal.vue
@@ -25,11 +25,13 @@
                         <template 
                                 v-for="(metadatum, index) in metadata">
                             <option
+                                    :key="index"
                                     v-if="metadatum.id"
                                     :value="metadatum.id">
                                 {{ metadatum.name }}
                             </option>
                             <option
+                                    :key="index"
                                     v-if="index === Object.keys(metadata).length-1"
                                     value="status">
                                 {{ $i18n.get('label_status') }}
@@ -42,6 +44,7 @@
                             v-if="bulkEditionProcedures[criterion] &&
                             bulkEditionProcedures[criterion].metadatumID"
                             :disabled="!!bulkEditionProcedures[criterion].action"
+                            :value="bulkEditionProcedures[criterion].action ? bulkEditionProcedures[criterion].action : undefined"
                             class="tainacan-bulk-edition-field tainacan-bulk-edition-field-not-last"
                             :placeholder="$i18n.get('instruction_select_a_action')"
                             @input="addToBulkEditionProcedures($event, 'action', criterion)">
@@ -57,7 +60,6 @@
                             <option
                                     v-for="(edtAct, key) in editionActionsForNotMultiple"
                                     :value="edtAct"
-                                    :selected="Object.keys(editionActionsForNotMultiple).length === 1"
                                     :key="key">
                                 {{ edtAct }}
                             </option>
@@ -533,11 +535,19 @@
                 return found ? found : {};
             },
             addToBulkEditionProcedures(value, key, criterion){
+
                 if(Array.isArray(value)){
                     value = value[0];
                 }
 
                 this.$set(this.bulkEditionProcedures[criterion], `${key}`, value);
+                
+                if (key == 'metadatumID') {
+                    if (this.getMetadataByID(this.bulkEditionProcedures[criterion].metadatumID).multiple != 'yes') {
+                        let value = Object.values(this.editionActionsForNotMultiple)[0];
+                        this.addToBulkEditionProcedures(value, 'action', criterion);
+                    }
+                }
             }
         },
     }
diff --git a/src/admin/js/mixins.js b/src/admin/js/mixins.js
index 1565d3aaa..23bd09cb4 100644
--- a/src/admin/js/mixins.js
+++ b/src/admin/js/mixins.js
@@ -65,7 +65,7 @@ export const formHooks = {
             ];
             // Gets data from existing extra form hooks
             for (let position of positions) {
-                if (this.formHooks[entity][position] && this.formHooks[entity][position] != undefined) {
+                if (this.formHooks[entity] && this.formHooks[entity][position] && this.formHooks[entity][position] != undefined) {
                     let formElement = document.getElementById('form-' + entity + '-' + position);
                     if (formElement) {  
                         for (let element of formElement.elements) {
@@ -95,7 +95,7 @@ export const formHooks = {
             ];
             // Gets data from existing extra form hooks
             for (let position of positions) {
-                if (this.formHooks[entity][position] && this.formHooks[entity][position] != undefined) {
+                if (this.formHooks[entity] && this.formHooks[entity][position] && this.formHooks[entity][position] != undefined) {
                     let formElement = document.getElementById('form-' + entity + '-' + position);
                     
                     if (formElement) {   
diff --git a/src/admin/js/theme-main.js b/src/admin/js/theme-main.js
index 9bdfaa462..35182d981 100644
--- a/src/admin/js/theme-main.js
+++ b/src/admin/js/theme-main.js
@@ -110,9 +110,8 @@ export const ThemeItemsListing =  new Vue({
     },
     render: h => h(ThemeItemsList),
     beforeMount () {
-        console.log("oie")
-        //if (this.$el.attributes['collection-id'] != undefined)
-        this.collectionId = this.$el.attributes['collection-id'].value;
+        if (this.$el.attributes['collection-id'] != undefined)
+            this.collectionId = this.$el.attributes['collection-id'].value;
         if (this.$el.attributes['default-view-mode'] != undefined)
             this.defaultViewMode = this.$el.attributes['default-view-mode'].value;
         if (this.$el.attributes['enabled-view-modes'] != undefined)
diff --git a/src/admin/theme-items-list.vue b/src/admin/theme-items-list.vue
index d443bd966..b99225cf1 100644
--- a/src/admin/theme-items-list.vue
+++ b/src/admin/theme-items-list.vue
@@ -20,7 +20,6 @@
 export default {
     name: "ThemeItemsList",
     created() {
-        console.log("oi")
         this.$userPrefs.init(); 
     }
 }

From b789c943bfa4c61706786f8a3c3f9fdcd6e5fb03 Mon Sep 17 00:00:00 2001
From: leogermani <leogermani@hacklab.com.br>
Date: Tue, 4 Sep 2018 17:51:51 -0300
Subject: [PATCH 30/31] embed docs

---
 docs/key-concepts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/key-concepts.md b/docs/key-concepts.md
index 3e038444f..0424ccf33 100644
--- a/docs/key-concepts.md
+++ b/docs/key-concepts.md
@@ -26,7 +26,7 @@ In WordPress language, each item is a post and its post type represents its coll
 Document is the main information of the item. It is the object which all metadata refer to. Tainacan accepts 3 different document types:
 
 * Attachment: A file attached to the item. An image, video, pdf, audio or other media file.
-* URL: An URL pointing to an external website or file. It can be a general website, a specific file, or media services. In the case of media services, Tainacan recognizes addresses and displays the appropriate player, using [oEmbed](https://oembed.com/)
+* URL: An URL pointing to an external website or file. It can be a general website, a specific file, or media services. In the case of media services, Tainacan recognizes addresses and displays the appropriate player, using [oEmbed](https://oembed.com/). A list of services automatically conveted to embeds by WordPress can be found [here](https://codex.wordpress.org/Embeds).
 * Text: A plain text, stored directly in the database, the user can type upon creating or editing an item
 
 ## Metadata

From 16ea621a932c759b68c0d79526fd274210cd876c Mon Sep 17 00:00:00 2001
From: Leo Germani <leogermani@hacklab.com.br>
Date: Tue, 4 Sep 2018 17:55:19 -0300
Subject: [PATCH 31/31] Load search js in repository archive #118

---
 src/theme-helper/class-tainacan-theme-helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/theme-helper/class-tainacan-theme-helper.php b/src/theme-helper/class-tainacan-theme-helper.php
index b957e8a28..14986a169 100644
--- a/src/theme-helper/class-tainacan-theme-helper.php
+++ b/src/theme-helper/class-tainacan-theme-helper.php
@@ -88,7 +88,7 @@ class Theme_Helper {
 	
 	public function enqueue_scripts($force = false) {
 		global $TAINACAN_BASE_URL;
-		if ( $force || is_post_type_archive( \Tainacan\Repositories\Repository::get_collections_db_identifiers() ) || tainacan_get_term() ) {
+		if ( $force || is_post_type_archive( \Tainacan\Repositories\Repository::get_collections_db_identifiers() ) || tainacan_get_term() || get_query_var('tainacan_repository_archive') == 1 ) {
 			//\Tainacan\Admin::get_instance()->add_admin_js();
 			wp_enqueue_script('tainacan-search', $TAINACAN_BASE_URL . '/assets/user_search-components.js' , [] , null, true);
 			wp_localize_script('tainacan-search', 'tainacan_plugin', \Tainacan\Admin::get_instance()->get_admin_js_localization_params());