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

fixes to sabe/tweak #1952 @SabreCat (put gems inline with fortify

Browse source 
button, remove reroll from store)
This commit is contained in:
Tyler Renelle 2013-12-08 09:38:24 -07:00
parent dd8b38ca04
commit 4d3a359d6b
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', '
/* Figure out whether we wanna put this in habitrpg-shared
*/
sorted = [updated.weapon, updated.armor, updated.head, updated.shield, updated.potion, updated.reroll];
sorted = [updated.weapon, updated.armor, updated.head, updated.shield, updated.potion];
$scope.itemStore = sorted;
}

8
views/options/inventory/inventory.jade
View file

@ -80,7 +80,7 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html')
li.customize-menu
menu.pets-menu(label='Services')
div
button.btn(popover='Return all tasks to neutral value (yellow color).', popover-title=env.t('rerollName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.reroll = true') Fortify
div
| 4
span.Pet_Currency_Gem1x.inline-gems
// Once grunt-spritesmith is merged, let's use https://github.com/browserquest/BrowserQuest/blob/master/client/img/1/item-firepotion.png
button.btn(popover='Return all tasks to neutral value (yellow color).', popover-title=env.t('rerollName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.reroll = true')
| Fortify 4
span.Pet_Currency_Gem1x.inline-gems

8
views/shared/tasks/task.jade
View file

@ -157,10 +157,10 @@ li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{taskCl
button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!!"}', ng-click='task.challenge.id || (task.priority="!!")') Medium
button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!!!"}', ng-click='task.challenge.id || (task.priority="!!!")') Hard
//span(ng-if='task.type=="daily" && !task.challenge.id')
p
span(ng-if='task.type=="daily"')
legend.option-title Restore Streak
input.option-content(type='number', ng-model='task.streak')
br
span(ng-if='task.type=="daily"')
legend.option-title Restore Streak
input.option-content(type='number', ng-model='task.streak')
button.task-action-btn.tile.spacious(type='submit') Save & Close
div(class='{{obj._id}}{{task.id}}-chart', ng-show='charts[obj._id+task.id]')