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 pleroma/admin-fe!89
This commit is contained in:
commit
0f9cee2a52
5 changed files with 39 additions and 16 deletions
|
@ -358,7 +358,8 @@ export default {
|
|||
successfullyUpdated: 'Successfully updated',
|
||||
metadatLowerCase: 'metadata',
|
||||
files: 'files',
|
||||
successfullyRemoved: 'Setting removed successfully!'
|
||||
successfullyRemoved: 'Setting removed successfully!',
|
||||
seeDocs: 'See Documentation'
|
||||
},
|
||||
invites: {
|
||||
inviteTokens: 'Invite tokens',
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
class="top-margin"
|
||||
@change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)"/>
|
||||
<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"
|
||||
clearable
|
||||
@change="update($event, settingGroup.group, settingGroup.key, settingParent, setting.key, setting.type, nested)">
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
</el-form>
|
||||
<div class="line"/>
|
||||
<el-form ref="quackData" :model="quackData" :label-width="labelWidth">
|
||||
<el-form-item label="Quack logger:"/>
|
||||
<setting :setting-group="quack" :data="quackData"/>
|
||||
</el-form>
|
||||
<div class="submit-button-container">
|
||||
|
|
|
@ -1,7 +1,21 @@
|
|||
<template>
|
||||
<div class="settings-container">
|
||||
<h1>{{ $t('settings.settings') }}</h1>
|
||||
<el-tabs v-model="activeTab" :tab-position="tabPosition">
|
||||
<div class="settings-header-container">
|
||||
<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>
|
||||
<activity-pub/>
|
||||
</el-tab-pane>
|
||||
|
@ -127,9 +141,6 @@ export default {
|
|||
},
|
||||
isMobile() {
|
||||
return this.$store.state.app.device === 'mobile'
|
||||
},
|
||||
tabPosition() {
|
||||
return this.isMobile ? 'top' : 'left'
|
||||
}
|
||||
},
|
||||
mounted: function() {
|
||||
|
@ -143,9 +154,21 @@ export default {
|
|||
.el-tabs {
|
||||
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) {
|
||||
.settings-container {
|
||||
|
|
|
@ -112,11 +112,11 @@ export default {
|
|||
}
|
||||
}
|
||||
.filter-container {
|
||||
display: flex;
|
||||
height: 36px;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin: 22px 0 15px 0;
|
||||
display: flex;
|
||||
height: 36px;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin: 22px 0 15px 0;
|
||||
}
|
||||
.select-instance {
|
||||
width: 350px;
|
||||
|
|
Loading…
Reference in a new issue