From: simonbrandhof <simon.brandhof@gmail.com>
Date: Thu, 30 Sep 2010 14:04:18 +0000 (+0000)
Subject: Add some warnings to the database upgrade form
X-Git-Tag: 2.6~903
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e833f6263a3d90d5dcf012df73b486b39c198be9;p=sonarqube.git

Add some warnings to the database upgrade form
---

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 3c42abcf46d..c09154ca647 100644
--- 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,11 +16,9 @@
 
 <div id="setupform">
 <div id="setupformlogo"><a href="http://www.sonarsource.org"><%= image_tag('sonar.png', :class => 'png') -%></a></div>
-<h1>Upgrade database.</h1>
-<p>It is recommended to <b>backup database</b> before.</p>
-<br/>
+<h1 class="marginbottom10">Upgrade database.</h1>
 <p>
-<h3>Database connection:</h3>
+<h3>Connection</h3>
 <table>
   <tr>
     <td width="1%" nowrap>URL: </td>
@@ -37,10 +35,16 @@
 </table>
 </p>
 <br/>
+<h3>Warnings</h3>
 <p>
-  WARNING : DO NOT REFRESH THIS PAGE UNTIL THE SETUP IS FINISHED. It can take several minutes.
+  <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>
+  </ul>
+</p>
+  <br/>
   <form id="submit_form" method="POST" action="<%= url_for :action => 'setup_database' -%>" onsubmit="Form.disable('submit_form');">
-    <input type="submit" value="Setup database" id="submit_setup" />
+    <input type="submit" value="Upgrade" id="submit_setup" />
   </form>
-</p>
 </div>
\ No newline at end of file