SONAR-2840 do not display JDBC settings in the database upgrade form

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.rhtml b/sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.rhtml
index cfb2a3049e97a4948f173f1f3a53e39e56b60596..fe3786216d4e7340904d5f5f2e8fca7d9f075926 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.rhtml
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.rhtml
@@ -1,21 +1,6 @@
-<h1>Database down.</h1>
+<h1>Fail to connect to database</h1>
 <div class="error">
-  Database connection cannot be established. Check that you have a database running
-  and configured for the following settings :
-  <table>
-  <tr>
-    <td>URL: &nbsp;&nbsp;</td>
-    <td><%= configuration('sonar.jdbc.url', '') -%>
-  </tr>
-  <tr>
-    <td>Login: &nbsp;&nbsp;</td>
-    <td><%= configuration('sonar.jdbc.username', '') -%>
-  </tr>
-  <tr>
-    <td>Driver: &nbsp;&nbsp;</td>
-    <td><%= configuration('sonar.jdbc.driverClassName', '') -%>
-  </tr>
-</table>
+  Database connection cannot be established. Please check database status and JDBC settings.
   <br/><br/>
 <%= button_to "Try again", { :action => "index" }, :method => :get %>
 </div>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/form.rhtml b/sonar-server/src/main/webapp/WEB-INF/app/views/setup/form.rhtml
index c09154ca647a294ac09e385d752bdfff48e8753a..3e765f936a8a6f1fe7985a9ade9af5fa42ac323b 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/form.rhtml
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/setup/form.rhtml
@@ -16,31 +16,14 @@
 
 <div id="setupform">
 <div id="setupformlogo"><a href="http://www.sonarsource.org"><%= image_tag('sonar.png', :class => 'png') -%></a></div>
-<h1 class="marginbottom10">Upgrade database.</h1>
-<p>
-<h3>Connection</h3>
-<table>
-  <tr>
-    <td width="1%" nowrap>URL: </td>
-    <td><%= configuration('sonar.jdbc.url', '') -%>
-  </tr>
-  <tr>
-    <td width="1%" nowrap>Login: </td>
-    <td><%= configuration('sonar.jdbc.username', '') -%>
-  </tr>
-  <tr>
-    <td width="1%" nowrap>Driver: </td>
-    <td><%= configuration('sonar.jdbc.driverClassName', '') -%>
-  </tr>
-</table>
-</p>
+<h1 class="marginbottom10">Upgrade database</h1>
 <br/>
-<h3>Warnings</h3>
+<h3>Important</h3>
 <p>
   <ul>
     <li><b>Do not refresh this page</b> until the upgrade is finished. It can take several minutes.</li>
     <li>It is recommended to <b>backup database</b> before upgrading.</li>
-    <li><b>Copy the directory /extensions</b> from previous version of Sonar before upgrading.</li>
+    <li><b>Copy the directory /extensions</b> from previous version before upgrading.</li>
   </ul>
 </p>
   <br/>