Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Page view: Fix title sometimes not centered & Fix Vue warn #3024

Merged
merged 1 commit into from
Jan 16, 2025
Merged

Page view: Fix title sometimes not centered & Fix Vue warn #3024

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions bundles/org.openhab.ui/web/src/pages/page/page-view.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
<f7-nav-left v-if="!showBackButton">
<f7-link icon-ios="f7:menu" icon-aurora="f7:menu" icon-md="material:menu" panel-open="left" />
</f7-nav-left>
<f7-nav-title>{{ (page) ? page.config.label : '' }}</f7-nav-title>
<f7-nav-title>{{ pageLabel }}</f7-nav-title>
<f7-nav-right>
<f7-link v-if="isAdmin" icon-md="material:edit" @click="editPage" class="edit-page-button">
{{ $theme.md ? '' : $t('page.navbar.edit') }}
</f7-link>
<f7-link v-if="fullscreenIcon" class="fullscreen-icon-navbar" :icon-f7="fullscreenIcon" @click="toggleFullscreen" />
<div v-if="!showBackButton && !isAdmin && !fullscreenIcon" style="width: 44px; height: 44px;" />
</f7-nav-right>
</f7-navbar>
<template v-else>
Expand Down Expand Up @@ -67,7 +68,9 @@ export default {
data () {
return {
currentTab: this.initialTab ? Number(this.initialTab) : 0,
fullscreen: this.$fullscreen.getState()
fullscreen: this.$fullscreen.getState(),

vars: {}
}
},
watch: {
Expand Down Expand Up @@ -97,6 +100,9 @@ export default {
pageType () {
return this.getPageType(this.page)
},
pageLabel () {
return this.page?.config.label
},
isAdmin () {
return this.page && this.$store.getters.isAdmin
},
Expand All @@ -109,12 +115,13 @@ export default {
return false
},
showBackButton () {
return this.deep && (!this.page || !this.page.config.sidebar)
return this.deep && !this.page?.config.sidebar
},
fullscreenIcon () {
if (this.page && this.$fullscreen.support && this.page.config.showFullscreenIcon) {
if (this.$fullscreen.support && this.page?.config.showFullscreenIcon) {
return this.fullscreen ? 'rectangle_arrow_up_right_arrow_down_left_slash' : 'rectangle_arrow_up_right_arrow_down_left'
} else return null
}
return null
}
},
methods: {
Expand Down
Loading