From 3b8b19511022bc49100ad7bbf66a040832320b29 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Fri, 30 Jan 2015 13:43:41 -0800 Subject: [PATCH] update the angular CDN and remove the optimizely cdn which was hanging. Improve angular notifications on email signup page --- views/account/account.jade | 8 ++++---- views/account/email-signup.jade | 14 +++++++++++--- views/layout-wide.jade | 5 ++--- views/layout.jade | 5 ++--- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/views/account/account.jade b/views/account/account.jade index 3a4e22b8250..64237b9b46f 100644 --- a/views/account/account.jade +++ b/views/account/account.jade @@ -50,7 +50,7 @@ block content .col-sm-4.col-sm-offset-5(ng-cloak, ng-show="profileForm.username.$error.unique && !profileForm.username.$pristine && $scope.storedUsername !== user.profile.username") alert(type='danger') span.ion-close-circled - | That username is already taken. + | That username is already in use. .form-group label.col-sm-3.col-sm-offset-2.control-label(for='email') Email * @@ -65,9 +65,9 @@ block content span.ion-close-circled | Please enter a valid email format. .col-sm-4.col-sm-offset-5(ng-cloak, ng-show="profileForm.email.$error.unique && !profileForm.email.$pristine") - alert(type='danger') - span.ion-close-circled - | That email is already taken. + alert(type='danger') + span.ion-close-circled + | That email is already in use. .form-group label.col-sm-3.col-sm-offset-2.control-label(for='location') Location diff --git a/views/account/email-signup.jade b/views/account/email-signup.jade index 67a36fdf526..3d734f2a9b8 100644 --- a/views/account/email-signup.jade +++ b/views/account/email-signup.jade @@ -7,14 +7,22 @@ block content .form-group .col-sm-6.col-sm-offset-3 input.form-control(type='email', ng-model='email', ng-keypress='', name='email', id='email', placeholder='email', autofocus, required, autocomplete="off", unique-email='') + .col-sm-6.col-sm-offset-3(ng-cloak, ng-show="signupForm.email.$error.required && !signupForm.email.$pristine") + alert(type='danger') + span.ion-close-circled + | Your email address is required. + .col-sm-6.col-sm-offset-3(ng-cloak, ng-show="signupForm.$error.email && !signupForm.email.$pristine") + alert(type='danger') + span.ion-close-circled + | Please enter a valid email format. .col-sm-6.col-sm-offset-3(ng-cloak, ng-show="signupForm.email.$error.unique && !signupForm.email.$pristine") alert(type='danger') span.ion-close-circled - | This email is taken. + | That email address is already in use. .form-group .col-sm-6.col-sm-offset-3 input.form-control(type='text', name='username', ng-keypress='', autocomplete="off", id='username', placeholder='username', ng-model='username', unique-username='', required, ng-minlength=5, ng-maxlength=20, ng-pattern="/^[A-z0-9_]+$/") - .col-sm-4.col-sm-offset-5(ng-cloak, ng-show="profileForm.username.$error.pattern && !signupForm.username.$pristine") + .col-sm-6.col-sm-offset-3(ng-cloak, ng-show="profileForm.username.$error.pattern && !signupForm.username.$pristine") alert(type='danger') span.ion-close-circled | Your username should only contain letters, numbers and underscores (az10_). @@ -46,7 +54,7 @@ block content | Passwords must match. .form-group .col-sm-offset-3.col-sm-6 - button.btn.btn-success(type='submit') + button.btn.btn-success(type='submit', ng-disabled='signupForm.$invalid') span.ion-person-add | Signup br diff --git a/views/layout-wide.jade b/views/layout-wide.jade index 0bed8cac5f8..33873b2bf21 100644 --- a/views/layout-wide.jade +++ b/views/layout-wide.jade @@ -2,7 +2,7 @@ doctype html html(ng-app='profileValidation', lang='en') head script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") - script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js") + script(src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js") script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js") link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicon.ico') link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css') @@ -29,5 +29,4 @@ script. })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', 'UA-55446531-1', 'auto'); ga('require', 'displayfeatures'); - ga('send', 'pageview'); -script(src="//cdn.optimizely.com/js/999692993.js") \ No newline at end of file + ga('send', 'pageview'); \ No newline at end of file diff --git a/views/layout.jade b/views/layout.jade index 1d9332ec8c3..d9cbb7bd0af 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -2,7 +2,7 @@ doctype html html(ng-app='profileValidation', lang='en') head script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") - script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.10/angular.min.js") + script(src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js") script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js") link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicon.ico') link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css') @@ -30,5 +30,4 @@ script. })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', 'UA-55446531-1', 'auto'); ga('require', 'displayfeatures'); - ga('send', 'pageview'); -script(src="//cdn.optimizely.com/js/999692993.js") \ No newline at end of file + ga('send', 'pageview'); \ No newline at end of file