about page: fix hiding of instance-specific panel, flow ToS and ISP better

This commit is contained in:
Ariadne Conill 2019-11-08 21:57:09 -06:00
parent 6cede475be
commit 5db77c839b
2 changed files with 8 additions and 3 deletions

View File

@ -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.getters.mergedConfig.hideISP &&
this.$store.state.instance.instanceSpecificPanelContent
}
} }
} }

View File

@ -1,8 +1,8 @@
<template> <template>
<div class="sidebar"> <div class="sidebar">
<instance-specific-panel /> <instance-specific-panel v-if="showInstanceSpecificPanel" />
<features-panel v-if="showFeaturesPanel" />
<terms-of-service-panel /> <terms-of-service-panel />
<features-panel v-if="showFeaturesPanel" />
</div> </div>
</template> </template>