Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved accept/reject buttons to the bottom, and simplified logic for quest leader buttons

Browse Source
This commit is contained in:
hairlessbear
2015-06-14 20:12:50 -04:00
parent 22ca76cf40
commit fbf1d64a04
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/views/options/social/quests/questNotActive.jade
+8 -7
View File
@@ -1,9 +1,4 @@
div(ng-if='group.quest.active==false')
span(ng-if='user.party.quest.RSVPNeeded')
// Buttons manually set RSVPNeeded to avoid synchronization errors
button.btn.btn-success(ng-click='party.$questAccept(); set({"party.quest.RSVPNeeded":false})')=env.t('accept')
button.btn.btn-danger(ng-click='party.$questReject(); set({"party.quest.RSVPNeeded":false})')=env.t('reject')
hr
tabset
tab(heading=env.t('invitations'))
+participants(false)
@@ -25,5 +20,11 @@ div(ng-if='group.quest.active==false')
.npc_ian.pull-left
p=env.t('questStart')
button.btn.btn-sm.btn-warning(ng-if=':: group.quest.leader && group.quest.leader==user._id && isMemberOfGroup(group.quest.leader,group) && isMemberOfPendingQuest(group.quest.leader,group)', ng-click='party.$questAccept({"force":true})')=env.t('begin')
button.btn.btn-sm.btn-danger(ng-if=':: (group.quest.leader && group.quest.leader==user._id && isMemberOfGroup(group.quest.leader,group) && isMemberOfPendingQuest(group.quest.leader,group))', ng-click='questCancel(party)')=env.t('cancel')
span(ng-if='user.party.quest.RSVPNeeded')
// Buttons manually set RSVPNeeded to avoid synchronization errors
button.btn.btn-sm.btn-success(ng-click='party.$questAccept(); set({"party.quest.RSVPNeeded":false})')=env.t('accept')
button.btn.btn-sm.btn-danger(ng-click='party.$questReject(); set({"party.quest.RSVPNeeded":false})')=env.t('reject')
span(ng-if='::group.quest.leader && group.quest.leader==user._id && isMemberOfGroup(group.quest.leader,group) && isMemberOfPendingQuest(group.quest.leader,group)')
button.btn.btn-sm.btn-warning(ng-click='party.$questAccept({"force":true})')=env.t('begin')
button.btn.btn-sm.btn-danger(ng-click='questCancel(party)')=env.t('cancel')