Merge pull request #200 from appirio-tech/dev

Release dev to qa

Author: thabofletcher

src/footer.html

@@ -175,7 +175,23 @@ <h2>Comment Examples</h2>
               } else {
                 photoLink = tcconfig.communityURL + '/i/m/nophoto_login.gif';
               }
+              
+              var color = '';
+              var ratings = data['ratingSummary'];
+              if (ratings) {
+                var maxRating = 0;
+                for (var i = 0; i < ratings.length; i++) {
+                  if (maxRating < ratings[i]['rating']) {
+                    maxRating = ratings[i]['rating'];
+                    color = ratings[i]['colorStyle'].split(": ")[1];
+                  }
+                }
+              } else if (data['isPM'] == true) {
+                color = '#FF9900';
+              }
+              
               $timeout(function() {
+                vm.handleStyle = { color: color };
                 vm.photoURL = photoLink;
               });
             });

src/js/app/header/partials/header-nav.html

@@ -20,7 +20,7 @@
           <div class="menu-item-header">
             <a ng-href={{vm.profileLink}} class="profile-link-dropdown">
               <img ng-src="{{vm.photoURL}}" class="user-avatar"/>
-              <span class="username">{{vm.userHandle}}</span>
+              <span ng-style="vm.handleStyle" class="username">{{vm.userHandle}}</span>
             </a>
           </div>
           <a href="/settings/profile" class="btn-link btn-edit-profile show-small">EDIT</a>

wp/wp-content/themes/tcs-responsive/footer.php

@@ -256,7 +256,23 @@ function _kms(u){
               } else {
                 photoLink = tcconfig.communityURL + '/i/m/nophoto_login.gif';
               }
+              
+              var color = '';
+              var ratings = data['ratingSummary'];
+              if (ratings) {
+                var maxRating = 0;
+                for (var i = 0; i < ratings.length; i++) {
+                  if (maxRating < ratings[i]['rating']) {
+                    maxRating = ratings[i]['rating'];
+                    color = ratings[i]['colorStyle'].split(": ")[1];
+                  }
+                }
+              } else if (data['isPM'] == true) {
+                color = '#FF9900';
+              }
+              
               $timeout(function() {
+                vm.handleStyle = { color: color };
                 vm.photoURL = photoLink;
               });
             });
@@ -290,7 +306,7 @@ function _kms(u){
               { 'href': '/community/competitive%20programming/', 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/mf/i/nav/book-cp.svg' },
           ],
           'community': [
-              { 'href': '/community/members/', 'text': 'MEMBERS', 'icon': '/mf/i/nav/members.svg' },
+              { 'href': '/community/members/', 'text': 'OVERVIEW', 'icon': '/mf/i/nav/members.svg' },
               { 'href': '/community/member-programs/', 'text': 'PROGRAMS', 'icon': '/mf/i/nav/programs.svg' },
               { 'href': 'https://' + tcconfig.forumsAppURL, 'text': 'FORUMS', 'icon': '/mf/i/nav/forums.svg' },
               { 'href': '/community/statistics/', 'text': 'STATISTICS', 'icon': '/mf/i/nav/statistics.svg' },