Changeset 2119

Show
Ignore:
Timestamp:
04/06/09 16:43:38
Author:
johnsa
Message:

user client: don't show "request refresh" button for organizer, fix up meeting display text

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r2117 r2119  
    18771877              Personal <xsl:value-of select="$entityType"/> 
    18781878            </xsl:when> 
     1879            <xsl:when test="scheduleMethod = '2'"> 
     1880              <!-- a scheduled meeting ro task --> 
     1881              <xsl:value-of select="$entityType"/> - organizer: <xsl:value-of select="substring-after(organizer/organizerUri,':')"/> 
     1882            </xsl:when> 
    18791883            <xsl:otherwise> 
    1880               <xsl:value-of select="$entityType"/> (<xsl:value-of select="calendar/owner"/>) 
     1884              <xsl:value-of select="$entityType"/> 
    18811885            </xsl:otherwise> 
    18821886          </xsl:choose> 
     
    18851889            <em>(recurrence master)</em> 
    18861890          </xsl:if> 
    1887           <xsl:if test="scheduleMethod = '2'"> 
     1891          <xsl:if test="scheduleMethod = '2' and not(/bedework/userid = substring-before(substring-after(organizer/organizerUri,':'),'@'))"> 
    18881892            <!-- this is a scheduled event (meeting or task) - allow a direct refresh --> 
     1893            <!-- NOTE: we need to actually output the organizer account for testing, rather 
     1894                 than testing against the organizerUri...might not be the same --> 
    18891895            <a href="{$schedule-refresh}&amp;method=REFRESH" id="refreshEventAction"> 
    18901896              <img src="{$resourcesRoot}/resources/std-icalRefresh-icon-small.gif" width="12" height="16" border="0" alt="send a request to refresh this scheduled event"/> 
     
    23882394                </xsl:when> 
    23892395                <xsl:otherwise> 
    2390                   <xsl:value-of select="$entityType"/> (<xsl:value-of select="calendar/owner"/>) 
     2396                  <xsl:value-of select="$entityType"/> 
    23912397                </xsl:otherwise> 
    23922398              </xsl:choose>