From 45c8bb06e2edfb53ce77512280c9731c04debd96 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 10 Sep 2015 18:08:51 -0400 Subject: [PATCH] Revert "feat(modals): Simplified scroll drop" This reverts commit 8b4d34da002bdcfced9516d2aabb5b1e67da96d4. --- common/locales/en/quests.json | 4 +--- website/views/shared/modals/quests.jade | 25 +++++++++---------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/common/locales/en/quests.json b/common/locales/en/quests.json index c4efc91895..27e45d5c9a 100644 --- a/common/locales/en/quests.json +++ b/common/locales/en/quests.json @@ -67,7 +67,5 @@ "startAQuest": "START A QUEST", "startQuest": "Start Quest", "whichQuestStart": "Which quest do you want to start?", - "getMoreQuests": "Get more quests", - "unlockedAQuest": "You unlocked a quest!", - "leveledUpReceivedQuest": "You leveled up to Level <%= level %> and received a quest scroll!" + "getMoreQuests": "Get more quests" } diff --git a/website/views/shared/modals/quests.jade b/website/views/shared/modals/quests.jade index a1db8cd0a5..9dce32c5ff 100644 --- a/website/views/shared/modals/quests.jade +++ b/website/views/shared/modals/quests.jade @@ -1,6 +1,5 @@ include ./quest-rewards include ../mixins -include ../avatar/generated_avatar mixin questInfo .pull-right-sm.text-center @@ -84,25 +83,19 @@ script(type='text/ng-template', id='modals/questInvitation.html') button.btn.btn-primary(ng-click='questAccept(party); $close()')=env.t('accept') script(type='text/ng-template', id='modals/questDrop.html') - .modal-body.text-center - h3=env.t('unlockedAQuest') + .quest-icon.pull-right(class='inventory_quest_scroll_{{::selectedQuest.key}}') + .modal-header + h4=env.t('messageDropQuest') + .modal-body h4 {{::selectedQuest.text()}} - .container-fluid - .row(ng-controller='UserCtrl') - .col-md-4 - .herobox - .character-sprites - +generatedAvatar - .col-md-4 - .herobox - .avatar-level(style='margin:4em auto auto 1.4em; position:static', ng-class='userLevelStyle(user)')=env.t('level')+' {{user.stats.lvl}}' - .col-md-4(style='margin-top:3.5em') - .quest-icon(class='inventory_quest_scroll_{{::selectedQuest.key}}') - h4!=env.t('leveledUpReceivedQuest', {level:'{{user.stats.lvl}}'}) + +questInfo + hr + .npc_ian.pull-left + p=env.t('dropQuestCongrats') .modal-footer + button.btn.btn-default(ng-click='closeQuest(); $close()')=env.t('questLater') button.btn.btn-primary(ng-click='inviteOrStartParty(group); $close()', ng-if='!party.members')=env.t('startAParty') button.btn.btn-primary(ng-click='questInit(); $close()', ng-if='party.members')=env.t('inviteParty') - button.btn.btn-default(ng-click='closeQuest(); $close()')=env.t('questLater') script(type='text/ng-template', id='modals/ownedQuests.html') .modal-header