Changeset 443

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

further updates to add event ref; next we'll add ability to select a calendar.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r440 r443  
    139139                    </xsl:when> 
    140140                    <xsl:when test="/bedework/page='addEventRef'"> 
    141                       <xsl:call-template name="addEventRef"/> 
     141                      <xsl:apply-templates select="/bedework/event" mode="addEventRef"/> 
    142142                    </xsl:when> 
    143143                    <xsl:when test="/bedework/page='editEvent'"> 
    …… 
    20362036  </xsl:template> 
    20372037 
    2038   <xsl:template name="addEventRef"> 
     2038  <xsl:template match="event" mode="addEventRef"> 
    20392039    <form name="eventForm" method="post" action="{$event-addEventRefComplete}" id="standardForm"  enctype="multipart/form-data"> 
     2040      <xsl:variable name="subscriptionId" select="subscription/id"/> 
     2041      <xsl:variable name="calPath" select="calendar/path"/> 
     2042      <xsl:variable name="guid" select="guid"/> 
     2043      <xsl:variable name="recurrenceId" select="recurrenceId"/> 
     2044      <input type="hidden" name="subid" value="{$subscriptionId}"/> 
     2045      <input type="hidden" name="calPath" value="{$calPath}"/> 
     2046      <input type="hidden" name="guid" value="{$guid}"/> 
     2047      <input type="hidden" name="recurrenceId" value="{$recurrenceId}"/> 
     2048 
    20402049      <h2>Add Event Reference</h2> 
    20412050      <table class="common" cellspacing="0"> 
    20422051        <tr> 
    20432052          <td class="fieldname"> 
     2053            Event: 
     2054          </td> 
     2055          <td> 
     2056            <xsl:value-of select="summary"/> 
     2057          </td> 
     2058        </tr> 
     2059        <tr> 
     2060          <td class="fieldname"> 
    20442061            Into calendar: 
    20452062          </td> 
    20462063          <td align="left"> 
    2047             <input type="hidden" name="calPath" value=""/> 
    20482064            <span id="bwEventCalDisplay"> 
    20492065              <em>default calendar</em> 
    …… 
    20572073          </td> 
    20582074          <td align="left"> 
    2059             <input type="radio" value="true" name="affectsFreeBusy"/> yes 
    2060             <input type="radio" value="false" name="affectsFreeBusy" checked="checked"/> no 
     2075            <input type="radio" value="true" name="transparency"/> yes 
     2076            <input type="radio" value="false" name="transparency" checked="checked"/> no 
    20612077          </td> 
    20622078        </tr> 

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

    r440 r443  
    3232      <xsl:when test="id='org.bedework.client.error.missingcalendarpath'"> 
    3333          <p>Missing calendar path (required).</p> 
     34      </xsl:when> 
     35      <xsl:when test="id='org.bedework.client.error.duplicate.guid'"> 
     36          <p>Duplicate guid: this event already exists in your calendar.</p> 
    3437      </xsl:when> 
    3538      <xsl:when test="id='org.bedework.client.error.unknowncalendar'"> 

  • trunk/calendar3/webclient/war/docs/event/addEventRef.jsp

    r442 r443  
    1010try { 
    1111%> 
     12  <page>addEventRef</page> 
     13  <%-- This page used for displaying, confirming, and setting a 
     14       calendar for a public event reference added to the personal 
     15       calendar web client. --%> 
     16  <%-- Wrapper for a single event (emitEvent.jsp)--%> 
     17    <bean:define id="allView" value="true" toScope="request"/> 
     18    <bean:define id="eventFormatter" 
     19                 name="calForm" 
     20                 property="curEventFmt" 
     21                 toScope="request"/> 
    1222 
    13 <page>addEventRef</page> 
    14  
     23    <%@ include file="/docs/event/emitEvent.jsp" %> 
    1524<% 
    1625} catch (Throwable t) {