From b49846a504c07e5e72851816a42fd57925368436 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Thu, 29 Jan 2015 16:10:49 -0800 Subject: [PATCH 1/2] Add some clever new compliment messages --- controllers/resources.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/controllers/resources.json b/controllers/resources.json index dc926ce9a8..21171ca4b3 100644 --- a/controllers/resources.json +++ b/controllers/resources.json @@ -215,7 +215,12 @@ "Here's looking at you, Code!", "The more you code!", "Legen - wait for it - dary!", - "Ludicrous Speed! Go!" + "Ludicrous Speed! Go!", + "Yes you can!", + "Most triumphant!", + "One loop to rule them all!", + "Ain't got time to bleed!", + "By the power of Grayskull!" ], "phrases": [ "Shout it from on top of a mountain", From e82b45e34c039ca63c8f1cbe51aadd6d6e1e80b4 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Thu, 29 Jan 2015 22:01:27 -0800 Subject: [PATCH 2/2] make the account page purely settings and make the photo redirect to the user public profile --- views/account/account.jade | 18 +----------------- views/partials/navbar.jade | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/views/account/account.jade b/views/account/account.jade index 2612dfe818..48641cdc3f 100644 --- a/views/account/account.jade +++ b/views/account/account.jade @@ -293,23 +293,7 @@ block content a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/auth/twitter') i.fa.fa-twitter | Link Twitter with your account - br - - if (ch[0] > 0) - .panel.panel-primary - .panel-heading.text-center Completed Challenges: - .panel-body - .col-xs-12 - table.table.table-striped - thead - tr - th Challenge - th Date Finished - for challenge in challenges - if ch[challenge.challengeNumber] > 0 - tr - td= challenges[challenge.challengeNumber].name - td= moment(ch[challenge.challengeNumber], 'X').format("MMM DD, YYYY") - br + .panel.panel-danger .panel-heading.text-center Danger Zone: .panel-body diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade index 8388ea2ba6..a8f9f3ce20 100644 --- a/views/partials/navbar.jade +++ b/views/partials/navbar.jade @@ -37,8 +37,16 @@ a(href='/account') [ #{user.points} ] .hidden-xs if user.profile.picture - a(href='/account') - img.profile-picture.float-right(src='#{user.profile.picture}') + if (user.profile.username) + a(href='/' + user.profile.username) + img.profile-picture.float-right(src='#{user.profile.picture}') + else + a(href='/account') + img.profile-picture.float-right(src='#{user.profile.picture}') else - a(href='/account') - img.profile-picture.float-right(src='#{user.gravatar(60)}') \ No newline at end of file + if (user.profile.username) + a(href='/' + user.profile.username) + img.profile-picture.float-right(src='#{user.gravatar(60)}') + else + a(href='/account') + img.profile-picture.float-right(src='#{user.gravatar(60)}') \ No newline at end of file