Index: openacs-4/packages/acs-templating/resources/forms/coddo.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/coddo.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-templating/resources/forms/coddo.adp	13 Jan 2003 15:23:30 -0000	1.4
+++ openacs-4/packages/acs-templating/resources/forms/coddo.adp	4 Jun 2003 01:38:34 -0000	1.5
@@ -54,7 +54,7 @@
   	                 </formgroup>
   	               </table>
   	               <formerror id=@elements.id@><br>
-                         <span style="color: Red; font-weight: bold">\@formerror.@elements.id@\@</span>
+                         <span style="color: Red; font-weight: bold">\@formerror.@elements.id@;noquote\@</span>
                        </formerror>
                      </noparse>
   	             </td>	    
@@ -81,7 +81,7 @@
                       </else>
   		      <noparse><formwidget id=@elements.id@>
   		        <formerror id=@elements.id@><br />
-                          <span style="font-weight: bold; color: red">\@formerror.@elements.id@\@</span>
+                          <span style="font-weight: bold; color: red">\@formerror.@elements.id@;noquote\@</span>
                         </formerror>
                       </noparse>
   	              </td>
Index: openacs-4/packages/acs-templating/resources/forms/plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/plain.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-templating/resources/forms/plain.adp	13 Jan 2003 15:23:30 -0000	1.5
+++ openacs-4/packages/acs-templating/resources/forms/plain.adp	4 Jun 2003 01:38:34 -0000	1.6
@@ -43,7 +43,7 @@
 	      </formgroup>
 	      </table>
 	      <formerror id=@elements.id@><br>
-                <span style="color: Red; font-weight: bold">\@formerror.@elements.id@\@</span>
+                <span style="color: Red; font-weight: bold">\@formerror.@elements.id@;noquote\@</span>
               </formerror>
             </noparse>
 	    </td>	    
@@ -60,7 +60,7 @@
                 <else><td nowrap="nowrap"></else>
 		<noparse><formwidget id=@elements.id@>
 		<formerror id=@elements.id@><br />
-                 <span style="font-weight: bold; color: red">\@formerror.@elements.id@\@</span>
+                 <span style="font-weight: bold; color: red">\@formerror.@elements.id@;noquote\@</span>
                 </formerror></noparse>
 	      </td>
 	    </else>
Index: openacs-4/packages/acs-templating/resources/forms/plainest.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/plainest.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-templating/resources/forms/plainest.adp	17 May 2003 10:04:53 -0000	1.4
+++ openacs-4/packages/acs-templating/resources/forms/plainest.adp	4 Jun 2003 01:38:34 -0000	1.5
@@ -49,7 +49,7 @@
 	      </formgroup>
 	      </table>
 	      <formerror id=@elements.id@><br>
-                <font color="red"><b>\@formerror.@elements.id@\@</b></font>
+                <font color="red"><b>\@formerror.@elements.id@;noquote\@</b></font>
               </formerror>
             </noparse>
 	    </td>	    
@@ -65,7 +65,7 @@
                 <else><td nowrap></else>
 		<noparse><formwidget id=@elements.id@>
 		<formerror id=@elements.id@><br><font 
-		   color="red"><b>\@formerror.@elements.id@\@<b></font>
+		   color="red"><b>\@formerror.@elements.id@;noquote\@<b></font>
                 </formerror></noparse>
 	      </td>
 	    </else>
Index: openacs-4/packages/acs-templating/resources/forms/standard-lars.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/Attic/standard-lars.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-templating/resources/forms/standard-lars.adp	19 Feb 2003 15:12:11 -0000	1.10
+++ openacs-4/packages/acs-templating/resources/forms/standard-lars.adp	4 Jun 2003 01:38:34 -0000	1.11
@@ -98,7 +98,7 @@
                 <formerror id="@elements.id@">
                   <br>
                   <font face="tahoma,verdana,arial,helvetica,sans-serif" color="red">
-                    <b>\@formerror.@elements.id@\@<b>
+                    <b>\@formerror.@elements.id@;noquote\@<b>
                   </font>
                 </formerror>
               </noparse>
Index: openacs-4/packages/acs-templating/resources/forms/standard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/standard.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	22 May 2003 14:15:37 -0000	1.6
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	4 Jun 2003 01:38:34 -0000	1.7
@@ -53,7 +53,7 @@
 	      </formgroup>
 	      </table>
 	      <formerror id=@elements.id@><br>
-                <font color="red"><b>\@formerror.@elements.id@\@</b></font>
+                <font color="red"><b>\@formerror.@elements.id@;noquote\@</b></font>
               </formerror>
             </noparse>
 	    </td>	    
@@ -69,7 +69,7 @@
                 <else><td nowrap></else>
 		<noparse><formwidget id=@elements.id@>
 		<formerror id=@elements.id@><br><font 
-		   color="red"><b>\@formerror.@elements.id@\@<b></font>
+		   color="red"><b>\@formerror.@elements.id@;noquote\@<b></font>
                 </formerror></noparse>
 	      </td>
 	    </else>
Index: openacs-4/packages/acs-templating/resources/forms/tiny-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/tiny-plain.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/resources/forms/tiny-plain.adp	17 May 2003 10:04:53 -0000	1.2
+++ openacs-4/packages/acs-templating/resources/forms/tiny-plain.adp	4 Jun 2003 01:38:34 -0000	1.3
@@ -89,7 +89,7 @@
                 <formerror id="@elements.id@">
                   <br>
                   <font face="tahoma,verdana,arial,helvetica,sans-serif" color="red">
-                    <b>\@formerror.@elements.id@\@<b>
+                    <b>\@formerror.@elements.id@;noquote\@<b>
                   </font>
                 </formerror>
               </noparse>
Index: openacs-4/packages/acs-templating/resources/forms/wizard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/wizard.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-templating/resources/forms/wizard.adp	17 May 2003 10:04:53 -0000	1.6
+++ openacs-4/packages/acs-templating/resources/forms/wizard.adp	4 Jun 2003 01:38:34 -0000	1.7
@@ -62,7 +62,7 @@
 
 		</table>
 		<formerror id=@elements.id@><br>
-		  <font color="red"><b>\@formerror.@elements.id@\@</b></font>
+		  <font color="red"><b>\@formerror.@elements.id@;noquote\@</b></font>
 		</formerror>
               </noparse>
 	    </td>
@@ -72,7 +72,7 @@
 	      <if @elements.wide@ not nil>
                 <noparse>
                   <formerror  id=@elements.id@><br>
-                    <font color="red"><b>\@formerror.@elements.id@\@</b></font><br>
+                    <font color="red"><b>\@formerror.@elements.id@;noquote\@</b></font><br>
                   </formerror>
                 </noparse>
               </if><else><td bgcolor=#EEEEEE></else>
@@ -83,7 +83,7 @@
 	      <if @elements.wide@ not nil></if><else><td nowrap></else>
 		<noparse><formwidget id=@elements.id@>
 		<formerror id=@elements.id@><br><font 
-		   color="red"><b>\@formerror.@elements.id@\@<b></font>
+		   color="red"><b>\@formerror.@elements.id@;noquote\@<b></font>
                 </formerror></noparse>
 	      </td>
 	    </else>
Index: openacs-4/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/www/default-master.adp	3 Jun 2003 11:29:35 -0000	1.10
+++ openacs-4/www/default-master.adp	4 Jun 2003 01:39:04 -0000	1.11
@@ -2,13 +2,13 @@
 <html>
 <head>
 <title>@title@</title>
-@header_stuff@
+@header_stuff;noquote@
 </head>
 <body<multiple name=attribute> @attribute.key@="@attribute.value@"</multiple>>
 <include src="login-status" />
 
-<if @body_start_include;noquote@ not nil>
-<include src="@body_start_include;noquote@" />
+<if @body_start_include@ not nil>
+<include src="@body_start_include@" />
 </if>
 
 <h1>@title@</h1>
Index: openacs-4/www/default-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/www/default-master.tcl	3 Jun 2003 11:29:35 -0000	1.10
+++ openacs-4/www/default-master.tcl	4 Jun 2003 01:39:04 -0000	1.11
@@ -10,17 +10,31 @@
 
 # fall back on defaults for title, signatory and header_stuff
 
-if [template::util::is_nil title]     { set title        [ad_conn instance_name]  }
-if [template::util::is_nil doc_type]     { 
-    set doc_type {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-       "http://www.w3.org/TR/html4/loose.dtd">}
+if { [template::util::is_nil title] } {
+    set title [ad_conn instance_name]
 }
-if [template::util::is_nil signatory] { set signatory    [ad_system_owner] }
-if ![template::util::is_nil context] { set context_bar [eval ad_context_bar $context]}
-if [template::util::is_nil context_bar] { set context_bar [ad_context_bar]}
-if ![info exists header_stuff]        { set header_stuff {} }
 
+if { [template::util::is_nil doc_type] } { 
+    set doc_type {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">}
+}
 
+if { [template::util::is_nil signatory] } {
+    set signatory [ad_system_owner]
+}
+
+if { ![template::util::is_nil context] } {
+    set context_bar [eval ad_context_bar $context]
+}
+
+if { [template::util::is_nil context_bar] } {
+    set context_bar [ad_context_bar]
+}
+
+if { ![info exists header_stuff] } {
+    set header_stuff {}
+}
+
+
 # Attributes
 
 template::multirow create attribute key value
@@ -44,7 +58,7 @@
     # Handle elements wohse name contains a dot
     regexp {^([^.]*)\.(.*)$} $focus match form_name element_name
 
-    # Add safety code to test that the element exists '
+    # Add safety code to test that the element exists
     set header_stuff "$header_stuff
       <script language=\"JavaScript\">
         function acs_focus( form_name, element_name ){
@@ -70,7 +84,6 @@
     set ds_link ""
 }
 
-
 # Curriculum bar
 
 if { [llength [namespace eval :: info procs curriculum::get_bar]] == 1 } {