Commit 0f9cee2a authored by Angelina Filippova's avatar Angelina Filippova

Merge branch 'feature/add-docs-and-new-type' into 'develop'

Add link to docs and new settings type

Closes #78 and pleroma#1549

See merge request !89
parents d4be7d26 db713474
Pipeline #22583 passed with stages
in 6 minutes and 40 seconds
...@@ -358,7 +358,8 @@ export default { ...@@ -358,7 +358,8 @@ export default {
successfullyUpdated: 'Successfully updated', successfullyUpdated: 'Successfully updated',
metadatLowerCase: 'metadata', metadatLowerCase: 'metadata',
files: 'files', files: 'files',
successfullyRemoved: 'Setting removed successfully!' successfullyRemoved: 'Setting removed successfully!',
seeDocs: 'See Documentation'
}, },
invites: { invites: {
inviteTokens: 'Invite tokens', inviteTokens: 'Invite tokens',
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
class="top-margin" class="top-margin"
@change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)"/> @change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)"/>
<el-select <el-select
v-if="setting.type === 'module' || (setting.type.includes('atom') && setting.type.includes(false))" v-if="setting.type === 'module' || (setting.type.includes('atom') && setting.type.includes('dropdown'))"
:value="inputValue" :value="inputValue"
clearable clearable
@change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)"> @change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)">
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
</el-form> </el-form>
<div class="line"/> <div class="line"/>
<el-form ref="quackData" :model="quackData" :label-width="labelWidth"> <el-form ref="quackData" :model="quackData" :label-width="labelWidth">
<el-form-item label="Quack logger:"/>
<setting :setting-group="quack" :data="quackData"/> <setting :setting-group="quack" :data="quackData"/>
</el-form> </el-form>
<div class="submit-button-container"> <div class="submit-button-container">
......
<template> <template>
<div class="settings-container"> <div class="settings-container">
<h1>{{ $t('settings.settings') }}</h1> <div class="settings-header-container">
<el-tabs v-model="activeTab" :tab-position="tabPosition"> <h1 class="settings-header">{{ $t('settings.settings') }}</h1>
<el-link
:underline="false"
href="https://docs-develop.pleroma.social/backend/admin/config/"
target="_blank">
<el-button class="settings-docs-button">
<span>
<i class="el-icon-document"/>
{{ $t('settings.seeDocs') }}
</span>
</el-button>
</el-link>
</div>
<el-tabs v-model="activeTab" tab-position="left">
<el-tab-pane :label="$t('settings.activityPub')" :disabled="configDisabled" lazy> <el-tab-pane :label="$t('settings.activityPub')" :disabled="configDisabled" lazy>
<activity-pub/> <activity-pub/>
</el-tab-pane> </el-tab-pane>
...@@ -127,9 +141,6 @@ export default { ...@@ -127,9 +141,6 @@ export default {
}, },
isMobile() { isMobile() {
return this.$store.state.app.device === 'mobile' return this.$store.state.app.device === 'mobile'
},
tabPosition() {
return this.isMobile ? 'top' : 'left'
} }
}, },
mounted: function() { mounted: function() {
...@@ -143,9 +154,21 @@ export default { ...@@ -143,9 +154,21 @@ export default {
.el-tabs { .el-tabs {
margin-top: 20px margin-top: 20px
} }
h1 { }
margin: 22px 0 0 15px; .settings-docs-button {
} width: 163px;
text-align: left;
padding: 10px;
}
.settings-header {
margin: 0;
}
.settings-header-container {
display: flex;
height: 36px;
justify-content: space-between;
align-items: center;
margin: 22px 15px 15px 15px;
} }
@media only screen and (min-width: 1824px) { @media only screen and (min-width: 1824px) {
.settings-container { .settings-container {
......
...@@ -112,11 +112,11 @@ export default { ...@@ -112,11 +112,11 @@ export default {
} }
} }
.filter-container { .filter-container {
display: flex; display: flex;
height: 36px; height: 36px;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin: 22px 0 15px 0; margin: 22px 0 15px 0;
} }
.select-instance { .select-instance {
width: 350px; width: 350px;
......
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