Commit e4763180 authored by kaniini's avatar kaniini

allow the location of the instance specific panel to be configurable

parent f225000c
......@@ -96,6 +96,10 @@ export default {
!this.$store.state.config.hideISP &&
this.$store.state.instance.instanceSpecificPanelContent
},
showInstanceSpecificPanelInSidebar () {
return this.showInstanceSpecificPanel &&
this.$store.state.instance.showInstanceSpecificPanelInSidebar
},
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
isMobileLayout () { return this.$store.state.interface.mobileLayout }
},
......
......@@ -76,7 +76,7 @@
<user-panel />
<div v-if="!isMobileLayout">
<nav-panel />
<instance-specific-panel v-if="showInstanceSpecificPanel" />
<instance-specific-panel v-if="showInstanceSpecificPanelInSidebar" />
<features-panel v-if="!currentUser && showFeaturesPanel" />
<who-to-follow-panel v-if="currentUser && suggestionsEnabled" />
<notifications v-if="currentUser" />
......
......@@ -99,6 +99,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
copyInstanceOption('redirectRootNoLogin')
copyInstanceOption('redirectRootLogin')
copyInstanceOption('showInstanceSpecificPanel')
copyInstanceOption('showInstanceSpecificPanelInSidebar')
copyInstanceOption('minimalScopesMode')
copyInstanceOption('hideMutedPosts')
copyInstanceOption('collapseMessageWithSubject')
......
......@@ -9,7 +9,12 @@ const About = {
TermsOfServicePanel
},
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 }
}
}
......
<template>
<div class="sidebar">
<instance-specific-panel />
<instance-specific-panel v-if="isMobileLayout || showInstanceSpecificPanel" />
<features-panel v-if="showFeaturesPanel" />
<terms-of-service-panel />
</div>
......
......@@ -16,6 +16,7 @@ const defaultState = {
redirectRootNoLogin: '/main/all',
redirectRootLogin: '/main/friends',
showInstanceSpecificPanel: false,
showInstanceSpecificPanelInSidebar: false,
alwaysShowSubjectInput: true,
hideMutedPosts: false,
collapseMessageWithSubject: false,
......
......@@ -6,7 +6,8 @@
"logoMargin": ".1em",
"redirectRootNoLogin": "/main/all",
"redirectRootLogin": "/main/friends",
"showInstanceSpecificPanel": false,
"showInstanceSpecificPanel": true,
"showInstanceSpecificPanelInSidebar": false,
"collapseMessageWithSubject": false,
"scopeCopy": true,
"subjectLineBehavior": "email",
......
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