diff options
| author | stephenbroyer <stephen.broyer@sonarsource.com> | 2013-10-11 09:42:04 +0200 |
|---|---|---|
| committer | stephenbroyer <stephen.broyer@sonarsource.com> | 2013-10-11 09:42:22 +0200 |
| commit | 7983daba67887b0b00085bfe0c3db0f3fc612fa5 (patch) | |
| tree | d3b9d65e40ca2762f21df19bc437a496f4838d0c /sonar-server | |
| parent | 5d5c93e5c4181fc8cbdfaf6dba7b091fb8b0e16c (diff) | |
| download | sonarqube-7983daba67887b0b00085bfe0c3db0f3fc612fa5.tar.gz sonarqube-7983daba67887b0b00085bfe0c3db0f3fc612fa5.zip | |
SONAR-4758 Use modal windows in Users pages
(change title of modal windows with user login)
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_modal_form.html.erb | 5 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_modal_form.html.erb | 5 |
2 files changed, 4 insertions, 6 deletions
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 149464eda2d..e13d7e6065d 100644 --- 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 %> for user <%= @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 6d3ef258eba..c78ab4290f5 100644 --- 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 %> <%= @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 %> |