From 62e526f8dc7b490b969a7ee9afa2ddc9c41956b2 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 3 Dec 2014 20:55:22 -0600 Subject: [PATCH 1/7] feat(subscriptions): Show count of purchasable Gems --- views/options/inventory/inventory.jade | 1 + 1 file changed, 1 insertion(+) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 5fed87ba1d..1396f91c3a 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -201,6 +201,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') div(ng-if='user.purchased.plan.planId') button.customize-option(ng-click='user.ops.purchase({params:{type:"gems",key:"gem"}})') span.Pet_Currency_Gem.inline-gems + .badge.badge-info.stack-count {{api.planGemLimits + user.purchased.plan.consecutive.gemCapExtra - user.purchased.plan.gemsBought}} p | 20 span.shop_gold From b01762362161f709bb1fac5f7c16581350475b84 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 3 Dec 2014 21:39:26 -0600 Subject: [PATCH 2/7] fix(subscriptions): Fix to Gems badge --- views/options/inventory/inventory.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 1396f91c3a..c45b18d52f 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -201,7 +201,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') div(ng-if='user.purchased.plan.planId') button.customize-option(ng-click='user.ops.purchase({params:{type:"gems",key:"gem"}})') span.Pet_Currency_Gem.inline-gems - .badge.badge-info.stack-count {{api.planGemLimits + user.purchased.plan.consecutive.gemCapExtra - user.purchased.plan.gemsBought}} + .badge.badge-info.stack-count {{Shared.planGemLimits.convCap - User.user.purchased.plan.gemsBought}} p | 20 span.shop_gold From ce8b6d29013cf5072eef22157d1c2f435a2c40c2 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 3 Dec 2014 22:22:21 -0600 Subject: [PATCH 3/7] fix(style): Give room for badge --- public/css/inventory.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/inventory.styl b/public/css/inventory.styl index e487e8448b..81602e1b9c 100644 --- a/public/css/inventory.styl +++ b/public/css/inventory.styl @@ -71,7 +71,7 @@ menu.pets div p text-align:center //width:6em - margin-top:-.5em + margin-top:-.3em .hatchingPotion-menu > div display:inline-block vertical-align:top From efcf9099f4d509c3a6982cd3b6a6c99fd7a4d21a Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Thu, 4 Dec 2014 17:48:01 -0600 Subject: [PATCH 4/7] Adjusted count for remaining gem count --- views/options/inventory/inventory.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index c45b18d52f..f78aa312d4 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -201,7 +201,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') div(ng-if='user.purchased.plan.planId') button.customize-option(ng-click='user.ops.purchase({params:{type:"gems",key:"gem"}})') span.Pet_Currency_Gem.inline-gems - .badge.badge-info.stack-count {{Shared.planGemLimits.convCap - User.user.purchased.plan.gemsBought}} + .badge.badge-info.stack-count {{Shared.planGemLimits.convCap + user.purchased.plan.consecutive.gemCapExtra - User.user.purchased.plan.gemsBought}} p | 20 span.shop_gold From f2c6c07ff87f9d90b710d64cb89dc150ecea8a4b Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 4 Dec 2014 19:04:47 -0600 Subject: [PATCH 5/7] fix(Gems): Clarify badge count --- views/options/inventory/inventory.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index f78aa312d4..fb70056c0f 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -199,9 +199,9 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') | 4 span.Pet_Currency_Gem1x.inline-gems div(ng-if='user.purchased.plan.planId') - button.customize-option(ng-click='user.ops.purchase({params:{type:"gems",key:"gem"}})') + button.customize-option(popover=env.t('subGemPop'), popover-title=env.t('subGemName'), popover-trigger='mouseenter', popover-placement='top',ng-click='user.ops.purchase({params:{type:"gems",key:"gem"}})') span.Pet_Currency_Gem.inline-gems - .badge.badge-info.stack-count {{Shared.planGemLimits.convCap + user.purchased.plan.consecutive.gemCapExtra - User.user.purchased.plan.gemsBought}} + .badge.badge-success.stack-count {{Shared.planGemLimits.convCap + User.user.purchased.plan.consecutive.gemCapExtra - User.user.purchased.plan.gemsBought}} p | 20 span.shop_gold From 63ea851fdb9865a715a64ba7b64460863b5a7db7 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 4 Dec 2014 20:13:26 -0600 Subject: [PATCH 6/7] fix(style): Make pet key a SPAN --- views/options/inventory/inventory.jade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index fb70056c0f..2e34eac23a 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -194,7 +194,8 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') | 8 span.Pet_Currency_Gem1x.inline-gems div(ng-show='petCount >= 90') - button.customize-option(popover=env.t('petKeyPop'), popover-title=env.t('petKeyName'), popover-trigger='mouseenter', popover-placement='top', ng-click='openModal("pet-key")', class='pet_key') + button.customize-option(popover=env.t('petKeyPop'), popover-title=env.t('petKeyName'), popover-trigger='mouseenter', popover-placement='top', ng-click='openModal("pet-key")') + span.pet_key p | 4 span.Pet_Currency_Gem1x.inline-gems From 7dd16a06e6ec1e08fc591ca5c2da042d9f8c15ce Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 4 Dec 2014 20:26:50 -0600 Subject: [PATCH 7/7] Revert "fix(style): Make pet key a SPAN" This reverts commit 63ea851fdb9865a715a64ba7b64460863b5a7db7. --- views/options/inventory/inventory.jade | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 2e34eac23a..fb70056c0f 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -194,8 +194,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') | 8 span.Pet_Currency_Gem1x.inline-gems div(ng-show='petCount >= 90') - button.customize-option(popover=env.t('petKeyPop'), popover-title=env.t('petKeyName'), popover-trigger='mouseenter', popover-placement='top', ng-click='openModal("pet-key")') - span.pet_key + button.customize-option(popover=env.t('petKeyPop'), popover-title=env.t('petKeyName'), popover-trigger='mouseenter', popover-placement='top', ng-click='openModal("pet-key")', class='pet_key') p | 4 span.Pet_Currency_Gem1x.inline-gems