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): misc fixes, port restore, delete and reset modals

Browse source
This commit is contained in:
Matteo Pagliazzi 2014-02-02 16:06:30 +01:00
parent 317a148760
commit 571954b5cf
9 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/css/index.styl
View file

@ -130,6 +130,11 @@ div.tooltip-inner {
/* Misc
-------------------------------------------------- */
//move
.new-stuff-modal // a .modal-body
overflow-y: auto
max-height: 400px // Taken from Bootstrap 2.3.2 css, may need to change
// notification-character used only by death modal's figure, move
.death-modal // a .modal-body

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

@ -66,9 +66,11 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
// Open a modal from a template expression (like ng-click,...)
// Otherwise use the proper $modal.open
$rootScope.openModal = function(modal){
$rootScope.openModal = function(template, controller, scope){
$modal.open({
templateUrl: 'modals/' + modal + '.html'
templateUrl: 'modals/' + template + '.html',
controller: controller, // optional
scope: scope // optional
});
}

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

@ -96,12 +96,10 @@ habitrpg.controller('SettingsCtrl',
"stats.mp": stats.mp,
"achievements.streak": achievements.streak
});
$rootScope.modals.restore = false;
}
$scope.reset = function(){
User.user.ops.reset({});
$rootScope.modals.reset = false;
$rootScope.$state.go('tasks');
}

4
views/options/index.jade
View file

@ -13,18 +13,22 @@ script(id='partials/options.html', type="text/ng-template")
li(ng-class="{ active: $state.includes('options.profile') }")
a(ui-sref='options.profile')
span.glyphicon.glyphicon-user
|  
=env.t('profile')
li(ng-class="{ active: $state.includes('options.social') }")
a(ui-sref='options.social')
span.glyphicon.glyphicon-heart
|  
=env.t('social')
li(ng-class="{ active: $state.includes('options.inventory') }", ng-if='user.flags.dropsEnabled')
a(ui-sref='options.inventory')
span.glyphicon.glyphicon-gift
|  
=env.t('inventory')
li(ng-class="{ active: $state.includes('options.settings') }")
a(ui-sref='options.settings')
span.glyphicon.glyphicon-wrench
|  
=env.t('settings')
.tab-content

6
views/options/settings.jade
View file

@ -65,7 +65,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
br
button.btn(ng-click='showBailey()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('showBaileyPop'))= env.t('showBailey')
br
button.btn(ng-click='modals.restore = true', popover-trigger='mouseenter', popover-placement='right', popover=env.t('fixValPop'))= env.t('fixVal')
button.btn(ng-click='openModal("restore", "SettingsCtrl")', popover-trigger='mouseenter', popover-placement='right', popover=env.t('fixValPop'))= env.t('fixVal')
div(ng-if='user.preferences.disableClasses==true')
button.btn(ng-click='user.ops.changeClass({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('enableClassPop'))= env.t('enableClass')
div(ng-if='!user.preferences.disableClasses && user.flags.classSelected')
@ -86,8 +86,8 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
hr
h4=env.t('dangerZone')
a.btn.btn-danger(ng-click='modals.reset = true', popover-trigger='mouseenter', popover-placement='right', popover=env.t('resetAccPop'))= env.t('resetAccount')
a.btn.btn-danger(ng-click='modals.delete = true', popover-trigger='mouseenter', popover=env.t('deleteAccPop'))= env.t('deleteAccount')
a.btn.btn-danger(ng-click='openModal("reset", "SettingsCtrl")', popover-trigger='mouseenter', popover-placement='right', popover=env.t('resetAccPop'))= env.t('resetAccount')
a.btn.btn-danger(ng-click='openModal("delete", "SettingsCtrl")', popover-trigger='mouseenter', popover=env.t('deleteAccPop'))= env.t('deleteAccount')
script(type='text/ng-template', id='partials/options.settings.api.html')
.row.fluid

4
views/shared/header/header.jade
View file

@ -14,20 +14,24 @@
.bar(style='width: {{Shared.percent(user.stats.hp, 50)}}%;')
span.meter-text
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
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'))
|  
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
span.glyphicon.glyphicon-fire
|  
| {{Math.floor(user.stats.mp)}} / {{user._statsComputed.maxMP}}
// party

6
views/shared/header/menu.jade
View file

@ -8,25 +8,31 @@
a.task-action-btn.tile.solid
span(ng-show='$state.includes("options")', ui-sref='tasks')
span.glyphicon.glyphicon-ok
|  
=env.t('tasks')
span(ng-show='$state.includes("tasks")', ui-sref='options')
span.glyphicon.glyphicon-wrench
|  
=env.t('options')
li
a.task-action-btn.tile.solid(href="http://habitrpg.wikia.com/wiki/FAQ", target='_blank')
span.glyphicon.glyphicon-book
|  
=env.t('FAQ')
li
a.task-action-btn.tile.solid(href="https://vimeo.com/57654086", target='_blank')
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()')
span.glyphicon.glyphicon-refresh
|  
=env.t('sync')
li
a.task-action-btn.tile.solid(ng-click='logout()')
span.glyphicon.glyphicon-share-alt
|  
=env.t('logout')
// party invitation notification
a(ng-show='user.party.invitation', style='cursor: pointer;', x-bind='click:gotoPartyChat')

4
views/shared/modals/new-stuff.jade
View file

@ -12,10 +12,10 @@ script(type='text/ng-template', id='modals/mathUpdates.html')
.modal-footer
button.btn.btn-default.cancel(ng-click='User.set({"flags.mathUpdates":true}); $close()') Dismiss
script(type='text/ng-template', id='modals/newStuff.html')
script(type='text/ng-template', id='modals/newStuff.html')
.modal-header
h3 New Stuff!
.modal-body
.modal-body.new-stuff-modal
table
tr
td

16
views/shared/modals/settings.jade
View file

@ -1,5 +1,3 @@
//div(ng-controller='SettingsCtrl') Above all
div(modal='modals.reset')
script(type='text/ng-template', id='modals/reset.html')
.modal-header
h3=env.t('resetAccount')
@ -7,10 +5,9 @@ script(type='text/ng-template', id='modals/reset.html')
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')
button.btn.btn-default.cancel(ng-click='$close();')=env.t('neverMind')
button.btn.btn-danger(ng-click='$close(); reset()')=env.t('resetDo')
//div(modal='modals.restore')
script(type='text/ng-template', id='modals/restore.html')
.modal-header
h3=env.t('fixValues')
@ -46,10 +43,9 @@ script(type='text/ng-template', id='modals/restore.html')
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')
button.btn.btn-default.cancel(ng-click='$close()')=env.t('discardChanges')
button.btn.btn-primary(ng-click='$close(); restore()')=env.t('saveAndClose')
//div(modal='modals.delete')
script(type='text/ng-template', id='modals/delete.html')
.modal-header
h3=env.t('deleteAccount')
@ -58,5 +54,5 @@ script(type='text/ng-template', id='modals/delete.html')
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')
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')