Changeset 2206

Show
Ignore:
Timestamp:
05/28/09 16:28:03
Author:
johnsa
Message:

admin client: fix up publish button for pending events after validation error
personal client: fix up calendar selection for viewing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2203 r2206  
    28052805    <div class="submitBox"> 
    28062806      <xsl:choose> 
    2807         <xsl:when test="starts-with(form/calendar/event/path,$submissionsRootUnencoded)"> 
     2807        <!-- xsl:when test="starts-with(form/calendar/event/path,$submissionsRootUnencoded)"--> 
     2808        <xsl:when test="/bedework/page = 'modEventPending'"> 
    28082809          <div class="right"> 
    28092810            <input type="submit" name="delete" value="Delete Event"/> 

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

    r2203 r2206  
    18991899            <em>(recurrence master)</em> 
    19001900          </xsl:if> 
     1901          <!-- 
    19011902          <xsl:if test="scheduleMethod = '2' and not(/bedework/userid = substring-before(substring-after(organizer/organizerUri,':'),'@'))"> 
    1902             <!-- this is a scheduled event (meeting or task) - allow a direct refresh --> 
    1903             <!-- NOTE: we need to actually output the organizer account for testing, rather 
    1904                  than testing against the organizerUri...might not be the same --> 
     1903            /* this is a scheduled event (meeting or task) - allow a direct refresh 
     1904                NOTE: we need to actually output the organizer account for testing, rather 
     1905                 than testing against the organizerUri...might not be the same */ 
    19051906            <a href="{$schedule-refresh}&amp;method=REFRESH" id="refreshEventAction"> 
    19061907              <img src="{$resourcesRoot}/resources/std-icalRefresh-icon-small.gif" width="12" height="16" border="0" alt="send a request to refresh this scheduled event"/> 
    …… 
    19081909            </a> 
    19091910          </xsl:if> 
     1911          --> 
    19101912        </th> 
    19111913      </tr> 
    …… 
    22442246          <td class="fieldname">Calendar:</td> 
    22452247          <td class="fieldval"> 
     2248            <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> 
    22462249            <xsl:variable name="calUrl" select="calendar/encodedPath"/> 
    22472250            <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable> 
    2248             <a href="{$setSelection}&amp;calUrl={$calUrl}"> 
     2251            <a href="{$setSelection}&amp;virtualPath={$virtualPath}&amp;calUrl={$calUrl}"> 
    22492252              <xsl:choose> 
    22502253                <xsl:when test="contains(calendar/path,$userPath)"> 
    …… 
    45784581        <xsl:text> </xsl:text> 
    45794582      </xsl:if> 
     4583      <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> 
    45804584      <xsl:variable name="calPath" select="encodedPath"/> 
    4581       <a href="{$setSelection}&amp;calUrl={$calPath}"> 
     4585      <a href="{$setSelection}&amp;virtualPath={$virtualPath}&amp;calUrl={$calPath}"> 
    45824586        <xsl:value-of select="name"/> 
    45834587      </a> 
    …… 
    46134617      </xsl:attribute> 
    46144618      <xsl:variable name="calPath" select="encodedPath"/> 
    4615         <xsl:choose> 
    4616           <xsl:when test="calType='5'"> 
    4617             <a href="{$showInbox}" title="incoming scheduling requests"> 
    4618               <xsl:value-of select="name"/> 
    4619             </a> 
    4620             <xsl:text> </xsl:text> 
    4621             <xsl:if test="/bedework/inboxState/numActive != '0'"> 
    4622               <span class="inoutboxActive">(<xsl:value-of select="/bedework/inboxState/numActive"/>)</span> 
    4623             </xsl:if> 
    4624           </xsl:when> 
    4625           <xsl:when test="calType='6'"> 
    4626             <a href="{$showOutbox}" title="outgoing scheduling requests"> 
    4627               <xsl:value-of select="name"/> 
    4628             </a> 
    4629             <xsl:text> </xsl:text> 
    4630             <xsl:if test="/bedework/outboxState/numActive != '0'"> 
    4631               <span class="inoutboxActive">(<xsl:value-of select="/bedework/outboxState/numActive"/>)</span> 
    4632             </xsl:if> 
    4633           </xsl:when> 
    4634           <xsl:otherwise> 
    4635             <a href="{$setSelection}&amp;calUrl={$calPath}"> 
    4636               <xsl:attribute name="title"> 
    4637                 <xsl:choose> 
    4638                   <xsl:when test="calType = 2">Contains items you have access to delete.</xsl:when> 
    4639                   <xsl:when test="calType = 3">Used to mask items you do not have access to truly delete, such as many subscribed events.</xsl:when> 
    4640                 </xsl:choose> 
    4641               </xsl:attribute> 
    4642               <xsl:value-of select="name"/> 
    4643             </a> 
    4644           </xsl:otherwise> 
    4645         </xsl:choose> 
     4619      <xsl:choose> 
     4620        <xsl:when test="calType='5'"> 
     4621          <a href="{$showInbox}" title="incoming scheduling requests"> 
     4622            <xsl:value-of select="name"/> 
     4623          </a> 
     4624          <xsl:text> </xsl:text> 
     4625          <xsl:if test="/bedework/inboxState/numActive != '0'"> 
     4626            <span class="inoutboxActive">(<xsl:value-of select="/bedework/inboxState/numActive"/>)</span> 
     4627          </xsl:if> 
     4628        </xsl:when> 
     4629        <xsl:when test="calType='6'"> 
     4630          <a href="{$showOutbox}" title="outgoing scheduling requests"> 
     4631            <xsl:value-of select="name"/> 
     4632          </a> 
     4633          <xsl:text> </xsl:text> 
     4634          <xsl:if test="/bedework/outboxState/numActive != '0'"> 
     4635            <span class="inoutboxActive">(<xsl:value-of select="/bedework/outboxState/numActive"/>)</span> 
     4636          </xsl:if> 
     4637        </xsl:when> 
     4638        <xsl:otherwise> 
     4639          <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> 
     4640          <a href="{$setSelection}&amp;virtualPath={$virtualPath}&amp;calUrl={$calPath}"> 
     4641            <xsl:attribute name="title"> 
     4642              <xsl:choose> 
     4643                <xsl:when test="calType = 2">Contains items you have access to delete.</xsl:when> 
     4644                <xsl:when test="calType = 3">Used to mask items you do not have access to truly delete, such as many subscribed events.</xsl:when> 
     4645              </xsl:choose> 
     4646            </xsl:attribute> 
     4647            <xsl:value-of select="name"/> 
     4648          </a> 
     4649        </xsl:otherwise> 
     4650      </xsl:choose> 
    46464651      <xsl:if test="calendar"> 
    46474652        <ul> 
    …… 
    81138118          </td> 
    81148119          <td> 
     8120            <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> 
    81158121            <xsl:variable name="calUrl" select="event/calendar/encodedPath"/> 
    8116             <a href="{$setSelection}&amp;calUrl={$calUrl}"> 
     8122            <a href="{$setSelection}&amp;virtualPath={$virtualPath}&amp;calUrl={$calUrl}"> 
    81178123              <xsl:value-of select="event/calendar/name"/> 
    81188124            </a>