From c7cbd41c16e36a6244ada6d4317dcd390e8dde0d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 26 Nov 2015 12:26:27 +0100
Subject: first iteration on the event item

---
 view/tpl/conv_item.tpl   | 5 +++++
 view/tpl/conv_list.tpl   | 5 +++++
 view/tpl/search_item.tpl | 5 +++++
 3 files changed, 15 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 5257b3ed6..206ee245e 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -13,6 +13,11 @@
 					{{$item.photo}}
 				</div>
 				{{/if}}
+				{{if $item.event}}
+				<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
+					{{$item.event}}
+				</div>
+				{{/if}}
 				<div class="wall-item-head">
 					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
 						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 53f65bc78..cf1310ea6 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -13,6 +13,11 @@
 					{{$item.photo}}
 				</div>
 				{{/if}}
+				{{if $item.event}}
+				<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
+					{{$item.event}}
+				</div>
+				{{/if}}
 				<div class="wall-item-head">
 					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
 						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index b44e1c39e..b2689c7ba 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -7,6 +7,11 @@
 				{{$item.photo}}
 			</div>
 			{{/if}}
+			{{if $item.event}}
+			<div class="wall-event-item" id="wall-event-item-{{$item.id}}">
+				{{$item.event}}
+			</div>
+			{{/if}}
 			<div class="wall-item-head">
 				<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
 					<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
-- 
cgit v1.2.3


From 8e3b796a2ff28d1c46fbae9d2b029e9f7252c0dc Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 26 Nov 2015 16:38:14 +0100
Subject: fix event rendering

---
 view/tpl/event_head.tpl | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index ec43d7ab7..05d58aba2 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -64,34 +64,35 @@
 			},
 
 			eventRender: function(event, element, view) {
+
 				//console.log(view.name);
 				if (event.item['author']['xchan_name']==null) return;
 
 				switch(view.name){
 					case "month":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
+					element.find(".fc-title").html(
+						"<img src='{0}' style='height:10px;width:10px'>&nbsp;{1}: {2}".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title
 					));
 					break;
 					case "agendaWeek":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
+					element.find(".fc-title").html(
+						"<img src='{0}' style='height:10px; width:10px'>&nbsp;{1}: {2}<p>{3}</p>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
-							event.item.desc,
-							event.item.location
+							event.title,
+							event.item.description
 					));
 					break;
 					case "agendaDay":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
+					element.find(".fc-title").html(
+						"<img src='{0}' style='height:10px;width:10px'>&nbsp;{1}: {2}<p>{3}</p>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
-							event.item.desc,
-							event.item.location
+							event.title,
+							event.item.description
 					));
 					break;
 				}
-- 
cgit v1.2.3


From c407e72dcc4d4f892e88e8260e662104586695f2 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 26 Nov 2015 16:40:40 +0100
Subject: add location

---
 view/tpl/event_head.tpl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 05d58aba2..4362360d3 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -79,20 +79,22 @@
 					break;
 					case "agendaWeek":
 					element.find(".fc-title").html(
-						"<img src='{0}' style='height:10px; width:10px'>&nbsp;{1}: {2}<p>{3}</p>".format(
+						"<img src='{0}' style='height:10px; width:10px'>&nbsp;{1}: {2}<p>{3}</p><p>{4}</p>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
-							event.item.description
+							event.item.description,
+							event.item.location
 					));
 					break;
 					case "agendaDay":
 					element.find(".fc-title").html(
-						"<img src='{0}' style='height:10px;width:10px'>&nbsp;{1}: {2}<p>{3}</p>".format(
+						"<img src='{0}' style='height:10px;width:10px'>&nbsp;{1}: {2}<p>{3}</p><p>{4}</p>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
-							event.item.description
+							event.item.description,
+							event.item.location
 					));
 					break;
 				}
-- 
cgit v1.2.3