Mercurial > gemma
changeset 1095:2d6d8b676e3f
merge
| author | Thomas Junk <thomas.junk@intevation.de> |
|---|---|
| date | Tue, 30 Oct 2018 13:37:04 +0100 |
| parents | 80b47f5d41c3 (current diff) 31b36ef00784 (diff) |
| children | aa1f5daf6fc9 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/App.vue Tue Oct 30 13:36:48 2018 +0100 +++ b/client/src/App.vue Tue Oct 30 13:37:04 2018 +0100 @@ -6,9 +6,9 @@ </div> <div class="midcontainer d-flex flex-row"> <div class="leftcontainer"> - <Sidebar></Sidebar> - <Zoom></Zoom> - <Bottlenecks></Bottlenecks> + <Sidebar :routeName="routeName"></Sidebar> + <Zoom v-if="routeName == 'mainview'"></Zoom> + <Bottlenecks v-if="routeName == 'mainview'"></Bottlenecks> </div> <div class="middle"></div> <div class="rightcontainer"></div>
--- a/client/src/application/Sidebar.vue Tue Oct 30 13:36:48 2018 +0100 +++ b/client/src/application/Sidebar.vue Tue Oct 30 13:37:04 2018 +0100 @@ -4,7 +4,7 @@ <div class="menupoints" v-if="!this.sidebarCollapsed"> <router-link to="/" class="text-body d-flex flex-row nav-link"> <i class="fa fa-map-o align-self-center navicon"></i>Riverbed Morphology</router-link> - <a href="#" class="text-body d-flex flex-row nav-link" @click="$store.commit('application/toggleBottlenecks');"> + <a v-if="routeName == 'mainview'" href="#" class="text-body d-flex flex-row nav-link" @click="$store.commit('application/toggleBottlenecks');"> Bottlenecks </a> <div v-if="isSysAdmin"> @@ -45,6 +45,7 @@ export default { name: "sidebar", + props: ["routeName"], computed: { ...mapGetters("user", ["isSysAdmin"]), ...mapGetters("application", ["sidebarCollapsed"]),