Changeset 1983

Show
Ignore:
Timestamp:
12/05/08 00:32:46
Author:
johnsa
Message:

more work on calendar subscriptions

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1979 r1983  
    15511551  padding-left: 0; 
    15521552} 
     1553#bedework  li.aliasFolder { 
     1554  list-style-image: url(../../resources/calIconAliasFolder-sm.gif); 
     1555  font-style: italic; 
     1556  margin-left: 0; 
     1557  padding-left: 0; 
     1558} 
    15531559#bedework  li.subscription li { 
    15541560  font-style: normal; 

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

    r1982 r1983  
    42984298          <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
    42994299                          and path = /bedework/selectionState/calendar/path">selected</xsl:when> 
     4300          <xsl:when test="isSubscription = 'true'"> 
     4301            <xsl:choose> 
     4302              <xsl:when test="calType = '0'">aliasFolder</xsl:when> 
     4303              <xsl:otherwise>alias</xsl:otherwise> 
     4304            </xsl:choose> 
     4305          </xsl:when> 
    43004306          <xsl:when test="calType = '0'">folder</xsl:when> 
    4301           <xsl:when test="calType = '7' or calType = '8'">alias</xsl:when> 
    43024307          <xsl:otherwise>calendar</xsl:otherwise> 
    43034308        </xsl:choose> 
    …… 
    43784383      <xsl:attribute name="class"> 
    43794384        <xsl:choose> 
     4385          <xsl:when test="isSubscription = 'true'"> 
     4386            <xsl:choose> 
     4387              <xsl:when test="calType = '0'">aliasFolder</xsl:when> 
     4388              <xsl:otherwise>alias</xsl:otherwise> 
     4389            </xsl:choose> 
     4390          </xsl:when> 
    43804391          <xsl:when test="calType = '0'">folder</xsl:when> 
    4381           <xsl:when test="calType = '7' or calType = '8'">alias</xsl:when> 
    43824392          <xsl:otherwise>calendar</xsl:otherwise> 
    43834393        </xsl:choose> 
    …… 
    43864396        <xsl:value-of select="name"/> 
    43874397      </a> 
    4388       <xsl:if test="calType = '0'"> 
     4398      <xsl:if test="calType = '0' and isSubscription = 'false'"> 
    43894399        <xsl:text> </xsl:text> 
    43904400        <a href="{$calendar-initAdd}&amp;calPath={$calPath}" title="add a calendar or folder"> 
    …… 
    43924402        </a> 
    43934403      </xsl:if> 
    4394       <xsl:if test="calendar"> 
     4404      <xsl:if test="calendar and isSubscription='false'"> 
    43954405        <ul> 
    43964406          <xsl:apply-templates select="calendar[number(calType) &lt; 2 or number(calType) = 4 or number(calType) &gt; 6]" mode="listForUpdate"> 
    …… 
    44084418      <xsl:attribute name="class"> 
    44094419        <xsl:choose> 
     4420          <xsl:when test="isSubscription = 'true'">alias</xsl:when> 
    44104421          <xsl:when test="calType = '0'">folder</xsl:when> 
    4411           <xsl:when test="calType = '7' or calType = '8'">alias</xsl:when> 
    44124422          <xsl:otherwise>calendar</xsl:otherwise> 
    44134423        </xsl:choose> 
    …… 
    44854495          <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
    44864496                          and name = /bedework/selectionState/subscriptions/subscription/calendar/name">selected</xsl:when> 
     4497          <xsl:when test="isSubscription = 'true'">alias</xsl:when> 
    44874498          <xsl:when test="name='Trash'">trash</xsl:when> 
    44884499          <xsl:when test="calendarCollection='false'">folder</xsl:when> 
    …… 
    45584569        <xsl:choose> 
    45594570          <xsl:when test="name='Trash'">trash</xsl:when> 
     4571          <xsl:when test="isSubscription = 'true'">alias</xsl:when> 
    45604572          <xsl:when test="calendarCollection='false'">folder</xsl:when> 
    45614573          <xsl:otherwise>calendar</xsl:otherwise> 
    …… 
    45834595  </xsl:template> 
    45844596 
    4585   <xsl:template match="currentCalendar" mode="modCalendar"> 
    4586     <xsl:variable name="calPath" select="path"/> 
    4587     <xsl:variable name="calPathEncoded" select="encodedPath"/> 
    4588     <xsl:choose> 
    4589       <xsl:when test="creating='true'"> 
    4590         <h3>Add Calendar, Folder, or Subscription</h3> 
    4591       </xsl:when> 
    4592       <xsl:when test="isSubscription='true'"> 
    4593         <h3>Modify Subscription</h3> 
    4594       </xsl:when> 
    4595       <xsl:when test="calendarCollection='true'"> 
    4596         <h3>Modify Calendar</h3> 
    4597       </xsl:when> 
    4598       <xsl:otherwise> 
    4599         <h3>Modify Folder</h3> 
    4600       </xsl:otherwise> 
    4601     </xsl:choose> 
     4597  <xsl:template match="currentCalendar" mode="addCalendar"> 
     4598    <h3>Add Calendar, Folder, or Subscription</h3> 
    46024599    <form name="addCalForm" method="post" action="{$calendar-update}" onsubmit="setCalendarAlias(this)"> 
    46034600      <table class="common"> 
    …… 
    47494746          </td> 
    47504747        </tr> 
    4751         <tr> 
     4748        <!-- tr> 
    47524749          <th>Mailing List ID:</th> 
    47534750          <td> 
    47544751            <xsl:value-of select="mailListId"/> 
    47554752          </td> 
    4756         </tr> 
     4753        </tr --> 
    47574754        <tr> 
    47584755          <th>Summary:</th> 
    …… 
    47754772          </td> 
    47764773        </tr> 
    4777         <tr> 
    4778           <th>Calendar/Folder:</th> 
     4774        <xsl:if test="isSubscription = 'true'"> 
     4775          <tr> 
     4776            <th>URL:</th> 
     4777            <td> 
     4778              <input name="aliasUri" value="" size="40"> 
     4779                <xsl:attribute name="value"><xsl:value-of select="aliasUri"/></xsl:attribute> 
     4780              </input> 
     4781            </td> 
     4782          </tr> 
     4783          <xsl:if test="externalSub = 'true'"> 
     4784            <tr> 
     4785              <th>Id (if required):</th> 
     4786              <td> 
     4787                <input name="remoteId" value="" size="40"/> 
     4788              </td> 
     4789            </tr> 
     4790            <tr> 
     4791              <th>Password (if required):</th> 
     4792              <td> 
     4793                <input type="password" name="remotePw" value="" size="40"/> 
     4794              </td> 
     4795            </tr> 
     4796          </xsl:if> 
     4797        </xsl:if> 
     4798      </table> 
     4799 
     4800      <table border="0" id="submitTable"> 
     4801        <tr> 
    47794802          <td> 
    47804803            <xsl:choose> 
    4781               <xsl:when test="calendarCollection='true'"> 
    4782                 <input type="radio" value="true" name="calendarCollection" checked="checked"/> Calendar 
    4783                 <input type="radio" value="false" name="calendarCollection"/> Folder 
     4804              <xsl:when test="isSubscription='true'"> 
     4805                <input type="submit" name="updateCalendar" value="Update Subscription"/> 
    47844806              </xsl:when> 
    4785               <xsl:otherwise> 
    4786                 <input type="radio" value="true" name="calendarCollection"/> Calendar 
    4787                 <input type="radio" value="false" name="calendarCollection" checked="checked"/> Folder 
    4788               </xsl:otherwise> 
    4789             </xsl:choose> 
    4790           </td> 
    4791         </tr> 
    4792         <tr> 
    4793           <th>URL: (for external subscriptions only)</th> 
    4794           <td> 
    4795             <input name="aliasUri" value="" size="40"/> 
    4796           </td> 
    4797         </tr> 
    4798         <tr> 
    4799           <th>Id: (for external subscriptions only)</th> 
    4800           <td> 
    4801             <input name="remoteId" value="" size="40"/> 
    4802           </td> 
    4803         </tr> 
    4804         <tr> 
    4805           <th>Password: (for external subscriptions only)</th> 
    4806           <td> 
    4807             <input type="password" name="remotePw" value="" size="40"/> 
    4808           </td> 
    4809         </tr> 
    4810       </table> 
    4811  
    4812       <table border="0" id="submitTable"> 
    4813         <tr> 
    4814           <td> 
    4815             <xsl:choose> 
    48164807              <xsl:when test="calendarCollection='true'"> 
    48174808                <input type="submit" name="updateCalendar" value="Update Calendar"/> 
    …… 
    48254816          <td align="right"> 
    48264817            <xsl:choose> 
     4818              <xsl:when test="isSubscription='true'"> 
     4819                <input type="submit" name="delete" value="Delete Subscription"/> 
     4820              </xsl:when> 
    48274821              <xsl:when test="calendarCollection='true'"> 
    48284822                <input type="submit" name="delete" value="Delete Calendar"/>