Skip to content
Snippets Groups Projects
Commit 7d442dff authored by Henrik Askjer's avatar Henrik Askjer
Browse files

back to results button on about page

parent 657e7c0f
No related branches found
No related tags found
No related merge requests found
<template id=""> <template id="">
<main tabindex="-1" ref="main" id="main"> <main tabindex="-1" ref="main" id="main">
<div class='about' :class="$vuetify.breakpoint.name"> <div class='about' :class="$vuetify.breakpoint.name">
<div id="return_to_results" v-if="$store.state.searchRoute && $route.name == 'about'">
<router-link id="return_link"
:to="$store.state.searchRoute">
<v-icon left
class="nav_arrow">chevron_left</v-icon>{{$t("notifications.back")}}
</router-link>
</div>
<div class="article" v-if="$store.state.currentLocale == 'eng'"> <div class="article" v-if="$store.state.currentLocale == 'eng'">
<h1> About </h1> <h1> About </h1>
<p>This is the website for the two Norwegian standard dictionaries <em>Bokmålsordboka</em> and <em>Nynorskordboka</em>. The website is still under development, so some features may not yet be in place. The content of the dictionaries is undergoing revision, and the editorial staff continuously publishes new word-articles, or articles which have been revised and quality checked.</p> <p>This is the website for the two Norwegian standard dictionaries <em>Bokmålsordboka</em> and <em>Nynorskordboka</em>. The website is still under development, so some features may not yet be in place. The content of the dictionaries is undergoing revision, and the editorial staff continuously publishes new word-articles, or articles which have been revised and quality checked.</p>
...@@ -1609,7 +1617,7 @@ export default { ...@@ -1609,7 +1617,7 @@ export default {
<style scoped> <style scoped>
main { main {
background-color: white; background-color: var(--v-tertiary-base);
} }
......
...@@ -9,15 +9,14 @@ ...@@ -9,15 +9,14 @@
<v-toolbar-items> <v-toolbar-items>
<v-btn v-if="!$store.state.localeChosen" id="locale_button" <v-divider vertical />
<v-btn id="locale_button"
aria-haspopup="dialog" aria-haspopup="dialog"
aria-label="Locale | Visningsspråk" aria-label="Locale | Visningsspråk"
icon @click.native="chooseLocale = !chooseLocale"> icon @click.native="chooseLocale = !chooseLocale">
<v-icon>language</v-icon></v-btn> <v-icon>language</v-icon></v-btn>
<v-divider v-if="!$store.state.localeChosen" vertical /> <v-divider vertical />
<v-btn id="top_menu" <v-btn id="top_menu"
v-if="$route.name != 'about'"
:aria-expanded="menuOpen? 'true' : 'false'" :aria-expanded="menuOpen? 'true' : 'false'"
aria-haspopup="dialog" aria-haspopup="dialog"
width="96px" width="96px"
...@@ -25,7 +24,6 @@ ...@@ -25,7 +24,6 @@
text @click.native="menuOpen = !menuOpen"> text @click.native="menuOpen = !menuOpen">
<span id="menu_label">{{$t('menu.title')}}</span><v-icon right>{{menuOpen? 'close' : 'menu'}}</v-icon></v-btn> <span id="menu_label">{{$t('menu.title')}}</span><v-icon right>{{menuOpen? 'close' : 'menu'}}</v-icon></v-btn>
<v-btn v-if="$route.name == 'about'" text @click.native="back">{{$t('close')}}<v-icon right>close</v-icon></v-btn>
</v-toolbar-items> </v-toolbar-items>
<v-divider vertical/> <v-divider vertical/>
</v-app-bar> </v-app-bar>
...@@ -77,11 +75,6 @@ export default { ...@@ -77,11 +75,6 @@ export default {
chooseLocale: false chooseLocale: false
} }
}, },
beforeRouteEnter(to, from, next) {
next(vm => {
vm._backRoute = from.path
})
},
computed: { computed: {
menuOpen: { menuOpen: {
get() { get() {
...@@ -97,8 +90,10 @@ export default { ...@@ -97,8 +90,10 @@ export default {
this.$router.push('/') this.$router.push('/')
}, },
back: function() { back: function() {
console.log(window.history)
if (this._backRoute) { if (this._backRoute) {
this.$router.go(-1)
//this.$router.go(-1)
} else { } else {
this.$router.push('/') this.$router.push('/')
...@@ -116,7 +111,7 @@ export default { ...@@ -116,7 +111,7 @@ export default {
} }
</script> </script>
<style> <style >
.dialogMenu { .dialogMenu {
margin: 0px !important; margin: 0px !important;
...@@ -125,11 +120,18 @@ export default { ...@@ -125,11 +120,18 @@ export default {
} }
.v-app-bar-title a { .top-bar a {
text-decoration: none; text-decoration: none;
color: white !important; color: white !important;
} }
.top-bar .return_link {
margin: 10px;
}
</style> </style>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment