From 6ba795ae8c3ada4e02768a2b3d13fda0d5f7cd3b Mon Sep 17 00:00:00 2001 From: hairlessbear Date: Fri, 15 May 2015 15:16:07 -0400 Subject: [PATCH] New style of pending quest display --- website/views/options/social/boss.jade | 62 +++++++++++++++----------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/website/views/options/social/boss.jade b/website/views/options/social/boss.jade index 6c61f6dd17..734dcc74c8 100644 --- a/website/views/options/social/boss.jade +++ b/website/views/options/social/boss.jade @@ -5,33 +5,43 @@ mixin boss(tavern, mobile) h3.panel-title(ng-if='group.quest.active==false')=env.t('questInvitation') + ' {{::Content.quests[group.quest.key].text()}}' h3.panel-title(ng-if='group.quest.active==true') {{::Content.quests[group.quest.key].text()}} .panel-body.modal-fixed-height - div(ng-if='group.quest.active==false') - div(class="quest_{{::group.quest.key}}") - div(ng-if='::Content.quests[group.quest.key].boss') - h4 {{::Content.quests[group.quest.key].boss.name()}} - p - strong=env.t('bossHP') + ': ' - | {{::Content.quests[group.quest.key].boss.hp}} - p - strong=env.t('bossStrength') + ': ' - | {{::Content.quests[group.quest.key].boss.str}} - div(ng-if='::Content.quests[group.quest.key].collect') - p(ng-repeat='(k,v) in ::Content.quests[group.quest.key].collect') - strong=env.t('collect') + ': ' - | {{::Content.quests[group.quest.key].collect[k].count}} {{::Content.quests[group.quest.key].collect[k].text()}} - div(ng-bind-html='::Content.quests[group.quest.key].notes()') - hr - table.table.table-striped - tr(ng-repeat='member in group.members') - td - span(ng-if=':: group.quest.leader && group.quest.leader==member._id && isMemberOfGroup(group.quest.leader,group) && isMemberOfPendingQuest(group.quest.leader,group)') - |*  - |{{::member.profile.name}} - td {{group.quest.members[member._id] === true ? env.t('accepted') : group.quest.members[member._id] === false ? env.t('rejected') : env.t('pending')}} + div(ng-if='group.quest.active==false' ng-init="selectedTab = 1") + ul.nav.nav-pills + li(ng-class="{active:selectedTab === 1}") + a(ng-click="selectedTab = 1") + ="Quest Details" + li(ng-class="{active:selectedTab === 2}") + a(ng-click="selectedTab = 2") + ="Invitation List" + div(ng-show="selectedTab === 1") + br + div(class="quest_{{::group.quest.key}}") + div(ng-if='::Content.quests[group.quest.key].boss') + h4 {{::Content.quests[group.quest.key].boss.name()}} + p + strong=env.t('bossHP') + ': ' + | {{::Content.quests[group.quest.key].boss.hp}} + p + strong=env.t('bossStrength') + ': ' + | {{::Content.quests[group.quest.key].boss.str}} + div(ng-if='::Content.quests[group.quest.key].collect') + p(ng-repeat='(k,v) in ::Content.quests[group.quest.key].collect') + strong=env.t('collect') + ': ' + | {{::Content.quests[group.quest.key].collect[k].count}} {{::Content.quests[group.quest.key].collect[k].text()}} + div(ng-bind-html='::Content.quests[group.quest.key].notes()') + div(ng-show="selectedTab === 2") + br + table.table.table-striped + tr(ng-repeat='member in group.members') + td + span(ng-if=':: group.quest.leader && group.quest.leader==member._id && isMemberOfGroup(group.quest.leader,group) && isMemberOfPendingQuest(group.quest.leader,group)') + |*  + |{{::member.profile.name}} + td {{group.quest.members[member._id] === true ? env.t('accepted') : group.quest.members[member._id] === false ? env.t('rejected') : env.t('pending')}} - span(ng-if=':: group.quest.leader && isMemberOfGroup(group.quest.leader,group) && isMemberOfPendingQuest(group.quest.leader,group)') - |*  - =env.t('questOwner') + span(ng-if=':: group.quest.leader && isMemberOfGroup(group.quest.leader,group) && isMemberOfPendingQuest(group.quest.leader,group)') + |*  + =env.t('questOwner') // This is commented-out until we have time to work out why it fails intermittently on the website and always on the mobile app (https://github.com/HabitRPG/habitrpg/issues/4074): // span(ng-if=':: group.quest.leader && isMemberOfGroup(group.quest.leader,group) && ! isMemberOfPendingQuest(group.quest.leader,group)') // =env.t('questOwnerNotInPendingQuest')