From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Tue, 12 Jun 2018 14:15:47 +0000 (+0200)
Subject: SONARCLOUD-67 Add new links in SonarCloud footer
X-Git-Tag: 7.5~959
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ae2f4fa2ea60f8692c7ef234352842f314d3b3bb;p=sonarqube.git

SONARCLOUD-67 Add new links in SonarCloud footer
---

diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooterSonarCloud.tsx b/server/sonar-web/src/main/js/app/components/GlobalFooterSonarCloud.tsx
index ad0c7d3b84d..44dd558676a 100644
--- a/server/sonar-web/src/main/js/app/components/GlobalFooterSonarCloud.tsx
+++ b/server/sonar-web/src/main/js/app/components/GlobalFooterSonarCloud.tsx
@@ -19,6 +19,7 @@
  */
 import * as React from 'react';
 import * as getYear from 'date-fns/get_year';
+import { Link } from 'react-router';
 import { translate } from '../../helpers/l10n';
 
 export default function GlobalFooterSonarCloud() {
@@ -34,22 +35,28 @@ export default function GlobalFooterSonarCloud() {
 
       <ul className="page-footer-menu">
         <li className="page-footer-menu-item">
-          <a href="https://about.sonarcloud.io/news/">{translate('footer.news')}</a>
+          <a href="https://blog.sonarsource.com/product/SonarCloud">{translate('footer.news')}</a>
         </li>
         <li className="page-footer-menu-item">
-          <a href="https://about.sonarcloud.io/terms.pdf">{translate('footer.terms')}</a>
+          <a href="https://twitter.com/sonarcloud">{translate('footer.twitter')}</a>
         </li>
         <li className="page-footer-menu-item">
-          <a href="https://twitter.com/sonarcloud">{translate('footer.twitter')}</a>
+          <Link to="/terms.pdf">{translate('footer.terms')}</Link>
+        </li>
+        <li className="page-footer-menu-item">
+          <Link to="/privacy">{translate('footer.privacy')}</Link>
+        </li>
+        <li className="page-footer-menu-item">
+          <a href="https://community.sonarsource.com/c/help/sc">{translate('footer.help')}</a>
         </li>
         <li className="page-footer-menu-item">
-          <a href="https://about.sonarcloud.io/get-started/">{translate('footer.get_started')}</a>
+          <Link to="/contact">{translate('footer.contact_us')}</Link>
         </li>
         <li className="page-footer-menu-item">
-          <a href="https://about.sonarcloud.io/contact/">{translate('footer.help')}</a>
+          <a href="https://sonarcloud.statuspage.io/">{translate('footer.status')}</a>
         </li>
         <li className="page-footer-menu-item">
-          <a href="https://about.sonarcloud.io/">{translate('footer.about')}</a>
+          <Link to="/about">{translate('footer.about')}</Link>
         </li>
       </ul>
     </div>
diff --git a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterSonarCloud-test.tsx.snap b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterSonarCloud-test.tsx.snap
index 71c3ddf2c75..4593fe94ca2 100644
--- a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterSonarCloud-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterSonarCloud-test.tsx.snap
@@ -22,7 +22,7 @@ exports[`should render correctly 1`] = `
       className="page-footer-menu-item"
     >
       <a
-        href="https://about.sonarcloud.io/news/"
+        href="https://blog.sonarsource.com/product/SonarCloud"
       >
         footer.news
       </a>
@@ -31,47 +31,73 @@ exports[`should render correctly 1`] = `
       className="page-footer-menu-item"
     >
       <a
-        href="https://about.sonarcloud.io/terms.pdf"
+        href="https://twitter.com/sonarcloud"
       >
-        footer.terms
+        footer.twitter
       </a>
     </li>
     <li
       className="page-footer-menu-item"
     >
-      <a
-        href="https://twitter.com/sonarcloud"
+      <Link
+        onlyActiveOnIndex={false}
+        style={Object {}}
+        to="/terms.pdf"
       >
-        footer.twitter
-      </a>
+        footer.terms
+      </Link>
     </li>
     <li
       className="page-footer-menu-item"
     >
-      <a
-        href="https://about.sonarcloud.io/get-started/"
+      <Link
+        onlyActiveOnIndex={false}
+        style={Object {}}
+        to="/privacy"
       >
-        footer.get_started
-      </a>
+        footer.privacy
+      </Link>
     </li>
     <li
       className="page-footer-menu-item"
     >
       <a
-        href="https://about.sonarcloud.io/contact/"
+        href="https://community.sonarsource.com/c/help/sc"
       >
         footer.help
       </a>
     </li>
+    <li
+      className="page-footer-menu-item"
+    >
+      <Link
+        onlyActiveOnIndex={false}
+        style={Object {}}
+        to="/contact"
+      >
+        footer.contact_us
+      </Link>
+    </li>
     <li
       className="page-footer-menu-item"
     >
       <a
-        href="https://about.sonarcloud.io/"
+        href="https://sonarcloud.statuspage.io/"
       >
-        footer.about
+        footer.status
       </a>
     </li>
+    <li
+      className="page-footer-menu-item"
+    >
+      <Link
+        onlyActiveOnIndex={false}
+        style={Object {}}
+        to="/about"
+      >
+        footer.about
+      </Link>
+    </li>
   </ul>
 </div>
 `;
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 9e09559006d..ac5f5a477ce 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2567,15 +2567,17 @@ embed_docs.suggestion=Suggestions For This Page
 #------------------------------------------------------------------------------
 footer.about=About
 footer.community=Community
+footer.contact_us=Contact us
 footer.documentation=Documentation
-footer.get_started=Get Started
 footer.help=Help
 footer.license=LGPL v3
 footer.news=News
 footer.plugins=Plugins
+footer.privacy=Privacy
 footer.production_database_explanation=The embedded database will not scale, it will not support upgrading to newer versions of {instance}, and there is no support for migrating your data out of it into a different database engine.
 footer.production_database_warning=Embedded database should be used for evaluation purpose only
 footer.support=Get Support
+footer.status=Status
 footer.terms=Terms
 footer.twitter=Twitter
 footer.version_x=Version {0}