' +
'
' +
'
' +
@@ -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/src/controllers/groups.js b/website/src/controllers/groups.js
index e515cd95a7..465de6ec08 100644
--- a/website/src/controllers/groups.js
+++ b/website/src/controllers/groups.js
@@ -137,7 +137,23 @@ api.get = function(req, res, next) {
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);
+ //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, add them
+ if (!userInGroup) { 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.push(user); }
+ res.json(group);
+ });
+ }
+
gid = null;
});
};
@@ -398,7 +414,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 +426,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 +456,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;
diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade
index e4d8246ebb..5df04ed24c 100644
--- a/website/views/options/settings.jade
+++ b/website/views/options/settings.jade
@@ -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')
diff --git a/website/views/options/social/chat-box.jade b/website/views/options/social/chat-box.jade
index 047f6e4eea..2266fd5e31 100644
--- a/website/views/options/social/chat-box.jade
+++ b/website/views/options/social/chat-box.jade
@@ -13,9 +13,9 @@ div.chat-form.guidelines-not-accepted(ng-if='!user.flags.communityGuidelinesAcce
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)')
+ 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
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/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/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/new-stuff.jade b/website/views/shared/new-stuff.jade
index e8d90abc8a..4e22434e5a 100644
--- a/website/views/shared/new-stuff.jade
+++ b/website/views/shared/new-stuff.jade
@@ -1,36 +1,44 @@
-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/06/2015 - MAY BACKGROUNDS REVEALED
+ hr
+ 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
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
+ 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 all are great!
h5 4/30/2015 - LAST CHANCE FOR BUSY BEE AND SPRING FLING ITEMS, AND SOON-TO-APPEAR NEW EQUIPMENT!
hr
tr
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..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')
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/front.jade b/website/views/static/front.jade
index 21207c2ef6..d9af6f2470 100644
--- a/website/views/static/front.jade
+++ b/website/views/static/front.jade
@@ -65,7 +65,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
@@ -170,7 +170,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')
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'))