aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'sonar-server/src/main')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb3
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb5
-rw-r--r--sonar-server/src/main/webapp/stylesheets/dashboard.css6
3 files changed, 12 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
index 2be2647d9f2..73412725de4 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
@@ -99,7 +99,8 @@ module DashboardHelper
if widget.resource_id
widget_resource = Project.find_by_id(widget.resource_id)
if widget_resource
- @project = @resource = widget_resource
+ @resource = widget_resource
+ @project = @resource
@snapshot=@resource.last_snapshot
@dashboard_configuration=Api::DashboardConfiguration.new(@dashboard, :period_index => params[:period], :snapshot => @snapshot)
end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb
index 3c24067b55e..c07a4657feb 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget.html.erb
@@ -15,7 +15,10 @@
if default_layout
%>
<div class="widget">
- <% end %>
+ <% if !widget.java_definition.global && @dashboard.global %>
+ <div class="widget-title"><%= @resource.name if @resource -%></div>
+ <% end %>
+ <% end %>
<%= widget_body -%>
<% if default_layout %>
<div class="clear"></div>
diff --git a/sonar-server/src/main/webapp/stylesheets/dashboard.css b/sonar-server/src/main/webapp/stylesheets/dashboard.css
index 72302b0dbd8..bbdca6b8a7b 100644
--- a/sonar-server/src/main/webapp/stylesheets/dashboard.css
+++ b/sonar-server/src/main/webapp/stylesheets/dashboard.css
@@ -43,6 +43,12 @@
-moz-border-radius: 0 0 3px 3px;
}
+#dashboard .widget .widget-title {
+ font-style: italic;
+ font-weight: bold;
+ margin-bottom: 10px;
+}
+
/*CONFIGURATION*/
#dashboard #configure {
position: relative;