SONAR-4628 Move the "Browse" permission before the "Administer" permission

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 cc1ec6b42d47ebe234cbb2482eff3b4a93b57f1e..e948e83a56692e38b8ac6ce8fbca35ae62070fe0 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
@@ -17,14 +17,14 @@
   <thead>
   <tr valign="top">
     <th class="left" width="20%"><%= message('name') -%></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.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.codeviewer') -%><br/>
       <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.codeviewer.desc') -%></span>
@@ -45,7 +45,7 @@
       <td valign="top"><b><%= h permission_template.name %></b><br/>
         <span class="small gray"><%= h permission_template.description -%></span>
       </td>
-      <% ['admin', 'user', 'codeviewer'].each do |permission| -%>
+      <% ['user', 'admin', 'codeviewer'].each do |permission| -%>
         <td valign="top">
           <%
              users=Api::Utils.insensitive_sort(permission_template.getUsersForPermission(permission).collect {|u| u.userName})

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 06a1dfd71f5be0b89b41c4c9ff2b045a626b9fe9..776982f3f63c876827e760373f4332a47ff7d6fc 100644 (file)
--- 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,14 +3,14 @@
   <thead>
   <tr>
     <th>&nbsp;</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.admin') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.admin.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>
@@ -21,7 +21,7 @@
   <tr class="even">
     <td valign="top"><b>Users</b></td>
 
-    <% ['admin', 'user', 'codeviewer'].each do |permission| -%>
+    <% ['user', 'admin', 'codeviewer'].each do |permission| -%>
       <td valign="top">
         <span id="<%= permission -%>-role-users"><%= users(permission, @project.id).map(&:name).join(', ') %></span>
         (<%= link_to_edit_roles_permission_form(message('select'), permission, @project.id, "select-#{permission}-edit-users") %>)<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 b04a00ac6a0e78fed7b7c05301d6ff5b84fbc08b..55b524732549d3835628dac1fee92112c68b18e2 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
@@ -45,14 +45,14 @@
   <thead>
   <tr>
     <th>&nbsp;</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.admin') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.admin.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>
@@ -79,7 +79,7 @@
       <td valign="top"><b><%= h project.name %></b><br/>
         <span class="small gray"><%= h project.key -%></span>
       </td>
-      <% ['admin', 'user', 'codeviewer'].each do |permission| -%>
+      <% ['user', 'admin', 'codeviewer'].each do |permission| -%>
         <td valign="top">
           <%
              users=Api::Utils.insensitive_sort(project.user_roles.select { |ur| ur.role==permission }.map { |ur| ur.user.name })