sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-22 03:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(bs3): port several modals & css fixes

Browse source
This commit is contained in:
Matteo Pagliazzi 2014-02-01 17:04:21 +01:00
parent 0a047f5b2f
commit af42ec263e
5 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
public/css/index.styl
View file

@ -131,30 +131,21 @@ div.tooltip-inner {
/* Misc
-------------------------------------------------- */
.modal
whitespace: normal
// notification-character used only by death modal's figure, move
.notification-character
float: left
padding: 15px
.notification-message
display: inline-block;
padding-right: 1em
line-height: 3
.death-modal // a .modal-body
margin: 10px
figure
float: left
padding: 15px
#reset-modal
z-index:1500
#notification-area
position: fixed;
top: 0;
right: 0px;
z-index: 1061;
.modal-body
margin: 10px
position: fixed
top: 0
right: 0px
z-index: 1061
// TODO this is supposed to go in avatar.styl, but stylus is breaking if I even touch that file
.profile-modal-header

23
public/js/controllers/notificationCtrl.js
View file

@ -69,24 +69,39 @@ habitrpg.controller('NotificationCtrl',
$rootScope.$watch('user.achievements.streak', function(after, before){
if(before == undefined || after == before || after < before) return;
$rootScope.modals.achievements.streak = true;
$modal.open({
templateUrl: 'modals/achievements/streak.html'
});
});
$rootScope.$watch('user.achievements.ultimateGear', function(after, before){
if (after === before || after !== true) return;
$rootScope.modals.achievements.ultimateGear = true;
$modal.open({
templateUrl: 'modals/achievements/ultimateGear.html'
});
});
$rootScope.$watch('user.items.pets', function(after, before){
if(_.size(after) === _.size(before) ||
Shared.countPets(null, after) < 90) return;
User.user.achievements.beastMaster = true;
$rootScope.modals.achievements.beastMaster = true;
$modal.open({
templateUrl: 'modals/achievements/beastMaster.html'
});
}, true);
$rootScope.$watch('user.achievements.rebirths', function(after, before){
if(after === before) return;
$rootScope.modals.achievements.rebirth = true;
$modal.open({
templateUrl: 'modals/achievements/rebirth.html'
});
});
$rootScope.$watch('user.flags.contributor', function(after, before){
if (after === before || after !== true) return;
$modal.open({
templateUrl: 'modals/achievements/contributor.html'
});
});
/*_.each(['weapon', 'head', 'chest', 'shield'], function(watched){

2
public/js/controllers/rootCtrl.js
View file

@ -13,8 +13,6 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
})
$rootScope.$on('userUpdated',initSticky);
$rootScope.modals = {};
$rootScope.modals.achievements = {};
$rootScope.User = User;
$rootScope.user = user;
$rootScope.moment = window.moment;

12
views/shared/modals/achievements.jade
View file

@ -6,7 +6,7 @@ script(id='modals/achievements/streak.html', type='text/ng-template')
.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
script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
@ -16,10 +16,10 @@ script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
.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
script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
script(id='modals/achievements/beastMaster.html', type='text/ng-template')
.modal-header
h3=env.t('modalAchievement')
.modal-body
@ -27,7 +27,7 @@ script(id='modals/achievements/ultimateGear.html', type='text/ng-template')
.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
// activated by user.flags.contributor
@ -40,7 +40,7 @@ script(id='modals/achievements/contributor.html', type='text/ng-template')
!=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
script(id='modals/achievements/rebirth.html', type='text/ng-template')
@ -50,4 +50,4 @@ script(id='modals/achievements/rebirth.html', type='text/ng-template')
.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')

2
views/shared/modals/death.jade
View file

@ -1,6 +1,6 @@
//div(modal='user.stats.hp <= 0', options='{backdrop:true, keyboard:false, backdropClick:false}')
script(type='text/ng-template', id='modals/death.html')
.modal-body
.modal-body.death-modal
.row
.col-md-3
figure.notification-character