Index: trunk/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/grid-json.xsl
===================================================================
--- trunk/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/grid-json.xsl (revision 2422)
+++ trunk/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/grid-json.xsl (revision 2465)
@@ -4,5 +4,5 @@
   
   <!-- **********************************************************************
-    Copyright 2008 Rensselaer Polytechnic Institute. All worldwide rights reserved.
+    Copyright 2009 Rensselaer Polytechnic Institute. All worldwide rights reserved.
 
     Redistribution and use of this distribution in source and binary forms,
@@ -122,19 +122,21 @@
 	      "longname" : "<xsl:value-of select='longname'/>",
 	      "shortname" : "<xsl:value-of select='shortname'/>",
+	      "weeks" : [
           <xsl:apply-templates select="week" />
+          ]
         }<xsl:if test="position() != last()">,</xsl:if>
   </xsl:template>
 
   <xsl:template match="week">
-	      "week": {
+	      {
 	        "value" : "<xsl:value-of select='value'/>",
-	        <xsl:apply-templates select="day" />
+	        "days" : [
+	           <xsl:apply-templates select="day" />
+	        ]
 	      }<xsl:if test="position() != last()">,</xsl:if>
   </xsl:template>
   
- 
-
   <xsl:template match="day">
-	        "day": {
+	        {
 	          <xsl:choose>
 		        <xsl:when test="filler = 'true'">
@@ -147,5 +149,6 @@
 	          "date" : "<xsl:value-of select='date'/>",
 	          "longdate" : "<xsl:value-of select='longdate'/>",
-	          "shortdate" : "<xsl:value-of select='shortdate'/>"
+	          "shortdate" : "<xsl:value-of select='shortdate'/>",
+	          "events" : [
 	              <xsl:choose>
 		            <xsl:when test="/bedework/appvar/key = 'filter'">
@@ -167,4 +170,5 @@
 		            </xsl:otherwise>
 		          </xsl:choose>
+		          ]
 		        </xsl:otherwise>
 		      </xsl:choose>
@@ -200,5 +204,5 @@
     <xsl:variable name="strippedLocAddress" select='translate($aposStrippedLocAddress,"&#xA;"," ")'/>
     <!-- finally, produce the JSON output -->
-                  , "event": {
+                  {
                     "summary" : "<xsl:value-of select="$strippedSummary"/>",
                     "subscriptionId" : "<xsl:value-of select="subscription/id"/>",