Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(bs3): port rebirth and reroll modals, misc fixes

Browse Source
This commit is contained in:
Matteo Pagliazzi
2014-02-02 13:52:42 +01:00
parent 211be37cfc
commit 3e077fea6d
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
views/options/inventory/inventory.jade
+2 -2
View File
@@ -123,7 +123,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
| {{Content.food.Saddle.value}}
span.Pet_Currency_Gem1x.inline-gems
div
button.customize-option(popover=env.t('fortifyPop'), popover-title=env.t('fortifyName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.reroll = true', class='inventory_special_fortify')
button.customize-option(popover=env.t('fortifyPop'), popover-title=env.t('fortifyName'), popover-trigger='mouseenter', popover-placement='left', ng-click='openModal("reroll")', class='inventory_special_fortify')
p
| 4
span.Pet_Currency_Gem1x.inline-gems
@@ -133,7 +133,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
| {{Content.spells.special.snowball.value}}
span.Pet_Currency_Gem1x.inline-gems
div(ng-show='user.flags.rebirthEnabled')
button.customize-option(popover=env.t('rebirthPop'), popover-title=env.t('rebirthName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.rebirth = true', class='rebirth_orb')
button.customize-option(popover=env.t('rebirthPop'), popover-title=env.t('rebirthName'), popover-trigger='mouseenter', popover-placement='left', ng-click='openModal("rebirth")', class='rebirth_orb')
p
| 8
span.Pet_Currency_Gem1x.inline-gems
views/shared/modals/rebirth.jade
+3 -5
View File
@@ -1,6 +1,5 @@
// Created by Sabe on 12/22/13.
//div(modal='modals.rebirthEnabled')
script(type='text/ng-template', id='modals/rebirthEnabled.html')
.modal-header
h3=env.t('rebirthNew')
@@ -9,9 +8,8 @@ script(type='text/ng-template', id='modals/rebirthEnabled.html')
p
span=env.t('rebirthUnlock')
.modal-footer
button.btn.btn-default.cancel(ng-click='modals.rebirthEnabled = false')=env.t('close')
button.btn.btn-default.cancel(ng-click='$close()')=env.t('close')
//div(modal='modals.rebirth')
script(type='text/ng-template', id='modals/rebirth.html')
.modal-header
h3=env.t('rebirthBegin')
@@ -37,12 +35,12 @@ script(type='text/ng-template', id='modals/rebirth.html')
.achievement-sun.pull-left(style='margin-right: 5px')
p=env.t('rebirthEarnAchievement')
.modal-footer
button.btn.btn-large.cancel(ng-click='modals.rebirth = false')=env.t('neverMind')
button.btn.btn-large.cancel(ng-click='$close()')=env.t('neverMind')
span(ng-if='user.balance < 2')
a.btn.btn-success.btn-large(ng-click='openModal("buyGems")')=env.t('buyMoreGems')
span.gem-cost=env.t('notEnoughGems')
span(ng-if='user.balance >= 2', ng-controller='SettingsCtrl')
a.btn.btn-danger.btn-large(ng-click='rebirth()')=env.t('beReborn')
a.btn.btn-danger.btn-large(ng-click='$close(); rebirth()')=env.t('beReborn')
span.gem-cost
| 8&nbsp;
=env.t('gems')
views/shared/modals/reroll.jade
+2 -3
View File
@@ -1,5 +1,4 @@
// Re-Roll modal
//div(modal='modals.reroll')
script(type='text/ng-template', id='modals/reroll.html')
.modal-header
h3=env.t('fortify')
@@ -8,12 +7,12 @@ script(type='text/ng-template', id='modals/reroll.html')
p=env.t('fortifyText')
.modal-footer
button.btn.btn-large.cancel(ng-click='modals.reroll = false')=env.t('neverMind')
button.btn.btn-large.cancel(ng-click='$close()')=env.t('neverMind')
span(ng-if='user.balance < 1')
a.btn.btn-success.btn-large(ng-click='openModal("buyGems")')=env.t('buyMoreGems')
span.gem-cost=env.t('notEnoughGems')
span(ng-if='user.balance >= 1', ng-controller='SettingsCtrl')
a.btn.btn-danger.btn-large(ng-click='reroll()')=env.t('fortify')
a.btn.btn-danger.btn-large(ng-click='$close(); reroll()')=env.t('fortify')
span.gem-cost
| 4&nbsp;
= env.t('gems')