From 6f3ee148425f84827c8638d56bcc919c945dd27a Mon Sep 17 00:00:00 2001 From: Lucy Davies Date: Thu, 1 Jan 2015 23:50:38 +0000 Subject: [PATCH 1/4] Move views/shared/gems.jade -> views/shared/mixins.jade --- views/shared/{gems.jade => mixins.jade} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename views/shared/{gems.jade => mixins.jade} (100%) diff --git a/views/shared/gems.jade b/views/shared/mixins.jade similarity index 100% rename from views/shared/gems.jade rename to views/shared/mixins.jade From 153e0db71d87b2102ef6eada8f4eb96a44e41c02 Mon Sep 17 00:00:00 2001 From: Lucy Davies Date: Thu, 1 Jan 2015 23:57:08 +0000 Subject: [PATCH 2/4] And of course convert this into a mixin --- views/shared/mixins.jade | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/views/shared/mixins.jade b/views/shared/mixins.jade index 9b78852cb8..429aab45c1 100644 --- a/views/shared/mixins.jade +++ b/views/shared/mixins.jade @@ -1,6 +1,7 @@ -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 ＋ - span.task-action-btn.tile.flush.neutral - .Pet_Currency_Gem2x.Gems - | {{user.balance * 4 | number:0}} - =env.t('gems') \ No newline at end of file +mixin gemButton(isGemsModal) + 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 ＋ + span.task-action-btn.tile.flush.neutral + .Pet_Currency_Gem2x.Gems + | {{user.balance * 4 | number:0}} + =env.t('gems') From 0754b58cc2e655452bdb65b291e34dca5586f50e Mon Sep 17 00:00:00 2001 From: Lucy Davies Date: Thu, 1 Jan 2015 23:58:28 +0000 Subject: [PATCH 3/4] Source the new mixin file, and call the mixins in place of including the former gems.jade --- views/index.jade | 1 + views/shared/modals/buy-gems.jade | 2 +- views/shared/modals/drops.jade | 2 +- views/shared/modals/rebirth.jade | 2 +- views/shared/modals/reroll.jade | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/views/index.jade b/views/index.jade index bd9f42f9f5..5698a42884 100644 --- a/views/index.jade +++ b/views/index.jade @@ -23,6 +23,7 @@ html(ng-app="habitrpg", ng-controller="RootCtrl", ng-class='{"applying-action":a body(ng-cloak, ng-controller='GroupsCtrl') + include ./shared/mixins include ./shared/header/avatar include ./shared/header/menu include ./shared/modals/index diff --git a/views/shared/modals/buy-gems.jade b/views/shared/modals/buy-gems.jade index 8cb78cc0b2..cac52f7aa3 100644 --- a/views/shared/modals/buy-gems.jade +++ b/views/shared/modals/buy-gems.jade @@ -1,7 +1,7 @@ script(id='modals/buyGems.html', type='text/ng-template') .modal-body .buy-gems - include ../gems + +gemButton .well h3=env.t('buyGems') table.table diff --git a/views/shared/modals/drops.jade b/views/shared/modals/drops.jade index 38ed79208a..12338eaac8 100644 --- a/views/shared/modals/drops.jade +++ b/views/shared/modals/drops.jade @@ -18,7 +18,7 @@ script(type='text/ng-template', id='modals/pet-key.html') .modal-header h4=env.t('petKeyBegin') .modal-body - include ../gems + +gemButton figure .npc_alex p=env.t('petKeyInfo') diff --git a/views/shared/modals/rebirth.jade b/views/shared/modals/rebirth.jade index 9dff5a6c57..e469a48c20 100644 --- a/views/shared/modals/rebirth.jade +++ b/views/shared/modals/rebirth.jade @@ -15,7 +15,7 @@ script(type='text/ng-template', id='modals/rebirth.html') .modal-header h4=env.t('rebirthBegin') .modal-body - include ../gems + +gemButton figure .rebirth_orb p=env.t('rebirthStartOver') diff --git a/views/shared/modals/reroll.jade b/views/shared/modals/reroll.jade index 5bfa2dacd5..cd144d8252 100644 --- a/views/shared/modals/reroll.jade +++ b/views/shared/modals/reroll.jade @@ -3,7 +3,7 @@ script(type='text/ng-template', id='modals/reroll.html') .modal-header h4=env.t('fortify') .modal-body - include ../gems + +gemButton p=env.t('fortifyText') .modal-footer From 0cfb70576268f4f64122e58ccc41d0bfdfa8462f Mon Sep 17 00:00:00 2001 From: Lucy Davies Date: Fri, 2 Jan 2015 00:01:44 +0000 Subject: [PATCH 4/4] Add behaviour specific to the buy-gems popup. --- views/shared/mixins.jade | 5 +++-- views/shared/modals/buy-gems.jade | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/views/shared/mixins.jade b/views/shared/mixins.jade index 429aab45c1..9fd46f2273 100644 --- a/views/shared/mixins.jade +++ b/views/shared/mixins.jade @@ -1,6 +1,7 @@ mixin gemButton(isGemsModal) - 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}} diff --git a/views/shared/modals/buy-gems.jade b/views/shared/modals/buy-gems.jade index cac52f7aa3..33862575ab 100644 --- a/views/shared/modals/buy-gems.jade +++ b/views/shared/modals/buy-gems.jade @@ -1,7 +1,7 @@ script(id='modals/buyGems.html', type='text/ng-template') .modal-body .buy-gems - +gemButton + +gemButton(true) .well h3=env.t('buyGems') table.table