From 0b53da07982e80b5c9e1b06dc7247a030e24a94a Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 12 Jul 2015 14:24:18 -0500 Subject: [PATCH] Double-check seasonal shop jades --- .../options/inventory/seasonal-shop.jade | 36 ------------------- .../views/options/inventory/seasonalShop.jade | 21 +++++++---- 2 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 website/views/options/inventory/seasonal-shop.jade diff --git a/website/views/options/inventory/seasonal-shop.jade b/website/views/options/inventory/seasonal-shop.jade deleted file mode 100644 index 9bbfd02cff..0000000000 --- a/website/views/options/inventory/seasonal-shop.jade +++ /dev/null @@ -1,36 +0,0 @@ -script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html') - .container-fluid - .stable.row - .col-md-2 - .seasonalshop_summer2015 - .col-md-10 - .popover.static-popover.fade.right.in - .arrow - h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"", linkEnd: ""}) - .popover-content - p!=env.t('seasonalShopSummerText') - .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth') - li.customize-menu.inventory-gear - menu.pets-menu(label='{{::label}}', ng-repeat='(set,label) in ::{summerWarrior:env.t("daringSwashbucklerSet"), summerMage:env.t("emeraldMermageSet"), summerHealer:env.t("reefSeahealerSet"), summerRogue:env.t("roguishPirateSet")}') - div(ng-repeat='item in ::getSeasonalShopArray(set)' ng-class="{transparent: user.items.gear.owned[item.key] === true ||user.items.gear.owned[item.key] === false}") - button.customize-option(popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase(item.type,item)', class='shop_{{::item.key}}') - .text-left - | {{((item.specialClass == "wizard") && (item.type == "weapon")) + 1}}  - span.Pet_Currency_Gem1x.inline-gems - // menu.pets-menu(label=env.t('quests')) - div(ng-repeat='quest in ::getSeasonalShopQuests()') - button.customize-option(data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-append-to-body='true', popover-title='{{::quest.text()}}', popover-trigger='mouseenter', popover-placement='right', ng-click='buyQuest(quest.key)', ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"') - p - | {{::quest.value}}  - span.Pet_Currency_Gem1x.inline-gems - menu.pets-menu(label=env.t('seasonalItems')) - div - button.customize-option(popover='{{::Content.spells.special.seafoam.notes()}}', popover-title='{{::Content.spells.special.seafoam.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase("special", Content.spells.special.seafoam)', class='shop_seafoam') - p - | {{::Content.spells.special.seafoam.value}} - span(class='shop_gold') - // div - button.customize-option(popover='{{::Content.spells.special.nye.notes()}}', popover-title='{{::Content.spells.special.nye.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.nye)', class='inventory_special_nye') - p - | {{Content.spells.special.nye.value}} - span(class='shop_gold') \ No newline at end of file diff --git a/website/views/options/inventory/seasonalShop.jade b/website/views/options/inventory/seasonalShop.jade index cbcfe9db26..e8132a9043 100644 --- a/website/views/options/inventory/seasonalShop.jade +++ b/website/views/options/inventory/seasonalShop.jade @@ -2,13 +2,16 @@ .stable.row .col-md-2 .seasonalshop_summer2015 + .col-md-10 .popover.static-popover.fade.right.in .arrow h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"", linkEnd: ""}) .popover-content p!=env.t('seasonalShopSummerText') + .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth') + li.customize-menu.inventory-gear menu.pets-menu(label='{{::label}}', ng-repeat='(set,label) in ::{summerWarrior:env.t("daringSwashbucklerSet"), summerMage:env.t("emeraldMermageSet"), summerHealer:env.t("reefSeahealerSet"), summerRogue:env.t("roguishPirateSet")}') div(ng-repeat='item in ::getSeasonalShopArray(set)', @@ -21,12 +24,16 @@ .text-left | {{((item.specialClass == "wizard") && (item.type == "weapon")) + 1}}  span.Pet_Currency_Gem1x.inline-gems + // menu.pets-menu(label=env.t('quests')) div(ng-repeat='quest in ::getSeasonalShopQuests()') - button.customize-option(data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-append-to-body='true', popover-title='{{::quest.text()}}', popover-trigger='mouseenter', popover-placement='right', ng-click='buyQuest(quest.key)', ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"') - p - | {{::quest.value}}  - span.Pet_Currency_Gem1x.inline-gems + button.customize-option(ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"' + data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", + popover-append-to-body='true', popover-title='{{::quest.text()}}', + popover-trigger='mouseenter', popover-placement='right', + ng-click='buyQuest(quest.key)') + p {{::quest.value}}  + span.Pet_Currency_Gem1x.inline-gems menu.pets-menu(label=env.t('seasonalItems')) div button.customize-option(class='shop_seafoam', @@ -37,8 +44,8 @@ ng-click='purchase("special", Content.spells.special.seafoam)') p {{::Content.spells.special.seafoam.value}} span(class='shop_gold') + // div button.customize-option(popover='{{::Content.spells.special.nye.notes()}}', popover-title='{{::Content.spells.special.nye.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.nye)', class='inventory_special_nye') - p - | {{Content.spells.special.nye.value}} - span(class='shop_gold') + p {{Content.spells.special.nye.value}} + span(class='shop_gold')