Changeset 1401

Show
Ignore:
Timestamp:
05/31/07 17:01:56
Author:
johnsa
Message:

user client: integrate event access control with event form

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1400 r1401  
    172172        <div id="bedework"><!-- main wrapper div to keep styles encapsulated within portals --> 
    173173          <xsl:choose> 
    174             <!--deprecated: <xsl:when test="/bedework/page='selectCalForEvent'"> 
     174            <!--deprecated:  
     175            <xsl:when test="/bedework/page='selectCalForEvent'"> 
    175176              <xsl:call-template name="selectCalForEvent"/> 
    176177            </xsl:when>--> 
    …… 
    181182              <xsl:call-template name="attendees"/> 
    182183            </xsl:when> 
     184            <!--deprecated: 
    183185            <xsl:when test="/bedework/page='eventAccess'"> 
    184186              <xsl:call-template name="messagesAndErrors"/> 
    185187              <xsl:apply-templates select="/bedework/eventAccess"/> 
    186             </xsl:when> 
     188            </xsl:when>--> 
    187189            <xsl:otherwise> 
    188190              <xsl:call-template name="headBar"/> 
    …… 
    19301932 
    19311933      <!-- event form submenu --> 
    1932       <xsl:choose> 
     1934      <!--<xsl:choose> 
    19331935        <xsl:when test="/bedework/creating = 'false'"> 
    19341936          <a href="javascript:launchSizedWindow('{$event-showAccess}',600,700)" id="eventAccessLink">set event access</a> 
    …… 
    19371939          <a href="javascript:alert('Access/sharing may be set once an event is created.\n')" id="eventAccessLink">set event access</a> 
    19381940        </xsl:otherwise> 
    1939       </xsl:choose> 
     1941      </xsl:choose>--> 
    19401942      <ul id="eventFormTabs" class="submenu"> 
    19411943        <li class="selected"> 
    1942           <a href="javascript:setTab('eventFormTabs',0); show('bwEventTab-Basic'); hide('bwEventTab-Details','bwEventTab-Recurrence');"> 
     1944          <a href="javascript:setTab('eventFormTabs',0); show('bwEventTab-Basic'); hide('bwEventTab-Details','bwEventTab-Recurrence','bwEventTab-Access');"> 
    19431945            basic 
    19441946          </a> 
    19451947        </li> 
    19461948        <li> 
    1947           <a href="javascript:setTab('eventFormTabs',1); show('bwEventTab-Details'); hide('bwEventTab-Basic','bwEventTab-Recurrence');"> 
     1949          <a href="javascript:setTab('eventFormTabs',1); show('bwEventTab-Details'); hide('bwEventTab-Basic','bwEventTab-Recurrence','bwEventTab-Access');"> 
    19481950            details 
    19491951          </a> 
    19501952        </li> 
    19511953        <li> 
    1952           <a href="javascript:setTab('eventFormTabs',2); show('bwEventTab-Recurrence'); hide('bwEventTab-Details','bwEventTab-Basic');"> 
     1954          <a href="javascript:setTab('eventFormTabs',2); show('bwEventTab-Recurrence'); hide('bwEventTab-Details','bwEventTab-Basic','bwEventTab-Access');"> 
    19531955            recurrence 
     1956          </a> 
     1957        </li> 
     1958        <li> 
     1959          <a href="javascript:setTab('eventFormTabs',3); show('bwEventTab-Access'); hide('bwEventTab-Details','bwEventTab-Basic','bwEventTab-Recurrence');"> 
     1960            access 
    19541961          </a> 
    19551962        </li> 
    …… 
    28992906      </xsl:choose> 
    29002907    </div> 
     2908     
     2909    <!-- Access Control tab --> 
     2910    <!-- ================== --> 
     2911    <div id="bwEventTab-Access" class="invisible"> 
     2912      <div id="sharingBox"> 
     2913        <xsl:apply-templates select="/bedework/eventAccess/access/acl" mode="currentAccess"> 
     2914          <xsl:with-param name="action" select="$event-setAccess"/> 
     2915          <xsl:with-param name="calPathEncoded" select="$calPathEncoded"/> 
     2916          <xsl:with-param name="guid" select="$guid"/> 
     2917          <xsl:with-param name="recurrenceId" select="$recurrenceId"/> 
     2918        </xsl:apply-templates> 
     2919        <form name="eventShareForm" method="post" action="{$event-setAccess}" id="shareForm" onsubmit="setAccessHow(this)"> 
     2920          <input type="hidden" name="calPath" value="{$calPath}"/> 
     2921          <input type="hidden" name="guid" value="{$guid}"/> 
     2922          <input type="hidden" name="recurid" value="{$recurrenceId}"/> 
     2923          <xsl:call-template name="entityAccessForm"> 
     2924            <xsl:with-param name="hideSubmitButton">true</xsl:with-param> 
     2925          </xsl:call-template> 
     2926        </form> 
     2927      </div> 
     2928    </div> 
     2929     
     2930     
    29012931    <div class="eventSubmitButtons"> 
    29022932      <input name="submit" type="submit" value="save event"/> 
    …… 
    65056535  <!--==== ACCESS CONTROL TEMPLATES ====--> 
    65066536 
    6507   <xsl:template match="eventAccess"> 
    6508     <xsl:variable name="calPathEncoded" select="calendar/encodedPath"/> 
    6509     <xsl:variable name="calPath" select="calendar/path"/> 
    6510     <xsl:variable name="guid" select="guid"/> 
    6511     <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    6512     <div id="bwEventTab-Access"> 
    6513       <div id="sharingBox"> 
    6514         <xsl:apply-templates select="access/acl" mode="currentAccess"> 
    6515           <xsl:with-param name="action" select="$event-setAccess"/> 
    6516           <xsl:with-param name="calPathEncoded" select="$calPathEncoded"/> 
    6517           <xsl:with-param name="guid" select="$guid"/> 
    6518           <xsl:with-param name="recurrenceId" select="$recurrenceId"/> 
    6519         </xsl:apply-templates> 
    6520         <form name="eventShareForm" method="post" action="{$event-setAccess}" id="shareForm" onsubmit="setAccessHow(this)"> 
    6521           <input type="hidden" name="calPath" value="{$calPath}"/> 
    6522           <input type="hidden" name="guid" value="{$guid}"/> 
    6523           <input type="hidden" name="recurid" value="{$recurrenceId}"/> 
    6524           <xsl:call-template name="entityAccessForm"/> 
    6525         </form> 
    6526       </div> 
    6527     </div> 
    6528   </xsl:template> 
    6529  
    65306537  <xsl:template name="schedulingAccessForm"> 
    65316538    <xsl:param name="what"/> 
    …… 
    65636570 
    65646571  <xsl:template name="entityAccessForm"> 
    6565     <xsl:param name="type"/><!-- optional: 
    6566     currently used for inbox and outbox to conditionally 
    6567     display scheduling access --> 
     6572    <xsl:param name="type"/><!-- optional: currently used for inbox and outbox to conditionally display scheduling access --> 
     6573    <xsl:param name="hideSubmitButton">false</xsl:param> 
    65686574    <table cellpadding="0" id="shareFormTable" class="common"> 
    65696575      <tr> 
    …… 
    68346840      </tr> 
    68356841    </table> 
    6836     <input type="submit" name="submit" value="Submit"/> 
     6842    <xsl:if test="$hideSubmitButton = 'false'">  
     6843      <input type="submit" name="submit" value="Submit"/> 
     6844    </xsl:if> 
    68376845  </xsl:template> 
    68386846 

  • trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js

    r1245 r1401  
    77  setDates(formObj); 
    88  setRecurrence(formObj); 
     9  setAccessHow(formObj); 
    910} 
    1011function setDates(formObj) {