From 6556c92c87c17bf4b3c5002f10c54d2d2b594dff Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 11 Jul 2012 17:27:54 +0000
Subject: [PATCH] See ChangeLog

Monotone-Parent: 0012ddb107483154b76c08f33a7b8437b5309529
Monotone-Revision: 975e40192e290b5aa4bc5c5b99a12b299d84fa5a

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T17:27:54
---
 ChangeLog                                     |  4 ++
 .../SchedulerUI/UIxCalendarProperties.wox     | 50 ++++++++++---------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd21751bb..cb773ecb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 	new defaults. Also added documentation in the SOGo Installation
 	and Configuration Guide.
 
+	* Updated UI/Templates/SchedulerUI/UIxCalendarProperties.wox to not
+	show the notification options if it's a web calendar or if the active
+	user isn't the owner of the calendar.
+
 2012-07-09  Ludovic Marcotte <lmarcotte@inverse.ca>
 
 	* Dropped old templates (SOGoAptMailDeletionReceipt.wox
diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index 285ffe274..375a33623 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -103,29 +103,33 @@
                 /></label></div></var:if>
       </fieldset>
 
-      <fieldset>
-	<legend><var:string label:value="Notifications"/></legend>
-        <div><label
-            ><input type="checkbox" const:class="checkBox"
-              id="notifyOnPersonalModifications" var:checked="notifyOnPersonalModifications"
-              /><var:string label:value="Receive a mail when I modify my calendar"/></label></div>
-        <div><label
-            ><input type="checkbox" const:class="checkBox" 
-              id="notifyOnExternalModifications" var:checked="notifyOnExternalModifications"
-              /><var:string label:value="Receive a mail when someone else modifies my calendar"
-              /></label></div>
-        <div><label
-            ><input type="checkbox" const:class="checkBox" 
-              id="notifyUserOnPersonalModifications" var:checked="notifyUserOnPersonalModifications"
-              /><var:string label:value="When I modify my calendar, send a mail to:"
-              /></label></div>
-        <div><span class="label"
-            ><entity name="nbsp"/></span><span class="content">
-             <input type="text" name="notifiedUserOnPersonalModifications" id="notifiedUserOnPersonalModifications"
-                    class="textField"
-                    var:value="notifiedUserOnPersonalModifications"
-             /></span></div>
-      </fieldset>
+      <var:if condition="isWebCalendar" const:negate="YES">
+	      <var:if condition="calendar.activeUserIsOwner">
+		<fieldset>
+		  <legend><var:string label:value="Notifications"/></legend>
+		  <div><label
+			   ><input type="checkbox" const:class="checkBox"
+			   id="notifyOnPersonalModifications" var:checked="notifyOnPersonalModifications"
+			   /><var:string label:value="Receive a mail when I modify my calendar"/></label></div>
+		  <div><label
+			   ><input type="checkbox" const:class="checkBox" 
+			   id="notifyOnExternalModifications" var:checked="notifyOnExternalModifications"
+			   /><var:string label:value="Receive a mail when someone else modifies my calendar"
+			   /></label></div>
+		  <div><label
+			   ><input type="checkbox" const:class="checkBox" 
+			   id="notifyUserOnPersonalModifications" var:checked="notifyUserOnPersonalModifications"
+			   /><var:string label:value="When I modify my calendar, send a mail to:"
+			   /></label></div>
+		  <div><span class="label"
+			     ><entity name="nbsp"/></span><span class="content">
+		  <input type="text" name="notifiedUserOnPersonalModifications" id="notifiedUserOnPersonalModifications"
+			 class="textField"
+			 var:value="notifiedUserOnPersonalModifications"
+			 /></span></div>
+		</fieldset>
+	      </var:if>
+      </var:if>
 
     </div>
     <div id="davLinksView" class="tab">