aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2011-08-03 12:31:27 +0200
committerSimon Brandhof <simon.brandhof@gmail.com>2011-08-03 12:31:27 +0200
commit66797a18f71b2111689a9e858e60862c288f95c0 (patch)
treed4022c4f2192df9bfdecfee12238f779ec73e8a8 /sonar-server
parent16201f701254aa492d05a623cf8b6cc69d71c0ba (diff)
downloadsonarqube-66797a18f71b2111689a9e858e60862c288f95c0.tar.gz
sonarqube-66797a18f71b2111689a9e858e60862c288f95c0.zip
Improve UI of Email administration console
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb1
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb4
2 files changed, 3 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb
index 5982b704372..e8f89b50748 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/email_configuration_controller.rb
@@ -40,6 +40,7 @@ class EmailConfigurationController < ApplicationController
Property.set(configuration::SMTP_PASSWORD, params[:smtp_password])
Property.set(configuration::FROM, params[:email_from])
Property.set(configuration::PREFIX, params[:email_prefix])
+ flash[:notice] = message('email_configuration.settings_saved')
redirect_to :action => 'index'
end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb
index d1bd745c14a..04e91ee296c 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb
@@ -39,7 +39,7 @@
</tr>
<tr>
<td></td>
- <td><%= submit_tag message('save') %></td>
+ <td><%= submit_tag message('email_configuration.save_settings'), :disable_with => message('email_configuration.saving_settings') %></td>
</tr>
</table>
<% end -%>
@@ -63,7 +63,7 @@
</tr>
<tr>
<td></td>
- <td><%= submit_tag message('email_configuration.test.send') %></td>
+ <td><%= submit_tag message('email_configuration.test.send'), :disable_with => message('email_configuration.test.sending') %></td>
</tr>
</table>
<% end -%>