Changeset 2658

Show
Ignore:
Timestamp:
01/12/10 17:15:03
Author:
johnsa
Message:

webclients: fix recurrence js bug

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r2641 r2658  
    398398        <xsl:choose> 
    399399          <xsl:when test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 
    400             <xsl:attribute name="onload">initRXDates();initXProperties();focusFirstElement();bwSetupDatePickers();</xsl:attribute> 
     400            <xsl:attribute name="onload"><xsl:if test="recurrenceId != ''">initRXDates();</xsl:if>initXProperties();focusFirstElement();bwSetupDatePickers();</xsl:attribute> 
    401401          </xsl:when> 
    402402          <xsl:otherwise> 
    …… 
    464464                <xsl:when test="/bedework/page='deleteCategoryConfirm'"> 
    465465                  <xsl:call-template name="deleteCategoryConfirm"/> 
     466                </xsl:when> 
     467                <xsl:when test="/bedework/page='categoryReferenced'"> 
     468                  <xsl:call-template name="categoryReferenced"/> 
    466469                </xsl:when> 
    467470                <xsl:when test="/bedework/page='calendarList' or 
    …… 
    37393742    </form> 
    37403743  </xsl:template> 
     3744   
     3745  <xsl:template name="categoryReferenced"> 
     3746    <h2>Category Referenced by Events or Collections</h2> 
     3747 
     3748 
     3749    <table class="eventFormTable"> 
     3750      <tr> 
     3751        <td class="fieldName"> 
     3752          <xsl:copy-of select="$bwStr-DeCC-Keyword"/> 
     3753        </td> 
     3754        <td> 
     3755          <xsl:value-of select="/bedework/currentCategory/category/value"/> 
     3756        </td> 
     3757      </tr> 
     3758      <tr class="optional"> 
     3759        <td> 
     3760          <xsl:copy-of select="$bwStr-DeCC-Description"/> 
     3761        </td> 
     3762        <td> 
     3763          <xsl:value-of select="/bedework/currentCategory/category/desc"/> 
     3764        </td> 
     3765      </tr> 
     3766    </table> 
     3767 
     3768    <form action="{$category-delete}" method="post"> 
     3769      <input type="submit" name="updateCategory" value="{$bwStr-DeCC-YesDelete}"/> 
     3770      <input type="submit" name="cancelled" value="{$bwStr-DeCC-NoCancel}"/> 
     3771    </form> 
     3772  </xsl:template> 
    37413773 
    37423774  <!-- form used for selecting categories in calendar and pref forms --> 

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

    r2654 r2658  
    210210          </xsl:when> 
    211211          <xsl:when test="/bedework/page = 'editEvent'"> 
    212             <xsl:attribute name="onload">initRXDates();initXProperties();focusElement('bwEventTitle');bwSetupDatePickers();</xsl:attribute> 
     212            <xsl:attribute name="onload"><xsl:if test="recurrenceId != ''">initRXDates();</xsl:if>initXProperties();focusElement('bwEventTitle');bwSetupDatePickers();</xsl:attribute> 
    213213          </xsl:when> 
    214214          <xsl:when test="/bedework/page = 'attendees'">