Chapril/mobilizon.chapril.org-mobilizon
Chapril
/
mobilizon.chapril.org-mobilizon
24
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'move-event-updates-disabled-checkbox-to-text' into 'master' 

Move event update disabled checkbox to text

See merge request framasoft/mobilizon!443
This commit is contained in:
Thomas Citharel 2020-06-05 16:07:32 +02:00
parent f1b1617df9 0ee2fad7c7
commit 86e43c259e
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/views/Settings/AccountSettings.vue
View File

@ -279,11 +279,11 @@ export default class AccountSettings extends Vue {
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
@import "@/variables.scss"; @import "@/variables.scss";
.setting-title { .setting-title {
margin-top: 3rem; margin-top: 1rem;
h2 { h2 {
display: inline; display: inline;
@ -293,7 +293,9 @@ export default class AccountSettings extends Vue {
font-size: 1.25rem; font-size: 1.25rem;
} }
} }
</style>
<style lang="scss" scoped>
.cancel-button { .cancel-button {
margin-top: 2rem; margin-top: 2rem;
} }

23
js/src/views/Settings/Notifications.vue
View File

@ -1,14 +1,19 @@
<template> <template>
<div v-if="loggedUser"> <div v-if="loggedUser">
<div class="setting-title">
<h2>{{ $t("Participation notifications") }}</h2>
</div>
<div class="field"> <div class="field">
<b-checkbox disabled v-model="notificationEventUpdates"> <strong>{{
<strong>{{ $t("Important event updates") }}</strong> $t("We'll always send you emails to notifiy about important event updates")
<p> }}</strong>
{{ <p>
$t("Like title update, start or end date change, event being confirmed or cancelled.") {{
}} $t(
</p> "Like title or physical address update, start or end date change or event being confirmed or cancelled."
</b-checkbox> )
}}
</p>
</div> </div>
<div class="field"> <div class="field">
<b-checkbox v-model="notificationOnDay" @input="updateSetting({ notificationOnDay })"> <b-checkbox v-model="notificationOnDay" @input="updateSetting({ notificationOnDay })">
@ -62,8 +67,6 @@ import { ICurrentUser } from "../../types/current-user.model";
export default class Notifications extends Vue { export default class Notifications extends Vue {
loggedUser!: ICurrentUser; loggedUser!: ICurrentUser;
notificationEventUpdates = true;
notificationOnDay = true; notificationOnDay = true;
notificationEachWeek = false; notificationEachWeek = false;