Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-25 02:16:14 -0500
committerWinston Prakash2011-12-01 20:47:32 -0500
commit1bd14830a3262f92002654e0d05cd95d0501eeec (patch)
treec94939824c4481f2f3e42067423e071b7f252939 /hudson-core/src/main/resources/hudson
parenta360fdb020921bd503e4e31b66557875d54c72d6 (diff)
downloadorg.eclipse.hudson.core-1bd14830a3262f92002654e0d05cd95d0501eeec.tar.gz
org.eclipse.hudson.core-1bd14830a3262f92002654e0d05cd95d0501eeec.tar.xz
org.eclipse.hudson.core-1bd14830a3262f92002654e0d05cd95d0501eeec.zip
FIxed HUDSON-8938 (Option to notify user of Hudson account creation Refactored MailSender in order to simplify the logic Improved mail templates.
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
Diffstat (limited to 'hudson-core/src/main/resources/hudson')
-rw-r--r--hudson-core/src/main/resources/hudson/mail/Messages.properties10
-rw-r--r--hudson-core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly7
2 files changed, 14 insertions, 3 deletions
diff --git a/hudson-core/src/main/resources/hudson/mail/Messages.properties b/hudson-core/src/main/resources/hudson/mail/Messages.properties
new file mode 100644
index 00000000..9765f8d6
--- /dev/null
+++ b/hudson-core/src/main/resources/hudson/mail/Messages.properties
@@ -0,0 +1,10 @@
+hudson.email.subject.prefix=[Hudson]
+
+hudson.email.footer=\n--\nThis message is automatically generated by Hudson. \n\
+For more information on Hudson, see: http://hudson-ci.org/
+
+account.creation.email.text=Dear {0} \n\nYou have signed up for a Hudson account at: {1} \n\
+Here are the details of your account: \n--------------------------------------------------------------------- \
+\n Email: {2}\n Username: {3}\n Password: {4}\n\n\
+You can change the password on the page: {1}securityRealm/user/{3}/configure
+account.creation.email.subject=Account signup \ No newline at end of file
diff --git a/hudson-core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly b/hudson-core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
index 0fa3df74..e0c8e8e5 100644
--- a/hudson-core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
+++ b/hudson-core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
@@ -1,6 +1,6 @@
<!-- **************************************************************************
#
-# Copyright (c) 2004-2010 Oracle Corporation.
+# Copyright (c) 2004-2011 Oracle Corporation.
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
@@ -20,7 +20,9 @@
<f:checkbox name="privateRealm.allowsSignup" checked="${h.defaultToTrue(instance.allowsSignup())}"
title="${%Allow users to sign up}"/>
- </f:entry>
+ <f:checkbox name="privateRealm.notifyUser" checked="${h.defaultToTrue(instance.isNotifyUser())}"
+ title="${%Notify user of Hudson account creation}"/>
+ </f:entry>
<j:if test="${size(h.captchaSupportDescriptors) gt 0}">
@@ -40,5 +42,4 @@
</j:forEach>
</f:dropdownList>
</j:if>
-
</j:jelly>

Back to the top