Commit 7ebc36d7 authored by Anton Koch's avatar Anton Koch
Browse files

Merge branch '555-add-logout-button' into 'master'

Resolve "Add "Logout"-Button to menu drawer"

See merge request !163
parents e204c196 0899cdd6
......@@ -27,11 +27,10 @@
.q-px-md
nav-footer
// Divider
.q-my-lg.mb-border-b-light
.q-mt-lg.q-mb-md.mb-border-b-light
// Footer ------------------------------------------------------------------------------------------------------------
.q-pt-lg
nav-global-switches
nav-global-switches
</template>
<script>
......
<template lang="pug">
mb-btn(
:label="$t('general.logout')"
:secondary="true"
@click.native="logout()"
)
</template>
<script>
export default {
name: 'Logout',
methods: {
logout () {
console.log('logout')
}
}
}
</script>
<style scoped lang="stylus">
</style>
<template lang="pug">
.flex.justify-between.items-center.global-switches.full-width.q-mr-md.q-pl-md
.flex.justify-between.items-center.global-switches.full-width.q-px-md.q-mb-md
lang-switch
logout
theme-handler
</template>
<script>
import LangSwitch from 'components/globals/Navigation/Drawer/Sub/GlobalSwitches/LangSwitch'
import ThemeHandler from 'components/globals/Navigation/Drawer/Sub/GlobalSwitches/ThemeHandler'
import Logout from 'components/globals/Navigation/Drawer/Sub/GlobalSwitches/Logout'
export default {
name: 'NavGlobalSwitches',
components: {
Logout,
ThemeHandler,
LangSwitch
}
......@@ -19,6 +22,4 @@ export default {
<style lang="stylus" scoped>
.global-switches
cursor pointer
position absolute
bottom 0
</style>
......@@ -4,6 +4,7 @@ export default {
add_user: 'Add user',
administration: 'Administration',
assets: 'Assets',
avatar: 'Avatar',
author: 'Author',
back: 'Back',
cancel: 'Cancel',
......@@ -13,9 +14,10 @@ export default {
created: 'Created',
delete: 'Delete',
edit: 'Edit',
groups: 'Groups',
invite: 'Invite',
liveAnnotate: 'Live Annotate',
login: 'Login',
logout: 'Logout',
media: 'Media',
members: 'Members',
more_info: 'More info',
......@@ -26,10 +28,14 @@ export default {
preview: 'Preview',
remove_selected: 'Remove Selected',
search: 'Search',
securitySettings: 'Security Settings',
systemSettings: 'System Settings',
share: 'Share',
submit: 'Submit',
timelineViewer: 'Timeline Viewer',
theme: 'Theme',
title: 'Title',
updated: 'Updated',
user: 'User',
userInformation: 'User Information',
yes: 'Yes'
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment