Changeset 2059

Show
Ignore:
Timestamp:
02/11/09 19:16:24
Author:
johnsa
Message:

user client: make calls to the timezone server

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2057 r2059  
    944944  <xsl:template name="actionIcons"> 
    945945    <xsl:param name="startDate"/> 
     946    <xsl:param name="startTime"/> 
    946947    <xsl:param name="actionIconsId"/> 
     948    <xsl:variable name="dateTime"> 
     949      <xsl:choose> 
     950        <xsl:when test="$startTime != ''"><xsl:value-of select="$startDate"/>T<xsl:value-of select="$startTime"/></xsl:when> 
     951        <xsl:otherwise><xsl:value-of select="$startDate"/></xsl:otherwise> 
     952      </xsl:choose> 
     953    </xsl:variable> 
    947954    <br/> 
    948955    <div id="{$actionIconsId}" class="invisible"> 
    949        <a href="{$initEvent}&amp;entityType=event&amp;startdate={$startDate}" title="add event" onclick="javascript:changeClass('{$actionIconsId}','invisible')"> 
     956       <a href="{$initEvent}&amp;entityType=event&amp;startdate={$dateTime}" title="add event" onclick="javascript:changeClass('{$actionIconsId}','invisible')"> 
    950957          <img src="{$resourcesRoot}/resources/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="add event"/> 
    951958          add event 
    952959       </a> 
    953        <a href="{$event-initMeeting}&amp;entityType=event&amp;schedule=request&amp;startdate={$startDate}" title="schedule a meeting" onclick="javascript:changeClass('{$actionIconsId}','invisible')"> 
     960       <a href="{$event-initMeeting}&amp;entityType=event&amp;schedule=request&amp;startdate={$dateTime}" title="schedule a meeting" onclick="javascript:changeClass('{$actionIconsId}','invisible')"> 
    954961          <img src="{$resourcesRoot}/resources/std-icalMeeting-icon-small.gif" width="12" height="16" border="0" alt="schedule meeting"/> 
    955962          schedule meeting 
    956963       </a> 
    957        <a href="{$initEvent}&amp;entityType=task&amp;startdate={$startDate}" title="add task" onclick="javascript:changeClass('{$actionIconsId}','invisible')"> 
     964       <a href="{$initEvent}&amp;entityType=task&amp;startdate={$dateTime}" title="add task" onclick="javascript:changeClass('{$actionIconsId}','invisible')"> 
    958965          <img src="{$resourcesRoot}/resources/std-icalTask-icon-small.gif" width="12" height="16" border="0" alt="add task"/> 
    959966          add task 
    960967       </a> 
    961        <a href="{$event-initMeeting}&amp;entityType=task&amp;schedule=request&amp;startdate={$startDate}" title="schedule a task" onclick="javascript:changeClass('{$actionIconsId}','invisible')"> 
     968       <a href="{$event-initMeeting}&amp;entityType=task&amp;schedule=request&amp;startdate={$dateTime}" title="schedule a task" onclick="javascript:changeClass('{$actionIconsId}','invisible')"> 
    962969          <img src="{$resourcesRoot}/resources/std-icalSchTask-icon-small.gif" width="12" height="16" border="0" alt="schedule task"/> 
    963970          schedule task 
    …… 
    9981005                       <xsl:with-param name="actionIconsId"><xsl:value-of select="$actionIconsId"/></xsl:with-param> 
    9991006                       <xsl:with-param name="startDate"><xsl:value-of select="$date"/></xsl:with-param> 
     1007                  <xsl:with-param name="startTime"><xsl:value-of select="/bedework/now/twodigithour24"/>0000</xsl:with-param> 
    10001008                     </xsl:call-template> 
    10011009                   </div> 
    …… 
    12461254                  <xsl:with-param name="actionIconsId"><xsl:value-of select="$actionIconsId"/></xsl:with-param> 
    12471255                  <xsl:with-param name="startDate"><xsl:value-of select="$dayDate"/></xsl:with-param> 
     1256                  <xsl:with-param name="startTime"><xsl:value-of select="/bedework/now/twodigithour24"/>0000</xsl:with-param> 
    12481257                </xsl:call-template> 
    12491258              </div> 

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

    r2050 r2059  
    1 var carddavUrl = "http://localhost:8080/ucarddav/find"; 
     1var carddavUrl = "/ucarddav/find"; 
    22 
    33var options = { 

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

    r1967 r2059  
    3333 
    3434var rdateDeleteStr = "remove"; 
     35var timezoneUrl = "/tzsvr/?names"; 
    3536 
    3637// ======================================================================== 
    …… 
    594595} 
    595596 
    596  
    597  
    598  
     597function setTimezones(timezones) { 
     598  var tzList = timezones.split(/\n|\r/); 
     599  //alert(tzList[0]); 
     600} 
     601 
     602/* jQuery initialization */ 
     603jQuery(document).ready(function($) { 
     604  // get the timezones from the timezone server 
     605  $.ajax({ 
     606    type: "GET", 
     607    url: timezoneUrl, 
     608    dataType: "text", 
     609    success: function(text){ 
     610      setTimezones(text); 
     611    } 
     612  }); 
     613}); 
     614