From c86a2c24bda8bf1dca57723c5eb52bb82dc09c21 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Thu, 12 Mar 2015 17:23:16 +0100
Subject: fix ui issues with warnings

---
 .../WEB-INF/app/views/dashboard/empty.html.erb     |  9 +++--
 .../WEB-INF/app/views/dashboard2/empty.html.erb    |  8 +++--
 .../WEB-INF/app/views/measures/_display.html.erb   |  2 +-
 .../app/views/project/_delete_form.html.erb        |  5 +--
 .../WEB-INF/app/views/project/deletion.html.erb    |  8 ++---
 .../WEB-INF/app/views/project/history.html.erb     |  2 +-
 .../webapp/WEB-INF/app/views/setup/dbdown.html.erb | 11 +++---
 .../app/views/updatecenter/_operations.html.erb    | 39 +++++++++++-----------
 8 files changed, 41 insertions(+), 43 deletions(-)

(limited to 'server/sonar-web')

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/empty.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/empty.html.erb
index a297b76e3f3..0ba745395cf 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/empty.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/empty.html.erb
@@ -1,3 +1,6 @@
-<% if @resource and !@snapshot %>
-<p class="warning marginbottom10"><%= message('provisioning.no_analysis') -%></p>
-<% end %>
+<div class="page">
+  <% if @resource and !@snapshot %>
+    <p class="alert alert-warning"><%= message('provisioning.no_analysis') -%></p>
+  <% end %>
+</div>
+
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/empty.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/empty.html.erb
index a297b76e3f3..7a4ace5fc08 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/empty.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/empty.html.erb
@@ -1,3 +1,5 @@
-<% if @resource and !@snapshot %>
-<p class="warning marginbottom10"><%= message('provisioning.no_analysis') -%></p>
-<% end %>
+<div class="page">
+  <% if @resource and !@snapshot %>
+    <p class="alert alert-warning"><%= message('provisioning.no_analysis') -%></p>
+  <% end %>
+</div>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display.html.erb
index e919a90a90e..22f30d97b77 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display.html.erb
@@ -1,6 +1,6 @@
 <% if !filter.errors.empty? %>
   <% filter.errors.full_messages.each do |message| %>
-    <div class="warning"><%= h message %></div>
+    <div class="alert alert-danger"><%= h message %></div>
   <% end %>
 <% elsif filter.rows && filter.display %>
   <%= render :partial => 'measures/display_list', :locals => {:filter => filter, :edit_mode => edit_mode, :widget_id => widget_id} -%>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/_delete_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/_delete_form.html.erb
index 6bde15752dc..79c73cd6f82 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/_delete_form.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/_delete_form.html.erb
@@ -5,10 +5,7 @@
       <h2><%= message('project_deletion.page', :params => resource_qualifier) -%></h2>
     </div>
     <div class="modal-body">
-      <div class="info">
-        <img src="<%= ApplicationController.root_context -%>/images/information.png" style="vertical-align: text-bottom"/>
-        <%= message('project_deletion.delete_resource_confirmation', :params => resource_qualifier) %>
-      </div>
+      <%= message('project_deletion.delete_resource_confirmation', :params => resource_qualifier) %>
     </div>
     <div class="modal-foot">
       <span id="delete-project-loading-image" class="loading-image hidden"><%= image_tag 'loading.gif' %></span>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb
index 64371eee0f2..73bdb62f6be 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb
@@ -10,11 +10,9 @@
     </header>
 
     <div class="yui-g widget" id="widget_delete_project">
-      <div class="warning">
-        <%= message('project_deletion.operation_cannot_be_undone') -%><br/>
-        <a id="delete_resource" class="open-modal button button-red"
-           href="<%= ApplicationController.root_context -%>/project/delete_form/<%= h(@project.id) -%>"><%= delete_resource_message -%></a>
-      </div>
+      <div class="alert alert-warning spacer-bottom"><%= message('project_deletion.operation_cannot_be_undone') -%></div>
+      <a id="delete_resource" class="open-modal button button-red"
+         href="<%= ApplicationController.root_context -%>/project/delete_form/<%= h(@project.id) -%>"><%= delete_resource_message -%></a>
     </div>
   <% end %>
 </div>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/history.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/history.html.erb
index 4863996035f..aa90c0c4436 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/history.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/history.html.erb
@@ -6,7 +6,7 @@
 
   <% if !@snapshot %>
 
-  <p class="warning"><%= message('provisioning.no_analysis') -%></p>
+  <p class="alert alert-warning"><%= message('provisioning.no_analysis') -%></p>
 
   <% elsif @snapshot.root? %>
 
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 c98fee7d30b..29aa2c67f1b 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,9 +1,6 @@
-<div class="warning migration" style="padding:10px">
-  <%= image_tag 'warning.png' -%>
-  <b>Fail to connect to database</b>
-  <br/>
-  <br/>
-  Database connection cannot be established. Please check database status and JDBC settings.
+<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/>
   <%= button_to "Try again", { :action => "index" }, :method => :get %>
-</div>
\ No newline at end of file
+</div>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb
index 4e3bb5de928..fe786c620ef 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb
@@ -1,5 +1,5 @@
 <script type="text/javascript">
-  function showPlugin(key) {
+  function showPlugin (key) {
     if ($j('#detail-' + key).is(':visible')) {
       $j('#detail-' + key).hide();
     } else {
@@ -10,25 +10,26 @@
 </script>
 
 <% if @uninstalls.size > 0 %>
-<form action="<%= ApplicationController.root_context -%>/updatecenter/cancel_uninstalls" method="post" class="warning">
-<p>SonarQube needs to be restarted in order to uninstall the following plugins: <ul>
-  <% @uninstalls.each do |uninstall| %>
-    <li><%= uninstall -%></li>
-  <% end %>
-  </ul>
-  <input type="submit" value="Cancel uninstalls" id="cancel-uninstall"/>
-</p>
-</form>
+  <form action="<%= ApplicationController.root_context -%>/updatecenter/cancel_uninstalls" method="post" class="warning">
+    <p>SonarQube needs to be restarted in order to uninstall the following plugins:</p>
+    <ul class="list-styled spacer-top spacer-bottom">
+      <% @uninstalls.each do |uninstall| %>
+        <li><%= uninstall -%></li>
+      <% end %>
+    </ul>
+    <input type="submit" value="Cancel uninstalls" id="cancel-uninstall"/>
+  </form>
 <% end %>
 
 <% if @downloads.size > 0 %>
-<form action="<%= ApplicationController.root_context -%>/updatecenter/cancel_downloads" method="post" class="warning">
-<p>SonarQube needs to be restarted in order to install the following plugins: <ul>
-  <% @downloads.each do |download| %>
-    <li><%= download -%></li>
-  <% end %>
-  </ul>
-  <input type="submit" value="Cancel pending installations" id="cancel-pending-installations"/>
-</p>
-</form>
+  <form action="<%= ApplicationController.root_context -%>/updatecenter/cancel_downloads" method="post" class="warning">
+    <p>SonarQube needs to be restarted in order to install the following plugins:
+    <ul>
+      <% @downloads.each do |download| %>
+        <li><%= download -%></li>
+      <% end %>
+    </ul>
+    <input type="submit" value="Cancel pending installations" id="cancel-pending-installations"/>
+    </p>
+  </form>
 <% end %>
-- 
cgit v1.2.3