From 5e4753081ab5549afa3d9d632dae4755a96dc1b1 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Vilain <jean-baptiste.vilain@sonarsource.com>
Date: Wed, 17 Jul 2013 17:18:57 +0200
Subject: [PATCH] SONAR-4466 Labels and display adjustments

---
 .../permission_templates/_default_templates_form.html.erb   | 2 +-
 .../WEB-INF/app/views/permission_templates/index.html.erb   | 6 +++---
 .../main/webapp/WEB-INF/app/views/roles/projects.html.erb   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb
index 71b471a9bf0..825e2468e5e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb
@@ -7,7 +7,7 @@
       <div id="permission-template-error" class="permission-template error errors" style="display:none;" />
       <% @root_qualifiers.each do |qualifier| %>
         <div class="modal-field">
-          <%= label_tag("default_template_#{qualifier}", "#{message('qualifier.' + qualifier)}(s):") %>
+          <%= label_tag("default_template_#{qualifier}", " For #{message('qualifier.' + qualifier).downcase}s:") %>
           <%= select_tag("default_template_#{qualifier}", options_for_select(@permission_templates_options, @default_templates[qualifier])) %>
         </div>
       <% end %>
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 fd8d4c24c7f..16f65a695b4 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
@@ -16,9 +16,9 @@
   <thead>
   <tr>
     <th class="left" width="20%"><%= message('name') -%></th>
-    <th class="left">Administrators</th>
-    <th class="left">Users</th>
-    <th class="left">Code viewers</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" 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/roles/projects.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb
index 7d744cd3120..ecc74d213df 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
@@ -56,7 +56,7 @@
   <tbody>
   <% if @projects.empty? %>
     <tr class="even">
-      <td colspan="4" align="left"><%= message('no_results') %></td>
+      <td colspan="5" align="left"><%= message('no_results') %></td>
     </tr>
   <% end
 
-- 
2.39.5