' +
'
' +
'
' +
@@ -216,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/public/js/static.js b/website/public/js/static.js
index 3fdd1e6f2d..ae355a4b17 100644
--- a/website/public/js/static.js
+++ b/website/public/js/static.js
@@ -18,6 +18,8 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui.
});
})
}
+
+ $scope.Math = window.Math;
}])
.controller("PlansCtrl", ['$rootScope',
diff --git a/website/public/manifest.json b/website/public/manifest.json
index 6d8af2438d..8bb5d7d275 100644
--- a/website/public/manifest.json
+++ b/website/public/manifest.json
@@ -125,7 +125,9 @@
],
"css": [
"bower_components/css-social-buttons/css/zocial.css",
- "front/staticstyle.css"
+ "front/staticstyle.css",
+ "common/dist/sprites/habitrpg-shared.css",
+ "app.css"
]
}
}
diff --git a/website/src/controllers/auth.js b/website/src/controllers/auth.js
index 228f0f7a3e..e861daab19 100644
--- a/website/src/controllers/auth.js
+++ b/website/src/controllers/auth.js
@@ -62,7 +62,7 @@ api.authWithUrl = function(req, res, next) {
if (_.isEmpty(user)) return res.json(401, NO_USER_FOUND);
res.locals.user = user;
next();
- })
+ });
}
api.registerUser = function(req, res, next) {
diff --git a/website/src/controllers/challenges.js b/website/src/controllers/challenges.js
index d6be9b5d43..26970b1dfe 100644
--- a/website/src/controllers/challenges.js
+++ b/website/src/controllers/challenges.js
@@ -11,7 +11,7 @@ var logging = require('./../logging');
var csv = require('express-csv');
var utils = require('../utils');
var api = module.exports;
-
+var pushNotify = require('./pushNotifications');
/*
------------------------------------------------------------------------
@@ -358,6 +358,9 @@ api.selectWinner = function(req, res, next) {
{name: 'CHALLENGE_NAME', content: chal.name}
]);
}
+
+ pushNotify.sendNotify(saved, shared.i18n.t('wonChallenge'), chal.name);
+
closeChal(cid, {broken: 'CHALLENGE_CLOSED', winner: saved.profile.name}, cb);
}
], function(err){
diff --git a/website/src/controllers/groups.js b/website/src/controllers/groups.js
index e515cd95a7..b9d2643c61 100644
--- a/website/src/controllers/groups.js
+++ b/website/src/controllers/groups.js
@@ -15,6 +15,7 @@ var Challenge = require('./../models/challenge').model;
var EmailUnsubscription = require('./../models/emailUnsubscription').model;
var isProd = nconf.get('NODE_ENV') === 'production';
var api = module.exports;
+var pushNotify = require('./pushNotifications');
/*
------------------------------------------------------------------------
@@ -136,8 +137,36 @@ api.get = function(req, res, next) {
populateQuery(gid, q);
q.exec(function(err, group){
if (err) return next(err);
- if (!group && gid!=='party') return res.json(404,{err: "Group not found or you don't have access."});
- res.json(group);
+ if(!group){
+ if(gid !== 'party') return res.json(404,{err: "Group not found or you don't have access."});
+
+ // Don't send a 404 when querying for a party even if it doesn't exist
+ // so that users with no party don't get a 404 on every access to the site
+ return res.json(group);
+ }
+ //Since we have a limit on how many members are populate to the group, we want to make sure the user is always in the group
+ var userInGroup = _.find(group.members, function(member){ return member._id == user._id; });
+ //If the group is private or the group is a party, then the user must be a member of the group based on access restrictions above
+ if (group.privacy === 'private' || gid === 'party') {
+ //If the user is not in the group query, remove a user and add the current user
+ if (!userInGroup) {
+ group.members.splice(0,1);
+ group.members.push(user);
+ }
+ res.json(group);
+ } else if ( group.privacy === "public" ) { //The group is public, we must do an extra check to see if the user is already in the group query
+ //We must see how to check if a user is a member of a public group, so we requery
+ var q2 = Group.findOne({ _id: group._id, privacy:'public', members: {$in:[user._id]} });
+ q2.exec(function(err, group2){
+ if (err) return next(err);
+ if (group2 && !userInGroup) {
+ group.members.splice(0,1);
+ group.members.push(user);
+ }
+ res.json(group);
+ });
+ }
+
gid = null;
});
};
@@ -309,7 +338,8 @@ api.flagChatMessage = function(req, res, next){
group.markModified('chat');
group.save(function(err,_saved){
if(err) return next(err);
- var addressesToSendTo = JSON.parse(nconf.get('FLAG_REPORT_EMAIL'));
+ var addressesToSendTo = nconf.get('FLAG_REPORT_EMAIL');
+ addressesToSendTo = (typeof addressesToSendTo == 'string') ? JSON.parse(addressesToSendTo) : addressesToSendTo;
if(Array.isArray(addressesToSendTo)){
addressesToSendTo = addressesToSendTo.map(function(email){
@@ -326,17 +356,17 @@ api.flagChatMessage = function(req, res, next){
{name: "REPORTER_USERNAME", content: user.profile.name},
{name: "REPORTER_UUID", content: user._id},
{name: "REPORTER_EMAIL", content: user.auth.local ? user.auth.local.email : ((user.auth.facebook && user.auth.facebook.emails && user.auth.facebook.emails[0]) ? user.auth.facebook.emails[0].value : null)},
- {name: "REPORTER_MODAL_URL", content: "https://habitrpg.com/static/front/#?memberId=" + user._id},
+ {name: "REPORTER_MODAL_URL", content: "/static/front/#?memberId=" + user._id},
{name: "AUTHOR_USERNAME", content: message.user},
{name: "AUTHOR_UUID", content: message.uuid},
{name: "AUTHOR_EMAIL", content: author.auth.local ? author.auth.local.email : ((author.auth.facebook && author.auth.facebook.emails && author.auth.facebook.emails[0]) ? author.auth.facebook.emails[0].value : null)},
- {name: "AUTHOR_MODAL_URL", content: "https://habitrpg.com/static/front/#?memberId=" + message.uuid},
+ {name: "AUTHOR_MODAL_URL", content: "/static/front/#?memberId=" + message.uuid},
{name: "GROUP_NAME", content: group.name},
{name: "GROUP_TYPE", content: group.type},
{name: "GROUP_ID", content: group._id},
- {name: "GROUP_URL", content: group._id == 'habitrpg' ? (nconf.get('BASE_URL') + '/#/options/groups/tavern') : (group.type === 'guild' ? (nconf.get('BASE_URL')+ '/#/options/groups/guilds/' + group._id) : 'party')},
+ {name: "GROUP_URL", content: group._id == 'habitrpg' ? '/#/options/groups/tavern' : (group.type === 'guild' ? ('/#/options/groups/guilds/' + group._id) : 'party')},
]);
return res.send(204);
@@ -398,7 +428,8 @@ api.likeChatMessage = function(req, res, next) {
api.join = function(req, res, next) {
var user = res.locals.user,
- group = res.locals.group;
+ group = res.locals.group,
+ isUserInvited = false;
if (group.type == 'party' && group._id == (user.invitations && user.invitations.party && user.invitations.party.id)) {
User.update({_id:user.invitations.party.inviter}, {$inc:{'items.quests.basilist':1}}).exec(); // Reward inviter
@@ -409,16 +440,25 @@ api.join = function(req, res, next) {
group.quest.members[user._id] = undefined;
group.markModified('quest.members');
}
- }
- else if (group.type == 'guild' && user.invitations && user.invitations.guilds) {
+ isUserInvited = true;
+ } else if (group.type == 'guild' && user.invitations && user.invitations.guilds) {
var i = _.findIndex(user.invitations.guilds, {id:group._id});
- if (~i) user.invitations.guilds.splice(i,1);
- user.save();
+ if (~i){
+ isUserInvited = true;
+ user.invitations.guilds.splice(i,1);
+ user.save();
+ }else{
+ isUserInvited = group.privacy === 'private' ? false : true;
+ }
}
+ if(!isUserInvited) return res.json(401, {err: "Can't join a group you're not invited to."});
+
if (!_.contains(group.members, user._id)){
group.members.push(user._id);
- group.invites.splice(_.indexOf(group.invites, user._id), 1);
+ if (group.invites.length > 0) {
+ group.invites.splice(_.indexOf(group.invites, user._id), 1);
+ }
}
async.series([
@@ -430,7 +470,6 @@ api.join = function(req, res, next) {
}
], function(err, results){
if (err) return next(err);
-
// Return the group? Or not?
res.json(results[1]);
group = null;
@@ -540,9 +579,13 @@ var inviteByUUIDs = function(uuids, group, req, res, next){
function sendInvite (){
if(group.type === 'guild'){
invite.invitations.guilds.push({id: group._id, name: group.name, inviter:res.locals.user._id});
+
+ pushNotify.sendNotify(invite, shared.i18n.t('invitedGuild'), group.name);
}else{
//req.body.type in 'guild', 'party'
invite.invitations.party = {id: group._id, name: group.name, inviter:res.locals.user._id};
+
+ pushNotify.sendNotify(invite, shared.i18n.t('invitedParty'), group.name);
}
group.invites.push(invite._id);
@@ -567,12 +610,12 @@ var inviteByUUIDs = function(uuids, group, req, res, next){
if(group.type == 'guild'){
emailVars.push(
{name: 'GUILD_NAME', content: group.name},
- {name: 'GUILD_URL', content: nconf.get('BASE_URL') + '/#/options/groups/guilds/public'}
+ {name: 'GUILD_URL', content: '/#/options/groups/guilds/public'}
);
}else{
emailVars.push(
{name: 'PARTY_NAME', content: group.name},
- {name: 'PARTY_URL', content: nconf.get('BASE_URL') + '/#/options/groups/party'}
+ {name: 'PARTY_URL', content: '/#/options/groups/party'}
)
}
@@ -614,7 +657,7 @@ var inviteByEmails = function(invites, group, req, res, next){
}
// yeah, it supports guild too but for backward compatibility we'll use partyInvite as query
- var link = nconf.get('BASE_URL')+'?partyInvite='+ utils.encrypt(JSON.stringify({id:group._id, inviter:res.locals.user._id, name:group.name}));
+ var link = '?partyInvite='+ utils.encrypt(JSON.stringify({id:group._id, inviter:res.locals.user._id, name:group.name}));
var inviterVars = utils.getUserInfo(res.locals.user, ['name', 'email']);
var variables = [
@@ -679,8 +722,8 @@ api.removeMember = function(req, res, next){
utils.txnEmail(removedUser, ('kicked-from-' + group.type), [
{name: 'GROUP_NAME', content: group.name},
{name: 'MESSAGE', content: message},
- {name: 'GUILDS_LINK', content: nconf.get('BASE_URL') + '/#/options/groups/guilds/public'},
- {name: 'PARTY_WANTED_GUILD', content: nconf.get('BASE_URL') + '/#/options/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'}
+ {name: 'GUILDS_LINK', content: '/#/options/groups/guilds/public'},
+ {name: 'PARTY_WANTED_GUILD', content: '/#/options/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'}
]);
}
}
@@ -830,7 +873,7 @@ questStart = function(req, res, next) {
});
utils.txnEmail(usersToEmail, 'quest-started', [
- {name: 'PARTY_URL', content: nconf.get('BASE_URL') + '/#/options/groups/party'}
+ {name: 'PARTY_URL', content: '/#/options/groups/party'}
]);
_.each(groupClone.members, function(user){
@@ -870,6 +913,10 @@ api.questAccept = function(req, res, next) {
group.quest.leader = user._id;
} else {
group.quest.members[m] = undefined;
+
+ User.findById(m, function(err,groupMember){
+ pushNotify.sendNotify(groupMember, shared.i18n.t('questInvitationTitle'), shared.i18n.t('questInvitationInfo', { quest: quest.text() }));
+ });
}
});
@@ -890,7 +937,7 @@ api.questAccept = function(req, res, next) {
{name: 'QUEST_NAME', content: quest.text()},
{name: 'INVITER', content: inviterVars.name},
{name: 'REPLY_TO_ADDRESS', content: inviterVars.email},
- {name: 'PARTY_URL', content: nconf.get('BASE_URL') + '/#/options/groups/party'}
+ {name: 'PARTY_URL', content: '/#/options/groups/party'}
]);
questStart(req,res,next);
diff --git a/website/src/controllers/members.js b/website/src/controllers/members.js
index 9102df985a..c7fe341d3d 100644
--- a/website/src/controllers/members.js
+++ b/website/src/controllers/members.js
@@ -7,6 +7,7 @@ var _ = require('lodash');
var shared = require('../../../common');
var utils = require('../utils');
var nconf = require('nconf');
+var pushNotify = require('./pushNotifications');
var fetchMember = function(uuid, restrict){
return function(cb){
@@ -72,7 +73,7 @@ api.sendPrivateMessage = function(req, res, next){
if(fetchedMember.preferences.emailNotifications.newPM !== false){
utils.txnEmail(fetchedMember, 'new-pm', [
{name: 'SENDER', content: utils.getUserInfo(res.locals.user, ['name']).name},
- {name: 'PMS_INBOX_URL', content: nconf.get('BASE_URL') + '/#/options/groups/inbox'}
+ {name: 'PMS_INBOX_URL', content: '/#/options/groups/inbox'}
]);
}
@@ -96,12 +97,18 @@ api.sendGift = function(req, res, next){
member.balance += amt;
user.balance -= amt;
api.sendMessage(user, member, req.body);
+
+ var byUsername = utils.getUserInfo(user, ['name']).name;
+
if(member.preferences.emailNotifications.giftedGems !== false){
utils.txnEmail(member, 'gifted-gems', [
- {name: 'GIFTER', content: utils.getUserInfo(user, ['name']).name},
+ {name: 'GIFTER', content: byUsername},
{name: 'X_GEMS_GIFTED', content: req.body.gems.amount}
]);
}
+
+ pushNotify.sendNotify(member, shared.i18n.t('giftedGems'), shared.i18n.t('giftedGemsInfo', { amount: req.body.gems.amount, name: byUsername }));
+
return async.parallel([
function (cb2) { member.save(cb2) },
function (cb2) { user.save(cb2) }
diff --git a/website/src/controllers/payments/index.js b/website/src/controllers/payments/index.js
index f117a48bc5..31d691a7fe 100644
--- a/website/src/controllers/payments/index.js
+++ b/website/src/controllers/payments/index.js
@@ -12,6 +12,7 @@ var async = require('async');
var iap = require('./iap');
var mongoose= require('mongoose');
var cc = require('coupon-code');
+var pushNotify = require('./../pushNotifications');
function revealMysteryItems(user) {
_.each(shared.content.gear.flat, function(item) {
@@ -75,12 +76,19 @@ exports.createSubscription = function(data, cb) {
data.user.purchased.txnCount++;
if (data.gift){
members.sendMessage(data.user, data.gift.member, data.gift);
+
+ var byUserName = utils.getUserInfo(data.user, ['name']).name;
+
if(data.gift.member.preferences.emailNotifications.giftedSubscription !== false){
utils.txnEmail(data.gift.member, 'gifted-subscription', [
- {name: 'GIFTER', content: utils.getUserInfo(data.user, ['name']).name},
+ {name: 'GIFTER', content: byUserName},
{name: 'X_MONTHS_SUBSCRIPTION', content: months}
]);
- }
+ }
+
+ if (data.gift.member._id != data.user._id) { // Only send push notifications if sending to a user other than yourself
+ pushNotify.sendNotify(data.gift.member, shared.i18n.t('giftedSubscription'), months + " months - by "+ byUserName);
+ }
}
async.parallel([
function(cb2){data.user.save(cb2)},
@@ -119,13 +127,20 @@ exports.buyGems = function(data, cb) {
utils.ga.transaction(data.user._id, amt).item(amt, 1, data.paymentMethod.toLowerCase() + "-checkout", "Gems > " + data.paymentMethod).send();
}
if (data.gift){
+ var byUsername = utils.getUserInfo(data.user, ['name']).name;
+ var gemAmount = data.gift.gems.amount || 20;
+
members.sendMessage(data.user, data.gift.member, data.gift);
if(data.gift.member.preferences.emailNotifications.giftedGems !== false){
utils.txnEmail(data.gift.member, 'gifted-gems', [
- {name: 'GIFTER', content: utils.getUserInfo(data.user, ['name']).name},
- {name: 'X_GEMS_GIFTED', content: data.gift.gems.amount || 20}
+ {name: 'GIFTER', content: byUsername},
+ {name: 'X_GEMS_GIFTED', content: gemAmount}
]);
}
+
+ if (data.gift.member._id != data.user._id) { // Only send push notifications if sending to a user other than yourself
+ pushNotify.sendNotify(data.gift.member, shared.i18n.t('giftedGems'), gemAmount + ' Gems - by '+byUsername);
+ }
}
async.parallel([
function(cb2){data.user.save(cb2)},
@@ -153,4 +168,4 @@ exports.paypalCheckoutSuccess = paypal.executePayment;
exports.paypalIPN = paypal.ipn;
exports.iapAndroidVerify = iap.androidVerify;
-exports.iapIosVerify = iap.iosVerify;
\ No newline at end of file
+exports.iapIosVerify = iap.iosVerify;
diff --git a/website/src/controllers/pushNotifications.js b/website/src/controllers/pushNotifications.js
new file mode 100644
index 0000000000..d0d98b5218
--- /dev/null
+++ b/website/src/controllers/pushNotifications.js
@@ -0,0 +1,57 @@
+var api = module.exports;
+var _ = require('lodash');
+var nconf = require('nconf');
+
+var pushNotify = require('push-notify');
+
+var gcmApiKey = nconf.get("PUSH_CONFIGS:GCM_SERVER_API_KEY");
+
+var gcm = gcmApiKey ? pushNotify.gcm({
+ apiKey: gcmApiKey,
+ retries: 3
+}) : undefined;
+
+if(gcm){
+ gcm.on('transmitted', function (result, message, registrationId) {
+ console.info("transmitted", result, message, registrationId);
+ });
+
+ gcm.on('transmissionError', function (error, message, registrationId) {
+ console.info("transmissionError", error, message, registrationId);
+ });
+ gcm.on('updated', function (result, registrationId) {
+ console.info("updated", result, registrationId);
+ });
+}
+
+api.sendNotify = function(user, title, msg, timeToLive){
+ timeToLive = timeToLive || 15;
+
+ // need investigation:
+ // https://github.com/HabitRPG/habitrpg/issues/5252
+ if(!user)
+ return;
+
+ _.forEach(user.pushDevices, function(pushDevice){
+ switch(pushDevice.type){
+ case "android":
+ if(gcm){
+ gcm.send({
+ registrationId: pushDevice.regId,
+ //collapseKey: 'COLLAPSE_KEY',
+ delayWhileIdle: true,
+ timeToLive: timeToLive,
+ data: {
+ title: title,
+ message: msg
+ }
+ });
+ }
+
+ break;
+
+ case "ios":
+ break;
+ }
+ });
+};
diff --git a/website/src/middleware.js b/website/src/middleware.js
index 34e1446be8..5c77e0a5dd 100644
--- a/website/src/middleware.js
+++ b/website/src/middleware.js
@@ -198,7 +198,8 @@ module.exports.locals = function(req, res, next) {
Content: shared.content,
mods: require('./models/user').mods,
tavern: tavern, // for world boss
- worldDmg: (tavern && tavern.quest && tavern.quest.extra && tavern.quest.extra.worldDmg) || {}
+ worldDmg: (tavern && tavern.quest && tavern.quest.extra && tavern.quest.extra.worldDmg) || {},
+ _: _
});
// Put query-string party (& guild but use partyInvite for backward compatibility)
diff --git a/website/src/models/user.js b/website/src/models/user.js
index 61f44e1724..60385abfbb 100644
--- a/website/src/models/user.js
+++ b/website/src/models/user.js
@@ -393,7 +393,12 @@ var UserSchema = new Schema({
todos: {type:[TaskSchemas.TodoSchema]},
rewards: {type:[TaskSchemas.RewardSchema]},
- extra: Schema.Types.Mixed
+ extra: Schema.Types.Mixed,
+
+ pushDevices: {type: [{
+ regId: {type: String},
+ type: {type: String}
+ }],'default': []}
}, {
strict: true,
diff --git a/website/src/routes/apiv2.coffee b/website/src/routes/apiv2.coffee
index f30b03cb53..9694c0f37f 100644
--- a/website/src/routes/apiv2.coffee
+++ b/website/src/routes/apiv2.coffee
@@ -396,6 +396,16 @@ module.exports = (swagger, v2) ->
]
action: user.deleteWebhook
+ # Push Notifications
+ "/user/pushDevice":
+ spec:
+ method: 'POST'
+ description: 'Add a new push devices registration ID'
+ parameters: [
+ body '','New push registration { regId: "123123", type: "android"}','object'
+ ]
+ action: user.addPushDevice
+
# ---------------------------------
# Groups
# ---------------------------------
diff --git a/website/src/utils.js b/website/src/utils.js
index cefb9cab8c..00ee9c106b 100644
--- a/website/src/utils.js
+++ b/website/src/utils.js
@@ -87,7 +87,7 @@ module.exports.txnEmail = function(mailingInfoArray, emailType, variables, perso
},
{
name: 'RECIPIENT_UNSUB_URL',
- content: baseUrl + '/unsubscribe?code=' + module.exports.encrypt(JSON.stringify({
+ content: '/unsubscribe?code=' + module.exports.encrypt(JSON.stringify({
_id: mailingInfo._id,
email: mailingInfo.email
}))
@@ -113,7 +113,7 @@ module.exports.txnEmail = function(mailingInfoArray, emailType, variables, perso
},
{
name: 'RECIPIENT_UNSUB_URL',
- content: baseUrl + '/unsubscribe?code=' + module.exports.encrypt(JSON.stringify({
+ content: '/unsubscribe?code=' + module.exports.encrypt(JSON.stringify({
_id: temporaryPersonalVariables[singlePersonalVariables.rcpt]._id,
email: singlePersonalVariables.rcpt
}))
diff --git a/website/views/options/inventory/inventory.jade b/website/views/options/inventory/inventory.jade
index 83349e019e..4d110776aa 100644
--- a/website/views/options/inventory/inventory.jade
+++ b/website/views/options/inventory/inventory.jade
@@ -2,7 +2,7 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html')
.container-fluid
.row
.col-md-6.border-right
- h3.equipment-title.hint(popover-trigger='mouseenter', popover-placement='top', popover-append-to-body='true', popover=env.t('battleGearText'))=env.t('battleGear')
+ h3.equipment-title.hint(popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', popover=env.t('battleGearText'))=env.t('battleGear')
div
button.btn.btn-default(type="button", ng-click='dequip("battleGear");') {{env.t("unequipBattleGear")}}
li.customize-menu.inventory-gear
@@ -193,8 +193,8 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
p
| {{::egg.value}}
span.Pet_Currency_Gem1x.inline-gems
- //- buyable quest eggs
- each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin',rock:'Rock',bunny:'Bunny',slime:'Slime'}
+ //- buyable quest eggs. TODO: Get this from a collection so we don't have to maintain this ridiculous comma-delimited list
+ each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin',rock:'Rock',bunny:'Bunny',slime:'Slime',sheep:'Sheep'}
div(ng-show='user.achievements.quests.#{quest} > 0')
button.customize-option(popover='{{::Content.eggs.#{egg}.notes()}}', popover-title!=env.t("egg", {eggType: "{{::Content.eggs.#{egg}.text()}}"}), popover-trigger='mouseenter', popover-placement='top', popover-append-to-body='true', ng-click='purchase("eggs", Content.eggs.#{egg})', class='Pet_Egg_#{egg}')
p
diff --git a/website/views/options/inventory/stable.jade b/website/views/options/inventory/stable.jade
index af8329f996..83c448d4f1 100644
--- a/website/views/options/inventory/stable.jade
+++ b/website/views/options/inventory/stable.jade
@@ -24,7 +24,7 @@ mixin mountList(source)
div(popover-trigger='mouseenter', popover=env.t('mountName', {potion: potion.text(env.language.code), mount: egg.mountText(env.language.code)}), popover-placement='bottom')
button(class="pet-button Mount_Head_#{mount}", ng-show='user.items.mounts["#{mount}"]', ng-class='{active: user.items.currentMount == "#{mount}"}', ng-click='chooseMount("#{egg.key}", "#{potion.key}")')
//div(class='Mount_Head_{{mount}}')
- button(class="pet-button pet-not-owned", ng-hide='user.items.mounts["#{mount}"]')
+ button(class="pet-button mount-not-owned", ng-hide='user.items.mounts["#{mount}"]')
.PixelPaw
-}
diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade
index d37cf01aa0..8867593f24 100644
--- a/website/views/options/profile.jade
+++ b/website/views/options/profile.jade
@@ -4,6 +4,7 @@ mixin gemCost(cost)
= ' ' + env.t('locked')
block
+-var gearGroup = function(grouping) { return env._(env.Content.gear.flat).where({gearSet:grouping}).pluck('key') }
-var showPath = function(path, items, joiner) { return path+'["'+items.join('"] '+joiner+' '+path+'["')+'"]'; }
-var unlockPath = function(path, items) { return 'unlock("'+path+'.'+items.join(','+path+'.')+'")'; }
@@ -19,7 +20,7 @@ mixin customizeProfile(mobile)
+gemCost(2)
button.btn.btn-xs(ng-click='#{unlockPath(path, colors)}')!= env.t('unlockSet',{cost:5}) + '
'
each color in colors
- button.customize-option(type='button', class='#{path=="skin" ? "skin_"+color : "customize-option hair hair_bangs_1_"+color}', ng-class='{locked: !user.purchased.#{path}["#{color}"]}', ng-if='#{status!="disabled"} || user.purchased.#{path}["#{color}"]', ng-click='unlock("#{path}.#{color}")')
+ button.customize-option(type='button', class='#{path=="skin" ? "skin_"+color : "customize-option hair hair_bangs_1_"+color}', ng-class='{locked: !user.purchased.#{path}["#{color}"], selectableInventory: user.preferences.#{path} == "#{color}"}', ng-if='#{status!="disabled"} || user.purchased.#{path}["#{color}"]', ng-click='unlock("#{path}.#{color}")')
div(class=mobile ? 'padding' : 'container-fluid row')
.col-md-4
@@ -35,7 +36,7 @@ mixin customizeProfile(mobile)
li.customize-menu
menu(label=env.t('shirts'))
each shirt in ['black', 'blue', 'green', 'pink', 'white', 'yellow']
- button.customize-option(class='{{user.preferences.size}}_shirt_'+shirt, type='button', ng-click='set({"preferences.shirt":"'+shirt+'"})')
+ button.customize-option(class='{{user.preferences.size}}_shirt_'+shirt, type='button', ng-click='set({"preferences.shirt":"'+shirt+'"})', ng-class='{selectableInventory: user.preferences.shirt == "#{shirt}"}')
menu(label=env.t('specialShirts'))
- var specialShirts = ['convict', 'cross', 'fire', 'horizon', 'ocean', 'purple', 'rainbow', 'redblue', 'thunder', 'tropical', 'zombie']
@@ -43,8 +44,17 @@ mixin customizeProfile(mobile)
+gemCost(2)
button.btn.btn-xs(ng-click='#{unlockPath("shirt",specialShirts)}')!= env.t('unlockSet',{cost:5}) + '
'
each shirt in specialShirts
- button.customize-option(type='button', class='{{user.preferences.size}}_shirt_'+shirt, ng-class='{locked: !user.purchased.shirt.'+shirt+'}', ng-click='unlock("shirt.'+shirt+'")')
+ button.customize-option(type='button', class='{{user.preferences.size}}_shirt_'+shirt, ng-class='{locked: !user.purchased.shirt.'+shirt+', selectableInventory: user.preferences.shirt == "#{shirt}"}', ng-click='unlock("shirt.'+shirt+'")')
+ h3(class=mobile?'item item-divider':'')=env.t('accessories')
+
+ menu(type='list')
+ li.customize-menu
+ menu(label=env.t('animalEars'))
+ span(ng-hide='#{showPath("user.items.gear.owned", gearGroup("animal"), "&&")}')
+ +gemCost(2)
+ button.btn.btn-xs(ng-click='#{unlockPath("items.gear.owned", gearGroup("animal"))}')!= env.t('unlockSet', {cost: 5}) + '
'
+ button.customize-option(ng-repeat='item in ::getGearArray("animal")' ng-class="{locked: user.items.gear.owned[item.key] == undefined, selectableInventory: user.preferences.costume ? user.items.gear.costume.headAccessory == item.key : user.items.gear.equipped.headAccessory == item.key}", popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase(item.type,item)', class='shop_{{::item.key}}')
.col-md-4
h3(class=mobile?'item item-divider':'')=env.t('bodyHead')
@@ -56,11 +66,11 @@ mixin customizeProfile(mobile)
li.customize-menu
menu(label=env.t('color'))
each color in ['white','brown','blond','red','black']
- button(type='button', class='#{path=="skin" ? "skin_"+color : "customize-option hair hair_bangs_1_"+color}', ng-click='set({"preferences.hair.color": "#{color}"})')
+ button(type='button', class='#{path=="skin" ? "skin_"+color : "customize-option hair hair_bangs_1_"+color}', ng-click='set({"preferences.hair.color": "#{color}"})', ng-class='{selectableInventory: user.preferences.hair.color == "#{color}"}')
each color in ['candycane','frost','winternight','holly']
- button(type='button', ng-if='user.purchased.hair.color.#{color}', class='customize-option hair hair_bangs_1_#{color}', ng-click='unlock("hair.color.#{color}")')
+ button(type='button', ng-if='user.purchased.hair.color.#{color}', class='customize-option hair hair_bangs_1_#{color}', ng-click='unlock("hair.color.#{color}")', ng-class='{selectableInventory: user.preferences.hair.color == "#{color}"}')
each color in ['pblue','pgreen','porange','ppink','ppurple','pyellow']
- button(type='button', ng-if='user.purchased.hair.color.#{color}', class='customize-option hair hair_bangs_1_#{color}', ng-click='unlock("hair.color.#{color}")')
+ button(type='button', ng-if='user.purchased.hair.color.#{color}', class='customize-option hair hair_bangs_1_#{color}', ng-click='unlock("hair.color.#{color}")', ng-class='{selectableInventory: user.preferences.hair.color == "#{color}"}')
+buyPref('hair.color', ['rainbow','yellow','green','purple','blue','TRUred'], 'rainbowColors')
+buyPref('hair.color', ['pblue2','pgreen2','porange2','ppink2','ppurple2','pyellow2'], 'shimmerColors', 'disabled')
+buyPref('hair.color', ['candycorn','ghostwhite','halloween','midnight','pumpkin','zombie'], 'hauntedColors', 'disabled')
@@ -71,15 +81,15 @@ mixin customizeProfile(mobile)
// Bangs
menu(label=env.t('hairBangs'))
- button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.bangs":0})')
+ button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.bangs":0})', ng-class='{selectableInventory: user.preferences.hair.bangs == 0}')
each num in [1,2,3]
- button(class='hair_bangs_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.bangs":#{num}})')
+ button(class='hair_bangs_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.bangs":#{num}})', ng-class='{selectableInventory: user.preferences.hair.bangs == "#{num}"}')
// Base hairstyles (free)
menu(label=env.t('hairBase'))
- button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.base":0})')
+ button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.base":0})', ng-class='{selectableInventory: user.preferences.hair.base == 0}')
each num in [1,3]
- button(class='hair_base_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":#{num}})')
+ button(class='hair_base_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":#{num}})', ng-class='{selectableInventory: user.preferences.hair.base == "#{num}"}')
// Purchasable hairstyles
menu(label=env.t('hairSet1'))
@@ -88,22 +98,22 @@ mixin customizeProfile(mobile)
+gemCost(2)
button.btn.btn-xs(ng-click='#{unlockPath("hair.base",styles)}')!= env.t('unlockSet',{cost:5}) + '
'
each num in styles
- button(class='hair_base_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base["#{num}"]}', ng-click='unlock("hair.base.#{num}")')
+ button(class='hair_base_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base["#{num}"], selectableInventory: user.preferences.hair.base == "#{num}"}', ng-click='unlock("hair.base.#{num}")')
menu(label=env.t('hairSet2'))
- var styles = [9,10,11,12,13,14]
span(ng-hide='#{showPath("user.purchased.hair.base", styles, "&&")}')
+gemCost(2)
button.btn.btn-xs(ng-click='#{unlockPath("hair.base", styles)}')!= env.t('unlockSet', {cost: 5}) + '
'
each num in styles
- button(class='hair_base_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base["#{num}"]}', ng-click='unlock("hair.base.#{num}")')
+ button(class='hair_base_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base["#{num}"], selectableInventory: user.preferences.hair.base == "#{num}"}', ng-click='unlock("hair.base.#{num}")')
// Flower
li.customize-menu
menu(label=env.t('flower'))
- button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.flower":0})')
+ button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.flower":0})', ng-class='{selectableInventory: user.preferences.hair.flower == 0}')
each num in [1,2,3,4,5,6]
- button(class='hair_flower_#{num} customize-option', type='button', ng-click='set({"preferences.hair.flower":#{num}})')
+ button(class='hair_flower_#{num} customize-option', type='button', ng-click='set({"preferences.hair.flower":#{num}})', ng-class='{selectableInventory: user.preferences.hair.flower == "#{num}"}')
li.customize-menu
menu(label=env.t('bodyFacialHair'))
@@ -113,15 +123,15 @@ mixin customizeProfile(mobile)
// Beard
menu(label=env.t('beard'))
- button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.beard":0})')
+ button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.beard":0})', ng-class='{selectableInventory: user.preferences.hair.beard == 0}')
each num in [1,2,3]
- button(class='hair_beard_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.beard["#{num}"]}', ng-click='unlock("hair.beard.#{num}")')
+ button(class='hair_beard_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.beard["#{num}"], selectableInventory: user.preferences.hair.beard == "#{num}"}', ng-click='unlock("hair.beard.#{num}")')
// Mustache
menu(label=env.t('mustache'))
- button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.mustache":0})')
+ button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.mustache":0})', ng-class='{selectableInventory: user.preferences.hair.mustache == 0}')
each num in [1,2]
- button(class='hair_mustache_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.mustache["#{num}"]}', ng-click='unlock("hair.mustache.#{num}")')
+ button(class='hair_mustache_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.mustache["#{num}"], selectableInventory: user.preferences.hair.mustache == "#{num}"}', ng-click='unlock("hair.mustache.#{num}")')
.col-md-4
h3(class=mobile?'item item-divider':'')=env.t('bodySkin')
@@ -130,13 +140,14 @@ mixin customizeProfile(mobile)
li.customize-menu
menu(label=env.t('basicSkins'))
each color in ['ddc994','f5a76e','ea8349','c06534','98461a','915533','c3e1dc','6bd049']
- button.customize-option(type='button', class='skin_#{color}', ng-click='set({"preferences.skin":"#{color}"})')
+ button.customize-option(type='button', class='skin_#{color}', ng-click='set({"preferences.skin":"#{color}"})', ng-class='{selectableInventory: user.preferences.skin == "#{color}"}')
- // Rainbow Skin
+ // Always-available premium skins
+buyPref('skin', ['eb052b','f69922','f5d70f','0ff591','2b43f6','d7a9f7','800ed0','rainbow'], 'rainbowSkins')
- +buyPref('skin', ['pastelPink','pastelOrange','pastelYellow','pastelGreen','pastelBlue','pastelPurple','pastelRainbowChevron','pastelRainbowDiagonal'], 'pastelSkins', 'disabled')
+ +buyPref('skin', ['bear','cactus','fox','lion','panda','pig','tiger','wolf'], 'animalSkins')
- // Special Events
+ // Seasonal event skins. Note that Spooky Skins are a legacy set and should always be disabled for purchase
+ +buyPref('skin', ['pastelPink','pastelOrange','pastelYellow','pastelGreen','pastelBlue','pastelPurple','pastelRainbowChevron','pastelRainbowDiagonal'], 'pastelSkins', 'disabled')
+buyPref('skin', ['monster','pumpkin','skeleton','zombie','ghost','shadow'], 'spookySkins', 'disabled')
+buyPref('skin', ['candycorn','ogre','pumpkin2','reptile','shadow2','skeleton2','transparent','zombie2'], 'supernaturalSkins', 'disabled')
@@ -161,9 +172,11 @@ mixin profileStats
table.table.table-striped
tr
td
- strong.inline
- |{{user.stats.points}}
- strong.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelPopover'))=env.t('unallocated')
+ p(ng-if='::user.stats.lvl >= 100')!=env.t('noMoreAllocate')
+ p(ng-if='user.stats.points || user.stats.lvl < 100')
+ strong.inline
+ |{{user.stats.points}}
+ strong.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelPopover'))=env.t('unallocated')
td
tr
td(colspan=2)
diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade
index 378a534e25..c25d4a054f 100644
--- a/website/views/options/settings.jade
+++ b/website/views/options/settings.jade
@@ -9,9 +9,9 @@ script(id='partials/options.settings.html', type="text/ng-template")
li(ng-class="{ active: $state.includes('options.settings.export') }")
a(ui-sref='options.settings.export')
=env.t('dataExport')
- li(ng-class="{ active: $state.includes('options.settings.coupon') }")
- a(ui-sref='options.settings.coupon')
- =env.t('coupon')
+ li(ng-class="{ active: $state.includes('options.settings.promo') }")
+ a(ui-sref='options.settings.promo')
+ =env.t('promoCode')
li(ng-class="{ active: $state.includes('options.settings.subscription') }")
a(ui-sref='options.settings.subscription')=env.t('subscription')
li(ng-class="{ active: $state.includes('options.settings.notifications') }")
@@ -69,7 +69,6 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
// button.btn.btn-default(ng-click='showTour()', popover-placement='right', popover-trigger='mouseenter', popover=env.t('restartTour'))= env.t('showTour')
button.btn.btn-default(ng-click='showBailey()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('showBaileyPop'))= env.t('showBailey')
button.btn.btn-default(ng-click='openRestoreModal()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('fixValPop'))= env.t('fixVal')
- button.btn.btn-default(ng-click="openModal('invite-friends', {controller:'GroupsCtrl'})") Invite Friends
button.btn.btn-default(ng-if='user.preferences.disableClasses==true', ng-click='user.ops.changeClass({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('enableClassPop'))= env.t('enableClass')
button.btn.btn-default(ng-if='!user.preferences.disableClasses && user.flags.classSelected', ng-click='showClassesTour()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('classTourPop'))= env.t('showClass')
@@ -155,14 +154,14 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
a.btn.btn-danger(ng-click='openModal("reset", {controller:"SettingsCtrl"})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('resetAccPop'))= env.t('resetAccount')
a.btn.btn-danger(ng-click='openModal("delete", {controller:"SettingsCtrl"})', popover-trigger='mouseenter', popover=env.t('deleteAccPop'))= env.t('deleteAccount')
-script(type='text/ng-template', id='partials/options.settings.coupon.html')
+script(type='text/ng-template', id='partials/options.settings.promo.html')
.container-fluid
.row
.col-md-6
- h2= env.t('coupon')
+ h2=env.t('promoCode')
form.form-inline(role='form',ng-submit='enterCoupon(_couponCode)')
- input.form-control(type='text', ng-model='_couponCode', placeholder=env.t('couponPlaceholder'))
- button.btn.btn-primary(type='submit') Submit
+ input.form-control(type='text', ng-model='_couponCode', placeholder=env.t('promoPlaceholder'))
+ button.btn.btn-primary(type='submit')= env.t('submit')
div
small= env.t('couponText')
div(ng-if='user.contributor.sudo')
@@ -379,12 +378,12 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template')
.form-inline
.form-group
- input.form-control(type='text', ng-model='_subscription.coupon', placeholder='Promo Code')
+ input.form-control(type='text', ng-model='_subscription.coupon', placeholder= env.t('couponPlaceholder'))
.form-group
- button.btn.btn-small(type='button',ng-click='applyCoupon(_subscription.coupon)') Apply
+ button.btn.btn-small(type='button',ng-click='applyCoupon(_subscription.coupon)')= env.t("apply")
- h3(ng-if='(user.purchased.plan.customerId && user.purchased.plan.dateTerminated)') Resubscribe
- a.btn.btn-primary(ng-click='Payments.showStripe({subscription:_subscription.key, coupon:_subscription.coupon})', ng-disabled='!_subscription.key') Card
+ h3(ng-if='(user.purchased.plan.customerId && user.purchased.plan.dateTerminated)')= env.t("resubscribe")
+ a.btn.btn-primary(ng-click='Payments.showStripe({subscription:_subscription.key, coupon:_subscription.coupon})', ng-disabled='!_subscription.key')= env.t('card')
a.btn.btn-warning(href='/paypal/subscribe?_id={{user._id}}&apiToken={{user.apiToken}}&sub={{_subscription.key}}{{_subscription.coupon ? "&coupon="+_subscription.coupon : ""}}', ng-disabled='!_subscription.key') PayPal
div(ng-if='user.purchased.plan.customerId')
.btn.btn-primary(ng-if='!user.purchased.plan.dateTerminated && user.purchased.plan.paymentMethod=="Stripe"', ng-click='Payments.showStripeEdit()')=env.t('subUpdateCard')
diff --git a/website/views/options/social/chat-box.jade b/website/views/options/social/chat-box.jade
index 047f6e4eea..fb109b70bf 100644
--- a/website/views/options/social/chat-box.jade
+++ b/website/views/options/social/chat-box.jade
@@ -7,19 +7,18 @@ div.chat-form.guidelines-not-accepted(ng-if='!user.flags.communityGuidelinesAcce
div
button.btn.btn-warning(ng-click='acceptCommunityGuidelines()')=env.t('iAcceptCommunityGuidelines')
.chat-buttons
- button(type="button", ng-click='sync(group)', tooltip=env.t('toolTipMsg'))
- span.glyphicon.glyphicon-refresh
+ button(type="button", ng-click='sync(group)')=env.t('toolTipMsg')
form.chat-form(ng-if='user.flags.communityGuidelinesAccepted' ng-submit='postChat(group,message.content)')
div(ng-controller='AutocompleteCtrl')
- textarea.form-control(rows=4, ui-keydown='{"meta-enter":"postChat(group,message.content)"}', ui-keypress='{13:"postChat(group,message.content)"}', ng-model='message.content', updateinterval='250', flag='@', at-user, auto-complete placeholder="{{group._id == 'habitrpg' ? env.t('tavernCommunityGuidelinesPlaceholder') : ''}}")
- span.user-list(ng-show='!isAtListHidden')
- ul.list-at-user
- li(ng-repeat='msg in response | filter:filterUser | limitTo: 5', ng-click='autoComplete(msg)')
+ textarea.form-control(rows=4, ui-keydown='{"meta-enter":"postChat(group,message.content)"}', ui-keypress='{13:"postChat(group,message.content)"}', ng-model='message.content', updateinterval='250', flag='@', at-user, auto-complete placeholder="{{group._id == 'habitrpg' ? env.t('tavernCommunityGuidelinesPlaceholder') : ''}}", ng-disabled='_sending == true')
+ span.user-list
+ ul.list-at-user(ng-show="query")
+ li(ng-repeat='msg in response | filter:filterUser | limitTo: 5', ng-click='performCompletion(msg)')
span.username.label.label-default(ng-class=':: userLevelStyle(msg)') {{::msg.user}}
.chat-controls
.chat-formatting
include ../../shared/formatting-help
.chat-buttons
- input(type='submit', value=env.t('sendChat'), ng-class='{disabled: _sending == true}')
- button(type="button", ng-click='sync(group)')=env.t('toolTipMsg')
+ input.btn(type='submit', value=env.t('sendChat'), ng-disabled='_sending')
+ button.btn(type="button", ng-click='sync(group)', ng-disabled='_sending')=env.t('toolTipMsg')
diff --git a/website/views/options/social/chat-message.jade b/website/views/options/social/chat-message.jade
index 48c6d85e7f..944088faa4 100644
--- a/website/views/options/social/chat-message.jade
+++ b/website/views/options/social/chat-message.jade
@@ -31,6 +31,9 @@ mixin chatMessages(inbox)
|
a(ng-click="flagChatMessage(group._id, message)", ng-if=':: user.contributor.admin || (!message.sent && user.flags.communityGuidelinesAccepted && message.uuid != user.id && message.uuid != "system")')
span.glyphicon.glyphicon-flag(tooltip="{{message.flags[user._id] ? env.t('abuseAlreadyReported') : env.t('abuseFlag')}}" ng-class='message.flags[user._id] ? "text-danger" : ""')
+ |
+ a(ng-click="copyToDo(message)")
+ span.glyphicon.glyphicon-share(tooltip=env.t('copyMessageAsToDo'))
span.float-label(ng-class='::contribText(message.contributor, message.backer).length > 30 ? "long-title" : ""')
a.label.label-default.chat-message(ng-if=':: message.user', ng-class='::userLevelStyleFromLevel(message.contributor.level, message.backer.npc, style)', ng-click='clickMember(message.uuid, true)')
span.glyphicon.glyphicon-arrow-right(ng-if='::message.sent')
diff --git a/website/views/options/social/create-group.jade b/website/views/options/social/create-group.jade
index 6c0c4c20e8..846bd99837 100644
--- a/website/views/options/social/create-group.jade
+++ b/website/views/options/social/create-group.jade
@@ -23,6 +23,6 @@ form.col-md-12.form-horizontal(ng-submit='create(newGroup)')
.checkbox
label
input(type='checkbox', ng-model='newGroup.leaderOnly.challenges')
- | Only group leader can create challenges
+ =env.t('leaderOnlyChallenges')
.form-group(ng-show='type=="party"')
input.btn.btn-default.form-control(type='submit', value=env.t('create'))
diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade
index 4315ee285e..850694e7e4 100644
--- a/website/views/options/social/group.jade
+++ b/website/views/options/social/group.jade
@@ -23,8 +23,8 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
=env.t('leave')
a.btn.btn-success.pull-right(ng-if=':: !isMemberOfGroup(User.user._id, group)', ng-click='join(group)')=env.t('join')
span(ng-if='group.leader == user.id')
- button.btn.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing')=env.t('save')
- button.btn.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing')=env.t('editGroup')
+ button.btn.btn-sm.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing')=env.t('save')
+ button.btn.btn-sm.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing')=env.t('editGroup')
.panel-body
form(ng-show='group._editing')
@@ -42,7 +42,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
.checkbox
label
input(type='checkbox', ng-model='group.leaderOnly.challenges')
- | Only group leader can create challenges
+ =env.t('leaderOnlyChallenges')
h4=env.t('assignLeader')
select#group-leader-selection(ng-model='group._newLeader', ng-options='member.profile.name for member in group.members')
@@ -60,7 +60,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
.panel-heading
h3.panel-title
=env.t('members')
- button.pull-right.btn.btn-primary(ng-click="openInviteModal(group)") Invite Friends
+ button.pull-right.btn.btn-primary(ng-click="openInviteModal(group)")=env.t('inviteFriends')
.panel-body.modal-fixed-height
div.form-group(ng-if='::group.type=="party"')
p=env.t('partyList')
diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade
index 5cbea6e7c0..a965b5d1d3 100644
--- a/website/views/options/social/index.jade
+++ b/website/views/options/social/index.jade
@@ -113,3 +113,33 @@ script(type='text/ng-template', id='partials/options.social.html')
.tab-content
.tab-pane.active
div(ui-view)
+
+script(type='text/ng-template', id='modals/copyChatToDo.html')
+ .modal-header
+ h4=env.t('copyMessageAsToDo')
+ .modal-body
+ .form-group
+ input.form-control(type='text',ng-model='text', ng-model-options="{debounce: 1000}")
+ .form-group
+ textarea.form-control(rows='5',ng-model='notes', ng-model-options="{debounce: 1000}", focus-me)
+
+ hr
+
+ div.task-column.preview
+ div(ng-init='popoverOpen = false', class='task todo uncompleted color-neutral', popover-trigger='mouseenter', data-popover-html="{{popoverOpen ? '' : notes | markdown}}", popover-placement="top")
+ // right-hand side control buttons
+ .task-meta-controls
+ // Icons only available if you own the tasks (aka, hidden from challenge stats)
+ span(ng-if='!obj._locked')
+ // notes
+ span.task-notes(ng-show='notes', ng-click='popoverOpen = !popoverOpen', popover-trigger='click', data-popover-html="{{notes | markdown}}", popover-placement="top")
+ span.glyphicon.glyphicon-comment
+ |
+
+ // main content
+ div.task-text
+ markdown(text='text',target='_blank')
+
+ .modal-footer
+ button.btn.btn-default(ng-click='$close()')=env.t('close')
+ button.btn.btn-primary(ng-click='saveTodo()')=env.t('submit')
\ No newline at end of file
diff --git a/website/views/options/social/tavern.jade b/website/views/options/social/tavern.jade
index 54657ecff8..bfe065697a 100644
--- a/website/views/options/social/tavern.jade
+++ b/website/views/options/social/tavern.jade
@@ -14,14 +14,11 @@
h3.popover-title
a(target='_blank', href='http://www.kickstarter.com/profile/2014640723')=env.t('daniel')
.popover-content
- =env.t('danielText')
- div
- button.btn.btn-lg.btn-success(ng-class='{active: user.preferences.sleep}', ng-click='User.user.ops.sleep({})')
- span(ng-show='user.preferences.sleep')=env.t('innCheckOut')
- span(ng-hide='user.preferences.sleep')=env.t('innCheckIn')
- =env.t('danielText2')
- .alert.alert-info(ng-show='user.preferences.sleep')
- =env.t('innText',{name:"{{user.profile.name}}"})
+ | {{user.preferences.sleep ? env.t('innText',{name: user.profile.name}) : env.t('danielText')}}
+ button.btn-block.btn.btn-lg.btn-success(ng-click='User.user.ops.sleep({})')
+ | {{user.preferences.sleep ? env.t('innCheckOut') : env.t('innCheckIn')}}
+ span(ng-if='!user.preferences.sleep')=env.t('danielText2')
+
// Resources
.panel.panel-default
diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade
index 06f2f3f3ca..6f7cd61fd1 100644
--- a/website/views/shared/header/menu.jade
+++ b/website/views/shared/header/menu.jade
@@ -243,7 +243,7 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
li
a(ui-sref='options.settings.export')=env.t('export')
li
- a(ui-sref='options.settings.coupon') Coupon
+ a(ui-sref='options.settings.promo')=env.t('promoCode')
li
a(ui-sref='options.settings.subscription')=env.t('subscription')
li
diff --git a/website/views/shared/mixins.jade b/website/views/shared/mixins.jade
index f2c37b9b56..c4dde11e38 100644
--- a/website/views/shared/mixins.jade
+++ b/website/views/shared/mixins.jade
@@ -11,3 +11,9 @@ mixin aLink(url, label)
a(href="", ng-click="externalLink('#{url}')")= label
else
a(href='#{url}', target='_blank')= label
+
+mixin previewMarkdown(text)
+ .panel.panel-warning
+ .panel-heading=env.t('msgPreviewHeading')
+ .panel-body.markdown-preview
+ markdown(text='#{text}')
\ No newline at end of file
diff --git a/website/views/shared/modals/invite-friends.jade b/website/views/shared/modals/invite-friends.jade
index 1d3b586a29..36b1c21596 100644
--- a/website/views/shared/modals/invite-friends.jade
+++ b/website/views/shared/modals/invite-friends.jade
@@ -1,26 +1,26 @@
script(type='text/ng-template', id='modals/invite-friends.html')
.modal-header
- h4 Invite Friends
+ h4=env.t('inviteFriends')
.modal-body
- p.alert.alert-info Invite friends by
User ID here.
+ p.alert.alert-info!=env.t('inviteAlertInfo')
form.form-inline(ng-submit='invite()')
//-.alert.alert-danger(ng-show='_groupError') {{_groupError}}
.form-group
input.form-control(type='text', placeholder=env.t('userId'), ng-model='invitee')
|
- button.btn.btn-primary(type='submit') Invite Existing User
+ button.btn.btn-primary(type='submit')=env.t('inviteExistUser')
hr
- p.alert.alert-info Invite friends by email. If they join via your email, they'll automatically be invited to this group.
+ p.alert.alert-info=env.t('inviteByEmail')
form.form-horizontal(ng-submit='inviteEmails()')
table.table.table-striped
thead
tr
- th Name
- th Email
+ th=env.t('name')
+ th=env.t('email')
tbody
tr(ng-repeat='email in emails')
td
@@ -33,16 +33,16 @@ script(type='text/ng-template', id='modals/invite-friends.html')
i.glyphicon.glyphicon-plus
tr
td.form-group(colspan=2)
- label.col-sm-1.control-label By:
+ label.col-sm-1.control-label=env.t('byColon')
.col-sm-7
input.form-control(type='text', ng-model='inviter')
.col-sm-4
- button.btn.btn-primary(type='submit') Invite New User(s)
+ button.btn.btn-primary(type='submit')=env.t('inviteNewUsers')
//-
hr
- p.alert.alert-info Or share this link (copy/paste):
+ p.alert.alert-info=env.t('inviteAlertInfo2')
input.form-control(type='text', ng-value='inviteLink({id: party._id, inviter: user._id, name: party.name})')
.modal-footer
- button.btn.btn-default(ng-click='$close()') Close
+ button.btn.btn-default(ng-click='$close()')=env.t('close')
diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade
index 0add44a526..2f5fc4196e 100644
--- a/website/views/shared/modals/members.jade
+++ b/website/views/shared/modals/members.jade
@@ -2,7 +2,7 @@ script(type='text/ng-template', id='modals/member.html')
.modal-header
h4
span {{::profile.profile.name}}
- span(ng-if='profile.contributor.level') - {{::contribText(profile.contributor, profile.backer)}}
+ span(ng-if='::contribText && profile.contributor.level') - {{::contribText(profile.contributor, profile.backer)}}
.modal-body
.container-fluid
.row
@@ -22,6 +22,7 @@ script(type='text/ng-template', id='modals/member.html')
|
| {{::profile.auth.timestamps.loggedin | date:user.preferences.dateFormat}} -
h3=env.t('stats')
+ // @TODO: Figure out why this isn't showing up in front page
.label.label-info {{:: {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer")}[profile.stats.class] }}
include ../profiles/stats
.col-md-6
@@ -38,7 +39,7 @@ script(type='text/ng-template', id='modals/member.html')
span.glyphicon.glyphicon-ban-circle
button.btn.btn-md.btn-default(tooltip=env.t('sendPM'), ng-click="openModal('private-message',{controller:'MemberModalCtrl'})", tooltip-placement='right')
span.glyphicon.glyphicon-envelope
- button.btn.btn-md.btn-default(tooltip="Send Gift", ng-click="openModal('send-gift',{controller:'MemberModalCtrl'})", tooltip-placement='right')
+ button.btn.btn-md.btn-default(tooltip=env.t('sendGift'), ng-click="openModal('send-gift',{controller:'MemberModalCtrl'})", tooltip-placement='right')
span.glyphicon.glyphicon-gift
button.btn.btn-default(ng-click='$close()')=env.t('close')
diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade
index e8d90abc8a..a2ad16fd80 100644
--- a/website/views/shared/new-stuff.jade
+++ b/website/views/shared/new-stuff.jade
@@ -1,38 +1,82 @@
-h5 5/01/2015 - Skills Rebalancing
-hr
-tr
- td
- p After over a year's worth of complaints on Trello and countless bug reports on Github, and after almost five months of dedicated debating, coding, and testing, we have finally rolled out an overhaul of the skills and mana system. Thank you so much to everyone who contributed opinions, time, and effort! Here's what happened:
-tr
- td
- h5 HABITS DAMAGE BOSSES
- p Now it's even easier to damage a Boss without skills! It was definitely high time that HabitRPG counted Habits towards battles. We were not living up to our name.
-tr
- td
- h5 MANA DIRECTLY LINKED TO PROGRESS
- p Mana was pretty broken: you gained it overnight no matter what you'd done the day before, and it was only linked to To-Dos. This meant that using skills was pretty detached from how well you were doing in your real life, which defeated the purpose of the game!
- p Now you can gain Mana from Dailies and positive Habits as well as To-Dos! You still gain Mana overnight, but how much you gain depends on how many of your Dailies you did.
- p You can also lose Mana by hitting negative Habits. Yikes! Better not indulge...
-tr
- td
- h5 SKILLS STRENGTHENED AND WEAKENED
- p Some notoriously overpowered skills have been weakened, like Backstab (which often granted over 1000GP per cast), Burst of Flames (which allowed you to 1-hit KO most bosses regardless of how much or how little you'd done that day), and Valorous Presence (which caused the notorious "I checked off one Daily and gained 997 levels" bug reports).
- p Some painfully UNDERpowered skills have been strengthened, such as Tools of the Trade and Searing Brightness. We think you'll like these much better now!
- p For a full description of what changed,
check out this blog post.
-tr
- td
- h5 GIVING FEEDBACK
- p We understand that these changes may be disruptive to some of you. We're sorry! We hope that with time, you will find them to be a drastic improvement. We will be waiting two weeks (so that everyone can get used to the new system), and then on May 15th will open up a new Trello card for comments and feedback.
- p For those of you who want to reallocate stats now that you have the new system, please post your User ID in this
Github ticket. (Your UUID is found under Settings > API; do NOT post your API Token.) That ticket is also being used to debate a possibility to make it so that reallocating stats does not cost gems. If that's a feature you would like (or would hate), definitely drop by that ticket and let us know!
- p.small.muted by Alys, Verabird, brandonjreid, ShilohT, betaveros, SabreCat, chimericdream, and everyone who commented with feedback on Trello and Github. You guys are great!
+h5 5/20/2015 - NEW PET QUEST: SHEEP!
+ hr
+ tr
+ td
+ .quest_sheep.pull-right
+ h5 New Pet Quest: Sheep!
+ p It looks like there's some ba-a-a-ad weather in the Taskan countryside! Can you and your party be diligent enough to defeat the Thunder Ram? If so, you may find yourself with some wooly sheep pets...
+ p.small.muted art by Starsystemic and Misceo
+ p.small.muted writing by Salambander, Leephon, and Lemoness
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
+ h5 5/13/2015 - NEW ANIMAL SKINS AND ACCESSORIES, INN IMPROVEMENTS, COPY CHAT TO TO-DO, AND EXTRA INFO
+ tr
+ td
+ .promo_pet_skins.pull-right
+ h5 New Animal Skins and Accessories Available!
+ p They say that owners resemble their pets, and now that's truer than ever for Habiticans! The Animal Skin Set and Animal Accessory Set are now available in the
Customization shop. Time to let your avatar walk on the wild side.
+ p.small.muted by Painter de Cluster and SabreCat
+ tr
+ td
+ h5 Inn Improvements
+ p Now even when you Rest in the Inn, your Dailies will refresh each day.
Important note: your Dailies still do NOT hurt you while you're in the Inn. We wouldn't do that to you!
+ br
+ p It used to be that the Resting in the Inn froze all your Dailies so that they wouldn't refresh the next day - even for important Dailies like "take medicine" or "feed pets." This was very frustrating to a lot of users who relied on these features, even during periods of time when they needed to rest in the Inn for finals, illness, vacation, etc.
+ br
+ p Now if you're in a situation, for example finals period, where you don't have the time or energy to do most of your Dailies, you can still complete some of them every day while Resting in the Inn. It's much more flexible and convenient!
+ br
+ p If you're in a quest, you still won't deal damage/collect items until you check out of the Inn, and your Dailies will not damage your party members, but you can still be injured by a Boss if your Party mates skip their own Dailies. You also still do not gain Mana overnight until you check out of the Inn. If you have any questions about how Resting in the Inn works, be sure to ask in the
Newbies Guild!
+ p.small.muted by hairlessbear and Blade
+ tr
+ td
+ h5 Copy Chat to To-Do
+ p Now you can copy any chat message into your To-Do list! If your roommate posted in party chat and asked you to grab groceries, or your friend reminded you about the history quiz tomorrow, you can save it right into your To-Do list. Awesome!
+ p.small.muted by Negue and Redphoenix
+ tr
+ td
+ h5 Extra Info
+ p We know that HabitRPG can be confusing, so now you can easily double-check what each task type does by clicking the question mark next to its name.
+ p.small.muted by Lemoness, lefnire, and SabreCat
+ h5 5/06/2015 - MAY BACKGROUNDS REVEALED
+ tr
+ td
+ .background_mountain_lake.pull-right
+ h5 May Backgrounds Revealed
+ p There are three new avatar backgrounds in the
Background Shop! Now your avatar can climb to the top of Pagodas, pose in front of a Marble Temple, or dip toes in a Mountain Lake!
+ p.small.muted by (in order) Teto is Great, Painter de Cluster, and Hazel40
+
+ h5 5/01/2015 - Skills Rebalancing
+ tr
+ td
+ p After over a year's worth of complaints on Trello and countless bug reports on Github, and after almost five months of dedicated debating, coding, and testing, we have finally rolled out an overhaul of the skills and mana system. Thank you so much to everyone who contributed opinions, time, and effort! Here's what happened:
+ tr
+ td
+ h5 HABITS DAMAGE BOSSES
+ p Now it's even easier to damage a Boss without skills! It was definitely high time that HabitRPG counted Habits towards battles. We were not living up to our name.
+ tr
+ td
+ h5 MANA DIRECTLY LINKED TO PROGRESS
+ p Mana was pretty broken: you gained it overnight no matter what you'd done the day before, and it was only linked to To-Dos. This meant that using skills was pretty detached from how well you were doing in your real life, which defeated the purpose of the game!
+ p Now you can gain Mana from Dailies and positive Habits as well as To-Dos! You still gain Mana overnight, but how much you gain depends on how many of your Dailies you did.
+ p You can also lose Mana by hitting negative Habits. Yikes! Better not indulge...
+ tr
+ td
+ h5 SKILLS STRENGTHENED AND WEAKENED
+ p Some notoriously overpowered skills have been weakened, like Backstab (which often granted over 1000GP per cast), Burst of Flames (which allowed you to 1-hit KO most bosses regardless of how much or how little you'd done that day), and Valorous Presence (which caused the notorious "I checked off one Daily and gained 997 levels" bug reports).
+ p Some painfully UNDERpowered skills have been strengthened, such as Tools of the Trade and Searing Brightness. We think you'll like these much better now!
+ p For a full description of what changed,
check out this blog post.
+ tr
+ td
+ h5 GIVING FEEDBACK
+ p We understand that these changes may be disruptive to some of you. We're sorry! We hope that with time, you will find them to be a drastic improvement. We will be waiting two weeks (so that everyone can get used to the new system), and then on May 15th will open up a new Trello card for comments and feedback.
+ p For those of you who want to reallocate stats now that you have the new system, please post your User ID in this
Github ticket. (Your UUID is found under Settings > API; do NOT post your API Token.) That ticket is also being used to debate a possibility to make it so that reallocating stats does not cost gems. If that's a feature you would like (or would hate), definitely drop by that ticket and let us know!
+ p.small.muted by Alys, Verabird, brandonjreid, ShilohT, betaveros, SabreCat, chimericdream, and everyone who commented with feedback on Trello and Github. You all are great!
+
h5 4/30/2015 - LAST CHANCE FOR BUSY BEE AND SPRING FLING ITEMS, AND SOON-TO-APPEAR NEW EQUIPMENT!
- hr
tr
td
.promo_shimmer_hair.pull-right
diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade
index bfa614f5dc..b2bec658d8 100644
--- a/website/views/shared/profiles/achievements.jade
+++ b/website/views/shared/profiles/achievements.jade
@@ -144,7 +144,7 @@ div(ng-if='::profile.achievements.originalUser')
small!=env.t('originalUserText')
hr
-div(ng-if='::profile.achievements.challenges || user._id == profile._id')
+div(ng-if='::profile.achievements.challenges.length || user._id == profile._id')
// This is a very strange icon to use. revisit
.achievement.achievement-karaoke(ng-if='::profile.achievements.challenges.length')
div(ng-class='::{muted: !profile.achievements.challenges.length}')
diff --git a/website/views/shared/profiles/stats.jade b/website/views/shared/profiles/stats.jade
index 0d9c33363a..476c114143 100644
--- a/website/views/shared/profiles/stats.jade
+++ b/website/views/shared/profiles/stats.jade
@@ -43,13 +43,13 @@ table.table.table-striped
ul.list-unstyled(ng-init='g=Content.gear.flat;e=profile.items.gear.equipped')
li(ng-show='profile.stats.lvl > 1')
span.hint(popover-title=env.t('levelBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('levelBonusText'))=env.t('level')
- |: {{(Math.min(profile.stats.lvl - 1, 100)) / 2}}
+ |: {{Math.ceil((Math.min(profile.stats.lvl - 1, 100)) / 2)}}
li(ng-show='g[e.weapon].#{k} + g[e.armor].#{k} + g[e.head].#{k} + g[e.shield].#{k} > 0')
span.hint(popover-title=env.t('equipment'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('equipmentBonusText'))=env.t('equipment')
|: {{g[e.weapon].#{k} + g[e.armor].#{k} + g[e.head].#{k} + g[e.shield].#{k} || 0}}
- li(ng-show='profile._statsComputed.#{k} - profile.stats.buffs.#{k} - ((Math.min(profile.stats.lvl - 1, 100)) / 2) - g[e.weapon].#{k} - g[e.armor].#{k} - g[e.head].#{k} - g[e.shield].#{k} - profile.stats.#{k} > 0')
+ li(ng-show='profile._statsComputed.#{k} - profile.stats.buffs.#{k} - Math.ceil((Math.min(profile.stats.lvl - 1, 100)) / 2) - g[e.weapon].#{k} - g[e.armor].#{k} - g[e.head].#{k} - g[e.shield].#{k} - profile.stats.#{k} > 0')
span.hint(popover-title=env.t('classBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('classBonusText'))=env.t('classEquipBonus')
- |: {{profile._statsComputed.#{k} - profile.stats.buffs.#{k} - ((Math.min(profile.stats.lvl - 1,100)) / 2) - g[e.weapon].#{k} - g[e.armor].#{k} - g[e.head].#{k} - g[e.shield].#{k} - profile.stats.#{k}}}
+ |: {{profile._statsComputed.#{k} - profile.stats.buffs.#{k} - Math.ceil((Math.min(profile.stats.lvl - 1,100)) / 2) - g[e.weapon].#{k} - g[e.armor].#{k} - g[e.head].#{k} - g[e.shield].#{k} - profile.stats.#{k}}}
li(ng-show='profile.stats.#{k} > 0')
span.hint(popover-title=env.t('allocatedPoints'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('allocatedPointsText'))=env.t('allocated')
|: {{profile.stats.#{k} || 0}}
diff --git a/website/views/shared/tasks/lists.jade b/website/views/shared/tasks/lists.jade
index b4487d690e..4bd9629a21 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')
@@ -34,6 +70,10 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
span(ng-if='!list.bulk')=env.t('addmultiple')
span(ng-if='list.bulk')=env.t('addsingle')
+ alert.alert-warning.dailiesRestingInInn(ng-if='::list.type == "daily" && user.preferences.sleep')
+ i.glyphicon.glyphicon-warning-sign
+ =env.t('dailiesRestingInInn')
+
mixin taskColumnTabs(position)
// Habits Tabs
div(ng-if='::main && list.type=="habit"', class='tabbable tabs-below')
diff --git a/website/views/shared/tasks/task.jade b/website/views/shared/tasks/task.jade
index 9a5644094f..05661a939e 100644
--- a/website/views/shared/tasks/task.jade
+++ b/website/views/shared/tasks/task.jade
@@ -1,4 +1,4 @@
-li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s"] | conditionalOrderBy: list.view=="dated":"date"', class='task {{Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main)}}', ng-click='spell && (list.type != "reward") && castEnd(task, "task", $event)', ng-class='{"cast-target":spell && (list.type != "reward"), "locked-task":obj._locked === true}', popover-trigger='mouseenter', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}', ng-show='shouldShow(task, list, user.preferences)')
+li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s"] | conditionalOrderBy: list.view=="dated":"date"', class='task {{Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main)}}', ng-click='spell && (list.type != "reward") && castEnd(task, "task", $event)', ng-class='{"cast-target":spell && (list.type != "reward"), "locked-task":obj._locked === true}', popover-trigger='mouseenter', data-popover-html="{{task.popoverOpen ? '' : task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}', ng-show='shouldShow(task, list, user.preferences)')
// right-hand side control buttons
.task-meta-controls
@@ -53,7 +53,7 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
span.glyphicon.glyphicon-signal
|
// notes
- span.task-notes(ng-show='task.notes && !task._editing')
+ span.task-notes(ng-show='task.notes && !task._editing', ng-click='task.popoverOpen = !task.popoverOpen', popover-trigger='click', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}')
span.glyphicon.glyphicon-comment
|
diff --git a/website/views/static/community-guidelines.jade b/website/views/static/community-guidelines.jade
index 4af0c13a60..c6bb49a838 100644
--- a/website/views/static/community-guidelines.jade
+++ b/website/views/static/community-guidelines.jade
@@ -26,7 +26,8 @@ block content
.page-header
h1=env.t('communityGuidelines')
p.pagemeta
- |Last updated
+ =env.t('lastUpdated')
+ |
=env.t('February')
| 9, 2015
h2=env.t('commGuideHeadingWelcome')
diff --git a/website/views/static/front.jade b/website/views/static/front.jade
index 21207c2ef6..c3aa29a078 100644
--- a/website/views/static/front.jade
+++ b/website/views/static/front.jade
@@ -35,6 +35,9 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
body(ng-controller='AuthCtrl')
include ./login-modal
+ include ../shared/header/avatar
+ include ../shared/mixins
+ include ../shared/modals/members
.mobile-container
header#header
nav.navbar.navbar-default.navbar-static-top
@@ -65,7 +68,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
li
button#header-play-button.btn.btn-primary.navbar-btn.navbar-right(ng-click='playButtonClick()')= env.t('playButtonFull')
#intro
- h1= env.t('motivate')
+ h1(ng-cloak) {{ variant==0 ? "#{env.t('motivate')}" : (variant==1 ? "#{env.t('motivate1')}" : "#{env.t('motivate2')}") }}
img.center-block.img-responsive(src='https://s3.amazonaws.com/habitrpg-assets/front/images/intro.png')
// insert intro images
.introcall.bg-success
@@ -131,14 +134,14 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
.row
.col-sm-8.col-sm-offset-2
p
- = env.t('andeeliaoQuote')
+ = env.t('andeeliaoQuote')
small AndeeLiao
.item
blockquote
.row
.col-sm-8.col-sm-offset-2
p
- = env.t('alexandraQuote')
+ = env.t('alexandraQuote')
small _AlexandraSo_
// Carousel Buttons Next/Prev
a.left.carousel-control(data-slide='prev', href='#quote-carousel')
@@ -170,7 +173,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
= env.t('work')
br
small
- a(href='/business.html')= env.t('businessText')
+ a(href='/static/plans')= env.t('businessText')
.carousel-content.row
.sampletasks.col-lg-4.col-md-6.col-sm-12.col-xs-12
h4= env.t('sampleHabits')
@@ -330,7 +333,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
.usetweet.tweet.popover.right
.arrow
.popover-content
- = env.t('dreimQuote')
+ = env.t('dreimQuote')
// End Item
.item.improvement-use
h3= env.t('goals')
@@ -368,7 +371,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
.usetweet.tweet.popover.right
.arrow
.popover-content
- = env.t('kazuiQuote')
+ = env.t('kazuiQuote')
// End Item
.item.housework-use
h3= env.t('chores')
@@ -642,3 +645,4 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
}]).directive('carousel', [function () {
return {}
}]);
+
diff --git a/website/views/static/login-modal.jade b/website/views/static/login-modal.jade
index c21069daeb..eed23662c3 100644
--- a/website/views/static/login-modal.jade
+++ b/website/views/static/login-modal.jade
@@ -69,4 +69,4 @@ script(id='modals/login.html', type='text/ng-template')
a(href='/static/privacy' target='_blank')=env.t('privacy')
| .
.form-group
- input.btn.btn-primary(type='submit', ng-disabled='registrationForm.$invalid', value=env.t('register'))
+ input.btn.btn-primary(type='submit', ng-disabled='registrationForm.$invalid || registrationInProgress', value=env.t('register'))
diff --git a/website/views/static/press-kit.jade b/website/views/static/press-kit.jade
index 7439cff41c..427da56098 100644
--- a/website/views/static/press-kit.jade
+++ b/website/views/static/press-kit.jade
@@ -5,7 +5,7 @@ block vars
- var menuItem = 'pressKit'
block title
- title Press Kit
+ title= env.t('presskit')
block extraHead
style.