[CalendarServer-changes] [8095] CalendarServer/trunk/twistedcaldav/mail.py

[source_changes at macosforge.org]

Revision: 8095
          http://trac.macosforge.org/projects/calendarserver/changeset/8095
Author:   sagen at apple.com
Date:     2011-09-13 16:00:18 -0700 (Tue, 13 Sep 2011)
Log Message:
-----------
Adds URL to imip invites

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/mail.py

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2011-09-13 22:10:04 UTC (rev 8094)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2011-09-13 23:00:18 UTC (rev 8095)
@@ -105,6 +105,7 @@
 %(dateLabel)s: %(dateInfo)s %(recurrenceInfo)s
 %(timeLabel)s: %(timeInfo)s %(durationInfo)s
 %(descLabel)s: %(description)s
+%(urlLabel)s: %(url)s
 %(attLabel)s: %(plainAttendees)s
 """
 
@@ -146,6 +147,9 @@
     <h3>%(descLabel)s:</h3> %(description)s
     </p>
     <p>
+    <h3>%(urlLabel)s:</h3> <a href="%(url)s">%(url)s</a>
+    </p>
+    <p>
     <h3>%(attLabel)s:</h3> %(htmlAttendees)s
     </p>
     """.encode("utf-8")
@@ -266,6 +270,7 @@
             durationLabel = _("Duration"),
             recurrenceLabel = _("Occurs"),
             descLabel = _("Description"),
+            urlLabel = _("URL"),
             orgLabel = _("Organizer"),
             attLabel = _("Attendees"),
             locLabel = _("Location"),
@@ -1541,7 +1546,8 @@
     def getEventDetails(self, calendar, language='en'):
         """
         Create a dictionary mapping slot names - specifically: summary,
-        description, location, dateInfo, timeInfo, durationInfo, recurrenceInfo
+        description, location, dateInfo, timeInfo, durationInfo, recurrenceInfo,
+        url
         - with localized string values that should be placed into the HTML and
         plain-text templates.
 
@@ -1569,7 +1575,7 @@
         results['month'] = dtStart.getMonth()
         results['day'] = dtStart.getDay()
 
-        for propertyToResult in ['summary', 'description', 'location']:
+        for propertyToResult in ['summary', 'description', 'location', 'url']:
             result = component.propertyValue(propertyToResult.upper())
             if result is None:
                 result = u""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110913/33c49fcc/attachment.html>