allow the location of the instance specific panel to be configurable
This commit is contained in:
parent
f225000ce9
commit
e476318012
7 changed files with 16 additions and 4 deletions
|
@ -96,6 +96,10 @@ export default {
|
||||||
!this.$store.state.config.hideISP &&
|
!this.$store.state.config.hideISP &&
|
||||||
this.$store.state.instance.instanceSpecificPanelContent
|
this.$store.state.instance.instanceSpecificPanelContent
|
||||||
},
|
},
|
||||||
|
showInstanceSpecificPanelInSidebar () {
|
||||||
|
return this.showInstanceSpecificPanel &&
|
||||||
|
this.$store.state.instance.showInstanceSpecificPanelInSidebar
|
||||||
|
},
|
||||||
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
|
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
|
||||||
isMobileLayout () { return this.$store.state.interface.mobileLayout }
|
isMobileLayout () { return this.$store.state.interface.mobileLayout }
|
||||||
},
|
},
|
||||||
|
|
|
@ -76,7 +76,7 @@
|
||||||
<user-panel />
|
<user-panel />
|
||||||
<div v-if="!isMobileLayout">
|
<div v-if="!isMobileLayout">
|
||||||
<nav-panel />
|
<nav-panel />
|
||||||
<instance-specific-panel v-if="showInstanceSpecificPanel" />
|
<instance-specific-panel v-if="showInstanceSpecificPanelInSidebar" />
|
||||||
<features-panel v-if="!currentUser && showFeaturesPanel" />
|
<features-panel v-if="!currentUser && showFeaturesPanel" />
|
||||||
<who-to-follow-panel v-if="currentUser && suggestionsEnabled" />
|
<who-to-follow-panel v-if="currentUser && suggestionsEnabled" />
|
||||||
<notifications v-if="currentUser" />
|
<notifications v-if="currentUser" />
|
||||||
|
|
|
@ -99,6 +99,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
|
||||||
copyInstanceOption('redirectRootNoLogin')
|
copyInstanceOption('redirectRootNoLogin')
|
||||||
copyInstanceOption('redirectRootLogin')
|
copyInstanceOption('redirectRootLogin')
|
||||||
copyInstanceOption('showInstanceSpecificPanel')
|
copyInstanceOption('showInstanceSpecificPanel')
|
||||||
|
copyInstanceOption('showInstanceSpecificPanelInSidebar')
|
||||||
copyInstanceOption('minimalScopesMode')
|
copyInstanceOption('minimalScopesMode')
|
||||||
copyInstanceOption('hideMutedPosts')
|
copyInstanceOption('hideMutedPosts')
|
||||||
copyInstanceOption('collapseMessageWithSubject')
|
copyInstanceOption('collapseMessageWithSubject')
|
||||||
|
|
|
@ -9,7 +9,12 @@ const About = {
|
||||||
TermsOfServicePanel
|
TermsOfServicePanel
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }
|
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
|
||||||
|
showInstanceSpecificPanel() {
|
||||||
|
return this.$store.state.instance.showInstanceSpecificPanel &&
|
||||||
|
!this.$store.state.instance.showInstanceSpecificPanelInSidebar
|
||||||
|
},
|
||||||
|
isMobileLayout () { return this.$store.state.interface.mobileLayout }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="sidebar">
|
<div class="sidebar">
|
||||||
<instance-specific-panel />
|
<instance-specific-panel v-if="isMobileLayout || showInstanceSpecificPanel" />
|
||||||
<features-panel v-if="showFeaturesPanel" />
|
<features-panel v-if="showFeaturesPanel" />
|
||||||
<terms-of-service-panel />
|
<terms-of-service-panel />
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -16,6 +16,7 @@ const defaultState = {
|
||||||
redirectRootNoLogin: '/main/all',
|
redirectRootNoLogin: '/main/all',
|
||||||
redirectRootLogin: '/main/friends',
|
redirectRootLogin: '/main/friends',
|
||||||
showInstanceSpecificPanel: false,
|
showInstanceSpecificPanel: false,
|
||||||
|
showInstanceSpecificPanelInSidebar: false,
|
||||||
alwaysShowSubjectInput: true,
|
alwaysShowSubjectInput: true,
|
||||||
hideMutedPosts: false,
|
hideMutedPosts: false,
|
||||||
collapseMessageWithSubject: false,
|
collapseMessageWithSubject: false,
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
"logoMargin": ".1em",
|
"logoMargin": ".1em",
|
||||||
"redirectRootNoLogin": "/main/all",
|
"redirectRootNoLogin": "/main/all",
|
||||||
"redirectRootLogin": "/main/friends",
|
"redirectRootLogin": "/main/friends",
|
||||||
"showInstanceSpecificPanel": false,
|
"showInstanceSpecificPanel": true,
|
||||||
|
"showInstanceSpecificPanelInSidebar": false,
|
||||||
"collapseMessageWithSubject": false,
|
"collapseMessageWithSubject": false,
|
||||||
"scopeCopy": true,
|
"scopeCopy": true,
|
||||||
"subjectLineBehavior": "email",
|
"subjectLineBehavior": "email",
|
||||||
|
|
Loading…
Reference in a new issue