Merge branch 'develop' of https://github.com/tainacan/tainacan into develop

.travis.yml

@@ -28,7 +28,7 @@ before_install:
 - sudo service mysql restart
 - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'
 install:
-- echo -e "Install"
+- echo -e "Install" 
 - sudo mv  ./tests/bootstrap-config-sample.php ./tests/bootstrap-config.php
 - sudo ./tests/bin/install-wp-tests.sh test travis "" /tmp/wordpress localhost latest
   true 

src/admin/components/lists/terms-list.vue

@@ -32,7 +32,8 @@
                 <a
                         class="is-medium"
                         type="button"
-                        @click="addNewChildTerm(term, index)">
+                        @click="addNewChildTerm(term, index)"
+                        :disabled="isEditingTerm">
                     <b-icon icon="plus-circle"/>
                 </a>
                 <span 
@@ -144,6 +145,12 @@ export default {
             this.loadTerms();
         },
         addNewTerm() {
+            if (this.isEditingTerm) {
+                let editingTermIndex = this.orderedTermsList.findIndex(anEditingTerm => anEditingTerm.opened == true);
+                if (editingTermIndex >= 0)
+                    this.onTermEditionCanceled(this.orderedTermsList[editingTermIndex]);
+            }
+
             let newTerm = {
                 taxonomyId: this.taxonomyId,
                 name: this.$i18n.get('label_term_without_name'),
@@ -157,6 +164,12 @@ export default {
             this.editTerm(newTerm, this.orderedTermsList.length - 1);
         },
         addNewChildTerm(parent, parentIndex) {
+            if (this.isEditingTerm) {
+                let editingTermIndex = this.orderedTermsList.findIndex(anEditingTerm => anEditingTerm.opened == true);
+                if (editingTermIndex >= 0)
+                    this.onTermEditionCanceled(this.orderedTermsList[editingTermIndex]);
+            }
+
             let newTerm = {
                 taxonomyId: this.taxonomyId,
                 name:  this.$i18n.get('label_term_without_name'),

src/admin/scss/_pagination.scss

@@ -7,8 +7,10 @@
     border-top: 1px solid $gray;
     padding-top: 0;
     padding-bottom: 0;
-    padding-left: $page-side-padding;
-    padding-right: $page-side-padding;
+    margin-left: $page-side-padding;
+    margin-right: $page-side-padding;
+    padding-left: 0.75rem;
+    padding-right: 0.75rem;
     color: $gray-light;
 
     .shown-items {