Index: grid_blocks.tpl
===================================================================
--- grid_blocks.tpl	(revision 13681)
+++ grid_blocks.tpl	(working copy)
@@ -190,11 +190,10 @@
 <inp2:m_DefineElement name="grid_total_td">
 	<inp2:m_if check="FieldOption" field="$field" option="totals">
 		<inp2:FieldOption field="$field" option="totals" result_to_var="totals"/>
-		'<inp2:FieldTotal field="$field" function="$totals"/>'
+		<inp2:FieldTotal field="$field" function="$totals"/>
 	<inp2:m_else/>
-		'&nbsp;'
+		&nbsp;
 	</inp2:m_if>
-	<inp2:m_ifnot check="m_Param" name="is_last">, </inp2:m_ifnot>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_priority_td" format="" no_special="" nl2br="" first_chars="" td_style="" currency="">
@@ -529,7 +528,7 @@
 	</table>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_column_title_html">
+<inp2:m_DefineElement name="grid_column_title" use_phrases="1">
 	<table style="width: auto" class="layout-only-table"><tr>
 		<td style="vertical-align: middle; padding: 0px">
 			<a
@@ -573,12 +572,12 @@
 	<input type="checkbox" onclick="Grids['<inp2:m_param name="PrefixSpecial"/>'].InvertSelection(); this.checked=false;" ondblclick="Grids['<inp2:m_param name="PrefixSpecial"/>'].ClearSelection(); this.checked=false;" />
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_column_title" use_phrases="1">
-	'<inp2:m_RenderElement name="grid_column_title_html" pass_params="1" js_escape="1"/>'<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
+<inp2:m_DefineElement name="grid_column_title_no_sorting" use_phrases="1">
+	<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_column_title_no_sorting" use_phrases="1">
-	'<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title" js_escape="1"/><inp2:m_else/><inp2:m_param name="title" js_escape="1"/></inp2:m_if>'<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
+<inp2:m_DefineElement name="grid_js_header_block" format="" no_special="1" nl2br="" first_chars="" td_style="">
+	'<inp2:m_RenderElement name="$header_block" pass_params="1" js_escape="1"/>'<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_js_data_td" format="" no_special="1" nl2br="" first_chars="" td_style="">
@@ -593,6 +592,10 @@
 	'<inp2:m_RenderElement name="$filter_block" pass_params="1" js_escape="1"/>'<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="grid_js_total_td" format="" no_special="1" nl2br="" first_chars="" td_style="">
+	'<inp2:m_RenderElement name="$total_block" pass_params="1" js_escape="1"/>'<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="grid_js_width_td" format="" width="" no_special="1" nl2br="" first_chars="" td_style="">
 	<inp2:m_Param name="width" js_escape="1"/><inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
 </inp2:m_DefineElement>
@@ -602,7 +605,7 @@
 	 header_block="grid_column_title"
 	 filter_block="grid_column_filter"
 	 data_block="grid_data_td"
-	 totals_block="grid_total_td"
+	 total_block="grid_total_td"
 	 row_block="_row"
 	 ajax="0"
 	 totals="0"
@@ -672,7 +675,7 @@
 <inp2:m_DefineElement name="grid_total_row">
 	GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].SetFooter(
 		[
-			['&nbsp;', <inp2:IterateGridFields grid="$grid" mode="total" force_block="$totals_block" ajax="$ajax"/>]
+			['&nbsp;', <inp2:IterateGridFields grid="$grid" mode="total" force_block="grid_js_total_td" ajax="$ajax"/>]
 		]
 	);
 </inp2:m_DefineElement>
@@ -682,7 +685,7 @@
 	header_block="grid_column_title"
 	filter_block="grid_column_filter"
 	data_block="grid_data_td"
-	totals_block="grid_total_td"
+	total_block="grid_total_td"
 	row_block="_row"
 	ajax="0"
 	totals="0"
@@ -707,7 +710,7 @@
 		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].MaxRowHeight = <inp2:m_param name="max_row_height"/>;
 		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].SetHeader(
 			[
-				[' <inp2:m_RenderElement name="default_sorting_element" prefix="$PrefixSpecial" ajax="$ajax" js_escape="1" strip_nl="2"/>', <inp2:IterateGridFields grid="$grid" mode="header" block="$header_block" ajax="$ajax"/>],
+				[' <inp2:m_RenderElement name="default_sorting_element" prefix="$PrefixSpecial" ajax="$ajax" js_escape="1" strip_nl="2"/>', <inp2:IterateGridFields grid="$grid" mode="header" force_block="grid_js_header_block" ajax="$ajax"/>],
 				['<inp2:m_if check="m_Param" name="selector" equals_to="checkbox"><inp2:m_RenderElement name="grid_select_all_checkbox_html" pass_params="1" js_escape="1"/><inp2:m_else/>&nbsp;</inp2:m_if>',
 					<inp2:m_if check="m_Param" name="grid_filters">
 						<inp2:IterateGridFields grid="$grid" mode="filter" force_block="grid_js_filter_block" ajax="$ajax"/>
@@ -786,7 +789,7 @@
   		$ViewMenus = new Array('<inp2:m_param name="PrefixSpecial"/>');
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="old_grid" main_prefix="" per_page="" main_special="" grid_filters="" search="on" header_block="grid_column_title" filter_block="grid_column_filter" data_block="grid_data_td" totals_block="grid_total_td" row_block="_row" ajax="0" totals="0" selector="checkbox">
+<inp2:m_DefineElement name="old_grid" main_prefix="" per_page="" main_special="" grid_filters="" search="on" header_block="grid_column_title" filter_block="grid_column_filter" data_block="grid_data_td" total_block="grid_total_td" row_block="_row" ajax="0" totals="0" selector="checkbox">
 <!--##
 	DEPRICATED. LEFT FOR EDUCATION PURPOSES.
 
@@ -844,7 +847,7 @@
 
 		<inp2:m_if check="m_ParamEquals" name="totals" value="1">
 			<tr class="totals-row"/>
-				<inp2:IterateGridFields grid="$grid" mode="data" block="$totals_block"/>
+				<inp2:IterateGridFields grid="$grid" mode="data" block="$total_block"/>
 			</tr>
 		</inp2:m_if>
 	</table>