|
9 | 9 | <v-toolbar-title class="nav-title"> |
10 | 10 | <span :class="{'clickable': auth}" @click.stop.prevent="showNavigation()">{{ page.title }}</span> |
11 | 11 | </v-toolbar-title> |
12 | | - <v-menu v-if="auth && !config.disable.settings" attach="#p-navigation .nav-small" :nudge-bottom="9" :nudge-right="6" |
| 12 | + <v-menu v-if="showNavMenu" attach="#p-navigation .nav-small" :nudge-bottom="16" :nudge-right="0" |
13 | 13 | close-on-content-click fixed disable-keys offset-y bottom left> |
14 | 14 | <template #activator="{ on }"> |
15 | 15 | <v-btn |
|
23 | 23 | </v-btn> |
24 | 24 | </template> |
25 | 25 |
|
26 | | - <v-list class="nav-menu opacity-98"> |
| 26 | + <v-list class="nav-menu navigation dark elevation-2"> |
| 27 | + <v-list-tile to="/browse" class="clickable nav-menu-browse"> |
| 28 | + <v-list-tile-content> |
| 29 | + <v-list-tile-title> |
| 30 | + <translate>Search</translate> |
| 31 | + </v-list-tile-title> |
| 32 | + </v-list-tile-content> |
| 33 | + |
| 34 | + <v-list-tile-action :title="$gettext('Search')"> |
| 35 | + <v-icon>search</v-icon> |
| 36 | + </v-list-tile-action> |
| 37 | + </v-list-tile> |
| 38 | + |
27 | 39 | <v-list-tile v-if="auth && !config.readonly && $config.feature('upload')" class="clickable nav-menu-upload" @click.prevent="openUpload()"> |
| 40 | + <v-list-tile-content> |
| 41 | + <v-list-tile-title> |
| 42 | + <translate key="Upload">Upload</translate> |
| 43 | + </v-list-tile-title> |
| 44 | + </v-list-tile-content> |
28 | 45 | <v-list-tile-action class="clickable" @click.prevent="openUpload()"> |
29 | 46 | <v-icon>cloud_upload</v-icon> |
30 | 47 | </v-list-tile-action> |
| 48 | + </v-list-tile> |
31 | 49 |
|
| 50 | + <v-list-tile v-if="!config.disable.settings" to="/settings" class="nav-menu-settings"> |
32 | 51 | <v-list-tile-content> |
33 | 52 | <v-list-tile-title> |
34 | | - <v-list-tile-title><translate key="Upload">Upload</translate></v-list-tile-title> |
| 53 | + <translate key="Settings">Settings</translate> |
35 | 54 | </v-list-tile-title> |
36 | 55 | </v-list-tile-content> |
37 | | - </v-list-tile> |
38 | | - <v-list-tile v-if="auth && !isPublic" class="clickable nav-menu-logout" @click.prevent="logout"> |
39 | | - <v-list-tile-action class="clickable" @click.prevent="logout"> |
40 | | - <v-icon>power_settings_new</v-icon> |
| 56 | + <v-list-tile-action :title="$gettext('Settings')"> |
| 57 | + <v-icon>settings</v-icon> |
41 | 58 | </v-list-tile-action> |
| 59 | + </v-list-tile> |
42 | 60 |
|
| 61 | + <v-list-tile v-if="auth && !isPublic" class="clickable nav-menu-logout" @click.prevent="logout"> |
43 | 62 | <v-list-tile-content> |
44 | 63 | <v-list-tile-title> |
45 | | - <v-list-tile-title><translate key="Logout">Logout</translate></v-list-tile-title> |
| 64 | + <translate key="Logout">Logout</translate> |
46 | 65 | </v-list-tile-title> |
47 | 66 | </v-list-tile-content> |
| 67 | + <v-list-tile-action class="clickable" @click.prevent="logout"> |
| 68 | + <v-icon>power_settings_new</v-icon> |
| 69 | + </v-list-tile-action> |
48 | 70 | </v-list-tile> |
49 | 71 | </v-list> |
50 | 72 | </v-menu> |
@@ -596,6 +618,7 @@ export default { |
596 | 618 | drawer: null, |
597 | 619 | isMini: localStorage.getItem('last_navigation_mode') !== 'false', |
598 | 620 | isPublic: this.$config.get("public"), |
| 621 | + isDemo: this.$config.get("demo"), |
599 | 622 | isTest: this.$config.test, |
600 | 623 | isReadOnly: this.$config.get("readonly"), |
601 | 624 | session: this.$session, |
@@ -632,6 +655,9 @@ export default { |
632 | 655 | const user = this.$session.getUser(); |
633 | 656 | return user.PrimaryEmail ? user.PrimaryEmail : this.$gettext("Account"); |
634 | 657 | }, |
| 658 | + showNavMenu() { |
| 659 | + return (this.isDemo || this.session.auth); |
| 660 | + }, |
635 | 661 | }, |
636 | 662 | created() { |
637 | 663 | this.subscriptions.push(Event.subscribe('index', this.onIndex)); |
@@ -660,13 +686,6 @@ export default { |
660 | 686 | this.goHome(); |
661 | 687 | } |
662 | 688 | }, |
663 | | - openSettings() { |
664 | | - if (this.auth && this.$config.feature('settings')) { |
665 | | - this.$router.push({ name: 'settings' }); |
666 | | - } else { |
667 | | - this.goHome(); |
668 | | - } |
669 | | - }, |
670 | 689 | goHome() { |
671 | 690 | if (this.$route.name !== "home") { |
672 | 691 | this.$router.push({name: "home"}); |
|
0 commit comments