Mercurial > gemma
changeset 1505:a6c2d4252bae
refresh clears notifications
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Wed, 05 Dec 2018 12:08:42 +0100 |
parents | ffd076dad319 |
children | bf32ef5dfb04 |
files | client/src/components/Sidebar.vue |
diffstat | 1 files changed, 29 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/Sidebar.vue Wed Dec 05 12:06:33 2018 +0100 +++ b/client/src/components/Sidebar.vue Wed Dec 05 12:08:42 2018 +0100 @@ -9,72 +9,72 @@ <div class="menu text-nowrap text-left"> <router-link to="/"> <font-awesome-icon + fixed-width icon="map-marked-alt" - fixed-width ></font-awesome-icon> - <span v-translate class="fix-trans-space">Map</span> + <span class="fix-trans-space" v-translate>Map</span> </router-link> <a - href="#" + :class="['secondary', { active: isActive('bottlenecks') }]" @click="toggleContextBox('bottlenecks')" - :class="['secondary', { active: isActive('bottlenecks') }]" + href="#" > - <font-awesome-icon icon="ship" fixed-width></font-awesome-icon> - <span v-translate class="fix-trans-space">Bottlenecks</span> + <font-awesome-icon fixed-width icon="ship"></font-awesome-icon> + <span class="fix-trans-space" v-translate>Bottlenecks</span> </a> <div v-if="isWaterwayAdmin"> <a - href="#" + :class="['secondary', { active: isActive('imports') }]" @click="toggleContextBox('imports')" - :class="['secondary', { active: isActive('imports') }]" + href="#" > - <font-awesome-icon icon="upload" fixed-width></font-awesome-icon> - <span v-translate class="fix-trans-space" + <font-awesome-icon fixed-width icon="upload"></font-awesome-icon> + <span class="fix-trans-space" v-translate >Import soundingresults</span > </a> <a - href="#" + :class="['secondary', { active: isActive('staging') }]" @click="toggleContextBox('staging')" - :class="['secondary', { active: isActive('staging') }]" + href="#" > <font-awesome-icon + fixed-width icon="clipboard-check" - fixed-width ></font-awesome-icon> - <span v-translate class="fix-trans-space">Staging area</span> + <span class="fix-trans-space" v-translate>Staging area</span> </a> <small class="text-muted pl-3"> <translate>Systemadministration</translate> </small> <hr class="m-0" /> <router-link to="usermanagement"> - <font-awesome-icon icon="users-cog" fixed-width></font-awesome-icon> - <span v-translate class="fix-trans-space">Users</span> + <font-awesome-icon fixed-width icon="users-cog"></font-awesome-icon> + <span class="fix-trans-space" v-translate>Users</span> </router-link> </div> <div v-if="isSysAdmin"> <router-link to="systemconfiguration"> - <font-awesome-icon icon="wrench" fixed-width></font-awesome-icon> - <span v-translate class="fix-trans-space">Configuration</span> + <font-awesome-icon fixed-width icon="wrench"></font-awesome-icon> + <span class="fix-trans-space" v-translate>Configuration</span> </router-link> <router-link to="logs"> - <font-awesome-icon icon="book" fixed-width></font-awesome-icon> - <span v-translate class="fix-trans-space">Logs</span> + <font-awesome-icon fixed-width icon="book"></font-awesome-icon> + <span class="fix-trans-space" v-translate>Logs</span> </router-link> <router-link to="importqueue"> - <font-awesome-icon icon="tasks" fixed-width></font-awesome-icon> - <span v-translate class="fix-trans-space">Importqueue</span> + <font-awesome-icon fixed-width icon="tasks"></font-awesome-icon> + <span class="fix-trans-space" v-translate>Importqueue</span> </router-link> - <router-link v-if="this.$options.IMPORTSCHEDULE" to="importschedule"> - <font-awesome-icon icon="clock" fixed-width></font-awesome-icon> + <router-link to="importschedule" v-if="this.$options.IMPORTSCHEDULE"> + <font-awesome-icon fixed-width icon="clock"></font-awesome-icon> <translate class="fix-trans-space">Importschedule</translate> </router-link> </div> <hr class="m-0" /> - <a href="#" @click="logoff"> - <font-awesome-icon icon="power-off" fixed-width></font-awesome-icon> - <span v-translate class="fix-trans-space">Logout</span> {{ user }} + <a @click="logoff" href="#"> + <font-awesome-icon fixed-width icon="power-off"></font-awesome-icon> + <span class="fix-trans-space" v-translate>Logout</span> {{ user }} </a> </div> </div> @@ -96,6 +96,7 @@ * Markus Kottländer <markus.kottlaender@intevation.de> */ import { mapGetters, mapState } from "vuex"; +import app from "../main"; export default { name: "sidebar", @@ -122,6 +123,7 @@ IMPORTSCHEDULE: process.env.VUE_APP_FEATURE_IMPORTSCHEDULE, methods: { logoff() { + app.$snotify.clear(); this.$store.commit("reset"); this.$store.commit("user/clearAuth"); this.$router.push("/login");