Merge branch 'dev' into feature/tc-ui-kit-integration

Nick Litwin · Nick Litwin · commit 2572e912a3bb · 2015-10-13T15:38:53.000-07:00
diff --git a/.version b/.version
@@ -1 +1 @@
-v1.0.3
+v1.0.5
diff --git a/app/directives/ios-card/ios-card.directive.jade b/app/directives/ios-card/ios-card.directive.jade
@@ -9,11 +9,14 @@
   .challenge-details
 
     p.currentPhase {{challenge.userCurrentPhase}}
+
     .challenge-calendar(ng-show="challenge.userCurrentPhaseEndTime")
       p.ends-in Ends In
       p.time-remaining {{challenge.userCurrentPhaseEndTime[0]}}
       p.unit-of-time {{challenge.userCurrentPhaseEndTime[1]}}
       
+    .stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
+      
     p.prize-money(ng-show="challenge.reviewType === 'PEER'") Peer Review Challenge
 
     p.prize-money(ng-hide="challenge.reviewType === 'PEER'") {{challenge.totalCheckpointPrize || 0 | currency:undefined:0}}
diff --git a/app/directives/profile-widget/profile-widget.directive.js b/app/directives/profile-widget/profile-widget.directive.js
@@ -10,7 +10,7 @@
       scope: {
         profile: '=profile',
         editProfileLink: '=editProfileLink',
-        numChallenges: '=numChallenges',
+        numWins: '=numWins',
         profileVm: '=profileVm'
       },
       link: function(scope, elem, attrs) {
diff --git a/app/directives/profile-widget/profile-widget.jade b/app/directives/profile-widget/profile-widget.jade
@@ -10,8 +10,8 @@
       | Member Since {{profile.startMonth}}
 
     h3.location-challenges {{profile.homeCountryCode | isoCountry}}
-      span.bar(ng-show="profile.homeCountryCode && numChallenges") &nbsp;|&nbsp;
-      span(ng-show="numChallenges") {{numChallenges}} Challenges
+      span.bar(ng-show="profile.homeCountryCode && numWins") &nbsp;|&nbsp;
+      span(ng-show="numWins") {{numWins}} Wins
 
     p.description {{profile.description}}
 
diff --git a/app/index.jade b/app/index.jade
@@ -81,7 +81,7 @@ html
 
   body(ng-app="topcoder", ng-controller="TopcoderController as main", ng-class="{'menu-visible': main.menuVisible}", ng-strict-di)
 
-    #header(ui-view="header")
+    #header(ui-view="header", autoscroll="true")
 
     .intro-js-container(ng-intro-options="main.introOptions", ng-intro-method="main.startIntro")
 
diff --git a/app/my-dashboard/my-dashboard.controller.js b/app/my-dashboard/my-dashboard.controller.js
@@ -3,15 +3,35 @@
 
   angular.module('tc.myDashboard').controller('MyDashboardController', MyDashboardController);
 
-  MyDashboardController.$inject = ['userIdentity'];
+  MyDashboardController.$inject = ['userIdentity', 'ProfileService', '$log'];
 
-  function MyDashboardController(userIdentity) {
+  function MyDashboardController(userIdentity, ProfileService, $log) {
     var vm = this;
 
     activate();
 
     function activate() {
+      vm.showSRMs = false;
       vm.isCopilot = _.includes(userIdentity.roles, 'copilot');
+
+      displaySRMsBasedOnTrack();
+    }
+
+    function displaySRMsBasedOnTrack() {
+      ProfileService.getUserProfile(userIdentity.handle)
+      .then(function(userProfile) {
+        var isDesigner = _.includes(userProfile.tracks, 'DESIGN');
+
+        if (isDesigner && userProfile.tracks.length === 1) {
+          vm.showSRMs = false;
+        } else {
+          vm.showSRMs = true;
+        }
+      })
+      .catch(function(err) {
+        vm.showSRMs = false;
+        $log.error(err);
+      })
     }
   }
 })();
diff --git a/app/my-dashboard/my-dashboard.jade b/app/my-dashboard/my-dashboard.jade
@@ -5,7 +5,7 @@
 
   .my-challenges(id="challenges", ui-view="my-challenges")
 
-  .srms(id="srms", ui-view="srms")
+  .srms(id="srms", ui-view="srms", ng-show="dashboard.showSRMs")
 
   .programs(id="community", ui-view="programs")
 
diff --git a/app/profile/about/about.jade b/app/profile/about/about.jade
@@ -1,5 +1,5 @@
 .profile-header-container(ng-cloak)
-  profile-widget(profile="profileVm.profile", edit-profile-link="profileVm.showEditProfileLink", num-challenges="profileVm.numProjects", profile-vm="profileVm")
+  profile-widget(profile="profileVm.profile", edit-profile-link="profileVm.showEditProfileLink", num-wins="profileVm.numWins", profile-vm="profileVm")
 
 .profile-about-container
 
diff --git a/app/profile/profile.jade b/app/profile/profile.jade
@@ -1,2 +1,2 @@
 .profile-container
-  ui-view(ng-cloak, autoscroll="true")
+  ui-view(ng-cloak)
diff --git a/app/profile/subtrack/develop/develop.jade b/app/profile/subtrack/develop/develop.jade
@@ -6,15 +6,15 @@
           span.square(ng-if="vm.typeStats.rank.rating", style="background-color: {{vm.typeStats.rank.rating | ratingColor}}")
         .name RATING
 
-      li.stat(ng-if="!vm.typeStats.rank.rating")
+      li.stat(ng-if="!vm.typeStats.rank.rating && !vm.nonRated")
         .value -
         .name RATING
 
-      li.stat
+      li.stat(ng-hide="vm.nonRated")
         .value {{vm.typeStats.rank.overallRank | empty}}
         .name RANK
 
-      li.stat
+      li.stat(ng-hide="vm.nonRated")
         .value {{vm.typeStats.rank.overallPercentile / 100 | percentage | empty}}
         .name PERCENTILE
 
@@ -26,7 +26,7 @@
         .value {{vm.typeStats.wins | empty}}
         .name WINS
 
-      li.stat
+      li.stat(ng-hide="vm.nonRated")
         .value {{vm.typeStats.rank.reliability | percentage | empty}}
         .name RELIABILITY
 
diff --git a/app/profile/subtrack/subtrack.controller.js b/app/profile/subtrack/subtrack.controller.js
@@ -76,6 +76,8 @@
           vm.subTrack.toLowerCase().replace(/ /g, '')
         );
 
+        vm.nonRated = !vm.typeStats.rank.rating && !vm.typeStats.rank.overallRank && !vm.typeStats.rank.reliability;
+
         if (vm.subTrack) {
           vm.dropdown = ProfileService.getSubTracks(profileVm.stats, vm.track.toLowerCase())
           .map(function(subtrack) {
diff --git a/app/settings/edit-profile/edit-profile.jade b/app/settings/edit-profile/edit-profile.jade
@@ -38,7 +38,7 @@
         .bio
           .form-label short bio
             span(style="float:right;") {{vm.userData.description.length || 0}}/144
-          textarea.form-field(name="description", ng-model="vm.userData.description", maxlength="144")
+          textarea.form-field(name="description", ng-model="vm.userData.description", data-ng-trim="false", maxlength="144")
 
     .settings-section.tracks
       .section-info
diff --git a/assets/css/directives/ios-card.scss b/assets/css/directives/ios-card.scss
@@ -50,7 +50,10 @@ ios-card .challenge.tile-view {
     align-items: center;
 
     .currentPhase {
-      margin-top: 42px;
+      margin-top: 40px;
+      @include sofia-pro-light;
+      font-size: 20px;
+      line-height: 24px;
     }
   }
 
@@ -63,7 +66,8 @@ ios-card .challenge.tile-view {
   }
 
   .technologies {
-    margin-bottom: 40px;
+    height: 36px;
+    margin-bottom: 33px;
     padding: 0 20px;
     @include source-sans-regular;
     font-size: 13px;
@@ -76,8 +80,7 @@ ios-card .challenge.tile-view {
     align-items: center;
     width: 75px;
     height: 63px;
-    margin-bottom: 20px;
-    margin-top: 44px;
+    margin-top: 16px;
     background-image: url(/images/ico-calendar.svg);
 
     > p {
@@ -106,6 +109,11 @@ ios-card .challenge.tile-view {
     }
   }
 
+  .stalled-challenge {
+    margin-top: 31px;
+    margin-bottom: 32px;
+  }
+
   .phase-action {
     margin-bottom: 25px;
     @include button-m-wide;

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`.profile-container`
`2`		`- ui-view(ng-cloak, autoscroll="true")`
	`2`	`+ ui-view(ng-cloak)`