Changeset 2235

Show
Ignore:
Timestamp:
06/26/09 15:27:19
Author:
johnsa
Message:

fix up of some final bugs / naming conventions

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2195 r2235  
    436436           <xsl:choose> 
    437437             <xsl:when test="/bedework/selectionState/selectionType = 'collections'"> 
    438                Calendar: 
     438               Topical Area: 
    439439               <strong> 
    440440                 <xsl:call-template name="substring-afterLastInstanceOf"> 

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

    r2234 r2235  
    230230  /*border-top: 24px solid #333;*/ 
    231231  vertical-align: top; 
    232   white-space: nowrap; 
    233   margin: 0; 
    234   padding: 0; 
     232  margin: 0; 
     233  padding: 0; 
     234} 
     235#bedework #bodyBlock td#msgTaskBar ul { 
     236  margin-left: 2.25em; 
     237  padding-left: 0; 
     238} 
     239#bedework #bodyBlock td#msgTaskBar li { 
     240  list-style-image: url(../../resources/calIconSchedule-sm.gif); 
    235241} 
    236242#bedework #bodyBlock td#msgTaskBarPlaceholder { 

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

    r2234 r2235  
    18601860  <xsl:template match="event" mode="schedNotifications"> 
    18611861    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    1862     <xsl:variable name="guid"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template></xsl:variable> 
     1862    <xsl:variable name="eventName" select="name"/> 
    18631863    <xsl:variable name="recurrenceId" select="recurrenceId"/> 
     1864    <xsl:variable name="inboxItemAction"> 
     1865      <xsl:choose> 
     1866        <xsl:when test="scheduleMethod=2"><xsl:value-of select="$schedule-initAttendeeRespond"/></xsl:when> 
     1867        <xsl:when test="scheduleMethod=3"><xsl:value-of select="$schedule-initAttendeeReply"/></xsl:when> 
     1868        <xsl:when test="scheduleMethod=6"><xsl:value-of select="$schedule-processRefresh"/></xsl:when> 
     1869        <xsl:when test="scheduleMethod=7"><xsl:value-of select="$schedule-initAttendeeReply"/></xsl:when> 
     1870        <xsl:otherwise><xsl:value-of select="$schedule-initAttendeeRespond"/></xsl:otherwise> 
     1871      </xsl:choose> 
     1872    </xsl:variable> 
    18641873    <li> 
    1865       <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1874      <a href="{$inboxItemAction}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}"> 
    18661875        <xsl:value-of select="summary"/> 
    18671876      </a> 
    …… 
    24392448          <td class="fieldname">Calendar:</td> 
    24402449          <td class="fieldval"> 
     2450            <!-- 
    24412451            <xsl:variable name="virtualPath"><xsl:call-template name="url-encode"><xsl:with-param name="str">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:with-param></xsl:call-template></xsl:variable> 
    2442             <xsl:variable name="calUrl" select="calendar/encodedPath"/> 
     2452            <xsl:variable name="calUrl" select="calendar/encodedPath"/> --> 
    24432453            <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable> 
    2444             <a href="{$setSelection}&amp;virtualPath={$virtualPath}&amp;calUrl={$calUrl}"> 
     2454            <!-- a href="{$setSelection}&amp;virtualPath={$virtualPath}&amp;calUrl={$calUrl}"--> 
    24452455              <xsl:choose> 
    24462456                <xsl:when test="contains(calendar/path,$userPath)"> 
    …… 
    24512461                </xsl:otherwise> 
    24522462              </xsl:choose> 
    2453             </a> 
     2463            <!-- /a--> 
    24542464          </td> 
    24552465        </tr>