Level: {{profile.stats.lvl}}
GP: {{profile.stats.gp | number:0}}
{{count(profile.items.pets)}} / 90 Pets Found
")
-figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember(profile._id)', data-name='{{profile.profile.name}}', ng-class='{isUser: (user._id==profile._id && !user.items.currentMount), hasPet: profile.items.currentMount, "cast-target": applyingAction, isLeader: party.leader==profile._id}')
+figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember(profile._id)', data-name='{{profile.profile.name}}', ng-class='{isUser: user._id==profile._id, hasPet:profile.items.currentPet, hasMount:profile.items.currentMount, "cast-target": applyingAction, isLeader: party.leader==profile._id}')
.character-sprites
// Mount Body
span(ng-if='profile.items.currentMount', class='Mount_Body_{{profile.items.currentMount}}')
@@ -43,8 +43,8 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember(
span(ng-class='{zzz:profile.preferences.sleep}')
// FIXME handle @minimal, this might have to be a directive
span.current-pet(class='Pet-{{profile.items.currentPet}}', ng-show='profile.items.currentPet && !minimal')
- .avatar-level(ng-class='userLevelStyle(profile,"label")')
- i.icon-circle-arrow-up.icon-white(ng-show='profile.stats.buffs.str || profile.stats.buffs.per || profile.stats.buffs.con || profile.stats.buffs.int || profile.stats.buffs.stealth', tooltip=env.t('buffed'), style='margin-right:5px;')
+ .avatar-level(ng-class='userLevelStyle(profile,"label label-default")')
+ span.glyphicon.glyphicon-circle-arrow-up(ng-show='profile.stats.buffs.str || profile.stats.buffs.per || profile.stats.buffs.con || profile.stats.buffs.int || profile.stats.buffs.stealth', tooltip=env.t('buffed'), style='margin-right:5px;')
=env.t('lvl')
| {{profile.stats.lvl}}
- i.icon-plus-sign.icon-white(ng-show='profile.achievements.rebirths', tooltip=env.t('reborn', {reLevel: "{{profile.achievements.rebirthLevel}}"}), style='margin-left:5px')
+ span.glyphicon.glyphicon-plus-sign(ng-show='profile.achievements.rebirths', tooltip=env.t('reborn', {reLevel: "{{profile.achievements.rebirthLevel}}"}), style='margin-left:5px')
diff --git a/views/shared/header/header.jade b/views/shared/header/header.jade
index 63ea79962a..8c85538495 100644
--- a/views/shared/header/header.jade
+++ b/views/shared/header/header.jade
@@ -13,21 +13,25 @@
.meter.health(title=env.t('health'))
.bar(style='width: {{Shared.percent(user.stats.hp, 50)}}%;')
span.meter-text
- i.icon-heart
+ span.glyphicon.glyphicon-heart
+ |
| {{Math.ceil(user.stats.hp)}} / 50
.meter.experience(title=env.t('experience'))
.bar(style='width: {{Shared.percent(user.stats.exp,Shared.tnl(user.stats.lvl))}}%;')
span.meter-text
- i.icon-star
+ span.glyphicon.glyphicon-star
+ |
| {{Math.floor(user.stats.exp)}} / {{Shared.tnl(user.stats.lvl) | number:0}}
// FIXME doesn't look great here, but the "Experience" CSS title rollover covers it where it was before
span(ng-show='user.history.exp')
a(ng-click='toggleChart("exp")', tooltip=env.t('progress'))
- i.icon-signal
+ |
+ span.glyphicon.glyphicon-signal
.meter.mana(title='Mana', ng-if='user.flags.classSelected && !user.preferences.disableClasses')
.bar(style='width: {{user.stats.mp / user._statsComputed.maxMP * 100}}%;')
span.meter-text
- i.icon-fire
+ span.glyphicon.glyphicon-fire
+ |
| {{Math.floor(user.stats.mp)}} / {{user._statsComputed.maxMP}}
// party
@@ -35,5 +39,5 @@
.herobox-wrap(ng-repeat='profile in partyMinusSelf')
include avatar
- .npc_bailey.npc_bailey_head(ng-show='user.flags.newStuff', tooltip=env.t('psst'), tooltip-placement='top', ng-click='modals.newStuff=true')
+ .npc_bailey.npc_bailey_head(ng-show='user.flags.newStuff', tooltip=env.t('psst'), tooltip-placement='top', ng-click='openModal("newStuff")')
diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade
index 6933ffbe98..d812ded929 100644
--- a/views/shared/header/menu.jade
+++ b/views/shared/header/menu.jade
@@ -1,5 +1,4 @@
.user-menu(ng-controller='AuthCtrl')
- button.task-action-btn.tile.solid(ng-hide='authenticated()', style='cursor: pointer;', ng-click="modals.login = true")=env.t('loginAndReg')
ul.nav.site-nav(ng-show='authenticated()')
li.flyout
h1.task-action-btn.tile.solid.user-reporter {{user.profile.name}}
@@ -7,30 +6,36 @@
li
a.task-action-btn.tile.solid
span(ng-show='$state.includes("options")', ui-sref='tasks')
- i.icon-ok
+ span.glyphicon.glyphicon-ok
+ |
=env.t('tasks')
span(ng-show='$state.includes("tasks")', ui-sref='options')
- i.icon.icon-wrench
+ span.glyphicon.glyphicon-wrench
+ |
=env.t('options')
li
a.task-action-btn.tile.solid(href="http://habitrpg.wikia.com/wiki/FAQ", target='_blank')
- i.icon.icon-book
+ span.glyphicon.glyphicon-book
+ |
=env.t('FAQ')
li
a.task-action-btn.tile.solid(href="https://vimeo.com/57654086", target='_blank')
- i.icon.icon-film
+ span.glyphicon.glyphicon-film
+ //| Tutorials is too long to stay in the menu if we add a space
=env.t('tutorials')
li
a.task-action-btn.tile.solid(ng-click='User.sync()')
- i.icon.icon-refresh
+ span.glyphicon.glyphicon-refresh
+ |
=env.t('sync')
li
a.task-action-btn.tile.solid(ng-click='logout()')
- i.icon-share-alt
+ span.glyphicon.glyphicon-share-alt
+ |
=env.t('logout')
// party invitation notification
a(ng-show='user.party.invitation', style='cursor: pointer;', x-bind='click:gotoPartyChat')
- i.icon-user
+ span.glyphicon.glyphicon-user
// party chat notification
a(ng-show='newChatMessages(_party.chat,user.party.lastMessageSeen)', style='cursor: pointer;', x-bind='click:gotoPartyChat')
- i.icon-comment(tooltip=env.t('partyNotification'))
+ span.glyphicon.glyphicon-comment(tooltip=env.t('partyNotification'))
diff --git a/views/shared/modals/achievements.jade b/views/shared/modals/achievements.jade
index ed4ba27b57..3693a22d43 100644
--- a/views/shared/modals/achievements.jade
+++ b/views/shared/modals/achievements.jade
@@ -1,52 +1,53 @@
// Streak
-div(modal='modals.achievements.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')
.modal-footer
- button.btn.btn-default.cancel(ng-click='modals.achievements.streak = false')=env.t('ok')
+ button.btn.btn-default.cancel(ng-click='$close()')=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')
+ h4=env.t('modalAchievement')
.modal-body
.achievement.achievement-armor
=env.t('gearAchievement')
.modal-footer
- button.btn.btn-default.cancel(ng-click='modals.achievements.ultimateGear = false')=env.t('ok')
+ button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok')
// Beast Master
-div(modal='modals.achievements.beastMaster')
+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
=env.t('beastAchievement')
.modal-footer
- button.btn.btn-default.cancel(ng-click='modals.achievements.beastMaster = false')=env.t('ok')
+ button.btn.btn-default.cancel(ng-click='$close()')=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')
+ h4=env.t('modalContribAchievement')
.modal-body
.npc_justin.float-left
p
!=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"})
a(href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink')
.modal-footer
- button.btn.btn-default.cancel(ng-click='set({"flags.contributor":false})')=env.t('ok')
+ button.btn.btn-default.cancel(ng-click='set({"flags.contributor":false}); $close()')=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')
+ h4=env.t('modalAchievement')
.modal-body
.achievement.achievement-sun
=env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"})
.modal-footer
- button.btn.btn-default.cancel(ng-click='modals.achievements.rebirth = false')=env.t('ok')
+ button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok')
diff --git a/views/shared/modals/buy-gems.jade b/views/shared/modals/buy-gems.jade
index 63b5127abb..fface7fe89 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
@@ -18,14 +19,14 @@ div(modal='modals.buyGems')
=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')
+ //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'")
.modal-footer
- button.btn.btn-default.cancel(ng-click='modals.buyGems = false')=env.t('cancel')
+ button.btn.btn-default.cancel(ng-click='$close()')=env.t('cancel')
diff --git a/views/shared/modals/classes.jade b/views/shared/modals/classes.jade
index 220b13c213..089eaf7e34 100644
--- a/views/shared/modals/classes.jade
+++ b/views/shared/modals/classes.jade
@@ -1,75 +1,76 @@
-.modal(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')
+ 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({})', popover-placement='top', popover-trigger='mouseenter', popover=env.t('optOutText'))=env.t('optOut')
- button.btn.btn-primary.cancel(ng-click='selectedClass && changeClass(selectedClass)')=env.t('select')
\ No newline at end of file
+ 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')
+ button.btn.btn-primary.cancel(ng-disabled='!selectedClass' ng-click='changeClass(selectedClass); $close()')=env.t('select')
\ No newline at end of file
diff --git a/views/shared/modals/death.jade b/views/shared/modals/death.jade
index 2c346e11a8..4c756524d7 100644
--- a/views/shared/modals/death.jade
+++ b/views/shared/modals/death.jade
@@ -1,14 +1,16 @@
-div(modal='user.stats.hp <= 0', options='{backdrop:true, keyboard:false, backdropClick:false}')
- .modal-body
- .row-fluid
- .span4
- figure.notification-character
- .GrimReaper
- .span8
- h2=env.t('youDied')
- .row-fluid
- .span4
- p
- a.btn.btn-danger.btn-large.notification-action(ng-click='user.ops.revive({})')=env.t('continue')
- .span8
- p=env.t('dieText')
+//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
+ .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')
diff --git a/views/shared/modals/drops.jade b/views/shared/modals/drops.jade
index e423e2d68a..a7904187a0 100644
--- a/views/shared/modals/drops.jade
+++ b/views/shared/modals/drops.jade
@@ -1,23 +1,13 @@
-div(modal='modals.dropsEnabled')
+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
span.item-drop-icon(class='Pet_Currency_Gem')
span!=env.t('useGems')
.modal-footer
- button.btn.btn-default.cancel(ng-click='modals.dropsEnabled = false')=env.t('close')
-
-div(modal='modals.drop')
- .modal-header
- h3=env.t('itemDrop')
- .modal-body
- p
- span.item-drop-icon(class='Pet_{{user._tmp.drop.type}}_{{user._tmp.drop.key}}')
- | {{user._tmp.drop.dialog}}
- .modal-footer
- button.btn.btn-default.cancel(ng-click='modals.drop = false')=env.t('close')
\ No newline at end of file
+ button.btn.btn-default.cancel(ng-click='$close()')=env.t('close')
\ No newline at end of file
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 508ecce4e1..da90f985d5 100644
--- a/views/shared/modals/members.jade
+++ b/views/shared/modals/members.jade
@@ -1,15 +1,15 @@
-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
+script(type='text/ng-template', id='modals/member.html')
+ .modal-header(bindonce='profile')
+ h4
+ span {{profile.profile.name}}
+ span(ng-if='profile.contributor.level') - {{contribText(profile.contributor, profile.backer)}}
+ .modal-body(bindonce='profile')
+ .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.unstyled(ng-if='profile.auth.timestamps', style='margin-top:10px;')
+ 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)}} -
@@ -18,9 +18,9 @@ div(ng-controller='MemberModalCtrl')
h3=env.t('stats')
.label.label-info {{ {warrior:'Warrior',wizard:'Mage',healer:'Healer',rogue:'Rogue'}[profile.stats.class] }}
include ../profiles/stats
- .span6
+ .col-md-6
include ../header/avatar
h3 Achievements
include ../profiles/achievements
- .modal-footer
- button.btn.btn-default(ng-click='modals.member = false')=env.t('ok')
+ .modal-footer
+ button.btn.btn-default(ng-click='$close()')=env.t('ok')
\ No newline at end of file
diff --git a/views/shared/modals/new-stuff.jade b/views/shared/modals/new-stuff.jade
index 6edf896590..a838aa32ea 100644
--- a/views/shared/modals/new-stuff.jade
+++ b/views/shared/modals/new-stuff.jade
@@ -1,6 +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.