Changeset 1767

Show
Ignore:
Timestamp:
03/13/08 14:36:51
Author:
johnsa
Message:

user client: better handling of tasks with no start date (from Lightning)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.4.1/deployment/webuser/webapp/resources/demoskins/default/default/default.css

    r1681 r1767  
    14581458  padding: 1em; 
    14591459} 
     1460#bedework #tasks { 
     1461  margin: 0; 
     1462  padding: 0; 
     1463  font-size: 0.9em; 
     1464} 
     1465#bedework #tasks h3 { 
     1466  margin: 0; 
     1467  padding: 2px 4px; 
     1468  font-size: 1em; 
     1469  /*background-color: #2B4795;*/ 
     1470  background-color: #999; 
     1471  color: #eee; 
     1472  font-weight: normal; 
     1473} 
     1474#bedework #tasks .taskDate { 
     1475  font-size: 0.7em; 
     1476  margin-left: 1em; 
     1477} 
    14601478/* Calendars and Subscriptions */ 
    14611479#calendarTable td, 

  • releases/bedework-3.4.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1755 r1767  
    904904              </tr> 
    905905            </xsl:if> 
    906             <xsl:for-each select="event"> 
     906            <xsl:for-each select="event[not(entityType=2 and start/noStart='true' and end/type='N')]"> 
    907907              <xsl:variable name="id" select="id"/> 
    908908              <xsl:variable name="subscriptionId" select="subscription/id"/> 
    …… 
    10521052      </xsl:choose> 
    10531053    </table> 
     1054    <xsl:call-template name="tasks"/> 
    10541055  </xsl:template> 
    10551056 
    …… 
    11501151              <xsl:if test="event"> 
    11511152                <ul> 
    1152                   <xsl:apply-templates select="event" mode="calendarLayout"> 
     1153                  <xsl:apply-templates select="event[not(entityType=2 and start/noStart='true' and end/type='N')]" mode="calendarLayout"> 
    11531154                    <xsl:with-param name="dayPos" select="$dayPos"/> 
    11541155                  </xsl:apply-templates> 
    …… 
    11601161      </tr> 
    11611162    </table> 
     1163    <xsl:call-template name="tasks"/> 
    11621164  </xsl:template> 
    11631165 
    …… 
    11991201                  <xsl:if test="event"> 
    12001202                    <ul> 
    1201                       <xsl:apply-templates select="event" mode="calendarLayout"> 
     1203                      <xsl:apply-templates select="event[not(entityType=2 and start/noStart='true' and end/type='N')]" mode="calendarLayout"> 
    12021204                        <xsl:with-param name="dayPos" select="$dayPos"/> 
    12031205                      </xsl:apply-templates> 
    …… 
    12111213      </xsl:for-each> 
    12121214    </table> 
     1215    <xsl:call-template name="tasks"/> 
    12131216  </xsl:template> 
    12141217 
    …… 
    14051408      </table> 
    14061409    </td> 
     1410  </xsl:template> 
     1411 
     1412  <!--== TASKS ==--> 
     1413  <xsl:template name="tasks"> 
     1414    <xsl:if test="/bedework/eventscalendar//event[entityType=2 and start/noStart='true' and end/type='N']"> 
     1415      <div id="tasks"> 
     1416        <h3> 
     1417          reminders (tasks with no start or end date) 
     1418        </h3> 
     1419        <ul class="tasks"> 
     1420          <xsl:apply-templates select="/bedework/eventscalendar//event[entityType=2 and start/noStart='true' and end/type='N']" mode="tasks"/> 
     1421        </ul> 
     1422      </div> 
     1423    </xsl:if> 
     1424  </xsl:template> 
     1425 
     1426  <xsl:template match="event" mode="tasks"> 
     1427    <xsl:variable name="subscriptionId" select="subscription/id"/> 
     1428    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
     1429    <xsl:variable name="guid" select="guid"/> 
     1430    <xsl:variable name="recurrenceId" select="recurrenceId"/> 
     1431 
     1432    <li> 
     1433      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1434        <xsl:choose> 
     1435          <xsl:when test="summary = ''"> 
     1436            <em>no title</em> 
     1437          </xsl:when> 
     1438          <xsl:otherwise> 
     1439            <xsl:value-of select="summary"/> 
     1440          </xsl:otherwise> 
     1441        </xsl:choose> 
     1442      </a> 
     1443      <xsl:if test="start/noStart = 'false'"> 
     1444        <span class="taskDate"><xsl:value-of select="start/shortdate"/></span> 
     1445      </xsl:if> 
     1446    </li> 
    14071447  </xsl:template> 
    14081448 
    …… 
    44894529    </div> 
    44904530    <div class="note"> 
    4491       <p><strong>Note:</strong> If you grant write access to another user, and you wish  
     4531      <p><strong>Note:</strong> If you grant write access to another user, and you wish 
    44924532        to see events added by that user in your calendar, <strong>you must explicitly 
    4493         grant yourself access to the same calendar.</strong>  Enter your RCS UserID as   
    4494         a user in the "Who" box with "All" set in the "Rights" box.   
     4533        grant yourself access to the same calendar.</strong>  Enter your RCS UserID as 
     4534        a user in the "Who" box with "All" set in the "Rights" box. 
    44954535      </p> 
    44964536      <p> 
    44974537        This is standard access control; the reason you will not see the other 
    4498         user's events without doing this is that the default access is grant:all to  
     4538        user's events without doing this is that the default access is grant:all to 
    44994539        "owner" - and you don't own the other user's events. 
    45004540      </p> 
    …… 
    49344974      </table> 
    49354975    </form> 
    4936      
     4976 
    49374977    <ul class="note" style="margin-left: 2em;"> 
    49384978      <li>The <strong>Name</strong> is anything you want to call your subscription.</li> 
    49394979      <li> 
    49404980        The <strong>Path</strong> is the name of the folder and/or calendar within 
    4941         the remote user's calendar tree.  For example, to subscribe to  
     4981        the remote user's calendar tree.  For example, to subscribe to 
    49424982        bwcal:///user/johnsa/someFolder/someCalendar, enter "someFolder/someCalendar" 
    49434983      </li> 
    49444984      <li> 
    49454985        You must be granted at least read access to the other user's calendar 
    4946         to subscribe to it.   
     4986        to subscribe to it. 
    49474987      </li> 
    49484988    </ul>