Changeset 1465

Show
Ignore:
Timestamp:
07/11/07 13:55:08
Author:
douglm
Message:

More scheduling changes - added start of vavailability which required a schema change.

Mostly implemented an itip refresh function. Autoprocessig still to be completed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/libjars.properties

    r1326 r1465  
    112112 
    113113#      ical4j.jar           Used for icalendar translation. 
    114 #ical4j.jar.name=ical4j-0.9.19-pre.jar 
    115 ical4j.jar.name=ical4j-1.0-beta1.jar 
     114#ical4j.jar.name=ical4j-1.0-beta1.jar 
     115ical4j.jar.name=ical4j-head.jar 
    116116ical4j.jar=${org.bedework.default.lib}/${ical4j.jar.name} 
    117117 

  • trunk/deployment/resources/xsl/default/default/messages.xsl

    r1432 r1465  
    133133        Schedule rescheduled 
    134134      </xsl:when> 
     135      <xsl:when test="id='org.bedework.client.message.schedule.sent'"> 
     136        Scheduling message sent to <xsl:value-of select="param"/> 
     137      </xsl:when> 
    135138      <xsl:when test="id='org.bedework.client.message.schedule.updated'"> 
    136139        Schedule updated 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1464 r1465  
    139139  <xsl:variable name="schedule-initAttendeeUpdate" select="/bedework/urlPrefixes/schedule/initAttendeeUpdate/a/@href"/> 
    140140  <xsl:variable name="schedule-processAttendeeReply" select="/bedework/urlPrefixes/schedule/processAttendeeReply/a/@href"/> 
     141  <xsl:variable name="schedule-processRefresh" select="/bedework/urlPrefixes/schedule/processRefresh/a/@href"/> 
    141142  <xsl:variable name="schedule-refresh" select="/bedework/urlPrefixes/schedule/refresh/a/@href"/> 
    142143  <!-- misc (mostly import and export) --> 
    …… 
    34823483              <option value="DELEGATED">delegated</option> 
    34833484            </select> 
    3484           </div>   
     3485          </div> 
    34853486 
    34863487          <xsl:if test="/bedework/attendees/attendee"> 
    …… 
    55305531            <xsl:when test="scheduleMethod=2"><xsl:value-of select="$schedule-initAttendeeRespond"/></xsl:when> 
    55315532            <xsl:when test="scheduleMethod=3"><xsl:value-of select="$schedule-initAttendeeReply"/></xsl:when> 
     5533            <xsl:when test="scheduleMethod=6"><xsl:value-of select="$schedule-processRefresh"/></xsl:when> 
    55325534            <xsl:otherwise><xsl:value-of select="$schedule-initAttendeeRespond"/></xsl:otherwise> 
    55335535          </xsl:choose> 
    …… 
    57885790            <xsl:choose> 
    57895791              <xsl:when test="not(guidcals/calendar)"> 
    5790               <!-- the event has not been added to a calendar, so this is the  
     5792              <!-- the event has not been added to a calendar, so this is the 
    57915793                   first request --> 
    5792                
     5794 
    57935795                <!-- the string "user/" should not be hard coded; fix this --> 
    57945796                <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/></xsl:variable> 
    …… 
    58085810                           currentAccess/current-user-privilege-set/privilege/write-content and 
    58095811                           (not(contains(path,$userPath)))]/path"/></xsl:variable> 
    5810      
     5812 
    58115813                    <input type="hidden" name="newCalPath" value="{$newCalPath}"/> 
    5812      
     5814 
    58135815                    <xsl:variable name="userFullPath"><xsl:value-of select="$userPath"/>/</xsl:variable> 
    58145816                    <span id="bwEventCalDisplay"> 
    …… 
    58285830                      <xsl:if test="form/calendar/calType = '1'"><xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute></xsl:if> 
    58295831                    </input>--> 
    5830      
     5832 
    58315833                    <xsl:variable name="userFullPath"><xsl:value-of select="$userPath"/>/</xsl:variable> 
    5832      
     5834 
    58335835                    <span id="bwEventCalDisplay"> 
    58345836                      <xsl:if test="form/calendar/calType = '1'"> 
    …… 
    58465848                           span element which is improperly rendered in the browser --> 
    58475849                    </span> 
    5848      
     5850 
    58495851                    <xsl:call-template name="selectCalForEvent"/> 
    5850      
     5852 
    58515853                  </xsl:otherwise> 
    58525854                </xsl:choose> 
    5853                
     5855 
    58545856              </xsl:when> 
    58555857              <xsl:otherwise> 
    5856                 <!-- the event exists in calendars already, so this is a  
    5857                      subsequent follow-up.  Let the user choose which copies  
     5858                <!-- the event exists in calendars already, so this is a 
     5859                     subsequent follow-up.  Let the user choose which copies 
    58585860                     of the event to update.  For now, we'll just list them 
    58595861                     and add calPath request parameters --> 
    …… 
    58645866                      <input type="hidden" name="calPath"> 
    58655867                        <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute> 
    5866                       </input>  
     5868                      </input> 
    58675869                    </li> 
    58685870                  </xsl:for-each> 
    58695871                </ul> 
    58705872              </xsl:otherwise> 
    5871             </xsl:choose>               
     5873            </xsl:choose> 
    58725874          </td> 
    58735875        </tr> 
    …… 
    62916293              </xsl:when> 
    62926294              <xsl:otherwise> 
    6293                 <!-- the event exists.  Let the user choose which copies  
     6295                <!-- the event exists.  Let the user choose which copies 
    62946296                     of the event to update.  For now, we'll just list them 
    62956297                     and add calPath request parameters --> 
    …… 
    63006302                      <input type="hidden" name="calPath"> 
    63016303                        <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute> 
    6302                       </input>  
     6304                      </input> 
    63036305                    </li> 
    63046306                  </xsl:for-each> 
    63056307                </ul> 
    63066308              </xsl:otherwise> 
    6307             </xsl:choose>               
     6309            </xsl:choose> 
    63086310          </td> 
    63096311        </tr>