' +
- //'
' +
(showCounter ? '
'+ (i+1 +' of '+ _.flatten(chapters[k]).length) +'' : '')+ // counter
'
' +
(step.hideNavigation ? '' : '') +
@@ -222,14 +237,10 @@ function($rootScope, User, $timeout, $state, Analytics) {
'
';
},
storage: false
- //onEnd: function(){
- // User.set({'flags.showTour': false});
- //}
});
});
var goto = function(chapter, page, force) {
- //return; // TODO temporarily remove old tutorial system while experimenting with leslie's new gettup
if (chapter == 'intro') User.set({'flags.welcomed': true});
var curr = User.user.flags.tour[chapter];
if (page != curr+1 && !force) return;
diff --git a/website/public/js/services/notificationServices.js b/website/public/js/services/notificationServices.js
index f41a986728..80d2a18df4 100644
--- a/website/public/js/services/notificationServices.js
+++ b/website/public/js/services/notificationServices.js
@@ -51,7 +51,7 @@ angular.module("habitrpg").factory("Notification",
function exp(val) {
if (val < -50) return; // don't show when they level up (resetting their exp)
- _notify(_sign(val) + " " + _round(val) + " " + window.env.t('xp'), 'xp', 'glyphicon glyphicon-star');
+ _notify(_sign(val) + " " + _round(val) + " " + window.env.t('experience'), 'xp', 'glyphicon glyphicon-star');
}
function error(error){
@@ -64,7 +64,7 @@ angular.module("habitrpg").factory("Notification",
function hp(val) {
// don't show notifications if user dead
- _notify(_sign(val) + " " + _round(val) + " " + window.env.t('hp'), 'hp', 'glyphicon glyphicon-heart');
+ _notify(_sign(val) + " " + _round(val) + " " + window.env.t('health'), 'hp', 'glyphicon glyphicon-heart');
}
function lvl(){
@@ -79,7 +79,7 @@ angular.module("habitrpg").factory("Notification",
}
function mp(val) {
- _notify(_sign(val) + " " + _round(val) + " " + window.env.t('mp'), 'mp', 'glyphicon glyphicon-fire');
+ _notify(_sign(val) + " " + _round(val) + " " + window.env.t('mana'), 'mp', 'glyphicon glyphicon-fire');
}
function streak(val) {
diff --git a/website/views/shared/modals/welcome.jade b/website/views/shared/modals/welcome.jade
index bf8fe48dd1..927a5ab4f7 100644
--- a/website/views/shared/modals/welcome.jade
+++ b/website/views/shared/modals/welcome.jade
@@ -1,18 +1,31 @@
-// Created by sabrecat on 5/18/15.
-
script(type='text/ng-template', id='modals/welcome.html')
- .modal-header
- h4=env.t('welcomeToHabit')
- .modal-body.text-center
- h4=env.t('welcome1')
- .welcome_to_Habit_1.center-block
- h4=env.t('welcome2')
- .welcome_to_Habit_2.center-block
- h4=env.t('welcome3')
- .welcome_to_Habit_3.center-block
- h4=env.t('welcome4')
- .welcome_to_Habit_4.center-block
- .modal-footer
- span.h4=env.t('welcome5')
- |
- span.button.btn.btn-primary(ng-click='$close(); Guide.goto("intro",0)')=env.t('imReady')
\ No newline at end of file
+ .modal-header.text-center
+ h1=env.t('welcomeToHabit')
+ .modal-body
+ .container-fluid
+ .col-sm-4.col-centered
+ span(style='display:flex')
+ h1
+ | ①
+ h3(style='margin:auto auto auto .5em')=env.t('welcome1')
+ .welcome_basic_avatars(style='margin: 1.5em auto 1.5em')
+ h4=env.t('welcome1notes')
+ .col-sm-4.col-centered
+ span(style='display:flex')
+ h1
+ | ②
+ h3(style='margin:.3em auto auto .5em')=env.t('welcome2')
+ .welcome_sample_tasks(style='margin: 2.5em auto 1.5em')
+ h4=env.t('welcome2notes')
+ .col-sm-4.col-centered
+ span(style='display:flex')
+ h1
+ | ③
+ h3(style='margin:auto auto auto .5em')=env.t('welcome3')
+ .welcome_promo_party(style='margin: 1em auto 1em')
+ h4=env.t('welcome3notes')
+ .modal-footer.text-center(style='margin-top:0')
+ .col-sm-3
+ .col-sm-6
+ a.btn.btn-primary.btn-lg.flex-column(ng-click='$close(); Guide.goto("intro",0)')=env.t('imReady')
+ .col-sm-3
diff --git a/website/views/shared/tasks/index.jade b/website/views/shared/tasks/index.jade
index ee684c2960..79ab99d11b 100644
--- a/website/views/shared/tasks/index.jade
+++ b/website/views/shared/tasks/index.jade
@@ -11,7 +11,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
include ./task_view/graph
- h2.task-column_title {{::list.header}}
+ h2.task-column_title(class='{{::list.type}}-title') {{::list.header}}
include ./task_view/help