Merge pull request #5408 from guardian/profile-menu

bring identity header into line with common header
guardian · Aug 6, 2014 · fe2b242 · fe2b242
2 parents 3407957 + 741affd
commit fe2b242
Showing 1 changed file with 10 additions and 15 deletions.
diff --git a/identity/app/views/fragments/identityHeader.scala.html b/identity/app/views/fragments/identityHeader.scala.html
@@ -6,18 +6,17 @@
         <div class="l-header-pre__inner gs-container u-cf">
             <div class="top-bar">
                 @if(IdentityProfileNavigationSwitch.isSwitchedOn) {
-                    <div class="top-bar__item">
-                        <div class="js-profile-nav">
-                            <a href="@Configuration.id.url/signin" data-link-name="User profile" data-toggle="nav-popup--profile"
-                               class="top-bar__item--action">
-                                <span class="control__icon-wrapper">
-                                    <span class="control__icon">
-                                        <i class="i i-profile-white-36"></i>
-                                    </span>
+                    <div class="top-bar__item top-bar__item--profile has-nav-popup top-bar__item--has-control js-profile-nav">
+                        <a href="@Configuration.id.url/signin" data-link-name="User profile" data-toggle="nav-popup--profile"
+                           class="top-bar__item--action nav-popup__toggle">
+                            <span class="control__icon-wrapper">
+                                <span class="control__icon">
+                                    <i class="i i-profile-white-36"></i>
                                 </span>
-                                <span class="js-profile-info control__info">Sign in</span>
-                            </a>
-                        </div>
+                            </span>
+                            <span class="js-profile-info control__info">Sign in</span>
+                        </a>
+                        <ul class="nav-popup nav-popup--profile js-profile-nav-popup" data-link-name="Sub Sections"></ul>
                     </div>
                 }
             </div>
@@ -31,10 +30,6 @@
                 <i class="i i-guardian-logo-160-header mobile-only"></i>
                 <i class="i i-guardian-logo-big hide-on-mobile"></i>
             </a>
-
-            @if(IdentityProfileNavigationSwitch.isSwitchedOn) {
-                <div class="nav-popup nav-popup--profile js-profile-nav-popup is-off"></div>
-            }
         </div>
     </div>
 </header>