Merge branch 'dev' into feature/member-page-updates

Author: TonyJ

app/account/register/register.jade

@@ -46,6 +46,7 @@
         input(ng-model="vm.username", ng-model-options="{ debounce: {'default': 500} }", ng-focus="vm.usernameTips = true", ng-blur="vm.usernameTips = false", ng-minlength="2", ng-maxlength="15", name="username", placeholder="Username", type="text", username-is-free, required)
 
       .tips.username-tips(ng-show="vm.usernameTips")
+        .arrow
         h3 Username Tips:
 
         p Your username will be public
@@ -67,6 +68,7 @@
         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")
+        .arrow
         h3 Email Tips:
 
         p Your email address will be private and not shared with anyone.
@@ -84,9 +86,10 @@
       toggle-password-with-tips(ng-if="!vm.isSocialRegistration")
 
       .tips.password-tips(ng-show="vm.passwordFocus")
-        h3 Password Tips:
+        .arrow
+        //- h3 Password Tips:
 
-        p Your password must have:
+        H3 Your password must have:
 
         p(ng-class="{ 'has-length-between-range': (vm.registerForm.password.$dirty && !vm.registerForm.password.$error.minlength && !vm.registerForm.password.$error.maxlength && !vm.registerForm.password.$error.required) }") At least 8 characters
 
@@ -117,5 +120,4 @@
 
 .join-topcoder
   span Have an account?  
-
     a(ui-sref="login(vm.$stateParams)") Log in

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

@@ -15,6 +15,7 @@
         input(ng-model="vm.email", ng-focus="vm.emailTips = true", ng-blur="vm.emailTips = false", name="email", placeholder="EMAIL ADDRESS", type="email", valid-email, required)
 
       .tips.email-tips(ng-show="vm.emailTips")
+        .arrow
         h3 Email Tips:
 
         p Enter your email address and we'll get back to you with a reset link
@@ -49,6 +50,7 @@
       toggle-password-with-tips
 
       .tips.password-tips(ng-show="vm.passwordFocus")
+        .arrow
         h3 Password Tips:
 
         p(ng-class="{ 'has-length-between-range': (vm.resetPasswordForm.password.$dirty && !vm.resetPasswordForm.password.$error.minlength && !vm.resetPasswordForm.password.$error.maxlength && !vm.resetPasswordForm.password.$error.required) }") Must be between 8 and 64 characters

app/directives/busy-button/busy-button.directive.js

@@ -23,11 +23,12 @@
               scope);
             element.attr('disabled', true).html('').append(busyMessageHtml);
           } else {
-            // remove the disabled attribute only if either element does not have ng-disabled set
+            // remove the disabled attribute only if either element does not have disabled set
             // or it evaluates to false
-            if (!attr.ngDisabled || !$parse(attr.ngDisabled)) {
-              element.removeAttr('disabled').html(scope.originalContent);
+            if (!attrs.disabled) {
+              element.removeAttr('disabled');
             }
+            element.html(scope.originalContent);
           }
         });
       }

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

@@ -21,7 +21,7 @@
       .stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
 
       .phase-action(ng-switch="challenge.userAction")
-        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit") Submit
+        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'detail'}}") Submit
 
         .submitted(ng-switch-when="Submitted") Submitted
 
@@ -31,7 +31,7 @@
     // Only show if not data science track
     p.roles 
       span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
-        #[span Role:  ] #[span {{challenge.userDetails.roles | listRoles}}]
+       #[span Role: ] #[span {{challenge.userDetails.roles | listRoles}}]
 
   .completed-challenge(
     ng-show="challenge.status === 'COMPLETED' || challenge.status === 'PAST'",
@@ -65,7 +65,7 @@
     // Only show if not data science track
     p.roles
       span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
-        #[span Role:  ] #[span {{challenge.userDetails.roles | listRoles}}]
+        #[span Role: ] #[span {{challenge.userDetails.roles | listRoles}}]
 
 .challenge.list-view(ng-show="view=='list'", ng-class="challenge.track")
   .active-challenge(ng-show="challenge.status === 'ACTIVE'")
@@ -76,7 +76,7 @@
 
       p.subtrack-color {{challenge.subTrack | underscoreStrip}}
 
-      p.roles(ng-hide="challenge.track === 'DATA_SCIENCE'") #[span Role:  ] #[span {{challenge.userDetails.roles | listRoles}}]
+      p.roles(ng-hide="challenge.track === 'DATA_SCIENCE'") #[span Role: ] #[span {{challenge.userDetails.roles | listRoles}}]
 
     .challenge-details
       .challenge-info
@@ -87,7 +87,7 @@
         p.ends-in(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
 
       .phase-action(ng-switch="challenge.userAction")
-        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit") Submit
+        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'detail'}}") Submit
 
         .submitted(ng-switch-when="Submitted") Submitted
 
@@ -106,7 +106,7 @@
 
       p.subtrack-color {{challenge.subTrack | underscoreStrip}}
 
-      p.roles(ng-hide="challenge.track === 'DATA_SCIENCE'") #[span Role:  ] #[span {{challenge.userDetails.roles | listRoles}}]
+      p.roles(ng-hide="challenge.track === 'DATA_SCIENCE'") #[span Role: ] #[span {{challenge.userDetails.roles | listRoles}}]
 
     .challenge-details(ng-switch-when="DATA_SCIENCE", ng-switch="challenge.subTrack", ng-class="challenge.track")
 

app/directives/challenge-user-place/challenge-user-place.directive.js

@@ -46,7 +46,7 @@
           if (!$scope.challenge.isPrivate && $scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) {
             $scope.selectedIndex = 0;
             $scope.challenge.thumbnailId = $scope.challenge.userDetails.submissions[0].id;
-            $scope.imageURL = $scope.challenge.userDetails.submissions[0].submissionImage;
+            $scope.imageURL = $scope.challenge.userDetails.submissions[0].submissionImage && $scope.challenge.userDetails.submissions[0].submissionImage.full;
             $scope.selectedImage = $scope.imageURL;
 
             $scope.challenge.highestPlacement = _.max($scope.challenge.userDetails.submissions, 'placement').placement;

app/directives/challenge-user-place/design-challenge-user-place.directive.jade

@@ -4,13 +4,9 @@
   p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
   p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED
 
-  .thumbnail(ng-click="openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
-    img(ng-src="{{imageURL}}", fallback-src="/images/ico-picture.svg")
-
-    .thumbnail-gallery(ng-click="openLightbox()")
-      .gallery-icon
-
-      .num-images 1 image
+  .thumbnail(ng-click="!challenge.isPrivate && imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
+    img(ng-show="!challenge.isPrivate", ng-src="{{imageURL || '/images/card-bg-no-image.svg'}}", fallback-src="/images/card-bg-no-image.svg")
+    img(ng-show="challenge.isPrivate", src="/images/card-bg-private-project.svg")
 
 .list-view(ng-show="view === 'list'")
   .place-date
@@ -22,10 +18,7 @@
 
   .winner-ribbon(ng-show="challenge.wonFirst")
 
-  .thumbnail(ng-click="openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
-    img(ng-src="http://studio.{{DOMAIN}}/studio.jpg?module=DownloadSubmission&sbmid={{challenge.thumbnailId}}&sbt=full", fallback-src="/images/ico-picture.svg")
-
-    .thumbnail-gallery(ng-click="challenge.showLightbox()")
-      .gallery-icon
 
-      .num-images 1 image
+  .thumbnail(ng-click="!challenge.isPrivate && imageURL && openLightbox()", ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
+    img(ng-show="!challenge.isPrivate", ng-src="{{imageURL || '/images/card-bg-no-image.svg'}}", fallback-src="/images/ico-picture.svg")
+    img(ng-show="challenge.isPrivate", src="/images/card-bg-private-project.svg")

app/directives/challenge-user-place/design-lightbox/design-lightbox.jade

@@ -6,7 +6,10 @@
     .title {{challenge.name}}
 
 
-    img(ng-src="{{selectedImage}}")
+    img(
+      ng-src="{{selectedImage}}",
+      fallback-src="/images/card-bg-no-image.svg"
+    )
 
 
     .info
@@ -15,9 +18,10 @@
     .selections
       img.selection(
         ng-repeat="submission in challenge.userDetails.submissions",
-        ng-src="{{submission.submissionImage}}",
-        ng-click="updateSelected(submission.submissionImage, $index)",
-        ng-class="{'current': submission.submissionImage == selectedImage}"
+        ng-src="{{currentImage = submission.submissionImage && submission.submissionImage.full}}",
+        ng-click="updateSelected(currentImage, $index)",
+        ng-class="{'current': currentImage == selectedImage}",
+        fallback-src="/images/card-bg-no-image.svg"
       )
 
   .right-nav

app/directives/track-toggle/track-toggle.directive.jade

@@ -1,7 +1,6 @@
 .track(ng-repeat="track in ['DESIGN', 'DEVELOP', 'DATA_SCIENCE']")
-  hr(class="{{!$index  && 'first'}}")
 
-  .content
+  .content(class="{{!tracks[track] && 'disabled'}}")
     .track-details
       .icon(ng-class="{'disabled': !tracks[track]}")
         img(ng-if="track == 'DATA_SCIENCE' && tracks[track]", src="/images/ico-track-data.svg")
@@ -23,5 +22,3 @@
       label.onoffswitch-label(for='{{track}}-onoffswitch')
         span.onoffswitch-inner
         span.onoffswitch-switch
-
-hr.bottom

app/index.jade

@@ -28,6 +28,7 @@ html
     // build:css /styles/app.css
     //- inject:css
     link(rel="stylesheet", href="assets/css/reset.css")
+    link(rel="stylesheet", href="assets/css/vendors/angucomplete.css")
     link(rel="stylesheet", href="assets/css/topcoder.css")
     link(rel="stylesheet", href="assets/css/skill-picker/skill-picker.css")
     link(rel="stylesheet", href="assets/css/sitemap/sitemap.css")

app/profile/subtrack/subtrack.controller.js

@@ -25,7 +25,7 @@
     vm.back = back;
     vm.subTrackStats = [];
 
-    vm.pageName = vm.subTrack.toLowerCase().replace('_', ' ');
+    vm.pageName = vm.subTrack.toLowerCase().replace(/_/g, ' ');
 
     vm.tabs = [];
     if (vm.track !== 'DESIGN') {

app/profile/subtrack/subtrack.jade

@@ -10,7 +10,7 @@
           responsive-carousel(data="vm.subTrackStats", handle="{{vm.handle}}")
             .carousel-elem
               .flex-wrapper
-                p.title(ng-hide="true") {{item.subTrack | underscoreStrip}}
+                p.title(ng-hide="true") {{item.subTrack | track}}
 
                 p.value(ng-show="item.label === 'rating'", style="color: {{item.val |  ratingColor}}") {{item.val | empty}}
                   span(style="background-color: {{item.val | ratingColor}}")
@@ -29,7 +29,7 @@
           responsive-carousel(data="vm.subTrackStats", handle="{{vm.handle}}")
             .carousel-elem
               .flex-wrapper
-                p.title(ng-hide="true") {{item.subTrack | underscoreStrip}}
+                p.title(ng-hide="true") {{item.subTrack | track}}
 
                 p.value(ng-show="item.label === 'rating'", style="color: {{item.val |  ratingColor}}") {{item.val | empty}}
                   span(style="background-color: {{item.val | ratingColor}}")

app/services/introduction.service.js

@@ -82,34 +82,39 @@
             },
             {
               // element: '#skills',
-              intro: 'The quickest way to understand a member’s skills. It includes languages, environments, frameworks, libraries, platforms, tools, and any other technologies that you know well.',
+              intro: 'The quickest way to understand a member’s skills. It includes languages, environments, frameworks, libraries, platforms, tools, and any other technologies that the members knows well.',
               position: 'top'
             },
             {
               // element: '#tcActivity',
-              intro: 'Topcoder activity, ratings and other statistics now live in this section. See the active sub-tracks and click on them for even more details and history.',
+              intro: 'See the active sub-tracks and click on them for ratings, charts, history and even more details.',
               position: 'top'
             },
             {
               // element: '#externalLinks',
-              intro: 'Best of member’s presence on the web will be highlighted here. Show off your work and experience outside of Topcoder by connecting accounts or adding links.',
+              intro: 'View the best of your presence on the web: show off your work and experience outside of Topcoder by connecting accounts or adding links.',
               position: 'top'
             }
           ]
         },
         subtrack: {
           steps: [
             {
-              intro: 'Welcome to the new Sub-track details page. This page contains activity in this track and in-depth metrics in an easy-to-understand way.'
+              intro: 'Welcome to the new Sub-track details page. This page contains activity in this track, in-depth metrics and history in an easy-to-understand way.'
             },
             {
               // element: '#subtrack-stats',
-              intro: 'Find the most important metrics here to understand performance in a glance. You can scroll below to see charts and more in-depth metrics to get a very granular understanding of the activity in this subtrack.',
+              intro: 'Find the most important metrics here to understand performance in a glance.',
               position: 'bottom'
             },
             {
               // element: '#challenges-tab',
-              intro: 'This sections contains all the completed challenges, in order of success.',
+              intro: 'View all the successfully completed challenges for the member in this sub-track.',
+              position: 'top'
+            },
+            {
+              // element: '#challenges-tab',
+              intro: 'View charts and more in-depth metrics to get a very granular understanding of the activity in this sub-track.',
               position: 'top'
             }
           ]
@@ -118,7 +123,7 @@
       dashboard: {
         steps: [
           {
-            intro: 'Welcome to your new Topcoder Dashboard. We have revamped the dashboard to bring to fore the information that matters to you. Let us walk you through some of the new things to help you keep on top of your Topcoder activity.'
+            intro: 'Welcome to the your new Topcoder Dashboard. We have revamped the dashboard to bring to fore the information that matters to you. Lets walk through some of the new features.'
           },
           {
             // element: '#metrics',
@@ -132,12 +137,7 @@
           },
           {
             // element: '#challenges',
-            intro: 'All your active challenges can be found here. See the phase, and activity on here, or click on them to go to the challenge details. You can view these in a grid or list view.',
-            position: 'top'
-          },
-          {
-            // element: '#viewAllChallenges',
-            intro: 'Want to see more of the challenges? Or look up a past one? Click on the buttons here to see all of your challenges.',
+            intro: 'View your active challenges on the dashboard in a grid or list view.  You can find the phase, and activity on here, or can click on them to go to the challenge details.',
             position: 'top'
           },
           {

app/settings/account-info/account-info.controller.js

@@ -77,6 +77,7 @@
         vm.formProcessing.accountInfoForm = false;
         toaster.pop('success', "Success!", "Your account information was updated.");
         for (var k in vm.userData) userData[k] = vm.userData[k];
+        vm.accountInfoForm.$setPristine();
       })
       .catch(function() {
         vm.formProcessing.accountInfoForm = false;

app/settings/account-info/account-info.jade

@@ -1,14 +1,14 @@
 .account-info-container
   .settings-section.credentials
     .section-info
-      h2 credentials
+      h2 Credentials
       .description Used to log in to your account and cannot be edited. Please contact [email protected] if you need to make changes.
 
     .section-fields
       .form-label.username Username
       input.form-field.grey(name="username", value="{{vm.userData.handle}}", disabled=true)
 
-      .form-label email
+      .form-label Email
       input.form-field.grey(name="email", value="{{vm.userData.email}}", disabled=true)
 
       div(ng-hide="vm.isSocialRegistration")
@@ -31,6 +31,7 @@
               placeholder="Pick a new password"
             )
             .tips.password-tips(ng-show="vm.passwordFocus")
+              .arrow
               h3 Password Tips:
 
               p Your password must have:
@@ -42,7 +43,7 @@
               p(ng-class="{ 'has-symbol-or-number': (vm.newPasswordForm.password.$dirty && !vm.newPasswordForm.password.$error.hasSymbolOrNumber) }") At least one number or symbol
 
           .button-container
-            button.tc-btn.tc-btn-l.save(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.newPasswordForm", ng-disabled="vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine", ng-class="{'disabled': vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine}") Change Password
+            button.tc-btn.save(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.newPasswordForm", ng-disabled="vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine", ng-class="{'disabled': vm.newPasswordForm.$invalid || vm.newPasswordForm.$pristine}") Change Password
 
 
       div(ng-show="vm.isSocialRegistration")
@@ -163,4 +164,4 @@
 
 
   .save-section
-    button.save.tc-btn.tc-btn-l(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.accountInfoForm", ng-disabled="vm.accountInfoForm.$invalid", ng-class="{'enabled-button': vm.accountInfoForm.$valid, 'disabled': vm.accountInfoForm.$invalid || vm.accountInfoForm.$pristine}", ng-click="vm.accountInfoForm.$valid && vm.accountInfoForm.$dirty && vm.saveAccountInfo()") Save
+    button.save.tc-btn.tc-btn-wide(type="submit", tc-busy-button, tc-busy-when="vm.formProcessing.accountInfoForm", ng-disabled="vm.accountInfoForm.$invalid || vm.accountInfoForm.$pristine", ng-class="{'enabled-button': vm.accountInfoForm.$valid}", ng-click="vm.accountInfoForm.$valid && vm.accountInfoForm.$dirty && vm.saveAccountInfo()") Save

app/settings/edit-profile/edit-profile.controller.js

@@ -35,12 +35,13 @@
 
       processData(vm.userData);
 
-      $scope.tracks = vm.tracks;
-      $scope.$watch('tracks', function watcher() {
-        if (!tracksValid()) {
-          toaster.pop('error', "Error", "Please select at least one track.");
-        }
-      }, true);
+      // commenting out since this might come back
+//      $scope.tracks = vm.tracks;
+//      $scope.$watch('tracks', function watcher() {
+//        if (!tracksValid()) {
+//          toaster.pop('error', "Error", "Please select at least one track.");
+//        }
+//      }, true);
 
       ExternalAccountService.getLinkedExternalAccounts(vm.userData.userId).then(function(data) {
         vm.linkedExternalAccounts = data;
@@ -117,6 +118,10 @@
     }
 
     function updateProfile() {
+      if (!vm.tracksValid()) {
+        toaster.pop('error', "Error", "Please select at least one track.");
+        return false;
+      }
       vm.profileFormProcessing = true;
       vm.userData.tracks = _.reduce(vm.tracks, function(result, isInterested, trackName) {
         if (isInterested) {
@@ -128,6 +133,7 @@
       ProfileService.updateUserProfile(vm.userData)
       .then(function() {
         vm.profileFormProcessing = false;
+        vm.editProfile.$setPristine();
         $log.info('Saved successfully');
         toaster.pop('success', "Success!", "Your account information was updated.");
         for (var k in vm.userData) userData[k] = vm.userData[k];