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

chore(git): Resolve merge conflict

Browse source
This commit is contained in:
Sabe Jones 2014-12-14 14:55:37 -06:00
commit 071ac02ec2
4 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/js/app.js
View file

@ -185,6 +185,10 @@ window.habitrpg = angular.module('habitrpg',
url: '/timetravelers',
templateUrl: "partials/options.inventory.timetravelers.html"
})
.state('options.inventory.seasonalshop', {
url: '/seasonalshop',
templateUrl: "partials/options.inventory.seasonalshop.html"
})
// Options > Settings
.state('options.settings', {

3
views/options/inventory/index.jade
View file

@ -18,6 +18,9 @@ script(type='text/ng-template', id='partials/options.inventory.html')
li.equipment-tab(ng-class="{ active: $state.includes('options.inventory.timetravelers') }")
a(ui-sref='options.inventory.timetravelers')
=env.t('timeTravelers')
li.equipment-tab(ng-class="{ active: $state.includes('options.inventory.seasonalshop') }")
a(ui-sref='options.inventory.seasonalshop')
=env.t('seasonalShop')
.tab-content
.tab-pane.active

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

@ -19,6 +19,18 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html')
div(ng-repeat='item in gear[klass]')
button.customize-option(popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', ng-click='user.ops.equip({params:{type:"costume", key:item.key}})', class='shop_{{::item.key}}', ng-class='{selectableInventory: user.items.gear.costume[item.type] == item.key}')
script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html')
.container-fluid
.stable.row
.col-md-2
.seasonalshop_closed
.col-md-10
.popover.static-popover.fade.right.in
.arrow
h3.popover-title!=env.t('seasonalShopClosedTitle')
.popover-content
p!=env.t('seasonalShopClosedText', {linkStart: "<a href='https://habitrpg.wikia.com/wiki/Community#World_Events' target='_blank'>", linkEnd: "</a>"})
script(type='text/ng-template', id='partials/options.inventory.timetravelers.html')
.container-fluid
.stable.row(ng-if='user.purchased.plan.consecutive.trinkets <= 0')

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

@ -50,6 +50,8 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
a(ui-sref='options.inventory.equipment')=env.t('equipment')
li
a(ui-sref='options.inventory.timetravelers')=env.t('timeTravelers')
li
a(ui-sref='options.inventory.seasonalshop')=env.t('seasonalShop')
ul.toolbar-submenu
li
a(target="_blank" ng-href='http://data.habitrpg.com?uuid={{user._id}}')=env.t('dataTool')
@ -132,6 +134,8 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
a(ui-sref='options.inventory.equipment')=env.t('equipment')
li
a(ui-sref='options.inventory.timetravelers')=env.t('timeTravelers')
li
a(ui-sref='options.inventory.seasonalshop')=env.t('seasonalShop')
li.toolbar-button-dropdown
a(target="_blank" ng-href='http://data.habitrpg.com?uuid={{user._id}}')
span=env.t('data')