Changeset 2083

Show
Ignore:
Timestamp:
02/27/09 17:13:45
Author:
johnsa
Message:

user client: tidy up access control and calendar editing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/resources/xsl/default/default/bedeworkAccess.xsl

    r2080 r2083  
    167167              </td> 
    168168            </tr> 
    169             <xsl:if test="$type = 'inbox' or $type = 'outbox'"> 
    170               <tr> 
    171                 <td class="level4"> 
    172                   <input type="checkbox" value="S" id="accessSchedule" name="howItem" onclick="setupAccessForm(this, this.form); toggleAllowDenyFlag(this, this.form)"/> schedule 
    173                 </td> 
     169            <tr> 
     170              <td class="level4"> 
     171                <input type="checkbox" value="S" id="accessSchedule" name="howItem" onclick="setupAccessForm(this, this.form); toggleAllowDenyFlag(this, this.form)"/> schedule 
     172              </td> 
    174173              <td> 
    175174                <input type="radio" value="S" name="accessSchedule" checked="checked" disabled="disabled"/> 
    …… 
    211210                <input type="radio" value="-s" name="s" disabled="disabled"/> 
    212211              </td> 
    213               </tr> 
    214             </xsl:if> 
     212            </tr> 
    215213            <tr> 
    216214              <td class="level3"> 

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

    r2080 r2083  
    18611861  margin: 1em; 
    18621862} 
     1863#bedework .innerBlock { 
     1864  margin: 0 1em 2em 1em; 
     1865} 
     1866#bedework .innerBlock a { 
     1867  text-decoration: underline; 
     1868} 
     1869 

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

    r2082 r2083  
    43274327              </xsl:when> 
    43284328              <xsl:otherwise> 
    4329                 <xsl:apply-templates select="calendar[number(calType) &lt; 2 or number(calType) = 4 or number(calType) &gt; 6]" mode="listForUpdate"/> 
     4329                <xsl:apply-templates select="calendar" mode="listForUpdate"/> 
    43304330              </xsl:otherwise> 
    43314331            </xsl:choose> 
    …… 
    44474447 
    44484448  <xsl:template match="calendar" mode="listForUpdate"> 
    4449     <!-- this template receives calType 0,1,4,7,8,9 --> 
     4449    <!-- this template receives all calTypes --> 
    44504450    <xsl:variable name="calPath" select="encodedPath"/> 
    44514451    <li> 
    …… 
    44594459          </xsl:when> 
    44604460          <xsl:when test="calType = '0'">folder</xsl:when> 
     4461          <xsl:when test="calType='2' or calType='3'">trash</xsl:when> 
     4462          <xsl:when test="calType='5'">inbox</xsl:when> 
     4463          <xsl:when test="calType='6'">outbox</xsl:when> 
    44614464          <xsl:otherwise>calendar</xsl:otherwise> 
    44624465        </xsl:choose> 
    …… 
    44734476      <xsl:if test="calendar and isSubscription='false'"> 
    44744477        <ul> 
    4475           <xsl:apply-templates select="calendar[number(calType) &lt; 2 or number(calType) = 4 or number(calType) &gt; 6]" mode="listForUpdate"> 
     4478          <xsl:apply-templates select="calendar" mode="listForUpdate"> 
    44764479            <xsl:sort select="name" order="ascending" case-order="upper-first"/> 
    44774480          </xsl:apply-templates> 
    …… 
    48264829          </td> 
    48274830          <td align="right"> 
    4828             <xsl:choose> 
    4829               <xsl:when test="isSubscription='true'"> 
    4830                 <input type="submit" name="delete" value="Delete Subscription"/> 
    4831               </xsl:when> 
    4832               <xsl:when test="calType = '0'"> 
    4833                 <input type="submit" name="delete" value="Delete Folder"/> 
    4834               </xsl:when> 
    4835               <xsl:otherwise> 
    4836                 <input type="submit" name="delete" value="Delete Calendar"/> 
    4837               </xsl:otherwise> 
    4838             </xsl:choose> 
     4831            <xsl:if test="calType != '3' and calType != '5' and calType != '6'"> 
     4832              <xsl:choose> 
     4833                <xsl:when test="isSubscription='true'"> 
     4834                  <input type="submit" name="delete" value="Delete Subscription"/> 
     4835                </xsl:when> 
     4836                <xsl:when test="calType = '0'"> 
     4837                  <input type="submit" name="delete" value="Delete Folder"/> 
     4838                </xsl:when> 
     4839                <xsl:otherwise> 
     4840                  <input type="submit" name="delete" value="Delete Calendar"/> 
     4841                </xsl:otherwise> 
     4842              </xsl:choose> 
     4843            </xsl:if> 
    48394844          </td> 
    48404845        </tr> 
    …… 
    49624967          </td> 
    49634968          <td align="right"> 
    4964             <xsl:choose> 
    4965               <xsl:when test="isSubscription='true'"> 
    4966                 <input type="submit" name="delete" value="Delete Subscription"/> 
    4967               </xsl:when> 
    4968               <xsl:when test="calType = '0'"> 
    4969                 <input type="submit" name="delete" value="Delete Folder"/> 
    4970               </xsl:when> 
    4971               <xsl:otherwise> 
    4972                 <input type="submit" name="delete" value="Delete Calendar"/> 
    4973               </xsl:otherwise> 
    4974             </xsl:choose> 
     4969            <xsl:if test="calType != '3' and calType != '5' and calType != '6'"> 
     4970              <xsl:choose> 
     4971                <xsl:when test="isSubscription='true'"> 
     4972                  <input type="submit" name="delete" value="Delete Subscription"/> 
     4973                </xsl:when> 
     4974                <xsl:when test="calType = '0'"> 
     4975                  <input type="submit" name="delete" value="Delete Folder"/> 
     4976                </xsl:when> 
     4977                <xsl:otherwise> 
     4978                  <input type="submit" name="delete" value="Delete Calendar"/> 
     4979                </xsl:otherwise> 
     4980              </xsl:choose> 
     4981            </xsl:if> 
    49754982          </td> 
    49764983        </tr> 
    …… 
    75247531    </ul> 
    75257532 
    7526     <table class="common" cellspacing="0"> 
    7527       <tr> 
    7528         <th class="leftBorder">Can send me scheduling requests:</th> 
    7529         <th class="leftBorder">Can schedule on my behalf:</th> 
    7530       </tr> 
    7531       <tr> 
    7532         <td class="leftBorder padMe"> 
    7533           <form name="prefsSetAccess1" method="post" action="{$prefs-setAccess}" onsubmit="setScheduleHow(this)"> 
    7534             <xsl:call-template name="schedulingAccessForm"> 
    7535               <xsl:with-param name="what">in</xsl:with-param> 
    7536             </xsl:call-template> 
    7537           </form> 
    7538  
    7539           <!-- xsl:apply-templates select="inbox/acl" mode="currentAccess"> 
    7540             <xsl:with-param name="action" select="$prefs-setAccess"/> 
    7541             <xsl:with-param name="what">in</xsl:with-param> 
    7542           </xsl:apply-templates--> 
    7543  
    7544           <h3>Current Access:</h3> 
    7545           <div id="bwCurrentAccessWidgetIn">&#160;</div> 
    7546           <script type="text/javascript"> 
    7547             bwAcl.display("bwCurrentAccessWidgetIn"); 
    7548           </script> 
    7549         </td> 
    7550         <td class="leftBorder padMe"> 
    7551           <form name="prefsSetAccess2" method="post" action="{$prefs-setAccess}" onsubmit="setScheduleHow(this)"> 
    7552             <xsl:call-template name="schedulingAccessForm"> 
    7553               <xsl:with-param name="what">out</xsl:with-param> 
    7554             </xsl:call-template> 
    7555           </form> 
    7556  
    7557           <!-- xsl:apply-templates select="outbox/acl" mode="currentAccess"> 
    7558             <xsl:with-param name="action" select="$prefs-setAccess"/> 
    7559             <xsl:with-param name="what">out</xsl:with-param> 
    7560           </xsl:apply-templates--> 
    7561  
    7562           <h3>Current Access:</h3> 
    7563           <div id="bwCurrentAccessWidgetOut">&#160;</div> 
    7564           <script type="text/javascript"> 
    7565             bwAcl.display("bwCurrentAccessWidgetOut"); 
    7566           </script> 
    7567         </td> 
    7568       </tr> 
    7569     </table> 
     7533    <div class="innerBlock"> 
     7534      <h3>This page is in progress.</h3> 
     7535      <p>In the meantime, you may <a href="{$calendar-fetch}">set scheduling access by modifying acls on your inbox and outbox</a>.  Grant scheduling access and read freebusy.</p> 
     7536      <ul> 
     7537        <li>Inbox: users granted scheduling access on your inbox can send you scheduling requests.</li> 
     7538        <li>Outbox: users granted scheduling access on your outbox can schedule on your behalf.</li> 
     7539      </ul> 
     7540    </div> 
    75707541 
    75717542    <form name="scheduleAutoProcessingForm" method="post" action="{$prefs-updateSchedulingPrefs}">