Improve rendering of operations in administration consoles of users and groups

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb
index bfa438fdc153f3036fd8254c0f83135eb5a6406e..52f8ea303f756bf0303b59e125e4d8a9f175444b 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb
@@ -22,10 +22,10 @@
               <span id="count-<%= u group.name -%>"><%= group.users.count %></span> (<%= link_to "select", { :action => 'select_user', :id => group.id}, {:id => "select-#{u group.name}", :class => 'link-action'} %>)
             </td>
             <td class="left">
-              <%= link_to "edit", { :action => 'index', :id => group.id}, 
+              <%= link_to "Edit", { :action => 'index', :id => group.id},
                                   { :method => :get, :id => "edit-#{u group.name}", :class => 'link-action'} %>
-               
-              <%= link_to "delete", { :action => 'destroy', :id => group.id}, 
+              |
+              <%= link_to "Delete", { :action => 'destroy', :id => group.id},
                                     {:confirm => "Are you sure to delete this group ? Members will not be deleted.", :class => 'link-action', :method => 'get', :id => "delete-#{u group.name}"} %>
             </td>
           </tr>
@@ -62,7 +62,7 @@
         <tr>
           <td class="left"  nowrap="nowrap" valign="top" colspan="2">
             <%= submit_tag @group.id.nil? ? 'Create':'Update' %>
-            <%= link_to 'cancel', { :controller => 'groups', :action => 'index', :id => nil}, { :class => 'action' } %><br/>
+            <%= link_to 'Cancel', { :controller => 'groups', :action => 'index', :id => nil}, { :class => 'action' } %><br/>
           </td>
         </tr>
       </tbody>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb
index 6139b0713df58edf95ac6ce1cdfd6e18732e1a65..def16e51634d07976d5bdf6ea2dfe607fcd69f09 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb
@@ -23,11 +23,12 @@
                 <%= user.groups.sort.map(&:name).join(', ') %> (<%= link_to "select", {:action => 'select_group', :id => user.id}, {:id => "select-#{u user.login}", :class => 'link-action'} %>)
               </td>
               <td class="left" valign="top">
-                <%= link_to "edit", { :id => user.id, :action => 'edit'}, {:id => "edit-#{u user.login}", :class => 'link-action'} %>
-                
-                <%= link_to "change password", { :id => user.id, :action => 'change_password'}, {:id => "change-password-#{u user.login}", :class => 'link-action'} %>
-                
-                <%= link_to "delete", {:action => 'destroy', :id => user.id}, {:confirm => "Warning : are you sure to delete this user ?", :method => 'delete', :id => "delete-#{u user.login}", :class => 'link-action'} %>
+                <%= link_to "Edit", { :id => user.id, :action => 'edit'}, {:id => "edit-#{u user.login}", :class => 'link-action'} %>
+                |
+                <%= link_to "Change password", { :id => user.id, :action => 'change_password'}, {:id => "change-password-#{u user.login}", :class => 'link-action'} %>
+                |
+                <%= link_to "Delete", {:action => 'destroy', :id => user.id}, {:confirm => "Warning : are you sure to delete this user ?", :method => 'delete',
+                                                                               :id => "delete-#{u user.login}", :class => 'link-action'} %>
               </td>
             </tr>
           <% end %>
@@ -113,7 +114,7 @@
         <tr>
           <td class="left"  nowrap="nowrap" valign="top" colspan="2">
             <%= submit_tag submit_button_label %>
-            <%= link_to 'cancel', { :controller => 'users', :action => 'index'}, { :class => 'action' } %><br/>
+            <%= link_to 'Cancel', { :controller => 'users', :action => 'index'}, { :class => 'action' } %><br/>
           </td>
         </tr>
       </table>