Index: trunk/core/admin_templates/incs/image_blocks.tpl
===================================================================
diff -u -r8686 -r8892
--- trunk/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 8686)
+++ trunk/core/admin_templates/incs/image_blocks.tpl	(.../image_blocks.tpl)	(revision 8892)
@@ -6,41 +6,41 @@
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text">
 			<inp2:m_phrase label="la_fld_Location"/><br>
-			<span class="error"><inp2:$prefix_Error field="ThumbPath"/><inp2:$prefix_Error field="ThumbUrl"/></span>&nbsp;
+			<span class="error"><inp2:{$prefix}_Error field="ThumbPath"/><inp2:{$prefix}_Error field="ThumbUrl"/></span>&nbsp;
 		</td>
 		<td>
 			<table border="0">
 				<tr>
 					<td>
 						<inp2:m_inc param="tab_index" by="1"/>
-					  	<input type="radio" <inp2:m_if check="{$prefix}_FieldEquals" field="LocalThumb" value="1">checked</inp2:m_if> name="<inp2:$prefix_InputName field="LocalThumb"/>" id="<inp2:$prefix_InputName field="LocalThumb"/>_1" value="1">
+					  	<input type="radio" <inp2:m_if check="{$prefix}_FieldEquals" field="LocalThumb" value="1">checked</inp2:m_if> name="<inp2:{$prefix}_InputName field="LocalThumb"/>" id="<inp2:{$prefix}_InputName field="LocalThumb"/>_1" value="1">
 					</td>
 					<td>
 					  	<inp2:m_phrase label="la_fld_Upload"/>:
 					</td>
 					<td>
 						<inp2:m_inc param="tab_index" by="1"/>
-					  	<input type="file" name="<inp2:$prefix_InputName field="ThumbPath"/>" id="<inp2:$prefix_InputName field="ThumbPath"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onclick="document.getElementById('<inp2:m_param name="prefix"/>[<inp2:$prefix_Field field="ImageId"/>][LocalThumb]_1').checked = true">
-					  	<input type="hidden" name="<inp2:$prefix_InputName field="ThumbPath"/>[upload]" id="<inp2:$prefix_InputName field="ThumbPath"/>[upload]" value="<inp2:$prefix_Field field="ThumbPath"/>">
+					  	<input type="file" name="<inp2:{$prefix}_InputName field="ThumbPath"/>" id="<inp2:{$prefix}_InputName field="ThumbPath"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onclick="document.getElementById('<inp2:m_param name="prefix"/>[<inp2:{$prefix}_Field field="ImageId"/>][LocalThumb]_1').checked = true">
+					  	<input type="hidden" name="<inp2:{$prefix}_InputName field="ThumbPath"/>[upload]" id="<inp2:{$prefix}_InputName field="ThumbPath"/>[upload]" value="<inp2:{$prefix}_Field field="ThumbPath"/>">
 					</td>
 				</tr>
 				<tr>
 					<td>
 						<inp2:m_inc param="tab_index" by="1"/>
-						<input type="radio" <inp2:m_if check="{$prefix}_FieldEquals" field="LocalThumb" value="0">checked</inp2:m_if> name="<inp2:$prefix_InputName field="LocalThumb"/>" id="<inp2:$prefix_InputName field="LocalThumb"/>_0" value="0">
+						<input type="radio" <inp2:m_if check="{$prefix}_FieldEquals" field="LocalThumb" value="0">checked</inp2:m_if> name="<inp2:{$prefix}_InputName field="LocalThumb"/>" id="<inp2:{$prefix}_InputName field="LocalThumb"/>_0" value="0">
 					</td>
 					<td>
 						<inp2:m_phrase label="la_fld_RemoteUrl"/>:
 					</td>
 					<td>
 						<inp2:m_inc param="tab_index" by="1"/>
-						<input type="text" name="<inp2:$prefix_InputName field="ThumbUrl"/>" id="<inp2:$prefix_InputName field="ThumbUrl"/>" value="<inp2:$prefix_Field field="ThumbUrl"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onclick="document.getElementById('<inp2:m_param name="prefix"/>[<inp2:$prefix_Field field="ImageId"/>][LocalThumb]_0').checked = true">
+						<input type="text" name="<inp2:{$prefix}_InputName field="ThumbUrl"/>" id="<inp2:{$prefix}_InputName field="ThumbUrl"/>" value="<inp2:{$prefix}_Field field="ThumbUrl"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onclick="document.getElementById('<inp2:m_param name="prefix"/>[<inp2:{$prefix}_Field field="ImageId"/>][LocalThumb]_0').checked = true">
 				  	</td>
 				</tr>
 			  </table>
 		</td>
 		<td>
-			<inp2:$prefix_Image block="image_block" Thumbnail="1" DefaultImage="../../kernel/images/noimage.gif"/>
+			<inp2:{$prefix}_Image block="image_block" Thumbnail="1" DefaultImage="../../kernel/images/noimage.gif"/>
 		</td>
 	</tr>
 </inp2:m_DefineElement>
@@ -49,48 +49,48 @@
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text">
 			<inp2:m_phrase label="la_fld_Location"/><br>
-			<span class="error"><inp2:$prefix_Error field="LocalPath"/><inp2:$prefix_Error field="Url"/></span>&nbsp;
+			<span class="error"><inp2:{$prefix}_Error field="LocalPath"/><inp2:{$prefix}_Error field="Url"/></span>&nbsp;
 		</td>
 		<td>
 			<table border="0">
 				<tr>
 					<td>
 						<inp2:m_inc param="tab_index" by="1"/>
-					  	<input type="radio" <inp2:m_if check="{$prefix}_FieldEquals" field="LocalImage" value="1">checked</inp2:m_if> name="<inp2:$prefix_InputName field="LocalImage"/>" id="<inp2:$prefix_InputName field="LocalImage"/>_1" value="1">
+					  	<input type="radio" <inp2:m_if check="{$prefix}_FieldEquals" field="LocalImage" value="1">checked</inp2:m_if> name="<inp2:{$prefix}_InputName field="LocalImage"/>" id="<inp2:{$prefix}_InputName field="LocalImage"/>_1" value="1">
 					</td>
 					<td>
 					  	<inp2:m_phrase label="la_fld_Upload"/>:
 					</td>
 					<td>
 						<inp2:m_inc param="tab_index" by="1"/>
-					  	<input type="file" name="<inp2:$prefix_InputName field="LocalPath"/>" id="<inp2:$prefix_InputName field="LocalPath"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onclick="document.getElementById('<inp2:m_param name="prefix"/>[<inp2:$prefix_field field="ImageId"/>][LocalImage]_1').checked = true">
-					  	<input type="hidden" name="<inp2:$prefix_InputName field="LocalPath"/>[upload]" id="<inp2:$prefix_InputName field="LocalPath"/>[upload]" value="<inp2:$prefix_Field field="LocalPath"/>">
+					  	<input type="file" name="<inp2:{$prefix}_InputName field="LocalPath"/>" id="<inp2:{$prefix}_InputName field="LocalPath"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onclick="document.getElementById('<inp2:m_param name="prefix"/>[<inp2:{$prefix}_field field="ImageId"/>][LocalImage]_1').checked = true">
+					  	<input type="hidden" name="<inp2:{$prefix}_InputName field="LocalPath"/>[upload]" id="<inp2:{$prefix}_InputName field="LocalPath"/>[upload]" value="<inp2:{$prefix}_Field field="LocalPath"/>">
 					</td>
 				</tr>
 				<tr>
 					<td>
 						<inp2:m_inc param="tab_index" by="1"/>
-						<input type="radio" <inp2:m_if check="{$prefix}_FieldEquals" field="LocalImage" value="0">checked</inp2:m_if> name="<inp2:$prefix_InputName field="LocalImage"/>" id="<inp2:$prefix_InputName field="LocalImage"/>_0" value="0">
+						<input type="radio" <inp2:m_if check="{$prefix}_FieldEquals" field="LocalImage" value="0">checked</inp2:m_if> name="<inp2:{$prefix}_InputName field="LocalImage"/>" id="<inp2:{$prefix}_InputName field="LocalImage"/>_0" value="0">
 					</td>
 					<td>
 						<inp2:m_phrase label="la_fld_RemoteUrl"/>:
 					</td>
 					<td>
 						<inp2:m_inc param="tab_index" by="1"/>
-						<input type="text" name="<inp2:$prefix_InputName field="Url"/>" id="<inp2:$prefix_InputName field="Url"/>" value="<inp2:$prefix_Field field="Url"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onclick="document.getElementById('<inp2:m_param name="prefix"/>[<inp2:$prefix_Field field="ImageId"/>][LocalImage]_0').checked = true">
+						<input type="text" name="<inp2:{$prefix}_InputName field="Url"/>" id="<inp2:{$prefix}_InputName field="Url"/>" value="<inp2:{$prefix}_Field field="Url"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onclick="document.getElementById('<inp2:m_param name="prefix"/>[<inp2:{$prefix}_Field field="ImageId"/>][LocalImage]_0').checked = true">
 				  	</td>
 				</tr>
 			  </table>
 		</td>
 		<td>
-			<inp2:$prefix_Image block="image_block" DefaultImage="../../kernel/images/noimage.gif"/>
+			<inp2:{$prefix}_Image block="image_block" DefaultImage="../../kernel/images/noimage.gif"/>
 		</td>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="images_edit_js">
 	function FieldID($field_name) {
-		var $field_mask = '<inp2:$prefix_InputName field="#FIELD#"/>';
+		var $field_mask = '<inp2:{$prefix}_InputName field="#FIELD#"/>';
 		return $field_mask.replace('#FIELD#', $field_name);
 	}
 
@@ -129,24 +129,24 @@
 	}
 </inp2:m_DefineElement>
 
-<inp2:m_block name="image_caption_td" />
+<inp2:m_DefineElement name="image_caption_td" >
 	<td valign="top" class="text">
-		<input type="checkbox" name="<inp2:$PrefixSpecial_InputName field="$IdField" IdField="$IdField"/>" id="<inp2:$PrefixSpecial_InputName field="$IdField" IdField="$IdField"/>">
-		<img src="<inp2:ModulePath module="In-Portal"/>img/itemicons/<inp2:$PrefixSpecial_ItemIcon grid="$grid"/>">
-		<inp2:Field field="$field" grid="$grid"/><span class="priority"><inp2:m_if prefix="$PrefixSpecial" function="fieldequals" field="Priority" value="0"/><inp2:m_else/><sup><inp2:$PrefixSpecial_field field="Priority"/></sup><inp2:m_endif/></span>
+		<input type="checkbox" name="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>" id="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>">
+		<img src="<inp2:ModulePath module="In-Portal"/>img/itemicons/<inp2:{$PrefixSpecial}_ItemIcon grid="$grid"/>">
+		<inp2:Field field="$field" grid="$grid"/><span class="priority"><inp2:m_if check="{$PrefixSpecial}_fieldequals" field="Priority" value="0"/><inp2:m_else/><sup><inp2:{$PrefixSpecial}_field field="Priority" ></sup></inp2:m_if></span>
 	</td>
-<inp2:m_blockend />
+</inp2:m_DefineElement>
 
-<inp2:m_block name="image_preview_td"/>
+<inp2:m_DefineElement name="image_preview_td">
 	<td>
 		<inp2:Image block="image_block" Thumbnail="1" DefaultImage="../../kernel/images/noimage.gif" MaxWidth="120" MaxHeight="120"/>
 	</td>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>
 
-<inp2:m_block name="image_url_td"/>
+<inp2:m_DefineElement name="image_url_td">
 	<td valign="top" class="text">
 		<inp2:ImageUrl local_phrase="!la_LocalImage!"/>
 	</td>
-<inp2:m_blockend/>
+</inp2:m_DefineElement>