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.28 -r1.28.2.1
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	29 Jun 2015 11:03:39 -0000	1.28
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	18 Aug 2015 11:39:15 -0000	1.28.2.1
@@ -37,7 +37,7 @@
 		   </if>
 
              <if @elements.label@ not nil>
-			   <noparse>
+	       <noparse>
                  <if @form_properties.mode;literal@ eq display or @elements.widget;literal@ in radio checkbox date inform>
                    <!-- no label tag -->
                  </if>
@@ -61,6 +61,13 @@
                  </if>
                </if>
                </span><!-- form-label -->
+                 <if @form_properties.mode;literal@ eq display or @elements.widget;literal@ in radio checkbox date inform>
+                   <!-- no label tag -->
+                 </if>
+                 <else>
+                                   </label>
+                 </else>
+
 		     </if>
 		     <else>
                         <if @form_properties.show_required_p;literal@ true>
@@ -73,7 +80,7 @@
 		     </else>
 
 		     <if @elements.widget;literal@ in radio checkbox>
-			   <noparse>
+                           <noparse>
                  <span class="form-widget">
                  <formgroup id="@elements.id@">			
 				   <label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">
@@ -90,10 +97,6 @@
                    <formwidget id="@elements.id@">
                  </span>
 			   </noparse>
-               <if @form_properties.mode;literal@ eq display or @elements.widget;literal@ in radio checkbox date inform><!-- no label tag --></if>
-               <else>
-                 <if @elements.label@ not nil></label></if>
-               </else>
              </else>							
 							
            <if @elements.help_text@ not nil>
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
 }