diff options
Diffstat (limited to 'server/sonar-web/src/main/webapp')
7 files changed, 36 insertions, 53 deletions
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb index 2c76816b05c..a2976adc994 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb @@ -6,4 +6,9 @@ </div> </div> </div> +<script> + (function ($) { + $('html').addClass('dashboard-page'); + })(window.jQuery); +</script> </body></html> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb index d325ed11658..fd604b7694f 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb @@ -1,12 +1,8 @@ -<style> -#maintenance { - padding: 10px; - border: 2px solid #4B9FD5; - background-color: #CAE3F2; -} -</style> +<div id="maintenance"></div> + +<script> + require(['apps/maintenance/app'], function (App) { + App.start({ el: '#maintenance', setup: false }); + }); +</script> -<div id="maintenance"> -<h1>SonarQube is under maintenance. <a href="<%= ApplicationController.root_context -%>/">Please check back later.</a></h1> -<p>Whilst waiting, you might want to check <a href="http://redirect.sonarsource.com/doc/plugin-library.html">new plugins</a> to extend the current functionality. </p><p>If you are an administrator and have no idea why this message is showing, you should read the <a href="http://redirect.sonarsource.com/doc/upgrading.html">upgrade guide</a>.</p> -</div> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/db_uptodate.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/db_uptodate.html.erb index 63b3c49006d..cbe4b12434f 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/db_uptodate.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/db_uptodate.html.erb @@ -1,10 +1,9 @@ <meta http-equiv='refresh' content='5;url=<%= home_path -%>'> - -<div class="notice migration" style="padding:10px"> - <%= image_tag 'accept.png' -%> <b>Database is up-to-date.</b> - <br/> - <br/> +<h1 class="maintenance-title text-success">Database is up-to-date</h1> +<p class="maintenance-text"> You will be redirected shortly to SonarQube. - <br/> - <i>(if this does not happen, you can <a href="<%= home_path -%>">click here to be redirected</a>)</i> -</div>
\ No newline at end of file + <br> + <small class="text-muted"> + (if this does not happen, you can <a href="<%= home_path -%>">click here to be redirected</a>) + </small> +</p> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/dbdown.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/dbdown.html.erb index 29aa2c67f1b..1040fb71839 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/dbdown.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/dbdown.html.erb @@ -1,6 +1,5 @@ -<div class="alert alert-danger"> - <h3 class="text-danger">Fail to connect to database</h3> - <p>Database connection cannot be established. Please check database status and JDBC settings.</p> - <br/> +<h1 class="maintenance-title text-danger">Fail to connect to database</h1> +<p class="maintenance-text">Database connection cannot be established. Please check database status and JDBC settings.</p> +<div class="maintenance-spinner"> <%= button_to "Try again", { :action => "index" }, :method => :get %> </div> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/failed.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/failed.html.erb index 5c4306fc70d..36062451e19 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/failed.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/failed.html.erb @@ -1,7 +1,2 @@ -<div class="error migration" style="padding:10px"> - <%= image_tag 'exclamation.png' -%> - <b>Impossible to upgrade database</b> - <br/> - <br/> - <%= DatabaseMigrationManager.instance.message -%> -</div>
\ No newline at end of file +<h1 class="maintenance-title text-danger">Impossible to upgrade database</h1> +<p class="maintenance-text"><%= DatabaseMigrationManager.instance.message -%></p> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/form.html.erb index 69a41abb6ac..648083a90b1 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/form.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/form.html.erb @@ -1,14 +1,10 @@ <form action="<%= ApplicationController.root_context -%>/setup/setup_database" method="POST"> -<div class="admin migration"> - <h1 class="marginbottom10">Upgrade database</h1> - <br/> - <h3>Important</h3> - <ul> - <li>The database upgrade can take several minutes.</li> - <li>It is mandatory to <b>back up database</b> before upgrading.</li> - <li><b>Copy the directory /extensions</b> from previous version before upgrading.</li> - </ul> - <br/> - <input type="submit" value="Upgrade"> -</div> + <h1 class="maintenance-title">Upgrade database</h1> + <p class="maintenance-text">The database upgrade can take several minutes.</p> + <p class="maintenance-text">It is mandatory to <strong>back up database</strong> before upgrading.</p> + <p class="maintenance-text"><strong>Copy the directory /extensions</strong> from previous version before upgrading. + </p> + <div class="maintenance-spinner"> + <input type="submit" value="Upgrade"> + </div> </form> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb index 6d4bc3b7746..d10ba7c6513 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb @@ -1,13 +1,6 @@ <meta http-equiv='refresh' content='5;'> -<% - start_time = DatabaseMigrationManager.instance.migration_start_time -%> - -<div class="admin migration" style="padding:10px"> - <i class="spinner" style="vertical-align: text-bottom;"></i> - <b>SonarQube Database is currently upgrading.</b> - <br/> - <br/> - Started <%= distance_of_time_in_words(start_time, Time.now) -%> ago (<%= l start_time -%>) -</div> +<% start_time = DatabaseMigrationManager.instance.migration_start_time %> +<h1 class="maintenance-title">Database is currently upgrading</h1> +<p class="maintenance-text text-center">Started <%= distance_of_time_in_words(start_time, Time.now) -%> ago (<%= l start_time -%>)</p> +<div class="maintenance-spinner"><i class="spinner"></i></div> |