Roles and permissions labels adjustments

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 7b78c5e675351056568282556fba983a33ab7c90..9f1b13f9ba96551c6b05ea6b25f867caf0f2be6a 100644 (file)
--- 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
@@ -2260,8 +2260,8 @@ projects_role.user.desc=Ability to browse the measures and to create/edit issues
 projects_role.codeviewer=Code Viewers
 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
-projects_role.apply_template_to_xxx=Apply permission template to "{0}"
+projects_role.apply_template=Apply Permission Template
+projects_role.apply_template_to_xxx=Apply Permission Template to "{0}"
 projects_role.no_projects=There are currently no results to apply the permission template to.
 
 
@@ -2273,17 +2273,17 @@ projects_role.no_projects=There are currently no results to apply the permission
 #------------------------------------------------------------------------------
 permission_templates=Permission Templates
 permission_templates.page=Permission Templates
-permission_template.new_template=New permission template
+permission_template.new_template=New Permission Template
 permission_template.create_template=Create
-permission_template.delete_confirm_title=Delete permission template
+permission_template.delete_confirm_title=Delete Permission Template
 permission_template.do_you_want_to_delete_template_xxx=Are you sure that you want to delete permission template "{0}"?
 permission_template.delete_template=Delete
-permission_template.edit_template=Edit permission template
+permission_template.edit_template=Edit Permission Template
 permission_template.update_template=Update
-permission_template.edit_permissions=Edit permissions: {0}
+permission_template.edit_permissions=Edit Permissions: {0}
 permission_template.update_permissions=Save
 permission_template.no_results=No template to display
-permission_template.set_default_templates=Set default templates
+permission_template.set_default_templates=Set Default Templates
 
 
 #------------------------------------------------------------------------------

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 0f3cef7d04579d0e4361fb7abdeb96601cc8fecf..fc6b7231b65617379539fb1baf1cc9b399bb160b 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
@@ -1,3 +1,5 @@
+<h1 class="marginbottom10"><%= message 'roles.page' -%></h1>
+
 <%= render :partial => 'roles/tabs', :locals => {:selected_tab=>'Permission templates'} %>
 <br/>
 <div class="line-block">
@@ -10,7 +12,6 @@
       <%= link_to message('create'), {:action => :create_form}, :id => 'create-link-permission-template', :class => 'open-modal link-action' %>
     </li>
   </ul>
-  <h2>Available templates</h2>
 </div>
 <table class="data width100" id="permission-templates">
   <thead>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb
index 28db709d40d820aac74b323e9d79ece3254cb44e..4b9d4d4c5a5f80246faf0c1f81edd6122bda32e1 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb
@@ -19,7 +19,7 @@
         </div>
       <% else %>
         <div class="modal-field">
-          <%= label_tag 'template_key', 'Permission template:' %>
+          <%= label_tag 'template_key', 'Permission Template:' %>
           <%= select_tag('template_key', options_for_select(@permission_templates, -1), :style => 'width: 250px;') %>
           <% unless params[:project_name] %>
             <span style="float:right" class="note">(<%= "#{components.size} #{message('qualifier.' + qualifier)}s" %>)</span><br/>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb
index d69c032ff0c3567964dc67ffd5906e7c92c36968..0a060683c5d156ec388a990c3d7937a32f52c378 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb
@@ -8,7 +8,7 @@
   <input name="role" value="<%= @role -%>" type="hidden"/>
   <fieldset>
     <div class="modal-head">
-      <h2><%= @project ? 'Edit permissions for: ' + h(@project.name) : "Edit system permissions: #{message("global_permissions.#{@role}")}" -%></h2>
+      <h2><%= @project ? 'Edit Permissions for: ' + h(@project.name) : "Edit Global Permission: #{message("global_permissions.#{@role}")}" -%></h2>
     </div>
     <div class="modal-body">
       <div class="modal-error"/>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb
index 8f55c9e749436fe4ccf802a895286da3335e2dce..c2703c220dbf2fc1d7ad1cd20fbc68946f07fac3 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb
@@ -8,7 +8,7 @@
   <input name="role" value="<%= @role -%>" type="hidden" />
   <fieldset>
     <div class="modal-head">
-      <h2><%= @project ? 'Edit permissions for: ' + h(@project.name) : "Edit system permissions: #{message("global_permissions.#{@role}")}" -%></h2>
+      <h2><%= @project ? 'Edit Permissions for: ' + h(@project.name) : "Edit Global Permission: #{message("global_permissions.#{@role}")}" -%></h2>
     </div>
     <div class="modal-body">
       <div class="modal-error"/>

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 4a2e5a855c5a402780546011d5fdff2efc7e92f1..2a37157af768cbc0cc6b3eecb13cd49fdb2901f0 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
@@ -1,3 +1,5 @@
+<h1 class="marginbottom10"><%= message 'roles.page' -%></h1>
+
 <%= render :partial => 'roles/tabs', :locals => {:selected_tab=>'Projects'} %>
 
 <div class="tabs-panel marginbottom10 background-gray">