From 475eab492b95cc7e2c755bdadc6d6238382b8bef Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Vilain <jean-baptiste.vilain@sonarsource.com>
Date: Thu, 8 Aug 2013 09:53:25 +0200
Subject: [PATCH] SONAR-4522 Renamed project roles to better match the
 underlying permissions

---
 .../main/resources/org/sonar/l10n/core.properties |  7 +++----
 .../app/views/permission_templates/index.html.erb | 15 ++++++++++++---
 .../app/views/project_roles/index.html.erb        | 15 ++++++++++++---
 .../WEB-INF/app/views/roles/global.html.erb       |  3 ++-
 .../WEB-INF/app/views/roles/projects.html.erb     | 15 ++++++++++++---
 5 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 4336a5fd576..a09ab4b49bf 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -2241,13 +2241,12 @@ This permission is <em>required</em> to execute a local analysis in Eclipse or v
 projects_role.criteria.name=Name contains
 projects_role.criteria.key=Key contains
 projects_role.role=Role Membership For New
-projects_role.users=Users
 projects_role.groups=Groups
-projects_role.admin=Administrators
+projects_role.admin=Administer
 projects_role.admin.desc=Ability to perform administration tasks for the project by accessing its settings.
-projects_role.user=Users
+projects_role.user=Browse Measures and Issues
 projects_role.user.desc=Ability to browse the measures and to create/edit issues on the project.
-projects_role.codeviewer=Code Viewers
+projects_role.codeviewer=Browse Source Code
 projects_role.codeviewer.desc=Ability to view the source code of the project.
 projects_role.bulk_change=Bulk Change
 projects_role.apply_template=Apply Permission Template
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 fc6b7231b65..0acce90f036 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
@@ -17,9 +17,18 @@
   <thead>
   <tr>
     <th class="left" width="20%"><%= message('name') -%></th>
-    <th class="left"><%= message('projects_role.admin') -%></th>
-    <th class="left"><%= message('projects_role.user') -%></th>
-    <th class="left"><%= message('projects_role.codeviewer') -%></th>
+    <th class="left">
+      <%= message('projects_role.admin') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.admin.desc') -%></span>
+    </th>
+    <th class="left">
+      <%= message('projects_role.user') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.user.desc') -%></span>
+    </th>
+    <th class="left">
+      <%= message('projects_role.codeviewer') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.codeviewer.desc') -%></span>
+    </th>
     <th class="left" width="8%"><%= message('default') -%></th>
     <th class="right" width="5%" colspan="2"><%= message('operations') -%></th>
   </tr>
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 17585b47fab..4877f839e51 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
@@ -3,9 +3,18 @@
   <thead>
   <tr>
     <th>&nbsp;</th>
-    <th><%= message('projects_role.admin') -%></th>
-    <th><%= message('projects_role.user') -%></th>
-    <th><%= message('projects_role.codeviewer') -%></th>
+    <th>
+      <%= message('projects_role.admin') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.admin.desc') -%></span>
+    </th>
+    <th>
+      <%= message('projects_role.user') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.user.desc') -%></span>
+    </th>
+    <th>
+      <%= message('projects_role.codeviewer') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.codeviewer.desc') -%></span>
+    </th>
   </tr>
   </thead>
   <tbody>
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 e21143652ba..cb593534e2e 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
@@ -13,7 +13,8 @@
     <tr class="<%= cycle('even', 'odd', :name => 'global_permission') -%>" >
       <td valign="top">
         <b><%= message("global_permissions.#{global_permission_key}") -%></b><br/>
-        <span class="small gray"><%= message("global_permissions.#{global_permission_key}.desc") -%></span></td>
+        <span class="small gray"><%= message("global_permissions.#{global_permission_key}.desc") -%></span>
+      </td>
       <td valign="top" style="word-break:break-all;width:30%;">
         <span><%= users(global_permission_key).map(&:name).join(', ') -%></span>
         (<%= link_to_edit_roles_permission_form(message('select'), global_permission_key, nil, "select-users-#{global_permission_key}") %>)<br/>
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 70b37e1e645..763c08fec55 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
@@ -45,9 +45,18 @@
   <thead>
   <tr>
     <th>&nbsp;</th>
-    <th><%= message('projects_role.admin') -%></th>
-    <th><%= message('projects_role.user') -%></th>
-    <th><%= message('projects_role.codeviewer') -%></th>
+    <th>
+      <%= message('projects_role.admin') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.admin.desc') -%></span>
+    </th>
+    <th>
+      <%= message('projects_role.user') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.user.desc') -%></span>
+    </th>
+    <th>
+      <%= message('projects_role.codeviewer') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.codeviewer.desc') -%></span>
+    </th>
     <th></th>
   </tr>
   </thead>
-- 
2.39.5