High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
Restyle admin settings UI and make it more readable.
Kailash Nadh0118ea838f07
diff --git a/frontend/src/assets/style.scss b/frontend/src/assets/style.scssindex ae032f1b..fc6893f7 100644--- a/frontend/src/assets/style.scss+++ b/frontend/src/assets/style.scss@@ -30,7 +30,7 @@ $red: #FF5722;$link: $primary;$input-placeholder-color: $grey-light;-$grey-lightest: #eaeaea;+$grey-lightest: #f3f3f3;$colors: map-merge($colors, ("turquoise": ($green, $green-invert),@@ -1102,6 +1102,35 @@ section.analytics {/* Settings */.settings {+ .settings-wrap {+ max-width: 1240px;+ }++ .settings-tabs {+ flex-wrap: nowrap;++ > .tabs {+ flex: 0 0 230px;++ a {+ border: 0;+ }+ li.is-active {+ background: $grey-lightest;+ border-left: 5px solid $primary;+ border-bottom: 0;+ color: inherit;+ }+ }++ > .tab-content {+ border: 0;+ box-shadow: none;+ padding: 0 0 0 45px;+ min-width: 0;+ }+ }+.disabled {opacity: 0.30;}@@ -1368,6 +1397,20 @@ th.role-toggle-select a {.b-tabs .tab-content {padding: 15px 0 0 0;}++ .settings {+ .settings-tabs {+ display: block;++ > .tabs {+ margin-bottom: 20px;+ }++ > .tab-content {+ padding: 0;+ }+ }+ }}/* On big sizes, keep the header buttons small and non-expanded. */diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vueindex effd6835..60e98e02 100644--- a/frontend/src/views/Settings.vue+++ b/frontend/src/views/Settings.vue@@ -20,9 +20,9 @@</header><hr />- <section class="wrap" v-if="form">- <b-tabs type="is-boxed" :animated="false" v-model="tab">- <b-tab-item :label="$t('settings.general.name')" label-position="on-border">+ <section class="wrap settings-wrap" v-if="form">+ <b-tabs class="settings-tabs" vertical :animated="false" v-model="tab">+ <b-tab-item :label="$t('settings.general.name')"><general-settings :form="form" :key="key" /></b-tab-item><!-- general -->diff --git a/frontend/src/views/settings/bounces.vue b/frontend/src/views/settings/bounces.vueindex d5be2170..2c8bedfe 100644--- a/frontend/src/views/settings/bounces.vue+++ b/frontend/src/views/settings/bounces.vue@@ -1,9 +1,11 @@<template><div><div class="columns mb-6">- <div class="column is-3">- <b-field :label="$t('settings.bounces.enable')" data-cy="btn-enable-bounce">- <b-switch v-model="data['bounce.enabled']" name="bounce.enabled" />+ <div class="column is-4">+ <b-field data-cy="btn-enable-bounce">+ <b-switch v-model="data['bounce.enabled']" name="bounce.enabled">+ {{ $t('settings.bounces.enable') }}+ </b-switch></b-field></div><div class="column">@@ -42,9 +44,11 @@</div><!-- columns --><div class="mb-6">- <b-field :label="$t('settings.bounces.enableWebhooks')" data-cy="btn-enable-bounce-webhook">+ <b-field data-cy="btn-enable-bounce-webhook"><b-switch v-model="data['bounce.webhooks_enabled']" :disabled="!data['bounce.enabled']" name="webhooks_enabled"- :native-value="true" data-cy="btn-enable-bounce-webhook" />+ :native-value="true" data-cy="btn-enable-bounce-webhook">+ {{ $t('settings.bounces.enableWebhooks') }}+ </b-switch><p class="has-text-grey"><a href="https://listmonk.app/docs/bounces" target="_blank" rel="noopener noreferer">{{$t('globals.buttons.learnMore') }} →</a>@@ -53,17 +57,21 @@<div class="box" v-if="data['bounce.webhooks_enabled']"><div class="columns"><div class="column">- <b-field :label="$t('settings.bounces.enableSES')">+ <b-field><b-switch v-model="data['bounce.ses_enabled']" name="ses_enabled" :native-value="true"- data-cy="btn-enable-bounce-ses" />+ data-cy="btn-enable-bounce-ses">+ {{ $t('settings.bounces.enableSES') }}+ </b-switch></b-field></div></div><div class="columns"><div class="column is-3">- <b-field :label="$t('settings.bounces.enableSendgrid')">+ <b-field><b-switch v-model="data['bounce.sendgrid_enabled']" name="sendgrid_enabled" :native-value="true"- data-cy="btn-enable-bounce-sendgrid" />+ data-cy="btn-enable-bounce-sendgrid">+ {{ $t('settings.bounces.enableSendgrid') }}+ </b-switch></b-field></div><div class="column">@@ -76,9 +84,11 @@</div><div class="columns"><div class="column is-3">- <b-field :label="$t('settings.bounces.enablePostmark')">+ <b-field><b-switch v-model="data['bounce.postmark'].enabled" name="postmark_enabled" :native-value="true"- data-cy="btn-enable-bounce-postmark" />+ data-cy="btn-enable-bounce-postmark">+ {{ $t('settings.bounces.enablePostmark') }}+ </b-switch></b-field></div><div class="column">@@ -99,9 +109,11 @@</div><div class="columns"><div class="column is-3">- <b-field :label="$t('settings.bounces.enableForwardemail')">+ <b-field><b-switch v-model="data['bounce.forwardemail'].enabled" name="forwardemail_enabled" :native-value="true"- data-cy="btn-enable-bounce-forwardemail" />+ data-cy="btn-enable-bounce-forwardemail">+ {{ $t('settings.bounces.enableForwardemail') }}+ </b-switch></b-field></div><div class="column">@@ -114,16 +126,17 @@</div><div class="columns"><div class="column is-3">- <b-field :label="$t('settings.bounces.enableLettermint')">+ <b-field><b-switch v-model="data['bounce.lettermint'].enabled" name="lettermint_enabled" :native-value="true"- data-cy="btn-enable-bounce-lettermint" />+ data-cy="btn-enable-bounce-lettermint">+ {{ $t('settings.bounces.enableLettermint') }}+ </b-switch></b-field></div><div class="column"><b-field :label="$t('settings.bounces.lettermintKey')" :message="$t('globals.messages.passwordChange')"><b-input v-model="data['bounce.lettermint'].key" type="password"- :disabled="!data['bounce.lettermint'].enabled" name="lettermint_key"- data-cy="bounce-lettermint-key" />+ :disabled="!data['bounce.lettermint'].enabled" name="lettermint_key" data-cy="bounce-lettermint-key" /></b-field></div></div>@@ -131,9 +144,11 @@</div><!-- bounce mailbox -->- <b-field :label="$t('settings.bounces.enableMailbox')">+ <b-field><b-switch v-if="data['bounce.mailboxes']" v-model="data['bounce.mailboxes'][0].enabled"- :disabled="!data['bounce.enabled']" name="enabled" :native-value="true" data-cy="btn-enable-bounce-mailbox" />+ :disabled="!data['bounce.enabled']" name="enabled" :native-value="true" data-cy="btn-enable-bounce-mailbox">+ {{ $t('settings.bounces.enableMailbox') }}+ </b-switch></b-field><template v-if="data['bounce.enabled'] && data['bounce.mailboxes'][0].enabled">@@ -143,7 +158,7 @@<div class="columns"><div class="column is-3"><b-field :label="$t('settings.bounces.type')" label-position="on-border">- <b-select v-model="item.type" name="type">+ <b-select v-model="item.type" name="type" expanded><option value="pop">POP</option>@@ -168,7 +183,7 @@<div class="columns"><div class="column is-3"><b-field :label="$t('settings.mailserver.authProtocol')" label-position="on-border">- <b-select v-model="item.auth_protocol" name="auth_protocol">+ <b-select v-model="item.auth_protocol" name="auth_protocol" expanded><option value="none">none</option>@@ -207,13 +222,15 @@<div class="columns"><div class="column is-6"><b-field grouped>- <b-field :label="$t('settings.mailserver.tls')" expanded :message="$t('settings.mailserver.tlsHelp')">- <b-switch v-model="item.tls_enabled" name="item.tls_enabled" />+ <b-field expanded :message="$t('settings.mailserver.tlsHelp')">+ <b-switch v-model="item.tls_enabled" name="item.tls_enabled">+ {{ $t('settings.mailserver.tls') }}+ </b-switch></b-field>- <b-field :label="$t('settings.mailserver.skipTLS')" expanded- :message="$t('settings.mailserver.skipTLSHelp')">- <b-switch v-model="item.tls_skip_verify" :disabled="!item.tls_enabled"- name="item.tls_skip_verify" />+ <b-field expanded :message="$t('settings.mailserver.skipTLSHelp')">+ <b-switch v-model="item.tls_skip_verify" :disabled="!item.tls_enabled" name="item.tls_skip_verify">+ {{ $t('settings.mailserver.skipTLS') }}+ </b-switch></b-field></b-field></div>diff --git a/frontend/src/views/settings/general.vue b/frontend/src/views/settings/general.vueindex 5f882fcc..70df9447 100644--- a/frontend/src/views/settings/general.vue+++ b/frontend/src/views/settings/general.vue@@ -11,23 +11,16 @@:maxlength="300" required type="url" pattern="https?://.*" /></b-field>- <div class="columns">- <div class="column is-6">- <b-field :label="$t('settings.general.logoURL')" label-position="on-border"- :message="$t('settings.general.logoURLHelp')">- <b-input v-model="data['app.logo_url']" name="app.logo_url" placeholder="https://listmonk.yoursite.com/logo.png"- :maxlength="300" type="url" pattern="https?://.*" />- </b-field>- </div>- <div class="column is-6">- <b-field :label="$t('settings.general.faviconURL')" label-position="on-border"- :message="$t('settings.general.faviconURLHelp')">- <b-input v-model="data['app.favicon_url']" name="app.favicon_url"- placeholder="https://listmonk.yoursite.com/favicon.png" :maxlength="300"- type="url" pattern="https?://.*" />- </b-field>- </div>- </div>+ <b-field :label="$t('settings.general.logoURL')" label-position="on-border"+ :message="$t('settings.general.logoURLHelp')">+ <b-input v-model="data['app.logo_url']" name="app.logo_url" placeholder="https://listmonk.yoursite.com/logo.png"+ :maxlength="300" type="url" pattern="https?://.*" />+ </b-field>+ <b-field :label="$t('settings.general.faviconURL')" label-position="on-border"+ :message="$t('settings.general.faviconURLHelp')">+ <b-input v-model="data['app.favicon_url']" name="app.favicon_url"+ placeholder="https://listmonk.yoursite.com/favicon.png" :maxlength="300" type="url" pattern="https?://.*" />+ </b-field><hr /><b-field :label="$t('settings.general.fromEmail')" label-position="on-border"@@ -47,25 +40,21 @@<h2 class="is-size-4 mb-5">{{ $tc('globals.terms.subscriptions', 2) }}</h2>- <div class="columns">- <div class="column is-4">- <b-field :label="$t('settings.general.enablePublicSubPage')"- :message="$t('settings.general.enablePublicSubPageHelp')">- <b-switch v-model="data['app.enable_public_subscription_page']" name="app.enable_public_subscription_page" />- </b-field>- </div>- <div class="column is-4">- <b-field :label="$t('settings.general.sendOptinConfirm')"- :message="$t('settings.general.sendOptinConfirmHelp')">- <b-switch v-model="data['app.send_optin_confirmation']" name="app.send_optin_confirmation" />- </b-field>- </div>- <div class="column is-4">- <b-field :label="$t('settings.general.showOptinPage')" :message="$t('settings.general.showOptinPageHelp')">- <b-switch v-model="data['app.show_optin_page']" name="app.show_optin_page" />- </b-field>- </div>- </div>+ <b-field :message="$t('settings.general.enablePublicSubPageHelp')">+ <b-switch v-model="data['app.enable_public_subscription_page']" name="app.enable_public_subscription_page">+ {{ $t('settings.general.enablePublicSubPage') }}+ </b-switch>+ </b-field>+ <b-field :message="$t('settings.general.sendOptinConfirmHelp')">+ <b-switch v-model="data['app.send_optin_confirmation']" name="app.send_optin_confirmation">+ {{ $t('settings.general.sendOptinConfirm') }}+ </b-switch>+ </b-field>+ <b-field :message="$t('settings.general.showOptinPageHelp')">+ <b-switch v-model="data['app.show_optin_page']" name="app.show_optin_page">+ {{ $t('settings.general.showOptinPage') }}+ </b-switch>+ </b-field></div><hr />@@ -73,26 +62,23 @@<h2 class="is-size-4 mb-5">{{ $t('campaigns.archive') }}</h2>- <div class="columns">- <div class="column is-4">- <b-field :label="$t('settings.general.enablePublicArchive')"- :message="$t('settings.general.enablePublicArchiveHelp')">- <b-switch v-model="data['app.enable_public_archive']" name="app.enable_public_archive" />- </b-field>- </div>- <div class="column is-4">- <b-field :label="$t('settings.general.enablePublicArchiveRSSContent')"- :message="$t('settings.general.enablePublicArchiveRSSContentHelp')">- <b-switch v-model="data['app.enable_public_archive_rss_content']"- name="app.enable_public_archive_rss_content" />- </b-field>- </div>- </div>+ <b-field :message="$t('settings.general.enablePublicArchiveHelp')">+ <b-switch v-model="data['app.enable_public_archive']" name="app.enable_public_archive">+ {{ $t('settings.general.enablePublicArchive') }}+ </b-switch>+ </b-field>+ <b-field :message="$t('settings.general.enablePublicArchiveRSSContentHelp')">+ <b-switch v-model="data['app.enable_public_archive_rss_content']" name="app.enable_public_archive_rss_content">+ {{ $t('settings.general.enablePublicArchiveRSSContent') }}+ </b-switch>+ </b-field></div><hr />- <b-field :label="$t('settings.general.checkUpdates')" :message="$t('settings.general.checkUpdatesHelp')">- <b-switch v-model="data['app.check_updates']" name="app.check_updates" />+ <b-field :message="$t('settings.general.checkUpdatesHelp')">+ <b-switch v-model="data['app.check_updates']" name="app.check_updates">+ {{ $t('settings.general.checkUpdates') }}+ </b-switch></b-field><hr />diff --git a/frontend/src/views/settings/media.vue b/frontend/src/views/settings/media.vueindex 2cb20de1..5089b004 100644--- a/frontend/src/views/settings/media.vue+++ b/frontend/src/views/settings/media.vue@@ -37,78 +37,60 @@</div><!-- filesystem --><div class="block" v-if="data['upload.provider'] === 's3'">- <div class="columns">- <div class="column is-3">- <b-field :label="$t('settings.media.s3.region')" label-position="on-border" expanded>- <b-input v-model="data['upload.s3.aws_default_region']" @input="onS3URLChange"- name="upload.s3.aws_default_region" :maxlength="200" placeholder="ap-south-1" />- </b-field>- </div>- <div class="column">- <b-field grouped>- <b-field :label="$t('settings.media.s3.key')" label-position="on-border" expanded>- <b-input v-model="data['upload.s3.aws_access_key_id']" name="upload.s3.aws_access_key_id"- :maxlength="200" />- </b-field>- <b-field :label="$t('settings.media.s3.secret')" label-position="on-border" expanded- message="Enter a value to change.">- <b-input v-model="data['upload.s3.aws_secret_access_key']" name="upload.s3.aws_secret_access_key"- type="password" :maxlength="200" />- </b-field>- </b-field>- </div>- </div>+ <b-field :label="$t('settings.media.s3.region')" label-position="on-border" expanded>+ <b-input v-model="data['upload.s3.aws_default_region']" @input="onS3URLChange"+ name="upload.s3.aws_default_region" :maxlength="200" placeholder="ap-south-1" />+ </b-field>- <div class="columns">- <div class="column is-3">- <b-field :label="$t('settings.media.s3.bucketType')" label-position="on-border">- <b-select v-model="data['upload.s3.bucket_type']" name="upload.s3.bucket_type" expanded>- <option value="private">- {{ $t('settings.media.s3.bucketTypePrivate') }}- </option>- <option value="public">- {{ $t('settings.media.s3.bucketTypePublic') }}- </option>- </b-select>- </b-field>- </div>- <div class="column">- <b-field grouped>- <b-field :label="$t('settings.media.s3.bucket')" label-position="on-border" expanded>- <b-input v-model="data['upload.s3.bucket']" @input="onS3URLChange" name="upload.s3.bucket"- :maxlength="200" placeholder="" />- </b-field>- <b-field :label="$t('settings.media.s3.bucketPath')" label-position="on-border"- :message="$t('settings.media.s3.bucketPathHelp')" expanded>- <b-input v-model="data['upload.s3.bucket_path']" name="upload.s3.bucket_path" :maxlength="200"- placeholder="/" />- </b-field>- </b-field>- </div>- </div>+ <b-field :label="$t('settings.media.s3.key')" label-position="on-border" expanded>+ <b-input v-model="data['upload.s3.aws_access_key_id']" name="upload.s3.aws_access_key_id" :maxlength="200" />+ </b-field>- <div class="columns">- <div class="column is-3">- <b-field :label="$t('settings.media.s3.uploadExpiry')" label-position="on-border"- :message="$t('settings.media.s3.uploadExpiryHelp')" expanded>- <b-input v-model="data['upload.s3.expiry']" name="upload.s3.expiry" placeholder="14d" :pattern="regDuration"- :maxlength="10" />- </b-field>- </div>- <div class="column is-9">- <b-field :label="$t('settings.media.s3.url')" label-position="on-border"- :message="$t('settings.media.s3.urlHelp')">- <b-input v-model="data['upload.s3.url']" name="upload.s3.url" required- placeholder="https://s3.$region.amazonaws.com" :maxlength="200" expanded type="url"- pattern="https?://.*" />- </b-field>- <b-field :label="$t('settings.media.s3.publicURL')" label-position="on-border" :message="$t('settings.media.s3.publicURLHelp')" expanded>- <b-input v-model="data['upload.s3.public_url']"- name="upload.s3.public_url" placeholder="https://files.yourdomain.com" :maxlength="200" type="string"- pattern="(https?://.*|/.+)" />- </b-field>- </div>- </div>+ <b-field :label="$t('settings.media.s3.secret')" label-position="on-border" expanded+ message="Enter a value to change.">+ <b-input v-model="data['upload.s3.aws_secret_access_key']" name="upload.s3.aws_secret_access_key"+ type="password" :maxlength="200" />+ </b-field>++ <b-field :label="$t('settings.media.s3.bucketType')" label-position="on-border">+ <b-select v-model="data['upload.s3.bucket_type']" name="upload.s3.bucket_type" expanded>+ <option value="private">+ {{ $t('settings.media.s3.bucketTypePrivate') }}+ </option>+ <option value="public">+ {{ $t('settings.media.s3.bucketTypePublic') }}+ </option>+ </b-select>+ </b-field>++ <b-field :label="$t('settings.media.s3.bucket')" label-position="on-border" expanded>+ <b-input v-model="data['upload.s3.bucket']" @input="onS3URLChange" name="upload.s3.bucket" :maxlength="200"+ placeholder="" />+ </b-field>++ <b-field :label="$t('settings.media.s3.bucketPath')" label-position="on-border"+ :message="$t('settings.media.s3.bucketPathHelp')" expanded>+ <b-input v-model="data['upload.s3.bucket_path']" name="upload.s3.bucket_path" :maxlength="200"+ placeholder="/" />+ </b-field>++ <b-field :label="$t('settings.media.s3.uploadExpiry')" label-position="on-border"+ :message="$t('settings.media.s3.uploadExpiryHelp')" expanded>+ <b-input v-model="data['upload.s3.expiry']" name="upload.s3.expiry" placeholder="14d" :pattern="regDuration"+ :maxlength="10" />+ </b-field>++ <b-field :label="$t('settings.media.s3.url')" label-position="on-border"+ :message="$t('settings.media.s3.urlHelp')">+ <b-input v-model="data['upload.s3.url']" name="upload.s3.url" required+ placeholder="https://s3.$region.amazonaws.com" :maxlength="200" expanded type="url" pattern="https?://.*" />+ </b-field>++ <b-field :label="$t('settings.media.s3.publicURL')" label-position="on-border"+ :message="$t('settings.media.s3.publicURLHelp')" expanded>+ <b-input v-model="data['upload.s3.public_url']" name="upload.s3.public_url"+ placeholder="https://files.yourdomain.com" :maxlength="200" type="string" pattern="(https?://.*|/.+)" />+ </b-field></div><!-- s3 --></div></template>diff --git a/frontend/src/views/settings/messengers.vue b/frontend/src/views/settings/messengers.vueindex d09c123c..f8879ded 100644--- a/frontend/src/views/settings/messengers.vue+++ b/frontend/src/views/settings/messengers.vue@@ -2,78 +2,64 @@<div><div class="items messengers"><div class="block box" v-for="(item, n) in data.messengers" :key="n">- <div class="columns">- <div class="column is-2">- <b-field :label="$t('globals.buttons.enabled')">- <b-switch v-model="item.enabled" name="enabled" :native-value="true" />- </b-field>- <b-field>- <a @click.prevent="$utils.confirm(null, () => removeMessenger(n))" href="#" class="is-size-7">- <b-icon icon="trash-can-outline" size="is-small" />- {{ $t('globals.buttons.delete') }}- </a>- </b-field>- </div><!-- first column -->+ <b-field>+ <b-switch v-model="item.enabled" name="enabled" :native-value="true">+ {{ $t('globals.buttons.enabled') }}+ </b-switch>+ </b-field>+ <b-field>+ <a @click.prevent="$utils.confirm(null, () => removeMessenger(n))" href="#" class="is-size-7">+ <b-icon icon="trash-can-outline" size="is-small" />+ {{ $t('globals.buttons.delete') }}+ </a>+ </b-field>- <div class="column" :class="{ disabled: !item.enabled }">- <div class="columns">- <div class="column is-4">- <b-field :label="$t('globals.fields.name')" label-position="on-border"- :message="$t('settings.messengers.nameHelp')">- <b-input v-model="item.name" name="name" placeholder="mymessenger" :maxlength="200" />- </b-field>- </div>- <div class="column is-8">- <b-field :label="$t('settings.messengers.url')" label-position="on-border"- :message="$t('settings.messengers.urlHelp')">- <b-input v-model="item.root_url" name="root_url" placeholder="https://postback.messenger.net/path"- :maxlength="200" expanded type="url" pattern="https?://.*" />- </b-field>- </div>- </div><!-- host -->+ <div :class="{ disabled: !item.enabled }">+ <b-field :label="$t('globals.fields.name')" label-position="on-border"+ :message="$t('settings.messengers.nameHelp')">+ <b-input v-model="item.name" name="name" placeholder="mymessenger" :maxlength="200" />+ </b-field>- <div class="columns">- <div class="column">- <b-field grouped>- <b-field :label="$t('settings.messengers.username')" label-position="on-border" expanded>- <b-input v-model="item.username" name="username" :maxlength="200" />- </b-field>- <b-field :label="$t('settings.messengers.password')" label-position="on-border" expanded- :message="$t('globals.messages.passwordChange')">- <b-input v-model="item.password" name="password" type="password"- :placeholder="$t('globals.messages.passwordChange')" :maxlength="200" />- </b-field>- </b-field>- </div>- </div><!-- auth -->- <hr />+ <b-field :label="$t('settings.messengers.url')" label-position="on-border"+ :message="$t('settings.messengers.urlHelp')">+ <b-input v-model="item.root_url" name="root_url" placeholder="https://postback.messenger.net/path"+ :maxlength="200" expanded type="url" pattern="https?://.*" />+ </b-field>- <div class="columns">- <div class="column is-4">- <b-field :label="$t('settings.messengers.maxConns')" label-position="on-border"- :message="$t('settings.messengers.maxConnsHelp')">- <b-numberinput v-model="item.max_conns" name="max_conns" type="is-light" controls-position="compact"- placeholder="25" min="1" max="65535" />- </b-field>- </div>- <div class="column is-4">- <b-field :label="$t('settings.messengers.retries')" label-position="on-border"- :message="$t('settings.messengers.retriesHelp')">- <b-numberinput v-model="item.max_msg_retries" name="max_msg_retries" type="is-light"- controls-position="compact" placeholder="2" min="1" max="1000" />- </b-field>- </div>- <div class="column is-4">- <b-field :label="$t('settings.messengers.timeout')" label-position="on-border"- :message="$t('settings.messengers.timeoutHelp')">- <b-input v-model="item.timeout" name="timeout" placeholder="5s" :pattern="regDuration"- :maxlength="10" />- </b-field>- </div>+ <b-field :label="$t('settings.messengers.username')" label-position="on-border" expanded>+ <b-input v-model="item.username" name="username" :maxlength="200" />+ </b-field>++ <b-field :label="$t('settings.messengers.password')" label-position="on-border" expanded+ :message="$t('globals.messages.passwordChange')">+ <b-input v-model="item.password" name="password" type="password"+ :placeholder="$t('globals.messages.passwordChange')" :maxlength="200" />+ </b-field>++ <div class="columns">+ <div class="column is-4">+ <b-field :label="$t('settings.messengers.maxConns')" label-position="on-border"+ :message="$t('settings.messengers.maxConnsHelp')">+ <b-numberinput v-model="item.max_conns" name="max_conns" type="is-light" controls-position="compact"+ placeholder="25" min="1" max="65535" />+ </b-field>+ </div>+ <div class="column is-4">+ <b-field :label="$t('settings.messengers.retries')" label-position="on-border"+ :message="$t('settings.messengers.retriesHelp')">+ <b-numberinput v-model="item.max_msg_retries" name="max_msg_retries" type="is-light"+ controls-position="compact" placeholder="2" min="1" max="1000" />+ </b-field>+ </div>+ <div class="column is-4">+ <b-field :label="$t('settings.messengers.timeout')" label-position="on-border"+ :message="$t('settings.messengers.timeoutHelp')">+ <b-input v-model="item.timeout" name="timeout" placeholder="5s" :pattern="regDuration"+ :maxlength="10" />+ </b-field></div>- <hr /></div>- </div><!-- second container column -->+ </div></div><!-- block --></div><!-- mail-servers -->diff --git a/frontend/src/views/settings/performance.vue b/frontend/src/views/settings/performance.vueindex bddc5e7a..6d368230 100644--- a/frontend/src/views/settings/performance.vue+++ b/frontend/src/views/settings/performance.vue@@ -27,9 +27,10 @@<div><div class="columns"><div class="column is-6">- <b-field :label="$t('settings.performance.slidingWindow')"- :message="$t('settings.performance.slidingWindowHelp')">- <b-switch v-model="data['app.message_sliding_window']" name="app.message_sliding_window" />+ <b-field :message="$t('settings.performance.slidingWindowHelp')">+ <b-switch v-model="data['app.message_sliding_window']" name="app.message_sliding_window">+ {{ $t('settings.performance.slidingWindow') }}+ </b-switch></b-field></div>@@ -56,9 +57,10 @@<hr /><div class="columns"><div class="column is-4">- <b-field :label="$t('settings.performance.cacheSlowQueries')"- :message="$t('settings.performance.cacheSlowQueriesHelp')">- <b-switch v-model="data['app.cache_slow_queries']" name="app.cache_slow_queries" />+ <b-field :message="$t('settings.performance.cacheSlowQueriesHelp')">+ <b-switch v-model="data['app.cache_slow_queries']" name="app.cache_slow_queries">+ {{ $t('settings.performance.cacheSlowQueries') }}+ </b-switch></b-field></div><div class="column is-4" :class="{ disabled: !data['app.cache_slow_queries'] }">diff --git a/frontend/src/views/settings/privacy.vue b/frontend/src/views/settings/privacy.vueindex 6a2f4bd9..6df1af64 100644--- a/frontend/src/views/settings/privacy.vue+++ b/frontend/src/views/settings/privacy.vue@@ -2,41 +2,56 @@<div class="items"><div class="columns"><div class="column is-6">- <b-field :label="$t('settings.privacy.disableTracking')" :message="$t('settings.privacy.disableTrackingHelp')">- <b-switch v-model="data['privacy.disable_tracking']" name="privacy.disable_tracking" />+ <b-field :message="$t('settings.privacy.disableTrackingHelp')">+ <b-switch v-model="data['privacy.disable_tracking']" name="privacy.disable_tracking">+ {{ $t('settings.privacy.disableTracking') }}+ </b-switch></b-field></div><div class="column is-6" :class="{ 'is-disabled': data['privacy.disable_tracking'] }">- <b-field :label="$t('settings.privacy.individualSubTracking')"- :message="$t('settings.privacy.individualSubTrackingHelp')">+ <b-field :message="$t('settings.privacy.individualSubTrackingHelp')"><b-switch v-model="data['privacy.individual_tracking']" :disabled="data['privacy.disable_tracking']"- name="privacy.individual_tracking" />+ name="privacy.individual_tracking">+ {{ $t('settings.privacy.individualSubTracking') }}+ </b-switch></b-field></div></div>- <b-field :label="$t('settings.privacy.listUnsubHeader')" :message="$t('settings.privacy.listUnsubHeaderHelp')">- <b-switch v-model="data['privacy.unsubscribe_header']" name="privacy.unsubscribe_header" />+ <b-field :message="$t('settings.privacy.listUnsubHeaderHelp')">+ <b-switch v-model="data['privacy.unsubscribe_header']" name="privacy.unsubscribe_header">+ {{ $t('settings.privacy.listUnsubHeader') }}+ </b-switch></b-field>- <b-field :label="$t('settings.privacy.allowBlocklist')" :message="$t('settings.privacy.allowBlocklistHelp')">- <b-switch v-model="data['privacy.allow_blocklist']" name="privacy.allow_blocklist" />+ <b-field :message="$t('settings.privacy.allowBlocklistHelp')">+ <b-switch v-model="data['privacy.allow_blocklist']" name="privacy.allow_blocklist">+ {{ $t('settings.privacy.allowBlocklist') }}+ </b-switch></b-field>- <b-field :label="$t('settings.privacy.allowPrefs')" :message="$t('settings.privacy.allowPrefsHelp')">- <b-switch v-model="data['privacy.allow_preferences']" name="privacy.allow_blocklist" />+ <b-field :message="$t('settings.privacy.allowPrefsHelp')">+ <b-switch v-model="data['privacy.allow_preferences']" name="privacy.allow_blocklist">+ {{ $t('settings.privacy.allowPrefs') }}+ </b-switch></b-field>- <b-field :label="$t('settings.privacy.allowExport')" :message="$t('settings.privacy.allowExportHelp')">- <b-switch v-model="data['privacy.allow_export']" name="privacy.allow_export" />+ <b-field :message="$t('settings.privacy.allowExportHelp')">+ <b-switch v-model="data['privacy.allow_export']" name="privacy.allow_export">+ {{ $t('settings.privacy.allowExport') }}+ </b-switch></b-field>- <b-field :label="$t('settings.privacy.allowWipe')" :message="$t('settings.privacy.allowWipeHelp')">- <b-switch v-model="data['privacy.allow_wipe']" name="privacy.allow_wipe" />+ <b-field :message="$t('settings.privacy.allowWipeHelp')">+ <b-switch v-model="data['privacy.allow_wipe']" name="privacy.allow_wipe">+ {{ $t('settings.privacy.allowWipe') }}+ </b-switch></b-field>- <b-field :label="$t('settings.privacy.recordOptinIP')" :message="$t('settings.privacy.recordOptinIPHelp')">- <b-switch v-model="data['privacy.record_optin_ip']" name="privacy.record_optin_ip" />+ <b-field :message="$t('settings.privacy.recordOptinIPHelp')">+ <b-switch v-model="data['privacy.record_optin_ip']" name="privacy.record_optin_ip">+ {{ $t('settings.privacy.recordOptinIP') }}+ </b-switch></b-field><hr />diff --git a/frontend/src/views/settings/security.vue b/frontend/src/views/settings/security.vueindex 0f51aa40..eeb32889 100644--- a/frontend/src/views/settings/security.vue+++ b/frontend/src/views/settings/security.vue@@ -2,88 +2,76 @@<div class="items"><div class="columns"><div class="column is-3">- <b-field :label="$t('settings.security.enableOIDC')" :message="$t('settings.security.OIDCHelp')">- <b-switch v-model="data['security.oidc']['enabled']" name="security.oidc" />+ <b-field :message="$t('settings.security.OIDCHelp')">+ <b-switch v-model="data['security.oidc']['enabled']" name="security.oidc">+ {{ $t('settings.security.enableOIDC') }}+ </b-switch></b-field></div><div class="column is-9">- <div class="columns">- <div class="column is-7">- <b-field :label="$t('settings.security.OIDCURL')" label-position="on-border">- <div>- <b-input v-model="data['security.oidc']['provider_url']" name="oidc.provider_url"- placeholder="https://login.yoursite.com" :disabled="!data['security.oidc']['enabled']"- :maxlength="300" required type="url" pattern="https?://.*" />-- <div class="spaced-links is-size-7 mt-2" :class="{ 'disabled': !data['security.oidc']['enabled'] }">- <a href="#" @click.prevent="() => setProvider('google')">Google</a>- <a href="#" @click.prevent="() => setProvider('microsoft')">Microsoft</a>- <a href="#" @click.prevent="() => setProvider('apple')">Apple</a>- </div>- </div>- </b-field>+ <b-field :label="$t('settings.security.OIDCURL')" label-position="on-border">+ <div>+ <b-input v-model="data['security.oidc']['provider_url']" name="oidc.provider_url"+ placeholder="https://login.yoursite.com" :disabled="!data['security.oidc']['enabled']" :maxlength="300"+ required type="url" pattern="https?://.*" />++ <div class="spaced-links is-size-7 mt-2" :class="{ 'disabled': !data['security.oidc']['enabled'] }">+ <a href="#" @click.prevent="() => setProvider('google')">Google</a>+ <a href="#" @click.prevent="() => setProvider('microsoft')">Microsoft</a>+ <a href="#" @click.prevent="() => setProvider('apple')">Apple</a>+ </div></div>- <div class="column is-5">- <b-field :label="$t('settings.security.OIDCName')" label-position="on-border">- <b-input v-model="data['security.oidc']['provider_name']" name="oidc.provider_name" ref="provider_name"- :disabled="!data['security.oidc']['enabled']" :maxlength="200" />- </b-field>- </div>- </div>+ </b-field>- <div class="columns">- <div class="column is-6">- <b-field :label="$t('settings.security.OIDCClientID')" label-position="on-border">- <b-input v-model="data['security.oidc']['client_id']" name="oidc.client_id" ref="client_id"- :disabled="!data['security.oidc']['enabled']" :maxlength="200" required />- </b-field>- </div>+ <b-field :label="$t('settings.security.OIDCName')" label-position="on-border">+ <b-input v-model="data['security.oidc']['provider_name']" name="oidc.provider_name" ref="provider_name"+ :disabled="!data['security.oidc']['enabled']" :maxlength="200" />+ </b-field>- <div class="column is-6">- <b-field :label="$t('settings.security.OIDCClientSecret')" label-position="on-border">- <b-input v-model="data['security.oidc']['client_secret']" name="oidc.client_secret" type="password"- :disabled="!data['security.oidc']['enabled']" :maxlength="200" required />- </b-field>- </div>- </div>+ <b-field :label="$t('settings.security.OIDCClientID')" label-position="on-border">+ <b-input v-model="data['security.oidc']['client_id']" name="oidc.client_id" ref="client_id"+ :disabled="!data['security.oidc']['enabled']" :maxlength="200" required />+ </b-field>++ <b-field :label="$t('settings.security.OIDCClientSecret')" label-position="on-border">+ <b-input v-model="data['security.oidc']['client_secret']" name="oidc.client_secret" type="password"+ :disabled="!data['security.oidc']['enabled']" :maxlength="200" required />+ </b-field><hr />- <div class="columns">- <div class="column is-4">- <b-field :label="$t('settings.security.OIDCAutoCreateUsers')"- :message="$t('settings.security.OIDCAutoCreateUsersHelp')">- <b-switch v-model="data['security.oidc']['auto_create_users']"- :disabled="!data['security.oidc']['enabled']" name="oidc.auto_create_users" />- </b-field>- </div>- <div class="column is-4">- <b-field :label="$t('settings.security.OIDCDefaultUserRole')" label-position="on-border"- :message="$t('settings.security.OIDCDefaultRoleHelp')">- <b-select v-model="data['security.oidc']['default_user_role_id']"- :disabled="!data['security.oidc']['enabled'] || !data['security.oidc']['auto_create_users']"- name="oidc.default_user_role_id" expanded>- <option v-for="role in userRoles" :key="role.id" :value="role.id">- {{ role.name }}- </option>- </b-select>- </b-field>- </div>- <div class="column is-4">- <b-field :label="$t('settings.security.OIDCDefaultListRole')" label-position="on-border"- :message="$t('settings.security.OIDCDefaultRoleHelp')">- <b-select v-model="data['security.oidc']['default_list_role_id']"- :disabled="!data['security.oidc']['enabled'] || !data['security.oidc']['auto_create_users']"- name="oidc.default_list_role_id" expanded>- <option :value="null">— {{ $t("globals.terms.none") }} —</option>- <option v-for="role in listRoles" :key="role.id" :value="role.id">- {{ role.name }}- </option>- </b-select>- </b-field>- </div>- </div>++ <b-field :message="$t('settings.security.OIDCAutoCreateUsersHelp')">+ <b-switch v-model="data['security.oidc']['auto_create_users']" :disabled="!data['security.oidc']['enabled']"+ name="oidc.auto_create_users">+ {{ $t('settings.security.OIDCAutoCreateUsers') }}+ </b-switch>+ </b-field>++ <b-field :label="$t('settings.security.OIDCDefaultUserRole')" label-position="on-border"+ :message="$t('settings.security.OIDCDefaultRoleHelp')">+ <b-select v-model="data['security.oidc']['default_user_role_id']"+ :disabled="!data['security.oidc']['enabled'] || !data['security.oidc']['auto_create_users']"+ name="oidc.default_user_role_id" expanded>+ <option v-for="role in userRoles" :key="role.id" :value="role.id">+ {{ role.name }}+ </option>+ </b-select>+ </b-field>++ <b-field :label="$t('settings.security.OIDCDefaultListRole')" label-position="on-border"+ :message="$t('settings.security.OIDCDefaultRoleHelp')">+ <b-select v-model="data['security.oidc']['default_list_role_id']"+ :disabled="!data['security.oidc']['enabled'] || !data['security.oidc']['auto_create_users']"+ name="oidc.default_list_role_id" expanded>+ <option :value="null">— {{ $t("globals.terms.none") }} —</option>+ <option v-for="role in listRoles" :key="role.id" :value="role.id">+ {{ role.name }}+ </option>+ </b-select>+ </b-field><hr />+<b-field :label="$t('settings.security.OIDCRedirectURL')"><code><copy-text :text="`${serverConfig.root_url}/auth/oidc`" /></code></b-field>@@ -97,8 +85,10 @@<hr /><div class="columns"><div class="column is-3">- <b-field :label="$t('settings.security.enableCaptcha')" :message="$t('settings.security.enableCaptchaHelp')">- <b-switch v-model="captchaEnabled" name="security.captcha" />+ <b-field :message="$t('settings.security.enableCaptchaHelp')">+ <b-switch v-model="captchaEnabled" name="security.captcha">+ {{ $t('settings.security.enableCaptcha') }}+ </b-switch></b-field></div><div class="column is-9" v-if="captchaEnabled">diff --git a/frontend/src/views/settings/smtp.vue b/frontend/src/views/settings/smtp.vueindex b3edc37f..d16ac685 100644--- a/frontend/src/views/settings/smtp.vue+++ b/frontend/src/views/settings/smtp.vue@@ -4,8 +4,10 @@<div class="block box" v-for="(item, n) in form.smtp" :key="n"><div class="columns"><div class="column is-2">- <b-field :label="$t('globals.buttons.enabled')">- <b-switch v-model="item.enabled" name="enabled" :native-value="true" data-cy="btn-enable-smtp" />+ <b-field>+ <b-switch v-model="item.enabled" name="enabled" :native-value="true" data-cy="btn-enable-smtp">+ {{ $t('globals.buttons.enabled') }}+ </b-switch></b-field><b-field v-if="form.smtp.length > 1"><a @click.prevent="$utils.confirm(null, () => removeSMTP(n))" href="#" data-cy="btn-delete-smtp">@@ -33,9 +35,9 @@</div><!-- host --><div class="columns">- <div class="column is-2">+ <div class="column is-3"><b-field :label="$t('settings.mailserver.authProtocol')" label-position="on-border">- <b-select v-model="item.auth_protocol" name="auth_protocol">+ <b-select v-model="item.auth_protocol" name="auth_protocol" expanded><option value="login">LOGIN</option>@@ -102,10 +104,11 @@</option></b-select></b-field>- <b-field :label="$t('settings.mailserver.skipTLS')" expanded- :message="$t('settings.mailserver.skipTLSHelp')">+ <b-field expanded :message="$t('settings.mailserver.skipTLSHelp')"><b-switch v-model="item.tls_skip_verify" :disabled="item.tls_type === 'none'"- name="item.tls_skip_verify" />+ name="item.tls_skip_verify">+ {{ $t('settings.mailserver.skipTLS') }}+ </b-switch></b-field></b-field></div>