Merge branch 'dev' of https://github.com/appirio-tech/topcoder-app into forms-refactor

# By Tom Ladendorf (3) and others
# Via Tom Ladendorf (4) and others
* 'dev' of https://github.com/appirio-tech/topcoder-app:
  updated track validation
  SUP-2317, Account Setting--> Spinner on 'Save' button should stop after successful message.
  -- Removed hardcoded Submit button for challenge tile
  Updated latest copy, from Anuj, for introjs stuff.
  more save button fixes
  save button fixes
  Updated Community nav per latest reqs
  Corrected image link for Ghostar
  Added 4th member of month and updated latest SRM winners

Conflicts:
	app/settings/account-info/account-info.jade
	app/settings/edit-profile/edit-profile.jade

Author: Victor George

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

@@ -26,8 +26,9 @@
             // remove the disabled attribute only if either element does not have disabled set
             // or it evaluates to false
             if (!attrs.disabled) {
-              element.removeAttr('disabled').html(scope.originalContent);
+              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
 
@@ -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
 

app/services/communityData.service.js

@@ -36,15 +36,21 @@
           "contestType": "Data Science",
           "description": "Rating increased in both SRMs & advanced from Div 2 to Div 1.",
           "class": "data-science"
+        }, {
+          "avatar": "https://s3.amazonaws.com/app.topcoder-dev.com/images/ico-user-default.7aa28736.svg",
+          "name": "TBD",
+          "contestType": "Rookie of the Month",
+          "description": "Most impressive start...",
+          "class": "data-science"
         }],
         "copilots": [{
           "avatar": "//community.topcoder.com/i/m/maroosh.jpeg",
           "name": "maroosh",
           "country": "Jordan"
         }, {
-          "avatar": "//community.topcoder.com/i/m/elkhawajah.jpeg",
-          "name": "elkhawajah",
-          "country": "Jordan"
+          "avatar": "//community.topcoder.com/i/m/Ghostar.jpeg",
+          "name": "Ghostar",
+          "country": "United States"
         }, {
           "avatar": "//community.topcoder.com/i/m/hohosky.png",
           "name": "hohosky",

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/services/nav.service.js

@@ -29,8 +29,7 @@
           { 'href': '/community/competitive%20programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/images/nav/book-cp.svg' },
       ],
       'community': [
-          { 'sref': 'community', 'text': 'HOME', 'icon': '/images/nav/community.svg' },
-          { 'sref': 'community.members', 'text': 'MEMBERS', 'icon': '/images/nav/members.svg' },
+          { 'sref': 'community.members', 'text': 'OVERVIEW', 'icon': '/images/nav/members.svg' },
           { 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': '/images/nav/programs.svg' },
           { 'href': CONSTANTS.FORUMS_APP_URL, 'text': 'FORUMS', 'icon': '/images/nav/forums.svg', 'target': '_blank' },
           { 'sref': 'community.statistics', 'text': 'STATISTICS', 'icon': '/images/nav/statistics.svg' },

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

@@ -164,4 +164,4 @@
 
 
   .save-section
-    button.save.tc-btn.tc-btn-wide(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-l(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];

app/settings/edit-profile/edit-profile.jade

@@ -22,7 +22,7 @@
               input(type='file', name='image', on-file-change='on-file-change', id="change-image-input", style="display: none;")
 
               .file-delete(ng-show="vm.userData.photoURL && vm.userData.photoURL.length")
-                button.tc-btn.tc-btn-ghost.tc-btn-warning.tc-btn-s(ng-click="vm.deleteImage()", type="button") Delete
+                button.tc-btn.tc-btn-secondary.tc-btn-s(ng-click="vm.deleteImage()", type="button") Delete
 
         .country
           .form-label country to represent
@@ -59,8 +59,8 @@
         track-toggle(tracks="vm.tracks")
 
     .save-section
-      button.tc-btn.tc-btn-primary.tc-btn-wide(ng-show="!(vm.editProfile.$invalid || vm.editProfile.$pristine || !vm.tracksValid())", type="submit", tc-busy-button, tc-busy-when="vm.profileFormProcessing" ng-disabled="vm.editProfile.$invalid || vm.editProfile.$pristine", ng-class="{' ': vm.editProfile.$valid, 'disabled': disabled}") Save
-      button.tc-btn.tc-btn-secondary.tc-btn-wide.disabled(ng-show="vm.editProfile.$invalid || vm.editProfile.$pristine || !vm.tracksValid()", type="button") Save
+      button.tc-btn.tc-btn-primary.tc-btn-s(ng-show="!(vm.editProfile.$invalid || vm.editProfile.$pristine)", type="submit", tc-busy-button, tc-busy-when="vm.profileFormProcessing" ng-disabled="vm.editProfile.$invalid || vm.editProfile.$pristine", ng-class="{' ': vm.editProfile.$valid, 'disabled': disabled}") Save
+      button.tc-btn.tc-btn-secondary.tc-btn-s(ng-show="vm.editProfile.$invalid || vm.editProfile.$pristine", type="button", disabled="disabled") Save
 
   .settings-section.skills
     .section-info