From e77974ff71fd0b8d1e8ab1e3d2f2a1d6f5ae8a11 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 2 Feb 2015 09:55:09 +0100
Subject: [PATCH] SONAR-6041 apply feedback

---
 .../src/main/hbs/nav/nav-global-navbar.hbs    | 13 ++++++-------
 .../sonar-web/src/main/hbs/nav/nav-search.hbs |  4 +++-
 server/sonar-web/src/main/less/navbar.less    | 19 +++++++++++++------
 .../resources/org/sonar/l10n/core.properties  |  2 ++
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs b/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs
index 19e3e1119a8..8692b0433be 100644
--- a/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs
+++ b/server/sonar-web/src/main/hbs/nav/nav-global-navbar.hbs
@@ -37,11 +37,16 @@
     <li {{#isActiveLink '/quality_gates'}}class="active"{{/isActiveLink}}>
       <a href="{{link '/quality_gates'}}">{{t 'quality_gates.page'}}</a>
     </li>
+    {{#if isUserAdmin}}
+      <li {{#isActiveLink '/settings'}}class="active"{{/isActiveLink}}>
+        <a class="navbar-admin-link" href="{{link '/settings'}}">{{t 'layout.settings'}}</a>
+      </li>
+    {{/if}}
     <li class="dropdown">
       <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{t 'more'}}&nbsp;<i class="icon-dropdown"></i></a>
       <ul class="dropdown-menu">
         <li>
-          <a href="{{link '/comparison'}}">{{t 'comparison.page'}}</a>
+          <a href="{{link '/comparison'}}">{{t 'comparison_global.page'}}</a>
         </li>
         <li>
           <a href="{{link '/dependencies'}}">{{t 'dependencies.page'}}</a>
@@ -51,12 +56,6 @@
             <a href="{{link url}}">{{name}}</a>
           </li>
         {{/each}}
-        {{#if isUserAdmin}}
-          <li class="divider"></li>
-          <li>
-            <a href="{{link '/settings'}}">{{t 'layout.settings'}}</a>
-          </li>
-        {{/if}}
       </ul>
     </li>
   </ul>
diff --git a/server/sonar-web/src/main/hbs/nav/nav-search.hbs b/server/sonar-web/src/main/hbs/nav/nav-search.hbs
index ed298aef314..c566d3832d9 100644
--- a/server/sonar-web/src/main/hbs/nav/nav-search.hbs
+++ b/server/sonar-web/src/main/hbs/nav/nav-search.hbs
@@ -1,6 +1,8 @@
 <i class="navbar-search-icon icon-search"></i>
 
 <input class="navbar-search-input js-search-input" type="search" name="q" placeholder="{{t 'search_verb'}}"
-       autocomplete="off">
+       maxlength="30" autocomplete="off">
 
 <div class="js-search-results"></div>
+
+<div class="subtitle navbar-search-subtitle">{{t 'search.shortcut'}}</div>
diff --git a/server/sonar-web/src/main/less/navbar.less b/server/sonar-web/src/main/less/navbar.less
index 19361496061..87234f80161 100644
--- a/server/sonar-web/src/main/less/navbar.less
+++ b/server/sonar-web/src/main/less/navbar.less
@@ -124,6 +124,12 @@
   text-align: right;
 }
 
+.navbar-search-subtitle {
+  position: absolute;
+  top: 5px;
+  right: 40px;
+}
+
 
 .navbar-global {
   background-color: @navbarGlobalBackground;
@@ -153,12 +159,18 @@
   .navbar-nav > li > a:focus,
   .navbar-nav > .active > a,
   .navbar-nav > .dropdown.open > a {
-    background-color: @darkBlue;
+    background-color: @blue;
   }
 
   .navbar-search-dropdown {
     background-color: @blue !important;
   }
+
+  .navbar-admin-link:hover,
+  .navbar-admin-link:focus,
+  .active > .navbar-admin-link {
+    background-color: @orange !important;
+  }
 }
 
 
@@ -182,8 +194,3 @@
   color: @secondFontColor;
   font-size: @smallFontSize;
 }
-
-
-.navbar-settings {
-  .horizontal-gradient(@navbarGlobalBackground, #7b1b1b);
-}
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 410557c39c3..fb4abbbb25d 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -524,6 +524,7 @@ issues_drilldown.page=Issues Drilldown
 source.page=Source
 timemachine.page=Time Machine
 comparison.page=Compare
+comparison_global.page=Compare Projects
 design.page=Design
 libraries.page=Libraries
 
@@ -1027,6 +1028,7 @@ dashboard.TimeMachine.name=Time Machine
 #------------------------------------------------------------------------------
 search.results=results
 search.duration=({0} seconds)
+search.shortcut=Press S to quickly open search bar
 
 
 #------------------------------------------------------------------------------
-- 
2.39.5