Changeset 2330

Show
Ignore:
Timestamp:
08/12/09 13:30:03
Author:
douglm
Message:

Bring up to date with trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/douglm/deployment/webadmin/webapp/resources/default/default/default.xsl

    r2259 r2330  
    391391      <body> 
    392392        <xsl:choose> 
    393           <xsl:when test="(/bedework/page='modEvent' or /bedework/page='modEventPending') and /bedework/formElements/recurrenceId=''"> 
     393          <xsl:when test="/bedework/page='modEvent' or /bedework/page='modEventPending'"> 
    394394            <xsl:attribute name="onload">initRXDates();initXProperties();focusFirstElement();bwSetupDatePickers();</xsl:attribute> 
    395395          </xsl:when> 
    …… 
    25662566          <td> 
    25672567            <ul class="aliasTree"> 
    2568               <xsl:apply-templates select="form/subscriptions/calsuite/calendars/calendar" mode="showEventFormAliases"> 
    2569                 <xsl:with-param name="root">true</xsl:with-param> 
     2568              <xsl:apply-templates select="form/subscriptions/calsuite/calendars/calendar/calendar[isTopicalArea = 'true']" mode="showEventFormAliases"> 
     2569                <xsl:with-param name="root">false</xsl:with-param> 
    25702570              </xsl:apply-templates> 
    25712571            </ul> 
    …… 
    27442744        </xsl:if> 
    27452745      </table> 
    2746       <xsl:if test="not(starts-with(form/calendar/path,$submissionsRootUnencoded))"> 
     2746      <xsl:if test="not(starts-with(form/calendar/event/path,$submissionsRootUnencoded))"> 
    27472747        <!-- don't create two instances of the submit buttons on pending events; 
    27482748             the publishing buttons require numerous unique ids --> 
    …… 
    27912791      </xsl:if> 
    27922792 
    2793       <xsl:if test="calendar[isSubscription = 'true' or calType = '0']"> 
     2793      <!-- Return topical areas and all underlying calendars. 
     2794           Check for topical areas only if the subscription is owned by the calendar suite: 
     2795           If the subscription points out to a calendar or folder in another tree, 
     2796           return the branch regardless of the topical area setting.  --> 
     2797      <xsl:if test="calendar[(isSubscription = 'true' or calType = '0') and ((isTopicalArea = 'true' and  starts-with(path,/bedework/currentCalSuite/resourcesHome)) or not(starts-with(path,/bedework/currentCalSuite/resourcesHome)))]"> 
    27942798        <ul> 
    2795           <xsl:apply-templates select="calendar[isSubscription = 'true' or calType = '0']" mode="showEventFormAliases"/> 
     2799          <xsl:apply-templates select="calendar[(isSubscription = 'true' or calType = '0') and ((isTopicalArea = 'true' and  starts-with(path,/bedework/currentCalSuite/resourcesHome)) or not(starts-with(path,/bedework/currentCalSuite/resourcesHome)))]" mode="showEventFormAliases"/> 
    27962800        </ul> 
    27972801      </xsl:if> 
    …… 
    39193923  <xsl:template match="currentCalendar" mode="addCalendar"> 
    39203924    <h3>Add Calendar, Folder, or Subscription</h3> 
    3921     <form name="addCalForm" method="post" action="{$calendar-update}" onsubmit="setCalendarAlias(this)"> 
     3925    <p class="note">Note: Access may be set on a calendar after it is created.</p> 
     3926    <form name="addCalForm" method="post" action="{$calendar-update}" onsubmit="setCatFilters(this);return setCalendarAlias(this);"> 
    39223927      <table class="common"> 
    39233928        <tr> 
    …… 
    40254030        </tr> 
    40264031      </table> 
    4027       <div class="submitButtons"> 
    4028         <input type="submit" name="addCalendar" value="Add"/> 
    4029         <input type="submit" name="cancelled" value="cancel"/> 
    4030       </div> 
     4032 
    40314033      <div id="subscriptionTypes" class="invisible"> 
    40324034        <h4>Subscription URL</h4> 
     4035        <input type="hidden" value="publicTree" name="subType" id="bwSubType"/> 
    40334036        <div id="subscriptionTypeExternal"> 
    40344037          <table class="common" id="subscriptionTypes"> 
    …… 
    40594062      </div> 
    40604063 
    4061       <div id="sharingBox"> 
     4064      <!-- div id="sharingBox"> 
    40624065        <h3>Current Access:</h3> 
    40634066        <div id="bwCurrentAccessWidget">&#160;</div> 
    …… 
    40684071          <xsl:with-param name="outputId">bwCurrentAccessWidget</xsl:with-param> 
    40694072        </xsl:call-template> 
    4070       </div> 
     4073      </div--> 
    40714074 
    40724075      <div class="submitButtons"> 
    …… 
    40754078      </div> 
    40764079    </form> 
    4077  
    4078     <!-- div id="sharingBox"> 
    4079       <h3>Current Access:</h3> 
    4080       Sharing may be added to a calendar once created. 
    4081     </div--> 
    40824080  </xsl:template> 
    40834081 
    …… 
    49174915  <xsl:template match="currentCalendar" mode="addSubscription"> 
    49184916    <h3>Add Subscription</h3> 
     4917    <p class="note">Note: Access may be set on a subscription after it is created.</p> 
    49194918    <form name="addCalForm" method="post" action="{$subscriptions-update}" onsubmit="setCatFilters(this);return setCalendarAlias(this);"> 
    49204919      <table class="common"> 
    …… 
    49314930            <xsl:variable name="curCalSummary" select="summary"/> 
    49324931            <input type="text" name="calendar.summary" value="{$curCalSummary}" size="40"/> 
     4932          </td> 
     4933        </tr> 
     4934        <tr> 
     4935          <th>Topical Area:</th> 
     4936          <td> 
     4937            <input type="radio" name="calendar.isTopicalArea" value="true" checked="checked"/> true 
     4938            <input type="radio" name="calendar.isTopicalArea" value="false"/> false 
    49334939          </td> 
    49344940        </tr> 
    …… 
    50635069        </tr> 
    50645070      </table> 
    5065  
    5066       <div id="sharingBox"> 
     5071      <!-- div id="sharingBox"> 
    50675072        <h3>Current Access:</h3> 
    50685073        <div id="bwCurrentAccessWidget">&#160;</div> 
    …… 
    50735078          <xsl:with-param name="outputId">bwCurrentAccessWidget</xsl:with-param> 
    50745079        </xsl:call-template> 
    5075       </div> 
     5080      </div--> 
    50765081 
    50775082      <div class="submitButtons"> 

  • branches/douglm/deployment/webadmin/webapp/resources/resources/bedework.js

    r2157 r2330  
    191191  } else if (formObj.type.value == "subscription") { 
    192192    switch (formObj.subType.value) { 
     193      case "publicTree": 
     194        // do nothing: when adding a subscription to the public tree, we set the fields directly. 
     195        break; 
    193196      case "public": 
    194197        formObj.aliasUri.value = "bwcal://" + formObj.publicAliasHolder.value; 

  • branches/douglm/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js

    r2225 r2330  
    284284      output += '</table>'; 
    285285    } 
    286     // categories: deprecated - there will be no categories because the topical 
    287     // areas selected by the submitter are only suggestions 
    288     /*if (this.category != "") { 
    289       output += '<p><strong>Type of Event:</strong> (if Topical Areas weren\'t sufficient)<br/>'; 
     286    if (this.category != "") { 
     287      output += '<p><strong>Suggested Type of Event:</strong><br/>'; 
    290288      output += this.category; 
    291289      output += '</p>'; 
    292     }*/ 
     290    } 
    293291    output += '<p>'; 
    294292    if (this.notes != "") {