From 24f87c82aa75bca9f0e9e42a15794398edf6087e Mon Sep 17 00:00:00 2001
From: simonbrandhof <simon.brandhof@gmail.com>
Date: Wed, 3 Nov 2010 10:42:15 +0000
Subject: [PATCH] SONAR-1643 configure widgets: fix display of the section "new
 widgets"

---
 .../views/dashboard/_widget_definition.html.erb |  6 ++++--
 .../app/views/dashboard/configure.html.erb      | 11 ++++++++---
 .../src/main/webapp/stylesheets/dashboard.css   | 17 +++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definition.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definition.html.erb
index d8b6c9c90d0..880d5a1ca99 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definition.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definition.html.erb
@@ -1,7 +1,9 @@
-<div class="widget_def" id="def_<%= definition.getId().tr('_', '') -%>">
+<td>
+ <div class="widget_def" id="def_<%= definition.getId().tr('_', '') -%>">
 <p><b><%= h definition.getTitle() -%></b></p>
 <p><%= h definition.getDescription() -%></p>
 <%= form_tag :action => 'add_widget', :id => @dashboard.id, :resource => params[:resource], :widget => definition.getId() %>
   <input type="submit" value="Add widget" >
 </form>
-</div>
\ No newline at end of file
+  </div>
+</td>
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb
index 49d3bc131da..6562f2a5cc1 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/configure.html.erb
@@ -32,9 +32,14 @@
   <%= render :partial => 'dashboard/header', :locals => {:back => true} %>
 
   <div id="widget_defs" class="marginbottom10">
-      <% @widget_definitions.each_with_index do |definition, index| %>
-           <%= render :partial => 'dashboard/widget_definition', :locals => {:definition => definition} %>
-      <% end %>
+    <table width="100%">
+    <% @widget_definitions.each_with_index do |definition, index| %>
+      <% if index%4==0 %><tr><% end %>
+        <%= render :partial => 'dashboard/widget_definition', :locals => {:definition => definition} %>
+      <% if index%4==3 %></tr><% end %>
+    <% end %>
+    <% if @widget_definitions.size%4<3 %></tr><% end %>
+    </table>
   </div>
 
 
diff --git a/sonar-server/src/main/webapp/stylesheets/dashboard.css b/sonar-server/src/main/webapp/stylesheets/dashboard.css
index bc780e82bc3..98a73b8e7ff 100644
--- a/sonar-server/src/main/webapp/stylesheets/dashboard.css
+++ b/sonar-server/src/main/webapp/stylesheets/dashboard.css
@@ -50,21 +50,26 @@
 /*CONFIGURATION*/
 #dashboard #widget_defs {
   width: 100%;
-  overflow: auto;
-  white-space: nowrap;
+  height: 130px;
+  overflow-y: auto;
   background-color: #FFF6BF;
   border: 2px solid #FFD324;
+  padding: 3px;
 }
 
+#dashboard #widget_defs td {
+  white-space: normal;
+  vertical-align: top;
+  width: 25%;
+}
 #dashboard .widget_def {
-  border-right: 1px dashed #FFD324;
+  border: 1px solid #FFD324;
   padding: 5px;
-  display: inline-block;
-  width: 160px;
+  margin: 3px;
   white-space: normal;
   vertical-align: top;
-}
 
+}
 /*OPERATIONS*/
 #dashboard #dashboard-operations {
   position: relative;
-- 
2.39.5