SONAR-4466 Labels and display adjustments

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 71b471a9bf06d3dfd32c5e3fc273a8332fdae092..825e2468e5e0c3d0a0eb66654dca476001d74d4a 100644 (file)
--- 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 fd8d4c24c7fb3f67da631de7542f5292f8bf53ae..16f65a695b4c9576d804c7a2fe84ffc0ce3f4b91 100644 (file)
--- 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 7d744cd31208d8bbe670201889559aeb163516e7..ecc74d213dffac4179a30c8728e0af94e272eb25 100644 (file)
--- 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