Changeset 383

Show
Ignore:
Timestamp:
04/19/06 13:36:51
Author:
johnsa
Message:

basic calendar sharing now implemented in personal client user interface

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r382 r383  
    385385 
    386386/* table below is used for almost all forms  */ 
    387 #commonTable { 
     387table.common { 
    388388  width: 100%; 
    389389  font-size: 0.9em; 
    …… 
    391391  padding: 0px; 
    392392} 
    393 #commonTable th { 
     393table.common th { 
    394394  text-align: left; 
    395395  vertical-align: top; 
    …… 
    399399  white-space: nowrap; 
    400400} 
    401 #commonTable th.icon { 
     401table.common th.icon { 
    402402  margin: 0em; 
    403403  vertical-align: middle; 
    …… 
    407407  color: black; 
    408408} 
    409 #commonTable th.commonHeader { 
     409table.common th.commonHeader { 
    410410  background-color: #666; 
    411411  color: #eee; 
    …… 
    414414  font-weight: normal; 
    415415} 
    416 #commonTable th.commonHeader a:link, 
    417 #commonTable th.commonHeader a:active, 
    418 #commonTable th.commonHeader a:visited { 
     416table.common th.commonHeader a:link, 
     417table.common th.commonHeader a:active, 
     418table.common th.commonHeader a:visited { 
    419419  background-color: inherit; 
    420420  color: #eee; 
    …… 
    422422  text-align: left; 
    423423} 
    424 #commonTable th.commonHeader a:hover { 
     424table.common th.commonHeader a:hover { 
    425425  background-color: inherit; 
    426426  color: #ff9; 
    …… 
    428428  text-align: left; 
    429429} 
    430 #commonTable td.filler { 
     430table.common td.filler { 
    431431  height: 200px; 
    432432} 
    433 #commonTable td.fieldval { 
     433table.common td.fieldval { 
    434434  margin: 0em; 
    435435  vertical-align: top; 
    436436  padding: 0.5em 0.5em 0.2em 1em; 
    437437} 
    438 #commonTable td.fieldname { 
     438table.common td.fieldname { 
    439439  width: 80px; 
    440440  margin: 0em; 
    …… 
    445445  white-space: nowrap; 
    446446} 
    447 #commonTable td.eventLinks { 
     447table.common td.eventLinks { 
    448448  background-color: #ddd; 
    449449  color: #eee; 
    …… 
    451451  text-align: center; 
    452452} 
    453 #commonTable #eventActions { 
     453table.common #eventActions { 
    454454  float: right; 
    455455  clear: none; 
    456456} 
    457 #commonTable td.allField { 
     457table.common td.allField { 
    458458  white-space: nowrap; 
    459459  text-align: right; 
    …… 
    463463  padding: 0.2em; 
    464464} 
    465 #commonTable .dateFields { 
     465table.common .dateFields { 
    466466  display: inline; 
    467467} 
    468 #commonTable .timeFields { 
     468table.common .timeFields { 
    469469  display: inline; 
    470470  margin-left: 1em; 
    471471} 
    472 #commonTable .dateStartEndBox { 
     472table.common .dateStartEndBox { 
    473473  border: 1px solid #ccb; 
    474474  margin: 4px; 
    475475  padding: 4px; 
    476476} 
    477 #commonTable .dateStartEndBox strong { 
     477table.common .dateStartEndBox strong { 
    478478  display: block; 
    479479} 
    480 #commonTable .startDateLabel { 
     480table.common .startDateLabel { 
    481481  margin-left: 26px; 
    482482} 
    483 #commonTable div.durationBox { 
     483table.common div.durationBox { 
    484484  border: 1px solid #ccb; 
    485485  display: inline; 
    …… 
    487487  padding: 4px; 
    488488} 
    489 #commonTable .durationSpacerText { 
     489table.common .durationSpacerText { 
    490490  font-weight: bold; 
    491491  margin: 0 1em; 
    …… 
    10061006  background-color: yellow; 
    10071007  text-decoration: none; 
     1008} 
     1009#sharingBox { 
     1010  margin: 2em 0; 
     1011  border-top: 1px solid #333; 
     1012} 
     1013#sharingBox h3 { 
     1014  padding: 1em 0 0.5em 0; 
     1015} 
     1016#sharingBox h5 { 
     1017  padding: 1em 0 0.5em 0; 
     1018} 
     1019#sharingBox ul { 
     1020  font-size: 0.8em; 
     1021  margin: 0 1em; 
     1022} 
     1023#shareForm { 
     1024  margin: 1em 0; 
     1025  padding: 0.5em; 
     1026  border-top: 1px dotted #666; 
    10081027} 
    10091028/* Footer */ 

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

    r382 r383  
    5959  <xsl:variable name="upload" select="/bedework/urlPrefixes/upload"/> 
    6060  <xsl:variable name="getFreeBusy" select="/bedework/urlPrefixes/getFreeBusy/a/@href"/> 
     61  <xsl:variable name="setAccess" select="/bedework/urlPrefixes/setAccess/a/@href"/> 
    6162  <!-- calendars --> 
    6263  <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/> 
    …… 
    10171018      </xsl:choose> 
    10181019    </h2> 
    1019     <table id="commonTable" cellspacing="0"> 
     1020    <table class="common" cellspacing="0"> 
    10201021      <tr> 
    10211022        <th colspan="3" class="commonHeader"> 
    …… 
    12481249      <input type="hidden" name="endType" value="date"/> 
    12491250      <h2>Add Event</h2> 
    1250       <table id="commonTable" cellspacing="0"> 
     1251      <table class="common" cellspacing="0"> 
    12511252        <tr> 
    12521253          <td class="fieldname"> 
    …… 
    16141615      <input type="hidden" name="endType" value="date"/> 
    16151616      <h2>Edit Event</h2> 
    1616       <table id="commonTable" cellspacing="0"> 
     1617      <table class="common" cellspacing="0"> 
    16171618        <tr> 
    16181619          <th colspan="2" class="commonHeader"> 
    …… 
    21092110    <h3>Add Calendar / Folder</h3> 
    21102111    <form name="addCalForm" action="{$calendar-update}"> 
    2111       <table id="commonTable"> 
     2112      <table class="common"> 
    21122113        <tr> 
    21132114          <th>Name:</th> 
    …… 
    21592160      </table> 
    21602161    </form> 
     2162 
     2163    <div id="sharingBox"> 
     2164      <h3>Sharing</h3> 
     2165      Sharing may be added to a calendar once created. 
     2166    </div> 
     2167 
    21612168  </xsl:template> 
    21622169 
    …… 
    21712178    </xsl:choose> 
    21722179    <form name="modCalForm" action="{$calendar-update}"> 
    2173       <table id="commonTable"> 
    2174         <tr> 
    2175           <th>Path:</th> 
    2176           <td> 
     2180      <table class="common"> 
     2181        <tr> 
     2182          <th class="commonHeader" colspan="2"> 
    21772183            <xsl:value-of select="path"/> 
    2178           </td> 
     2184          </th> 
    21792185        </tr> 
    21802186        <tr> 
    …… 
    22492255      </table> 
    22502256    </form> 
     2257    <div id="sharingBox"> 
     2258      <h3>Sharing</h3> 
     2259      <table class="common"> 
     2260        <tr> 
     2261          <th class="commonHeader" colspan="2">Current access:</th> 
     2262        </tr> 
     2263        <tr> 
     2264          <td class="fieldName">Owner:</td> 
     2265          <td><xsl:value-of select="name(acl/ace[principal/property/owner]/grant/*)"/></td> 
     2266        </tr> 
     2267        <xsl:if test="acl/ace/principal/href"> 
     2268          <tr> 
     2269            <td class="fieldName">Users:</td> 
     2270            <td> 
     2271              <xsl:for-each select="acl/ace[principal/href]"> 
     2272                <xsl:value-of select="principal/href"/> (<xsl:value-of select="name(grant/*)"/>)<br/> 
     2273              </xsl:for-each> 
     2274            </td> 
     2275          </tr> 
     2276        </xsl:if> 
     2277      </table> 
     2278      <form name="calendarShareForm" action="{$setAccess}" id="shareForm"> 
     2279        <xsl:variable name="id" select="id"/> 
     2280        <input type="hidden" name="calId" value="{$id}"/> 
     2281        <p> 
     2282          Share this calendar with:<br/> 
     2283          <input type="text" name="who" size="20"/> 
     2284          <input type="radio" value="user" name="whoType" checked="checked"/> user 
     2285          <input type="radio" value="group" name="whoType"/> group 
     2286        </p> 
     2287        <p> 
     2288          Access rights:<br/> 
     2289          <input type="radio" value="r" name="how" checked="checked"/> read<br/> 
     2290          <input type="radio" value="w" name="how"/> write<br/> 
     2291          <input type="radio" value="f" name="how"/> free/busy only<br/> 
     2292          <input type="radio" value="d" name="how"/> default (reset access) 
     2293        </p> 
     2294        <input type="submit" name="submit" value="Submit"/> 
     2295      </form> 
     2296    </div> 
    22512297  </xsl:template> 
    22522298 
    …… 
    23092355  <xsl:template match="currentCalendar" mode="displayCalendar"> 
    23102356    <h2>Calendar Information</h2> 
    2311     <table id="commonTable"> 
     2357    <table class="common"> 
    23122358      <tr> 
    23132359        <th>Name:</th> 
    …… 
    23552401 
    23562402    <form name="delCalForm" action="{$calendar-delete}"> 
    2357       <table id="commonTable"> 
     2403      <table class="common"> 
    23582404        <tr> 
    23592405          <th>Path:</th> 
    …… 
    24902536    <p class="note">*the subsciption name must be unique</p> 
    24912537    <form name="subscribeForm" action="{$subscriptions-subscribe}" method="post"> 
    2492       <table id="commonTable" cellspacing="0"> 
     2538      <table class="common" cellspacing="0"> 
    24932539        <tr> 
    24942540          <td class="fieldname">Name:</td> 
    …… 
    25442590    <h3>Modify Subscription</h3> 
    25452591    <form name="subscribeForm" action="{$subscriptions-subscribe}" method="post"> 
    2546       <table id="commonTable" cellspacing="0"> 
     2592      <table class="common" cellspacing="0"> 
    25472593        <tr> 
    25482594          <td class="fieldname">Name:</td> 
    …… 
    26272673  <xsl:template name="subscriptionList"> 
    26282674    <h3>Current subscriptions</h3> 
    2629     <table id="commonTable" cellspacing="0"> 
     2675    <table class="common" cellspacing="0"> 
    26302676      <tr> 
    26312677        <th>Name</th> 
    …… 
    26982744    <form method="get" action="{$setAlarm}" id="standardForm"> 
    26992745      <input type="hidden" name="updateAlarmOptions" value="true"/> 
    2700       <table id="commonTable" cellspacing="0"> 
     2746      <table class="common" cellspacing="0"> 
    27012747        <tr> 
    27022748          <th colspan="2" class="commonHeader">Alarm options</th> 
    …… 
    27722818    <form method="post" action="{$upload}" id="standardForm"  enctype="multipart/form-data"> 
    27732819      <h2>Upload iCAL File</h2> 
    2774       <table id="commonTable" cellspacing="0"> 
     2820      <table class="common" cellspacing="0"> 
    27752821        <tr> 
    27762822          <td class="fieldname"> 
    …… 
    27962842    <form method="get" action="{$mailEvent}" id="standardForm"> 
    27972843      <input type="hidden" name="updateEmailOptions" value="true"/> 
    2798       <table id="commonTable" cellspacing="0"> 
     2844      <table class="common" cellspacing="0"> 
    27992845        <tr> 
    28002846          <th colspan="2" class="commonHeader">Update email options</th> 
    …… 
    28332879      <input type="hidden" name="confirmationid" value="{$confId}"/> 
    28342880      <h2>Manage Locations</h2> 
    2835       <table id="commonTable" cellspacing="0"> 
     2881      <table class="common" cellspacing="0"> 
    28362882        <tr> 
    28372883          <th class="commonHeader" colspan="2">Add Location</th> 
    …… 
    28922938      <input type="hidden" name="confirmationid" value="{$confId}"/> 
    28932939      <h2>Manage Locations</h2> 
    2894       <table id="commonTable" cellspacing="0"> 
     2940      <table class="common" cellspacing="0"> 
    28952941        <tr> 
    28962942          <th colspan="2" class="commonHeader"> 

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

    r342 r383  
    2727          <p>Missing event's calendar id (required).</p> 
    2828      </xsl:when> 
     29      <xsl:when test="id='org.bedework.client.error.unknowncalendar'"> 
     30          <p>Unknown calendar.</p> 
     31      </xsl:when> 
    2932      <xsl:when test="id='org.bedework.client.error.location.referenced'"> 
    3033          <p>Location is in use.  It cannot be deleted while referenced by an event.</p> 
    …… 
    4548          <p>No default view defined</p> 
    4649      </xsl:when> 
     50      <xsl:when test="id='org.bedework.client.error.unimplemented'"> 
     51          <p>The feature you requested is currently unimplemented.</p> 
     52      </xsl:when> 
    4753      <xsl:otherwise> 
    4854        <p><xsl:value-of select="id"/> = <xsl:value-of select="param"/></p> 

  • trunk/calendar3/webclient/war/docs/calendar/displayCalendarCommon.jsp

    r319 r383  
    11<%@ taglib uri='struts-bean' prefix='bean' %> 
    22<%@ taglib uri='struts-logic' prefix='logic' %> 
    3 <%@ taglib uri='struts-html' prefix='html' %> 
     3<%@ taglib uri='bedework' prefix='bw' %> 
    44 
    55<bean:define id="curcal" name="calForm" property="calendar"/> 
    66<currentCalendar> 
    7   <id><bean:write name="curcal" property="id" /></id> 
    8   <name><bean:write name="curcal" property="name" /></name> 
    9   <summary><bean:write name="curcal" property="summary" /></summary> 
    10   <desc><bean:write name="curcal" property="description" /></desc> 
    11   <path><bean:write name="curcal" property="path" /></path> 
    12   <calendarCollection><bean:write name="curcal" property="calendarCollection" /></calendarCollection> 
    13   <mailListId><bean:write name="calendar" property="mailListId" /></mailListId> 
     7  <id><bean:write name="calendar" property="id" /></id> 
     8  <bw:emitText name="calendar" property="name" /> 
     9  <bw:emitText name="calendar" property="path" /> 
     10  <bw:emitText name="calendar" property="description" tagName="desc" /> 
     11  <calendarCollection><bean:write name="calendar" property="calendarCollection" /></calendarCollection> 
     12  <bw:emitText name="calendar" property="mailListId" /> 
     13  <bw:emitCurrentPrivs name="calendar" property="currentAccess" /> 
     14  <bw:emitAcl name="calendar" property="currentAccess" /> 
    1415</currentCalendar> 

  • trunk/calendar3/webclient/war/docs/header.jsp

    r381 r383  
    140140 
    141141      <getFreeBusy><genurl:link page="/getFreeBusy.do?b=de"/></getFreeBusy> 
     142      <setAccess><genurl:link page="/setAccess.do?b=de"/></setAccess> 
    142143 
    143144      <calendar>