diff options
Diffstat (limited to 'src/components/settings_modal')
8 files changed, 155 insertions, 64 deletions
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue index 3a7bd805..e0d825f2 100644 --- a/src/components/settings_modal/helpers/boolean_setting.vue +++ b/src/components/settings_modal/helpers/boolean_setting.vue @@ -1,7 +1,7 @@ <template> <label - class="BooleanSetting" v-if="matchesExpertLevel" + class="BooleanSetting" > <Checkbox :checked="state" @@ -14,7 +14,7 @@ > <slot /> </span> - <ModifiedIndicator :changed="isChanged" /><ServerSideIndicator :serverSide="isServerSide" /> </Checkbox> + <ModifiedIndicator :changed="isChanged" /><ServerSideIndicator :server-side="isServerSide" /> </Checkbox> </label> </template> diff --git a/src/components/settings_modal/helpers/choice_setting.vue b/src/components/settings_modal/helpers/choice_setting.vue index 845886ca..54f5d0a7 100644 --- a/src/components/settings_modal/helpers/choice_setting.vue +++ b/src/components/settings_modal/helpers/choice_setting.vue @@ -1,7 +1,7 @@ <template> <label - class="ChoiceSetting" v-if="matchesExpertLevel" + class="ChoiceSetting" > <slot /> <Select @@ -19,7 +19,7 @@ </option> </Select> <ModifiedIndicator :changed="isChanged" /> - <ServerSideIndicator :serverSide="isServerSide" /> + <ServerSideIndicator :server-side="isServerSide" /> </label> </template> diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue index 0aad1abb..1805c77f 100644 --- a/src/components/settings_modal/settings_modal.vue +++ b/src/components/settings_modal/settings_modal.vue @@ -109,8 +109,8 @@ </template> </Popover> - <Checkbox v-model="expertLevel" > - {{ $t("settings.expert_mode")}} + <Checkbox v-model="expertLevel"> + {{ $t("settings.expert_mode") }} </Checkbox> </div> </div> diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue index 0352e887..e60a8a85 100644 --- a/src/components/settings_modal/tabs/filtering_tab.vue +++ b/src/components/settings_modal/tabs/filtering_tab.vue @@ -21,8 +21,8 @@ </li> <li> <BooleanSetting - :disabled="hideFilteredStatuses" v-if="user" + :disabled="hideFilteredStatuses" path="hideMutedThreads" > {{ $t('settings.hide_muted_threads') }} @@ -30,8 +30,8 @@ </li> <li> <BooleanSetting - :disabled="hideFilteredStatuses" v-if="user" + :disabled="hideFilteredStatuses" path="hideMutedPosts" > {{ $t('settings.hide_muted_posts') }} @@ -40,15 +40,18 @@ </ul> </li> <li> - <BooleanSetting path="hidePostStats" expert="1"> + <BooleanSetting + path="hidePostStats" + expert="1" + > {{ $t('settings.hide_post_stats') }} </BooleanSetting> </li> <ChoiceSetting + v-if="user" id="replyVisibility" path="replyVisibility" :options="replyVisibilityOptions" - v-if="user" > {{ $t('settings.replies_in_timeline') }} </ChoiceSetting> @@ -87,7 +90,10 @@ </li> </ul> </div> - <div class="setting-item" v-if="expertLevel > 0"> + <div + v-if="expertLevel > 0" + class="setting-item" + > <h2>{{ $t('settings.user_profiles') }}</h2> <ul class="setting-list"> <li> diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js index 9e4e282f..fe7deb6e 100644 --- a/src/components/settings_modal/tabs/general_tab.js +++ b/src/components/settings_modal/tabs/general_tab.js @@ -41,7 +41,7 @@ const GeneralTab = { ChoiceSetting, InterfaceLanguageSwitcher, ScopeSelector, - ServerSideIndicator, + ServerSideIndicator }, computed: { postFormats () { diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index 7944b03c..d4196c3d 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -27,7 +27,7 @@ </BooleanSetting> </li> <li> - <BooleanSetting path="streaming" > + <BooleanSetting path="streaming"> {{ $t('settings.streaming') }} </BooleanSetting> <ul @@ -45,7 +45,10 @@ </ul> </li> <li> - <BooleanSetting path="useStreamingApi" expert="1"> + <BooleanSetting + path="useStreamingApi" + expert="1" + > {{ $t('settings.useStreamingApi') }} <br> <small> @@ -54,22 +57,34 @@ </BooleanSetting> </li> <li> - <BooleanSetting path="virtualScrolling" expert="1"> + <BooleanSetting + path="virtualScrolling" + expert="1" + > {{ $t('settings.virtual_scrolling') }} </BooleanSetting> </li> <li> - <BooleanSetting path="alwaysShowNewPostButton" expert="1"> + <BooleanSetting + path="alwaysShowNewPostButton" + expert="1" + > {{ $t('settings.always_show_post_button') }} </BooleanSetting> </li> <li> - <BooleanSetting path="autohideFloatingPostButton" expert="1"> + <BooleanSetting + path="autohideFloatingPostButton" + expert="1" + > {{ $t('settings.autohide_floating_post_button') }} </BooleanSetting> </li> <li v-if="instanceShoutboxPresent"> - <BooleanSetting path="hideShoutbox" expert="1"> + <BooleanSetting + path="hideShoutbox" + expert="1" + > {{ $t('settings.hide_shoutbox') }} </BooleanSetting> </li> @@ -84,18 +99,28 @@ </BooleanSetting> </li> <li> - <BooleanSetting path="emojiReactionsOnTimeline" expert="1"> + <BooleanSetting + path="emojiReactionsOnTimeline" + expert="1" + > {{ $t('settings.emoji_reactions_on_timeline') }} </BooleanSetting> </li> <li> - <BooleanSetting path="serverSide_stripRichContent" expert="1" v-if="user"> + <BooleanSetting + v-if="user" + path="serverSide_stripRichContent" + expert="1" + > {{ $t('settings.no_rich_text_description') }} </BooleanSetting> </li> <h3>{{ $t('settings.attachments') }}</h3> <li> - <BooleanSetting path="useContainFit" expert="1"> + <BooleanSetting + path="useContainFit" + expert="1" + > {{ $t('settings.use_contain_fit') }} </BooleanSetting> </li> @@ -107,7 +132,8 @@ <ul class="setting-list suboptions"> <li> <BooleanSetting - path="preloadImage" expert="1" + path="preloadImage" + expert="1" :disabled="!hideNsfw" > {{ $t('settings.preload_images') }} @@ -115,7 +141,8 @@ </li> <li> <BooleanSetting - path="useOneClickNsfw" expert="1" + path="useOneClickNsfw" + expert="1" :disabled="!hideNsfw" > {{ $t('settings.use_one_click_nsfw') }} @@ -123,7 +150,10 @@ </li> </ul> <li> - <BooleanSetting path="loopVideo" expert="1"> + <BooleanSetting + path="loopVideo" + expert="1" + > {{ $t('settings.loop_video') }} </BooleanSetting> <ul @@ -132,7 +162,8 @@ > <li> <BooleanSetting - path="loopVideoSilentOnly" expert="1" + path="loopVideoSilentOnly" + expert="1" :disabled="!loopVideo || !loopSilentAvailable" > {{ $t('settings.loop_video_silent_only') }} @@ -147,7 +178,10 @@ </ul> </li> <li> - <BooleanSetting path="playVideosInModal" expert="1"> + <BooleanSetting + path="playVideosInModal" + expert="1" + > {{ $t('settings.play_videos_in_modal') }} </BooleanSetting> </li> @@ -165,51 +199,74 @@ class="setting-list suboptions" > <li v-if="mentionLinkDisplay === 'short'"> - <BooleanSetting path="mentionLinkShowTooltip" expert="1"> + <BooleanSetting + path="mentionLinkShowTooltip" + expert="1" + > {{ $t('settings.mention_link_show_tooltip') }} </BooleanSetting> </li> </ul> - <li> - <BooleanSetting path="useAtIcon" expert="1"> - {{ $t('settings.use_at_icon') }} - </BooleanSetting> - </li> - <li> - <BooleanSetting path="mentionLinkShowAvatar"> - {{ $t('settings.mention_link_show_avatar') }} - </BooleanSetting> - </li> - <li> - <BooleanSetting path="mentionLinkFadeDomain" expert="1"> - {{ $t('settings.mention_link_fade_domain') }} - </BooleanSetting> - </li> - <li v-if="user"> - <BooleanSetting path="mentionLinkBoldenYou" expert="1"> - {{ $t('settings.mention_link_bolden_you') }} - </BooleanSetting> - </li> - <h3 v-if="expertLevel > 0">{{ $t('settings.fun') }}</h3> <li> - <BooleanSetting path="greentext" expert="1"> + <BooleanSetting + path="useAtIcon" + expert="1" + > + {{ $t('settings.use_at_icon') }} + </BooleanSetting> + </li> + <li> + <BooleanSetting path="mentionLinkShowAvatar"> + {{ $t('settings.mention_link_show_avatar') }} + </BooleanSetting> + </li> + <li> + <BooleanSetting + path="mentionLinkFadeDomain" + expert="1" + > + {{ $t('settings.mention_link_fade_domain') }} + </BooleanSetting> + </li> + <li v-if="user"> + <BooleanSetting + path="mentionLinkBoldenYou" + expert="1" + > + {{ $t('settings.mention_link_bolden_you') }} + </BooleanSetting> + </li> + <h3 v-if="expertLevel > 0"> + {{ $t('settings.fun') }} + </h3> + <li> + <BooleanSetting + path="greentext" + expert="1" + > {{ $t('settings.greentext') }} </BooleanSetting> </li> <li v-if="user"> - <BooleanSetting path="mentionLinkShowYous" expert="1"> + <BooleanSetting + path="mentionLinkShowYous" + expert="1" + > {{ $t('settings.show_yous') }} </BooleanSetting> </li> </ul> </div> - <div class="setting-item" v-if="user"> + <div + v-if="user" + class="setting-item" + > <h2>{{ $t('settings.composing') }}</h2> <ul class="setting-list"> <li> <label for="default-vis"> - {{ $t('settings.default_vis') }} <ServerSideIndicator :serverSide="true"/> + {{ $t('settings.default_vis') }} <ServerSideIndicator :server-side="true" /> <ScopeSelector class="scope-selector" :show-all="true" @@ -226,12 +283,18 @@ </BooleanSetting> </li> <li> - <BooleanSetting path="scopeCopy" expert="1"> + <BooleanSetting + path="scopeCopy" + expert="1" + > {{ $t('settings.scope_copy') }} </BooleanSetting> </li> <li> - <BooleanSetting path="alwaysShowSubjectInput" expert="1"> + <BooleanSetting + path="alwaysShowSubjectInput" + expert="1" + > {{ $t('settings.subject_input_always_show') }} </BooleanSetting> </li> @@ -255,22 +318,34 @@ </ChoiceSetting> </li> <li> - <BooleanSetting path="minimalScopesMode" expert="1"> + <BooleanSetting + path="minimalScopesMode" + expert="1" + > {{ $t('settings.minimal_scopes_mode') }} </BooleanSetting> </li> <li> - <BooleanSetting path="alwaysShowNewPostButton" expert="1"> + <BooleanSetting + path="alwaysShowNewPostButton" + expert="1" + > {{ $t('settings.always_show_post_button') }} </BooleanSetting> </li> <li> - <BooleanSetting path="autohideFloatingPostButton" expert="1"> + <BooleanSetting + path="autohideFloatingPostButton" + expert="1" + > {{ $t('settings.autohide_floating_post_button') }} </BooleanSetting> </li> <li> - <BooleanSetting path="padEmoji" expert="1"> + <BooleanSetting + path="padEmoji" + expert="1" + > {{ $t('settings.pad_emoji') }} </BooleanSetting> </li> diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue index 5e9ce91e..86be6095 100644 --- a/src/components/settings_modal/tabs/notifications_tab.vue +++ b/src/components/settings_modal/tabs/notifications_tab.vue @@ -46,16 +46,25 @@ </ul> </div> - <div class="setting-item" v-if="expertLevel > 0"> + <div + v-if="expertLevel > 0" + class="setting-item" + > <h2>{{ $t('settings.notification_setting_privacy') }}</h2> <ul class="setting-list"> <li> - <BooleanSetting path="webPushNotifications" expert="1"> + <BooleanSetting + path="webPushNotifications" + expert="1" + > {{ $t('settings.enable_web_push_notifications') }} </BooleanSetting> </li> <li> - <BooleanSetting path="serverSide_webPushHideContents" expert="1"> + <BooleanSetting + path="serverSide_webPushHideContents" + expert="1" + > {{ $t('settings.notification_setting_hide_notification_contents') }} </BooleanSetting> </li> diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue index 699fdcf4..e00f6e5b 100644 --- a/src/components/settings_modal/tabs/profile_tab.vue +++ b/src/components/settings_modal/tabs/profile_tab.vue @@ -101,7 +101,8 @@ <p class="visibility-notice"> {{ $t('settings.avatar_size_instruction') }} </p> - <div class="current-avatar-container"> <img + <div class="current-avatar-container"> + <img :src="user.profile_image_url_original" class="current-avatar" > @@ -243,7 +244,7 @@ <BooleanSetting path="serverSide_hideFollowersCount" :disabled="!serverSide_hideFollowers" - > + > {{ $t('settings.hide_followers_count_description') }} </BooleanSetting> </li> @@ -261,7 +262,7 @@ <BooleanSetting path="serverSide_hideFollowsCount" :disabled="!serverSide_hideFollows" - > + > {{ $t('settings.hide_follows_count_description') }} </BooleanSetting> </li> |