Index: branches/RC/core/units/agents/agents_config.php
===================================================================
diff -u -r11892 -r11906
--- branches/RC/core/units/agents/agents_config.php	(.../agents_config.php)	(revision 11892)
+++ branches/RC/core/units/agents/agents_config.php	(.../agents_config.php)	(revision 11906)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: agents_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: agents_config.php 11906 2009-07-18 00:11:13Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -56,8 +56,14 @@
 				'new_titlefield' => Array ('agent' => '!la_title_NewAgent!'),
 			),
 
-			'agent_list' => Array ('prefixes' => Array ('agent_List'), 'format' => "!la_title_Agents!"),
-			'agent_edit' => Array ('prefixes' => Array ('agent'), 'format' => "#agent_status# '#agent_titlefield#'"),
+			'agent_list' => Array (
+				'prefixes' => Array ('agent_List'), 'format' => "!la_title_Agents!",
+				'toolbar_button' => Array ('new_agent', 'edit', 'delete', 'approve', 'decline', 'cancel', 'view', 'dbl-click'),
+				),
+
+			'agent_edit' => Array ('prefixes' => Array ('agent'), 'format' => "#agent_status# '#agent_titlefield#'",
+				'toolbar_button' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+				),
 		),
 
 		'PermSection' => Array('main' => 'in-portal:agents'),
Index: branches/RC/core/units/form_submissions/form_submissions_config.php
===================================================================
diff -u -r11892 -r11906
--- branches/RC/core/units/form_submissions/form_submissions_config.php	(.../form_submissions_config.php)	(revision 11892)
+++ branches/RC/core/units/form_submissions/form_submissions_config.php	(.../form_submissions_config.php)	(revision 11906)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_submissions_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: form_submissions_config.php 11906 2009-07-18 00:11:13Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -44,13 +44,17 @@
 												'new_titlefield'		=> Array('form'=>''),
 										),
 
-						'formsubs_list'=>Array('prefixes'				=>	Array('formsubs_List'),
-												'format'				=>	"!la_title_FormSubmissions!",
-										),
+						'formsubs_list' => Array (
+									'prefixes' =>	Array('formsubs_List'),
+									'format' =>	"!la_title_FormSubmissions!",
+									'toolbar_buttons' => Array (),
+								),
 
-						'formsubs_view'=>Array(	'prefixes'				=> Array('formsubs'),
-												'format'				=> "!la_title_ViewingFormSubmission!",
-										),
+						'formsubs_view' => Array(
+									'prefixes' => Array('formsubs'),
+									'format' => "!la_title_ViewingFormSubmission!",
+									'toolbar_buttons' => Array (),
+								),
 
 							),
 
Index: branches/RC/core/units/ban_rules/ban_rules_config.php
===================================================================
diff -u -r11892 -r11906
--- branches/RC/core/units/ban_rules/ban_rules_config.php	(.../ban_rules_config.php)	(revision 11892)
+++ branches/RC/core/units/ban_rules/ban_rules_config.php	(.../ban_rules_config.php)	(revision 11906)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: ban_rules_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: ban_rules_config.php 11906 2009-07-18 00:11:13Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -39,8 +39,15 @@
 				'edit_status_labels' => Array ('ban-rule' => '!la_title_EditingBanRule!'),
 			),
 
-			'ban_rule_list' => Array ('prefixes' => Array ('ban-rule_List'), 'format' => "!la_tab_BanList!"),
-			'ban_rule_edit' => Array ('prefixes' => Array ('ban-rule'), 'format' => "#ban-rule_status# '#ban-rule_titlefield#'"),
+			'ban_rule_list' => Array (
+					'prefixes' => Array ('ban-rule_List'), 'format' => "!la_tab_BanList!",
+					'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'view', 'dbl-click'),
+				),
+
+			'ban_rule_edit' => Array (
+					'prefixes' => Array ('ban-rule'), 'format' => "#ban-rule_status# '#ban-rule_titlefield#'",
+					'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+				),
 		),
 
 		'PermSection' => Array('main' => 'in-portal:user_banlist'),
@@ -74,7 +81,7 @@
 //					1 => 'la_opt_Allow'
 				)
 			),
-			'ItemField' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL, 'use_phrases' => 1, 'formatter'=>'kOptionsFormatter', 'options'=>Array(
+			'ItemField' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL, 'use_phrases' => 1, 'formatter'=>'kOptionsFormatter', 'options' => Array(
 					'ip' => 'la_opt_IP_Address',
 					'Login' => 'la_opt_Username',
 					'Email' => 'la_opt_Email',
@@ -92,7 +99,7 @@
 					3 => 'la_opt_Sub-match'
 				)
 			),
-			'ItemValue' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'required'=>1, 'default' => ''),
+			'ItemValue' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'required' => 1, 'default' => ''),
 			'ItemType' => Array ('type' => 'int', 'not_null' => 1, 'default' => 6),
 			'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'Status' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1, 'use_phrases' => 1, 'formatter'=>'kOptionsFormatter', 'options'=>Array(
Index: branches/RC/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -r11892 -r11906
--- branches/RC/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 11892)
+++ branches/RC/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 11906)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_messages_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: email_messages_config.php 11906 2009-07-18 00:11:13Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -31,12 +31,16 @@
 		'TitleField' => 'Subject',
 
 		'TitlePresets' => Array (
-			'email_messages_direct_list' => Array ('prefixes' => Array ('emailmessages.st_List'), 'format' => "!la_title_EmailMessages!"),
+			'email_messages_direct_list' => Array (
+				'prefixes' => Array ('emailmessages.st_List'), 'format' => "!la_title_EmailMessages!",
+				'toolbar_buttons' => Array ('edit', 'view', 'dbl-click'),
+				),
 			'email_messages_edit_direct' => Array (
 				'prefixes' => Array ('emailmessages'),
 				'new_status_labels' => Array ('emailmessages' => '!la_title_Adding_E-mail!'),
 				'edit_status_labels' => Array ('emailmessages' => '!la_title_Editing_E-mail!'),
 				'format' => '#emailmessages_status# - #emailmessages_titlefield#',
+				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit'),
 			),
 		),
 
Index: branches/RC/core/units/forms/forms_config.php
===================================================================
diff -u -r11892 -r11906
--- branches/RC/core/units/forms/forms_config.php	(.../forms_config.php)	(revision 11892)
+++ branches/RC/core/units/forms/forms_config.php	(.../forms_config.php)	(revision 11906)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: forms_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: forms_config.php 11906 2009-07-18 00:11:13Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -60,28 +60,38 @@
 												'new_titlefield'		=> Array('form'=>''),
 										),
 
-						'forms_list'=>Array('prefixes'				=>	Array('form_List'),
-												'format'				=>	"!la_title_Forms!",
-										),
+						'forms_list' => Array (
+									'prefixes' => Array ('form_List'),
+									'format' =>	"!la_title_Forms!",
+									'toolbar_buttons' => Array('new_form', 'edit', 'delete', 'view', 'dbl-click'),
+								),
 
-						'forms_edit'=>Array(	'prefixes'				=> Array('form'),
-												'format'				=> "#form_status# '#form_titlefield#' - !la_title_General!",
-										),
-						'forms_edit_fields' => Array(	'prefixes'				=> Array('form'),
-												'format'				=> "#form_status# '#form_titlefield#' - !la_title_Fields!",
-										),
+						'forms_edit' => Array (
+									'prefixes' => Array('form'),
+									'format' => "#form_status# '#form_titlefield#' - !la_title_General!",
+									'toolbar_buttons' => Array('select', 'cancel', 'prev', 'next'),
+								),
 
-						'form_field_edit'		=>	Array(		'prefixes'				=>	Array('form', 'formflds'),
-																				'new_status_labels'		=>	Array('formflds'=>"!la_title_Adding_FormField!"),
-																				'edit_status_labels'	=>	Array('formflds'=>'!la_title_Editing_FormField!'),
-																				'new_titlefield'		=>	Array('formflds'=>''),
-																				'format'				=>	"#form_status# '#form_titlefield#' - #formflds_status# '#formflds_titlefield#'",
-																		),
-						'tree_submissions'=>Array(
-												'format'				=>	"!la_title_FormSubmissions!",
-										),
-							),
+						'forms_edit_fields' => Array (
+									'prefixes' => Array('form'),
+									'format' => "#form_status# '#form_titlefield#' - !la_title_Fields!",
+									'toolbar_buttons' => Array('select', 'cancel', 'prev', 'next', 'new_item', 'edit', 'delete', 'move_up', 'move_down', 'view', 'dbl-click'),
+								),
 
+						'form_field_edit' => Array (
+									'prefixes' => Array('form', 'formflds'),
+									'new_status_labels' => Array('formflds'=>"!la_title_Adding_FormField!"),
+									'edit_status_labels' => Array('formflds'=>'!la_title_Editing_FormField!'),
+									'new_titlefield' => Array('formflds'=>''),
+									'format' => "#form_status# '#form_titlefield#' - #formflds_status# '#formflds_titlefield#'",
+									'toolbar_buttons' => Array('select', 'cancel'),
+								),
+
+						'tree_submissions' => Array (
+									'format' =>	"!la_title_FormSubmissions!",
+								),
+					),
+
 					'EditTabPresets' => Array (
 						'Default' => Array (
 							'general' => Array ('title' => 'la_tab_General', 't' => 'forms/forms_edit', 'priority' => 1),
Index: branches/RC/core/admin_templates/submissions/submission_view.tpl
===================================================================
diff -u -r11698 -r11906
--- branches/RC/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 11698)
+++ branches/RC/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 11906)
@@ -91,7 +91,7 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" prefix="formsubs" fields="FormSubmissionId,SubmissionTime" title="!la_section_General!"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="formsubs" field="FormSubmissionId" title="!la_fld_Id!"/>
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="formsubs" field="SubmissionTime" title="!la_fld_SubmissionTime!" />
 		<inp2:m_RenderElement name="subsection" title="!la_section_Data!"/>
Index: branches/RC/core/admin_templates/languages/email_message_edit.tpl
===================================================================
diff -u -r11677 -r11906
--- branches/RC/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 11677)
+++ branches/RC/core/admin_templates/languages/email_message_edit.tpl	(.../email_message_edit.tpl)	(revision 11906)
@@ -39,17 +39,19 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" prefix="emailmessages" fields="Description,Subject,MessageType,Headers" title="!la_section_General!"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="LanguageId"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="EventId"/>
 
 			<inp2:m_RenderElement name="inp_label" prefix="emailmessages" field="Description" title="!la_fld_Description!" as_label="1"/>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="emailmessages" field="Subject" title="!la_fld_Subject!" size="60"/>
-			<!--<inp2:m_RenderElement name="inp_edit_radio" prefix="emailmessages" field="MessageType" title="!la_fld_MessageType!"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="Headers" title="!la_fld_ExtraHeaders!" rows="5" cols="60"/>-->
-		<inp2:m_RenderElement name="subsection" title="!la_section_Message!"/>
 
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="emailmessages" field="MessageType" title="!la_fld_MessageType!"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="Headers" title="!la_fld_ExtraHeaders!" rows="5" cols="60"/>
+
+		<inp2:m_RenderElement name="subsection" prefix="emailmessages" fields="Body" title="!la_section_Message!"/>
+
 		<inp2:m_RenderElement name="inp_edit_fck" prefix="emailmessages" field="Body" title="!la_fld_ExtraHeaders!" rows="5" cols="60" control_options="{min_height: 200}"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/RC/core/units/form_fields/form_fields_config.php
===================================================================
diff -u -r11892 -r11906
--- branches/RC/core/units/form_fields/form_fields_config.php	(.../form_fields_config.php)	(revision 11892)
+++ branches/RC/core/units/form_fields/form_fields_config.php	(.../form_fields_config.php)	(revision 11906)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_fields_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: form_fields_config.php 11906 2009-07-18 00:11:13Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -56,19 +56,19 @@
 
 					'Fields'	=>	Array(
 						'FormFieldId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-						'FormId' => Array('type' => 'int','not_null' => 1, 'default' => 0),
-			            'Type' => Array('type' => 'int','not_null' => 1, 'default' => 0),
-			            'FieldName' => Array('required'=>'1', 'type' => 'string','not_null' => 1,'default' => ''),
+						'FormId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
+			            'Type' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
+			            'FieldName' => Array('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''),
 			            'FieldLabel' => Array('type' => 'string', 'required' => 1, 'default' => null),
 			            'Heading' => Array('type' => 'string', 'default' => null),
-			            'Prompt' => Array('type' => 'string','default' => null,'required'=>1),
-			            'ElementType' => Array('required'=>'1', 'type'=>'string', 'not_null'=>1, 'default'=>'', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_SingleCheckbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label')),
+			            'Prompt' => Array('type' => 'string', 'default' => null, 'required' => 1),
+			            'ElementType' => Array('required'=>'1', 'type'=>'string', 'not_null '=> 1, 'default'=>'', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_SingleCheckbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label')),
 			            'ValueList' => Array('type' => 'string','default' => null),
 			            'Priority' => Array('type' => 'int','not_null' => 1, 'default' => 0),
 			            'IsSystem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 			            'Required' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 			            'DisplayInGrid' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
-			            'DefaultValue' => Array('type' => 'string','not_null' => 1, 'default' => ''),
+			            'DefaultValue' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
 			            'Validation' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_None', 1 => 'la_ValidationEmail'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 					),
 
Index: branches/RC/core/admin_templates/ban_rules/ban_rule_edit.tpl
===================================================================
diff -u -r11623 -r11906
--- branches/RC/core/admin_templates/ban_rules/ban_rule_edit.tpl	(.../ban_rule_edit.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/ban_rules/ban_rule_edit.tpl	(.../ban_rule_edit.tpl)	(revision 11906)
@@ -62,6 +62,7 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
+	<inp2:m_RenderElement name="subsection" prefix="ban-rule" fields="RuleId,RuleType,ItemField,ItemVerb,ItemValue,ErrorTag,Priority,Status" title="!la_section_General!"/>
 		<inp2:m_RenderElement name="inp_edit_hidden" prefix="ban-rule" field="ItemType"/>
 
 		<inp2:m_RenderElement name="inp_id_label" prefix="ban-rule" field="RuleId" title="la_fld_Id"/>
Index: branches/RC/core/admin_templates/forms/forms_list.tpl
===================================================================
diff -u -r11623 -r11906
--- branches/RC/core/admin_templates/forms/forms_list.tpl	(.../forms_list.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/forms/forms_list.tpl	(.../forms_list.tpl)	(revision 11906)
@@ -1,5 +1,5 @@
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:forms" pagination="1" prefix="form"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:forms" pagination="1" prefix="form" title_preset="forms_list"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%">
Index: branches/RC/core/admin_templates/submissions/submissions_list.tpl
===================================================================
diff -u -r11623 -r11906
--- branches/RC/core/admin_templates/submissions/submissions_list.tpl	(.../submissions_list.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/submissions/submissions_list.tpl	(.../submissions_list.tpl)	(revision 11906)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header" />
 
 <inp2:m_Get var="form_id" result_to_var="form_id"/>
-<inp2:m_RenderElement name="combined_header" prefix="formsubs" section="in-portal:submissions:$form_id" pagination="1"/>
+<inp2:m_RenderElement name="combined_header" prefix="formsubs" section="in-portal:submissions:$form_id" pagination="1" title_preset="formsubs_list" />
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%">
Index: branches/RC/core/admin_templates/forms/form_field_edit.tpl
===================================================================
diff -u -r11760 -r11906
--- branches/RC/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 11760)
+++ branches/RC/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 11906)
@@ -32,12 +32,12 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" prefix="formflds" fields="FormFieldId,FieldName,FieldLabel"  title="!la_section_General!"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="formflds" field="FormFieldId" title="!la_prompt_FieldId!"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldName" title="!la_prompt_FieldName!" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldLabel" title="!la_prompt_FieldLabel!" size="40"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_tab_AdminUI!"/>
+		<inp2:m_RenderElement name="subsection" prefix="" fields="Prompt,ElementType,Validation,ValueList,DefaultValue,Priority,Required,DisplayInGrid" title="!la_tab_AdminUI!"/>
 			<!--<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Heading" title="!la_prompt_heading!" size="40"/>-->
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="ElementType" title="!la_prompt_InputType!"/>