Changeset 2986

Show
Ignore:
Timestamp:
08/24/10 16:27:02
Author:
johnsa
Message:

user client: change behavior of notification link when event is canceled

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/themeSettings.xsl

    r2837 r2986  
    7272       icon (above) as it is included already.  
    7373       See http://www.bedework.org/trac/bedework/wiki/BedeworkManual/v3.6/ShareThis --> 
    74   <xsl:variable name="eventIconShareThis">true</xsl:variable>  
    75      
     74  <xsl:variable name="eventIconShareThis">true</xsl:variable>    
    7675     
    7776     

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl

    r2981 r2986  
    396396                        </xsl:if> 
    397397                  <xsl:text> </xsl:text> 
    398                   <a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/images/clockIcon.gif" width="16" height="15" border="0" alt="bwClock"/></a> 
     398                  <a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/images/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwStartClock"/></a> 
    399399 
    400400                  <select name="eventStartDate.tzid" id="startTzid" class="timezones"> 
    …… 
    483483                    </xsl:if> 
    484484                    <xsl:text> </xsl:text> 
    485                     <a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/images/clockIcon.gif" width="16" height="15" border="0" alt="bwClock"/></a> 
     485                    <a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/images/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwEndClock"/></a> 
    486486 
    487487                    <select name="eventEndDate.tzid" id="endTzid" class="timezones"> 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/head.xsl

    r2966 r2986  
    9797          <link rel="stylesheet" href="{$resourcesRoot}/css/dynCalendarWidget.css"/> 
    9898        </xsl:when> 
    99         <xsl:otherwise> 
     99        <xsl:otherwise>         
    100100          <script type="text/javascript"> 
    101101            <xsl:comment> 
    …… 
    122122              }).attr("readonly", "readonly"); 
    123123              $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>'); 
    124  
     124               
    125125              // recurrence until 
    126126              $("#bwEventWidgetUntilDate").datepicker({ 
    …… 
    197197        var bwGridCurUser = "<xsl:value-of select="/bedework/userid"/>"; 
    198198        var bwGrid = new bwSchedulingGrid("bwFreeBusyDisplay",bwGridSDate,8,17,bwGridAttees,true,100,"<xsl:value-of select="$resourcesRoot"/>","<xsl:value-of select="$requestFreeBusy"/>","<xsl:value-of select="$widget-attendees"/>",bwGridOrganizer,bwGridCurUser); 
    199          
     199 
    200200        // set the grid size 
    201201        function bwGridSetSize() { 
    …… 
    203203          $("#bwFreeBusyDisplay").css("width", fbWidth + "px"); 
    204204        }; 
    205          
    206205        </xsl:comment> 
    207206      </script> 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkAttendees.js

    r2963 r2986  
    1717   under the License.   
    1818*/ 
     19 
     20/* DEPRECATED - now using the jQuery UI's built in Autocomplete  
     21 * See: bedeworkScheduling.js 
     22 */ 
    1923 
    2024var bwAutoCompleteOptions = { 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js

    r2979 r2986  
    190190 * startRange:      js date string - start of date range for grid 
    191191 * startHoursRange: integer, 0-23 - hours of range start time  
    192  * endHoursRange:   integer, 0-23 - hours of range end time  
     192 * endHoursRange:   integer, 0-23 - hours of range end time  
    193193 * attendees:       array   - array of attendee objects; MUST include organizer on first instantiation 
    194194 * workday:         boolean - true to display workday hours only, false to display all 24 hours 
    …… 
    238238  var hourMils = 3600000; 
    239239  var startMils = Number(this.startRange.getTime()) + Number(this.startHoursRange * hourMils); // the start of the grid 
    240   var durationMils = hourMils; // value used to calculate default endSelectionMils, defaults to 1 hour in milliseconds 
     240  var durationMils = hourMils; //getTimeFromForm("duration");  
     241    // hourMils; // value used to calculate default endSelectionMils, defaults to 1 hour in milliseconds 
    241242                               // - SHOULD DEFAULT TO DATE/TIME SETTINGS 
    242243  var incrementMils = hourMils / this.hourDivision; // increment for the pick next/previous buttons 
    243   var startSelectionMils = startMils;  // where a mouse selection begins, milliseconds parsed from the first half of a fbcell's ID, default to beginning of grid 
     244  var startSelectionMils = startMils; //getTimeFromForm("start"); 
     245    // startMils;  // where a mouse selection begins, milliseconds parsed from the first half of a fbcell's ID, default to beginning of grid 
    244246                                       // - SHOULD DEFAULT TO DATE/TIME SETTINGS 
    245247  var endSelectionMils;       // where a mouse selection ends, milliseconds parsed from the first half of a fbcell's ID 
    …… 
    578580    try { 
    579581      // number of days to display 
    580       var range = dayRange(this.startRange, this.endRange); 
     582      var range = getDayRange(this.startRange, this.endRange); 
    581583      // number of hours to display 
    582584      var hourRange = this.endHoursRange - this.startHoursRange; 
    …… 
    12351237 
    12361238// Utilities 
    1237 var dayRange = function(startDate, endDate) {   
     1239var getDayRange = function(startDate, endDate) {   
    12381240  // find difference in milliseconds and return number of days. 
    12391241  // 86400000 is the number of milliseconds in a day; 
    12401242  return Math.round((Math.abs(startDate.getTime() - endDate.getTime())) / 86400000) 
    12411243}; 
     1244 
     1245var getTimeFromForm = function(type) { 
     1246  var startDate = new Date(); 
     1247  //startDate = $("#bwEventWidgetStartDate").datepicker("getDate"); 
     1248  var startMils = Number(startDate.getTime()); 
     1249   
     1250  switch(type) { 
     1251    case "start":  
     1252      return startMils; 
     1253    case "duration": 
     1254      var hourMils = 3600000; 
     1255      var endType = $("input[@name='eventEndType']:radio:checked").val(); 
     1256      if (endType = "E") { // datetime end type 
     1257        return hourMils; 
     1258      } else if (endType = "D") { // duration end type 
     1259        return hourMils; 
     1260      } else { 
     1261        return hourMils;  
     1262      } 
     1263    default:  
     1264      return undefined; 
     1265  } 
     1266} 
    12421267 
    12431268// DATE PROTOTYPE OVERRIDES - should be pulled into a library 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/notifications.xsl

    r2890 r2986  
    3131        <xsl:when test="scheduleMethod=2"><xsl:value-of select="$schedule-initAttendeeUpdate"/></xsl:when> 
    3232        <xsl:when test="scheduleMethod=3"><xsl:value-of select="$eventView"/></xsl:when> 
     33        <xsl:when test="scheduleMethod=5"><xsl:value-of select="$eventView"/></xsl:when> 
    3334        <xsl:when test="scheduleMethod=6"><xsl:value-of select="$schedule-processRefresh"/></xsl:when> 
    3435        <xsl:when test="scheduleMethod=7"><xsl:value-of select="$eventView"/></xsl:when>