Merge branch 'dev' into hotfix/sup-2582-sort-srms-by-registration-start

* dev:
  Update
  Fix search bar, styling and placement  of user handle
  Move footer links to bottom of mobile nav, style white
  Fix formatting
  Fix import
  adjusted winner ribbon positioning
  Fix test
  Remove stopPropagation
  fixed some design card display stuff
  Prevent the section from flickering
  quick fix
  more nav styling changes
  Finished nav basics
  placeholder
  logo 'beta' tag css fix

Author: vikasrohit

README.md

@@ -58,7 +58,7 @@ The tests folder contains mock data (tests/test-helpers/mock-data.js). It also h
 Spec files live alongside the code they are testing. For example, in peer-review you have review-status.controller.js and review-status.spec.js in the same review-status folder. If you want to see an example of tests, use review-status.spec.js as an example of controller tests and services/challenge.service.spec.js as an example of service tests.
 
 ## UI-Router and States
-See sample.routes.js and peer-review.routes.js as examples.
+See any *.routes.js file as an example.
 
 ## Contributing
 
@@ -87,7 +87,7 @@ Jade Files
 ```
 
 SCSS Files
-  - Use SCSS syntax (nesting)
+  - Use SCSS syntax, but do not overly nest
   - Use variables and mixins as much as possible
   - Store new variables and mixins in the appropriate file in `assets/css/partials`
   - Since a class with the current state name is added to the ui-view (see the Creating New Views/Pages section), wrap your .scss file with this class, in order to write specific SCSS in its own file for that page.

app/directives/header/header-menu-item.directive.js

@@ -13,8 +13,9 @@
         var href = $scope.item.href;
 
         // I believe I have to hack this because of https://github.com/angular-ui/ui-router/issues/395, I tried ui-state
-        if ($scope.item.srefParams)
+        if ($scope.item.srefParams) {
           $scope.wtfhref = $state.href($scope.item.sref, $scope.item.srefParams);
+        }
 
         $scope.isActive = function() {
           if (window.location.pathname == href || $state.is(sref)) {
@@ -23,6 +24,7 @@
 
             return true;
           }
+
           return false;
         }
       }]

app/index.jade

@@ -37,6 +37,7 @@ html
     link(rel="stylesheet", href="assets/css/settings/edit-profile.css")
     link(rel="stylesheet", href="assets/css/settings/account-info.css")
     link(rel="stylesheet", href="assets/css/profile/subtrack.css")
+    link(rel="stylesheet", href="assets/css/profile/nav.css")
     link(rel="stylesheet", href="assets/css/profile/icons.css")
     link(rel="stylesheet", href="assets/css/profile/header.css")
     link(rel="stylesheet", href="assets/css/profile/badges.css")

app/layout/footer/footer.jade

@@ -2,20 +2,25 @@ footer.bottom-footer
   // Footer links
   nav.menu-item
     .menu-item-header.show-small OTHERS
+
     ul.submenu
-        li.submenu-item #[a.menu-link(ng-click="$event.stopPropagation();" href="/sitemap") SITEMAP]
-        li.submenu-item #[a.menu-link(ng-click="$event.stopPropagation();" href="/about") ABOUT US]
-        li.submenu-item #[a.menu-link(ng-click="$event.stopPropagation();" href="/contact-us") CONTACT US]
-        li.submenu-item #[a.menu-link(ng-click="$event.stopPropagation();" href="https://help.{{domain}}" target="_blank") HELP CENTER]
-        li.submenu-item #[a.menu-link(ng-click="$event.stopPropagation();" href="https://www.{{domain}}/community/how-it-works/privacy-policy/") PRIVACY POLICY]
-        li.submenu-item #[a.menu-link(ng-click="$event.stopPropagation();" href="https://www.{{domain}}/community/how-it-works/terms/") TERMS]
+      li.submenu-item #[a.menu-link(ng-href="https://www.{{domain}}/sitemap") SITE MAP]
+      li.submenu-item #[a.menu-link(ng-href="https://www.{{domain}}/about") ABOUT US]
+      li.submenu-item #[a.menu-link(ng-href="https://www.{{domain}}/contact-us") CONTACT US]
+      li.submenu-item #[a.menu-link(ng-href="https://help.{{domain}}" target="_blank") HELP CENTER]
+      li.submenu-item #[a.menu-link(ng-href="https://www.{{domain}}/community/how-it-works/privacy-policy/") PRIVACY POLICY]
+      li.submenu-item #[a.menu-link(ng-href="https://www.{{domain}}/community/how-it-works/terms/") TERMS]
 
     // Social links
   .social-links
     p Topcoder is also on
+
     a.fb-link(href="https://www.facebook.com/topcoder" target="fbwindow")
+
     a.twitter-link(href="http://www.twitter.com/topcoder" target="twwindow")
+
     a.linkedin-link(href="https://www.linkedin.com/company/topcoder" target="liwindow")
+
     a.google-link(href="https://plus.google.com/u/0/b/104268008777050019973/104268008777050019973/posts" target="gpwindow")
 
   p.copyright-notice © 2015 Topcoder. All Rights Reserved

app/layout/header/header.jade

@@ -1,6 +1,7 @@
 .header-wrapper(ng-class="{'autocomplete': main.searchTerm.length > 0}")
   header.top-header
     a.logo-link(href="/")
+      
     // Header content visible on small screens
     .show-small.mobile-heading
       span.tc-text-logo(ng-if="main.menuVisible") [ topcoder ]
@@ -11,8 +12,8 @@
 
       // User link (profile or join)
       a(ui-sref="profile.about({userHandle: vm.userHandle})", ng-switch="vm.isAuth" class="user-link" data-ng-if="!main.menuVisible")
-        //- img(ng-switch-when="true", class="user-avatar", ng-src="{{vm.profile.photoURL}}")
         img(ng-switch-when="true", ng-if="vm.profile.photoURL && vm.profile.photoURL.length", class="user-avatar", ng-src="{{vm.profile.photoURL}}")
+
         img(ng-switch-when="true", ng-if="!vm.profile.photoURL || !vm.profile.photoURL.length", class="user-avatar", ng-src="/images/ico-user-default.svg")
 
         span(ng-switch-when="false" class="tc-btn tc-btn-s") JOIN
@@ -29,7 +30,7 @@
           //     a(href="javascript:;" class="menu-link") {{suggestion}}
 
       li.menu-item.link-group.user-menu(ng-switch="vm.isAuth", ng-class="{'anonymous-menu': !vm.isAuth}")
-        // links for logged in user
+        // Links for logged in user
         div(ng-switch-when="true")
           .menu-item-header(
             ng-class="{'hide': vm.selectedGroup() == 'user'}"
@@ -52,20 +53,16 @@
               //- a.menu-link(ng-click="vm.logout(); main.menuVisible = vm.isAuth = false")
               a.menu-link(ui-sref="logout")
                 img.menu-icon(ng-src="/images/nav/exit.svg")
+
                 .menu-text LOG OUT
 
-        // links for anonymous user
+        // Links for anonymous user
         .menu-item-header(ng-switch-when="false")
           a.tc-btn.tc-btn-s.btn-link(ui-sref="register") JOIN
 
           a.tc-btn.tc-btn-s.tc-btn-ghost.btn-link(ui-sref="login") LOG IN
 
-          //- a(ng-click="launchIntro();", ng-show="!!vm.introOptions") Intro
-
-      li.menu-item.link-group(
-        ng-repeat="(menu, items) in vm.menuLinks",
-        ng-class="{'selected': vm.selectedGroup() == menu}"
-      )
+      li.menu-item.link-group(ng-repeat="(menu, items) in vm.menuLinks", ng-class="{'selected': vm.selectedGroup() == menu}")
         .menu-item-header {{menu}}
 
         ul.submenu

app/profile/profile.controller.js

@@ -13,6 +13,7 @@
     // set profile to the object that was resolved
     vm.profile = profile;
     vm.userHandle = userHandle;
+    vm.handleColor = ProfileService.getUserHandleColor(profile);
     vm.showBadges = showBadges;
     vm.closeDialog = closeDialog;
     vm.scrollTo = scrollTo;

app/profile/profile.controller.spec.js

@@ -24,6 +24,9 @@ describe('Profile Controller', function() {
       getUserSkills: function() {
         return $q.when({result: {content: mockSkills}});
       },
+      getUserHandleColor: function() {
+        return 'something';
+      },
       getRanks: ProfileService.getRanks
     };
     // mock user api

app/profile/subtrack/nav.jade

@@ -1,3 +1,14 @@
+.nav-top
+  .user
+    .avatar
+      img(ng-src="{{vm.profile.photoURL}}")
+
+    .handle(style="color: {{vm.handleColor}}") {{vm.profile.handle}}
+
+  .exit(ng-click="vm.closeDialog()")
+    img(src="/images/x-mark-gray.svg")
+
+hr
 .categoryNav
   .track(
     ng-repeat="track in vm.profile.tracks",

app/profile/subtrack/subtrack.controller.js

@@ -227,7 +227,7 @@
         template: 'profile/subtrack/nav.html',
         controller: 'ProfileCtrl',
         controllerAs: 'vm',
-        className: 'ngdialog-theme-default',
+        className: 'ngdialog-nav-theme',
         resolve: {
           userHandle: function() {
             return vm.userHandle;

app/services/nav.service.js

@@ -8,10 +8,8 @@
   function NavService(CONSTANTS, $state, UserService, TcAuthService) {
 
     var service = {
-
       selectedTopLevelItem: null,
       getParent: getParent
-
     };
 
     service.menuLinks = {
@@ -47,6 +45,7 @@
     ];
 
     service.hrefs = {};
+
     service.menuLinks.compete.forEach(function(link) {
       link.parent = 'compete';
       service.hrefs[link.href] = link;
@@ -68,8 +67,9 @@
     });
 
     function getParent(ref) {
-      if (ref.indexOf('.') >= 0)
+      if (ref.indexOf('.') >= 0) {
         ref = ref.slice(0, ref.indexOf('.'));
+      }
 
       if (ref.match(/profile/)) {
         if (TcAuthService.isAuthenticated() && $state.params && $state.params.userHandle == UserService.getUserIdentity().handle) {
@@ -82,9 +82,6 @@
       }
     }
 
-
     return service;
-
   }
-
 })();

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

@@ -16,6 +16,7 @@
 
     function activate() {
       vm.isSocialRegistrant = false;
+      vm.loading = true;
 
       vm.formProcessing = {
         accountInfoForm: false,
@@ -28,10 +29,12 @@
       UserService.getUserProfile({fields: 'credential'})
       .then(function(res) {
         vm.isSocialRegistrant = !res.credential.hasPassword;
+        vm.loading = false;
       })
       .catch(function(err) {
         $log.error("Error fetching user profile. Redirecting to edit profile.");
         $state.go('settings.profile');
+        vm.loading = false;
       });
 
       vm.countries = ISO3166.getAllCountryObjects();

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

@@ -11,7 +11,7 @@
       .form-label Email
       input.form-field.grey(name="email", value="{{vm.userData.email}}", disabled=true)
 
-      div(ng-hide="vm.isSocialRegistrant")
+      div(ng-if="!vm.isSocialRegistrant && !vm.loading")
         form(name="vm.newPasswordForm", role="form", ng-submit="vm.newPasswordForm.$valid && vm.submitNewPassword()", novalidate)
           .form-label Current password
 
@@ -45,7 +45,7 @@
             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.isSocialRegistrant")
+      div(ng-if="vm.isSocialRegistrant && !vm.loading")
         p You joined Topcoder by using an external account, so we don't have a password for you.
 
   form(name="vm.accountInfoForm", role="form", novalidate, autocomplete="off")

app/sitemap/sitemap.jade

@@ -1,58 +1,58 @@
 .sitemap-container
-	h1.page-header SITEMAP
-	
-	.sitemap-wrapper
-		section.sitemap-nav
-			h2.sitemap-header Compete
-			ul
-				li 
-					a(href="/challenges/design/active") Design Challenges
-				li 	
-					a(href="/challenges/develop/active") Development Challenges
-				li 
-					a(href="/challenges/data/active") Data Science Challenges
-				li 
-					a(href="//arena.topcoder.com/") Single Round Matches
-					
-					
-		section.sitemap-nav.hide-small
-			h2.sitemap-header Learn
-			ul
-				li 
-					a(href="/community/design") Design
-				li 	
-					a(href="/community/devlopment") Development
-				li 
-					a(href="/community/data-science") Data Science
-				li 
-					a(href="/community/competitive programming") Competitive Programming
-							
-		section.sitemap-nav
-			h2.sitemap-header Community
-			ul
-				li 
-					a(href="/community") Home
-				li 
-					a(href="/community/members") Members
-				li 	
-					a(href="/community/member-programs") Programs
-				li 
-					a(href="//apps.topcoder.com/forums") Forums
-				li 
-					a(href="/community/statistics") Statistics
-				li 
-					a(href="/community/events") Events
-				li 
-					a(href="/blog") Blog
-					
-		section.sitemap-nav.hide-small
-			h2.sitemap-header My Account
-			ul
-				li 
-					a(href="/my-dashboard") Dashboard
-				li 
-					a(href="/members/") My Profile
-				li 	
-					a(href="/settings/profile") Settings
-					
-					
+  h1.page-header SITE MAP
+  
+  .sitemap-wrapper
+    section.sitemap-nav
+      h2.sitemap-header Compete
+      ul
+        li 
+          a(href="/challenges/design/active") Design Challenges
+        li  
+          a(href="/challenges/develop/active") Development Challenges
+        li 
+          a(href="/challenges/data/active") Data Science Challenges
+        li 
+          a(href="//arena.topcoder.com/") Single Round Matches
+          
+          
+    section.sitemap-nav.hide-small
+      h2.sitemap-header Learn
+      ul
+        li 
+          a(href="/community/design") Design
+        li  
+          a(href="/community/devlopment") Development
+        li 
+          a(href="/community/data-science") Data Science
+        li 
+          a(href="/community/competitive programming") Competitive Programming
+              
+    section.sitemap-nav
+      h2.sitemap-header Community
+      ul
+        li 
+          a(href="/community") Home
+        li 
+          a(href="/community/members") Members
+        li  
+          a(href="/community/member-programs") Programs
+        li 
+          a(href="//apps.topcoder.com/forums") Forums
+        li 
+          a(href="/community/statistics") Statistics
+        li 
+          a(href="/community/events") Events
+        li 
+          a(href="/blog") Blog
+          
+    section.sitemap-nav.hide-small
+      h2.sitemap-header My Account
+      ul
+        li 
+          a(href="/my-dashboard") Dashboard
+        li 
+          a(href="/members/") My Profile
+        li  
+          a(href="/settings/profile") Settings
+          
+          

app/specs.html

@@ -253,8 +253,8 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="/app/blocks/exception/exception-handler.provider.spec.js"></script>
     <script src="/app/account/login/login.spec.js"></script>
     <script src="/app/account/logout/logout.controller.spec.js"></script>
-    <script src="/app/account/register/register.spec.js"></script>
     <script src="/app/account/reset-password/reset-password.spec.js"></script>
+    <script src="/app/account/register/register.spec.js"></script>
     <script src="/app/directives/badges/badge-tooltip.spec.js"></script>
     <script src="/app/directives/busy-button/busy-button.directive.spec.js"></script>
     <script src="/app/directives/challenge-tile/challenge-tile.spec.js"></script>

assets/css/directives/challenge-tile.scss

@@ -217,7 +217,7 @@ challenge-tile .challenge.tile-view {
       .winner-ribbon {
         position: absolute;
         z-index: 1;
-        bottom: -40px;
+        bottom: -33px;
         left: -2px;
         @include background-image-size(73px, 26px);
         background: url(/images/ico-winner-ribbon.svg);

assets/css/directives/design-challenge-user-place.scss

@@ -9,6 +9,10 @@ design-challenge-user-place {
     align-items: center;
 
     .place {
+      &.completed, &.passed, &.didnt {
+        margin-bottom: -23px;
+        margin-top: 40px;
+      }
       margin-bottom: 8px;
       margin-top: 8px;
       @include sofia-pro-regular;