diff --git a/website/views/options/inventory/equipment.jade b/website/views/options/inventory/equipment.jade index 817c9e3a1d..ba45f9a693 100644 --- a/website/views/options/inventory/equipment.jade +++ b/website/views/options/inventory/equipment.jade @@ -6,7 +6,7 @@ popover=env.t('battleGearText'))=env.t('battleGear') div - button.btn.btn-default(type="button", ng-click='dequip("battleGear");') {{env.t("unequipBattleGear")}} + button.btn.btn-default(type="button", ng-click='dequip("battleGear");') {{env.t("unequipBattleGear")}} li.customize-menu.inventory-gear menu.pets-menu(label='{{::label}}', ng-show='gear[klass]', @@ -28,8 +28,8 @@ label input(type="checkbox", ng-model="user.preferences.costume", ng-change='set({"preferences.costume":user.preferences.costume ? true : false})') - |   - =env.t('useCostume') + |   + =env.t('useCostume') div button.btn.btn-default(type="button", ng-click='dequip("costume");') {{env.t("unequipCostume")}} diff --git a/website/views/options/inventory/quests.jade b/website/views/options/inventory/quests.jade index abcac99171..7748e1888c 100644 --- a/website/views/options/inventory/quests.jade +++ b/website/views/options/inventory/quests.jade @@ -1,3 +1,6 @@ +//- If this variable gets any bigger, please move it out of this jade template and into common/script/content +- var questCategories = {'unlockable':'unlockableQuests','pet':'petQuests','gold':'goldQuests'} + .container-fluid .row .col-md-2 @@ -8,8 +11,8 @@ h3.popover-title=env.t('ian') .popover-content p=env.t('ianText') + .row - - var questCategories = {'unlockable':'unlockableQuests','pet':'petQuests','gold':'goldQuests'} .col-md-6 h3.equipment-title=env.t('yourQuests') menu.inventory-list @@ -18,15 +21,23 @@ each caption,type in questCategories menu.pets-menu(label=env.t(caption)) div(ng-repeat='(quest_key,points) in ownedItems(user.items.quests)', ng-init='quest = Content.quests[quest_key]', ng-if='Content.quests[quest_key].category === "#{type}"') - button.customize-option(data-popover-html="{{::lockQuest(quest) ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-title='{{::quest.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='showQuest(quest_key)', ng-class='lockQuest(quest) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"') + button.customize-option(ng-class='lockQuest(quest) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"', + ng-click='showQuest(quest_key)', + data-popover-html="{{::lockQuest(quest) ? env.t('scrollsPre') : questPopover(quest) | markdown}}", + popover-title='{{::quest.text()}}', popover-trigger='mouseenter', + popover-placement='right', popover-append-to-body='true') .badge.badge-info.stack-count {{points}} + .col-md-6.border-left li.customize-menu h3.equipment-title=env.t('questsForSale') each caption,type in questCategories menu.pets-menu(label=env.t(caption)) div(ng-repeat='quest in Content.questsByLevel', ng-if='quest.canBuy && quest.category === "#{type}"') - button.customize-option(data-popover-html="{{::lockQuest(quest,true) ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-title='{{::quest.text()}}', popover-append-to-body="true", popover-trigger='mouseenter', ng-click='buyQuest(quest.key)', ng-class='lockQuest(quest) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"') + button.customize-option(ng-class='lockQuest(quest) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"', + data-popover-html="{{::lockQuest(quest,true) ? env.t('scrollsPre') : questPopover(quest) | markdown}}", + popover-title='{{::quest.text()}}', popover-append-to-body="true", + popover-trigger='mouseenter', ng-click='buyQuest(quest.key)') p(ng-if='quest.unlockCondition') | {{::quest.unlockCondition.text()}} p(ng-if='!quest.unlockCondition && quest.category !== "gold" && !lockQuest(quest)')