Fixes to form e-mails

Issue #412

nunaliit2-couch-command/src/main/java/ca/carleton/gcrc/couch/command/servlet/ConfigServlet.java

@@ -557,6 +557,7 @@ private void initMail(ServletContext servletContext) throws ServletException {
 			// Mail Service
 			{
 				MailServletConfiguration mailServletConfiguration = new MailServletConfiguration();
+				mailServletConfiguration.setAtlasName(atlasProperties.getAtlasName());
 				mailServletConfiguration.setMailDelivery(mailDelivery);
 				mailServletConfiguration.setRecipients(mailServiceRecipients);
 				servletContext.setAttribute(MailServletConfiguration.CONFIGURATION_KEY, mailServletConfiguration);

nunaliit2-js/src/main/js/nunaliit2/css/basic/n2.widget.css

@@ -540,4 +540,9 @@ Mail Form
 .n2mailForm_button {
 	float: right;
 	padding: 5px;
+}
+
+.n2mailForm_button_disabled {
+	color: #ccc !important;
+	pointer-events: none;
 }

nunaliit2-js/src/main/js/nunaliit2/n2.mail.js

@@ -153,8 +153,8 @@ var MailService = $n2.Class({
 			return;
 		};
 
-		if( !request.message 
-		 || (typeof request.message === 'string' && request.message.length < 1) ){
+		if( !request.body 
+		 || (typeof request.body === 'string' && request.body.length < 1) ){
 			opts.onError( _loc('You must provide a message') );
 			return;
 		};
@@ -201,7 +201,7 @@ var MailService = $n2.Class({
 			.appendTo($content);
 
 		$('<textarea>')
-			.addClass('n2mailForm_input n2mailForm_input_contact')
+			.addClass('n2mailForm_input n2mailForm_processing_element n2mailForm_input_contact')
 			.attr('placeholder', _loc('Information to contact you'))
 			.appendTo($content);
 
@@ -211,7 +211,7 @@ var MailService = $n2.Class({
 			.appendTo($content);
 
 		$('<textarea>')
-			.addClass('n2mailForm_input n2mailForm_input_message')
+			.addClass('n2mailForm_input n2mailForm_processing_element n2mailForm_input_message')
 			.appendTo($content);
 
 		var $buttons = $('<div>')
@@ -236,9 +236,8 @@ var MailService = $n2.Class({
 			.appendTo($buttons)
 			.click(function(){
 				var $diag = $('#'+diagId);
-				$diag.find('input').attr('disabled','disabled');
-				$diag.find('textarea').attr('disabled','disabled');
-				$diag.find('.n2mailForm_button').addClass('n2mailForm_button_cancel');
+				$diag.find('.n2mailForm_processing_element').attr('disabled','disabled');
+				$diag.find('.n2mailForm_button').addClass('n2mailForm_button_disabled');
 
 				var contact = $diag.find('.n2mailForm_input_contact').val();
 				var message = $diag.find('.n2mailForm_input_message').val();
@@ -270,7 +269,8 @@ var MailService = $n2.Class({
 							err: err
 						}) );
 						var $diag = $('#'+diagId);
-						$diag.dialog('close');
+						$diag.find('.n2mailForm_processing_element').removeAttr('disabled');
+						$diag.find('.n2mailForm_button').removeClass('n2mailForm_button_disabled');
 					}
 				});
 

nunaliit2-js/src/main/js/nunaliit2/nunaliit2.fr.js

@@ -557,7 +557,9 @@ $n2.l10n.addLocalizedStrings('fr',{
 	,"You must first log in to create a new document.":"Vous devez ouvrir une session avant de créer un document."
 	,"You must leave the atlas to view this file.":"Vous devez quitter l'atlas pour accéder à ce fichier."
 	,"You must provide a display name":"Vous devez préciser un nom d'affichage"
+	,"You must provide a message":"Vous devez fournir un message"
 	,"You must provide a password":"Vous devez préciser un mot de passe"
+	,"You must provide contact information":"Vous devez fournir vos coordonnées"
 	,"You must select a file":"Vous devez précisez un fichier"
 	,"Your browser is not supported by this web site.":"Votre fureteur est incompatible avec ce site"
 	,"Your file was uploaded and will become available when it has been approved.":"Votre fichier est téléchargé. Il sera disponible lorsqu'un adminitrateur l'aura approuvé"

nunaliit2-mail/src/main/java/ca/carleton/gcrc/mail/MailServiceActions.java

@@ -12,10 +12,15 @@ public class MailServiceActions {
 
 	final protected Logger logger = LoggerFactory.getLogger(this.getClass());
 
+	private String atlasName;
 	private MailDelivery mailDelivery;
 	private MailServiceRecipients mailRecipients;
 
-	public MailServiceActions(MailDelivery mailDelivery, MailServiceRecipients mailRecipients){
+	public MailServiceActions(
+			String atlasName, 
+			MailDelivery mailDelivery, 
+			MailServiceRecipients mailRecipients ){
+		this.atlasName = atlasName;
 		this.mailDelivery = mailDelivery;
 		this.mailRecipients = mailRecipients;
 	}
@@ -60,8 +65,14 @@ public JSONObject sendFormEmail(String destination, String contactInfo, String b
 			StringWriter sw = new StringWriter();
 			PrintWriter pw = new PrintWriter(sw);
 
-			pw.println("<p><b>Destination:</b> "+destination+"</p>");
-			pw.println();
+			if( null != atlasName ){
+				pw.println("<p><b>Atlas:</b> "+atlasName+"</p>");
+				pw.println();
+			}
+			if( null != destination ){
+				pw.println("<p><b>Destination:</b> "+destination+"</p>");
+				pw.println();
+			}
 			pw.println("<p><b>Contact:</b> <pre>");
 			pw.println(contactInfo);
 			pw.println("</pre></p>");

nunaliit2-mail/src/main/java/ca/carleton/gcrc/mail/MailServlet.java

@@ -39,6 +39,7 @@ public void init(ServletConfig config) throws ServletException {
 			configuration = (MailServletConfiguration)configurationObj;
 
 			mailActions = new MailServiceActions(
+					configuration.getAtlasName(),
 					configuration.getMailDelivery(),
 					configuration.getRecipients()
 					);

nunaliit2-mail/src/main/java/ca/carleton/gcrc/mail/MailServletConfiguration.java

@@ -4,9 +4,18 @@ public class MailServletConfiguration {
 
 	final static public String CONFIGURATION_KEY = "MAIL_SERVLET_CONFIGURATION";
 
+	private String atlasName;
 	private MailDelivery mailDelivery;
 	private MailServiceRecipients recipients;
 
+	public String getAtlasName() {
+		return atlasName;
+	}
+
+	public void setAtlasName(String atlasName) {
+		this.atlasName = atlasName;
+	}
+
 	public MailDelivery getMailDelivery() {
 		return mailDelivery;
 	}