Changeset 2133

Show
Ignore:
Timestamp:
04/14/09 17:32:27
Author:
johnsa
Message:

some cosmetic updates

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2132 r2133  
    981981          <td class="calcat"> 
    982982            <xsl:for-each select="categories/category"> 
     983              <xsl:sort select="word"/> 
    983984              <xsl:value-of select="word"/><br/> 
    984985            </xsl:for-each> 
    …… 
    22712272        </tr> 
    22722273 
     2274        <!-- Topical area  --> 
     2275        <!-- These are the subscriptions (aliases) where the events should show up. 
     2276             By selecting one or more of these, appropriate categories will be set on the event --> 
     2277        <tr> 
     2278          <td class="fieldName"> 
     2279            Topical area: 
     2280          </td> 
     2281          <td> 
     2282            <ul class="aliasTree"> 
     2283              <xsl:apply-templates select="form/subscriptions/calsuite/calendars/calendar" mode="showEventFormAliases"> 
     2284                <xsl:with-param name="root">true</xsl:with-param> 
     2285              </xsl:apply-templates> 
     2286            </ul> 
     2287          </td> 
     2288        </tr> 
     2289 
    22732290        <!--  Category  --> 
    22742291        <!-- 
    …… 
    23912408        </tr> --> 
    23922409 
    2393         <!-- Topical area  --> 
    2394         <!-- These are the subscriptions (aliases) where the events should show up. 
    2395              By selecting one or more of these, appropriate categories will be set on the event --> 
    2396         <tr> 
    2397           <td class="fieldName"> 
    2398             Topical area: 
    2399           </td> 
    2400           <td> 
    2401             <ul class="aliasTree"> 
    2402               <xsl:apply-templates select="form/subscriptions/calsuite/calendars/calendar" mode="showEventFormAliases"> 
    2403                 <xsl:with-param name="root">true</xsl:with-param> 
    2404               </xsl:apply-templates> 
    2405             </ul> 
    2406           </td> 
    2407         </tr> 
    2408  
    24092410        <xsl:if test="form/contact/name"> 
    24102411          <tr> 
    …… 
    24852486              <xsl:if test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
    24862487            </input> 
    2487             <xsl:value-of select="name"/> 
     2488            <xsl:choose> 
     2489              <xsl:when test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"> 
     2490                <strong><xsl:value-of select="name"/></strong> 
     2491              </xsl:when> 
     2492              <xsl:otherwise> 
     2493                <xsl:value-of select="name"/> 
     2494              </xsl:otherwise> 
     2495            </xsl:choose> 
    24882496          </xsl:otherwise> 
    24892497        </xsl:choose> 
    …… 
    55435551        <tr> 
    55445552          <th> 
    5545             Allow users to select categories in event form: 
     5553            Allow event administrators to<br/>select categories in event form: 
    55465554          </th> 
    55475555          <td> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r2123 r2133  
    461461             </xsl:otherwise> 
    462462           </xsl:choose> 
    463            <span class="link"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">available calendars</a></span> 
     463           <span class="link"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">all topical areas</a></span> 
    464464         </td> 
    465465         <td class="rightCell"> 
    …… 
    843843            <xsl:for-each select="xproperties/X-BEDEWORK-ALIAS"> 
    844844              <xsl:variable name="calUrl" select="values/text"/> 
    845               <a href="{$setSelection}&amp;calUrl={$calUrl}"> 
     845              <a href="{$setSelection}&amp;calUrl={$calUrl}&amp;setappvar=curCollection({$calUrl})"> 
    846846                <xsl:call-template name="substring-afterLastInstanceOf"> 
    847847                  <xsl:with-param name="string" select="values/text"/> 
    …… 
    14241424  <!-- list of available calendars --> 
    14251425  <xsl:template match="calendars"> 
    1426     <xsl:variable name="topLevelCalCount" select="count(calendar/calendar[calType != 5 and calType != 6 and calType != 2 and calType != 3])"/> 
     1426    <xsl:variable name="topLevelCalCount" select="count(calendar/calendar[calType != 5 and calType != 6 and name != 'calendar'])"/> 
    14271427    <table id="calPageTable" border="0" cellpadding="0" cellspacing="0"> 
    14281428      <tr> 
    14291429        <th colspan="2"> 
    1430           All Calendars 
     1430          All Topical Areas 
    14311431        </th> 
    14321432      </tr> 
    …… 
    14341434        <td colspan="2" class="infoCell"> 
    14351435          <p class="info"> 
    1436             Select a calendar from the list below to see only that calendar's events. 
     1436            Select a topical area from the list below to see only its events. 
    14371437          </p> 
    14381438        </td> 
    …… 
    14401440      <tr> 
    14411441        <td class="leftCell"> 
     1442          <!-- adjust the following calculations to get a balanced layout between the cells --> 
    14421443          <ul class="calendarTree"> 
    1443             <xsl:apply-templates select="calendar/calendar[(calType = 0 or calType = 7 or calType = 8) and position() &lt;= ceiling($topLevelCalCount div 2)]" mode="calTree"/> 
     1444            <xsl:apply-templates select="calendar/calendar[(calType != 5 and calType != 6 and name != 'calendar') and (position() &lt;= ceiling($topLevelCalCount div 2)+2)]" mode="calTree"/> 
    14441445          </ul> 
    14451446        </td> 
    14461447        <td> 
    14471448          <ul class="calendarTree"> 
    1448             <xsl:apply-templates select="calendar/calendar[(calType = 0 or calType = 7 or calType = 8) and position() &gt; ceiling($topLevelCalCount div 2)]" mode="calTree"/> 
     1449            <xsl:apply-templates select="calendar/calendar[(calType != 5 and calType != 6 and name != 'calendar') and (position() &gt; ceiling($topLevelCalCount div 2)+2)]" mode="calTree"/> 
    14491450          </ul> 
    14501451        </td> 
    …… 
    14641465      <xsl:variable name="calPath" select="path"/> 
    14651466      <a href="{$setSelection}&amp;calUrl={$url}&amp;setappvar=curCollection({$calPath})" title="view calendar"><xsl:value-of select="name"/></a> 
    1466       <xsl:if test="calType != '0'"> 
    1467         <xsl:variable name="calPath" select="path"/> 
    1468         <span class="exportCalLink"> 
    1469           <a href="{$calendar-fetchForExport}&amp;calPath={$calPath}" title="export calendar as iCal"> 
    1470             <img src="{$resourcesRoot}/images/calIconExport-sm.gif" width="13" height="13" alt="export calendar" border="0"/> 
    1471           </a> 
    1472         </span> 
    1473       </xsl:if> 
     1467      <xsl:variable name="calPath" select="path"/> 
     1468      <span class="exportCalLink"> 
     1469        <a href="{$calendar-fetchForExport}&amp;calPath={$calPath}" title="export calendar as iCal"> 
     1470          <img src="{$resourcesRoot}/images/calIconExport-sm.gif" width="13" height="13" alt="export calendar" border="0"/> 
     1471        </a> 
     1472      </span> 
    14741473      <xsl:if test="calendar"> 
    14751474        <ul>