Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v
diff -u -r1.52.2.1 -r1.52.2.2
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	14 Aug 2015 11:41:28 -0000	1.52.2.1
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	18 Aug 2015 11:39:15 -0000	1.52.2.2
@@ -616,7 +616,10 @@
 		}
 
 		set ckOptions [join $ckOptionsList ", "]
-		append postTextArea [subst {<script>CKEDITOR.replace( '$attributes(id)', \[$ckOptions\] );</script>\n}]
+		append postTextArea [subst {
+		    <script type="text/javascript">CKEDITOR.replace( '$attributes(id)', \[$ckOptions\] );
+		    </script>
+		}]
 		
             } else {
 		# Editor is custom.
@@ -627,13 +630,12 @@
 	    }
 		      
             append output \
-		"</span></label>\n<script type='text/javascript'>" \n \
+		"</span>\n<script type='text/javascript'>" \n \
 		[subst {document.write("<input name='$element(id).format' value='text/html' type='hidden'>");}] \
 		"</script>\n<noscript><div>" \
-		[subst {<label for="$element(id).format"><span class="form-widget">}] \
-		[_ acs-templating.Format] \
-		": $format_menu</span></label></div></noscript>\n" \
-		$postTextArea
+		[subst {<span class="form-widget"><label for="$element(id).format">[_ acs-templating.Format]: </label>}] \
+		$format_menu "</span></div></noscript>\n" \
+		$postTextArea "<span>"
 
             if { $spellcheck(render_p) } {
                 append output \
@@ -646,12 +648,16 @@
         } else {
             # htmlarea_p is false
 
-            append output "</span></label>\n<label for=\"$element(id).format\"><span class=\"form-widget\">[_ acs-templating.Format]: $format_menu"
+	    append output [subst {</span>
+		<span class="form-widget"><label for="$element(id).format">[_ acs-templating.Format]: </label>$format_menu
+	    }]
 
             if { $spellcheck(render_p) } {
-                append output "</span></label>\n<label for=\"$element(id).spellcheck\"><span class=\"form-widget\">[_  acs-templating.Spellcheck]: " \
+                append output [subst {</span>
+		    <span class="form-widget"><label for="$element(id).spellcheck">[_  acs-templating.Spellcheck]: </label>
                     [menu "$element(id).spellcheck" [nsv_get spellchecker lang_options] \
                          $spellcheck(selected_option) {}]
+		}]
             }
 
         }
@@ -664,7 +670,7 @@
             append output "<input type=\"hidden\" name=\"$element(id).format\" value=\"[ad_quotehtml $format]\">"
         }
     }
-    
+
     return $output
 }