Changeset 457

Show
Ignore:
Timestamp:
05/05/06 11:48:02
Author:
johnsa
Message:

personal client stylesheet and front-end actions now use request parameter "newCalPath" for setting the calendar in which to place an event ("calPath" is used as the source calendar). Now can set the destination calendar for both an imported iCal file and an event reference.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r450 r457  
    13221322          </td> 
    13231323          <td class="fieldval"> 
    1324             <xsl:variable name="calPath" select="/bedework/formElements/form/calendar/path"/> 
    1325             <input type="hidden" name="calPath" value="{$calPath}"/> 
     1324            <xsl:variable name="newCalPath" select="/bedework/formElements/form/calendar/path"/> 
     1325            <input type="hidden" name="newCalPath" value="{$newCalPath}"/> 
    13261326            <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable> 
    13271327            <span id="bwEventCalDisplay"> 
    …… 
    17111711          </td> 
    17121712          <td class="fieldval"> 
    1713             <xsl:variable name="calPath" select="/bedework/formElements/form/calendar/path"/> 
    1714             <input type="hidden" name="calPath" value="{$calPath}"/> 
     1713            <xsl:variable name="newCalPath" select="/bedework/formElements/form/calendar/path"/> 
     1714            <input type="hidden" name="newCalPath" value="{$newCalPath}"/> 
    17151715            <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable> 
    17161716            <span id="bwEventCalDisplay"> 
    …… 
    20782078              <em>default calendar</em> 
    20792079            </span> 
    2080             <a href="javascript:launchCalSelectWindow('{$event-selectCalForEvent}')" class="small">[change]</a> (does not yet work) 
     2080            <a href="javascript:launchCalSelectWindow('{$event-selectCalForEvent}')" class="small">[change]</a> 
    20812081          </td> 
    20822082        </tr> 
    …… 
    32043204          </td> 
    32053205          <td align="left"> 
    3206             <input type="hidden" name="calPath" value=""/> 
     3206            <input type="hidden" name="newCalPath" value=""/> 
    32073207            <span id="bwEventCalDisplay"> 
    32083208              <em>default calendar</em> 
    …… 
    34193419          </td> 
    34203420          <td> 
    3421             <xsl:variable name="calPath" select="defaultCalendar"/> 
    3422             <input type="hidden" name="calPath" value="{$calPath}"/> 
     3421            <xsl:variable name="newCalPath" select="defaultCalendar"/> 
     3422            <input type="hidden" name="newCalPath" value="{$newCalPath}"/> 
    34233423            <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable> 
    34243424            <span id="bwEventCalDisplay"> 

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

    r380 r457  
    3939        <p>Calendar added.</p> 
    4040      </xsl:when> 
     41      <xsl:when test="id='org.bedework.client.message.folder.added'"> 
     42        <p>Folder added.</p> 
     43      </xsl:when> 
    4144      <xsl:when test="id='org.bedework.client.message.calendar.updated'"> 
    4245        <p>Calendar updated.</p> 
    4346      </xsl:when> 
     47      <xsl:when test="id='org.bedework.client.message.folder.updated'"> 
     48        <p>Folder updated.</p> 
     49      </xsl:when> 
    4450      <xsl:when test="id='org.bedework.client.message.calendar.deleted'"> 
    45         <p>Calendar deleted.</p> 
     51        <p>Calendar/folder deleted.</p> 
    4652      </xsl:when> 
    4753      <xsl:when test="id='org.bedework.client.message.added.subscriptions'"> 
    …… 
    98104        </xsl:choose> 
    99105      </xsl:when> 
     106      <xsl:when test="id='org.bedework.client.message.prefs.updated'"> 
     107        <p>Preferences updated.</p> 
     108      </xsl:when> 
    100109      <xsl:when test="id='org.bedework.client.message.nosuchevent'"> 
    101110          <p>Event <em><xsl:value-of select="param"/></em> does not exist.</p> 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/resources/includes.js

    r422 r457  
    8989// the calSelect pop-up window.  We must do two things: update the hidden calendar 
    9090// input field and update the displayed text. 
    91 function updateEventFormCalendar(calPath,calDisplay) { 
     91function updateEventFormCalendar(newCalPath,calDisplay) { 
    9292  if (window.opener.document.eventForm) { 
    93     window.opener.document.eventForm.calPath.value = calPath; 
     93    window.opener.document.eventForm.newCalPath.value = newCalPath; 
    9494    bwCalDisplay = window.opener.document.getElementById("bwEventCalDisplay"); 
    9595    bwCalDisplay.innerHTML = calDisplay; 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwAddEventRefAction.java

    r453 r457  
    6161/** Action to add an event alias to a personal calendar. 
    6262 * <p>Request parameters<ul> 
    63  *      <li>"eventId" id of event.</li> 
     63 *      <li>"subid"    subscription id for event.</li> 
     64 *      <li>"calPath"  calendar for event.</li> 
     65 *      <li>"guid"     guid of event.</li> 
     66 *      <li>"recurrenceId"   recurrence-id of event instance - possibly null.</li> 
    6467 * </ul> 
    6568 * <p>Forwards to:<ul> 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java

    r453 r457  
    408408  } 
    409409 
    410   /** Set the event calendar based on request parameters. If calPath is specified 
    411    * we use the named calendar as the event calendar. 
    412    * 
    413    * <p>If calPath is not speciifed and subname is specified it should refer to 
     410  /** Set the event calendar based on request parameters. If newCalPath 
     411   * is specified we use the named calendar as the event calendar. 
     412   * 
     413   * <p>If newCalPath is not speciifed and subname is specified it should refer to 
    414414   * an external calendar. We will use teh dummy calendar object for the event. 
    415415   * 
    416    * <p>If neither calPath or subname is specified we use the default. 
     416   * <p>If neither newCalPath or subname is specified we use the default. 
    417417   * 
    418418   * <p>If a calendar was already set in the event, this action will only 
    419    * change that calendar if subname or calPath are specified. It will not 
     419   * change that calendar if subname or newCalPath are specified. It will not 
    420420   * reset the calendar to the default. 
    421421   * 
    …… 
    433433    BwCalendar cal = null; 
    434434 
    435     String calPath = request.getParameter("calPath"); 
    436  
    437     if (calPath != null) { 
    438       cal = svci.getCalendar(calPath); 
     435    String newCalPath = request.getParameter("newCalPath"); 
     436 
     437    if (newCalPath != null) { 
     438      cal = svci.getCalendar(newCalPath); 
    439439      if (cal == null) { 
    440         form.getErr().emit("org.bedework.client.error.nosuchcalendar", calPath); 
     440        form.getErr().emit("org.bedework.client.error.nosuchcalendar", newCalPath); 
    441441        return "notFound"; 
    442442      } 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/misc/UploadAction.java

    r436 r457  
    7777 * Action to upload an icalendar file. 
    7878 * <p>Parameters are:<ul> 
    79  *      <li>"calPath"            Path of calendar</li> 
     79 *      <li>"newCalPath"            Path of calendar</li> 
    8080 * </ul> 
    8181 * 
    …… 
    9898    BwCalendar cal = null; 
    9999 
    100     String calPath = getReqPar(request, "calPath"); 
     100    String newCalPath = getReqPar(request, "newCalPath"); 
    101101 
    102     if (calPath != null) { 
    103       cal = svci.getCalendar(calPath); 
     102    if (newCalPath != null) { 
     103      cal = svci.getCalendar(newCalPath); 
    104104    } 
    105105