diff --git a/src/assets/styles/base.css b/src/assets/styles/base.css
index 3d1ecf04fc73f10b2417eca200f6f56dfe1bae6b..85af870f09a89e6a42390d05e28c8c6d2031be42 100644
--- a/src/assets/styles/base.css
+++ b/src/assets/styles/base.css
@@ -80,6 +80,9 @@ body {
.tiny-margin {
margin: 0.1rem 0 0.1rem 0.1rem !important;
}
+.tiny-margin-left {
+ margin-left: 0.1rem !important;
+}
.ellipsis {
text-overflow: ellipsis;
overflow: hidden;
diff --git a/src/components/Feature/Detail/FeatureHeader.vue b/src/components/Feature/Detail/FeatureHeader.vue
index 3be179128521789fcf6a2cb83e3d8d5c3b23b522..eb75b473eb99c429536067ffe80928bdea61cbd2 100644
--- a/src/components/Feature/Detail/FeatureHeader.vue
+++ b/src/components/Feature/Detail/FeatureHeader.vue
@@ -45,7 +45,7 @@
v-if="((permissions && permissions.can_update_feature) || isFeatureCreator) && isOnline"
id="currentFeature-delete"
class="ui button button-hover-red"
- @click="$emit('delete')"
+ @click="$emit('setIsCancelling')"
>
<i
class="inverted grey trash alternate icon"
diff --git a/src/components/Project/Detail/ProjectHeader.vue b/src/components/Project/Detail/ProjectHeader.vue
index bd7f0749d6943f08b290b940c345324b915f5f41..35d1871095f4b433b15415a0a40d81292cd37f68 100644
--- a/src/components/Project/Detail/ProjectHeader.vue
+++ b/src/components/Project/Detail/ProjectHeader.vue
@@ -273,24 +273,20 @@ export default {
.project-header {
- .row {
- margin-top: 3em;
+ .row .right-column {
+ display: flex;
+ flex-direction: column;
- .right-column {
- display: flex;
- flex-direction: column;
-
- .ui.buttons {
- justify-content: flex-end;
- a.ui.button {
- flex-grow: 0; /* avoid stretching buttons */
- }
+ .ui.buttons {
+ justify-content: flex-end;
+ a.ui.button {
+ flex-grow: 0; /* avoid stretching buttons */
}
}
- .centered {
- margin: auto;
- text-align: center;
- }
+ }
+ .centered {
+ margin: auto;
+ text-align: center;
}
}
diff --git a/src/components/Project/FeaturesListAndMap/FeaturesListAndMapFilters.vue b/src/components/Project/FeaturesListAndMap/FeaturesListAndMapFilters.vue
index 4e624f10378ccc3b988577ab543db618af3d6ee8..7416a8f72d95420e4d3ab9fc506a6daf38f37ad6 100644
--- a/src/components/Project/FeaturesListAndMap/FeaturesListAndMapFilters.vue
+++ b/src/components/Project/FeaturesListAndMap/FeaturesListAndMapFilters.vue
@@ -85,7 +85,7 @@
</div>
<div
v-if="checkedFeatures.length > 0 && massMode === 'modify'"
- class="ui dropdown button compact button-hover-green margin-left-25"
+ class="ui dropdown button compact button-hover-green tiny-margin-left"
data-tooltip="Modifier le statut des Signalements"
data-position="bottom right"
@click="toggleModifyStatus"
@@ -107,7 +107,7 @@
v-for="status in availableStatus"
:key="status.value"
class="item"
- @click="modifyStatus(status.value)"
+ @click="$emit('modify-status', status.value)"
>
{{ status.name }}
</span>
@@ -116,10 +116,10 @@
</div>
<div
v-if="checkedFeatures.length > 0 && massMode === 'delete'"
- class="ui button compact button-hover-red margin-left-25"
+ class="ui button compact button-hover-red tiny-margin-left"
data-tooltip="Supprimer tous les signalements sélectionnés"
data-position="bottom right"
- @click="toggleDeleteModal"
+ @click="$emit('toggle-delete-modal')"
>
<i
class="grey trash fitted icon"
@@ -320,6 +320,14 @@ export default {
},
},
+ mounted() {
+ window.addEventListener('mousedown', this.clickOutsideDropdown);
+ },
+
+ destroyed() {
+ window.removeEventListener('mousedown', this.clickOutsideDropdown);
+ },
+
methods: {
resetPaginationNfetchFeatures() {
this.$emit('reset-pagination');
@@ -330,6 +338,20 @@ export default {
this.showAddFeature = !this.showAddFeature;
this.showModifyStatus = false;
},
+
+ toggleModifyStatus() {
+ this.showModifyStatus = !this.showModifyStatus;
+ this.showAddFeature = false;
+ },
+
+ clickOutsideDropdown(e) {
+ if (!e.target.closest('#button-dropdown')) {
+ this.showModifyStatus = false;
+ setTimeout(() => { //* timout necessary to give time to click on link to add feature
+ this.showAddFeature = false;
+ }, 500);
+ }
+ },
}
};
diff --git a/src/views/Feature/FeatureDetail.vue b/src/views/Feature/FeatureDetail.vue
index f7eac45c0ae6aca9838a903ece894a9252a42285..946b4629a960d30fa743f8ddb91a28f4139bdde2 100644
--- a/src/views/Feature/FeatureDetail.vue
+++ b/src/views/Feature/FeatureDetail.vue
@@ -10,7 +10,7 @@
<div class="row">
<div class="sixteen wide column">
<FeatureHeader
- @delete="isCanceling = true"
+ @setIsCancelling="isCanceling = true"
/>
</div>
</div>
diff --git a/src/views/Project/FeaturesListAndMap.vue b/src/views/Project/FeaturesListAndMap.vue
index 6b6af5454d03509df24be6f07478676b40d5138d..ec2d2bd5012c056ab30e1f0f0b4dc52f719368e7 100644
--- a/src/views/Project/FeaturesListAndMap.vue
+++ b/src/views/Project/FeaturesListAndMap.vue
@@ -12,6 +12,8 @@
@reset-pagination="resetPagination"
@fetch-features="fetchPagedFeatures"
@show-map="setShowMap"
+ @modify-status="modifyStatus"
+ @toggle-delete-modal="toggleDeleteModal"
/>
<div
@@ -143,8 +145,6 @@ export default {
pagination: { ...initialPagination },
projectSlug: this.$route.params.slug,
showMap: true,
- showAddFeature: false,
- showModifyStatus: false,
sort: {
column: '',
ascending: true,
@@ -223,12 +223,9 @@ export default {
} else {
this.initMap();
}
-
- window.addEventListener('mousedown', this.clickOutsideDropdown);
},
destroyed() {
- window.removeEventListener('mousedown', this.clickOutsideDropdown);
//* allow user to change page if ever stuck on loader
this.$store.commit('DISCARD_LOADER');
},
@@ -260,24 +257,10 @@ export default {
}
},
- toggleModifyStatus() {
- this.showModifyStatus = !this.showModifyStatus;
- this.showAddFeature = false;
- },
-
toggleDeleteModal() {
this.isDeleteModalOpen = !this.isDeleteModalOpen;
},
- clickOutsideDropdown(e) {
- if (!e.target.closest('#button-dropdown')) {
- this.showModifyStatus = false;
- setTimeout(() => { //* timout necessary to give time to click on link to add feature
- this.showAddFeature = false;
- }, 500);
- }
- },
-
async modifyStatus(newStatus) {
if (this.checkedFeatures.length > 0) {
const feature_id = this.checkedFeatures[0];