Mercurial > gemma

changeset 5107:b0d29f0aae3b queued-stage-done

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge default into queued-stage-done
author Tom Gottfried <tom@intevation.de>
date Wed, 25 Mar 2020 10:40:25 +0100
parents 13fff84c2b70 (current diff) f59ba73ff692 (diff)
children 89639e02cff0
files
diffstat 2 files changed, 9 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/TimeSlider.vue	Tue Mar 24 19:14:06 2020 +0100
+++ b/client/src/components/TimeSlider.vue	Wed Mar 25 10:40:25 2020 +0100
@@ -3,9 +3,11 @@
     id="slider"
     :class="[
       'd-flex box ui-element rounded bg-white flex-row',
-      { expanded: showTimeSlider }
+      { expanded: showTimeSlider },
+      {
+        reposition: ['DEFAULT', 'COMPARESURVEYS'].indexOf(this.paneSetup) === -1
+      }
     ]"
-    :style="reposition"
   >
     <div id="timeselection" class="d-flex mt-1 mr-1">
       <input
@@ -46,6 +48,10 @@
   bottom: 0;
   min-width: 100vw;
 }
+// reposition time slider in case of opened diagram
+#slider.reposition {
+  bottom: 50%;
+}
 #slider.expanded {
   max-height: 100%;
   max-width: 100%;
@@ -129,15 +135,6 @@
       "ongoingTimeSlide",
       "openLayersMaps"
     ]),
-    reposition() {
-      // reposition time slider in case of opened diagram
-      if (["DEFAULT", "COMPARESURVEYS"].indexOf(this.paneSetup) === -1) {
-        const height = document.getElementById("main").clientHeight + 1;
-        return `bottom: ${height}px`;
-      } else {
-        return "";
-      }
-    },
     dateSelection: {
       get() {
         const date = this.$store.state.application.selectedTime;
--- a/pkg/controllers/importqueue.go	Tue Mar 24 19:14:06 2020 +0100
+++ b/pkg/controllers/importqueue.go	Wed Mar 25 10:40:25 2020 +0100
@@ -654,7 +654,7 @@
 	}
 
 	message = fmt.Sprintf(
-		"Import #%d successfully changed to state '%s'.", id, state)
+		"Requested import #%d to be %s.", id, state)
 
 	return
 }