[CalendarServer-changes] [3716] CalendarServer/trunk/calendarserver/webcal/resource.py
source_changes at macosforge.org
source_changes at macosforge.org
Mon Feb 23 16:25:26 PST 2009
Revision: 3716
http://trac.macosforge.org/projects/calendarserver/changeset/3716
Author: wsanchez at apple.com
Date: 2009-02-23 16:25:25 -0800 (Mon, 23 Feb 2009)
Log Message:
-----------
Add tzid query arg
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/webcal/resource.py
Modified: CalendarServer/trunk/calendarserver/webcal/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webcal/resource.py 2009-02-24 00:16:00 UTC (rev 3715)
+++ CalendarServer/trunk/calendarserver/webcal/resource.py 2009-02-24 00:25:25 UTC (rev 3716)
@@ -82,19 +82,27 @@
#
authenticatedPrincipalURL = str(request.authnUser.childOfType(davxml.HRef))
+ def queryValue(arg):
+ query = parse_qs(urlparse(request.uri).query, True)
+ return query.get(arg, [""])[0]
+
#
# Parse debug query arg
#
- query = parse_qs(urlparse(request.uri).query)
- debug = query.get("debug", None)
- if debug is not None:
- debug = debug[0]
- if debug and debug.lower() in ("1", "true", "yes"):
+ debug = queryValue("debug")
+ if debug is not None and debug.lower() in ("1", "true", "yes"):
debug = "true"
else:
debug = "false"
#
+ # Parse TimeZone query arg
+ #
+ tzid = queryValue("tzid")
+ if not tzid:
+ tzid = "America/Los_Angeles"
+
+ #
# Make some HTML
#
data = """
@@ -104,7 +112,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="caldav_principal_path" content="%(principalURL)s">
- <meta name="tzid" content="%(timeZone)s">
+ <meta name="tzid" content="%(tzid)s">
<title>Calendar</title>
<link rel="stylesheet" href="/webcal/calendar/css/calendar_standalone.css" type="text/css" media="screen" charset="utf-8">
<link rel="stylesheet" href="/webcal/css/required/niftydate.css" type="text/css" media="screen" charset="utf-8">
@@ -134,11 +142,10 @@
<script type="text/javascript" charset="utf-8">
setTimeout(function() { if (window.prepare) prepare() }, 10);
</script>
- <h1>%(debug)s</h1>
</body>
</html>
""" % {
- "timeZone": "America/Los_Angeles",
+ "tzid": tzid,
"principalURL": authenticatedPrincipalURL,
"debug": debug,
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090223/0d64e0ba/attachment.html>
More information about the calendarserver-changes
mailing list