aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2013-12-03 16:21:54 +0100
committerJulien HENRY <julien.henry@sonarsource.com>2013-12-03 16:22:20 +0100
commit06b86ea17261a6126c369b5b9a9b8a21e80e8682 (patch)
treea2451034987322b875286c7099fb2c20e53818be /sonar-server
parent24c82c3211552b1888a1ce0d3648cb63c1b2f5f4 (diff)
downloadsonarqube-06b86ea17261a6126c369b5b9a9b8a21e80e8682.tar.gz
sonarqube-06b86ea17261a6126c369b5b9a9b8a21e80e8682.zip
SONAR-4750 Add introduction paragraph on each admin page
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb5
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb12
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb19
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb3
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb5
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb7
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb5
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb5
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb3
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb9
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb7
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb11
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb25
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/project/profile.html.erb3
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb3
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb4
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb3
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb3
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb4
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb5
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb3
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb3
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb3
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb3
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb5
-rw-r--r--sonar-server/src/main/webapp/stylesheets/dashboard.css5
-rw-r--r--sonar-server/src/main/webapp/stylesheets/style.css12
27 files changed, 99 insertions, 76 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb
index 41779bac8a3..c8b6bc01b79 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb
@@ -1,4 +1,4 @@
-<div class="line-block">
+<div>
<% if profiles_administrator? %>
<ul style="float: right" class="horizontal">
<li class="marginleft10 add">
@@ -6,7 +6,8 @@
</li>
</ul>
<% end %>
- <h1><%= message('action_plans.page_title') -%></h1>
+ <h1 class="admin-page-title"><%= message('action_plans.page_title') -%></h1>
+ <p class="admin-page-description"><%= message('action_plans.page.description') -%></p>
</div>
<table width="100%" id="action-plans">
<tr>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb
index 2a6c7dabc78..74bbd6309ba 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb
@@ -1,16 +1,16 @@
<div class="admin_page">
- <h1><%= message('dashboard.global_dashboards') -%></h1>
- <p><%= message('dashboard.global_dashboards.description') -%></p>
+ <h1 class="admin-page-title"><%= message('dashboard.global_dashboards') -%></h1>
+ <p class="admin-page-description"><%= message('dashboard.global_dashboards.description') -%></p>
<%= render :partial => 'list', :locals => {:active_dashboards => @actives.select(&:global?), :group => 'activeGlobal'} %>
- <h1><%= message('dashboard.project_dashboards') -%></h1>
- <p><%= message('dashboard.project_dashboards.description') -%></p>
+ <h1 class="admin-page-title"><%= message('dashboard.project_dashboards') -%></h1>
+ <p class="admin-page-description"><%= message('dashboard.project_dashboards.description') -%></p>
<%= render :partial => 'list', :locals => {:active_dashboards => @actives.reject(&:global?), :group => 'activeProject'} %>
- <h1><%= message('dashboard.shared_dashboards') -%></h1>
- <p><%= message('dashboard.shared_dashboards.description') -%></p>
+ <h1 class="admin-page-title"><%= message('dashboard.shared_dashboards') -%></h1>
+ <p class="admin-page-description"><%= message('dashboard.shared_dashboards.description') -%></p>
<table class="data" id="shared">
<thead>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb
index 1bc7b10e9e3..61bea1fb837 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb
@@ -1,4 +1,5 @@
-<h1 class="marginbottom10"><%= message('bulk_deletion.page') -%></h1>
+<h1 class="admin-page-title"><%= message('bulk_deletion.page') -%></h1>
+<p class="admin-page-description"><%= message('bulk_deletion.page.description') -%></p>
<ul class="tabs">
<% @tabs.each do |tab| %>
@@ -16,19 +17,19 @@
<p style="margin: 0 0 15px 0">
<%= message('bulk_deletion.ghosts.description') -%>
</p>
-
+
<% unless @ghosts.size > 0 %>
-
+
<b><%= message('bulk_deletion.no_ghosts') -%></b>
-
+
<% else %>
-
+
<p style="margin: 0 0 10px 0">
<%= message('bulk_deletion.following_ghosts_can_be_deleted') -%>
</p>
<table>
- <%
+ <%
@tabs.each do |qualifier|
ghosts = @ghosts_by_qualifier[qualifier]
if ghosts
@@ -43,16 +44,16 @@
ghosts.sort {|x,y| x.name <=> y.name}.each do |resource|
%>
<li><%= h resource.name -%> <span class="small gray">( <%= h resource.key -%> )</span></li>
- <%
+ <%
end
%>
</ul>
<%
end
- end
+ end
%>
</table>
-
+
<p style="margin: 15px 0">
<form action="<%= ApplicationController.root_context -%>/bulk_deletion/delete_resources" method="POST">
<input type="hidden" id="all_resources" name="all_resources" value="<%= @ghosts.map {|r| r.id.to_s}.join(',') -%>"/>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb
index a4982762bd1..26ba7d8afc7 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb
@@ -1,4 +1,5 @@
-<h1 class="marginbottom10"><%= message('bulk_deletion.page') -%></h1>
+<h1 class="admin-page-title"><%= message('bulk_deletion.page') -%></h1>
+<p class="admin-page-description"><%= message('bulk_deletion.page.description') -%></p>
<ul class="tabs">
<% @tabs.each do |tab| %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb
index d85a780728b..19b2ba6acb2 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb
@@ -1,4 +1,4 @@
-<div class="line-block">
+<div>
<% if profiles_administrator? %>
<ul style="float: right" class="horizontal">
<li class="marginleft10 add">
@@ -6,7 +6,8 @@
</li>
</ul>
<% end %>
- <h1 class="marginbottom10">Groups</h1>
+ <h1 class="admin-page-title"><%= message('user_groups.page') -%></h1>
+ <p class="admin-page-description"><%= message('user_groups.page.description') -%> </p>
</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
index a75fa06299a..37fef076e42 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
@@ -10,7 +10,7 @@
}
</style>
-<div class="line-block">
+<div>
<ul style="float: right" class="horizontal">
<li class="marginleft10 add">
@@ -18,7 +18,8 @@
</li>
</ul>
- <h1 class="marginbottom10"><%= message('manual_measures.page') -%></h1>
+ <h1 class="admin-page-title"><%= message('manual_measures.page') -%></h1>
+ <p class="admin-page-description"><%= message('manual_measures.page.description') -%></p>
</div>
<% has_pendings=false %>
@@ -85,4 +86,4 @@
<%= message('manual_measures.pending_message') -%>
</p>
</div>
-<% end %> \ No newline at end of file
+<% end %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
index 47222c38803..da667469921 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
@@ -1,4 +1,4 @@
-<div class="line-block">
+<div>
<% if profiles_administrator? %>
<ul style="float: right" class="horizontal">
<li class="marginleft10 add">
@@ -6,7 +6,8 @@
</li>
</ul>
<% end %>
- <h1 class="marginbottom10"><%= message('manual_rules.page') -%></h1>
+ <h1 class="admin-page-title"><%= message('manual_rules.page') -%></h1>
+ <p class="admin-page-description"><%= message('manual_rules.page.description') -%> </p>
</div>
<table width="100%">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
index e166f7de746..cf33b999538 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
@@ -1,4 +1,4 @@
-<div class="line-block">
+<div>
<% if profiles_administrator? %>
<ul style="float: right" class="horizontal">
<li class="marginleft10 add">
@@ -6,7 +6,8 @@
</li>
</ul>
<% end %>
- <h1 class="marginbottom10"><%= message('manual_metrics.page') -%></h1>
+ <h1 class="admin-page-title"><%= message('manual_metrics.page') -%></h1>
+ <p class="admin-page-description"><%= message('manual_metrics.page.description') -%> </p>
</div>
<table width="100%">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb
index c57272cfeb4..ef7a6574fae 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb
@@ -1,4 +1,5 @@
-<h1 class="marginbottom10"><%= message 'roles.page' -%></h1>
+<h1 class="admin-page-title"><%= message 'roles.page' -%></h1>
+<p class="admin-page-description"><%= message('roles.page.description') -%></p>
<%= render :partial => 'roles/tabs', :locals => {:selected_tab=>'Permission templates'} %>
<br/>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb
index 8644fb5769e..fb694f6e376 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb
@@ -1,9 +1,10 @@
<%
if !@snapshot || @snapshot.root?
- resource_name = message('qualifier.' + @project.qualifier)
- delete_resource_message = message('project_deletion.delete_resource', :params => resource_name)
+ resource_qualifier = message('qualifier.' + @project.qualifier)
+ delete_resource_message = message('project_deletion.page', :params => resource_qualifier)
%>
-<h1><%= delete_resource_message -%></h1>
+<h1 class="admin-page-title"><%= delete_resource_message -%></h1>
+<p class="admin-page-description"><%= message('project_deletion.page.description') -%></p>
<br/>
<div class="yui-g widget" id="widget_delete_project">
<div class="warning">
@@ -23,7 +24,7 @@
<%= message('project_deletion.operation_cannot_be_undone') -%>
<br/>
<%= submit_tag delete_resource_message, :id => 'delete_resource', :class => 'action red-button',
- :confirm => message('project_deletion.delete_resource_confirmation', :params => resource_name) %>
+ :confirm => message('project_deletion.delete_resource_confirmation', :params => resource_qualifier) %>
</form>
</div>
</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb
index 58b91d434ed..1815d10ee92 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb
@@ -1,4 +1,5 @@
-<h1><%= message('project_history.page') -%></h1>
+<h1 class="admin-page-title"><%= message('project_history.page') -%></h1>
+<p class="admin-page-description"><%= message('project_history.page.description') -%></p>
<% if !@snapshot %>
@@ -22,10 +23,6 @@
}
</style>
-<p style="margin: 15px 0px">
- <%= message('project_history.description') -%>
-</p>
-
<table id="project-history" class="data" style="width:1%">
<thead>
<tr>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb
index 3cee3d75a7e..45035d8778f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb
@@ -1,4 +1,4 @@
-<%
+<%
if controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'updatable_key')
has_modules = !@project.modules.empty?
reset_cycle 'modules_tree'
@@ -11,10 +11,9 @@
});
}
</script>
-
-<h1><%= message('update_key.update_resource_key') -%></h1>
-<p style="margin: 15px 0px"><%= message('update_key.description') -%></p>
+<h1 class="admin-page-title"><%= message('update_key.page') -%></h1>
+<p class="admin-page-description"><%= message('update_key.page.description') -%></p>
<% if has_modules %>
<h2><%= message('update_key.bulk_update') -%></h2>
@@ -44,7 +43,7 @@
<span class="loading" id="loading_bulk_update" style="display: none; padding: 3px 10px;"></span>
</td>
<td></td>
- </tr>
+ </tr>
</table>
<% end %>
<br/>
@@ -64,5 +63,5 @@
<%= render :partial => 'key_modules', :locals => {:current_module => @project, :module_depth => 0, :id_prefix => "0"} -%>
</tbody>
</table>
-
+
<% end %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb
index e3bd566ee78..578cb0af786 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb
@@ -1,4 +1,5 @@
-<h1>Project Links</h1>
+<h1 class="admin-page-title"><%= message('project_links.page') -%></h1>
+<p class="admin-page-description"><%= message('project_links.page.description') -%></p>
<br/>
<style>
@@ -16,7 +17,7 @@
<% form_for( 'set_links', :url => { :action => 'set_links', :project_id => @project.id } ) do |form|
links_by_key={}
@project.links.each do |link|
- links_by_key[link.link_type]=link
+ links_by_key[link.link_type]=link
end
%>
<div class="yui-u first">
@@ -35,7 +36,7 @@
if link.starts_with?("http")
link = "<a href=\"#{h link}\">#{h link}</a>"
end
- %>
+ %>
<%= link -%>
</td>
</tr>
@@ -43,7 +44,7 @@
<td>
<%= image_tag("links/ci.png") -%> <%= message('project_links.ci') -%>
<br/>
- <span class="note" style="margin-left: 20px">sonar.links.ci</span>
+ <span class="note" style="margin-left: 20px">sonar.links.ci</span>
</td>
<td>
<%
@@ -51,7 +52,7 @@
if link.starts_with?("http")
link = "<a href=\"#{h link}\">#{h link}</a>"
end
- %>
+ %>
<%= link -%>
</td>
</tr>
@@ -59,7 +60,7 @@
<td>
<%= image_tag("links/issue.png") -%> <%= message('project_links.issue') -%>
<br/>
- <span class="note" style="margin-left: 20px">sonar.links.issue</span>
+ <span class="note" style="margin-left: 20px">sonar.links.issue</span>
</td>
<td>
<%
@@ -67,7 +68,7 @@
if link.starts_with?("http")
link = "<a href=\"#{h link}\">#{h link}</a>"
end
- %>
+ %>
<%= link -%>
</td>
</tr>
@@ -75,7 +76,7 @@
<td>
<%= image_tag("links/scm.png") -%> <%= message('project_links.scm') -%>
<br/>
- <span class="note" style="margin-left: 20px">sonar.links.scm</span>
+ <span class="note" style="margin-left: 20px">sonar.links.scm</span>
</td>
<td>
<%
@@ -83,7 +84,7 @@
if link.starts_with?("http")
link = "<a href=\"#{h link}\">#{h link}</a>"
end
- %>
+ %>
<%= link -%>
</td>
</tr>
@@ -91,7 +92,7 @@
<td>
<%= image_tag("links/scm_dev.png") -%> <%= message('project_links.scm_dev') -%>
<br/>
- <span class="note" style="margin-left: 20px">sonar.links.scm_dev</span>
+ <span class="note" style="margin-left: 20px">sonar.links.scm_dev</span>
</td>
<td>
<%
@@ -99,7 +100,7 @@
if link.starts_with?("http")
link = "<a href=\"#{h link}\">#{h link}</a>"
end
- %>
+ %>
<%= link -%>
</td>
</tr>
@@ -128,4 +129,4 @@
<%= submit_tag( "Save links" ) %>
</div>
<% end %>
-</div> \ No newline at end of file
+</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/profile.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/profile.html.erb
index f2cc72743ea..57b85c1d43e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/profile.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/profile.html.erb
@@ -1,4 +1,5 @@
-<h1 class="marginbottom10"><%= message('project_quality_profiles.page') -%></h1>
+<h1 class="admin-page-title"><%= message('project_quality_profiles.page') -%></h1>
+<p class="admin-page-description"><%= message('project_quality_profiles.page.description') -%></p>
<table class="data">
<thead>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb
index 957f8d84d06..c9a1451410d 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb
@@ -1,4 +1,5 @@
-<h1>Project Permissions</h1>
+<h1 class="admin-page-title"><%= message('project_roles.page') -%></h1>
+<p class="admin-page-description"><%= message('project_roles.page.description') -%></p>
<div class="line-block marginbottom10">
<ul class="operations">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb
index ede85b31c1a..5ce25186a33 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb
@@ -5,8 +5,8 @@
</li>
</ul>
- <h1 class="marginbottom10"><%= message('provisioning.page') -%></h1>
- <p><%= message('provisioning.page.description') -%></p>
+ <h1 class="admin-page-title"><%= message('provisioning.page') -%></h1>
+ <p class="admin-page-description"><%= message('provisioning.page.description') -%></p>
<% if @query_result.empty? %>
<br/>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb
index 188cb0b4ade..13ac5b37633 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb
@@ -1,4 +1,5 @@
-<h1 class="marginbottom10"><%= h message 'global_permissions.page' -%></h1>
+<h1 class="admin-page-title"><%= h message 'global_permissions.page' -%></h1>
+<p class="admin-page-description"><%= message('global_permissions.page.description') -%> </p>
<table class="data width100" id="global-permissions">
<thead>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb
index a9543758c1d..f3950fd8020 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb
@@ -1,4 +1,5 @@
-<h1 class="marginbottom10"><%= message 'roles.page' -%></h1>
+<h1 class="admin-page-title"><%= message 'roles.page' -%></h1>
+<p class="admin-page-description"><%= message('roles.page.description') -%></p>
<%= render :partial => 'roles/tabs', :locals => {:selected_tab=>'Projects'} %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb
index 323ea8e0e05..2ab1b404d4a 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb
@@ -1,6 +1,6 @@
<div id="plugins">
- <h1 class="marginbottom10"><%= message(@resource ? 'project_settings.page' : 'settings.page') -%></h1>
-
+ <h1 class="admin-page-title""><%= message(@resource ? 'project_settings.page' : 'settings.page') -%></h1>
+ <p class="admin-page-description"><%= message(@resource ? 'project_settings.page.description' : 'settings.page.description') -%> </p>
<table width="100%">
<tr>
<td width="1%" nowrap class="column first">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb
index f0d3734cc18..ab8726fa6ae 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb
@@ -1,10 +1,11 @@
-<div class="line-block">
+<div>
<ul style="float: right" class="horizontal">
<li class="csv marginleft10">
<a href="<%= ApplicationController.root_context -%>/system/index?format=csv" id="download-link" class="action">Download</a>
</li>
</ul>
- <h1 class="marginbottom10"><%= message('system_info.page') -%></h1>
+ <h1 class="admin-page-title"><%= message('system_info.page') -%></h1>
+ <p class="admin-page-description"><%= message('system_info.page.description') -%></p>
</div>
<table class="data width100" id="sonar">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
index 9a78d6e9c08..d13f908de7f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
@@ -14,7 +14,8 @@ function installPlugin(key) {
return false;
}
</script>
-<h1 class="marginbottom10"><%= message('update_center.page') -%></h1>
+<h1 class="admin-page-title"><%= message('update_center.page') -%></h1>
+<p class="admin-page-description"><%= message('update_center.page.description') -%></p>
<%= render :partial => 'updatecenter/tabs', :locals => {:tab => 'available'} -%>
<div class="tabs-panel">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb
index 78e8031b63c..b0752b03a58 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb
@@ -1,4 +1,5 @@
- <h1 class="marginbottom10"><%= message('update_center.page') -%></h1>
+<h1 class="admin-page-title"><%= message('update_center.page') -%></h1>
+<p class="admin-page-description"><%= message('update_center.page.description') -%></p>
<%= render :partial => 'updatecenter/tabs', :locals => {:tab => 'index'} -%>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
index c3272dcd4d9..27b0710468f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
@@ -11,7 +11,8 @@
return false;
}
</script>
-<h1 class="marginbottom10"><%= message('update_center.page') -%></h1>
+<h1 class="admin-page-title"><%= message('update_center.page') -%></h1>
+<p class="admin-page-description"><%= message('update_center.page.description') -%></p>
<%= render :partial => 'updatecenter/tabs', :locals => {:tab => 'system_updates'} -%>
<div class="tabs-panel">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb
index f7a83dc3a88..2622cc2a8af 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb
@@ -7,7 +7,8 @@ function upgradePlugin(key) {
return false;
}
</script>
-<h1 class="marginbottom10"><%= message('update_center.page') -%></h1>
+<h1 class="admin-page-title"><%= message('update_center.page') -%></h1>
+<p class="admin-page-description"><%= message('update_center.page.description') -%></p>
<%= render :partial => 'updatecenter/tabs', :locals => {:tab => 'updates'} -%>
<div class="tabs-panel">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb
index 19cab3e7b71..f987b93957b 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb
@@ -1,4 +1,4 @@
-<div class="line-block">
+<div>
<% if profiles_administrator? %>
<ul style="float: right" class="horizontal">
<li class="marginleft10 add">
@@ -6,7 +6,8 @@
</li>
</ul>
<% end %>
- <h1 class="marginbottom10">Users</h1>
+ <h1 class="admin-page-title"><%= message('users.page') -%></h1>
+ <p class="admin-page-description"><%= message('users.page.description') -%> </p>
</div>
<table width="100%">
diff --git a/sonar-server/src/main/webapp/stylesheets/dashboard.css b/sonar-server/src/main/webapp/stylesheets/dashboard.css
index ea1431d917d..544784961a7 100644
--- a/sonar-server/src/main/webapp/stylesheets/dashboard.css
+++ b/sonar-server/src/main/webapp/stylesheets/dashboard.css
@@ -156,11 +156,6 @@
text-align: center;
}
-.admin_page .description {
- font-size: 85%;
- font-weight: normal;
-}
-
/*OPERATIONS*/
#dashboard #dashboard-operations {
position: relative;
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 709870353ff..0579c6dbf05 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -2471,3 +2471,15 @@ textarea.width100 {
stroke-width: 1px;
transition: all 0.3s ease;
}
+
+/* ------------------- Admin pages ------------------- */
+
+.admin-page-title {
+ margin-bottom: 0px;
+}
+
+.admin-page-description {
+ font-size: 85%;
+ font-weight: normal;
+ margin-bottom: 10px;
+}