Mercurial > gemma

changeset 644:c1a31858ad54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 13 Sep 2018 12:14:25 +0200
parents 756f3fc62da6 (current diff) 14dfab4e6e32 (diff)
children 794592cad75a
files client/src/application/User.vue
diffstat 4 files changed, 85 insertions(+), 87 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/App.vue	Thu Sep 13 12:09:23 2018 +0200
+++ b/client/src/App.vue	Thu Sep 13 12:14:25 2018 +0200
@@ -16,7 +16,7 @@
                 </div>
             </div>
             <div class="bottomcontainer d-flex flex-row align-items-end">
-                <User v-if="isAuthenticated"></User>
+                <Userbar v-if="isAuthenticated"></Userbar>
             </div>
         </div>
         <div class="d-flex flex-column">
@@ -86,7 +86,7 @@
 import Sidebar from "./application/Sidebar";
 import Topbar from "./application/Topbar";
 import { mapGetters } from "vuex";
-import User from "./application/User";
+import Userbar from "./application/Userbar";
 
 export default {
   name: "app",
@@ -96,7 +96,7 @@
   components: {
     Sidebar,
     Topbar,
-    User
+    Userbar
   }
 };
 </script>
--- a/client/src/application/User.vue	Thu Sep 13 12:09:23 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-<template>
-    <div>
-        <img @click="extendUserMenu" class="ui-element userpic shadow" src="../application/assets/user.png">
-        <div :class="userManagementStyle">
-            <span v-if="!isUsermenuCollapsed" class="username align-self-center">{{ userinfo }}</span>
-            <span v-if="!isUsermenuCollapsed" class="logout align-self-center" @click="logoff">
-                <i class="fa fa-power-off"></i>
-            </span>
-        </div>
-    </div>
-</template>
-
-<style lang="scss">
-.userpic {
-  background: white;
-  position: absolute;
-  bottom: $offset;
-  left: $offset;
-  height: $icon-width;
-  width: $icon-height;
-  border-radius: $border-radius;
-}
-
-.username {
-  margin-left: 40px;
-}
-
-.usermanagement {
-  background: white;
-  margin-left: $offset;
-  padding: $offset;
-  border-radius: $border-radius;
-  margin-bottom: $offset;
-  height: $icon-height;
-}
-
-.usermanagementcollapsed {
-  transition: 0.3s;
-  width: $icon-width;
-}
-
-.usermanagementexpanded {
-  width: $sidebar-width;
-}
-</style>
-
-<script>
-import { mapGetters } from "vuex";
-export default {
-  name: "user",
-  data() {
-    return {};
-  },
-  methods: {
-    extendUserMenu() {
-      this.$store.commit("application/toggleUserMenu");
-    },
-    logoff() {
-      this.$store.commit("user/clear_auth");
-      this.$store.commit("application/resetSidebar");
-      this.$store.commit("application/resetUserMenu");
-      this.$router.push("/login");
-    }
-  },
-  computed: {
-    ...mapGetters("user", ["userinfo"]),
-    ...mapGetters("application", ["isUsermenuCollapsed"]),
-    userManagementStyle() {
-      return {
-        "ui-element": true,
-        "d-flex": true,
-        "flex-row": true,
-        "justify-content-around": true,
-        usermanagement: true,
-        usermanagementcollapsed: this.isUsermenuCollapsed,
-        usermanagementexpanded: !this.isUsermenuCollapsed,
-        shadow: true
-      };
-    }
-  }
-};
-</script>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/application/Userbar.vue	Thu Sep 13 12:14:25 2018 +0200
@@ -0,0 +1,82 @@
+<template>
+    <div>
+        <img @click="extendUserMenu" class="ui-element userpic shadow" src="../application/assets/user.png">
+        <div :class="userManagementStyle">
+            <span v-if="!isUsermenuCollapsed" class="username align-self-center">{{ userinfo }}</span>
+            <span v-if="!isUsermenuCollapsed" class="logout align-self-center" @click="logoff">
+                <i class="fa fa-power-off"></i>
+            </span>
+        </div>
+    </div>
+</template>
+
+<style lang="scss">
+.userpic {
+  background: white;
+  position: absolute;
+  bottom: $offset;
+  left: $offset;
+  height: $icon-width;
+  width: $icon-height;
+  border-radius: $border-radius;
+}
+
+.username {
+  margin-left: 40px;
+}
+
+.usermanagement {
+  background: white;
+  margin-left: $offset;
+  padding: $offset;
+  border-radius: $border-radius;
+  margin-bottom: $offset;
+  height: $icon-height;
+}
+
+.usermanagementcollapsed {
+  transition: 0.3s;
+  width: $icon-width;
+}
+
+.usermanagementexpanded {
+  width: $sidebar-width;
+}
+</style>
+
+<script>
+import { mapGetters } from "vuex";
+export default {
+  name: "user",
+  data() {
+    return {};
+  },
+  methods: {
+    extendUserMenu() {
+      this.$store.commit("application/toggleUserMenu");
+    },
+    logoff() {
+      this.$store.commit("user/clear_auth");
+      this.$store.commit("application/resetSidebar");
+      this.$store.commit("application/resetUserMenu");
+      this.$router.push("/login");
+    }
+  },
+  computed: {
+    ...mapGetters("user", ["userinfo"]),
+    ...mapGetters("application", ["isUsermenuCollapsed"]),
+    userManagementStyle() {
+      return {
+        "ui-element": true,
+        "d-flex": true,
+        "flex-row": true,
+        "justify-content-around": true,
+        usermanagement: true,
+        usermanagementcollapsed: this.isUsermenuCollapsed,
+        usermanagementexpanded: !this.isUsermenuCollapsed,
+        shadow: true
+      };
+    }
+  }
+};
+</script>
--- a/client/src/layers/Layers.vue	Thu Sep 13 12:09:23 2018 +0200
+++ b/client/src/layers/Layers.vue	Thu Sep 13 12:14:25 2018 +0200
@@ -21,7 +21,6 @@
 
 <style lang="scss">
 .layerselection {
-  margin-right: $offset;
   background-color: white;
   margin-left: $small-offset;
   opacity: $slight-transparent;
@@ -41,7 +40,6 @@
 .minimizer {
   position: absolute;
   z-index: 2;
-  margin-right: $offset;
   right: $offset;
   background-color: white;
   border-radius: $border-radius;