From b44dcc9f30d9e3c5a3d15075fe40073b4188aab5 Mon Sep 17 00:00:00 2001
From: GzoT <gzot@users.noreply.github.com>
Date: Fri, 24 Jun 2016 09:15:12 +0000
Subject: [PATCH 1/3] Not display title and/or message if they are not provided
 (alert module)

---
 modules/default/alert/alert.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js
index 084161ac..3099471d 100644
--- a/modules/default/alert/alert.js
+++ b/modules/default/alert/alert.js
@@ -35,9 +35,17 @@ Module.register("alert",{
 	},
 	show_notification: function(message) {
 		if (this.config.effect == "slide") {this.config.effect = this.config.effect + "-" + this.config.position;}
-		message = "<span class='thin' style='line-height: 35px; font-size:24px' color='#4A4A4A'>" + message.title + "</span><br /><span class='light' style='font-size:28px;line-height: 30px;'>" + message.message + "</span>";
+		
+		msg = "";
+		if (message.title) {
+			msg += "<span class='thin' style='line-height: 35px; font-size:24px' color='#4A4A4A'>" + message.title + "</span>";
+		}
+		if (message.message){
+			msg += "<br /><span class='light' style='font-size:28px;line-height: 30px;'>" + message.message + "</span>";
+		}
+		
 		new NotificationFx({
-			message: message,
+			message: msg,
 			layout: "growl",
 			effect: this.config.effect,
 			ttl: this.config.display_time
@@ -67,7 +75,15 @@ Module.register("alert",{
 			this.hide_alert(sender);
 		}
 
-		message = "<span class='light' style='line-height: 35px; font-size:30px' color='#4A4A4A'>" + params.title + "</span><br /><span class='thin' style='font-size:22px;line-height: 30px;'>" + params.message + "</span>";
+		//Display title and message only if they are provided in notification parameters
+		message ="";
+		if (params.title) {
+			message += "<span class='light' style='line-height: 35px; font-size:30px' color='#4A4A4A'>" + params.title + "</span>"
+		}
+		if (params.message) {
+			message += "<br /><span class='thin' style='font-size:22px;line-height: 30px;'>" + params.message + "</span>";
+		}
+
 		//Store alert in this.alerts
 		this.alerts[sender.name] = new NotificationFx({
 			message: image + message,

From ccdc981756c45f24b0455a53da948346b4378bcb Mon Sep 17 00:00:00 2001
From: GzoT <gzot@users.noreply.github.com>
Date: Mon, 27 Jun 2016 16:15:53 +0000
Subject: [PATCH 2/3] small fix

---
 modules/default/alert/alert.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js
index 3099471d..cc25a31c 100644
--- a/modules/default/alert/alert.js
+++ b/modules/default/alert/alert.js
@@ -41,7 +41,10 @@ Module.register("alert",{
 			msg += "<span class='thin' style='line-height: 35px; font-size:24px' color='#4A4A4A'>" + message.title + "</span>";
 		}
 		if (message.message){
-			msg += "<br /><span class='light' style='font-size:28px;line-height: 30px;'>" + message.message + "</span>";
+			if (msg != ""){
+				msg+= "<br />";
+			}
+			msg += "<span class='light' style='font-size:28px;line-height: 30px;'>" + message.message + "</span>";
 		}
 		
 		new NotificationFx({
@@ -81,7 +84,11 @@ Module.register("alert",{
 			message += "<span class='light' style='line-height: 35px; font-size:30px' color='#4A4A4A'>" + params.title + "</span>"
 		}
 		if (params.message) {
-			message += "<br /><span class='thin' style='font-size:22px;line-height: 30px;'>" + params.message + "</span>";
+			if (message != ""){
+				message += "<br />";
+			}
+
+			message += "<span class='thin' style='font-size:22px;line-height: 30px;'>" + params.message + "</span>";
 		}
 
 		//Store alert in this.alerts

From 1b9daa0adb9e0fa36f6600658547774198eaa6e2 Mon Sep 17 00:00:00 2001
From: GzoT <gzot@users.noreply.github.com>
Date: Mon, 27 Jun 2016 16:34:51 +0000
Subject: [PATCH 3/3] Fix #300

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7fe1729..829faf6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Polish Translation
 
 ### Fixed
+- Edit Alert Module to display title & message if they are provided in the notification (Issue #300)
 
 ### Changed
 - Added default string to calendar titleReplace.