Index: branches/1.1.x/units/sections/sections_config.php
===================================================================
diff -u -N -r14249 -r14287
--- branches/1.1.x/units/sections/sections_config.php	(.../sections_config.php)	(revision 14249)
+++ branches/1.1.x/units/sections/sections_config.php	(.../sections_config.php)	(revision 14287)
@@ -60,7 +60,7 @@
 
 		# Hooks to events that may call any other events
 		'Hooks' => Array (
-			
+
 			# hook to OnAfterCacheRebuild event of "adm" prefix (tiggered when unit cache is rebuild and stored) called
 			# to override cloned sub-items (ie. register extended classes for cloned unit configs such as n-img, n-rev)
 			/*Array (
@@ -73,7 +73,7 @@
 				'DoSpecial' => '*',
 				'DoEvent' => 'OnOverrideClonedSubItems',
 			),*/
-		
+
 			# hook to category OnAfterConfigRead event called to customize category configuration settings
 			/*Array (
 				'Mode' => hAFTER,
Index: branches/1.1.x/admin_templates/widgets/widget_edit.tpl
===================================================================
diff -u -N -r14249 -r14287
--- branches/1.1.x/admin_templates/widgets/widget_edit.tpl	(.../widget_edit.tpl)	(revision 14249)
+++ branches/1.1.x/admin_templates/widgets/widget_edit.tpl	(.../widget_edit.tpl)	(revision 14287)
@@ -1,7 +1,9 @@
 <inp2:adm_SetPopupSize width="750" height="570"/>
 
+<inp2:m_DefaultParam prefix="widget" grid="Default" title_preset="widget_edit" section="custom:widgets" id_field="WidgetId"/>
+
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="custom:widgets" prefix="widget" title_preset="widget_edit"/>
+<inp2:m_RenderElement name="combined_header" section="$section" prefix="$prefix" title_preset="$title_preset"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -11,41 +13,41 @@
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-						submit_event('widget','<inp2:widget_SaveEvent/>');
+						submit_event('<inp2:m_Param name="prefix"/>','<inp2:{$prefix}_SaveEvent/>');
 					}
 				));
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-						cancel_edit('widget','OnCancelEdit','<inp2:widget_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						cancel_edit('<inp2:m_Param name="prefix"/>','OnCancelEdit','<inp2:{$prefix}_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
 					}
 				));
 
 				a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
-						reset_form('widget', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+						reset_form('<inp2:m_Param name="prefix"/>', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
 					}
 				));
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('widget', '<inp2:widget_PrevId/>');
+							go_to_id('<inp2:m_Param name="prefix"/>', '<inp2:{$prefix}_PrevId/>');
 						}
 				));
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('widget', '<inp2:widget_NextId/>');
+							go_to_id('<inp2:m_Param name="prefix"/>', '<inp2:{$prefix}_NextId/>');
 						}
 				));
 
 				a_toolbar.Render();
 
-				<inp2:m_if check="widget_IsSingle" >
+				<inp2:m_if check="{$prefix}_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
-					<inp2:m_if check="widget_IsLast" >
+					<inp2:m_if check="{$prefix}_IsLast" >
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
-					<inp2:m_if check="widget_IsFirst" >
+					<inp2:m_if check="{$prefix}_IsFirst" >
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
@@ -58,30 +60,30 @@
 </tbody>
 </table>
 
-<inp2:widget_SaveWarning name="grid_save_warning"/>
-<inp2:widget_ErrorWarning name="form_error_warning"/>
+<inp2:{$prefix}_SaveWarning name="grid_save_warning"/>
+<inp2:{$prefix}_ErrorWarning name="form_error_warning"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="la_section_Page"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="widget" field="WidgetId" title="la_fld_Id"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="widget" field="Title" title="la_fld_Title" style="width: 100px"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="widget" field="Good" title="la_fld_Good"/>
-			<inp2:m_RenderElement name="inp_edit_fck" prefix="widget" field="Description" title="la_fld_Description"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="widget" field="Status" title="la_fld_Status"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="widget" field="Type" title="la_fld_Type" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="$prefix" field="$id_field" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Title" title="la_fld_Title" style="width: 100px"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="$prefix" field="Good" title="la_fld_Good"/>
+			<inp2:m_RenderElement name="inp_edit_fck" prefix="$prefix" field="Description" title="la_fld_Description"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="$prefix" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="$prefix" field="Type" title="la_fld_Type" has_empty="1"/>
 
 		<!--##
-			<inp2:m_RenderElement name="inp_edit_date" prefix="widget" field="CreatedOn" title="la_fld_CreatedOn"/>			
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="widget" field="IsSystem" title="la_fld_IsSystemTemplate" onchange="OnSystemClick()"/>
+			<inp2:m_RenderElement name="inp_edit_date" prefix="$prefix" field="CreatedOn" title="la_fld_CreatedOn"/>			
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="$prefix" field="IsSystem" title="la_fld_IsSystemTemplate" onchange="OnSystemClick()"/>
 		##-->
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="widget" field="Qty" title="la_fld_Qty" style="width: 50px"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="widget" field="Phone" title="la_fld_Phone"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="widget" field="Email" title="la_fld_Email" style="width: 200px"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Qty" title="la_fld_Qty" style="width: 50px"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="$prefix" field="Phone" title="la_fld_Phone"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Email" title="la_fld_Email" style="width: 200px"/>
 
-			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="widget" field="Image" title="la_fld_Image"/>
-			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="widget" field="DataFile" title="la_fld_DataFile"/>
+			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="$prefix" field="Image" title="la_fld_Image"/>
+			<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="$prefix" field="DataFile" title="la_fld_DataFile"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/1.1.x/admin_templates/widgets/widget_list.tpl
===================================================================
diff -u -N -r14249 -r14287
--- branches/1.1.x/admin_templates/widgets/widget_list.tpl	(.../widget_list.tpl)	(revision 14249)
+++ branches/1.1.x/admin_templates/widgets/widget_list.tpl	(.../widget_list.tpl)	(revision 14287)
@@ -1,111 +1,112 @@
+<inp2:m_DefaultParam prefix="widget" grid="Default" title_preset="widget_list" section="custom:widgets" edit_template="custom/widgets/widget_edit" id_field="WidgetId"/>
+
 <inp2:m_include t="incs/header" />
+<inp2:m_RenderElement name="combined_header" prefix="$prefix" section="$section" title_preset="$title_preset" pagination="1"/>
 
-<inp2:m_RenderElement name="combined_header" prefix="widget" section="custom:widgets" title_preset="widget_list" pagination="1"/>
-
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
   		<td>
 	  		<table width="100%" cellpadding="0" cellspacing="0">
 	  			<tr>
-	  				<td >
-	  					<script type="text/javascript">
-								a_toolbar = new ToolBar();
+	  				<td>
+		  				<script type="text/javascript">
+							a_toolbar = new ToolBar();
 
-								a_toolbar.AddButton(
-									new ToolBarButton(
-										'new_item',
-										'<inp2:m_phrase label="la_ToolTip_NewWidget" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
-										function() {
-											std_precreate_item('widget', 'custom/widgets/widget_edit')
-										}
-									)
-								);
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'new_item',
+									'<inp2:m_phrase label="la_ToolTip_NewWidget" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
+									function() {
+										std_precreate_item('<inp2:m_Param name="prefix"/>', '<inp2:m_Param name="edit_template"/>')
+									}
+								)
+							);
 
-								function edit() {
-								  	std_edit_item('widget', 'custom/widgets/widget_edit');
-								}
+							function edit() {
+							  	std_edit_item('<inp2:m_Param name="prefix"/>', '<inp2:m_Param name="edit_template"/>');
+							}
 
-								a_toolbar.AddButton(
-									new ToolBarButton(
-										'edit',
-										'<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>',
-										edit
-									)
-								);
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'edit',
+									'<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>',
+									edit
+								)
+							);
 
-								a_toolbar.AddButton(
-									new ToolBarButton(
-										'delete',
-										'<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-										function() {
-											std_delete_items('widget');
-										}
-									)
-								);
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'delete',
+									'<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+									function() {
+										std_delete_items('<inp2:m_Param name="prefix"/>');
+									}
+								)
+							);
 
-								a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+							a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-								a_toolbar.AddButton(
-									new ToolBarButton(
-										'approve',
-										'<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>',
-										function() {
-											submit_event('widget', 'OnMassApprove');
-										}
-				 					)
-				 				);
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'approve',
+									'<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>',
+									function() {
+										submit_event('<inp2:m_Param name="prefix"/>', 'OnMassApprove');
+									}
+			 					)
+			 				);
 
-								a_toolbar.AddButton(
-									new ToolBarButton(
-										'decline',
-										'<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>',
-										function() {
-											submit_event('widget', 'OnMassDecline');
-										}
-								 	)
-								);
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'decline',
+									'<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>',
+									function() {
+										submit_event('<inp2:m_Param name="prefix"/>', 'OnMassDecline');
+									}
+							 	)
+							);
 
-								a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+							a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-								a_toolbar.AddButton(
-									new ToolBarButton(
-										'export',
-										'<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>',
-										function() {
-											std_csv_export('widget', 'Default', 'export/export_progress');
-										}
-									)
-								);
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'export',
+									'<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>',
+									function() {
+										std_csv_export('<inp2:m_Param name="prefix"/>', '<inp2:m_Param name="grid"/>', 'export/export_progress');
+									}
+								)
+							);
 
-								a_toolbar.AddButton(
-									new ToolBarButton(
-										'import',
-										'<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>',
-										function() {
-											std_csv_import('widget', 'Default', 'import/import_start');
-										}
-									)
-								);
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'import',
+									'<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>',
+									function() {
+										std_csv_import('<inp2:m_Param name="prefix"/>', '<inp2:m_Param name="grid"/>', 'import/import_start');
+									}
+								)
+							);
 
-								a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+							a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 
-								a_toolbar.AddButton(
-									new ToolBarButton(
-										'view',
-										'<inp2:m_phrase label="la_ToolTip_View" escape="1"/>',
-										function(id) {
-											show_viewmenu(a_toolbar,'view');
-										}
-									)
-								);
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'view',
+									'<inp2:m_phrase label="la_ToolTip_View" escape="1"/>',
+									function(id) {
+										show_viewmenu(a_toolbar,'view');
+									}
+								)
+							);
 
-								a_toolbar.Render();
-							</script>
+							a_toolbar.Render();
+						</script>
 	  				</td>
 
-	  				<inp2:m_RenderElement name="search_main_toolbar" prefix="widget" grid="Default"/>
+	  				<inp2:m_RenderElement name="search_main_toolbar" prefix="$prefix" grid="$grid"/>
 	  			</tr>
 	  		</table>
 		</td>
@@ -131,9 +132,9 @@
 	<a href="<inp2:ItemEditLink/>" title="<inp2:m_Phrase name='la_Text_Edit' no_editing='1'/>" onclick="return direct_edit('<inp2:m_param name="PrefixSpecial"/>', this.href);"><inp2:Field field="$field" grid="$grid" format="$format"/></a>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="widget" IdField="WidgetId" grid="Default" max_row_height="100"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="$prefix" IdField="$id_field" grid="$grid" max_row_height="100"/>
 <script type="text/javascript">
-	Grids['widget'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline') );
+	Grids['<inp2:m_Param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file