Index: trunk/deployment/webuser/webapp/resources/demoskins/default/default/widget.xsl
===================================================================
---  (revision )
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/widget.xsl (revision 2979)
@@ -1,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Licensed to Jasig under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Jasig licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License. You may obtain a
+    copy of the License at:
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on
+    an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+<xsl:output
+  method="text"
+  indent="yes"
+  media-type="application/json"
+  standalone="yes"/>
+
+  <!-- ====================================================== -->
+  <!--    PERSONAL CALENDAR STYLESHEET for JSON WIDGETS       -->
+  <!-- ====================================================== -->
+ 
+  <!-- GENERATE KEYS -->
+  <!-- We occasionally need to pick out unique events from the calendar tree view
+       which breaks up an event across multiple days.  In the future, we may
+       work from a list of unique events and build the tree from it in the UI. -->
+       <xsl:key name="eventUid" match="event" use="guid"/>
+
+  <!-- DEFINE INCLUDES -->
+  <xsl:include href="./globals.xsl" />
+  <xsl:include href="../strings.xsl" />
+  <!-- xsl:include href="../localeSettings.xsl" /-->
+
+  <!-- DEFAULT WIDGET STYLESHEET -->
+  <!-- to change the default json stylesheets, change this include -->
+  <xsl:include href="../../widgets/json.xsl" />
+
+</xsl:stylesheet>
Index: trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/attendees.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/attendees.xsl (revision 2964)
+++ trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/attendees.xsl (revision 2979)
@@ -22,5 +22,6 @@
   xmlns="http://www.w3.org/1999/xhtml">
   
-  <!-- Transform the attendees into an array of json objects 
+  
+   <!-- Transform the attendees into an array of json objects 
        for use in the BwGrid.  This is called on edit event and after each update to 
        the attendees using xml from the attendee widget.  -->
@@ -31,7 +32,10 @@
     </xsl:for-each>
   </xsl:template>
-  
-  
+
+
   <!-- THE FOLLOWING TEMPLATE IS DEPRECATED, BUT MUST REMAIN FOR NOW  -->
+  <!-- Recipients and attendees are handled by the json widgets in the newer versions.
+       This template remains for both backward compatibility and testing.
+   -->
   <xsl:template name="attendees">
     <h2>
Index: trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js (revision 2974)
+++ trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js (revision 2979)
@@ -69,4 +69,5 @@
 var bwAddAttendeeBookDisp = "Book:";
 var bwEventSubmitMeetingDisp = "send";
+var bwEventSubmitDisp = "save";
 
 var bwReqParticipantDisp = "required";
@@ -79,4 +80,6 @@
 var bwTentative = "tentative";
 var bwDelegated = "delegated";
+
+var bwErrorAttendees = "Error: attendees not returned";
 
 /* An attendee
@@ -281,6 +284,6 @@
     // check to see if attendee already exists
     for (var i=0; i < bwGrid.attendees.length; i++) {
-      if (uid.indexOf("mailto:") != -1) {
-         uid = uid.substring(7); 
+      if (uid.indexOf("mailto:") == -1) {
+         uid = "mailto:" + uid; 
       }
       if (uid == bwGrid.attendees[i].uid) {
@@ -298,17 +301,20 @@
         type: "POST",
         url: bwGrid.attUrlPrefix,
-        data: "uri=" + uid + "&role=" + role + "&partstat=" + status + "&attendee=true&submit=add&list=yes",
+        data: "uri=" + uid + "&role=" + role + "&partstat=" + status + "&attendee=true&submit=add&list=yes&skinName=widget",
+        dataType: "json",
         success: function(responseData){
-          // add the attendee to the local array (temporary)
-          // the local array should be overwritten with data from the ajax call (coming)
-          // alert(responseData);
-        
-          // take off "mailto:" for local storage
-          if (uid.indexOf("mailto:") != -1) {
-             uid = uid.substring(7); 
+
+          // the local array is overwritten with attendee data returned from the ajax call
+          if (responseData.attendees != undefined && responseData.attendees.length) {
+            bwGrid.attendees.length = 0;
+            for (var i=0; i < responseData.attendees.length; i++) {
+              var att = responseData.attendees[i];
+              var newAttendee = new bwAttendee(att.name, att.uid, att.role, att.status, att.type);
+              bwGrid.attendees.push(newAttendee); 
+            }
+            bwGrid.requestFreeBusy();
+          } else { // no attendees were returned
+            alert(bwErrorAttendees);
           }
-          var newAttendee = new bwAttendee(name, uid, role, status, type);
-          bwGrid.attendees.push(newAttendee); 
-          bwGrid.requestFreeBusy();
           
           // got attendees??  send the param that will trigger a
@@ -349,5 +355,5 @@
       type: "POST",
       url: bwGrid.attUrlPrefix,
-      data: "uri=" + uid + "&attendee=true&delete=true",
+      data: "uri=" + uid + "&attendee=true&delete=true&list=yes&skinName=widget",
       success: function(){
         // remove the attendee from the local array
@@ -358,4 +364,13 @@
           bwGrid.display();
         }
+        
+        // no more attendees??  change back to a normal event.
+        if (!bwGrid.attendees.length) {
+          $("input.bwEventFormSubmit").each(function(i) {
+             $(this).attr("name","submit");
+             $(this).val(bwEventSubmitDisp);
+          });
+        }
+        
       },
       error: function(msg) {
Index: trunk/deployment/webuser/webapp/resources/demoskins/widgets/json.xsl
===================================================================
---  (revision )
+++ trunk/deployment/webuser/webapp/resources/demoskins/widgets/json.xsl (revision 2979)
@@ -1,0 +1,58 @@
+<!-- 
+    Licensed to Jasig under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Jasig licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License. You may obtain a
+    copy of the License at:
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on
+    an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+  
+  <xsl:template match="/">
+	  <xsl:choose>
+	    <xsl:when test="/bedework/page='attendeeWidget'">
+	      <!-- generate json list of attendees after modifying the scheduling widget -->
+	      {
+	        "attendees" : [
+  	        <xsl:apply-templates select="/bedework/attendees/attendee" mode="loadBwGrid">
+	            <xsl:sort select="attendeeUri"/>
+	          </xsl:apply-templates>
+	        ]
+	      }
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <!-- not found -->
+	      {
+	        "errors" : [ "404" ]
+	      }
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+  
+  <!-- Transform the attendees into an array of json objects 
+       for use in the BwGrid.  This is called on edit event and after each update to 
+       the attendees using xml from the attendee widget.  -->
+  <xsl:template match="attendee" mode="loadBwGrid">
+    {
+      "name" : "<xsl:value-of select="cn"/>",
+      "uid" : "<xsl:value-of select="attendeeUri"/>",
+      "role" : "<xsl:value-of select="role"/>",
+      "status" : "<xsl:value-of select="partstat"/>",
+      "type" : "<xsl:value-of select="cuType"/>"
+    }<xsl:if test="position()!=last()">,</xsl:if>
+  </xsl:template>
+  
+</xsl:stylesheet>