Merge pull request #65 from FreeCodeCamp/profile-redirect

Michael Johnson asked for public profile redirection from navbar user image
This commit is contained in:
Nathan
2015-01-30 02:05:46 -05:00
3 changed files with 19 additions and 22 deletions

View File

@ -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",

View File

@ -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

View File

@ -37,8 +37,16 @@
a(href='/account') [ #{user.points} ]
.hidden-xs
if user.profile.picture
a(href='/account')
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
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)}')