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

refactor(bs3): consistent style for modals

Browse Source
This commit is contained in:
Matteo Pagliazzi
2014-02-05 16:51:35 +01:00
parent 055fa82428
commit ce5edbee58
14 changed files with 237 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/css/index.styl
+36 -34
View File
@@ -51,27 +51,25 @@ hr
-------------------------------------------------- */
/* Bootstrap website boilerplate */
.footer {
padding: 70px 0;
border-top: 1px solid #e5e5e5;
background-color: #f5f5f5;
}
.footer p {
margin-bottom: 0;
color: #777;
}
.footer-links {
margin: 10px 0;
}
.footer-links li {
display: inline;
margin-right: 10px;
}
.footer
padding: 70px 0
border-top: 1px solid #e5e5e5
background-color: #f5f5f5
.footer p
margin-bottom: 0
color: #777
.footer-links
margin: 10px 0
.footer-links li
display: inline
margin-right: 10px
/* Bootstrap overrides */
div.tooltip-inner {
max-width: 300px;
}
div.tooltip-inner
max-width: 300px
/* Customizations to make footer sticky */
/*html, body {height: 100%;}*/
@@ -79,11 +77,9 @@ div.tooltip-inner {
z-index:-1
padding: 0 15px // Required by Bootstrap 3 when using .container-fluid
@media (max-width: 600px) {
#wrap {
@media (max-width: 600px)
#wrap
margin-top: 0
}
}
/* Gems
-------------------------------------------------- */
@@ -102,17 +98,17 @@ div.tooltip-inner {
position: relative;
.gem-cost::before
content: "";
display: block;
width: 0;
height: 0;
border: 6px solid #D4D4D4;
border-color: transparent #D4D4D4 transparent transparent;
position: absolute;
right: 100%;
margin-right: 0;
top: 50%;
margin-top: -6px;
content: ""
display: block
width: 0
height: 0
border: 6px solid #D4D4D4
border-color: transparent #D4D4D4 transparent transparent
position: absolute
right: 100%
margin-right: 0
top: 50%
margin-top: -6px
.gem-cost::after
content: "";
@@ -135,6 +131,9 @@ div.tooltip-inner {
overflow-y: auto
max-height: 400px // Taken from Bootstrap 2.3.2 css, may need to change
h5
font-weight: 700
// notification-character used only by death modal's figure, move
.death-modal // a .modal-body
margin: 10px
@@ -152,6 +151,9 @@ a
a span.glyphicon
color: #333 // Takes base color from bootstrap
.muted
color: #999
.btn
margin-right: 5px
public/js/controllers/notificationCtrl.js
+1 -1
View File
@@ -105,7 +105,7 @@ habitrpg.controller('NotificationCtrl',
// Classes modal
$rootScope.$watch('!user.flags.classSelected && user.stats.lvl >= 10', function(after, before){
if(after){
$rootScope.openModal('chooseClass', 'UserCtrl');
$rootScope.openModal('chooseClass', 'UserCtrl', undefined, false, 'static');
}
});
public/js/controllers/rootCtrl.js
+2 -2
View File
@@ -71,8 +71,8 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
templateUrl: 'modals/' + template + '.html',
controller: controller, // optional
scope: scope, // optional
keyboard: keyboard, // optional
backdrop: backdrop // optional
keyboard: (keyboard === undefined ? true : keyboard), // optional
backdrop: (backdrop === undefined ? true : backdrop) // optional
});
}
views/shared/modals/achievements.jade
+5 -5
View File
@@ -1,7 +1,7 @@
// Streak
script(id='modals/achievements/streak.html', type='text/ng-template')
.modal-header
h3=env.t('modalAchievement')
h4=env.t('modalAchievement')
.modal-body
.achievement.achievement-thermometer
=env.t('streakerAchievement')
@@ -11,7 +11,7 @@ script(id='modals/achievements/streak.html', type='text/ng-template')
// Max Gear
script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
.modal-header
h3=env.t('modalAchievement')
h4=env.t('modalAchievement')
.modal-body
.achievement.achievement-armor
=env.t('gearAchievement')
@@ -21,7 +21,7 @@ script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
// Beast Master
script(id='modals/achievements/beastMaster.html', type='text/ng-template')
.modal-header
h3=env.t('modalAchievement')
h4=env.t('modalAchievement')
.modal-body
p
.achievement.achievement-rat
@@ -33,7 +33,7 @@ script(id='modals/achievements/beastMaster.html', type='text/ng-template')
// activated by user.flags.contributor
script(id='modals/achievements/contributor.html', type='text/ng-template')
.modal-header
h3=env.t('modalContribAchievement')
h4=env.t('modalContribAchievement')
.modal-body
.npc_justin.float-left
p
@@ -45,7 +45,7 @@ script(id='modals/achievements/contributor.html', type='text/ng-template')
//Rebirth
script(id='modals/achievements/rebirth.html', type='text/ng-template')
.modal-header
h3=env.t('modalAchievement')
h4=env.t('modalAchievement')
.modal-body
.achievement.achievement-sun
=env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"})
views/shared/modals/buy-gems.jade
+2 -2
View File
@@ -19,12 +19,12 @@ script(id='modals/buyGems.html', type='text/ng-template')
=env.t('USD')
tr
td
.btn.btn-primary(ng-click='showStripe()',style='margin-left:10px;')=env.t('payWithCard')
.btn.btn-primary(ng-click='showStripe()')=env.t('payWithCard')
div(style='float:left;')
//-script(src='/bower_components/JavaScriptButtons/dist/paypal-button.min.js?merchant=#{env.PAYPAL_MERCHANT}', data-button='buynow', data-name=env.t('paypalText'), data-quantity='1', data-amount='5', data-currency='USD', data-tax='0', data-callback='#{env.BASE_URL}/api/v2/user/buy-gems/paypal-ipn', data-env="#{env.NODE_ENV == 'production' ? '' : 'sandbox'}", data-custom='?uid={{user._id}}&apiToken={{user.apiToken}}', data-return='#{env.BASE_URL}', data-rm='1', data-no_shipping='1')
//script(src='/bower_components/JavaScriptButtons/dist/paypal-button.min.js?merchant=#{env.PAYPAL_MERCHANT}', data-button='buynow', data-name=env.t('paypalText'), data-quantity='1', data-amount='5', data-currency='USD', data-tax='0', data-callback='#{env.BASE_URL}/api/v2/user/buy-gems/paypal-ipn', data-custom='?uid={{user._id}}&apiToken={{user.apiToken}}', data-return='#{env.BASE_URL}', data-rm='1', data-no_shipping='1')
p
small.muted(style='line-height:10px;')=env.t('payNote')
small.muted=env.t('payNote')
div(ng-include="'partials/options.settings.subscription.html'")
views/shared/modals/classes.jade
+68 -67
View File
@@ -1,74 +1,75 @@
script(type='text/ng-template', id='modals/chooseClass.html')
.modal-header
h3=env.t('chooseClass1')
h4=env.t('chooseClass1')
a(href='http://habitrpg.wikia.com/wiki/Class_System' target='_blank')=env.t('chooseClass2')
.modal-body.select-class
.row-fluid
.span3(ng-click='selectedClass = "warrior"')
h5
a(href='http://habitrpg.wikia.com/wiki/Warrior' target='_blank')=env.t('warrior')
figure.herobox(ng-class='{"selected-class": selectedClass=="warrior"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_warrior_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_warrior_5')
span(class='shield_warrior_5')
span(class='weapon_warrior_6')
.span3(ng-click='selectedClass = "wizard"')
h5
a(href='http://habitrpg.wikia.com/wiki/Mage' target='_blank')=env.t('mage')
figure.herobox(ng-class='{"selected-class": selectedClass=="wizard"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_wizard_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_wizard_5')
span(class='shield_wizard_5')
span(class='weapon_wizard_6')
.span3(ng-click='selectedClass = "rogue"')
h5
a(href='http://habitrpg.wikia.com/wiki/Rogue' target='_blank')=env.t('rogue')
figure.herobox(ng-class='{"selected-class": selectedClass=="rogue"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_rogue_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_rogue_5')
span(class='shield_rogue_6')
span(class='weapon_rogue_6')
.span3(ng-click='selectedClass = "healer"')
h5
a(href='http://habitrpg.wikia.com/wiki/Healer' target='_blank')=env.t('healer')
figure.herobox(ng-class='{"selected-class": selectedClass=="healer"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_healer_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_healer_5')
span(class='shield_healer_5')
span(class='weapon_healer_6')
br
.well(ng-show='selectedClass=="warrior"')=env.t('warriorText')
.well(ng-show='selectedClass=="wizard"')=env.t('mageText')
.well(ng-show='selectedClass=="rogue"')=env.t('rogueText')
.well(ng-show='selectedClass=="healer"')=env.t('healerText')
.container-fluid
.row
.col-md-3(ng-click='selectedClass = "warrior"')
h5
a(href='http://habitrpg.wikia.com/wiki/Warrior' target='_blank')=env.t('warrior')
figure.herobox(ng-class='{"selected-class": selectedClass=="warrior"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_warrior_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_warrior_5')
span(class='shield_warrior_5')
span(class='weapon_warrior_6')
.col-md-3(ng-click='selectedClass = "wizard"')
h5
a(href='http://habitrpg.wikia.com/wiki/Mage' target='_blank')=env.t('mage')
figure.herobox(ng-class='{"selected-class": selectedClass=="wizard"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_wizard_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_wizard_5')
span(class='shield_wizard_5')
span(class='weapon_wizard_6')
.col-md-3(ng-click='selectedClass = "rogue"')
h5
a(href='http://habitrpg.wikia.com/wiki/Rogue' target='_blank')=env.t('rogue')
figure.herobox(ng-class='{"selected-class": selectedClass=="rogue"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_rogue_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_rogue_5')
span(class='shield_rogue_6')
span(class='weapon_rogue_6')
.col-md-3(ng-click='selectedClass = "healer"')
h5
a(href='http://habitrpg.wikia.com/wiki/Healer' target='_blank')=env.t('healer')
figure.herobox(ng-class='{"selected-class": selectedClass=="healer"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_healer_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_healer_5')
span(class='shield_healer_5')
span(class='weapon_healer_6')
br
.well(ng-show='selectedClass=="warrior"')=env.t('warriorText')
.well(ng-show='selectedClass=="wizard"')=env.t('mageText')
.well(ng-show='selectedClass=="rogue"')=env.t('rogueText')
.well(ng-show='selectedClass=="healer"')=env.t('healerText')
.modal-footer
button.btn.btn-small.btn-danger.cancel(ng-click='user.ops.disableClasses({}); $close()', popover-placement='top', popover-trigger='mouseenter', popover=env.t('optOutText'))=env.t('optOut')
views/shared/modals/death.jade
+13 -12
View File
@@ -1,15 +1,16 @@
//div(modal='user.stats.hp <= 0', options='{backdrop:true, keyboard:false, backdropClick:false}')
script(type='text/ng-template', id='modals/death.html')
.modal-body.death-modal
.row
.col-md-3
figure.notification-character
.GrimReaper
.col-md-9
h2=env.t('youDied')
.row
.col-md-3
p
a.btn.btn-danger.btn-large(ng-click='user.ops.revive({}); $close()')=env.t('continue')
.col-md-9
p=env.t('dieText')
.container-fluid
.row
.col-md-3
figure.notification-character
.GrimReaper
.col-md-9
h2=env.t('youDied')
.row
.col-md-3
p
a.btn.btn-danger.btn-large(ng-click='user.ops.revive({}); $close()')=env.t('continue')
.col-md-9
p=env.t('dieText')
views/shared/modals/drops.jade
+2 -2
View File
@@ -1,9 +1,9 @@
script(type='text/ng-template', id='modals/dropsEnabled.html')
.modal-header
h3=env.t('dropsEnabled')
h4=env.t('dropsEnabled')
.modal-body
p
span.item-drop-icon(class='Pet_Egg_Wolf', style='margin-left: 0px')
span.item-drop-icon(class='Pet_Egg_Wolf')
span!=env.t('firstDrop', {eggText: "{{Content.eggs.Wolf.text}}", eggNotes: "{{Content.eggs.Wolf.notes}}"})
br
p
views/shared/modals/members.jade
+19 -18
View File
@@ -1,25 +1,26 @@
script(type='text/ng-template', id='modals/member.html')
.modal-header(bindonce='profile')
h3
h4
span {{profile.profile.name}}
span(ng-if='profile.contributor.level') - {{contribText(profile.contributor, profile.backer)}}
.modal-body(bindonce='profile')
.row-fluid
.span6
img(ng-show='profile.profile.imageUrl', ng-src='{{profile.profile.imageUrl}}')
markdown(ng-show='profile.profile.blurb', ng-model='profile.profile.blurb')
ul.muted.unstyled(ng-if='profile.auth.timestamps', style='margin-top:10px;')
li {{profile._id}}
li(ng-show='profile.auth.timestamps.created')=env.t('memberSince')
| {{timestamp(profile.auth.timestamps.created)}} -
li(ng-show='profile.auth.timestamps.loggedin')=env.t('lastLoggedIn')
| {{timestamp(profile.auth.timestamps.loggedin)}} -
h3=env.t('stats')
.label.label-info {{ {warrior:'Warrior',wizard:'Mage',healer:'Healer',rogue:'Rogue'}[profile.stats.class] }}
include ../profiles/stats
.span6
include ../header/avatar
h3 Achievements
include ../profiles/achievements
.container-fluid
.row
.col-md-6
img(ng-show='profile.profile.imageUrl', ng-src='{{profile.profile.imageUrl}}')
markdown(ng-show='profile.profile.blurb', ng-model='profile.profile.blurb')
ul.muted.list-unstyled(ng-if='profile.auth.timestamps', style='margin-top:10px;')
li {{profile._id}}
li(ng-show='profile.auth.timestamps.created')=env.t('memberSince')
| {{timestamp(profile.auth.timestamps.created)}} -
li(ng-show='profile.auth.timestamps.loggedin')=env.t('lastLoggedIn')
| {{timestamp(profile.auth.timestamps.loggedin)}} -
h3=env.t('stats')
.label.label-info {{ {warrior:'Warrior',wizard:'Mage',healer:'Healer',rogue:'Rogue'}[profile.stats.class] }}
include ../profiles/stats
.col-md-6
include ../header/avatar
h3 Achievements
include ../profiles/achievements
.modal-footer
button.btn.btn-default(ng-click='$close()')=env.t('ok')
views/shared/modals/new-stuff.jade
+2 -2
View File
@@ -1,7 +1,7 @@
//-div(modal='!user.flags.mathUpdates')
script(type='text/ng-template', id='modals/mathUpdates.html')
.modal-header
h3 Math Updates
h4 Math Updates
.modal-body
.npc_tyler.pull-left(style='margin-right:10px')
p Hey all, Tyler here. Sorry for the rocky numbers (Exp, GP, etc) with the Class System roll-out! We're tweaking the math today, and things should be mostly finalized by tomorrow. <a target='_blank' href='https://trello.com/c/L1H6LiZ3/110-character-stats-attributes-the-class-system'>Follow our progress here</a>, and please do chime in!
@@ -14,7 +14,7 @@ script(type='text/ng-template', id='modals/mathUpdates.html')
script(type='text/ng-template', id='modals/newStuff.html')
.modal-header
h3 New Stuff!
h4 New Stuff!
.modal-body.new-stuff-modal
table
tr
views/shared/modals/quests.jade
+4 -4
View File
@@ -13,7 +13,7 @@ script(id='partials/options.social.party.quest-rewards.html', type='text/ng-temp
script(type='text/ng-template', id='modals/questCompleted.html')
.modal-header
h3 "{{Content.quests[user.party.quest.completed].text}}"
h4 "{{Content.quests[user.party.quest.completed].text}}"
=env.t('completed')
.modal-body
p {{Content.quests[user.party.quest.completed].completion}}
@@ -23,7 +23,7 @@ script(type='text/ng-template', id='modals/questCompleted.html')
script(type='text/ng-template', id='modals/showQuest.html')
.modal-header
h3 {{selectedQuest.text}}
h4 {{selectedQuest.text}}
.modal-body
.pull-right(class='quest_{{selectedQuest.key}}')
div(ng-bind-html='selectedQuest.notes')
@@ -38,7 +38,7 @@ script(type='text/ng-template', id='modals/showQuest.html')
script(type='text/ng-template', id='modals/buyQuest.html')
.modal-header
h3 {{selectedQuest.text}}
h4 {{selectedQuest.text}}
.modal-body
.pull-right(class='quest_{{selectedQuest.key}}')
div(ng-bind-html='selectedQuest.notes')
@@ -49,7 +49,7 @@ script(type='text/ng-template', id='modals/buyQuest.html')
script(type='text/ng-template', id='modals/questInvitation.html')
.modal-header
h3=env.t('questInvitation')
h4=env.t('questInvitation')
| {{Content.quests[party.quest.key].text}}
.modal-body
div(ng-bind-html='Content.quests[party.quest.key].notes')
views/shared/modals/rebirth.jade
+41 -41
View File
@@ -1,46 +1,46 @@
// Created by Sabe on 12/22/13.
script(type='text/ng-template', id='modals/rebirthEnabled.html')
.modal-header
h3=env.t('rebirthNew')
.modal-body
.rebirth_orb.pull-left(style='margin-right: 5px')
p
span=env.t('rebirthUnlock')
.modal-footer
button.btn.btn-default.cancel(ng-click='$close()')=env.t('close')
.modal-header
h4=env.t('rebirthNew')
.modal-body
.rebirth_orb.pull-left(style='margin-right: 5px')
p
span=env.t('rebirthUnlock')
.modal-footer
button.btn.btn-default.cancel(ng-click='$close()')=env.t('close')
script(type='text/ng-template', id='modals/rebirth.html')
.modal-header
h3=env.t('rebirthBegin')
.modal-body
include ../gems
.rebirth_orb.pull-left(style='margin-right: 5px')
p=env.t('rebirthStartOver')
br
.unordered
li=env.t('rebirthAdvList1')
li=env.t('rebirthAdvList2')
li=env.t('rebirthAdvList3')
li=env.t('rebirthAdvList4')
br
p=env.t('rebirthInherit')
.unordered
li=env.t('rebirthInList1')
li=env.t('rebirthInList2')
li=env.t('rebirthInList3')
li=env.t('rebirthInList4')
li=env.t('rebirthInList5')
br
.achievement-sun.pull-left(style='margin-right: 5px')
p=env.t('rebirthEarnAchievement')
.modal-footer
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='$close(); rebirth()')=env.t('beReborn')
span.gem-cost
| 8&nbsp;
=env.t('gems')
.modal-header
h4=env.t('rebirthBegin')
.modal-body
include ../gems
.rebirth_orb.pull-left(style='margin-right: 5px')
p=env.t('rebirthStartOver')
br
ul.list-unstyled
li=env.t('rebirthAdvList1')
li=env.t('rebirthAdvList2')
li=env.t('rebirthAdvList3')
li=env.t('rebirthAdvList4')
br
p=env.t('rebirthInherit')
ul.list-unstyled
li=env.t('rebirthInList1')
li=env.t('rebirthInList2')
li=env.t('rebirthInList3')
li=env.t('rebirthInList4')
li=env.t('rebirthInList5')
br
.achievement-sun.pull-left(style='margin-right: 5px')
p=env.t('rebirthEarnAchievement')
.modal-footer
button.btn.btn-default.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='$close(); rebirth()')=env.t('beReborn')
span.gem-cost
| 8&nbsp;
=env.t('gems')
views/shared/modals/reroll.jade
+2 -2
View File
@@ -1,13 +1,13 @@
// Re-Roll modal
script(type='text/ng-template', id='modals/reroll.html')
.modal-header
h3=env.t('fortify')
h4=env.t('fortify')
.modal-body
include ../gems
p=env.t('fortifyText')
.modal-footer
button.btn.btn-large.cancel(ng-click='$close()')=env.t('neverMind')
button.btn.btn-default.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')
views/shared/modals/settings.jade
+40 -33
View File
@@ -1,6 +1,6 @@
script(type='text/ng-template', id='modals/reset.html')
.modal-header
h3=env.t('resetAccount')
h4=env.t('resetAccount')
.modal-body
p=env.t('resetText1')
p=env.t('resetText2')
@@ -10,49 +10,56 @@ script(type='text/ng-template', id='modals/reset.html')
script(type='text/ng-template', id='modals/restore.html')
.modal-header
h3=env.t('fixValues')
h4=env.t('fixValues')
.modal-body
p=env.t('fixValuesText1')
p=env.t('fixValuesText2')
div.restore-options
form#restore-form.form-horizontal
h3=env.t('stats')
.option-group.option-medium
input.option-content(type='number', step="any", data-for='stats.hp', ng-model='$parent.restoreValues.stats.hp')
span.input-suffix=env.t('health')
.option-group.option-medium
input.option-content(type='number', step="any", data-for='stats.exp', ng-model='$parent.restoreValues.stats.exp')
span.input-suffix=env.t('experience')
.option-group.option-medium
input.option-content(type='number', step="any", data-for='stats.gp', ng-model='$parent.restoreValues.stats.gp')
//input.option-content(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp',disabled)
span.input-suffix=env.t('gold')
//-p.alert
small=env.t('disabledWinterEvent')
.option-group.option-medium
input.option-content(type='number', step="any", data-for='stats.mp', ng-model='$parent.restoreValues.stats.mp')
span.input-suffix=env.t('mana')
.option-group.option-medium
input.option-content(type='number', data-for='stats.lvl', ng-model='$parent.restoreValues.stats.lvl')
span.input-suffix=env.t('level')
h3=env.t('achievements')
.option-group.option-medium
input.option-content(type='number', data-for='achievements.streak', ng-model='$parent.restoreValues.achievements.streak')
span.input-suffix=env.t('fix21Streaks')
//- This is causing too many problems for users
h3=env.t('other')
a.btn.btn-small.btn-warning(ng-controller='FooterCtrl', ng-click='addMissedDay()')=env.t('triggerDay')
form.form-horizontal
h3=env.t('stats')
.form-group
.col-md-6
input.form-control(type='number', step="any", data-for='stats.hp', ng-model='$parent.restoreValues.stats.hp')
label.control-label=env.t('health')
.form-group
.col-md-6
input.form-control(type='number', step="any", data-for='stats.exp', ng-model='$parent.restoreValues.stats.exp')
label.control-label=env.t('experience')
.form-group
.col-md-6
input.form-control(type='number', step="any", data-for='stats.gp', ng-model='$parent.restoreValues.stats.gp')
//input.form-control(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp',disabled)
label.control-label=env.t('gold')
//-p.alert
small=env.t('disabledWinterEvent')
.form-group
.col-md-6
input.form-control(type='number', step="any", data-for='stats.mp', ng-model='$parent.restoreValues.stats.mp')
label.control-label=env.t('mana')
.form-group
.col-md-6
input.form-control(type='number', data-for='stats.lvl', ng-model='$parent.restoreValues.stats.lvl')
label.control-label=env.t('level')
h3=env.t('achievements')
.form-group
.col-md-6
input.form-control(type='number', data-for='achievements.streak', ng-model='$parent.restoreValues.achievements.streak')
label.control-label=env.t('fix21Streaks')
//- This is causing too many problems for users
h3=env.t('other')
a.btn.btn-small.btn-warning(ng-controller='FooterCtrl', ng-click='addMissedDay()')=env.t('triggerDay')
.modal-footer
button.btn.btn-default.cancel(ng-click='$close()')=env.t('discardChanges')
button.btn.btn-primary(ng-click='restore(); $close();')=env.t('saveAndClose')
script(type='text/ng-template', id='modals/delete.html')
.modal-header
h3=env.t('deleteAccount')
h4=env.t('deleteAccount')
.modal-body
p!=env.t('deleteText')
p
input(type='text', ng-model='_deleteAccount')
br
.row
.col-md-6
input.form-control(type='text', ng-model='_deleteAccount')
.modal-footer
button.btn.btn-default(ng-click='$close()')=env.t('neverMind')
button.btn.btn-danger.btn-small(ng-disabled='_deleteAccount != "DELETE"', ng-click='$close(); delete()')=env.t('deleteDo')