From b775b8f39906c696c4d3d494f22db01696bba5cb Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Wed, 9 Sep 2015 14:27:34 -0400
Subject: [PATCH] feat(modals): Simplified scroll drop

Conflicts:
	website/views/shared/modals/quests.jade
---
 common/locales/en/quests.json           |  4 +++-
 website/views/shared/modals/quests.jade | 27 ++++++++++++++++---------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/common/locales/en/quests.json b/common/locales/en/quests.json
index 590b7e9f38..fe64b27831 100644
--- a/common/locales/en/quests.json
+++ b/common/locales/en/quests.json
@@ -68,5 +68,7 @@
     "startAQuest": "START A QUEST",
     "startQuest": "Start Quest",
     "whichQuestStart": "Which quest do you want to start?",
-    "getMoreQuests": "Get more quests"
+    "getMoreQuests": "Get more quests",
+    "unlockedAQuest": "You unlocked a quest!",
+    "leveledUpReceivedQuest": "You leveled up to <strong>Level <%= level %></strong> and received a quest scroll!"
 }
diff --git a/website/views/shared/modals/quests.jade b/website/views/shared/modals/quests.jade
index 55a778433e..e9b6418e94 100644
--- a/website/views/shared/modals/quests.jade
+++ b/website/views/shared/modals/quests.jade
@@ -1,5 +1,6 @@
 include ./quest-rewards
 include ../mixins
+include ../avatar/generated_avatar
 
 mixin questInfo
   .pull-right-sm.text-center
@@ -83,19 +84,25 @@ script(type='text/ng-template', id='modals/questInvitation.html')
     button.btn.btn-primary(ng-click='questAccept(); $close()')=env.t('accept')
 
 script(type='text/ng-template', id='modals/questDrop.html')
-  .quest-icon.pull-right(class='inventory_quest_scroll_{{::selectedQuest.key}}')
-  .modal-header
-    h4=env.t('messageDropQuest')
-  .modal-body
+  .modal-body.text-center
+    h3=env.t('unlockedAQuest')
     h4 {{::selectedQuest.text()}}
-    +questInfo
-    hr
-    .npc_ian.pull-left
-    p=env.t('dropQuestCongrats')
+    .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}}'})
   .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()', ng-if='party.members')=env.t('inviteParty')
+    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