Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl,v
diff -u -r1.44.2.1 -r1.44.2.2
--- openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl	10 Sep 2015 08:21:21 -0000	1.44.2.1
+++ openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl	3 Oct 2015 18:16:37 -0000	1.44.2.2
@@ -66,25 +66,23 @@
     set return_html "<table CELLPADDING=0 CELLSPACING=0 BORDER=0 width=95%>\n"
     
     # Navigation Bar
-    append return_html "<tr><td>
-    <table cellpadding=3 cellspacing=0 border=0 width=90% class=\"table-display\">
-    <tr class=\"table-header\" bgcolor=lavender>
-    <td align=center>
+    append return_html [subst {<tr><td>
+    <table cellpadding="3" cellspacing="0" border="0" width="90%" class="table-display">
+    <tr class="table-header" bgcolor="lavender">
+    <td align="center">
     [subst $prev_week_template]
-    <span style=\"font-family:Arial,Helvetica; size: smaller\">
-    <B>
-    [util_AnsiDatetoPrettyDate $sunday_date] - [util_AnsiDatetoPrettyDate $saturday_date]
-    </B>
+    <span style="font-family:Arial,Helvetica; size: smaller">
+    <b>[util_AnsiDatetoPrettyDate $sunday_date] - [util_AnsiDatetoPrettyDate $saturday_date]</b>
     </span>
     [subst $next_week_template]
     </td>
     </tr>
     </table></td></tr>
-    "
+    }]
 
-    append return_html "<tr>
+    append return_html [subst {<tr>
     <td>
-    <table  class=\"table-display\" cellpadding=0 cellspacing=0 border=0 width=90%>"
+        <table class="table-display" cellpadding="0" cellspacing="0" border="0" width="90%">}]
 
     set days_of_week {Sunday Monday Tuesday Wednesday Thursday Friday Saturday}
     foreach day $days_of_week {
@@ -101,12 +99,11 @@
             set bgcolor $day_bgcolor
         }
 
-        append return_html "<tr><td class=\"cal-week\" bgcolor=\"$bgcolor\">$day_html &nbsp;
-        </td>
+        append return_html [subst {<tr><td class="cal-week" bgcolor="$bgcolor">$day_html &nbsp;</td>
         </tr>
         <tr>
-        <td class=\"cal-week-event\">
-        <table cellpadding=0 cellspacing=0 border=0 width=100%>"
+        <td class="cal-week-event">
+        <table cellpadding="0" cellspacing="0" border="0" width="100%">}]
 	    
         # Go through events
         while {1} {
@@ -115,15 +112,11 @@
                 break
             }
 
-            append return_html "
-            <tr>
-            <td class=\"cal-week-event\">
-            <span style=\"font-size: smaller\">
-            [ns_set value $calendar_details $index]		    
-	    </span>
-	    </td>      
-	    </tr>
-	    "
+            append return_html [subst {
+            <tr><td class="cal-week-event">
+            <span style="font-size: smaller">[ns_set value $calendar_details $index]</span>
+	    </td></tr>
+	    }]
 
             ns_set delete $calendar_details $index
         }
@@ -149,8 +142,8 @@
     {-start_hour 0}
     {-end_hour 23}
     {-show_nav 1}
-    {-prev_nav_template {<a href="?date=[ns_urlencode $yesterday]"><img border=0 src=\"[dt_left_arrow]\" alt=\"[_ acs-datetime.back_one_day]\"></a>}}
-    {-next_nav_template {<a href="?date=[ns_urlencode $tomorrow]"><img border=0 src=\"[dt_right_arrow]\" alt=\"[_ acs-datetime.forward_one_day]\"></a>}}
+    {-prev_nav_template {<a href="?date=[ns_urlencode $yesterday]"><img border="0" src="[dt_left_arrow]" alt="[_ acs-datetime.back_one_day]"></a>}}
+    {-next_nav_template {<a href="?date=[ns_urlencode $tomorrow]"><img border="0" src="[dt_right_arrow]" alt="[_ acs-datetime.forward_one_day]"></a>}}
     {-master_bgcolor "black"}
     {-header_bgcolor "black"}
     {-header_text_color "white"}
@@ -246,9 +239,10 @@
     set next_hour ""
     set start_time ""
     set odd_row_p 0
-    set display_hour "<img border=0 align=\"center\" src=\"/resources/acs-subsite/diamond.gif\" alt=\"[_ acs-datetime.All_day]\">"
-    append return_html "<tr class=\"odd\"><td class=\"center\" align=\"left\" width=\"60\" \"nowrap\"><span style=\"font-size: smaller\">[subst $hour_template]</span></td>"
-    append return_html "<td colspan=\"$max_n_events\"><span style=\"font-size: smaller\">"
+    set display_hour [subst {<img border="0" align="center" src="/resources/acs-subsite/diamond.gif" alt="[_ acs-datetime.All_day]">}]
+    append return_html [subst {
+        <tr class="odd"><td class="center" align="left" width="60" nowrap><span style="font-size: smaller;">[subst $hour_template]</span></td>
+        <td colspan="$max_n_events"><span style="font-size: smaller">}]
     
     # Go through events
     while {1} {
Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl,v
diff -u -r1.26.2.1 -r1.26.2.2
--- openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl	10 Sep 2015 08:21:21 -0000	1.26.2.1
+++ openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl	3 Oct 2015 18:16:38 -0000	1.26.2.2
@@ -74,23 +74,23 @@
 
     if { $prev_next_links_in_title == 0 } {
         set title [subst {
-            <td colspan=7 align="center">
+            <td colspan="7" align="center">
             <span style="font-size:$header_text_size; color:$header_text_color; background:inherit; font-weight:bold">
             $month_heading
             </span>
             </td>\n}]
     } else {
         set title [subst {
-            <td class=\"no-border\" colspan=7>
-            <table width=100% cellpadding=0 cellspacing=0 border=0>
-            <tr class=\"table-header\">
-            <td align=left>$prev_month_url</td>
-            <td align=center>
+            <td class="no-border" colspan="7">
+            <table width="100%" cellpadding="0" cellspacing="0" border="0">
+            <tr class="table-header">
+            <td align="left">$prev_month_url</td>
+            <td align="center">
             <span style="font-size:$header_text_size; color:$header_text_color; background:inherit; font-weight:bold">
             $month_heading
             </span>
             </td>
-            <td align=right>$next_month_url</td>
+            <td align="right">$next_month_url</td>
             </tr>
             </table>
             </td>\n}]
@@ -99,13 +99,13 @@
     # Write out the header and the days of the week
 
     append output [subst {
-        <table class=\"table-display\" style="background:$master_bgcolor; color:inherit;" cellpadding=0 cellspacing=0 border=1 width=$calendar_width>
+        <table class="table-display" style="background:$master_bgcolor; color:inherit;" cellpadding="0" cellspacing="0" border="1" width="$calendar_width">
         <tr style="background:$header_bgcolor; color:inherit;"> $title </tr>
-        <tr style="background:$day_header_bgcolor; color:inherit;" class=\"table-header\">\n}]
+        <tr style="background:$day_header_bgcolor; color:inherit;" class="table-header">\n}]
 
     foreach day_of_week $days_of_week {
         append output [subst {
-            <td style="width:14%" align=center class=\"no-border\">
+            <td style="width:14%" align=center class="no-border">
             <span style="font-family: Verdana,Arial,Helvetica; font-size:$day_header_size; color:$day_text_color; background:inherit; font-weight:bold;">
             $day_of_week
             </span>