From ee2a7584861919027e927bf6a9fee3aea192f601 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Thu, 24 Nov 2016 10:07:02 +0100
Subject: [PATCH] SONAR-8382 move "About" link to the footer and help window

---
 .../src/main/js/main/nav/global/global-nav-menu.js    | 11 -----------
 .../main/js/main/nav/templates/nav-shortcuts-help.hbs |  3 ++-
 .../webapp/WEB-INF/app/views/layouts/_layout.html.erb |  3 ++-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/server/sonar-web/src/main/js/main/nav/global/global-nav-menu.js b/server/sonar-web/src/main/js/main/nav/global/global-nav-menu.js
index a002d6422fa..7d25c1b1a25 100644
--- a/server/sonar-web/src/main/js/main/nav/global/global-nav-menu.js
+++ b/server/sonar-web/src/main/js/main/nav/global/global-nav-menu.js
@@ -29,15 +29,6 @@ export default React.createClass({
     return { globalDashboards: [], globalPages: [] };
   },
 
-  renderAbout () {
-    const url = window.baseUrl + '/about';
-    return (
-        <li className={this.activeLink('/about')}>
-          <a href={url}>About</a>
-        </li>
-    );
-  },
-
   renderProjects () {
     const controller = window.SS.user ? '/projects/favorite' : '/projects';
     const url = window.baseUrl + controller;
@@ -127,14 +118,12 @@ export default React.createClass({
   render () {
     return (
         <ul className="nav navbar-nav">
-          {!window.SS.user && this.renderAbout()}
           {this.renderProjects()}
           {this.renderIssuesLink()}
           {this.renderRulesLink()}
           {this.renderProfilesLink()}
           {this.renderQualityGatesLink()}
           {this.renderAdministrationLink()}
-          {!!window.SS.user && this.renderAbout()}
           {this.renderMore()}
         </ul>
     );
diff --git a/server/sonar-web/src/main/js/main/nav/templates/nav-shortcuts-help.hbs b/server/sonar-web/src/main/js/main/nav/templates/nav-shortcuts-help.hbs
index 22356c886e4..ae4f9967233 100644
--- a/server/sonar-web/src/main/js/main/nav/templates/nav-shortcuts-help.hbs
+++ b/server/sonar-web/src/main/js/main/nav/templates/nav-shortcuts-help.hbs
@@ -8,7 +8,8 @@
     <a href="http://www.sonarqube.org/documentation" target="sonar_doc">Documentation</a> -
     <a href="http://www.sonarqube.org/support" target="support">Get Support</a> -
     <a href="http://redirect.sonarsource.com/doc/plugin-library.html" target="plugins">Plugins</a> -
-    <a href="{{link '/web_api'}}">Web API</a>
+    <a href="{{link '/web_api'}}">Web API</a> -
+    <a href="{{link '/about'}}">About</a>
   </div>
 
   <h2 class="spacer-top spacer-bottom">{{t 'shortcuts.modal_title'}}</h2>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index 1a2672d9fec..c723423852b 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -56,7 +56,8 @@
       <a href="http://www.sonarqube.org/documentation" target="sonar_doc">Documentation</a> -
       <a href="http://www.sonarqube.org/support" target="support">Get Support</a> -
       <a href="http://redirect.sonarsource.com/doc/plugin-library.html" target="plugins">Plugins</a> -
-      <a href="<%= ApplicationController.root_context -%>/web_api">Web API</a>
+      <a href="<%= ApplicationController.root_context -%>/web_api">Web API</a> -
+      <a href="<%= ApplicationController.root_context -%>/about">About</a>
     </div>
     <!--[if lte IE 8 ]><p class="spacer-top alert alert-danger">IE 8 is not supported. Some widgets may not be properly displayed. Please switch to a <a target="_blank" href="http://redirect.sonarsource.com/doc/requirements.html">supported version or another supported browser</a>.</p><!--<![endif]-->
   </div>
-- 
2.39.5