Merge branch 'lucymhdavies-4401_multiple_buy_gems_popups' into develop

closes #4401
This commit is contained in:
Blade Barringer
2015-01-01 23:12:10 -06:00
2 changed files with 5 additions and 2 deletions
+3 -2
View File
@@ -1,5 +1,6 @@
a.pull-right.gem-wallet(ng-click='openModal("buyGems",{track:"Gems > Wallet"})', popover-trigger='mouseenter', popover-title=env.t('gems'), popover=env.t('gemsWhatFor'), popover-placement='bottom')
span.task-action-btn.tile.flush.bright.add-gems-btn
a.pull-right.gem-wallet(ng-click=( isGemsModal ? '' : 'openModal("buyGems",{track:"Gems > Wallet"})'), popover-trigger='mouseenter', popover-title=env.t('gems'), popover=env.t('gemsWhatFor'), popover-placement='bottom')
if !isGemsModal
span.task-action-btn.tile.flush.bright.add-gems-btn
span.task-action-btn.tile.flush.neutral
.Pet_Currency_Gem2x.Gems
| {{user.balance * 4 | number:0}}
+2
View File
@@ -1,7 +1,9 @@
script(id='modals/buyGems.html', type='text/ng-template')
.modal-body
.buy-gems
- var isGemsModal = true
include ../gems
- isGemsModal = false
.well
h3=env.t('buyGems')
table.table