Changeset 2031

Show
Ignore:
Timestamp:
01/21/09 15:55:09
Author:
johnsa
Message:

admin client: allow folders in subscription tree

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2020 r2031  
    44504450        </xsl:choose> 
    44514451      </xsl:attribute> 
    4452       <!-- allow opening and closing in the subscription tree for now only on the root folder --> 
    4453       <xsl:if test="calType = '0' and $root = 'true'"> 
     4452      <xsl:if test="calType = '0' and isSubscription='false'"> 
    44544453         <xsl:choose> 
    44554454          <xsl:when test="open = 'true'"> 
    …… 
    44844483      <xsl:if test="calendar"> 
    44854484        <ul> 
    4486           <xsl:apply-templates select="calendar[isSubscription = 'true']" mode="listForUpdateSubscription"/> 
     4485          <xsl:apply-templates select="calendar[isSubscription = 'true' or calType = '0']" mode="listForUpdateSubscription"/> 
    44874486        </ul> 
    44884487      </xsl:if> 
    …… 
    45454544          <th>Type:</th> 
    45464545          <td> 
     4546            <!-- we will set the value of "calendarCollection" on submit. 
     4547                 Value is false only for folders, so we default it to true here. --> 
    45474548            <input type="hidden" value="true" name="calendarCollection"/> 
    4548             <input type="hidden" value="subscription" name="type"/> 
     4549 
     4550            <!-- type is defaulted to "subscription".  It is changed to "folder" 
     4551                 if subTypeSwitch is set to folder. --> 
     4552            <input type="hidden"  name="type" value="subscription" id="bwType"/> 
    45494553            <input type="hidden" name="aliasUri" value=""/> 
     4554 
    45504555            <!-- subType is defaulted to public.  It is changed when a subTypeSwitch is clicked. --> 
    45514556            <input type="hidden" value="public" name="subType" id="bwSubType"/> 
     4557            <input type="radio" name="subTypeSwitch" value="folder" onclick="changeClass('subscriptionTypePublic','invisible');setField('bwType',this.value);"/> Folder 
    45524558            <input type="radio" name="subTypeSwitch" value="public" checked="checked" onclick="changeClass('subscriptionTypePublic','visible');changeClass('subscriptionTypeExternal','invisible');setField('bwSubType',this.value);"/> Public alias 
    45534559            <input type="radio" name="subTypeSwitch" value="external" onclick="changeClass('subscriptionTypePublic','invisible');changeClass('subscriptionTypeExternal','visible');setField('bwSubType',this.value);"/> URL