From b7f9c6ba9db81d31dd5835b851d95ebaccb0dc70 Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Fri, 2 Aug 2019 11:46:56 -0300
Subject: [PATCH] New layout for sequence edit next buttons.

---
 .../components/edition/item-edition-form.vue  | 78 +++++++++++++++----
 src/admin/tainacan-admin-i18n.php             |  1 +
 2 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index 552b2c9ff..d65be905e 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -579,19 +579,41 @@
                         type="button"
                         class="button is-outlined">{{ $i18n.get('label_delete_permanently') }}</button>
                 <button 
+                        v-if="isOnSequenceEdit && (group != null && group.items_count != undefined && group.items_count > itemPosition)"
+                        @click="onNextInSequence();"
+                        type="button"
+                        class="button is-outlined">
+                    <span>{{ $i18n.get('label_keep_on_trash' ) }}</span>
+                    <span class="icon is-large">
+                        <i class="tainacan-icon tainacan-icon-20px tainacan-icon-next"/>
+                    </span>
+                </button>
+                <button 
+                        v-if="!isOnSequenceEdit || (group != null && group.items_count != undefined && group.items_count < itemPosition)"
                         @click="onSubmit('draft')"
                         type="button"
                         class="button is-secondary">{{ $i18n.get('label_save_as_draft') }}</button>
                 <button 
+                        v-else
+                        @click="onSubmit('draft', 'next')"
+                        type="button"
+                        class="button is-secondary">
+                    <span>{{ $i18n.get('label_save_as_draft') }}</span>
+                    <span class="icon is-large">
+                        <i class="tainacan-icon tainacan-icon-20px tainacan-icon-next"/>
+                    </span>
+                </button>
+                <button 
+                        v-if="!isOnSequenceEdit || (group != null && group.items_count != undefined && group.items_count < itemPosition)"
                         @click="onSubmit(visibility)"
                         type="button"
                         class="button is-success">{{ $i18n.get('label_publish') }}</button>
                 <button 
-                        v-if="isOnSequenceEdit && (group != null && group.items_count != undefined && group.items_count > itemPosition)"
-                        @click="onNextInSequence()"
+                        v-else
+                        @click="onSubmit(visibility, 'next')"
                         type="button"
-                        class="button sequence-button">
-                    <span>{{ $i18n.get('next') }}</span>
+                        class="button is-success">
+                    <span>{{ $i18n.get('label_publish') }}</span>
                     <span class="icon is-large">
                         <i class="tainacan-icon tainacan-icon-20px tainacan-icon-next"/>
                     </span>
@@ -631,19 +653,31 @@
                         type="button"
                         class="button is-outlined">{{ $i18n.get('label_discard') }}</button>
                 <button 
+                        v-if="!isOnSequenceEdit || (group != null && group.items_count != undefined && group.items_count == itemPosition)"
                         @click="onSubmit('draft')"
                         type="button"
                         class="button is-secondary">{{ form.status == 'draft' ? $i18n.get('label_update') : $i18n.get('label_save_as_draft') }}</button>
                 <button 
+                        v-else
+                        @click="onSubmit('draft'); onNextInSequence();"
+                        type="button"
+                        class="button is-secondary">
+                    <span>{{ $i18n.get('label_update_draft') }}</span>
+                    <span class="icon is-large">
+                        <i class="tainacan-icon tainacan-icon-20px tainacan-icon-next"/>
+                    </span>
+                </button>
+                <button 
+                        v-if="!isOnSequenceEdit || (group != null && group.items_count != undefined && group.items_count == itemPosition)"
                         @click="onSubmit(visibility)"
                         type="button"
                         class="button is-success">{{ $i18n.get('label_publish') }}</button>
                 <button 
-                        v-if="isOnSequenceEdit && (group != null && group.items_count != undefined && group.items_count > itemPosition)"
-                        @click="onNextInSequence()"
+                        v-else
+                        @click="onSubmit(visibility, 'next')"
                         type="button"
-                        class="button sequence-button">
-                    <span>{{ $i18n.get('next') }}</span>
+                        class="button is-success">
+                    <span>{{ $i18n.get('label_publish') }}</span>
                     <span class="icon is-large">
                         <i class="tainacan-icon tainacan-icon-20px tainacan-icon-next"/>
                     </span>
@@ -677,20 +711,33 @@
                         type="button"
                         class="button is-outlined">{{ $i18n.get('label_send_to_trash') }}</button>
                 <button 
+                        v-if="!isOnSequenceEdit || (group != null && group.items_count != undefined && group.items_count == itemPosition)"
                         @click="onSubmit('draft')"
                         type="button"
                         class="button is-secondary">{{ $i18n.get('label_return_to_draft') }}</button>
                 <button 
+                        v-else
+                        @click="onSubmit('draft', 'next')"
+                        type="button"
+                        class="button is-secondary">
+                    <span>{{ $i18n.get('label_save_as_draft') }}</span>
+                    <span class="icon is-large">
+                        <i class="tainacan-icon tainacan-icon-20px tainacan-icon-next"/>
+                    </span>
+                </button>
+                <button 
+                        v-if="!isOnSequenceEdit || (group != null && group.items_count != undefined && group.items_count == itemPosition)"
                         :disabled="formErrorMessage != undefined && formErrorMessage != ''"
                         @click="onSubmit(visibility)"
                         type="button"
                         class="button is-success">{{ $i18n.get('label_update') }}</button>
                 <button 
-                        v-if="isOnSequenceEdit && (group != null && group.items_count != undefined && group.items_count > itemPosition)"
-                        @click="onNextInSequence()"
+                        v-else
+                        :disabled="formErrorMessage != undefined && formErrorMessage != ''"
+                        @click="onSubmit(visibility, 'next')"
                         type="button"
-                        class="button sequence-button">
-                    <span>{{ $i18n.get('next') }}</span>
+                        class="button is-success">
+                    <span>{{ $i18n.get('label_update') }}</span>
                     <span class="icon is-large">
                         <i class="tainacan-icon tainacan-icon-20px tainacan-icon-next"/>
                     </span>
@@ -847,7 +894,7 @@ export default {
             'getItemIdInSequence',
             'getGroup'
         ]),
-        onSubmit(status) {
+        onSubmit(status, sequenceDirection) {
             // Puts loading on Item edition
             this.isLoading = true;
             this.sequenceRightDirection = undefined; 
@@ -880,6 +927,11 @@ export default {
                             this.$router.push(this.$routerHelper.getItemPath(this.form.collectionId, this.itemId));
                     } else
                         this.$router.push(this.$routerHelper.getCollectionPath(this.form.collectionId));
+                } else {
+                    if (sequenceDirection == 'next')
+                        this.onNextInSequence();
+                    else if (sequenceDirection == 'previous')
+                        this.onPrevInSequence();
                 }
             })
             .catch((errors) => {
diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php
index 5a79af6c8..89ebdd2e6 100644
--- a/src/admin/tainacan-admin-i18n.php
+++ b/src/admin/tainacan-admin-i18n.php
@@ -249,6 +249,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'label_edit_selected_collections'                => __( 'Edit selected collections', 'tainacan' ),
 	'label_delete_permanently'                       => __( 'Delete permanently', 'tainacan' ),
 	'label_send_to_trash'                            => __( 'Send to trash', 'tainacan' ),
+	'label_keep_on_trash'                            => __( 'Keep on trash', 'tainacan' ),
 	'label_delete_selected_taxonomies'               => __( 'Delete selected taxonomies', 'tainacan' ),
 	'label_bulk_edit_selected_items'                 => __( 'Bulk edit selected items', 'tainacan' ),
 	'label_sequence_edit_selected_items'             => __( 'Edit selected items in sequence', 'tainacan' ),