From cafc96fe283213bc9fe143cc8574f1e10d8c082b Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Fri, 3 Apr 2015 17:56:08 -0400
Subject: [PATCH] Switch the "Account Settings" link to the new user view
 page's settings tab

---
 static/directives/header-bar.html     | 5 ++++-
 static/js/directives/ui/header-bar.js | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/static/directives/header-bar.html b/static/directives/header-bar.html
index 3fb263d4b..051f51c88 100644
--- a/static/directives/header-bar.html
+++ b/static/directives/header-bar.html
@@ -55,7 +55,10 @@
       </a>
       <ul class="dropdown-menu">
         <li>
-          <a href="/user/" target="{{ appLinkTarget() }}">
+          <a href="/user/{{ user.username }}?tab=settings" target="{{ appLinkTarget() }}" ng-if="isNewLayout">
+            Account Settings
+          </a>
+          <a href="/user/" target="{{ appLinkTarget() }}" ng-if="!isNewLayout">
             Account Settings
           </a>
         </li>
diff --git a/static/js/directives/ui/header-bar.js b/static/js/directives/ui/header-bar.js
index e370b9432..535f8f2c1 100644
--- a/static/js/directives/ui/header-bar.js
+++ b/static/js/directives/ui/header-bar.js
@@ -18,6 +18,8 @@ angular.module('quay').directive('headerBar', function () {
       // Monitor any user changes and place the current user into the scope.
       UserService.updateUserIn($scope);
 
+      $scope.isNewLayout = Config.isNewLayout();
+
       $scope.signout = function() {
         ApiService.logout().then(function() {
           UserService.load();