From c208c74fcfaabd7e79520125c2ea3b010abceadd Mon Sep 17 00:00:00 2001
From: Oreille <33065839+Oreilles@users.noreply.github.com>
Date: Tue, 24 Aug 2021 21:29:02 +0200
Subject: [PATCH] Move basemap input higher in sidebar options. Keep map
 interactive under v-info (#7563)

* Move basemap input higher in sidebar options. Keep map interactive under v-info.

* Apply suggestions from code review

Co-authored-by: Nicola Krumschmidt <nicola.krumschmidt@freenet.de>

Co-authored-by: Rijk van Zanten <rijkvanzanten@me.com>
Co-authored-by: Nicola Krumschmidt <nicola.krumschmidt@freenet.de>
---
 app/src/layouts/map/map.vue     |  5 +++++
 app/src/layouts/map/options.vue | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/layouts/map/map.vue b/app/src/layouts/map/map.vue
index 5ca84d73da..a3c8597af3 100644
--- a/app/src/layouts/map/map.vue
+++ b/app/src/layouts/map/map.vue
@@ -256,6 +256,11 @@ export default defineComponent({
 	background-color: var(--background-page);
 	border-radius: var(--border-radius);
 	box-shadow: var(--card-shadow);
+	pointer-events: none;
+}
+
+.v-info > :deep(.v-button) {
+	pointer-events: initial;
 }
 
 .footer {
diff --git a/app/src/layouts/map/options.vue b/app/src/layouts/map/options.vue
index 229d010dd5..28222b001b 100644
--- a/app/src/layouts/map/options.vue
+++ b/app/src/layouts/map/options.vue
@@ -1,4 +1,9 @@
 <template>
+	<div class="field">
+		<div class="type-label">{{ t('layouts.map.basemap') }}</div>
+		<v-select v-model="basemap" :items="basemaps.map((s) => ({ text: s.name, value: s.name }))" />
+	</div>
+
 	<template v-if="geometryFields.length == 0">
 		<div class="field">
 			<v-input type="text" disabled :prefix="'No compatible fields'"></v-input>
@@ -14,11 +19,6 @@
 		</div>
 	</template>
 
-	<div class="field">
-		<div class="type-label">{{ t('layouts.map.basemap') }}</div>
-		<v-select v-model="basemap" :items="basemaps.map((s) => ({ text: s.name, value: s.name }))" />
-	</div>
-
 	<div class="field">
 		<v-checkbox
 			v-model="autoLocationFilter"