SONAR-4319 Update the footer displayed in the SonarQube web UI

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 85fec594ee2529db773e7c11a33edc350b30359a..091228a71682bdea3cbb5e917792ad4295e69177 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -308,6 +308,7 @@ layout.sonar.slogan=Embrace Quality
 layout.powered_by=Powered by
 layout.documentation=Documentation
 layout.ask_a_questions=Ask a question
+layout.get_support=Get Support
 layout.plugins=Plugins
 layout.evaluation=Embedded database should be used for evaluation purpose only
 layout.ie6_warn=Your web browser is outdated. This website may not display correctly.

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index 86551503673cee73855ad1b57bfcdee9c62c6878..504cc9be59612ee843b0f283a1406b0c8ddac8af 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -192,14 +192,18 @@
       <% end %>
     <% end %>
     <div id="ftlinks">
-      <%= message('layout.powered_by') -%> <a href="http://www.sonarsource.com" target="SonarSource">SonarSource</a> - Open Source
-      <a href="http://www.sonarsource.org/documentation/license/" target="license">LGPL</a> - v.<%= sonar_version -%> -
-      <a href="http://sonar-plugins.codehaus.org" target="plugins"><%= message('layout.plugins') -%></a> -
-      <a href="http://sonar.codehaus.org/documentation" target="sonar_doc"><%= message('layout.documentation') -%></a> -
-      <a href="http://sonar.codehaus.org/support/" target="support"><%= message('layout.ask_a_questions') -%></a>
-      <% unless DatabaseVersion.production? %>
-        <br/><span class="yellowHighlight" id="evaluation_warning"><%= message('layout.evaluation') -%></span>
-      <% end %>
+      <div>
+        SonarQube&trade; technology <%= message('layout.powered_by') -%> <a href="http://www.sonarsource.com" target="SonarSource SA">SonarSource SA</a>
+      </div>
+      <div>
+        Version <%= sonar_version -%> -
+        <a href="http://sonar.codehaus.org/documentation" target="sonar_doc"><%= message('layout.documentation') -%></a> -
+        <a href="http://sonar.codehaus.org/support/" target="support"><%= message('layout.get_support') -%></a> -
+        <a href="http://sonar-plugins.codehaus.org" target="plugins"><%= message('layout.plugins') -%></a>
+        <% unless DatabaseVersion.production? %>
+          <br/><span class="yellowHighlight" id="evaluation_warning"><%= message('layout.evaluation') -%></span>
+        <% end %>
+      </div>
       <!--[if lte IE 6]><br/><span class="ie6-warn"><%= message('layout.ie6_warn') -%></span><![endif]-->
     </div>
   </div>