moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notification controls: redesign entirely

This commit is contained in:
William Pitcock 2019-05-25 23:44:36 +00:00
parent ac97cd3e46
commit 855566f887
2 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/components/user_settings/user_settings.vue
View File

@ -167,47 +167,39 @@
</div> </div>
</div> </div>
<div :label="$t('settings.interactions_tab')" v-if="pleromaBackend"> <div :label="$t('settings.notifications')" v-if="pleromaBackend">
<div class="setting-item"> <div class="setting-item">
<h2>{{$t('settings.notifications')}}</h2> <div class="select-multiple">
<ul class="setting-list"> <span class="label">{{$t('settings.notification_setting')}}</span>
<li> <ul class="option-list">
<input type="checkbox" id="notification-setting-local" v-model="notificationSettings.local"> <li>
<label for="notification-setting-local"> <input type="checkbox" id="notification-setting-follows" v-model="notificationSettings.follows">
{{$t('settings.notification_setting_local')}} <label for="notification-setting-follows">
</label> {{$t('settings.notification_setting_follows')}}
</li> </label>
<li> </li>
<input type="checkbox" id="notification-setting-remote" v-model="notificationSettings.remote"> <li>
<label for="notification-setting-remote"> <input type="checkbox" id="notification-setting-followers" v-model="notificationSettings.followers">
{{$t('settings.notification_setting_remote')}} <label for="notification-setting-followers">
</label> {{$t('settings.notification_setting_followers')}}
</li> </label>
<li> </li>
<input type="checkbox" id="notification-setting-follows" v-model="notificationSettings.follows"> <li>
<label for="notification-setting-follows"> <input type="checkbox" id="notification-setting-non-follows" v-model="notificationSettings.non_follows">
{{$t('settings.notification_setting_follows')}} <label for="notification-setting-non-follows">
</label> {{$t('settings.notification_setting_non_follows')}}
</li> </label>
<li> </li>
<input type="checkbox" id="notification-setting-non-follows" v-model="notificationSettings.non_follows"> <li>
<label for="notification-setting-non-follows"> <input type="checkbox" id="notification-setting-non-followers" v-model="notificationSettings.non_followers">
{{$t('settings.notification_setting_non_follows')}} <label for="notification-setting-non-followers">
</label> {{$t('settings.notification_setting_non_followers')}}
</li> </label>
<li> </li>
<input type="checkbox" id="notification-setting-followers" v-model="notificationSettings.followers"> </ul>
<label for="notification-setting-followers"> </div>
{{$t('settings.notification_setting_followers')}} <p>{{$t('settings.notification_mutes')}}</p>
</label> <p>{{$t('settings.notification_blocks')}}</p>
</li>
<li>
<input type="checkbox" id="notification-setting-non-followers" v-model="notificationSettings.non_followers">
<label for="notification-setting-non-followers">
{{$t('settings.notification_setting_non_followers')}}
</label>
</li>
</ul>
<button class="btn btn-default" @click="updateNotificationSettings">{{$t('general.submit')}}</button> <button class="btn btn-default" @click="updateNotificationSettings">{{$t('general.submit')}}</button>
</div> </div>
</div> </div>

14
src/i18n/en.json
View File

@ -209,7 +209,6 @@
"loop_video": "Loop videos", "loop_video": "Loop videos",
"loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")", "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
"mutes_tab": "Mutes", "mutes_tab": "Mutes",
"interactions_tab": "Interactions",
"play_videos_in_modal": "Play videos directly in the media viewer", "play_videos_in_modal": "Play videos directly in the media viewer",
"use_contain_fit": "Don't crop the attachment in thumbnails", "use_contain_fit": "Don't crop the attachment in thumbnails",
"name": "Name", "name": "Name",
@ -278,12 +277,13 @@
"true": "yes" "true": "yes"
}, },
"notifications": "Notifications", "notifications": "Notifications",
"notification_setting_local": "Show notifications from local users", "notification_setting": "Receive notifications from:",
"notification_setting_remote": "Show notifications from remote users", "notification_setting_follows": "Users you follow",
"notification_setting_follows": "Show notifications from users you follow", "notification_setting_non_follows": "Users you do not follow",
"notification_setting_non_follows": "Show notifications from users you do not follow", "notification_setting_followers": "Users who follow you",
"notification_setting_followers": "Show notifications from users who follow you", "notification_setting_non_followers": "Users who do not follow you",
"notification_setting_non_followers": "Show notifications from users who do not follow you", "notification_mutes": "To stop receiving notifications from a specific user, use a mute.",
"notification_blocks": "Blocking a user stops all notifications as well as unsubscribes them.",
"enable_web_push_notifications": "Enable web push notifications", "enable_web_push_notifications": "Enable web push notifications",
"style": { "style": {
"switcher": { "switcher": {