From 66120a60b8b530228a370312a913f7a4b849e449 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 8 Oct 2015 16:29:43 -0700 Subject: [PATCH 1/4] update look of commit --- server/views/commit/index.jade | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade index cd64379443..e1f3d915fc 100644 --- a/server/views/commit/index.jade +++ b/server/views/commit/index.jade @@ -22,7 +22,7 @@ block content input(type='text' value='#{name}' name='nonprofit') .row .col-xs-12.col-sm-6.col-sm-offset-3 - h3 Choose your goal: + h3 Step 1: Choose your goal .btn-group.btn-group-justified(data-toggle='buttons' role='group') label.btn.btn-primary.btn-lg.active input(type='radio' id=frontEndCert value=frontEndCert name='goal' checked="checked") @@ -33,7 +33,7 @@ block content .spacer .row .col-xs-12.col-sm-6.col-sm-offset-3 - h3 Choose your monthly pledge: + h3 Step 2: Choose your monthly pledge .btn-group.btn-group-justified(data-toggle='buttons' role='group') label.btn.btn-success input(type='radio' id='5-dollar-pledge' value='5' name='amount') @@ -48,9 +48,18 @@ block content input(type='radio' id='50-dollar-pledge' value='50' name='amount') | $50 per month .spacer + .col-xs-12.col-sm-6.col-sm-offset-3 + h3 Step 3: Set up your monthly donation .row .col-xs-12.col-sm-6.col-sm-offset-3.text-center - a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit (and open donate page) + a.btn.btn-block.btn-lg.btn-primary(href=donateUrl target='_blank') Open the #{displayName} donation page + + .spacer + .col-xs-12.col-sm-6.col-sm-offset-3 + h3 Step 4: Confirm your commitment to your goal + .row + .col-xs-12.col-sm-6.col-sm-offset-3.text-center + a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit if pledge form.row(name='stop-pledge' action='/commit/stop-commitment' method='post') @@ -61,7 +70,7 @@ block content .row .col-xs-12.col-sm-6.col-sm-offset-3.text-center .button-spacer - a.btn.btn-block.btn-default(href='/') Maybe later + a.btn.btn-block.btn-default(href='/map') Maybe later .spacer script. $(function() { From e62375516bb8aa5a65bb46a912c6d907ad144478 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 8 Oct 2015 17:00:15 -0700 Subject: [PATCH 2/4] Add commit button functionality --- server/views/commit/index.jade | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade index e1f3d915fc..876eb81362 100644 --- a/server/views/commit/index.jade +++ b/server/views/commit/index.jade @@ -52,28 +52,38 @@ block content h3 Step 3: Set up your monthly donation .row .col-xs-12.col-sm-6.col-sm-offset-3.text-center - a.btn.btn-block.btn-lg.btn-primary(href=donateUrl target='_blank') Open the #{displayName} donation page + a#commit-btn-donate.btn.btn-block.btn-lg.btn-primary(href=donateUrl target='_blank') Open the #{displayName} donation page .spacer .col-xs-12.col-sm-6.col-sm-offset-3 - h3 Step 4: Confirm your commitment to your goal + h3#commit-step4-text.disabled + Step 4: Confirm + span#commit-step4-hidden.disabled (Do step 3 first) + span#commit-step4-show.hidden your commitment to your goal .row .col-xs-12.col-sm-6.col-sm-offset-3.text-center - a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit + button#commit-btn-submit.btn.btn-block.btn-lg.btn-primary.disabled Commit if pledge form.row(name='stop-pledge' action='/commit/stop-commitment' method='post') .col-xs-12.col-sm-6.col-sm-offset-3.text-center .button-spacer - button.btn.btn-block.btn-danger(name='submit' type='submit') Stop my current pledge + button.btn.btn-block.btn-lg.btn-default(name='submit' type='submit') Stop my current pledge else .row .col-xs-12.col-sm-6.col-sm-offset-3.text-center .button-spacer - a.btn.btn-block.btn-default(href='/map') Maybe later + a.btn.btn-block.btn-lg.btn-default(href='/map') Maybe later .spacer script. $(function() { + $('#commit-btn-donate').click(function() { + $('#commit-btn-submit').removeClass('disabled'); + $('#commit-step4-text').removeClass('disabled'); + $('#commit-step4-hidden').hide(); + $('#commit-step4-show').removeClass('hidden'); + }); + $('#commit-btn-submit').click(function() { window.location.href = '/commit/pledge?' + $('form').serialize(); }); From 6fafbdf441884b5c9c6529778dddf2e16e36b374 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Thu, 8 Oct 2015 17:05:42 -0700 Subject: [PATCH 3/4] improve stories view --- client/less/main.less | 2 +- server/views/commit/index.jade | 2 +- server/views/resources/stories.jade | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/less/main.less b/client/less/main.less index 62fdadff4a..0f7b020802 100644 --- a/client/less/main.less +++ b/client/less/main.less @@ -491,7 +491,7 @@ thead { } .story-section { - min-height: 500px; + height: 400px; } .testimonial-copy { diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade index e1f3d915fc..9659bd821b 100644 --- a/server/views/commit/index.jade +++ b/server/views/commit/index.jade @@ -70,7 +70,7 @@ block content .row .col-xs-12.col-sm-6.col-sm-offset-3.text-center .button-spacer - a.btn.btn-block.btn-default(href='/map') Maybe later + a.btn.btn-block.btn-default.btn-lg(href='/map') Maybe later .spacer script. $(function() { diff --git a/server/views/resources/stories.jade b/server/views/resources/stories.jade index 0d9b21d999..28343283b7 100644 --- a/server/views/resources/stories.jade +++ b/server/views/resources/stories.jade @@ -11,8 +11,9 @@ block content .story-section a(href=story.linkedin target='_blank') img.testimonial-image.img-responsive.img-center(src=story.image) - h3.text-center - a(href=story.linkedin target='_blank')= story.camper + h3.text-center= story.camper + |   + a.fa.fa-linkedin-square.text-primary(title="@#{username}'s LinkedIn Profile", href=story.linkedin, target='_blank') p.text-justify= story.quote From fcd7e096b2bc2ff7f3cbc432a89c86052b1c3aa3 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 8 Oct 2015 17:25:47 -0700 Subject: [PATCH 4/4] Fix alt attribute --- server/views/resources/stories.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/views/resources/stories.jade b/server/views/resources/stories.jade index 28343283b7..ec77f5431e 100644 --- a/server/views/resources/stories.jade +++ b/server/views/resources/stories.jade @@ -13,7 +13,7 @@ block content img.testimonial-image.img-responsive.img-center(src=story.image) h3.text-center= story.camper |   - a.fa.fa-linkedin-square.text-primary(title="@#{username}'s LinkedIn Profile", href=story.linkedin, target='_blank') + a.fa.fa-linkedin-square.text-primary(alt="#{story.camper}'s LinkedIn Profile", href=story.linkedin, target='_blank') p.text-justify= story.quote