summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-10-11 22:47:11 +0300
committerLauri Ojansivu <x@xet7.org>2018-10-11 22:47:11 +0300
commitb4402b72ac8beb93528b789d3d319d44dd483f29 (patch)
treeace57f5bf6d12522548a5bbc8813c00d91af6121 /client
parent6742dd05853352d68fdfbad1eec71365b4e53732 (diff)
parent23a35d9707f82391c74afbfbe47173815646e589 (diff)
downloadwekan-b4402b72ac8beb93528b789d3d319d44dd483f29.tar.gz
wekan-b4402b72ac8beb93528b789d3d319d44dd483f29.tar.bz2
wekan-b4402b72ac8beb93528b789d3d319d44dd483f29.zip
Merge branch 'edge' of https://github.com/Akuket/wekan into Akuket-edge
Diffstat (limited to 'client')
-rw-r--r--client/components/users/userHeader.jade18
-rw-r--r--client/components/users/userHeader.js20
2 files changed, 0 insertions, 38 deletions
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index a8fdb143..b6e10d8a 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -17,7 +17,6 @@ template(name="memberMenuPopup")
li: a.js-change-avatar {{_ 'edit-avatar'}}
li: a.js-change-password {{_ 'changePasswordPopup-title'}}
li: a.js-change-language {{_ 'changeLanguagePopup-title'}}
- li: a.js-edit-notification {{_ 'editNotificationPopup-title'}}
if currentUser.isAdmin
li: a.js-go-setting(href="{{pathFor 'setting'}}") {{_ 'admin-panel'}}
hr
@@ -50,23 +49,6 @@ template(name="editProfilePopup")
input.js-profile-email(type="email" value="{{emails.[0].address}}" readonly)
input.primary.wide(type="submit" value="{{_ 'save'}}")
-template(name="editNotificationPopup")
- ul.pop-over-list
- li
- a.js-toggle-tag-notify-watch
- i.fa.fa-eye.colorful
- | {{_ 'watching'}}
- if hasTag "notify-watch"
- i.fa.fa-check
- span.sub-name {{_ 'notify-watch'}}
- li
- a.js-toggle-tag-notify-participate
- i.fa.fa-bell.colorful
- | {{_ 'tracking'}}
- if hasTag "notify-participate"
- i.fa.fa-check
- span.sub-name {{_ 'notify-participate'}}
-
template(name="changePasswordPopup")
+atForm(state='changePwd')
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index d96a9b3d..63cbb14f 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -9,7 +9,6 @@ Template.memberMenuPopup.events({
'click .js-change-avatar': Popup.open('changeAvatar'),
'click .js-change-password': Popup.open('changePassword'),
'click .js-change-language': Popup.open('changeLanguage'),
- 'click .js-edit-notification': Popup.open('editNotification'),
'click .js-logout'(evt) {
evt.preventDefault();
@@ -89,25 +88,6 @@ Template.editProfilePopup.events({
},
});
-Template.editNotificationPopup.helpers({
- hasTag(tag) {
- const user = Meteor.user();
- return user && user.hasTag(tag);
- },
-});
-
-// we defined github like rules, see: https://github.com/settings/notifications
-Template.editNotificationPopup.events({
- 'click .js-toggle-tag-notify-participate'() {
- const user = Meteor.user();
- if (user) user.toggleTag('notify-participate');
- },
- 'click .js-toggle-tag-notify-watch'() {
- const user = Meteor.user();
- if (user) user.toggleTag('notify-watch');
- },
-});
-
// XXX For some reason the useraccounts autofocus isnt working in this case.
// See https://github.com/meteor-useraccounts/core/issues/384
Template.changePasswordPopup.onRendered(function () {