SONAR-5333 Fix some issues

3 files changed, 33 insertions, 31 deletions

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb
index d64f69d09ee..b37a7ce3821 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb
@@ -10,40 +10,40 @@
   <div class="widget-row">
     <div class="widget-span widget-span-5">
       <div class="widget-measure-container">
-        <% if function_complexity %>
-          <div class="widget-measure widget-measure-main">
-            <span class="widget-label"><%= message('widget.complexity.name') -%></span>
+        <div class="widget-measure widget-measure-main">
+          <span class="widget-label"><%= message('widget.complexity.name') -%></span>
+          <% if function_complexity %>
             <span class="nowrap">
               <%= format_measure(function_complexity, :url => url_for_drilldown(function_complexity)) %>
               <%= dashboard_configuration.selected_period? ? format_variation(function_complexity) : trend_icon(function_complexity) -%>
               <span class="small"><%= message('widget.complexity.per_method.suffix') %></span>
             </span>
-            <% if class_complexity %>
-              <br>
-              <span class="nowrap">
-                <%= format_measure(class_complexity, :url => url_for_drilldown(class_complexity)) %>
-                <%= dashboard_configuration.selected_period? ? format_variation(class_complexity) : trend_icon(class_complexity) -%>
-                <span class="small"><%= message('widget.complexity.per_class.suffix') %></span>
-              </span>
-            <% end %>
-            <% if file_complexity %>
-              <br>
-              <span class="nowrap">
-                <%= format_measure(file_complexity, :url => url_for_drilldown(file_complexity)) %>
-                <%= dashboard_configuration.selected_period? ? format_variation(file_complexity) : trend_icon(file_complexity) -%>
-                <span class="small"><%= message('widget.complexity.per_file.suffix') %></span>
-              </span>
-            <% end %>
-            <% if complexity %>
-              <br>
-              <span class="nowrap">
-                <%= message('widget.complexity.total') -%>
-                : <%= format_measure(complexity, :url => url_for_drilldown(complexity)) %>
-                <%= dashboard_configuration.selected_period? ? format_variation(complexity) : trend_icon(complexity) -%>
-              </span>
-            <% end %>
-          </div>
-        <% end %>
+          <% end %>
+          <% if class_complexity %>
+            <br>
+            <span class="nowrap">
+              <%= format_measure(class_complexity, :url => url_for_drilldown(class_complexity)) %>
+              <%= dashboard_configuration.selected_period? ? format_variation(class_complexity) : trend_icon(class_complexity) -%>
+              <span class="small"><%= message('widget.complexity.per_class.suffix') %></span>
+            </span>
+          <% end %>
+          <% if file_complexity %>
+            <br>
+            <span class="nowrap">
+              <%= format_measure(file_complexity, :url => url_for_drilldown(file_complexity)) %>
+              <%= dashboard_configuration.selected_period? ? format_variation(file_complexity) : trend_icon(file_complexity) -%>
+              <span class="small"><%= message('widget.complexity.per_file.suffix') %></span>
+            </span>
+          <% end %>
+          <% if complexity %>
+            <br>
+            <span class="nowrap">
+              <%= message('widget.complexity.total') -%>
+              : <%= format_measure(complexity, :url => url_for_drilldown(complexity)) %>
+              <%= dashboard_configuration.selected_period? ? format_variation(complexity) : trend_icon(complexity) -%>
+            </span>
+          <% end %>
+        </div>
       </div>
     </div>
 
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/duplications_widget.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/duplications_widget.html.erb
index c563134e96e..3eaaf6d4a55 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/duplications_widget.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/duplications_widget.html.erb
@@ -7,7 +7,7 @@
     <div class="widget-measure widget-measure-main">
       <span class="widget-label"><%= message('widget.duplications.duplications') -%></span>
       <span class="nowrap">
-        <%= format_measure(duplicated_lines_density, :url => url_for_drilldown(duplicated_lines_density, :highlight =>  'duplicated_lines_density')) %>
+        <%= format_measure(duplicated_lines_density, :url => url_for_drilldown('duplicated_lines', :highlight =>  'duplicated_lines_density')) %>
         <%= dashboard_configuration.selected_period? ? format_variation('duplicated_lines_density') : trend_icon('duplicated_lines_density') -%>
       </span>
     </div>
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 55a193ae798..8716ea0c682 100644
--- 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
@@ -54,7 +54,9 @@
         <div class="widget-measure widget-measure-main">
           <span class="widget-label"><%= message('widget.rules.technical_debt') -%></span>
           <span class="nowrap">
-            <%= format_measure(technical_debt, :url => url_for_drilldown('sqale_index')) %>
+            <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>
         </div>