diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-02-16 11:22:50 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-02-16 11:23:12 +0100 |
| commit | 8eaac596d2db9a5f3c3ce01ca7ed21966768f699 (patch) | |
| tree | 0a0c22ba8bd167f368031faa49aea4d0ca6dd07b | |
| parent | 78e0a10a5b86370f47fb1d37e1c7b0560a2b8e48 (diff) | |
| download | sonarqube-8eaac596d2db9a5f3c3ce01ca7ed21966768f699.tar.gz sonarqube-8eaac596d2db9a5f3c3ce01ca7ed21966768f699.zip | |
Improve rendering of operations in administration consoles of users and groups
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb | 8 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb | 13 |
2 files changed, 11 insertions, 10 deletions
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 bfa438fdc15..52f8ea303f7 100644 --- 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 6139b0713df..def16e51634 100644 --- 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> |