From c93bc469081502d27dda4afb03769da76d66037a Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Wed, 29 Jan 2014 22:18:13 +0100 Subject: [PATCH] refactor(bs3): use templates for modals --- views/shared/modals/achievements.jade | 11 +- views/shared/modals/buy-gems.jade | 5 +- views/shared/modals/classes.jade | 4 +- views/shared/modals/death.jade | 3 +- views/shared/modals/drops.jade | 6 +- views/shared/modals/index.jade | 1 - views/shared/modals/login.jade | 42 -------- views/shared/modals/members.jade | 52 +++++----- views/shared/modals/new-stuff.jade | 3 +- views/shared/modals/quests.jade | 12 ++- views/shared/modals/rebirth.jade | 6 +- views/shared/modals/reroll.jade | 3 +- views/shared/modals/settings.jade | 141 +++++++++++++------------- views/static/login-modal.jade | 2 +- 14 files changed, 134 insertions(+), 157 deletions(-) delete mode 100644 views/shared/modals/login.jade diff --git a/views/shared/modals/achievements.jade b/views/shared/modals/achievements.jade index 3526cb9dc4..b679a24c28 100644 --- a/views/shared/modals/achievements.jade +++ b/views/shared/modals/achievements.jade @@ -1,5 +1,5 @@ // Streak -div(modal='modals.achievements.streak') +script(id='modals/achievements/streak.html', type='text/ng-template') .modal-header h3=env.t('modalAchievement') .modal-body @@ -9,7 +9,7 @@ div(modal='modals.achievements.streak') button.btn.btn-default.cancel(ng-click='modals.achievements.streak = false')=env.t('ok') // Max Gear -div(modal='modals.achievements.ultimateGear') +script(id='modals/achievements/ultimateGear.html', type='text/ng-template') .modal-header h3=env.t('modalAchievement') .modal-body @@ -19,7 +19,7 @@ div(modal='modals.achievements.ultimateGear') button.btn.btn-default.cancel(ng-click='modals.achievements.ultimateGear = false')=env.t('ok') // Beast Master -div(modal='modals.achievements.beastMaster') +script(id='modals/achievements/ultimateGear.html', type='text/ng-template') .modal-header h3=env.t('modalAchievement') .modal-body @@ -30,7 +30,8 @@ div(modal='modals.achievements.beastMaster') button.btn.btn-default.cancel(ng-click='modals.achievements.beastMaster = false')=env.t('ok') // Contributor -div(modal='user.flags.contributor') +// activated by user.flags.contributor +script(id='modals/achievements/contributor.html', type='text/ng-template') .modal-header h3=env.t('modalContribAchievement') .modal-body @@ -45,7 +46,7 @@ div(modal='user.flags.contributor') button.btn.btn-default.cancel(ng-click='set({"flags.contributor":false})')=env.t('ok') //Rebirth -div(modal='modals.achievements.rebirth') +script(id='modals/achievements/rebirth.html', type='text/ng-template') .modal-header h3=env.t('modalAchievement') .modal-body diff --git a/views/shared/modals/buy-gems.jade b/views/shared/modals/buy-gems.jade index a7bd1375f8..2c9d42e268 100644 --- a/views/shared/modals/buy-gems.jade +++ b/views/shared/modals/buy-gems.jade @@ -1,4 +1,5 @@ -div(modal='modals.buyGems') +//Why is shown? Because of script here at line 24!!!!!!!!! +script(id='modals/buyGems.html', type='text/ng-template') .modal-body .buy-gems include ../gems @@ -20,7 +21,7 @@ div(modal='modals.buyGems') .btn.btn-primary(ng-click='showStripe()',style='margin-left:10px;')=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') + //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') diff --git a/views/shared/modals/classes.jade b/views/shared/modals/classes.jade index 220b13c213..4a96a558c3 100644 --- a/views/shared/modals/classes.jade +++ b/views/shared/modals/classes.jade @@ -1,4 +1,6 @@ -.modal(ng-if='!user.flags.classSelected && user.stats.lvl >= 10', data-backdrop=true, ng-controller='UserCtrl') +//activated by +// ng-if='!user.flags.classSelected && user.stats.lvl >= 10', data-backdrop=true, ng-controller='UserCtrl') +script(type='text/ng-template', id='modals/chooseClass.html') .modal-header h3=env.t('chooseClass1') a(href='http://habitrpg.wikia.com/wiki/Class_System' target='_blank')=env.t('chooseClass2') diff --git a/views/shared/modals/death.jade b/views/shared/modals/death.jade index 2c346e11a8..c76322e935 100644 --- a/views/shared/modals/death.jade +++ b/views/shared/modals/death.jade @@ -1,4 +1,5 @@ -div(modal='user.stats.hp <= 0', options='{backdrop:true, keyboard:false, backdropClick:false}') +//div(modal='user.stats.hp <= 0', options='{backdrop:true, keyboard:false, backdropClick:false}') +script(type='text/ng-template', id='modals/death.html') .modal-body .row-fluid .span4 diff --git a/views/shared/modals/drops.jade b/views/shared/modals/drops.jade index e423e2d68a..de42dd85ac 100644 --- a/views/shared/modals/drops.jade +++ b/views/shared/modals/drops.jade @@ -1,4 +1,5 @@ -div(modal='modals.dropsEnabled') +//div(modal='modals.dropsEnabled') +script(type='text/ng-template', id='modals/dropsEnabled.html') .modal-header h3=env.t('dropsEnabled') .modal-body @@ -12,7 +13,8 @@ div(modal='modals.dropsEnabled') .modal-footer button.btn.btn-default.cancel(ng-click='modals.dropsEnabled = false')=env.t('close') -div(modal='modals.drop') +//div(modal='modals.drop') +script(type='text/ng-template', id='modals/drop.html') .modal-header h3=env.t('itemDrop') .modal-body diff --git a/views/shared/modals/index.jade b/views/shared/modals/index.jade index db481615bb..a8c0626e99 100644 --- a/views/shared/modals/index.jade +++ b/views/shared/modals/index.jade @@ -1,5 +1,4 @@ include ./achievements -include ./login include ./reroll include ./death include ./new-stuff diff --git a/views/shared/modals/login.jade b/views/shared/modals/login.jade deleted file mode 100644 index 9245d18535..0000000000 --- a/views/shared/modals/login.jade +++ /dev/null @@ -1,42 +0,0 @@ -// This file was moved to /views/static/front.jade, as we're requiring login / registration from front page now - keep this file around until we're sure of that decision - -//-div(modal='modals.login') - .modal-header - h3 Login / Register - .modal-body - //a(href='/auth/facebook') - img(src='/img/facebook-login-register.jpeg', alt='Login / Register With Facebook') - //h3 Or - tabset - tab(heading='Login') - form(ng-controller='AuthCtrl', ng-submit='auth()') - .control-group - input(type='text', ng-model='loginUsername', placeholder='{{useUUID ? \'UUID\' : \'Username\'}}') - .control-group - input(type='{{useUUID ? "text" : "password"}}', ng-model='loginPassword', placeholder='{{useUUID ? \'API Token\' : \'Password\'}}') - .control-group - label.checkbox - input(type='checkbox', ng-click='useUUID = !useUUID') - | Use UUID / API Token (For Facebook Users) - .control-group - input.btn.btn-primary(type='submit', value='Login') - - tab(heading='Register') - form(ng-controller='AuthCtrl', ng-submit='register()', name='registrationForm') - .control-group - input(type='text', ng-model='registerVals.username', placeholder='Username', required) - .control-group - input(type='email', ng-model='registerVals.email', placeholder='Email', required) - .control-group - input(type='password', ng-model='registerVals.password', placeholder='Password', required) - .control-group - input(type='password', ng-model='registerVals.confirmPassword', placeholder='Password Confirm', required) - .control-group - input.btn.btn-primary(type='submit', value='Register') - - - .modal-footer - button.btn.btn-warning.cancel(ng-click='modals.login = false') Cancel - - diff --git a/views/shared/modals/members.jade b/views/shared/modals/members.jade index c0b3b9388d..4816c817f2 100644 --- a/views/shared/modals/members.jade +++ b/views/shared/modals/members.jade @@ -1,26 +1,28 @@ -div(ng-controller='MemberModalCtrl') +//div(ng-controller='MemberModalCtrl') #memberModal(modal='modals.member') - .modal-header(bindonce='profile') - h3 - 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 {{profile.stats.class}} - include ../profiles/stats - .span6 - include ../header/avatar - h3 Achievements - include ../profiles/achievements - .modal-footer - button.btn.btn-default(ng-click='modals.member = false')=env.t('ok') + +script(type='text/ng-template', id='modals/member.html') + .modal-header(bindonce='profile') + h3 + 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 {{profile.stats.class}} + include ../profiles/stats + .span6 + include ../header/avatar + h3 Achievements + include ../profiles/achievements + .modal-footer + button.btn.btn-default(ng-click='modals.member = false')=env.t('ok') diff --git a/views/shared/modals/new-stuff.jade b/views/shared/modals/new-stuff.jade index 096590cbce..c5623d18b0 100644 --- a/views/shared/modals/new-stuff.jade +++ b/views/shared/modals/new-stuff.jade @@ -11,7 +11,8 @@ .modal-footer button.btn.btn-default.cancel(ng-click='User.set({"flags.mathUpdates":true})') Dismiss -div(modal='modals.newStuff') +//div(modal='modals.newStuff') +script(type='text/ng-template', id='modals/newStuff.html') .modal-header h3 New Stuff! .modal-body diff --git a/views/shared/modals/quests.jade b/views/shared/modals/quests.jade index 2849d230f2..f09a176117 100644 --- a/views/shared/modals/quests.jade +++ b/views/shared/modals/quests.jade @@ -11,7 +11,8 @@ script(id='partials/options.social.party.quest-rewards.html', type='text/ng-temp td {{quest.drop.gp}} =env.t('gold') -div(modal='user.party.quest.completed', ng-controller='InventoryCtrl') +//div(modal='user.party.quest.completed', ng-controller='InventoryCtrl') +script(type='text/ng-template', id='modals/questCompleted.html') .modal-header h3 "{{Content.quests[user.party.quest.completed].text}}" =env.t('completed') @@ -21,7 +22,8 @@ div(modal='user.party.quest.completed', ng-controller='InventoryCtrl') .modal-footer button.btn.btn-default.btn-primary(ng-click='set({"party.quest.completed":""})')=env.t('accept') -div(modal='modals.showQuest', ng-controller='InventoryCtrl') +//div(modal='modals.showQuest', ng-controller='InventoryCtrl') +script(type='text/ng-template', id='modals/showQuest.html') .modal-header h3 {{selectedQuest.text}} .modal-body @@ -36,7 +38,8 @@ div(modal='modals.showQuest', ng-controller='InventoryCtrl') button.btn.btn-default.btn-small.btn-cancel(ng-click='closeQuest()')=env.t('cancel') button.btn.btn-default.btn-primary(ng-click='questInit()')=env.t('inviteParty') -div(modal='modals.buyQuest', ng-controller='InventoryCtrl') +//div(modal='modals.buyQuest', ng-controller='InventoryCtrl') +script(type='text/ng-template', id='modals/buyQuest.html') .modal-header h3 {{selectedQuest.text}} .modal-body @@ -47,7 +50,8 @@ div(modal='modals.buyQuest', ng-controller='InventoryCtrl') button.btn.btn-large.cancel(ng-click='closeQuest()')=env.t('neverMind') button.btn.btn-default.btn-large.btn-primary(ng-click='purchase("quests", quest);closeQuest()')=env.t('buyQuest') -div(modal='party.quest.key && !party.quest.active && !questHold && party.quest.members[user._id] == undefined') +//div(modal='party.quest.key && !party.quest.active && !questHold && party.quest.members[user._id] == undefined') +script(type='text/ng-template', id='modals/questInvitation.html') .modal-header h3=env.t('questInvitation') | {{Content.quests[party.quest.key].text}} diff --git a/views/shared/modals/rebirth.jade b/views/shared/modals/rebirth.jade index bbc79630cf..9e7dc610d2 100644 --- a/views/shared/modals/rebirth.jade +++ b/views/shared/modals/rebirth.jade @@ -1,6 +1,7 @@ // Created by Sabe on 12/22/13. -div(modal='modals.rebirthEnabled') +//div(modal='modals.rebirthEnabled') +script(type='text/ng-template', id='modals/rebirthEnabled.html') .modal-header h3=env.t('rebirthNew') .modal-body @@ -10,7 +11,8 @@ div(modal='modals.rebirthEnabled') .modal-footer button.btn.btn-default.cancel(ng-click='modals.rebirthEnabled = false')=env.t('close') -div(modal='modals.rebirth') +//div(modal='modals.rebirth') +script(type='text/ng-template', id='modals/rebirth.html') .modal-header h3=env.t('rebirthBegin') .modal-body diff --git a/views/shared/modals/reroll.jade b/views/shared/modals/reroll.jade index 24dba8d7ff..09bbcc5bee 100644 --- a/views/shared/modals/reroll.jade +++ b/views/shared/modals/reroll.jade @@ -1,5 +1,6 @@ // Re-Roll modal -div(modal='modals.reroll') +//div(modal='modals.reroll') +script(type='text/ng-template', id='modals/reroll.html') .modal-header h3=env.t('fortify') .modal-body diff --git a/views/shared/modals/settings.jade b/views/shared/modals/settings.jade index 956b47a96d..1de8fac436 100644 --- a/views/shared/modals/settings.jade +++ b/views/shared/modals/settings.jade @@ -1,76 +1,79 @@ -div(ng-controller='SettingsCtrl') +//div(ng-controller='SettingsCtrl') div(modal='modals.reset') - .modal-header - h3=env.t('resetaccount') - .modal-body - p=env.t('resetText1') - p=env.t('resetText2') - .modal-footer - button.btn.btn-default.cancel(ng-click='modals.reset = false')=env.t('neverMind') - button.btn.btn-danger(data-dismiss='modal', ng-click='reset()')=env.t('resetDo') +script(type='text/ng-template', id='modals/reset.html') + .modal-header + h3=env.t('resetaccount') + .modal-body + p=env.t('resetText1') + p=env.t('resetText2') + .modal-footer + button.btn.btn-default.cancel(ng-click='modals.reset = false')=env.t('neverMind') + button.btn.btn-danger(data-dismiss='modal', ng-click='reset()')=env.t('resetDo') - div(modal='modals.restore') - .modal-header - h3=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') +//div(modal='modals.restore') +script(type='text/ng-template', id='modals/restore.html') + .modal-header + h3=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='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='restoreValues.stats.exp') + span.input-suffix=env.t('experience') + .option-group.option-medium(ng-if='!user.purchased.plan.customerId') + //input.option-content(type='number', step="any", data-for='stats.gp', ng-model='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='restoreValues.stats.mp') + span.input-suffix=env.t('mana') + .option-group.option-medium + input.option-content(type='number', data-for='stats.lvl', ng-model='restoreValues.stats.lvl') + span.input-suffix=env.t('level') + //- + //- Commenting out since it doesn't make sense to restore equipment with Armory anymore. They can just restore GP & buy + h3 Equipment .option-group.option-medium - input.option-content(type='number', step="any", data-for='stats.hp', ng-model='restoreValues.stats.hp') - span.input-suffix=env.t('health') + input.option-content(type='number', data-for='items.weapon', ng-model='restoreValues.items.weapon') + span.input-suffix Weapon .option-group.option-medium - input.option-content(type='number', step="any", data-for='stats.exp', ng-model='restoreValues.stats.exp') - span.input-suffix=env.t('experience') - .option-group.option-medium(ng-if='!user.purchased.plan.customerId') - //input.option-content(type='number', step="any", data-for='stats.gp', ng-model='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') + input.option-content(type='number', data-for='items.armor', ng-model='restoreValues.items.armor') + span.input-suffix Armor .option-group.option-medium - input.option-content(type='number', step="any", data-for='stats.mp', ng-model='restoreValues.stats.mp') - span.input-suffix=env.t('mana') + input.option-content(type='number', data-for='items.head', ng-model='restoreValues.items.head') + span.input-suffix Helm .option-group.option-medium - input.option-content(type='number', data-for='stats.lvl', ng-model='restoreValues.stats.lvl') - span.input-suffix=env.t('level') - //- - //- Commenting out since it doesn't make sense to restore equipment with Armory anymore. They can just restore GP & buy - h3 Equipment - .option-group.option-medium - input.option-content(type='number', data-for='items.weapon', ng-model='restoreValues.items.weapon') - span.input-suffix Weapon - .option-group.option-medium - input.option-content(type='number', data-for='items.armor', ng-model='restoreValues.items.armor') - span.input-suffix Armor - .option-group.option-medium - input.option-content(type='number', data-for='items.head', ng-model='restoreValues.items.head') - span.input-suffix Helm - .option-group.option-medium - input.option-content(type='number', data-for='items.shield', ng-model='restoreValues.items.shield') - span.input-suffix Shield - h3=env.t('achievements') - .option-group.option-medium - input.option-content(type='number', data-for='achievements.streak', ng-model='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') - .modal-footer - button.btn.btn-default.cancel(ng-click='modals.restore = false')=env.t('discardChanges') - button.btn.btn-primary(ng-click='restore()')=env.t('saveAndClose') + input.option-content(type='number', data-for='items.shield', ng-model='restoreValues.items.shield') + span.input-suffix Shield + h3=env.t('achievements') + .option-group.option-medium + input.option-content(type='number', data-for='achievements.streak', ng-model='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') + .modal-footer + button.btn.btn-default.cancel(ng-click='modals.restore = false')=env.t('discardChanges') + button.btn.btn-primary(ng-click='restore()')=env.t('saveAndClose') - div(modal='modals.delete') - .modal-header - h3=env.t('deleteaccount') - .modal-body - p=env.t('deleteText1') - strong=env.t('deleteText2') - =env.t('deleteText3') - p - input(type='text', ng-model='_deleteAccount') - .modal-footer - button.btn.btn-default(ng-click='modals.delete = false')=env.t('neverMind') - button.btn.btn-danger.btn-small(ng-disabled='_deleteAccount != "DELETE"', ng-click='delete()')=env.t('deleteDo') +//div(modal='modals.delete') +script(type='text/ng-template', id='modals/delete.html') + .modal-header + h3=env.t('deleteaccount') + .modal-body + p=env.t('deleteText1') + strong=env.t('deleteText2') + =env.t('deleteText3') + p + input(type='text', ng-model='_deleteAccount') + .modal-footer + button.btn.btn-default(ng-click='modals.delete = false')=env.t('neverMind') + button.btn.btn-danger.btn-small(ng-disabled='_deleteAccount != "DELETE"', ng-click='delete()')=env.t('deleteDo') diff --git a/views/static/login-modal.jade b/views/static/login-modal.jade index 9949e316c0..b17d41d171 100644 --- a/views/static/login-modal.jade +++ b/views/static/login-modal.jade @@ -1,4 +1,4 @@ -script(id='modals/login.html', type="text/ng-template") +script(id='modals/login.html', type='text/ng-template') .modal-header button.close(type='button', ng-click='$close()') × h4.modal-title=env.t('loginAndReg')