Index: core/admin_templates/item_filters/item_filter_list.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/item_filters/item_filter_list.tpl	(revision 15716)
+++ core/admin_templates/item_filters/item_filter_list.tpl	(revision )
@@ -1,5 +1,7 @@
+<inp2:m_DefaultParam prefix="item-filter" section="in-portal:item_filters"/>
+
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:item_filters" prefix="item-filter" title_preset="item_filter_list" pagination="1"/>
+<inp2:m_RenderElement name="combined_header" title_preset="item_filter_list" pagination="1" pass_params="1"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -9,36 +11,36 @@
 			<script type="text/javascript">
 				//do not rename - this function is used in default grid for double click!
 				function edit() {
-					std_edit_item('item-filter', 'item_filters/item_filter_edit');
+					std_edit_item('<inp2:m_Param name="prefix"/>', 'item_filters/item_filter_edit');
 				}
 
 				var a_toolbar = new ToolBar();
 
-				<inp2:m_RenderElement design="toolbar_button" icon="new_item" title="la_ToolTip_NewItemFilter" short_title="la_ToolTip_Add">
-					std_precreate_item('item-filter', 'item_filters/item_filter_edit');
+				<inp2:m_RenderElement design="toolbar_button" icon="new_item" title="la_ToolTip_NewItemFilter" short_title="la_ToolTip_Add" perm_event="OnPreCreate" pass_params="1">
+					std_precreate_item('<inp2:m_Param name="prefix"/>', 'item_filters/item_filter_edit');
 				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="edit" title="la_ToolTip_Edit" short_title="la_ShortToolTip_Edit">
+				<inp2:m_RenderElement design="toolbar_button" icon="edit" title="la_ToolTip_Edit" short_title="la_ShortToolTip_Edit" perm_event="OnEdit" pass_params="1">
 					edit();
 				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="delete" title="la_ToolTip_Delete">
-					std_delete_items('item-filter');
+				<inp2:m_RenderElement design="toolbar_button" icon="delete" title="la_ToolTip_Delete" perm_event="OnMassDelete" pass_params="1">
+					std_delete_items('<inp2:m_Param name="prefix"/>');
 				</inp2:m_RenderElement>
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-				<inp2:m_RenderElement design="toolbar_button" icon="approve" title="la_ToolTip_Enable">
-					submit_event('item-filter', 'OnMassApprove');
+				<inp2:m_RenderElement design="toolbar_button" icon="approve" title="la_ToolTip_Enable" perm_event="OnMassApprove" pass_params="1">
+					submit_event('<inp2:m_Param name="prefix"/>', 'OnMassApprove');
 				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="decline" title="la_ToolTip_Disable">
-					submit_event('item-filter', 'OnMassDecline');
+				<inp2:m_RenderElement design="toolbar_button" icon="decline" title="la_ToolTip_Disable" perm_event="OnMassDecline" pass_params="1">
+					submit_event('<inp2:m_Param name="prefix"/>', 'OnMassDecline');
 				</inp2:m_RenderElement>
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				<inp2:m_RenderElement design="toolbar_button" icon="view" title="la_ToolTip_View">
+				<inp2:m_RenderElement design="toolbar_button" icon="view" title="la_ToolTip_View" pass_params="1">
 					show_viewmenu(a_toolbar,'view');
 				</inp2:m_RenderElement>
 
@@ -46,14 +48,14 @@
 			</script>
 		</td>
 
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="item-filter" grid="Default"/>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="$prefix" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="item-filter" IdField="FilterId" grid="Default"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="$prefix" IdField="FilterId" grid="Default"/>
 <script type="text/javascript">
-	Grids['item-filter'].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
Index: core/admin_templates/languages/phrase_list.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/languages/phrase_list.tpl	(revision 15716)
+++ core/admin_templates/languages/phrase_list.tpl	(revision )
@@ -1,5 +1,7 @@
+<inp2:m_DefaultParam prefix="phrases" section="in-portal:phrases" grid="Phrases"/>
+
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:phrases" pagination="1" grid="Phrases" prefix="phrases" title_preset="phrases_list_st" additional_blue_bar_render_as="grid_ml_selector"/>
+<inp2:m_RenderElement name="combined_header" title_preset="phrases_list_st" additional_blue_bar_render_as="grid_ml_selector" pagination="1" pass_params="1"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -11,46 +13,46 @@
 				function edit()
 				{
 					Application.SetVar('m_lang', '<inp2:m_Get name="m_lang"/>');
-					std_edit_item('phrases', 'languages/phrase_edit');
+					std_edit_item('<inp2:m_Param name="prefix"/>', 'languages/phrase_edit');
 				}
 
 				var a_toolbar = new ToolBar();
 
-				<inp2:m_RenderElement design="toolbar_button" icon="new_item" title="la_ToolTip_NewPhrase" short_title="la_ToolTip_Add">
-					std_precreate_item('phrases', 'languages/phrase_edit');
+				<inp2:m_RenderElement design="toolbar_button" icon="new_item" title="la_ToolTip_NewPhrase" short_title="la_ToolTip_Add" perm_event="OnPreCreate" pass_params="1">
+					std_precreate_item('<inp2:m_Param name="prefix"/>', 'languages/phrase_edit');
 				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="edit" title="la_ToolTip_Edit" short_title="la_ShortToolTip_Edit">
+				<inp2:m_RenderElement design="toolbar_button" icon="edit" title="la_ToolTip_Edit" short_title="la_ShortToolTip_Edit" perm_event="OnEdit" pass_params="1">
 					edit();
 				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="delete" title="la_ToolTip_Delete">
-					std_delete_items('phrases');
+				<inp2:m_RenderElement design="toolbar_button" icon="delete" title="la_ToolTip_Delete" perm_event="OnMassDelete" pass_params="1">
+					std_delete_items('<inp2:m_Param name="prefix"/>');
 				</inp2:m_RenderElement>
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-				<inp2:m_RenderElement design="toolbar_button" icon="export" title="la_ToolTip_Export" short_title="la_ShortToolTip_Export">
-					open_popup('phrases', 'OnExportPhrases', 'regional/languages_export');
+				<inp2:m_RenderElement design="toolbar_button" icon="export" title="la_ToolTip_Export" short_title="la_ShortToolTip_Export" perm_event="OnExportPhrases" pass_params="1">
+					open_popup('<inp2:m_Param name="prefix"/>', 'OnExportPhrases', 'regional/languages_export');
 				</inp2:m_RenderElement>
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				<inp2:m_RenderElement design="toolbar_button" icon="view" title="la_ToolTip_View">
+				<inp2:m_RenderElement design="toolbar_button" icon="view" title="la_ToolTip_View" pass_params="1">
 					show_viewmenu(a_toolbar,'view');
 				</inp2:m_RenderElement>
 
 				a_toolbar.Render();
 			</script>
 		</td>
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="phrases" grid="Phrases"/>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="$prefix" grid="$grid"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="phrases" IdField="PhraseId" grid="Phrases" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="$prefix" IdField="PhraseId" grid="$grid" menu_filters="yes"/>
 <script type="text/javascript">
-	Grids['phrases'].SetDependantToolbarButtons( new Array('edit','delete','primary_language','export_language') );
+	Grids['<inp2:m_Param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete','primary_language','export_language') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: core/admin_templates/logs/email_logs/email_log_list.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/logs/email_logs/email_log_list.tpl	(revision 15716)
+++ core/admin_templates/logs/email_logs/email_log_list.tpl	(revision )
@@ -1,5 +1,7 @@
+<inp2:m_DefaultParam section="in-portal:emaillog" prefix="email-log"/>
+
 <inp2:m_include t="incs/header" />
-<inp2:m_RenderElement name="combined_header" section="in-portal:emaillog" prefix="email-log" title_preset="email_log_list" pagination="1"/>
+<inp2:m_RenderElement name="combined_header" title_preset="email_log_list" pagination="1" pass_params="1"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -14,10 +16,10 @@
 
 							function edit()
 							{
-								std_edit_temp_item('email-log', 'logs/email_logs/email_log_edit');
+								std_edit_temp_item('<inp2:m_Param name="prefix"/>', 'logs/email_logs/email_log_edit');
 							}
 
-							<inp2:m_RenderElement design="toolbar_button" icon="edit" title="la_ToolTip_ViewItem" short_title="la_ToolTip_ViewDetails">
+							<inp2:m_RenderElement design="toolbar_button" icon="edit" title="la_ToolTip_ViewItem" short_title="la_ToolTip_ViewDetails" perm_event="OnStoreSelected" pass_params="1">
 								edit();
 							</inp2:m_RenderElement>
 
@@ -39,7 +41,7 @@
 									'<inp2:m_phrase label="la_ToolTip_DeleteAll" escape="1"/>',
 									function() {
 										if (inpConfirm('<inp2:m_Phrase name="la_Delete_Confirm" escape="1"/>')) {
-									  		submit_event('email-log', 'OnDeleteAll');
+									  		submit_event('<inp2:m_Param name="prefix"/>', 'OnDeleteAll');
 										}
 									}
 				 				)
@@ -47,7 +49,7 @@
 
 					  		a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-							<inp2:m_RenderElement design="toolbar_button" icon="view" title="la_ToolTip_View">
+							<inp2:m_RenderElement design="toolbar_button" icon="view" title="la_ToolTip_View" pass_params="1">
 								show_viewmenu(a_toolbar,'view');
 							</inp2:m_RenderElement>
 
@@ -55,7 +57,7 @@
 						</script>
 	  				</td>
 
-	  				<inp2:m_RenderElement name="search_main_toolbar" prefix="email-log" grid="Default"/>
+	  				<inp2:m_RenderElement name="search_main_toolbar" prefix="$prefix" grid="Default"/>
 	  			</tr>
 	  		</table>
 		</td>
@@ -63,10 +65,10 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="email-log" IdField="EmailLogId" grid="Default"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="$prefix" IdField="EmailLogId" grid="Default"/>
 
 <script type="text/javascript">
-	Grids['email-log'].SetDependantToolbarButtons( new Array('edit') );
+	Grids['<inp2:m_Param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
Index: core/units/helpers/permissions_helper.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/units/helpers/permissions_helper.php	(revision 15716)
+++ core/units/helpers/permissions_helper.php	(revision )
@@ -392,6 +392,7 @@
 
 		function TagPermissionCheck($params, $is_owner = false)
 		{
+			$params = $this->_sanitizeTagParams($params);
 			$perm_prefix = getArrayValue($params, 'perm_prefix');
 			$perm_event = getArrayValue($params, 'perm_event');
 			$permission_groups = getArrayValue($params, 'permissions');
@@ -446,6 +447,46 @@
 			}
 
 			return true;
+		}
+
+		/**
+		 * Ensures, that valid parameter values are given
+		 *
+		 * @param Array $params
+		 * @return Array
+		 * @access protected
+		 */
+		protected function _sanitizeTagParams($params)
+		{
+			if ( isset($params['perm_event']) ) {
+				$perm_event = $params['perm_event'];
+
+				if ( substr($perm_event, 0, 1) == ':' || substr($perm_event, -1, 1) == ':' ) {
+					// prefix without event or otherwise
+					unset($params['perm_event']);
+				}
+			}
+
+			if ( isset($params['permissions']) ) {
+				$new_permission_groups = Array ();
+				$permission_groups = explode('|', $params['permissions']);
+
+				foreach ($permission_groups as $permission_group) {
+					if ( substr($permission_group, 0, 1) != '.' && substr($permission_group, -1, 1) != '.' ) {
+						// section name with permission name
+						$new_permission_groups[] = $permission_group;
+					}
+				}
+
+				if ( !$new_permission_groups ) {
+					unset($params['permissions']);
+				}
+				else {
+					$params['permissions'] = implode('|', $new_permission_groups);
+				}
+			}
+
+			return $params;
 		}
 
 		/**
\ No newline at end of file
Index: core/admin_templates/item_filters/item_filter_edit.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/item_filters/item_filter_edit.tpl	(revision 15716)
+++ core/admin_templates/item_filters/item_filter_edit.tpl	(revision )
@@ -1,7 +1,8 @@
 <inp2:adm_SetPopupSize width="550" height="400"/>
+<inp2:m_DefaultParam prefix="item-filter" section="in-portal:item_filters"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:item_filters"  prefix="item-filter" title_preset="item_filter_edit"/>
+<inp2:m_RenderElement name="combined_header" title_preset="item_filter_edit" pass_params="1"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -11,37 +12,37 @@
 			<script type="text/javascript">
 				a_toolbar = new ToolBar();
 
-				<inp2:m_RenderElement design="toolbar_button" icon="select" title="la_ToolTip_Save">
-					submit_event('item-filter', '<inp2:item-filter_SaveEvent/>');
+				<inp2:m_RenderElement design="toolbar_button" icon="select" title="la_ToolTip_Save" pass_params="1">
+					submit_event('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SaveEvent/>');
 				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="cancel" title="la_ToolTip_Cancel">
-					cancel_edit('item-filter', 'OnCancelEdit', '<inp2:item-filter_SaveEvent/>', '<inp2:m_Phrase label="la_FormCancelConfirmation" js_escape="1"/>');
+				<inp2:m_RenderElement design="toolbar_button" icon="cancel" title="la_ToolTip_Cancel" pass_params="1">
+					cancel_edit('<inp2:m_Param name="prefix"/>', 'OnCancelEdit', '<inp2:$prefix_SaveEvent/>', '<inp2:m_Phrase label="la_FormCancelConfirmation" js_escape="1"/>');
 				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="reset_edit" title="la_ToolTip_Reset">
-					reset_form('item-filter', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+				<inp2:m_RenderElement design="toolbar_button" icon="reset_edit" title="la_ToolTip_Reset" pass_params="1">
+					reset_form('<inp2:m_Param name="prefix"/>', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
 				</inp2:m_RenderElement>
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-				<inp2:m_RenderElement design="toolbar_button" icon="prev" title="la_ToolTip_Prev">
-					go_to_id('item-filter', '<inp2:item-filter_PrevId/>');
+				<inp2:m_RenderElement design="toolbar_button" icon="prev" title="la_ToolTip_Prev" pass_params="1">
+					go_to_id('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_PrevId/>');
 				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="next" title="la_ToolTip_Next">
-					go_to_id('item-filter', '<inp2:item-filter_NextId/>');
+				<inp2:m_RenderElement design="toolbar_button" icon="next" title="la_ToolTip_Next" pass_params="1">
+					go_to_id('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_NextId/>');
 				</inp2:m_RenderElement>
 
 				a_toolbar.Render();
 
-				<inp2:m_if check="item-filter_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="item-filter_IsLast">a_toolbar.DisableButton('next');</inp2:m_if>
-					<inp2:m_if check="item-filter_IsFirst">a_toolbar.DisableButton('prev');</inp2:m_if>
+					<inp2:m_if check="{$prefix}_IsLast">a_toolbar.DisableButton('next');</inp2:m_if>
+					<inp2:m_if check="{$prefix}_IsFirst">a_toolbar.DisableButton('prev');</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
@@ -49,17 +50,17 @@
 </tbody>
 </table>
 
-<inp2:item-filter_SaveWarning name="grid_save_warning"/>
-<inp2:item-filter_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="inp_id_label" prefix="item-filter" field="FilterId" title="la_fld_Id"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="item-filter" field="ItemPrefix"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="item-filter" field="FilterField"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="item-filter" field="FilterType" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="item-filter" field="Enabled"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="item-filter" field="RangeCount" style="width: 50px;"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="$prefix" field="FilterId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="ItemPrefix"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="FilterField"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="$prefix" field="FilterType" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="$prefix" field="Enabled"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="RangeCount" style="width: 50px;"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
@@ -67,7 +68,7 @@
 <script type="text/javascript">
 	$(document).ready(
 		function () {
-			var $field_mask = '<inp2:item-filter_InputName name="#FIELD_NAME#" js_escape="1"/>';
+			var $field_mask = '<inp2:$prefix_InputName name="#FIELD_NAME#" js_escape="1"/>';
 
 			$( get_control($field_mask, 'FilterType') ).change(
 				function ($e) {
\ No newline at end of file
Index: core/admin_templates/languages/email_template_list.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/languages/email_template_list.tpl	(revision 15716)
+++ core/admin_templates/languages/email_template_list.tpl	(revision )
@@ -1,7 +1,8 @@
+<inp2:m_DefaultParam prefix="email-template" section="in-portal:configemail" grid="Emails"/>
+
 <inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" title_preset="email_template_list" additional_blue_bar_render_as="grid_ml_selector" pagination="1" pass_params="1"/>
 
-<inp2:m_RenderElement name="combined_header" section="in-portal:configemail" pagination="1" prefix="email-template" grid="Emails" title_preset="email_template_list" additional_blue_bar_render_as="grid_ml_selector"/>
-
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -9,63 +10,59 @@
   		<td>
   			<script type="text/javascript">
   				function edit() {
-	  				std_edit_item('email-template', 'languages/email_template_edit');
+	  				std_edit_item('<inp2:m_Param name="prefix"/>', 'languages/email_template_edit');
 	  			}
 
   				a_toolbar = new ToolBar();
 
-  				<inp2:m_if check="m_IsDebugMode">
-					<inp2:m_RenderElement design="toolbar_button" icon="new_item" title="la_ToolTip_Add">
-						std_precreate_item('email-template', 'languages/email_template_edit');
+				<inp2:m_RenderElement design="toolbar_button" icon="new_item" title="la_ToolTip_Add" perm_event="OnPreCreate" pass_params="1">
+					std_precreate_item('<inp2:m_Param name="prefix"/>', 'languages/email_template_edit');
-					</inp2:m_RenderElement>
+				</inp2:m_RenderElement>
-				</inp2:m_if>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="edit" title="la_ToolTip_Edit" short_title="la_ShortToolTip_Edit">
+				<inp2:m_RenderElement design="toolbar_button" icon="edit" title="la_ToolTip_Edit" short_title="la_ShortToolTip_Edit" perm_event="OnEdit" pass_params="1">
 					edit();
 				</inp2:m_RenderElement>
 
 				<inp2:m_if check="m_IsDebugMode">
-					<inp2:m_RenderElement design="toolbar_button" icon="delete" title="la_ToolTip_Delete">
-						std_delete_items('email-template');
+					<inp2:m_RenderElement design="toolbar_button" icon="delete" title="la_ToolTip_Delete" perm_event="OnMassDelete" pass_params="1">
+						std_delete_items('<inp2:m_Param name="prefix"/>');
 					</inp2:m_RenderElement>
 				</inp2:m_if>
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				<inp2:m_if check="m_IsDebugMode">
-					<inp2:m_RenderElement design="toolbar_button" icon="approve" title="la_ToolTip_Enable">
-						  submit_event('email-template', 'OnMassApprove');
+					<inp2:m_RenderElement design="toolbar_button" icon="approve" title="la_ToolTip_Enable" perm_event="OnMassApprove" pass_params="1">
+						  submit_event('<inp2:m_Param name="prefix"/>', 'OnMassApprove');
 					</inp2:m_RenderElement>
 
-				  	<inp2:m_RenderElement design="toolbar_button" icon="decline" title="la_ToolTip_Disable">
-				  		submit_event('email-template', 'OnMassDecline');
+				  	<inp2:m_RenderElement design="toolbar_button" icon="decline" title="la_ToolTip_Disable" perm_event="OnMassDecline" pass_params="1">
+				  		submit_event('<inp2:m_Param name="prefix"/>', 'OnMassDecline');
 				  	</inp2:m_RenderElement>
 				</inp2:m_if>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="frontend_mail" title="la_ToolTip_Email_FrontOnly">
-					submit_event('email-template', 'OnFrontOnly');
+				<inp2:m_RenderElement design="toolbar_button" icon="frontend_mail" title="la_ToolTip_Email_FrontOnly" perm_event="OnFrontOnly" pass_params="1">
+					submit_event('<inp2:m_Param name="prefix"/>', 'OnFrontOnly');
 				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="export" title="la_ToolTip_Export" short_title="la_ShortToolTip_Export">
-					open_popup('email-template', 'OnExportEmailTemplates', 'regional/languages_export');
+				<inp2:m_RenderElement design="toolbar_button" icon="export" title="la_ToolTip_Export" short_title="la_ShortToolTip_Export" perm_event="OnExportEmailTemplates" pass_params="1">
+					open_popup('<inp2:m_Param name="prefix"/>', 'OnExportEmailTemplates', 'regional/languages_export');
 				</inp2:m_RenderElement>
 
-				<inp2:m_if check="m_IsDebugMode">
-					<inp2:m_RenderElement design="toolbar_button" icon="process" title="la_ToolTip_Send">
-						submit_event('email-template', 'OnSend');
+				<inp2:m_RenderElement design="toolbar_button" icon="process" title="la_ToolTip_Send" perm_event="OnSend" pass_params="1">
+					submit_event('<inp2:m_Param name="prefix"/>', 'OnSend');
-					</inp2:m_RenderElement>
+				</inp2:m_RenderElement>
-				</inp2:m_if>
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				<inp2:m_RenderElement design="toolbar_button" icon="view" title="la_ToolTip_View">
+				<inp2:m_RenderElement design="toolbar_button" icon="view" title="la_ToolTip_View" pass_params="1">
 					show_viewmenu(a_toolbar,'view');
 				</inp2:m_RenderElement>
 
 				a_toolbar.Render();
 			</script>
 		</td>
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="email-template" grid="Emails"/>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="$prefix" grid="$grid"/>
 	</tr>
 </tbody>
 </table>
@@ -86,8 +83,8 @@
 	</inp2:m_ifnot>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="email-template" IdField="TemplateId" grid="Emails" row_class_render_as="row_class"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="$prefix" IdField="TemplateId" grid="$grid" row_class_render_as="row_class"/>
 <script type="text/javascript">
-	Grids['email-template'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline', 'frontend_mail', 'process') );
+	Grids['<inp2:m_Param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline', 'frontend_mail', 'process') );
 </script>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: core/admin_templates/incs/form_blocks.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/incs/form_blocks.tpl	(revision 15723)
+++ core/admin_templates/incs/form_blocks.tpl	(revision )
@@ -1153,20 +1153,24 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="toolbar_button" icon="" title="" short_title="" toolbar="a_toolbar">
+<inp2:m_DefineElement name="toolbar_button" icon="" title="" short_title="" toolbar="a_toolbar" section="" perm_event="" permission_type="view" system_permission="1">
+	<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
+
+	<inp2:m_if check="m_CheckPermission" permissions="{$perm_section}.{$permission_type}" perm_event="{$prefix}:{$perm_event}" system="$system_permission">
-	<inp2:m_Param name="toolbar"/>.AddButton(
-		new ToolBarButton(
-			'<inp2:m_Param name="icon"/>',
-			<inp2:m_if check="m_Param" name="short_title">
-				'<inp2:m_Phrase label="$title" escape="1"/>::<inp2:m_phrase label="$short_title" escape="1"/>',
-			<inp2:m_else/>
-				'<inp2:m_Phrase label="$title" escape="1"/>',
-			</inp2:m_if>
-			function() {
-				<inp2:m_Param name="content"/>
-			}
-		)
-	);
+		<inp2:m_Param name="toolbar"/>.AddButton(
+			new ToolBarButton(
+				'<inp2:m_Param name="icon"/>',
+				<inp2:m_if check="m_Param" name="short_title">
+					'<inp2:m_Phrase label="$title" escape="1"/>::<inp2:m_phrase label="$short_title" escape="1"/>',
+				<inp2:m_else/>
+					'<inp2:m_Phrase label="$title" escape="1"/>',
+				</inp2:m_if>
+				function() {
+					<inp2:m_Param name="content"/>
+				}
+			)
+		);
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="tabs_container" tabs_render_as="">
Index: core/admin_templates/logs/email_logs/email_log_edit.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/logs/email_logs/email_log_edit.tpl	(revision 15716)
+++ core/admin_templates/logs/email_logs/email_log_edit.tpl	(revision )
@@ -1,7 +1,8 @@
 <inp2:adm_SetPopupSize width="950" height="700"/>
+<inp2:m_DefaultParam section="in-portal:emaillog" prefix="email-log"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:emaillog" prefix="email-log" title_preset="email_log_edit"/>
+<inp2:m_RenderElement name="combined_header" title_preset="email_log_edit" pass_params="1"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -11,29 +12,29 @@
 			<script type="text/javascript">
 				a_toolbar = new ToolBar();
 
-				<inp2:m_RenderElement design="toolbar_button" icon="cancel" title="la_ToolTip_Close">
-					submit_event('email-log', 'OnGoBack');
+				<inp2:m_RenderElement design="toolbar_button" icon="cancel" title="la_ToolTip_Close" pass_params="1">
+					submit_event('<inp2:m_Param name="prefix"/>', 'OnGoBack');
 				</inp2:m_RenderElement>
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-				<inp2:m_RenderElement design="toolbar_button" icon="prev" title="la_ToolTip_Prev">
-					go_to_id('email-log', '<inp2:email-log_PrevId/>');
+				<inp2:m_RenderElement design="toolbar_button" icon="prev" title="la_ToolTip_Prev" pass_params="1">
+					go_to_id('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_PrevId/>');
 				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement design="toolbar_button" icon="next" title="la_ToolTip_Next">
-					go_to_id('email-log', '<inp2:email-log_NextId/>');
+				<inp2:m_RenderElement design="toolbar_button" icon="next" title="la_ToolTip_Next" pass_params="1">
+					go_to_id('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_NextId/>');
 				</inp2:m_RenderElement>
 
 				a_toolbar.Render();
 
-				<inp2:m_if check="email-log_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="email-log_IsLast">a_toolbar.DisableButton('next');</inp2:m_if>
-					<inp2:m_if check="email-log_IsFirst">a_toolbar.DisableButton('prev');</inp2:m_if>
+					<inp2:m_if check="{$prefix}_IsLast">a_toolbar.DisableButton('next');</inp2:m_if>
+					<inp2:m_if check="{$prefix}_IsFirst">a_toolbar.DisableButton('prev');</inp2:m_if>
 				</inp2:m_if>
 			</script>
 		</td>
@@ -41,20 +42,20 @@
 </tbody>
 </table>
 
-<inp2:email-log_SaveWarning name="grid_save_warning"/>
-<inp2:email-log_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="inp_id_label" prefix="email-log" field="EmailLogId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="$prefix" field="EmailLogId" title="la_fld_Id"/>
 
-		<inp2:m_if check="email-log_Field" name="TemplateName" db="db">
-			<inp2:m_RenderElement name="inp_label" prefix="email-log" field="TemplateName"/>
-			<inp2:m_RenderElement name="inp_label" prefix="email-log" field="EventType" title="la_fld_Type"/>
+		<inp2:m_if check="{$prefix}_Field" name="TemplateName" db="db">
+			<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="TemplateName"/>
+			<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="EventType" title="la_fld_Type"/>
 		</inp2:m_if>
 
-		<inp2:m_RenderElement name="inp_label" prefix="email-log" field="From" title="la_fld_Sender"/>
-		<inp2:m_RenderElement name="inp_label" prefix="email-log" field="To" title="la_fld_Recipient"/>
+		<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="From" title="la_fld_Sender"/>
+		<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="To" title="la_fld_Recipient"/>
 
 		<inp2:m_DefineElement name="recipient_element">
 			<inp2:m_Param name="recipient_name"/> &lt;<inp2:m_Param name="recipient_email"/>&gt;
@@ -65,15 +66,15 @@
 			<strong><inp2:RecipientType/>:</strong> <inp2:RecipientsByType render_as="recipient_element" strip_nl="2"/>
 		</inp2:m_DefineElement>
 
-		<inp2:m_RenderElement design="form_row" prefix="email-log" field="OtherRecipients">
+		<inp2:m_RenderElement design="form_row" prefix="$prefix" field="OtherRecipients">
 			<td class="control-cell" valign="top">
 				<inp2:$prefix_PrintOtherRecipients render_as="recipient_type_element"/>
 			</td>
 		</inp2:m_RenderElement>
 
-		<inp2:m_RenderElement name="inp_label" prefix="email-log" field="Subject"/>
+		<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="Subject"/>
 
-		<inp2:m_RenderElement design="form_row" prefix="email-log" field="HtmlBody" title="la_fld_HtmlVersion">
+		<inp2:m_RenderElement design="form_row" prefix="$prefix" field="HtmlBody" title="la_fld_HtmlVersion">
 			<td class="control-cell" valign="top">
 				<iframe src="<inp2:m_Link {$prefix}_event='OnGetHtmlBody' pass='m,$prefix'/>" style="border: 1px solid black;" width="640" height="250" align="left">
 					You browser doesn't support frames!
@@ -81,7 +82,7 @@
 			</td>
 		</inp2:m_RenderElement>
 
-		<inp2:m_RenderElement design="form_row" prefix="email-log" field="TextBody" title="la_fld_TextVersion">
+		<inp2:m_RenderElement design="form_row" prefix="$prefix" field="TextBody" title="la_fld_TextVersion">
 			<td class="control-cell" valign="top">
 				<div style="border: 1px solid black; width: 624px; height: 234px; padding: 8px; font-family: serif; font-size: 16px; overflow: auto;">
 					<inp2:$prefix_Field name="$field" nl2br="1"/>
@@ -89,11 +90,11 @@
 			</td>
 		</inp2:m_RenderElement>
 
-		<inp2:m_RenderElement name="inp_label" prefix="email-log" field="SentOn"/>
+		<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="SentOn"/>
 
 		<!--##
-			<inp2:m_RenderElement name="inp_label" prefix="email-log" field="EventParams"/>
-			<inp2:m_RenderElement name="inp_label" prefix="email-log" field="AccessKey"/>
+			<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="EventParams"/>
+			<inp2:m_RenderElement name="inp_label" prefix="$prefix" field="AccessKey"/>
 		##-->
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
\ No newline at end of file