Index: openacs-4/packages/calendar/www/view-list-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v
diff -u -N -r1.38 -r1.39
--- openacs-4/packages/calendar/www/view-list-display.tcl	20 Mar 2018 08:42:19 -0000	1.38
+++ openacs-4/packages/calendar/www/view-list-display.tcl	20 Mar 2018 08:49:09 -0000	1.39
@@ -40,9 +40,9 @@
 }
 
 if { $calendar_id_list ne "" } {
-    set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] 
+    set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar]
 } else {
-    set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] 
+    set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar]
 }
 
 set end_date [clock format [clock scan "+${period_days} days" -base [clock scan $start_date]] -format "%Y-%m-%d 00:00"]
@@ -66,7 +66,7 @@
     set title "[_ acs-datetime.Items_from] [lc_time_fmt $start_date "%q"] [_ acs-datetime.to] [lc_time_fmt $end_date "%q"]"
 }
 
-set today_date [dt_sysdate]    
+set today_date [dt_sysdate]
 set today_ansi_list [dt_ansi_to_list $today_date]
 set today_julian_date [dt_ansi_to_julian [lindex $today_ansi_list 0] [lindex $today_ansi_list 1] [lindex $today_ansi_list 2]]
 
@@ -147,22 +147,22 @@
     set event_url [export_vars -base [site_node::get_url_from_object_id -object_id $cal_package_id]cal-item-view {
         return_url {cal_item_id $item_id}
     }]
-    
+
     if { !$show_calendar_name_p } {
         set calendar_name ""
     }
 
     multirow append items \
-	$name \
-	$event_url \
-	$calendar_name \
-	$item_type \
-	$pretty_weekday \
-	$pretty_start_date \
-	$pretty_end_date \
-	$pretty_start_time \
-	$pretty_end_time \
-	$today \
+        $name \
+        $event_url \
+        $calendar_name \
+        $item_type \
+        $pretty_weekday \
+        $pretty_start_date \
+        $pretty_end_date \
+        $pretty_start_time \
+        $pretty_end_time \
+        $today \
     $description \
         $calendar_name
 }
Index: openacs-4/packages/calendar/www/view-month-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.tcl,v
diff -u -N -r1.28 -r1.29
--- openacs-4/packages/calendar/www/view-month-display.tcl	20 Mar 2018 08:42:19 -0000	1.28
+++ openacs-4/packages/calendar/www/view-month-display.tcl	20 Mar 2018 08:49:09 -0000	1.29
@@ -36,9 +36,9 @@
 
 
 if {$calendar_id_list ne ""} {
-    set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] 
+    set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar]
 } else {
-    set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] 
+    set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar]
 }
 
 set date_list  [dt_ansi_to_list $date]
@@ -50,7 +50,7 @@
 
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
-set today_date [dt_sysdate]    
+set today_date [dt_sysdate]
 
 set previous_month_url ?[export_vars {{view month} {date $prev_month} page_num}]
 set next_month_url ?[export_vars {{view month} {date $next_month} page_num}]
@@ -160,7 +160,7 @@
         set ansi_end_date [lc_time_system_to_conn $ansi_end_date]
 
     }
-    
+
     # Localize
     set pretty_weekday    [lc_time_fmt $ansi_start_date "%A"]
     set pretty_start_date [lc_time_fmt $ansi_start_date "%x"]
@@ -216,7 +216,7 @@
                     acs_KeypressGoto('$add_url',event);
                 });
             }]
-        } 
+        }
     }
 
     array set display_information \
@@ -254,7 +254,7 @@
         $num_attachments \
         [lc_time_fmt $current_day_ansi %w] \
         month-calendar-$current_day_ansi
-    
+
     add_body_script -script [subst {
         var e =  document.getElementById('month-calendar-$current_day_ansi');
         e.addEventListener('click', function (event) {
@@ -307,7 +307,7 @@
             "" \
             [lc_time_fmt $current_day_ansi %w] \
             month-calendar-$current_day_ansi
-        
+
             add_body_script -script [subst {
                 var e =  document.getElementById('month-calendar-$current_day_ansi');
                 e.addEventListener('click', function (event) {
@@ -318,12 +318,12 @@
                     acs_KeypressGoto('$add_url',event);
                 });
             }]
-        
+
     }
 
     # Add cells for remaining days outside the month
     set remaining_days [expr {($first_day_of_week + 6 - $current_day % 7) % 7}]
-    
+
     if {$remaining_days > 0} {
         for {} {$current_day <= $last_julian_date_in_month + $remaining_days} {incr current_day} {
             multirow append items \
Index: openacs-4/packages/calendar/www/view-one-day-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v
diff -u -N -r1.44 -r1.45
--- openacs-4/packages/calendar/www/view-one-day-display.tcl	20 Mar 2018 08:42:19 -0000	1.44
+++ openacs-4/packages/calendar/www/view-one-day-display.tcl	20 Mar 2018 08:49:09 -0000	1.45
@@ -16,12 +16,12 @@
     {calendar_id_list ""}
     {cal_system_type ""}
     {export ""}
-    {return_url:optional}    
+    {return_url:optional}
 }
 
 # FIXME from sloanspace calendar, they have added a system_type attribute to
 # cal_items table, which can be null, class, community, or personal
-# this is used to figure out which CSS class to use, for now we set to 
+# this is used to figure out which CSS class to use, for now we set to
 # empty string to use generic cal-Item css class DAVEB 20070121
 set system_type ""
 
@@ -36,9 +36,9 @@
 
 
 if {$calendar_id_list ne ""} {
-    set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] 
+    set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar]
 } else {
-    set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] 
+    set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar]
 }
 
 if {$date eq ""} {
@@ -80,7 +80,7 @@
 }
 set additional_select_clause ""
 set order_by_clause " order by name"
-set interval_limitation_clause [db_map dbqd.calendar.www.views.day_interval_limitation] 
+set interval_limitation_clause [db_map dbqd.calendar.www.views.day_interval_limitation]
 
 #AG: the "select_all_day_items" query is identical to "select_items"
 #just without the Oracle +ORDERED hint, which speeds every other
@@ -93,7 +93,7 @@
     set pretty_end_date [lc_time_fmt $ansi_end_date "%x"]
     set pretty_start_time [lc_time_fmt $ansi_start_date "%X"]
     set pretty_end_time [lc_time_fmt $ansi_end_date "%X"]
-    
+
     set event_url [export_vars -base [site_node::get_url_from_object_id -object_id $cal_package_id]cal-item-view {
         return_url {cal_item_id $item_id}
     }]
@@ -112,7 +112,7 @@
         0 \
         0 \
         "left: ${bump_right_base}${bump_right_units};" \
-	$num_attachments
+        $num_attachments
 
     incr bump_right_base $bump_right_delta
 }
@@ -142,8 +142,8 @@
     set start_time [lc_time_fmt $ansi_start_date "%X"]
     set end_time [lc_time_fmt $ansi_end_date "%X"]
 
-    scan [lc_time_fmt $ansi_start_date "%H"] %d start_hour 
-    scan [lc_time_fmt $ansi_end_date "%H"] %d end_hour 
+    scan [lc_time_fmt $ansi_start_date "%H"] %d start_hour
+    scan [lc_time_fmt $ansi_end_date "%H"] %d end_hour
 
     if { $start_hour < $adjusted_start_display_hour
          && [string range $ansi_start_date 0 9] eq [string range $ansi_end_date 0 9]
@@ -157,9 +157,9 @@
         set adjusted_end_display_hour $end_hour
     }
 
-    set top [expr {($start_hour * ($hour_height_inside+$hour_height_sep)) 
+    set top [expr {($start_hour * ($hour_height_inside+$hour_height_sep))
                    + ($start_minutes*$hour_height_inside/60)}]
-    set bottom [expr {($end_hour * ($hour_height_inside+$hour_height_sep)) 
+    set bottom [expr {($end_hour * ($hour_height_inside+$hour_height_sep))
                       + ($end_minutes*$hour_height_inside/60)}]
     set height [expr {$bottom - $top - 2}]
 
@@ -191,8 +191,8 @@
         $top \
         $height \
         "left: ${bump_right}${bump_right_units};" \
-	$num_attachments
-    
+        $num_attachments
+
     lappend previous_intervals $start_seconds $end_seconds
 }
 
Index: openacs-4/packages/calendar/www/view-week-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v
diff -u -N -r1.29 -r1.30
--- openacs-4/packages/calendar/www/view-week-display.tcl	20 Mar 2018 08:42:19 -0000	1.29
+++ openacs-4/packages/calendar/www/view-week-display.tcl	20 Mar 2018 08:49:09 -0000	1.30
@@ -12,7 +12,7 @@
     {calendar_id_list ""}
     {cal_system_type ""}
     {export ""}
-    {return_url:optional}    
+    {return_url:optional}
 }
 
 #Display constants, should match up with default styles in calendar.css.
@@ -37,9 +37,9 @@
 }
 
 if {$calendar_id_list ne ""} {
-    set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar] 
+    set calendars_clause [db_map dbqd.calendar.www.views.openacs_in_portal_calendar]
 } else {
-    set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] 
+    set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar]
 }
 
 if {$date eq ""} {
@@ -64,7 +64,7 @@
 
 db_1row select_weekday_info {}
 db_1row select_week_info {}
-    
+
 set current_weekday 0
 
 #s/item_id/url
@@ -140,7 +140,7 @@
         set max_bumps 0
         set previous_intervals [list]
     }
-    
+
     if { $no_time_p } {
         #All day event
         set top_hour 0
@@ -227,7 +227,7 @@
         $top \
         $height \
         $left \
-	$num_attachments
+        $num_attachments
 
     set current_weekday $day_of_week