From bccc37f55d98d7caf5d5c4cacf803a844068402f Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Thu, 5 Feb 2015 13:56:44 -0800 Subject: [PATCH] add more compliments and remove image validation from the profile image field --- controllers/resources.json | 26 ++++++++++++++++++++++++-- views/account/account.jade | 6 +----- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/controllers/resources.json b/controllers/resources.json index fab538f2ff..8a9fae7e28 100644 --- a/controllers/resources.json +++ b/controllers/resources.json @@ -162,7 +162,7 @@ "compliments": [ "Over the top!", "Down the rabbit hole we go!", - "Somewhere over the rainbow!", + "Follow the white rabbit!", "Eye of the tiger!", "Run, Forest, run!", "Welcome to the Rock!", @@ -213,6 +213,7 @@ "It's alive. It's alive!", "Sonic Boom!", "Here's looking at you, Code!", + "Ride like the wind!", "The more you code!", "Legen - wait for it - dary!", "Ludicrous Speed! Go!", @@ -223,7 +224,28 @@ "By the power of Grayskull!", "You did it!", "Storm that castle!", - "Face-melting guitar Solo!" + "Face-melting guitar Solo!", + "Checkmate!", + "Remember the Alamo!", + "Bodacious!", + "You're the man now, dog!", + "Tubular!", + "You're outta sight!", + "Keep calm and code on!", + "Even sad panda smiles!", + "Even grumpy cat approves!", + "Koolaid Man says oh yeah!", + "Bullseye!", + "You stay classy, San Diego!", + "Loud noises!", + "Me want cookie!", + "Far out!", + "You're heating up!", + "Crash override!", + "This is Sparta!", + "You ARE the law!", + "Hasta la vista, challenge!", + "Huh? It's just a box...", ], "phrases": [ "Shout it from on top of a mountain", diff --git a/views/account/account.jade b/views/account/account.jade index 05d68eb9b0..08ba8b0ccd 100644 --- a/views/account/account.jade +++ b/views/account/account.jade @@ -77,15 +77,11 @@ block content .form-group label.col-sm-3.col-sm-offset-2.control-label(for='email') Link to Profile Photo (1:1 ratio) .col-sm-4 - input.form-control(type='url', name='picture', id='picture', ng-model='user.profile.picture', placeholder='http://www.example.com/image.jpg', ng-pattern="/[\.](jpg|png|jpeg|gif)\s?$/") + input.form-control(type='url', name='picture', id='picture', ng-model='user.profile.picture', placeholder='http://www.example.com/image.jpg') .col-sm-4.col-sm-offset-5(ng-show="profileForm.picture.$error.url && !profileForm.picture.$pristine") alert(type='danger') span.ion-close-circled | Please enter a valid URL format (http://www.example.com/image.jpg). - .col-sm-4.col-sm-offset-5(ng-show="profileForm.picture.$error.pattern") - alert(type='danger') - span.ion-close-circled - | The image URL must end in .jpg, .png, .jpeg or .gif. .form-group label.col-sm-3.col-sm-offset-2.control-label(for='bio') Bio (140 characters) .col-sm-4