diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-07-26 18:36:44 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-26 18:36:44 +0300 |
commit | f337aed624dc412e550296e87a2c67e977fca80d (patch) | |
tree | 890d25923425f5d72c10d7cfbd1d225d3916e6c1 /src | |
parent | 948adda83efb3033c7fa429ae2db65c3929e6853 (diff) | |
parent | 805a2c3cc6e6f1b41a222365eb09319a1deaef5e (diff) |
Merge pull request #7652 from nextcloud/bugfix/noid/remove-unavailable-placeholder
Fix HTML validations in admin settings
Diffstat (limited to 'src')
-rw-r--r-- | src/components/AdminSettings/AllowedGroups.vue | 15 | ||||
-rw-r--r-- | src/components/AdminSettings/Command.vue | 2 | ||||
-rw-r--r-- | src/components/AdminSettings/GeneralSettings.vue | 7 | ||||
-rw-r--r-- | src/components/AdminSettings/HostedSignalingServer.vue | 2 |
4 files changed, 14 insertions, 12 deletions
diff --git a/src/components/AdminSettings/AllowedGroups.vue b/src/components/AdminSettings/AllowedGroups.vue index 4a5aeb568..204cd4495 100644 --- a/src/components/AdminSettings/AllowedGroups.vue +++ b/src/components/AdminSettings/AllowedGroups.vue @@ -33,8 +33,9 @@ {{ t('spreed', 'Users that cannot use Talk anymore will still be listed as participants in their previous conversations and also their chat messages will be kept.') }} </p> - <p class="allowed-groups-settings-content"> + <div class="allowed-groups-settings-content"> <Multiselect v-model="allowedGroups" + name="allow_groups_use_talk" class="allowed-groups-select" :options="groups" :placeholder="t('spreed', 'Limit using Talk')" @@ -54,11 +55,12 @@ @click="saveAllowedGroups"> {{ saveLabelAllowedGroups }} </Button> - </p> + </div> <h3>{{ t('spreed', 'Limit creating a public and group conversation') }}</h3> - <p class="allowed-groups-settings-content"> + <div class="allowed-groups-settings-content"> <Multiselect v-model="canStartConversations" + name="allow_groups_start_conversation" class="allowed-groups-select" :options="groups" :placeholder="t('spreed', 'Limit creating conversations')" @@ -78,19 +80,20 @@ @click="saveStartConversationsGroups"> {{ saveLabelStartConversations }} </Button> - </p> + </div> <h3>{{ t('spreed', 'Limit starting a call') }}</h3> - <p> + <div class="allowed-groups-settings-content"> <Multiselect id="start_calls" v-model="startCalls" + name="allow_groups_start_calls" :options="startCallOptions" :placeholder="t('spreed', 'Limit starting calls')" label="label" track-by="value" :disabled="loading || loadingStartCalls" @input="saveStartCalls" /> - </p> + </div> <p> <em>{{ t('spreed', 'When a call has started, everyone with access to the conversation can join the call.') }}</em> </p> diff --git a/src/components/AdminSettings/Command.vue b/src/components/AdminSettings/Command.vue index 46fb70aa1..f11110bab 100644 --- a/src/components/AdminSettings/Command.vue +++ b/src/components/AdminSettings/Command.vue @@ -41,7 +41,7 @@ </template> <script> -import { Fragment } from 'vue-fragment' +import { Fragment } from 'vue-frag' export default { name: 'Command', diff --git a/src/components/AdminSettings/GeneralSettings.vue b/src/components/AdminSettings/GeneralSettings.vue index 0ed9d9df9..84a6b8add 100644 --- a/src/components/AdminSettings/GeneralSettings.vue +++ b/src/components/AdminSettings/GeneralSettings.vue @@ -26,17 +26,18 @@ <h3>{{ t('spreed', 'Default notification settings') }}</h3> - <p> + <div class="paragraph"> <label for="default_group_notification">{{ t('spreed', 'Default group notification') }}</label> <Multiselect id="default_group_notification" v-model="defaultGroupNotification" + name="default_group_notification" :options="defaultGroupNotificationOptions" :placeholder="t('spreed', 'Default group notification for new groups')" label="label" track-by="value" :disabled="loading || loadingDefaultGroupNotification" @input="saveDefaultGroupNotification" /> - </p> + </div> <h3>{{ t('spreed', 'Integration into other apps') }}</h3> @@ -143,7 +144,7 @@ h3 { margin-top: 24px; } -p { +div.paragraph { display: flex; align-items: center; diff --git a/src/components/AdminSettings/HostedSignalingServer.vue b/src/components/AdminSettings/HostedSignalingServer.vue index 9b50996d4..ccf77de31 100644 --- a/src/components/AdminSettings/HostedSignalingServer.vue +++ b/src/components/AdminSettings/HostedSignalingServer.vue @@ -60,7 +60,6 @@ <h4>{{ t('spreed', 'Language') }}</h4> <select v-model="hostedHPBLanguage" name="hosted_hpb_language" - :placeholder="t('spreed', 'Language')" :disabled="loading" :aria-label="t('spreed', 'Language')"> <option v-for="l in languages.commonLanguages" :key="l.code" :value="l.code"> @@ -75,7 +74,6 @@ <h4>{{ t('spreed', 'Country') }}</h4> <select v-model="hostedHPBCountry" name="hosted_hpb_country" - :placeholder="t('spreed', 'Country')" :disabled="loading" :aria-label="t('spreed', 'Country')"> <option v-for="c in countries" :key="c.code" :value="c.code"> |