Changeset 1657

Show
Ignore:
Timestamp:
12/06/07 16:06:33
Author:
johnsa
Message:

admin client: further work on pending events

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1656 r1657  
    523523            <xsl:attribute name="class">selected</xsl:attribute> 
    524524          </xsl:if> 
    525           <!-- 
    526           <a href="{$initPendingTab}&amp;setappvar=menutab(pending)&amp;ignoreCreator=yes&amp;calPath=%2Fpublic%2Funbrowsable%2Fsubmissions">Pending Events</a> 
    527            --> 
    528           <a href="{$initPendingTab}&amp;setappvar=menutab(pending)&amp;ignoreCreator=yes&amp;calPath={submissionsRoot}">Pending Events</a> 
     525          <a href="{$initPendingTab}&amp;setappvar=menutab(pending)&amp;ignoreCreator=yes&amp;calPath={$submissionsRoot}">Pending Events</a> 
    529526        </li> 
    530527        <xsl:if test="/bedework/currentCalSuite/currentAccess/current-user-privilege-set/privilege/write or /bedework/userInfo/superUser='true'"> 
    …… 
    888885        <tr> 
    889886          <xsl:choose> 
    890             <xsl:when test="/bedework/creating='true'"> 
     887            <xsl:when test="starts-with(form/calendar/all/select/option[@selected],$submissionsRoot)"> 
    891888              <td> 
    892                 <input type="submit" name="addEvent" value="Add Event"/> 
     889                <input type="submit" name="updateSubmitEvent" value="Update Event"/> 
     890                <input type="submit" name="publishEvent" value="Publish Event"/> 
    893891                <input type="submit" name="cancelled" value="Cancel"/> 
    894                 <input type="reset" value="Clear"/> 
    895892              </td> 
    896893            </xsl:when> 
    897894            <xsl:otherwise> 
    898               <td> 
    899                 <input type="submit" name="updateEvent" value="Update Event"/> 
    900                 <input type="submit" name="cancelled" value="Cancel"/> 
    901                 <xsl:if test="form/recurringEntity != 'true' and recurrenceId = ''"> 
    902                   <!-- cannot duplicate recurring events for now --> 
    903                   <input type="submit" name="copy" value="Duplicate Event"/> 
    904                 </xsl:if> 
    905               </td> 
    906               <td align="right"> 
    907                 <input type="submit" name="delete" value="Delete Event"/> 
    908               </td> 
     895              <xsl:choose> 
     896                <xsl:when test="/bedework/creating='true'"> 
     897                  <td> 
     898                    <input type="submit" name="addEvent" value="Add Event"/> 
     899                    <input type="submit" name="cancelled" value="Cancel"/> 
     900                    <input type="reset" value="Clear"/> 
     901                  </td> 
     902                </xsl:when> 
     903                <xsl:otherwise> 
     904                  <td> 
     905                    <input type="submit" name="updateEvent" value="Update Event"/> 
     906                    <input type="submit" name="cancelled" value="Cancel"/> 
     907                    <xsl:if test="form/recurringEntity != 'true' and recurrenceId = ''"> 
     908                      <!-- cannot duplicate recurring events for now --> 
     909                      <input type="submit" name="copy" value="Duplicate Event"/> 
     910                    </xsl:if> 
     911                  </td> 
     912                  <td align="right"> 
     913                    <input type="submit" name="delete" value="Delete Event"/> 
     914                  </td> 
     915                </xsl:otherwise> 
     916              </xsl:choose> 
    909917            </xsl:otherwise> 
    910918          </xsl:choose> 
    …… 
    46224630  <!--+++++++++++++++ System Parameters (preferences) ++++++++++++++++++++--> 
    46234631  <xsl:template name="modSyspars"> 
    4624     <h2>Modify System Preferences/Parameters</h2> 
     4632    <h2>Manage System Preferences/Parameters</h2> 
    46254633    <p> 
    46264634      Do not change unless you know what you're doing.<br/>