From 3a875a433d7d1fe25eba80196a7432ba2ae7d188 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 23 Nov 2015 23:32:45 +0000
Subject: [PATCH] Changes to event icons: - Show private flag to users who can
 see the data - Include app icon for other app entries

---
 calendar/js/et2_widget_event.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js
index 129f7fe8a7..5ac2e3b6e1 100644
--- a/calendar/js/et2_widget_event.js
+++ b/calendar/js/et2_widget_event.js
@@ -370,17 +370,27 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
 	 */
 	_icons: function() {
 		var icons = [];
-		
+
 		if(this.options.value.is_private)
 		{
+			// Hide everything
 			icons.push('<img src="'+this.egw().image('private','calendar')+'"/>');
 		}
 		else
 		{
+			if(this.options.value.app !== 'calendar')
+			{
+				icons.push('<img src="'+this.egw().image('navbar',this.options.value.app)+'" title="'+this.egw().lang(this.options.value.app)+'"/>');
+			}
 			if(this.options.value.priority == 3)
 			{
 				icons.push('<img src="'+this.egw().image('high','calendar')+'" title="'+this.egw().lang('high priority')+'"/>');
 			}
+			if(this.options.value.public == '0')
+			{
+				// Show private flag
+				icons.push('<img src="'+this.egw().image('private','calendar')+'"/>');
+			}
 			if(this.options.value['recur_type'])
 			{
 				icons.push('<img src="'+this.egw().image('recur','calendar')+'" title="'+this.egw().lang('recurring event')+'"/>');