From 7b17b35399735815736796c96bb5bd64f801bfa8 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Tue, 21 Oct 2014 13:01:22 -0700 Subject: [PATCH] add navbar link to curriculum and get rid of email fields on profile --- views/account/login.jade | 2 +- views/account/profile.jade | 45 +------------------------------------- views/partials/navbar.jade | 7 ++++-- 3 files changed, 7 insertions(+), 47 deletions(-) diff --git a/views/account/login.jade b/views/account/login.jade index cb2f0bbf4f1..7862abd8289 100644 --- a/views/account/login.jade +++ b/views/account/login.jade @@ -14,4 +14,4 @@ block content | Sign in with Twitter a.btn.btn-block.btn-github.btn-social(href='/auth/github') i.fa.fa-github - | Sign in with GitHub + | Sign in with GitHub \ No newline at end of file diff --git a/views/account/profile.jade b/views/account/profile.jade index fc839ff9a38..cd3d0434b5c 100644 --- a/views/account/profile.jade +++ b/views/account/profile.jade @@ -14,15 +14,6 @@ block content label.col-sm-2.control-label(for='name') Name .col-sm-4 input.form-control(type='text', name='name', id='name', value='#{user.profile.name}') - .form-group - label.col-sm-2.control-label(for='gender') Gender - .col-sm-4 - label.radio - input(type='radio', checked=user.profile.gender=='male', name='gender', value='male', data-toggle='radio') - span Male - label.radio - input(type='radio', checked=user.profile.gender=='female', name='gender', value='female', data-toggle='radio') - span Female .form-group label.col-sm-2.control-label(for='location') Location .col-sm-4 @@ -31,49 +22,15 @@ block content label.col-sm-2.control-label(for='website') Website .col-sm-4 input.form-control(type='text', name='website', id='website', value='#{user.profile.website}') - .form-group - label.col-sm-2.control-label(for='gravatar') Gravatar - .col-sm-4 - img(src="#{user.gravatar()}", class='profile', width='100', height='100') .form-group .col-sm-offset-2.col-sm-4 button.btn.btn.btn-primary(type='submit') span.ion-edit | Update Profile - .page-header - h3 Change Password - - form.form-horizontal(action='/account/password', method='POST') - input(type='hidden', name='_csrf', value=_csrf) - .form-group - label.col-sm-3.control-label(for='password') New Password - .col-sm-4 - input.form-control(type='password', name='password', id='password') - .form-group - label.col-sm-3.control-label(for='confirmPassword') Confirm Password - .col-sm-4 - input.form-control(type='password', name='confirmPassword', id='confirmPassword') - .form-group - .col-sm-offset-3.col-sm-4 - button.btn.btn.btn-primary(type='submit') - span.ion-locked - | Change Password - - .page-header - h3 Delete Account - p You can delete your account, but keep in mind this action is irreversible. form(action='/account/delete', method='POST') input(type='hidden', name='_csrf', value=_csrf) button.btn.btn-danger(type='submit') span.ion-trash-b - | Delete my account - - .page-header - h3 Linked Accounts - - if user.twitter - p: a.text-danger(href='/account/unlink/twitter') Unlink your Twitter account - else - p: a(href='/auth/twitter') Link your Twitter account + | Delete my account \ No newline at end of file diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade index a67e90c0439..7871db2766f 100644 --- a/views/partials/navbar.jade +++ b/views/partials/navbar.jade @@ -24,12 +24,15 @@ | #{user.profile.name || user.email || user.id}  i.caret ul.dropdown-menu + li + a(href='/curriculum') + span.ion-map + | My curriculum li a(href='/account') span.ion-person | My Account - li.divider li a(href='/logout') span.ion-log-out - | Logout \ No newline at end of file + | Logout \ No newline at end of file