SONAR-4758 Use modal windows in Users pages

(change title of modal windows with user login)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_modal_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_modal_form.html.erb
index 149464eda2d2e1023bb3610b243ea9781848fcc6..e13d7e6065d02d1ba0aba11e2e4284c8bb87f872 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_modal_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_modal_form.html.erb
@@ -6,7 +6,7 @@
 <% form_for :user, @user, :url => { :id => @user.id, :action => action_name}, :html => { :id =>'user_modal_form', :method => @user.id.nil? ?  :post : :put} do |f| %>
   <fieldset>
       <div class="modal-head">
-          <h2><%= title %></h2>
+          <h2><%= title %>&nbsp;for user&nbsp;<%= @user.login %></h2>
       </div>
       <div class="modal-body">
         <% if @errors
@@ -16,9 +16,8 @@
           <% end
              end
           %>
-        <div class="modal-field"><label for="user[login]">Login<em class="mandatory">*</em></label>
+        <div class="modal-field">
             <% if @user.id %>
-              <%= @user.login %>
               <%= f.hidden_field :login %>
             <% else %>
               <%= f.text_field :login, :size => 30, :maxLength => 40 %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_modal_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_modal_form.html.erb
index 6d3ef258ebaf5119a339971a6651e2de0ba5f24b..c78ab4290f5b5bd1cb3777f286fcafa1c58014ab 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_modal_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_modal_form.html.erb
@@ -6,7 +6,7 @@
 <% form_for :user, @user, :url => { :id => @user.id, :action => action_name}, :html => { :id =>'user_modal_form', :method => @user.id.nil? ?  :post : :put} do |f| %>
   <fieldset>
       <div class="modal-head">
-          <h2><%= title %></h2>
+          <h2><%= title %>&nbsp;<%= @user.login %></h2>
       </div>
       <div class="modal-body">
         <% if @errors
@@ -16,9 +16,8 @@
           <% end
              end
           %>
-        <div class="modal-field"><label for="user[login]">Login<em class="mandatory">*</em></label>
+        <div class="modal-field">
           <% if @user.id %>
-            <%= @user.login %>
             <%= f.hidden_field :login %>
           <% else %>
             <%= f.text_field :login, :size => 30, :maxLength => 40 %>