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

fix(interactive-tour): small updates per

Browse source 
https://github.com/HabitRPG/habitrpg/issues/4726#issuecomment-77643235
This commit is contained in:
Tyler Renelle 2015-03-10 11:12:46 -06:00
parent aee1a3cd6f
commit 63a6af6e0a
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/locales/en/npc.json
View file

@ -71,7 +71,7 @@
"tourHP": "Watch out! If you don't complete a Daily by midnight, it will hurt you!",
"tourHabits": "This column is for good and bad Habits that you do many times a day! Click the pencil to edit the names.<ul><li><b>Sample Good Habits</b>: <b>Eat a vegetable</b>, <b>15 minutes productive work</b></li><li><b>Sample Bad Habits</b>: <b>Smoke</b>, <b>Procrastinate</b></li><li><b>Sample Good or Bad Habits</b>: <b>Took Stairs/Elevator</b>, <b>Drank Water/Soda</b>",
"tourStats": "Good Habits add Experience and Gold! Bad Habits remove health.",
"tourGP": "Use your gold to buy Rewards!",
"tourGP": "Buy a Reward with the gold you just earned!",
"tourAvatar": "Now your avatar has the Training Sword. Click on your avatar to customize it!",
"tourScrollDown": "Be sure to scroll all the way down to see all the options! Click on your avatar again to return to the tasks page.",
"tourMuchMore": "When you're done with tasks, you can form a Party with friends, chat in the shared-interest Guilds, join Challenges, and more!"

4
website/public/js/services/guideServices.js
View file

@ -142,7 +142,7 @@ function($rootScope, User, $timeout, $state) {
'<h3 class="popover-title"></h3> ' +
'<div class="popover-content"></div> ' +
'<div class="popover-navigation"> ' +
'<button class="btn btn-sm btn-default" data-role="end" style="float:none;">Hide</button>'+
'<button class="btn btn-sm btn-default" data-role="end" style="float:none;">' + (step.final ? 'Finish Tour' : 'Hide') + '</button>'+
'<div class="btn-group" style="float:right;"> ' +
'<button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> ' +
'<button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> ' +
@ -150,8 +150,6 @@ function($rootScope, User, $timeout, $state) {
'</div> ' +
'</div>' +
'</div>';
// FIXME: see https://github.com/HabitRPG/habitrpg/issues/4726
//return '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> ' + (step.final ? '<button class="btn btn-sm btn-default" data-role="end">' + window.env.t('ok') + '</button> ' : '') +' </div> </div>';
},
storage: false,
//onEnd: function(){