Changeset 2035

Show
Ignore:
Timestamp:
01/26/09 15:10:17
Author:
johnsa
Message:

caladmin: fix up calsuite subscriptions for use in the event form.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2032 r2035  
    10001000  margin: 0 25px 0 -35px; 
    10011001} 
     1002.aliasTree li { 
     1003  list-style: none !important; 
     1004} 
     1005.aliasTree li ul { 
     1006  margin-left: 10px; 
     1007  padding-left: 10px; 
     1008} 
    10021009#bwPublicCalDisplay { 
    10031010  margin: 1em 0 -1em 1em; 

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

    r2034 r2035  
    22042204          </td> 
    22052205          <td> 
    2206             <ul class="calendarTree"> 
     2206            <ul class="aliasTree"> 
    22072207              <xsl:apply-templates select="form/subscriptions/calsuite/calendars/calendar" mode="showEventFormAliases"> 
    22082208                <xsl:with-param name="root">true</xsl:with-param> 
    …… 
    23772377    <xsl:param name="root">false</xsl:param> 
    23782378    <li> 
    2379       <xsl:attribute name="class"> 
    2380         <xsl:choose> 
    2381           <xsl:when test="calType = 0">folder</xsl:when> 
    2382           <xsl:otherwise>calendar</xsl:otherwise> 
    2383         </xsl:choose> 
    2384       </xsl:attribute> 
    2385  
    2386       <xsl:choose> 
    2387         <xsl:when test="$root = 'true'"> 
    2388           <!-- treat the root calendar as the root of calendar suite; --> 
    2389           <strong> 
    2390             <xsl:value-of select="/bedework/currentCalSuite/name"/> 
    2391           </strong> 
    2392         </xsl:when> 
    2393         <xsl:otherwise> 
    2394           <input type="checkbox" name="alias"> 
    2395             <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute> 
    2396           </input> 
    2397           <xsl:value-of select="name"/> 
    2398         </xsl:otherwise> 
    2399       </xsl:choose> 
     2379      <xsl:if test="$root != 'true'"> 
     2380        <!-- hide the root calendar. --> 
     2381        <input type="checkbox" name="alias"> 
     2382          <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute> 
     2383        </input> 
     2384        <xsl:value-of select="name"/> 
     2385      </xsl:if> 
    24002386 
    24012387      <xsl:if test="calendar[isSubscription = 'true' or calType = '0']">