SONAR-10807 Update support link to the new community forum

diff --git a/server/sonar-web/public/images/embed-doc/google-group-icon.svg b/server/sonar-web/public/images/embed-doc/google-group-icon.svg
deleted file mode 100644 (file)
index fd581b7..0000000
--- a/server/sonar-web/public/images/embed-doc/google-group-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"><path d="M.563 0L.562 10.125H9l3.937 3.375V0H.562zm6.188 2.25a1.13 1.13 0 0 1 1.125 1.125A1.13 1.13 0 0 1 6.751 4.5a1.13 1.13 0 0 1-1.125-1.125A1.13 1.13 0 0 1 6.751 2.25zM3.938 6.917v.396H2.251v-.247c0-.208.395-.808 1.406-.808.18 0 .337.024.477.057-.127.22-.196.433-.196.602zm-.281-1.292a.848.848 0 0 1-.844-.844c0-.463.381-.844.844-.844.463 0 .844.381.844.844a.848.848 0 0 1-.844.844zm5.344 1.687h-4.5v-.395c0-.325.633-1.292 2.25-1.292s2.25.958 2.25 1.292v.395zm0-2.531c0-.463.381-.844.844-.844.463 0 .843.381.843.844 0 .463-.38.844-.843.844a.848.848 0 0 1-.844-.844zm2.25 2.531H9.563v-.395c0-.169-.068-.382-.195-.602.14-.033.297-.057.477-.057 1.011 0 1.406.598 1.406.809v.245z" fill="#4169e1" fill-rule="nonzero"/></svg>
\ No newline at end of file

diff --git a/server/sonar-web/public/images/embed-doc/so-icon.svg b/server/sonar-web/public/images/embed-doc/so-icon.svg
deleted file mode 100644 (file)
index 12ba4ac..0000000
--- a/server/sonar-web/public/images/embed-doc/so-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"><g fill-rule="nonzero"><path d="M10.686 12.3V8.683h1.201V13.5H1.052V8.683h1.201V12.3h8.433z" fill="#bcbbbb"/><path d="M3.578 8.34L9.47 9.572l.25-1.185-5.893-1.232-.249 1.185zm.779-2.806l5.456 2.541.499-1.091-5.456-2.557-.499 1.107zm1.512-2.681l4.63 3.85.764-.92-4.63-3.85-.764.92zM8.862 0l-.966.717 3.585 4.833.967-.717L8.862 0zM3.453 11.084H9.47V9.883H3.453v1.201z" fill="#f48023"/></g></svg>
\ No newline at end of file

diff --git a/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopup.tsx b/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopup.tsx
index 9beafb064fb85d0c0e084a6b78dfea8a14e08222..ea95ca18dbff3dac5c9203a4f3d4a49da444a1bc 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopup.tsx
+++ b/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopup.tsx
@@ -86,13 +86,10 @@ export default class EmbedDocsPopup extends React.PureComponent<Props> {
     return (
       <React.Fragment>
         <li className="divider" />
-        {this.renderTitle(translate('embed_docs.get_support'))}
         <li>
-          {this.renderIconLink(
-            'https://about.sonarcloud.io/contact/',
-            'sc-icon.svg',
-            translate('embed_docs.contact_form')
-          )}
+          <a href="https://community.sonarsource.com/" rel="noopener noreferrer" target="_blank">
+            {translate('embed_docs.get_help')}
+          </a>
         </li>
         <li className="divider" />
         {this.renderTitle(translate('embed_docs.stay_connected'))}
@@ -117,20 +114,10 @@ export default class EmbedDocsPopup extends React.PureComponent<Props> {
           </li>
         )}
         <li className="divider" />
-        {this.renderTitle(translate('embed_docs.get_support'))}
         <li>
-          {this.renderIconLink(
-            'https://groups.google.com/forum/#!forum/sonarqube',
-            'google-group-icon.svg',
-            'Google Groups'
-          )}
-        </li>
-        <li>
-          {this.renderIconLink(
-            'http://stackoverflow.com/questions/tagged/sonarqube',
-            'so-icon.svg',
-            'Stack Overflow'
-          )}
+          <a href="https://community.sonarsource.com/" rel="noopener noreferrer" target="_blank">
+            {translate('embed_docs.get_help')}
+          </a>
         </li>
         <li className="divider" />
         {this.renderTitle(translate('embed_docs.stay_connected'))}

diff --git a/server/sonar-web/src/main/js/app/components/embed-docs-modal/__tests__/__snapshots__/EmbedDocsPopup-test.tsx.snap b/server/sonar-web/src/main/js/app/components/embed-docs-modal/__tests__/__snapshots__/EmbedDocsPopup-test.tsx.snap
index 0984724bfcdb3cec60257546e52cf5ee903f4e0b..5f4d22a7aa1f2f4f8c09b9b71dfd76584fb57080 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/embed-docs-modal/__tests__/__snapshots__/EmbedDocsPopup-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/embed-docs-modal/__tests__/__snapshots__/EmbedDocsPopup-test.tsx.snap
@@ -71,41 +71,13 @@ exports[`should display suggestion links 1`] = `
       <li
         className="divider"
       />
-      <li
-        className="menu-header"
-      >
-        embed_docs.get_support
-      </li>
       <li>
         <a
-          href="https://groups.google.com/forum/#!forum/sonarqube"
+          href="https://community.sonarsource.com/"
           rel="noopener noreferrer"
           target="_blank"
         >
-          <img
-            alt="Google Groups"
-            className="spacer-right"
-            height="18"
-            src="/images/embed-doc/google-group-icon.svg"
-            width="18"
-          />
-          Google Groups
-        </a>
-      </li>
-      <li>
-        <a
-          href="http://stackoverflow.com/questions/tagged/sonarqube"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          <img
-            alt="Stack Overflow"
-            className="spacer-right"
-            height="18"
-            src="/images/embed-doc/so-icon.svg"
-            width="18"
-          />
-          Stack Overflow
+          embed_docs.get_help
         </a>
       </li>
       <li

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 36c1cb0444f6cc5b1d6fd874f25e564746a0aea6..7913933313a3cc389e5e0cc6fcbdfd45ad43cc40 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2555,9 +2555,8 @@ organization.change_visibility_form.submit=Change Default Visibility
 #------------------------------------------------------------------------------
 embed_docs.suggestion=Suggestions For This Page
 embed_docs.documentation=Documentation
-embed_docs.get_support=Get Support
+embed_docs.get_help=Get Help
 embed_docs.stay_connected=Stay Connected
-embed_docs.contact_form=Contact Form
 embed_docs.analyze_new_project=Analyze New Project
 
 #------------------------------------------------------------------------------