Changeset 3457

Show
Ignore:
Timestamp:
12/31/11 09:35:30
Author:
bleibson
Message:

o fix two places where the subscription name, rather than its display name, peaked through.
o in bedeworkWhite theme, adjust the styling of the "View All Calendars" page.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/eventList.xsl

    r3448 r3457  
    3939            <td class="eventFilterInfo" colspan="3"> 
    4040              <xsl:copy-of select="$bwStr-LsVw-DispEventsForCal"/> 
    41               <xsl:text> </xsl:text> 
    42               <span class="displayFilterName"> 
    43                 <xsl:call-template name="substring-afterLastInstanceOf"> 
    44                   <xsl:with-param name="string" select="/bedework/selectionState/collection/virtualpath"/> 
    45                   <xsl:with-param name="char">/</xsl:with-param> 
    46                 </xsl:call-template> 
    47               </span><xsl:text> </xsl:text> 
    48               <a id="allView" href="{$setSelection}"><xsl:copy-of select="$bwStr-LsVw-ShowAll"/></a></td> 
     41                  <xsl:text> </xsl:text> 
     42                  <span class="displayFilterName"> 
     43                    <xsl:variable name="subscriptionName">                                         
     44                          <xsl:call-template name="substring-afterLastInstanceOf"> 
     45                        <xsl:with-param name="string" select="/bedework/selectionState/collection/virtualpath"/> 
     46                            <xsl:with-param name="char">/</xsl:with-param>       
     47                          </xsl:call-template> 
     48                        </xsl:variable> 
     49                        <xsl:value-of select="/bedework/myCalendars/calendars//calendar[name=$subscriptionName]/summary/text()" /> 
     50                  </span> 
     51                  <xsl:text> </xsl:text> 
     52                  <a id="allView" href="{$setSelection}"><xsl:copy-of select="$bwStr-LsVw-ShowAll"/></a> 
     53                </td> 
    4954          </tr> 
    5055        </xsl:when> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/subscriptions.xsl

    r3443 r3457  
    7171    <xsl:variable name="virtualPath"><xsl:call-template name="escapeJson"><xsl:with-param name="string">/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> 
    7272    <xsl:variable name="encVirtualPath"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="$virtualPath"/></xsl:call-template></xsl:variable> 
     73     
     74    <xsl:variable name="name" select="name"/> 
    7375    <xsl:variable name="summary" select="summary"/> 
    7476    <xsl:variable name="itemId" select="generate-id(path)"/> 
    …… 
    106108              </xsl:when> 
    107109              <xsl:otherwise> 
    108                 <a href="{$setSelection}&amp;virtualPath={$encVirtualPath}&amp;setappvar=curCollection({$summary})"> 
     110                <a href="{$setSelection}&amp;virtualPath={$encVirtualPath}&amp;setappvar=curCollection({$name})"> 
    109111                  <xsl:value-of select="summary"/> 
    110112                </a> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkWhite/css/bwTheme.css

    r3444 r3457  
    716716} 
    717717.info { 
    718   font-size: 1.1em; 
     718  font-size: 14px; 
    719719  margin: 1em 1em 0 1em; 
     720  font-family: Arial, Helvetica, sans-serif; 
    720721} 
    721722table#searchTable { 
    …… 
    781782 line-height: 1.5; 
    782783} 
    783 div.singleEvent   a { 
    784  text-decoration: none; 
    785  color: #444; 
    786  font-weight: bold; 
    787 } 
    788 div.singleEvent   a:hover { 
     784div.singleEvent a { 
     785 text-decoration: none; 
     786 color: #444; 
     787 font-weight: bold; 
     788} 
     789div.singleEvent a:hover { 
    789790 text-decoration: underline; 
    790791  
    …… 
    813814ul.calendarTree { 
    814815 padding: 1em; 
     816 font-family: Arial, Helvetica, sans-serif; 
     817 font-size: 12px; 
    815818} 
    816819ul.calendarTree li { 
    …… 
    821824ul.calendarTree li a { 
    822825 color: #444; 
     826 text-decoration: none; 
     827} 
     828ul.calendarTree li a:hover { 
     829 text-decoration: underline; 
    823830} 
    824831ul.calendarTree li ul { 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkWhite/eventList.xsl

    r3448 r3457  
    3939            <td class="eventFilterInfo" colspan="3"> 
    4040              <xsl:copy-of select="$bwStr-LsVw-DispEventsForCal"/> 
    41               <xsl:text> </xsl:text> 
    42               <span class="displayFilterName"> 
    43                 <xsl:call-template name="substring-afterLastInstanceOf"> 
    44                   <xsl:with-param name="string" select="/bedework/selectionState/collection/virtualpath"/> 
    45                   <xsl:with-param name="char">/</xsl:with-param> 
    46                 </xsl:call-template> 
    47               </span><xsl:text> </xsl:text> 
    48               <a id="allView" href="{$setSelection}"><xsl:copy-of select="$bwStr-LsVw-ShowAll"/></a></td> 
     41                  <xsl:text> </xsl:text> 
     42                  <span class="displayFilterName"> 
     43                    <xsl:variable name="subscriptionName">                                         
     44                          <xsl:call-template name="substring-afterLastInstanceOf"> 
     45                        <xsl:with-param name="string" select="/bedework/selectionState/collection/virtualpath"/> 
     46                            <xsl:with-param name="char">/</xsl:with-param>       
     47                          </xsl:call-template> 
     48                        </xsl:variable> 
     49                        <xsl:value-of select="/bedework/myCalendars/calendars//calendar[name=$subscriptionName]/summary/text()" /> 
     50                  </span> 
     51                  <xsl:text> </xsl:text> 
     52                  <a id="allView" href="{$setSelection}"><xsl:copy-of select="$bwStr-LsVw-ShowAll"/></a> 
     53                </td> 
    4954          </tr> 
    5055        </xsl:when> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkWhite/subscriptions.xsl

    r3448 r3457  
    7171    <xsl:variable name="virtualPath"><xsl:call-template name="escapeJson"><xsl:with-param name="string">/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> 
    7272    <xsl:variable name="encVirtualPath"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="$virtualPath"/></xsl:call-template></xsl:variable> 
     73     
     74    <xsl:variable name="name" select="name"/> 
    7375    <xsl:variable name="summary" select="summary"/> 
    7476    <xsl:variable name="itemId" select="generate-id(path)"/> 
    …… 
    106108              </xsl:when> 
    107109              <xsl:otherwise> 
    108                 <a href="{$setSelection}&amp;virtualPath={$encVirtualPath}&amp;setappvar=curCollection({$summary})"> 
     110                <a href="{$setSelection}&amp;virtualPath={$encVirtualPath}&amp;setappvar=curCollection({$name})"> 
    109111                  <xsl:value-of select="summary"/> 
    110112                </a>