diff --git a/website/public/js/services/guideServices.js b/website/public/js/services/guideServices.js index 379e90fe39..8e0ef2b82b 100644 --- a/website/public/js/services/guideServices.js +++ b/website/public/js/services/guideServices.js @@ -217,6 +217,7 @@ function($rootScope, User, $timeout, $state) { }); var goto = function(chapter, page, force) { + return; // TODO temporarily remove old tutorial system while experimenting with leslie's new gettup var curr = User.user.flags.tour[chapter]; if (page != curr+1 && !force) return; var updates = {};updates['flags.tour.'+chapter] = page; diff --git a/website/views/shared/tasks/lists.jade b/website/views/shared/tasks/lists.jade index b4487d690e..6e4bb99574 100644 --- a/website/views/shared/tasks/lists.jade +++ b/website/views/shared/tasks/lists.jade @@ -8,16 +8,52 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template") .task-column(class='{{list.type}}s') // Todos export/graph options - span.option-box.pull-right(ng-if='::main && list.type=="todo"') - a.option-action(ng-show='obj.history.todos', ng-click='toggleChart("todos")', tooltip=env.t('progress')) + span.option-box.pull-right(ng-if='::main') + a.option-action(ng-if='list.type=="todo"', ng-show='obj.history.todos', ng-click='toggleChart("todos")', tooltip=env.t('progress'), style='margin-right:5px;') span.glyphicon.glyphicon-signal //a.option-action(ng-href='/v1/users/{{user.id}}/calendar.ics?apiToken={{user.apiToken}}', tooltip='iCal') - a.option-action(ng-click='notPorted()', tooltip='iCal', ng-show='false') + //-a.option-action(ng-if='list.type=="todo"', ng-click='notPorted()', tooltip='iCal', ng-show='false') span.glyphicon.glyphicon-calendar // + a.option-action(ng-click='list.help=!list.help', tooltip='Click for help') + span.glyphicon.glyphicon-question-sign // Header - h2.task-column_title {{list.header}} + h2.task-column_title + | {{list.header}} + + div(ng-if='list.help', ng-switch='::list.type') + div(ng-switch-when='habit') + ul + li Good Habits are things that you do often. They award gold and experience every time you click the +. + li Bad Habits are things you want to avoid doing. They remove health every time you click the -. + li For inspiration, check out these sample Habits + li More questions? Ask in the Newbies Guild! + div(ng-switch-when='daily') + ul + li Dailies repeat every day that they are active. Click the pencil icon to change the days a Daily is active. + li If you don’t complete active Dailies, they will hurt your avatar when your day rolls over. + li Dailies turn redder when you miss them, and bluer when you complete them. The redder the Daily, the more it will reward you... and hurt you. + li To change when your day rolls over, go to Settings > Site > Custom Day Start. + li For inspiration, check out these sample Dailies! + li More questions? Ask in the Newbies Guild! + + div(ng-switch-when='todo') + ul + li To-Dos start yellow, and get redder (more valuable) the longer it takes to complete them. + li To-Dos never hurt you! They only award gold and experience. + li Breaking a To-Do down into a small checklist will make it less scary, and will increase your points! + li For inspiration, check out these sample To-Dos! + li More questions? Ask in the Newbies Guild! + + div(ng-switch-when='reward') + ul + li The Equipment you buy for your avatar is stored in Inventory > Equipment. + li Equipment affects your stats (Avatar > Stats). + li There will be special equipment here during World Events. + li Don't be afraid to set custom rewards! Check out some samples here + li More questions? Ask in the Newbies Guild! + // Todo Chart .todos-chart(ng-if='::list.type == "todo"', ng-show='charts.todos')