SONAR-4758 Use modal windows in Users pages

(modifications needed to do IT)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_create_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/users/_create_form.html.erb
index 03cfadafbe7547a5fa41b35db433d93a8d35e382..445e00d1d6d2562a604d0e0e34258695f1d0418e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_create_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/users/_create_form.html.erb
@@ -1,4 +1,4 @@
-<% form_for :user, @user, :url => { :id => @user.id, :action => 'create' }, :html => { :id =>'user_form', :method => @user.id.nil? ?  :post : :put} do |f| %>
+<% form_for :user, @user, :url => { :id => @user.id, :action => 'create' }, :html => { :id =>'user_create_form', :method => @user.id.nil? ?  :post : :put} do |f| %>
   <fieldset>
     <div class="modal-head">
       <h2>Add new user</h2>
@@ -37,5 +37,5 @@
 <% end %>
 
 <script>
-  $j("#user_form").modalForm();
+  $j("#user_create_form").modalForm();
 </script>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_form.html.erb
index 18fb61fa69b67ee7d8c879446c1c29bf3b401a48..ba48254664529afc471ff381e90f4e51f1f484d9 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_form.html.erb
@@ -1,4 +1,4 @@
-<% form_for :user, @user, :url => { :id => @user.id, :action => 'update'}, :html => { :id =>'user_form', :method => @user.id.nil? ?  :post : :put} do |f| %>
+<% form_for :user, @user, :url => { :id => @user.id, :action => 'update'}, :html => { :id =>'user_edit_form', :method => @user.id.nil? ?  :post : :put} do |f| %>
   <fieldset>
       <div class="modal-head">
           <h2>Edit user &nbsp;<%= @user.login %></h2>
@@ -35,5 +35,5 @@
 <% end %>
 
 <script>
-  $j("#user_form").modalForm();
+  $j("#user_edit_form").modalForm();
 </script>
\ No newline at end of file

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 ee6bb23193d789f4f8a61aae9b9fee2db766d62d..e0481b78cb451237a4b61947dc4c98b0fcf10995 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
@@ -2,7 +2,7 @@
     <% if profiles_administrator? %>
       <ul style="float: right" class="horizontal">
           <li class="marginleft10 add">
-              <a href="<%=ApplicationController.root_context-%>/users/create_form" class="open-modal link-action">Add new user</a>
+              <a id="create-link-user" href="<%=ApplicationController.root_context-%>/users/create_form" id="create-link-user" class="open-modal link-action">Add new user</a>
           </li>
       </ul>
     <% end %>
@@ -32,14 +32,14 @@
                 <%= 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">
-                <a id="edit-<%= user.name -%>" class="open-modal link-action" href="<%=ApplicationController.root_context-%>/users/edit_form/<%= user.id -%>">Edit</a>
+                <a id="edit-<%= user.login -%>" class="open-modal link-action" href="<%=ApplicationController.root_context-%>/users/edit_form/<%= user.id -%>">Edit</a>
                 &nbsp;
                <%= link_to "Change password", { :id => user.id, :action => 'change_password_form'}, {:id => "change-password-#{u user.login}", :class => 'open-modal link-action'} %>
               </td>
               <td>
                 <%= link_to_action message('delete'), "#{ApplicationController.root_context}/users/delete/#{user.id}",
                                    :class => 'link-action link-red',
-                                   :id => "delete_#{user.id}",
+                                   :id => "delete-#{user.login}",
                                    :confirm_button => message('delete'),
                                    :confirm_title => 'Delete user '+user.name,
                                    :confirm_msg => 'Warning : are you sure to delete this user?',