SONAR-5333 Dashboard styles feedback

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb
index b2b13fb0680f58f59cb3bae633348718b8b6b457..0a182b314e1bf4038552439b9975802443e1e5d7 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb
@@ -141,7 +141,7 @@
           <% end %>
 
           <div class="widget-measure">
-            <span class="widget-label">&nbsp;</span>
+            <span class="widget-label"><%= message('widget.code_coverage.execution_time') -%></span>
             <span class="nowrap">
               <%= format_measure(execution_time, :url => url_for_drilldown('test_execution_time')) %>
               <%= dashboard_configuration.selected_period? ? format_variation(execution_time) : trend_icon(execution_time) -%>

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/events.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/events.html.erb
index 1a4ef1fccf2ebe0d0bfefeb5db0b68e96051cb44..6cdfe968f9195be439e50c78359fb6200eccf1a6 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/events.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/events.html.erb
@@ -89,9 +89,7 @@
     <td><%= event.name %></td>
     <td>
       <% unless event.description.blank? %>
-      <a href="#" class="nolink" title="<%= h event.description -%>" alt="<%= h event.description -%>">
-        <i class="icon-info"></i>
-      </a>
+        <i class="icon-info" title="<%= h event.description -%>"></i>
       <% end %>
     </td>
 </tr>

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issues.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issues.html.erb
index 99a069dc58304ce5ca089d5f77f307d4df6be2ee..f73f2855c756a82b387a00caf328359f8b3c3725 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issues.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issues.html.erb
@@ -51,13 +51,11 @@
     <div class="widget-span widget-span-3">
       <div class="widget-measure-container">
         <div class="widget-measure widget-measure-main">
-          <span class="widget-label"><%= message('widget.rules.technical_debt') -%></span>
-          <span class="nowrap">
-            <a href="<%= url_for_drilldown('sqale_index') -%>" class="widget-link link-<%= widget.key %>-debt">
-              <%= format_measure(technical_debt) -%>
-            </a>
-            <%= dashboard_configuration.selected_period? ? format_variation(technical_debt) : trend_icon(technical_debt) -%>
-          </span>
+          <span class="widget-label"><%= message('widget.rules.debt') -%></span>
+          <a href="<%= url_for_drilldown('sqale_index') -%>" class="widget-link link-<%= widget.key %>-debt">
+            <%= format_measure(technical_debt) -%>
+          </a>
+          <%= dashboard_configuration.selected_period? ? format_variation(technical_debt) : trend_icon(technical_debt) -%>
         </div>
         <div class="widget-measure-delta">
           <%

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb
index b39c4942f72061734ef99f71c8f6f09efde6d33f..b9916b0f3ea5d268820d4b3bf8f906c561de90fb 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb
@@ -70,7 +70,6 @@
                                            :period => dashboard_configuration.period_index,
                                            :url => url_for_drilldown(new_coverage, :period => dashboard_configuration.period_index),
                                            :default => '-') %>
-                        <%= dashboard_configuration.selected_period? ? format_variation(new_coverage) : trend_icon(new_coverage) -%>
                       </span>
                   </div>
                 <% end %>
@@ -82,7 +81,6 @@
                         <%= format_measure(new_line_coverage,
                                            :period => dashboard_configuration.period_index,
                                            :url => url_for_drilldown(new_line_coverage, :period => dashboard_configuration.period_index)) %>
-                        <%= dashboard_configuration.selected_period? ? format_variation(new_line_coverage) : trend_icon(new_line_coverage) -%>
                       </span>
                   </div>
                 <% end %>
@@ -94,7 +92,6 @@
                         <%= format_measure(new_branch_coverage,
                                            :period => dashboard_configuration.period_index,
                                            :url => url_for_drilldown(new_branch_coverage, :period => dashboard_configuration.period_index)) %>
-                        <%= dashboard_configuration.selected_period? ? format_variation(new_branch_coverage) : trend_icon(new_branch_coverage) -%>
                       </span>
                   </div>
                 <% end %>

diff --git a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/widgets/package_design.html.erb b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/widgets/package_design.html.erb
index a9b83d9345fbca970a4224e1661ae8eb0f093cd1..5d9b7a2c796746bdf8745523b9429795320258ee 100644 (file)
--- a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/widgets/package_design.html.erb
+++ b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/widgets/package_design.html.erb
@@ -37,21 +37,21 @@
 
         <% if package_feedback_edges %>
           <div class="widget-measure">
+            <span class="widget-label"><%= message('widget.package_design.between_packages.suffix') -%></span>
             <span class="nowrap">
               <%= format_measure(package_feedback_edges, :default => '-', :url => url_for_drilldown(package_feedback_edges)) %>
               <%= dashboard_configuration.selected_period? ? format_variation(package_feedback_edges) : trend_icon(package_feedback_edges) -%>
             </span>
-            <span class="widget-label"><%= message('widget.package_design.between_packages.suffix') -%></span>
           </div>
         <% end %>
 
         <% if package_tangles %>
           <div class="widget-measure">
+            <span class="widget-label"><%= message('widget.package_design.between_files.suffix') -%></span>
             <span class="nowrap">
               <%= format_measure(package_tangles, :default => '-', :url => url_for_drilldown(package_tangles)) %>
               <%= dashboard_configuration.selected_period? ? format_variation(package_tangles) : trend_icon(package_tangles) -%>
             </span>
-            <span class="widget-label"><%= message('widget.package_design.between_files.suffix') -%></span>
           </div>
         <% end %>
       </div>

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index b38db8b94c18f85757ee0cde1b327b3771264de2..c3417124df2c843452b4b7d1c783bc70bb157510 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -992,6 +992,7 @@ widget.code_coverage.failures.suffix=\ failures
 widget.code_coverage.errors.suffix=\ errors
 widget.code_coverage.tests.suffix=\ tests
 widget.code_coverage.skipped.suffix=\ skipped
+widget.code_coverage.execution_time=Execution Time
 
 # id of this widget does not use underscore in order to be backward-compatible with previous version of JaCoCo plugin
 widget.it-coverage.name=Integration Tests Coverage
@@ -1069,7 +1070,7 @@ widget.events.show_more=Show more
 widget.rules.name=Issues and Technical Debt
 widget.rules.description=Reports issues and technical debt.
 widget.rules.issues=Issues
-widget.rules.technical_debt=Technical Debt
+widget.rules.debt=Debt
 widget.rules.added=Added:
 widget.rules.removed=Removed:
 

diff --git a/sonar-server/src/main/less/dashboard.less b/sonar-server/src/main/less/dashboard.less
index 4f8602ac5bd13cb13abb6f8c399d99c65553ac0b..de628316f9f54dffed46c0880d0ec17e4b229523 100644 (file)
--- a/sonar-server/src/main/less/dashboard.less
+++ b/sonar-server/src/main/less/dashboard.less
@@ -164,6 +164,8 @@
   text-align: right;
 }
 
+.admin_page .operations .link-action { margin-left: 4px; }
+
 .admin_page .owner {
   width: 140px;
   text-align: center;

diff --git a/sonar-server/src/main/less/layout.less b/sonar-server/src/main/less/layout.less
index a87f1902f7c058a1106dcab1860a8b519d935ec2..69d93189211d95324fffb918a839c6f795ddc36a 100644 (file)
--- a/sonar-server/src/main/less/layout.less
+++ b/sonar-server/src/main/less/layout.less
@@ -65,6 +65,10 @@ body, a {
   position: relative;
 }
 
+#hd li {
+  height: 30px;
+}
+
 #hd a {
   .base-link;
   color: #e5e5e5;

diff --git a/sonar-server/src/main/less/style.less b/sonar-server/src/main/less/style.less
index d1e3fd8d9bc8ff4f7e9f70e4aa8f3aab615325d4..26e3c87b43b1c37eb0b9706b2428bf276acb2947 100644 (file)
--- a/sonar-server/src/main/less/style.less
+++ b/sonar-server/src/main/less/style.less
@@ -391,6 +391,10 @@ table.data > thead > tr > th {
   & > a {
     .base-link;
   }
+
+  & > .small {
+    text-transform: none;
+  }
 }
 
 table.data > tfoot > tr > td {

diff --git a/sonar-server/src/main/less/ui.less b/sonar-server/src/main/less/ui.less
index bdab9e2c93559553850acd8de770cb1e1b037e8f..7b978880ecdfda1ce10b6bfac432c349a646522d 100644 (file)
--- a/sonar-server/src/main/less/ui.less
+++ b/sonar-server/src/main/less/ui.less
@@ -114,6 +114,11 @@ a {
   .link;
 }
 
+.icon-with-link {
+  outline: none;
+  text-decoration: none;
+}
+
 .widget-link {
   .highlighted-link;
   border-bottom: 1px solid @lightBlue;
@@ -174,7 +179,7 @@ input[type=button] {
   vertical-align: baseline;
   height: 22px;
   margin: 0 1px;
-  padding: 2px 10px;
+  padding: 0 10px;
 
   border: 1px solid @darkGrey;
   .box-sizing(border-box);

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index 458574c46ab0fea9d0310f7e2c6ebf7912255e6f..d1a7a8c67d25b52a008610aa7aa2b087af3d81b0 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -313,10 +313,10 @@ module ApplicationHelper
     if resource.display_dashboard?
       if options[:dashboard]
         link_to(name || resource.name, params.merge({:controller => 'dashboard', :action => 'index', :id => resource.id, :period => period_index,
-                                                     :tab => options[:tab], :rule => options[:rule]}), :title => options[:title])
+                                                     :tab => options[:tab], :rule => options[:rule]}), :title => options[:title], :class => options[:class])
       else
         # stay on the same page (for example components)
-        link_to(name || resource.name, params.merge({:id => resource.id, :period => period_index, :tab => options[:tab], :rule => options[:rule]}), :title => options[:title])
+        link_to(name || resource.name, params.merge({:id => resource.id, :period => period_index, :tab => options[:tab], :rule => options[:rule]}), :title => options[:title], :class => options[:class])
       end
     else
       if options[:line]

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb
index 88b4219119d2fa1eeb2da686df5909ead310fad2..0ce35cae2147accb5e79eb91005c3e76ba61e19c 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/components/index.html.erb
@@ -53,7 +53,7 @@
                 <td class="left" x="<%= u(snapshot.project.name) -%>">
                   <%= qualifier_icon(snapshot) %>
                   <% if snapshot.display_dashboard? %>
-                    <%= link_to_resource(project, h(snapshot.project.name)) %>
+                    <%= link_to_resource(project, h(snapshot.project.name), :class => 'chevron-link highlighted-link') %>
                   <% else %>
                     <%= h snapshot.project.name %>
                   <% end %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
index a1879e7c268b4bff4700f3d6ab6c1e0f022014f6..b2133dc68965d55fbb5b14f4c1c6b02a4cc77b72 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
@@ -84,10 +84,10 @@
                 <% end %>
                 <%= qualifier_icon(resource) -%>&nbsp;
                 <% if resource.source_code? %>
-                  <a href="#" alt="<%= h resource.name(true) -%>" title="<%= h resource.name(true) -%>" data-key="<%= resource.key -%>"
+                  <a href="#" title="<%= h resource.name(true) -%>" data-key="<%= resource.key -%>"
                      class="js-drilldown-link chevron-link highlighted-link"><%= h resource.name(false) %></a>
                 <% else %>
-                  <%= link_to(h(resource.name), {:only_path => true, :overwrite_params => {:rids => (selected ? rids-[resource.id] : rids+[resource.id])}}) -%>
+                  <%= link_to(h(resource.name), {:only_path => true, :overwrite_params => {:rids => (selected ? rids-[resource.id] : rids+[resource.id])}}, :class => 'chevron-link highlighted-link') -%>
                 <% end %>
               </td>
               <td class="right">