Changeset 473

Show
Ignore:
Timestamp:
05/12/06 17:06:51
Author:
johnsa
Message:

added messages and errors to personal client

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r460 r473  
    16731673  <xsl:template match="formElements" mode="editEvent"> 
    16741674    <xsl:variable name="subscriptionId" select="subscriptionId"/> 
    1675     <xsl:variable name="calPath" select="calendar/encodedPath"/> 
     1675    <xsl:variable name="calPathEncoded" select="form/calendar/encodedPath"/> 
     1676    <xsl:variable name="calPath" select="form/calendar/path"/> 
    16761677    <xsl:variable name="guid" select="guid"/> 
    16771678    <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    …… 
    16901691                View 
    16911692              </a> | 
    1692               <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}"> 
     1693              <a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPathEncoded}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}"> 
    16931694                Delete 
    16941695              </a> 

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

    r470 r473  
    1717      <xsl:when test="id='org.bedework.client.error.baddate'"> 
    1818          <p>Bad or out-of-range date.</p> 
     19      </xsl:when> 
     20      <xsl:when test="id='org.bedework.validation.error.invalid.duration'"> 
     21          <p>Invalid duration.</p> 
    1922      </xsl:when> 
    2023      <xsl:when test="id='org.bedework.validation.error.event.startafterend'"> 
    …… 
    4144      <xsl:when test="id='org.bedework.client.error.duplicate.guid'"> 
    4245          <p>Duplicate guid: this event already exists in your calendar.</p> 
     46      </xsl:when> 
     47      <xsl:when test="id='org.bedework.exception.duplicateguid'"> 
     48          <p>Duplicate guid: this event already exists in your calendar.</p> 
     49      </xsl:when> 
     50      <xsl:when test="id='org.bedework.validation.error.missingfield'"> 
     51          <p>You must supply the following field: <em><xsl:value-of select="param"/></em></p> 
     52      </xsl:when> 
     53      <xsl:when test="id='org.bedework.client.error.calendar.referenced'"> 
     54          <p>Cannot delete: calendar contains events.</p> 
    4355      </xsl:when> 
    4456      <xsl:when test="id='org.bedework.client.error.unknowncalendar'"> 

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

    r457 r473  
    8484        </xsl:choose> 
    8585      </xsl:when> 
     86      <xsl:when test="id='org.bedework.client.message.added.locations'"> 
     87        <p>Location added.</p> 
     88      </xsl:when> 
    8689      <xsl:when test="id='org.bedework.client.message.deleted.locations'"> 
    8790        <xsl:choose>