Merge branch 'dev' into feature/sup-1611-web-link-support-ui

Conflicts:
	app/directives/external-account/external-account.directive.js
	app/services/user.service.js

Author: Parth Shah

.version

@@ -1 +1 @@
-v1.0.2
+v1.0.7

app/account/login/login.jade

@@ -1,8 +1,8 @@
 .login-container
   header
-    a.logo-link(href="/")
+    a.logo-link(href="/", title="Back to the home page")
       img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
-    .arrow
+
   h1 LOG IN TO TOPCODER
 
   form(name="vm.loginForm", role="form", ng-submit="vm.loginForm.$valid && vm.login()", novalidate)
@@ -21,27 +21,25 @@
     p.problem-signin
       a.forgot-password(ui-sref="resetPassword") Forgot your password?
 
-    button(type="submit", ng-disabled="vm.loginForm.$invalid", ng-class="{'enabled-button': vm.loginForm.$valid}") Log In
-
-  section.social
-    p ------------ Or Log in With ------------
-
-    .social-icons
-      .github
-        .ico(ng-click="vm.socialLogin('github')")
-        p Github
-      .google-plus
-        .ico(ng-click="vm.socialLogin('google-oauth2')")
-        p Google
-      .facebook
-        .ico(ng-click="vm.socialLogin('facebook')")
-        p Facebook
-      .twitter
-        .ico(ng-click="vm.socialLogin('twitter')")
-        p Twitter
-
-  .join-topcoder
-    span Not a member yet? 
-    p.redirect
-      a(ui-sref="register(vm.$stateParams)") Join now
-
+    button.tc-btn.tc-btn-wide(type="submit", ng-disabled="vm.loginForm.$invalid") Log In
+
+  section.login-options
+    p.tc-separator
+      span Or Log in With
+
+    ul.networks
+      li.network.github
+        a.ico(ng-click="vm.socialLogin('github')")
+        span Github
+      li.network.google-plus
+        a.ico(ng-click="vm.socialLogin('google-oauth2')")
+        span Google
+      li.network.facebook
+        a.ico(ng-click="vm.socialLogin('facebook')")
+        span Facebook
+      li.network.twitter
+        a.ico(ng-click="vm.socialLogin('twitter')")
+        span Twitter
+
+p.join-topcoder Not a member yet?  
+  a(ui-sref="register(vm.$stateParams)") Join now

app/account/login/login.spec.js

@@ -8,7 +8,10 @@ describe('Login Controller', function() {
   });
 
   beforeEach(function() {
-    controller = $controller('LoginController');
+    $scope = $rootScope.$new();
+    controller = $controller('LoginController', {
+      $scope : $scope
+    });
     $rootScope.$apply();
   });
 

app/account/register/register.controller.js

@@ -35,8 +35,10 @@
       var countryCode = _.get(angucompleteCountryObj, 'originalObject.code', undefined);
 
       var isValidCountry = _.isUndefined(countryCode) ? false : true;
-      vm.country = countryCode;
       vm.registerForm.country.$setValidity('required', isValidCountry);
+      if (isValidCountry) {
+        vm.country = angucompleteCountryObj.originalObject;
+      }
     };
 
     vm.register = function() {
@@ -47,7 +49,9 @@
         lastName: vm.lastname,
         email: vm.email,
         country: {
-          code: vm.country
+          code: Helpers.npad(vm.country.code, 3),
+          isoAlpha3Code: vm.country.alpha3,
+          isoAlpha2Code: vm.country.alpha2
         },
         utmSource: utm.source,
         utmMedium: utm.medium,

app/account/register/register.jade

@@ -3,7 +3,8 @@
     a.logo-link(href="/")
       img(src="/images/logo_mobile.svg", alt="Topcoder Logo")
     .arrow
-  h1 Join the Topcoder technology community to earn, learn, and connect
+  //- h1 Join the Topcoder technology community to earn, learn, and connect
+  h1 Join Topcoder
 
   form(name="vm.registerForm", role="form", ng-submit="vm.registerForm.$valid && vm.register()", novalidate, autocomplete="off")
 
@@ -34,8 +35,11 @@
         minlength="1"
       )
 
-      .form-errors
-        p.form-error(ng-show="vm.registerForm.country.$error.required") Please choose a country from the list.
+      .form-input-error(ng-show="vm.registerForm.country.$dirty && vm.registerForm.country.$invalid", ng-messages="vm.registerForm.country.$error")
+        p.form-error(ng-message="required") Please choose a country from the list
+
+    .section-break
+      hr
 
     .validation-bar(ng-class="{ 'error-bar': (vm.registerForm.username.$error.usernameIsFree || vm.registerForm.username.$error.minlength || vm.registerForm.username.$error.maxlength), 'success-bar': (vm.registerForm.username.$valid && !vm.registerForm.username.$error.usernameIsFree) }")
       input-sticky-placeholder(sticky-placeholder="Username", ng-model="vm.username")
@@ -50,13 +54,16 @@
 
         p It can contain letters, numbers, and these characters: -_.{}[]
 
-    .form-errors
-      p.form-error(ng-show="vm.registerForm.username.$dirty && vm.registerForm.username.$error.usernameIsFree", ng-bind="vm.usernameErrorMessage")
+    .form-input-error(ng-if="vm.registerForm.username.$dirty && vm.registerForm.username.$invalid", ng-messages="vm.registerForm.username.$error")
+      p.form-error(ng-message="required") Please enter a username.
+      p.form-error(ng-message="usernameIsFree") {{vm.usernameErrorMessage}}
+
+      p.form-error(ng-message="minlength") That username is not the correct length or format.
 
-      p.form-error(ng-show="vm.registerForm.username.$dirty && (vm.registerForm.username.$error.minlength || vm.registerForm.username.$error.maxlength)") That username is not the correct length or format.
+      p.form-error(ng-message="maxlength") That username is not the correct length or format.
 
     .validation-bar(ng-class="{ 'error-bar': (vm.registerForm.email.$dirty && vm.registerForm.email.$invalid), 'success-bar': (vm.registerForm.email.$valid) }")
-      input-sticky-placeholder(sticky-placeholder="Email", ng-model="vm.email")
+      input-sticky-placeholder.email(sticky-placeholder="Email", ng-model="vm.email")
         input(ng-model="vm.email", ng-model-options="{ debounce: {'default': 500} }", ng-focus="vm.emailTips = true", ng-blur="vm.emailTips = false", name="email", placeholder="Enter Your Email", type="email", valid-email, email-is-available, required)
 
       .tips.email-tips(ng-show="vm.emailTips")
@@ -66,10 +73,12 @@
 
         p We'll occasionally send you emails related to your activities or interests.
 
-    .form-errors
-      p.form-error(ng-show="vm.registerForm.email.$dirty && (vm.registerForm.email.$error.emailIsAvailable || vm.registerForm.email.$error.validEmail)", ng-bind="vm.emailErrorMessage")
+    .form-input-error(ng-show="vm.registerForm.email.$dirty && vm.registerForm.email.$invalid", ng-messages="vm.registerForm.email.$error")
+      p.form-error(ng-message="emailIsAvailable") {{vm.emailErrorMessage}}
 
-      p.form-error(ng-show="vm.registerForm.email.$dirty && vm.registerForm.email.$error.required") Please enter an email address.
+      p.form-error(ng-message="validEmail") {{vm.emailErrorMessage}}
+
+      p.form-error(ng-message="required") Please enter an email address.
 
     .validation-bar(ng-class="{ 'success-bar': (vm.registerForm.password.$valid) }")
       toggle-password-with-tips(ng-if="!vm.isSocialRegistration")
@@ -85,26 +94,27 @@
 
         p(ng-class="{ 'has-symbol-or-number': (vm.registerForm.password.$dirty && !vm.registerForm.password.$error.hasSymbolOrNumber) }") At least one number or symbol
 
-    button(type="submit", tc-busy-button, tc-busy-when="vm.registering", ng-disabled="vm.registerForm.$invalid", ng-class="{'enabled-button': vm.registerForm.$valid}") Join
-
-  section.terms
-    p By clicking "Join," you agree to Topcoder's #[a(href="http://www.topcoder.com/community/how-it-works/terms/", target="_blank") Terms of Service] and #[a(href="http://www.topcoder.com/community/how-it-works/privacy-policy/", target="_blank") Privacy Policy]
-
-  section.social
-    p ------------ Or Register With ------------
-
-    .social-icons
-      .github
-        .ico(ng-click="vm.socialRegister('github')")
-        p Github
-      .google-plus
-        .ico(ng-click="vm.socialRegister('google-oauth2')")
-        p Google
-      .facebook
-        .ico(ng-click="vm.socialRegister('facebook')")
-        p Facebook
-
-  .join-topcoder
-    span Already a member?
-    p.redirect
-      a(ui-sref="login(vm.$stateParams)") Log in
+    section.terms
+      p By clicking "Join" you agree to Topcoder's #[a(href="http://www.topcoder.com/community/how-it-works/terms/", target="_blank") Terms] and #[a(href="http://www.topcoder.com/community/how-it-works/privacy-policy/", target="_blank") Privacy Policy]
+
+    button.tc-btn.tc-btn-large(type="submit", tc-busy-button, tc-busy-when="vm.registering", ng-disabled="vm.registerForm.$invalid") Join
+
+  section.login-options
+    p.tc-separator
+      span Or Register With
+
+    ul.networks
+      li.network.github
+        a.ico(ng-click="vm.socialRegister('github')")
+        span Github
+      li.network.google-plus
+        a.ico(ng-click="vm.socialRegister('google-oauth2')")
+        span Google
+      li.network.facebook
+        a.ico(ng-click="vm.socialRegister('facebook')")
+        span Facebook
+
+.join-topcoder
+  span Have an account?  
+
+    a(ui-sref="login(vm.$stateParams)") Log in

app/account/reset-password/reset-password.jade

@@ -28,7 +28,7 @@
       p.form-error(ng-show="vm.unkownError") We were unable to send you a reset link because of a temporary problem. Please try again. If you continue to have trouble, please contact 
         a(href="mailto:[email protected]?Subject=Unable%20to%20reset%20my%20password" target="_top") [email protected]
 
-    button(type="submit", ng-disabled='vm.generateTokenForm.email.$invalid || vm.loading', ng-class="{'enabled-button': vm.generateTokenForm.$valid && !vm.loading}") Get Reset Link
+    button.tc-btn(type="submit", ng-disabled='vm.generateTokenForm.email.$invalid || vm.loading', ng-class="{'enabled-button': vm.generateTokenForm.$valid && !vm.loading}") Get Reset Link
 
   a.link(ui-sref="login") Back to Login
 
@@ -61,6 +61,6 @@
       p.form-error(ng-show="vm.resetFailed") We were unable to reset your password. Please request another reset link. If you continue to have trouble, please contact 
         a(href="mailto:[email protected]?Subject=Unable%20to%20reset%20my%20password" target="_top") [email protected]
 
-    button(type="submit", ng-disabled='vm.resetPasswordForm.password.$invalid || vm.loading', ng-class="{'enabled-button': vm.resetPasswordForm.$valid && !vm.loading}") Set Password
+    button.tc-btn(type="submit", ng-disabled='vm.resetPasswordForm.password.$invalid || vm.loading', ng-class="{'enabled-button': vm.resetPasswordForm.$valid && !vm.loading}") Set Password
 
   a.link(ui-sref="login") Back to Login

app/directives/account/toggle-password-with-tips/toggle-password-with-tips.directive.js

@@ -29,10 +29,12 @@
         vm.onFocus = function(event) {
           vm.passwordFocus = true;
           vm.placeholder = '';
+          element.addClass('focus');
         }
 
         vm.onBlur = function(event) {
           var relatedTarget = angular.element(event.relatedTarget);
+          element.removeClass('focus');
 
           // If you are blurring from the password input and clicking the checkbox
           if (relatedTarget.attr('type') === 'checkbox' && relatedTarget.attr('id') === 'passwordCheckbox') {

app/directives/account/toggle-password/toggle-password.directive.js

@@ -29,10 +29,12 @@
         vm.onCPFocus = function(event) {
           vm.currentPasswordFocus = true;
           vm.currentPasswordPlaceholder = '';
+          element.addClass('focus');
         }
 
         vm.onCPBlur = function(event) {
           var relatedTarget = angular.element(event.relatedTarget);
+          element.removeClass('focus');
 
           // If you are blurring from the password input and clicking the checkbox
           if (relatedTarget.attr('type') === 'checkbox' && relatedTarget.attr('id') === 'currentPasswordCheckbox') {

app/directives/challenge-links/challenge-links.directive.jade

@@ -0,0 +1,14 @@
+.challenge-links(ng-class="view + '-view'")
+  a.registrants(ng-href="{{challenge|challengeLinks:'registrants'}}", ng-switch="challenge.subTrack")
+    
+    .icon.registrants-icon
+    p(ng-switch-when="MARATHON_MATCH") {{challenge.numRegistrants[0]}}
+    p(ng-switch-default) {{challenge.numRegistrants}}
+
+  a.submissions(ng-hide="challenge.track === 'DATA_SCIENCE'", ng-href="")
+    .icon.submissions-icon
+    p {{challenge.numSubmissions}}
+
+  a.forum(ng-href="{{challenge|challengeLinks:'forums'}}")
+    .icon.forum-icon
+    p Posts

app/directives/challenge-links/challenge-links.directive.js

@@ -0,0 +1,24 @@
+(function() {
+  'use strict';
+  angular.module('tcUIComponents').directive('challengeLinks', function() {
+    return {
+      restrict: 'E',
+      transclude: false,
+      replace: true,
+      templateUrl: 'directives/challenge-links/challenge-links.directive.html',
+      scope: {
+        challenge: '=',
+        view: '='
+      },
+      controller: ['$log', '$scope', '$element', '$window',
+        function($log, $scope, $element, $window) {
+
+          activate();
+
+          function activate() {
+            //nothing to do as of now
+          }
+      }]
+    };
+  });
+})();