From 91b35c53494f0ab4b53430dd39bbbc21f019912a Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 26 Nov 2015 23:19:06 +0100
Subject: various css fixes

---
 view/tpl/event_head.tpl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'view/tpl/event_head.tpl')

diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index f587d69a0..6a38057fd 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -71,32 +71,32 @@
 				switch(view.name){
 					case "month":
 					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<span title='{3}\r\n\r\n{4}'>{2}</span>".format(
+						"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<span title='{3}{4}'>{2}</span>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
-							event.item.description,
-							event.item.location.replace(/(<([^>]+)>)/ig,"")
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
 					));
 					break;
 					case "agendaWeek":
 					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}\r\n\r\n{4}'>{2}</span>".format(
+						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
-							event.item.description,
-							event.item.location.replace(/(<([^>]+)>)/ig,"")
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
 					));
 					break;
 					case "agendaDay":
 					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}\r\n\r\n{4}'>{2}</span>".format(
+						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
-							event.item.description,
-							event.item.location.replace(/(<([^>]+)>)/ig,"")
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
 					));
 					break;
 				}
-- 
cgit v1.2.3