aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorstephenbroyer <stephen.broyer@sonarsource.com>2013-10-18 15:44:23 +0200
committerstephenbroyer <stephen.broyer@sonarsource.com>2013-10-18 15:44:23 +0200
commit5ab7cddb443433a1bc4852404524de33374d0290 (patch)
treedfa533adf5b7fa512ad3b61a6cd6749af93182ca /sonar-server
parentfc189032468eda359146fa22ed8b4a68e28a29a8 (diff)
downloadsonarqube-5ab7cddb443433a1bc4852404524de33374d0290.tar.gz
sonarqube-5ab7cddb443433a1bc4852404524de33374d0290.zip
SONAR-4758 Use modal windows in Users pages
(small adjustements)
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_form.html.erb2
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/users/_edit_form.html.erb2
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb4
3 files changed, 4 insertions, 4 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_form.html.erb
index 3b6a1542731..222770eb8b8 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/users/_change_password_form.html.erb
@@ -1,7 +1,7 @@
<% form_for :user, @user, :url => { :id => @user.id, :action => 'update_password'}, :html => { :id =>'user_form', :method => @user.id.nil? ? :post : :put} do |f| %>
<fieldset>
<div class="modal-head">
- <h2>Change password &nbsp;for user&nbsp;<%= @user.login %></h2>
+ <h2>Change password for user: <%= @user.login %></h2>
</div>
<div class="modal-body">
<% if @errors
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 ba482546645..5291f995a66 100644
--- 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,7 +1,7 @@
<% 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>
+ <h2>Edit user: <%= @user.login %></h2>
</div>
<div class="modal-body">
<% if @errors
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 12757c657b2..d32f76f979f 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
@@ -39,8 +39,8 @@
:class => 'link-action link-red',
:id => "delete-#{user.login}",
:confirm_button => message('delete'),
- :confirm_title => 'Delete user '+user.name,
- :confirm_msg => 'Warning : are you sure to delete this user?',
+ :confirm_title => 'Delete user: '+user.login,
+ :confirm_msg => 'Warning : are you sure to delete the user "' + user.name+'"?' ,
:confirm_msg_params => [user.name]
-%>
</td>