Index: branches/RC/core/install/install_schema.sql
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/install/install_schema.sql	(.../install_schema.sql)	(revision 11610)
+++ branches/RC/core/install/install_schema.sql	(.../install_schema.sql)	(revision 11623)
@@ -903,13 +903,6 @@
   KEY Priority (Priority)
 );
 
-CREATE TABLE SuggestMail (
-  email varchar(255) NOT NULL default '',
-  sent INT UNSIGNED NULL DEFAULT NULL,
-  PRIMARY KEY  (email),
-  KEY sent (sent)
-);
-
 CREATE TABLE SysCache (
   SysCacheId int(11) NOT NULL auto_increment,
   Name varchar(255) NOT NULL default '',
Index: branches/RC/core/admin_templates/no_permission.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 11623)
@@ -4,7 +4,7 @@
 
 <inp2:m_RenderElement name="blue_bar" prefix="adm" title_preset="no_permissions" module="in-portal" icon="icon46_banlist"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -r11558 -r11623
--- branches/RC/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 11558)
+++ branches/RC/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="visits" section="in-portal:visits" title_preset="visits_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 11612)
+++ branches/RC/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 11623)
@@ -28,6 +28,18 @@
 			),
 		),
 
+		'Sections' => Array (
+			'in-portal:configemail'	=>	Array(
+				'parent'		=>	'in-portal:site',
+				'icon'			=>	'core:e-mail',
+				'label'			=>	'la_tab_E-mails',
+				'url'			=>	Array('t' => 'config/email_events', 'pass_section' => true, 'pass' => 'm'),
+				'permissions'	=>	Array('view', 'edit'),
+				'priority'		=>	6,
+				'type'			=>	stTREE,
+			),
+		),
+
 		'TableName' => TABLE_PREFIX.'EmailMessage',
 
 		'ListSQLs' => Array (
Index: branches/RC/core/admin_templates/users/image_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/image_edit.tpl	(.../image_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/image_edit.tpl	(.../image_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 
 <inp2:m_include t="incs/image_blocks"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/logs/change_logs/change_log_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/logs/change_logs/change_log_list.tpl	(.../change_log_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/logs/change_logs/change_log_list.tpl	(.../change_log_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header" />
 <inp2:m_RenderElement name="combined_header" section="in-portal:change_logs" prefix="change-log" title_preset="change_log_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/tools/restore2.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/tools/restore2.tpl	(.../restore2.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/tools/restore2.tpl	(.../restore2.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="restore"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/tools/restore4.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/tools/restore4.tpl	(.../restore4.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/tools/restore4.tpl	(.../restore4.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="restore"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/themes/themes_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:configure_themes" prefix="theme" title_preset="themes_edit_general" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/incs/style_template.css
===================================================================
diff -u
--- branches/RC/core/admin_templates/incs/style_template.css	(revision 0)
+++ branches/RC/core/admin_templates/incs/style_template.css	(revision 11623)
@@ -0,0 +1,644 @@
+/*
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	THIS IS STYLESHEET TEMPLATES USED FOR SKINS IN ADMIN
+	IT'S NOT BEING USED DIRECTLY
+	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*/
+
+
+/* General elements */
+
+html {
+	height: 100%;
+}
+
+body {
+ 	font-family: verdana,arial,helvetica,sans-serif;
+ 	color: #000000;
+	overflow-x: auto; overflow-y: auto;
+	margin: 0px 0px 0px 0px;
+	text-decoration: none;
+}
+
+body, td {
+	/* fix for Firefox, when font-size was not inherited in table cells */
+	font-size: 9pt;
+}
+
+a {
+	color: #006699;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #009ff0;
+	text-decoration: none;
+}
+
+form {
+   display: inline;
+}
+
+img { border: 0px; }
+
+body.height-100 {
+	height: 100%;
+}
+
+body.regular-body {
+	margin: 0px 10px 5px 10px;
+	color: #000000;
+	background-color: @@SectionBgColor@@;
+}
+
+body.edit-popup {
+	margin: 0px 0px 0px 0px;
+}
+
+table.collapsed {
+	border-collapse: collapse;
+}
+
+.bordered, table.bordered, .bordered-no-bottom {
+	border: 1px solid #000000;
+	border-collapse: collapse;
+}
+
+.bordered-no-bottom {
+	border-bottom: none;
+}
+
+.login-table td {
+	padding: 1px;
+}
+
+.disabled {
+	background-color: #ebebeb;
+}
+
+/* Head frame */
+table.head-table {
+	background: url(@@base_url@@/core/admin_templates/img/top_frame/right_background.jpg) top right @@HeadBgColor@@ no-repeat;
+}
+
+.head-table tr td {
+	color: @@HeadColor@@
+}
+
+div#extra_toolbar td.button-active {
+	background: url(@@base_url@@/core/admin_templates/img/top_frame/toolbar_button_background.gif) bottom left repeat-x;
+	height: 22px;
+}
+
+td.kx-block-header, .head-table tr td.kx-block-header{
+	color: @@HeadBarColor@@;
+	background: url(@@base_url@@/core/admin_templates/img/top_frame/toolbar_background.gif) repeat-x top left;
+	/*background-color: @@HeadBarBgColor@@;*/
+	padding-left: 7px;
+	padding-right: 7px;
+}
+
+a.kx-header-link {
+	text-decoration: underline;
+	font-weight: bold;
+	color: #0080C8;
+}
+
+a.kx-header-link:hover {
+	color: #FFCB05;
+	text-decoration: none;
+}
+
+.kx-secondary-foreground 	{
+	color: #FFFFFF;
+	/*background-color: @@HeadBarBgColor@@;*/
+}
+
+.kx-login-button {
+	background-color: #2D79D6;
+	color: #FFFFFF;
+}
+
+/* General form button (yellow) */
+.button {
+	font-size: 12px;
+	font-weight: normal;
+	color: #000000;
+	background: url(@@base_url@@/core/admin_templates/img/button_back.gif) #f9eeae repeat-x;
+	text-decoration: none;
+}
+
+/* Disabled (grayed-out) form button */
+.button-disabled {
+	font-size: 12px;
+	font-weight: normal;
+	color: #676767;
+	background: url(@@base_url@@/core/admin_templates/img/button_back_disabled.gif) #f9eeae repeat-x;
+	text-decoration: none;
+}
+
+/* Tabs bar */
+
+.tab, .tab-active {
+	background-color: #F0F1EB;
+	padding: 3px 7px 2px 7px;
+	border-top: 1px solid black;
+	border-left: 1px solid black;
+	border-right: 1px solid black;
+	margin-left: 3px !important;
+	white-space: nowrap;
+}
+
+.tab-active {
+	background-color: #4487D9;
+}
+
+.tab a {
+	color: #4487D9;
+	font-weight: bold;
+}
+
+.tab-active a {
+	color: #FFFFFF;
+	font-weight: bold;
+}
+
+a.scroll-left, a.scroll-right {
+	cursor: pointer;
+	display: block;
+	float: left;
+	height: 18px;
+	margin: 0px 1px;
+	width: 18px;
+}
+
+a.scroll-left {
+	background: transparent url(@@base_url@@/core/admin_templates/img/tabs/left.png) no-repeat scroll 0 0;
+}
+
+a.scroll-right {
+	background: transparent url(@@base_url@@/core/admin_templates/img/tabs/right.png) no-repeat scroll 0 0;
+}
+
+a.disabled {
+	visibility: hidden !important;
+}
+
+a.scroll-left:hover, a.scroll-right:hover {
+	background-position: 0 -18px;
+}
+
+/* Toolbar */
+
+.toolbar {
+	font-size: 8pt;
+	border: 1px solid #000000;
+	border-width: 0px 1px 1px 1px;
+	background-color: @@ToolbarBgColor@@;
+	border-collapse: collapse;
+}
+
+.toolbar td {
+	height: 100%;
+}
+
+.toolbar-button, .toolbar-button-disabled, .toolbar-button-over {
+	float: left;
+	text-align: center;
+	font-size: 8pt;
+	padding: 5px 5px 5px 5px;
+	vertical-align: middle;
+	color: #006F99;
+}
+
+.toolbar-button-over {
+	color: #000;
+}
+
+.toolbar-button-disabled {
+	color: #444;
+}
+
+/*  Scrollable Grids */
+
+
+.layout-only-table td {
+  border: none !important;
+}
+
+/* Main Grid class */
+.grid-scrollable {
+	padding: 0px;
+	border: 1px solid black !important;
+	border-top: none !important;
+}
+
+/* Div generated by js, which contains all the scrollable grid elements, affects the style of scrollable area without data (if there are too few rows) */
+.grid-container {
+	background-color: #fff;
+}
+
+.grid-container table {
+	border-collapse: collapse;
+}
+
+/* Inner div generated in each data-cell */
+.grid-cell-div {
+	overflow: hidden;
+	height: auto;
+}
+
+/* Main row definition */
+.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2 {
+	font-weight: normal;
+	color: @@OddColor@@;
+	background-color: @@OddBgColor@@;
+	padding: 3px 5px 3px 5px;
+	overflow: hidden;
+	border-right: 1px solid #c9c9c9;
+}
+.grid-data-row-even td, .table-color2 {
+	background-color: @@EvenBgColor@@;
+	color: @@EvenColor@@;
+}
+.grid-data-row td a, .grid-data-row-selected td a, .grid-data-row-mouseover td a {
+	text-decoration: underline;
+}
+
+/* mouse-over rows */
+.grid-data-row-mouseover td, table tr.grid-data-row[_row_highlighted] td {
+	background: #FFFDF4;
+}
+
+/* Selected row, applies to both checkbox and data areas */
+.grid-data-row-selected td, table tr.grid-data-row[_row_selected] td {
+	background: #FEF2D6;
+}
+
+.grid-data-row-even-selected td, .grid-data-row-even[_row_selected] td {
+	background: #FFF7E0;
+}
+
+/* General header cell definition */
+.grid-header-row td {
+	font-weight: bold;
+	background-color: @@ColumnTitlesBgColor@@;
+	text-decoration: none;
+	padding: 3px 5px 3px 5px;
+	color: @@ColumnTitlesColor@@;
+	border-right: none;
+	text-align: left;
+	vertical-align: middle !important;
+	white-space: nowrap;
+	border-right: 1px solid #777;
+}
+
+/* Filters row */
+tr.grid-header-row-1 td {
+	background-color: @@FiltersBgColor@@;
+	border-bottom: 1px solid black;
+}
+
+/* Grid Filters */
+table.range-filter {
+	width: 100%;
+}
+
+.range-filter td {
+	padding: 0px 0px 2px 2px !important;
+	border: none !important;
+	font-size: 8pt !important;
+	font-weight: normal !important;
+	text-align: left;
+	color: #000000 !important;
+}
+
+input.filter, select.filter, input.filter-active, select.filter-active {
+	margin-bottom: 0px;
+	border: 1px solid #aaa;
+}
+
+input.filter-active {
+  background-color: #FFFF00;
+}
+
+select.filter-active {
+ background-color: #FFFF00;
+}
+
+/* Column titles row */
+tr.grid-header-row-0 td {
+	height: 25px;
+	font-weight: bold;
+	background-color: @@ColumnTitlesBgColor@@;
+	color: @@ColumnTitlesColor@@;
+	border-bottom: 1px solid black;
+}
+
+tr.grid-header-row-0 td a {
+	color: @@ColumnTitlesColor@@;
+}
+
+tr.grid-header-row-0 td a:hover {
+	color: #FFCC00;
+}
+
+
+.grid-footer-row td {
+	background-color: #D7D7D7;
+	font-weight: bold;
+	border-right: 1px solid #C9C9C9;
+	padding: 3px 5px 3px 5px;
+}
+
+td.grid-header-last-cell, td.grid-data-last-cell, td.grid-footer-last-cell {
+	border-right: none !important;
+}
+
+td.grid-data-col-0, td.grid-data-col-0 div {
+	text-align: center;
+	vertical-align: middle !important;
+}
+
+tr.grid-header-row-1 td.grid-header-col-1 {
+	text-align: center;
+	vertical-align: middle !important;
+}
+
+tr.grid-header-row-1 td.grid-header-col-1 div {
+	display: table-cell;
+	vertical-align: middle;
+}
+
+.grid-status-bar {
+	border: 1px solid black;
+	border-top: none;
+	padding: 0px;
+	width: 100%;
+	border-collapse: collapse;
+	height: 30px;
+}
+
+.grid-status-bar td {
+	background-color: @@TitleBarBgColor@@;
+  color: @@TitleBarColor@@;
+	font-size: 11pt;
+	font-weight: normal;
+	padding: 2px 8px 2px 8px;
+}
+
+/*  /Scrollable Grids */
+
+
+/* Forms */
+table.edit-form {
+	border: none;
+	border-top-width: 0px;
+	border-collapse: collapse;
+	width: 100%;
+}
+
+.edit-form-odd, .edit-form-even {
+	padding: 0px;
+}
+
+.subsectiontitle {
+	font-size: 10pt;
+	font-weight: bold;
+	background-color: #4A92CE;
+	color: #fff;
+	height: 25px;
+	border-top: 1px solid black;
+	vertical-align: middle;
+}
+
+.subsectiontitle td {
+	vertical-align: middle;
+	/*padding: 3px 5px 3px 5px;*/
+	padding: 1px 5px;
+}
+
+.label-cell {
+	background: #DEE7F6 url(@@base_url@@/core/admin_templates/img/bgr_input_name_line.gif) no-repeat right bottom;
+  font: 12px arial, sans-serif;
+  padding: 4px 20px;
+  width: 150px;
+}
+
+.control-mid {
+	width: 13px;
+	border-left: 1px solid #7A95C2;
+	background: #fff url(@@base_url@@/core/admin_templates/img/bgr_mid.gif) repeat-x left bottom;
+}
+
+.control-cell {
+	font: 11px arial, sans-serif;
+	padding: 4px 10px 5px 5px;
+	background: #fff url(@@base_url@@/core/admin_templates/img/bgr_input_line.gif) no-repeat left bottom;
+	width: auto;
+	vertical-align: middle;
+}
+
+.label-cell-filler {
+	background: #DEE7F6 none;
+}
+.control-mid-filler {
+	background: #fff none;
+	border-left: 1px solid #7A95C2;
+}
+.control-cell-filler {
+	background: #fff none;
+}
+
+.error {
+	color: red;
+}
+.error-cell {
+	color: red;
+}
+
+.field-required {
+	color: red;
+}
+
+.warning-table {
+	background-color: #F0F1EB;
+	border: 1px solid #000000;
+	border-collapse: collapse;
+	border-top-width: 0px;
+}
+
+.form-warning {
+	color: red;
+	font-size: 11px;
+}
+
+.priority {
+	color: red;
+	padding-left: 1px;
+	padding-right: 1px;
+	font-size: 11px;
+}
+
+.small-statistics {
+	font-size: 11px;
+	color: #707070;
+}
+
+.req-note {
+	font-style: italic;
+	color: #333;
+}
+
+#scroll_container table.tableborder {
+	border-collapse: separate
+}
+
+
+/* Uploader */
+
+.uploader-main {
+	position: absolute;
+	display: none;
+	z-index: 10;
+	border: 1px solid #777;
+	padding: 10px;
+	width: 350px;
+	height: 120px;
+	overflow: hidden;
+	background-color: #fff;
+}
+
+.uploader-percent {
+	width: 100%;
+	padding-top: 3px;
+	text-align: center;
+	position: relative;
+	z-index: 20;
+	float: left;
+	font-weight: bold;
+}
+
+.uploader-left {
+	width: 100%;
+	border: 1px solid black;
+	height: 20px;
+	background: #fff url(@@base_url@@/core/admin_templates/img/progress_left.gif);
+}
+
+.uploader-done {
+	width: 0%;
+	background-color: green;
+	height: 20px;
+	background: #4A92CE url(@@base_url@@/core/admin_templates/img/progress_done.gif);
+}
+
+
+/* To be sorted */
+span#category_path, span#category_path a {
+	color: #FFFFFF;
+}
+
+span#category_path a {
+	text-decoration: underline;
+}
+
+/* Section title, right to the big icon */
+.admintitle {
+	font-size: 16pt;
+	font-weight: bold;
+	color: @@SectionColor@@;
+	text-decoration: none;
+}
+
+/* Left side of bluebar */
+.header_left_bg {
+	background-color: @@TitleBarBgColor@@;
+	background-image: none;
+	padding-left: 5px;
+}
+
+/* Right side of bluebar */
+.tablenav, tablenav a {
+	font-size: 11pt;
+	font-weight: bold;
+	color: @@TitleBarColor@@;
+
+	text-decoration: none;
+	background-color: @@TitleBarBgColor@@;
+	background-image: none;
+}
+
+/* Section title in the bluebar * -- why 'link'? :S */
+.tablenav_link {
+	font-size: 11pt;
+	font-weight: bold;
+	color: @@TitleBarColor@@;
+	text-decoration: none;
+}
+
+/* Active page in top and bottom bluebars pagination */
+.current_page {
+	font-size: 10pt;
+	font-weight: bold;
+	background-color: #fff;
+	color: #2D79D6;
+	padding: 3px 2px 3px 3px;
+}
+
+/* Other pages and arrows in pagination on blue */
+.nav_url {
+	font-size: 10pt;
+	font-weight: bold;
+	color: #fff;
+	padding: 3px 2px 3px 3px;
+}
+
+/* Tree */
+.tree-body {
+	background-color: @@TreeBgColor@@;
+	height: 100%
+}
+
+.tree_head.td, .tree_head, .tree_head:hover {
+ font-weight: bold;
+ font-size: 10px;
+ color: #FFFFFF;
+ font-family: Verdana, Arial;
+ text-decoration: none;
+}
+
+.tree {
+	padding: 0px;
+	border: none;
+	border-collapse: collapse;
+}
+
+.tree tr td {
+	padding: 0px;
+	margin: 0px;
+	font-family: helvetica, arial, verdana,;
+	font-size: 11px;
+	white-space: nowrap;
+}
+
+.tree tr td a {
+	font-size: 11px;
+	color: @@TreeColor@@;
+	font-family: Helvetica, Arial, Verdana;
+	text-decoration: none;
+	padding: 2px 0px 2px 2px;
+}
+
+.tree tr.highlighted td a {
+	background-color: @@TreeHighBgColor@@;
+	color: @@TreeHighColor@@;
+}
+
+.tree tr.highlighted td a:hover {
+	color: #fff;
+}
+
+.tree tr td a:hover {
+	color: #000000;
+}
\ No newline at end of file
Index: branches/RC/core/admin_templates/img/bgr_input_line.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="cf" section="$section" perm_event="cf:OnLoad" title_preset="custom_fields_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/modules/modules_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/modules/modules_list.tpl	(.../modules_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/modules/modules_list.tpl	(.../modules_list.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header" />
 <inp2:m_RenderElement name="combined_header" prefix="mod" section="in-portal:mod_status" title_preset="module_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_groups" permission_type="advanced:manage_permissions" prefix="g" title_preset="groups_edit_permissions" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 	<tbody>
 		<tr>
Index: branches/RC/core/admin_templates/head.tpl
===================================================================
diff -u -r8929 -r11623
--- branches/RC/core/admin_templates/head.tpl	(.../head.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/head.tpl	(.../head.tpl)	(revision 11623)
@@ -2,47 +2,114 @@
 <inp2:m_include t="incs/header" nobody="yes"/>
 
 <inp2:m_NoDebug/>
+<inp2:m_Set skip_last_template="1"/>
 
 <script type="text/javascript">
 	$popup_manager = new AjaxPopupManager('<inp2:m_t t="ajax/popup_manager" pass="m" js_escape="1"/>');
+	grid_widths_cache = new Array();
 </script>
 
-<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" bgcolor="#FFFFFF" onload="document.body.scroll='no'">
+<body style="overflow: hidden; background-color: white;">
+	<div id="site_logo">
+		<table class="head-table" style="width: 100%;" cellpadding="0" cellspacing="0">
+			<td style="height: 95px; text-align: left;">
+				<div style="float: left;">
+					<a href="<inp2:m_t t="sections_list" section="in-portal:root" module="In-Portal" pass="m"/>" target="main">
+						<img src="<inp2:adm_AdminSkin type='logo'/>" alt="" border="0"/><br />
+					</a>
+				</div>
+				<div style="float: left; padding-left: 12px; font-family: impact, sans-serif; text-align: left;">
+					<span style="font-size: 48px; font-weight: bold;"><inp2:m_GetConfig var="Site_Name"/></span>
 
-	<table cellpadding="0" cellspacing="0" width="100%" border="0">
-		<tr>
-			<td valign="middle">
-				<a href="<inp2:m_t t="sections_list" section="in-portal:root" module="In-Portal" pass="m"/>" target="main"><img title="In-portal" src="img/globe.gif" width="84" height="82" border="0"></a>
-			</td>
-			<td valign="middle">
-				<a href="<inp2:m_t t="sections_list" section="in-portal:root" module="In-Portal" pass="m"/>" target="main"><img title="In-portal" src="img/logo.gif" width="150" height="82" border="0"></a>
-			</td>
-			<td width="100%">
-			</td>
-			<td width="400" valign="top">
-				<table cellpadding="0" cellspacing="0">
-					<tr>
-						<td height="73" valign="top">
-							<img src="img/blocks.gif" width="400" height="73" title="" alt="" /><br />
-						</td>
-					</tr>
+					<inp2:m_if check="m_GetConfig" name="SiteNameSubTitle">
+						<br />
+						<span style="font-size: 20px;"><inp2:m_GetConfig name="SiteNameSubTitle"/></span>
+					</inp2:m_if>
+				</div>
+				<div style="float: right; text-align: right; padding-top: 5px; padding-right: 8px;">
+					<inp2:m_if check="lang.enabled_IsMultiLanguage">
+						<select name="language" onchange="change_language();" style="color: white; background-color: transparent; border-width: 0px;">
+							<inp2:m_DefineElement name="lang_elem">
+								<option style="background-color: #1DAAF2;" value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="LocalName"/></option>
+							</inp2:m_DefineElement>
+							<inp2:lang.enabled_PrintList render_as="lang_elem"/>
+						</select>
+					</inp2:m_if>
 
-					<tr>
-			  			<td align="right" style="background: url(img/version_bg.gif) top right repeat-y;" class="head_version" valign="absmiddle" height="18">
-			  				<img title="" src="img/spacer.gif" width="1" height="10" align="absmiddle">
-							<inp2:m_phrase name="la_Logged_in_as"/> <b> <inp2:u.current_LoginName/> </b>
-			  				<a href="<inp2:m_t t="index" u_event="OnLogout" pass="m,u"/>" target="_parent"><img src="img/blue_bar_logout.gif" height="16" width="16" align="absmiddle" border="0"></a>
-			  			</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
+					<inp2:m_if check="lang.current_Field" name="UserDocsUrl">
+						<a href="<inp2:lang.current_Field name='UserDocsUrl' js_escape='1'/>" id="help_link" target="_blank">
+							<img src="<inp2:m_TemplatesBase/>/img/top_frame/help_icon.gif" width="15" height="15" border="0"/><br />
+						</a>
+					</inp2:m_if>
 
-		<tr>
-			<td bgcolor="#000000" colspan="4">
-				<img title="" src="img/spacer.gif" width="1" height="1" /><br />
+					<!--<div style="height: 8px;"></div>
+					<a href="http://www.intechnic.com" target="_new">
+						<img src="<inp2:adm_ModulePath module="core"/>img/logo_intechnic.gif" alt="" width="115" height="49" alt="Intechnic Corporation" border="0"/>
+					</a>-->
+				</div>
 			</td>
-		</tr>
-	</table>
+		</table>
+	</div>
 
+	<div style="background: url(<inp2:m_TemplatesBase/>/img/top_frame/toolbar_background.gif) repeat-x top left;">
+		<div style="background: url(<inp2:adm_AdminSkin type='LogoBottom'/>) no-repeat bottom left; text-align: left;">
+			<table cellpadding="0" cellspacing="0" style="width: 100%;">
+				<tr>
+					<td style="vertical-align: bottom; height: 22px; font-size: 9px; width: <inp2:adm_MenuFrameWidth/>px;">
+						<inp2:m_if check="m_RecallEquals" name="ShowAdminMenu" value="0" persistent="1">
+							<a id="menu_toggle_link" href="#"><img src="img/list_arrow_desc.gif" id="menu_toggle_img" width="15" height="15" alt=""/><span id="menu_toggle_text"><inp2:m_Phrase name="la_ToolTip_HideMenu"/></span></a>
+						<inp2:m_else/>
+							<a id="menu_toggle_link" href="#"><img src="img/list_arrow_desc.gif" id="menu_toggle_img" width="15" height="15" alt=""/><span id="menu_toggle_text"><inp2:m_Phrase name="la_ToolTip_ShowMenu"/></span></a>
+						</inp2:m_if>
+					</td>
+					<td>
+						<div id="extra_toolbar" style="height: 22px;"></div>
+					</td>
+					<td class="kx-block-header" align="right" nowrap valign="middle">
+						<table cellpadding="0" cellspacing="0" border="0" >
+						<tr>
+							<td class="kx-block-header" style="background-image: none;">
+								<inp2:m_phrase name="la_Logged_in_as"/> <strong><a href="javascript:change_password();" class="kx-header-link"><inp2:u.current_LoginName/></strong></a>
+								|
+								<a href="<inp2:m_t t="index" u_event="OnLogout" pass="m,u"/>" target="_parent" class="kx-header-link"><strong><inp2:m_Phrase label="la_Logout"/></strong></a>
+							</td>
+							<td>
+								<a href="<inp2:m_t t="index" u_event="OnLogout" pass="m,u"/>" target="_parent"><img src="<inp2:adm_ModulePath module='core'/>img/x.gif" alt="" width="15" height="15" /></a>
+							</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+
+			</table>
+		</div>
+	</div>
+
 <inp2:m_include t="incs/footer"/>
+
+<script type="text/javascript" src="js/frame_resizer.js"></script>
+<script type="text/javascript">
+	var $skip_refresh = true;
+
+	function change_language() {
+		// when changing language submit is made to frameset, not the current frame
+		var $kf = document.getElementById($form_name);
+		$kf.target = 'main_frame';
+
+		submit_event('lang', 'OnChangeLanguage', 'index');
+	}
+
+	function change_password() {
+		getFrame('main').set_hidden_field('u_id', <inp2:m_get name="u.current_id"/>);
+
+		<inp2:m_if check="m_GetEquals" name="u.current_id" value="-1">
+			open_popup('u', '', 'users/root_edit_password');
+		<inp2:m_else/>
+			open_popup('u', '', 'users/user_edit_password');
+		</inp2:m_if>
+	}
+
+	$FrameResizer = new FrameResizer('<inp2:m_Phrase name="la_ToolTip_ShowMenu" js_escape="1"/>', '<inp2:m_Phrase name="la_ToolTip_HideMenu" js_escape="1"/>', window.parent, '<inp2:m_Link pass="m,adm" adm_event="OnSaveSetting" var_name="#NAME#" var_value="#VALUE#" no_amp="1"/>', <inp2:adm_MenuFrameWidth/>);
+	$FrameResizer.InitControls($FrameResizer);
+	$FrameResizer.SetStatus(<inp2:m_if check="m_RecallEquals" name="ShowAdminMenu" value="0" persistent="1">0<inp2:m_else/>1</inp2:m_if>);
+</script>
Index: branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/stylesheets/base_style_edit.tpl	(.../base_style_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="css" section="in-portal:configure_styles" title_preset="base_style_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/spelling_dictionary/spelling_dictionary_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/spelling_dictionary/spelling_dictionary_edit.tpl	(.../spelling_dictionary_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/spelling_dictionary/spelling_dictionary_edit.tpl	(.../spelling_dictionary_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:spelling_dictionary" prefix="spelling-dictionary" title_preset="spelling_dictionary_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/img/bgr_mid.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r11269 -r11623
--- branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 11269)
+++ branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 11623)
@@ -22,243 +22,308 @@
 	<a href="javascript:go_to_page('<inp2:m_param name="PrefixSpecial"/>', <inp2:m_param name="page"/>, <inp2:m_param name="ajax"/>)" class="nav_url">&lt;&lt;</a>
 </inp2:m_DefineElement>
 
-
-<inp2:m_DefineElement name="search_main_toolbar">
+<inp2:m_DefineElement name="grid_pagination_elem" main_special="" ajax="0">
+	<inp2:m_if check="GridInfo" type="needs_pagination" pass_params="1">
+		&nbsp;<inp2:m_phrase name="la_Page"/>:
+		<inp2:PrintPages active_block="current_page" split="10" inactive_block="page" prev_page_block="prev_page" next_page_block="next_page" prev_page_split_block="prev_page_split" next_page_split_block="next_page_split" main_special="$main_special" ajax="$ajax" grid="$grid"/>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_pagination" SearchPrefixSpecial="" ajax="0">
-<table cellspacing="0" cellpadding="0" width="100%" bgcolor="#E0E0DA" border="0" class="<inp2:m_if check="m_ParamEquals" name="no_toolbar" value="no_toolbar" >bordered<inp2:m_else/>pagination_bar</inp2:m_if>">
+<!--## Maybe not in use ##-->
+<table cellspacing="0" cellpadding="2" width="100%" border="0" class="pagination_bar">
 	<tbody>
-		<tr id="MY_ID">
-	  	<td>
-	  		<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0">
-	  		<b class=text><inp2:m_phrase name="la_Page"/></b>
-	      <inp2:{$PrefixSpecial}_PrintPages active_block="current_page" split="10" inactive_block="page" prev_page_block="prev_page" next_page_block="next_page" prev_page_split_block="prev_page_split" next_page_split_block="next_page_split" main_special="$main_special" ajax="$ajax" grid="$grid"/>
+		<tr>
+	  	<td width="100%">
+		  	 <inp2:m_RenderElement name="grid_pagination_elem" pass_params="1"/>
 			</td>
-			<inp2:m_if check="m_ParamEquals" param="search" value="on">
-				<inp2:m_if check="m_ParamEquals" name="SearchPrefixSpecial" value="">
-					<inp2:m_RenderElement name="grid_search" grid="$grid" PrefixSpecial="$PrefixSpecial" ajax="$ajax"/>
-				<inp2:m_else />
-					<inp2:m_RenderElement name="grid_search" grid="$grid" PrefixSpecial="$SearchPrefixSpecial" ajax="$ajax"/>
-				</inp2:m_if>
-			</inp2:m_if>
 			<td>
+				<inp2:m_if check="m_ParamEquals" param="search" value="on">
+					<inp2:m_if check="m_ParamEquals" name="SearchPrefixSpecial" value="">
+						<inp2:m_RenderElement name="grid_search" grid="$grid" PrefixSpecial="$PrefixSpecial" ajax="$ajax"/>
+					<inp2:m_else />
+						<inp2:m_RenderElement name="grid_search" grid="$grid" PrefixSpecial="$SearchPrefixSpecial" ajax="$ajax"/>
+					</inp2:m_if>
+				</inp2:m_if>
+			</td>
 		</tr>
 	</tbody>
 </table>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_pagination_elem" ajax="0">
+<inp2:m_DefineElement name="search_main_toolbar">
+	<td style="white-space: nowrap; text-align: right; width: 300px;" align="right">
+		<div style="float: right">
+			<table cellpadding="0" cellspacing="0">
+				<tr>
+					<td>
+						<input 	type="text"
+							id="<inp2:m_param name="prefix"/>_search_keyword"
+							name="<inp2:m_param name="prefix"/>_search_keyword"
+							value="<inp2:m_recall var="{$prefix}_search_keyword" no_null="no_null" special="1"/>"
+							PrefixSpecial="<inp2:m_param name="prefix"/>"
+							Grid="<inp2:m_param name="grid"/>"
+							ajax="0"
+							style="border: 1px solid grey;"/>
+					</td>
+					<td style="white-space: nowrap;">
+						<script type="text/javascript">
+							b_toolbar = new ToolBar();
 
+							b_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search" escape="1"/>',
+									function() {
+										search('<inp2:m_Param name="prefix"/>', '<inp2:m_Param name="grid"/>', 0);
+									} ) );
+
+							b_toolbar.AddButton( new ToolBarButton('search_reset_alt', '<inp2:m_phrase label="la_ToolTip_SearchReset" escape="1"/>',
+									function() {
+										search_reset('<inp2:m_Param name="prefix"/>', '<inp2:m_Param name="grid"/>', 0);
+									} ) );
+
+							b_toolbar.Render();
+						</script>
+					</td>
+				</tr>
+			</table>
+		</div>
+	</td>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_search" ajax="0">
 				<td align="right" class="search-cell">
+					<img src="img/spacer.gif" width="300" height="1" alt=""/><br />
 					<table cellspacing="0" cellpadding="0">
 						<tr>
 							<td><inp2:m_phrase name="la_Search"/>:&nbsp;</td>
 							<td>
-								<input type="text" id="<inp2:m_param name="PrefixSpecial"/>_search_keyword" name="<inp2:m_param name="PrefixSpecial"/>_search_keyword" value="<inp2:m_recall var="{$PrefixSpecial}_search_keyword" no_null="no_null" special="1"/>" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);" class="search-box"/>
+								<input 	type="text"
+										id="<inp2:m_param name="PrefixSpecial"/>_search_keyword"
+										name="<inp2:m_param name="PrefixSpecial"/>_search_keyword"
+										value="<inp2:m_recall var="{$PrefixSpecial}_search_keyword" no_null="no_null" special="1"/>"
+										PrefixSpecial="<inp2:m_param name="PrefixSpecial"/>"
+										Grid="<inp2:m_param name="grid"/>"
+										ajax="<inp2:m_param name="ajax"/>"
+										style="border: 1px solid grey;"/>
 								<input type="text" style="display: none;"/>
 							</td>
 							<td style="white-space: nowrap;" id="search_buttons[<inp2:m_param name="PrefixSpecial"/>]">
-								<div style="white-space: nowrap;"></div>
-								<script type="text/javascript">
-									<inp2:m_RenderElement name="grid_search_buttons" pass_params="true"/>
-								</script>
 							</td>
 						</tr>
 					</table>
+
+					<inp2:m_if check="m_Param" name="ajax" equals_to="0">
+						<script type="text/javascript">
+							addLoadEvent(
+								function () {
+									<inp2:m_RenderElement name="grid_search_buttons" pass_params="true"/>
+								}
+							)
+						</script>
+					</inp2:m_if>
 				</td>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_search_buttons" PrefixSpecial="" grid="" ajax="1">
+	var $search_box = document.getElementById('<inp2:m_param name="PrefixSpecial"/>_search_keyword');
+	if ($search_box) {
+		//$search_box.onkeydown = search_keydown;
+		$( jq('#<inp2:m_param name="PrefixSpecial"/>_search_keyword') ).keydown(search_keydown);
+	}
+
+	var $search_buttons = document.getElementById('search_buttons[<inp2:m_param name="PrefixSpecial"/>]');
+	if ($search_buttons) {
 		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'] = new ToolBar('icon16_');
 		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].IconSize = {w:22,h:22};
 		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].UseLabels = false;
 		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton(
 			new ToolBarButton(
-						 'search',
-						 '<inp2:m_phrase name="la_ToolTip_Search" escape="1"/>',
-						 function() { search('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) },
-						 null,
-						 '<inp2:m_param name="PrefixSpecial"/>') );
+				'search',
+				'<inp2:m_phrase name="la_ToolTip_Search" escape="1"/>',
+				function() {
+					search('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>)
+				},
+				null,
+				'<inp2:m_param name="PrefixSpecial"/>'
+			)
+		);
+
 		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton(
 			new ToolBarButton(
-						 'search_reset',
-						 '<inp2:m_phrase name="la_ToolTip_SearchReset" escape="1"/>',
-						 function() { search_reset('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) },
-						 null,
-						 '<inp2:m_param name="PrefixSpecial"/>') );
-		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].Render(document.getElementById('search_buttons[<inp2:m_param name="PrefixSpecial"/>]'));
-</inp2:m_DefineElement>
+				'search_reset',
+				'<inp2:m_phrase name="la_ToolTip_SearchReset" escape="1"/>',
+				function() {
+					search_reset('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>)
+				},
+				null,
+				'<inp2:m_param name="PrefixSpecial"/>'
+			)
+		);
 
-<inp2:m_DefineElement name="grid_column_title" use_phrases="1" ajax="0">
-	<td nowrap="nowrap">
-		<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"><IMG alt="" src="img/list_arrow_<inp2:{$PrefixSpecial}_order field="$sort_field"/>.gif" border="0" align="absmiddle"><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></a>
-	</td>
+		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].Render($search_buttons);
+	}
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_column_title_no_sorting" use_phrases="1" ajax="0">
-	<td nowrap="nowrap">
-		<inp2:m_if check="m_Param" name="use_phrases">
-			<inp2:m_phrase name="$title"/>
-		<inp2:m_else/>
-			<inp2:m_param name="title"/>
-		</inp2:m_if>
-	</td>
+<inp2:m_DefineElement name="grid_checkbox_td" format="">
+	<inp2:m_RenderElement name="grid_data_td" pass_params="1"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_checkbox_td" format="" module="" >
-	<td valign="top" class="text">
-		<table border="0" cellpadding="0" cellspacing="0" class="grid_id_cell">
-			<tr>
-				<td><input type="checkbox" name="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>" id="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>"></td>
-				<td><img src="<inp2:ModulePath module="$module"/>img/itemicons/<inp2:{$PrefixSpecial}_ItemIcon grid="$grid"/>"></td>
-				<td><inp2:Field field="$field" no_special="no_special" format="$format"/></td>
-			</tr>
-		</table>
-	</td>
+<inp2:m_DefineElement name="grid_checkbox_td_no_icon" format="">
+	<inp2:m_RenderElement name="grid_data_td" pass_params="1"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_checkbox_td_no_icon" format="" >
-	<td valign="top" class="text">
-		<table border="0" cellpadding="0" cellspacing="0" class="grid_id_cell">
-			<tr>
-				<td><input type="checkbox" name="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>" id="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>"></td>
-				<td><inp2:{$PrefixSpecial}_field field="$field" no_special="no_special" format="$format"/></td>
-			</tr>
-		</table>
-	</td>
+<inp2:m_DefineElement name="label_grid_checkbox_td" format="">
+	<inp2:m_RenderElement name="grid_data_label_td" pass_params="1"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="label_grid_checkbox_td" format="" module="" >
-	<td valign="top" class="text">
-		<table border="0" cellpadding="0" cellspacing="0" class="grid_id_cell">
-			<tr>
-				<td><input type="checkbox" name="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>" id="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>"></td>
-				<td><img src="<inp2:ModulePath module="$module"/>img/itemicons/<inp2:{$PrefixSpecial}_ItemIcon grid="$grid"/>"></td>
-				<td><inp2:{$PrefixSpecial}_field field="$field" no_special="no_special" as_label="as_label" format="$format"/></td>
-			</tr>
-		</table>
-	</td>
+<inp2:m_DefineElement name="grid_icon_td" format="">
+	<inp2:m_RenderElement name="grid_data_td" pass_params="1"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_icon_td" format="" module="" >
-	<td valign="top" class="text">
-		<table border="0" cellpadding="0" cellspacing="0" class="grid_id_cell">
-			<tr>
-				<td><img src="<inp2:ModulePath module="$module"/>img/itemicons/<inp2:{$PrefixSpecial}_ItemIcon grid="$grid"/>"></td>
-				<td><inp2:{$PrefixSpecial}_field field="$field" no_special="no_special" format="$format"/></td>
-			</tr>
-		</table>
-	</td>
+<inp2:m_DefineElement name="grid_radio_td" format="">
+	<inp2:m_RenderElement name="grid_data_td" pass_params="1"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_radio_td" format="" module="">
-	<td valign="top" class="text">
-		<table border="0" cellpadding="0" cellspacing="0" class="grid_id_cell">
-			<tr>
-				<td><input type="radio" name="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>" id="<inp2:{$PrefixSpecial}_InputName field="$IdField" IdField="$IdField"/>"></td>
-				<td><img src="<inp2:ModulePath module="$module"/>img/itemicons/<inp2:{$PrefixSpecial}_ItemIcon grid="$grid"/>"></td>
-				<td><inp2:Field field="$field" no_special="no_special" format="$format"/></td>
-			</tr>
-		</table>
-	</td>
+<inp2:m_DefineElement name="grid_data_td" format="" no_special="1" nl2br="" first_chars="" td_style="">
+	<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_data_td" format="" no_special="" nl2br="" first_chars="" td_style="" currency="">
-	<td valign="top" class="text" style="<inp2:m_param name="td_style"/>"><inp2:{$PrefixSpecial}_field field="$field" first_chars="$first_chars" currency="$currency" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/></td>
+<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:m_else/>
+		'&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="">
-	<td valign="top" class="text" style="<inp2:m_param name="td_style"/>"><inp2:{$PrefixSpecial}_field field="$field" first_chars="$first_chars" currency="$currency" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
-	<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:Field field="$field" first_chars="$first_chars" currency="$currency" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
+	<span class="priority"><inp2:m_if check="FieldEquals" field="Priority" value="0"><inp2:m_else/><sup><inp2:Field field="Priority" /></sup></inp2:m_if></span>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_edit_td" format="" >
-	<td valign="top" class="text"><input type="text" id="<inp2:{$PrefixSpecial}_InputName field="$field"/>" name="<inp2:{$PrefixSpecial}_InputName field="$field"/>" value="<inp2:{$PrefixSpecial}_field field="$field" grid="$grid" format="$format"/>"></td>
+	<input type="text" id="<inp2:{$PrefixSpecial}_InputName field="$field"/>" name="<inp2:{$PrefixSpecial}_InputName field="$field"/>" value="<inp2:{$PrefixSpecial}_field field="$field" grid="$grid" format="$format"/>">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_picker_td" nl2br="0" no_special="1" separator="&nbsp;">
-	<td valign="top" class="text">
-		<inp2:Field name="$field" format="$separator" nl2br="$nl2br" no_special="$no_special"/>
-	</td>
+	<inp2:Field name="$field" format="$separator" nl2br="$nl2br" no_special="$no_special"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_options_td" format="">
-	<td valign="top" class="text">
 		<select name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>">
 			<inp2:m_if check="FieldOption" field="$field" option="use_phrases">
 				<inp2:PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="1" empty_value="0"/>
 			<inp2:m_else/>
 				<inp2:PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="1" empty_value="0"/>
 			</inp2:m_if>
 		</select>
-	</td>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_date_td" format="">
-	<td valign="top" class="text">
-		<input type="text" name="<inp2:InputName field="{$field}_date"/>" id="<inp2:InputName field="{$field}_date"/>" value="<inp2:Field field="{$field}_date" format="_regional_InputDateFormat"/>" size="<inp2:Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:Format field="{$field}_date" input_format="1" human="true"/>)</span>
+		<input type="text" name="<inp2:InputName field="{$field}_date"/>" id="<inp2:InputName field="{$field}_date"/>" value="<inp2:Field field="{$field}_date" format="_regional_InputDateFormat"/>" size="<inp2:Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;
+		<img src="img/calendar_icon.gif" id="cal_img_<inp2:InputName field="{$field}"/>"
+				     style="cursor: pointer; margin-right: 5px"
+				     title="Date selector"
+				/>
+		<span class="small">(<inp2:Format field="{$field}_date" input_format="1" human="true"/>)</span>
 		<script type="text/javascript">
-			initCalendar("<inp2:InputName field="{$field}_date"/>", "<inp2:Format field="{$field}_date" input_format="1"/>");
+			Calendar.setup({
+		        inputField		:	"<inp2:InputName field="{$field}_date"/>",
+		        ifFormat		:	Calendar.phpDateFormat("<inp2:Format field="{$field}_date" input_format="1"/>"),
+		        button			:	"cal_img_<inp2:InputName field="{$field}"/>",
+		        align			:	"br",
+		        singleClick		:	true,
+		        showsTime		:	true,
+		        weekNumbers		:	false,
+		        firstDay		:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
+		        onUpdate	:	function(cal) {
+		        	runOnChange('<inp2:InputName field="{$field}_date"/>');
+		       	}
+			});
 		</script>
 		<input type="hidden" name="<inp2:InputName field="{$field}_time"/>" id="<inp2:InputName field="{$field}_time" input_format="1"/>" value="">
-	</td>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_data_label_td" >
-	<td valign="top" class="text"><inp2:{$PrefixSpecial}_field field="$field" grid="$grid" plus_or_as_label="1" no_special="no_special" format="$format"/></td>
+	<inp2:Field field="$field" grid="$grid" plus_or_as_label="1" no_special="no_special" format="$format"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_data_label_ml_td" format="" >
-	<td valign="top" class="text">
-		<span class="<inp2:m_if check="{$SourcePrefix}_HasError" field="$virtual_field">error</inp2:m_if>">
-			<inp2:{$PrefixSpecial}_Field field="$field" grid="$grid" as_label="1" no_special="no_special" format="$format"/>
-		</span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"><span class="error"> *</span></inp2:m_if>:<br />
+	<span class="<inp2:m_if check="{$SourcePrefix}_HasError" field="$virtual_field">error-cell</inp2:m_if>">
+		<inp2:{$PrefixSpecial}_Field field="$field" grid="$grid" as_label="1" no_special="no_special" format="$format"/>
+	</span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"><span class="field-required"> *</span></inp2:m_if>:<br />
 
-		<inp2:m_if check="FieldEquals" field="$ElementTypeField" value="textarea">
-			<inp2:m_if check="Field" name="MultiLingual" equals_to="1" db="db">
-				<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>, 1);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" border="0"></a>
-			<inp2:m_else/>
-				<inp2:Field name="FieldName" result_to_var="custom_field"/>
-				<a href="javascript:OpenEditor('&section=in-link:editlink_general', 'kernel_form', '<inp2:{$SourcePrefix}_InputName field="cust_{$custom_field}"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor: hand;" border="0"></a>
-			</inp2:m_if>
+	<inp2:m_if check="FieldEquals" field="$ElementTypeField" value="textarea">
+		<inp2:m_if check="Field" name="MultiLingual" equals_to="1" db="db">
+			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>, 1);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" border="0"></a>
 		<inp2:m_else/>
-			<inp2:m_if check="Field" name="MultiLingual" equals_to="1" db="db">
-				<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" border="0"></a>
-			</inp2:m_if>
+			<inp2:Field name="FieldName" result_to_var="custom_field"/>
+			<a href="javascript:OpenEditor('&section=in-link:editlink_general', 'kernel_form', '<inp2:{$SourcePrefix}_InputName field="cust_{$custom_field}"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor: hand;" border="0"></a>
 		</inp2:m_if>
-	</td>
+	<inp2:m_else/>
+		<inp2:m_if check="Field" name="MultiLingual" equals_to="1" db="db">
+			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" border="0"></a>
+		</inp2:m_if>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="grid_empty_filter">
+
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="grid_column_filter">
-	<td>&nbsp;</td>
+	<!--## this cheat makes sure, that columns without a filter are using like filter ##-->
+	<inp2:m_RenderElement name="grid_like_filter" pass_params="1"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_options_filter" use_phrases="0">
-	<td>
-		<select <inp2:m_if check="SearchField" field="$filter_field" filter_type="options" grid="$grid">class="filter"</inp2:m_if> name="<inp2:SearchInputName field="$filter_field" filter_type="options" grid="$grid"/>">
-			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
+<inp2:m_DefineElement name="grid_options_filter" use_phrases="0" filter_width="90%">
+		<select
+			class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='options' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
+			name="<inp2:SearchInputName field="$filter_field" filter_type="options" grid="$grid"/>"
+			style="width: <inp2:m_Param name="filter_width"/>">
+
+			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
 				<inp2:PredefinedSearchOptions field="$filter_field" block="inp_option_phrase" selected="selected" has_empty="1" empty_value="" filter_type="options" grid="$grid"/>
 			<inp2:m_else/>
 				<inp2:PredefinedSearchOptions field="$filter_field" block="inp_option_item" selected="selected" has_empty="1" empty_value="" filter_type="options" grid="$grid"/>
 			</inp2:m_if>
 		</select>
-	</td>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_like_filter">
-	<td>
-		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="like" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="like" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="like" grid="$grid"/>" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/>
-	</td>
+<inp2:m_DefineElement name="grid_like_filter" filter_width="95%">
+		<input type="text"
+			class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='like' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
+		  style="width: <inp2:m_Param name="filter_width"/>"
+			name="<inp2:SearchInputName field="$filter_field" filter_type="like" grid="$grid"/>"
+			value="<inp2:SearchField field="$filter_field" filter_type="like" grid="$grid"/>"
+			onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="grid_user_like_filter" selector_template="user_selector" filter_width="95%">
+	<table class="range-filter">
+		<tr>
+			<td style="width: 100%">
+				<input type="text"
+					class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='like' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
+	 				 style="width: <inp2:m_Param name="filter_width"/>"
+		name="<inp2:SearchInputName field="$filter_field" filter_type="like" grid="$grid"/>"
+		id="<inp2:SearchInputName field="$filter_field" filter_type="like" grid="$grid"/>"
+		value="<inp2:SearchField field="$filter_field" filter_type="like" grid="$grid"/>"
+		onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
+			</td>
+			<td valign="middle">
+				<a href="javascript:openSelector('<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_t t="$selector_template" pass="all,$PrefixSpecial" escape="1"/>', '<inp2:m_param name="filter_field"/>');">
+					<img src="img/icons/icon24_link_user.gif" style="cursor:hand;" border="0">
+				</a>
+			</td>
+		</tr>
+	</table>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="grid_picker_filter" use_phrases="0" filter_width="90%">
-	<td>
 		<select
-			class="filter <inp2:m_if check="SearchField" field="$filter_field" filter_type="options" grid="$grid">filter-active</inp2:m_if>"
+			class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='options' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
 			name="<inp2:SearchInputName field="$filter_field" filter_type="picker" grid="$grid"/>"
 			style="width: <inp2:m_Param name="filter_width"/>">
 
@@ -268,40 +333,159 @@
 				<inp2:PredefinedSearchOptions field="$filter_field" block="inp_option_item" selected="selected" has_empty="1" empty_value="" filter_type="picker" grid="$grid"/>
 			</inp2:m_if>
 		</select>
-	</td>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_equals_filter">
-	<td>
-		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="equals" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="equals" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="equals" grid="$grid"/>" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/>
-	</td>
+<inp2:m_DefineElement name="grid_like_combo_filter" filter_width="95%">
+		<input type="text"
+			autocomplete="off"
+			class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='like' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
+		  style="width: <inp2:m_Param name="filter_width"/>"
+			name="<inp2:SearchInputName field="$filter_field" filter_type="like" grid="$grid"/>"
+			id="<inp2:SearchInputName field="$filter_field" filter_type="like" grid="$grid"/>"
+			value="<inp2:SearchField field="$filter_field" filter_type="like" grid="$grid"/>"
+			onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
+		<script type="text/javascript">
+			new AJAXDropDown('<inp2:SearchInputName field="$filter_field" filter_type="like" grid="$grid"/>',
+				function(cur_value) {
+					return '<inp2:m_t no_amp="1" pass="m,{$PrefixSpecial}" field="$filter_field" {$PrefixSpecial}_event="OnSuggestValues" cur_value="#VALUE#"/>'.replace('#VALUE#', cur_value);
+				}
+			);
+		</script>
 </inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_range_filter">
-	<td>
-		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="range" type="from" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="range" type="from" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="range" type="from" grid="$grid"/>" size="5" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
-		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="range" type="to" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="range" type="to" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="range" type="to" grid="$grid"/>" size="5" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
-	</td>
+
+<inp2:m_DefineElement name="grid_equals_filter" filter_width="95%">
+		<input type="text"
+			 class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='equals' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
+			 style="width: <inp2:m_Param name="filter_width"/>"
+			 name="<inp2:SearchInputName field="$filter_field" filter_type="equals" grid="$grid"/>"
+			 value="<inp2:SearchField field="$filter_field" filter_type="equals" grid="$grid"/>"
+			 onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
 </inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_float_range_filter">
-	<td>
-		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="float_range" type="from" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>" size="5" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
-		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="float_range" type="to" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>" size="5" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
-	</td>
+
+<inp2:m_DefineElement name="grid_range_filter" filter_width="90%">
+		<table class="range-filter">
+			<tr>
+				<td style="width: 100%">
+					<input type="text"
+						class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='range' type='from' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
+						name="<inp2:SearchInputName field="$filter_field" filter_type="range" type="from" grid="$grid"/>"
+						value="<inp2:SearchField field="$filter_field" filter_type="range" type="from" grid="$grid"/>"
+						style="width: <inp2:m_Param name="filter_width"/>;"
+						onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
+				</td>
+				<td rowspan="2" valign="middle">
+					<img src="<inp2:m_TemplatesBase/>/img/expand_filter.gif" width="7" height="9" alt="" onclick="filter_toggle('<inp2:SearchInputName field='$filter_field' filter_type='range' type='to' grid='$grid'/>_row', '<inp2:m_Param name='PrefixSpecial'/>');"/>
+				</td>
+			</tr>
+			<tr class="to-range-filter<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> hidden-filter</inp2:m_ifnot>" id="<inp2:SearchInputName field='$filter_field' filter_type='range' type='to' grid='$grid'/>_row">
+				<td style="width: 100%;<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> display: none;</inp2:m_ifnot>">
+					<input type="text"
+						class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='range' type='to' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
+						name="<inp2:SearchInputName field="$filter_field" filter_type="range" type="to" grid="$grid"/>"
+						value="<inp2:SearchField field="$filter_field" filter_type="range" type="to" grid="$grid"/>"
+						style="width: <inp2:m_Param name="filter_width"/>;"
+						onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
+				</td>
+			</tr>
+		</table>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_date_range_filter">
-	<td>
-		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="date_range" type="from" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>" id="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>" size="15" datepickerIcon="img/calendar_icon.gif" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
-		<input type="text" class="flat-input<inp2:m_if check="SearchField" field="$filter_field" filter_type="date_range" type="to" grid="$grid"> filter</inp2:m_if>" name="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>" id="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>" value="<inp2:SearchField field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>" size="15" datepickerIcon="img/calendar_icon.gif" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);"/><br />
-	</td>
-	<script type="text/javascript">
-		initCalendar("<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>", "<inp2:Format field="{$sort_field}_date" input_format="1"/>");
-		initCalendar("<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>", "<inp2:Format field="{$sort_field}_date" input_format="1"/>");
-	</script>
+<inp2:m_DefineElement name="grid_float_range_filter" filter_width="90%">
+		<table class="range-filter">
+			<tr>
+				<td style="width: 100%">
+					<input type="text"
+						class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='float_range' type='from' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
+						name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>"
+						value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>"
+						style="width: <inp2:m_Param name="filter_width"/>"
+						onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
+				</td>
+				<td rowspan="2" valign="middle">
+					<img src="<inp2:m_TemplatesBase/>/img/expand_filter.gif" width="7" height="9" alt="" onclick="filter_toggle('<inp2:SearchInputName field='$filter_field' filter_type='range' type='to' grid='$grid'/>_row', '<inp2:m_Param name='PrefixSpecial'/>');"/>
+				</td>
+			</tr>
+			<tr class="to-range-filter<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> hidden-filter</inp2:m_ifnot>" id="<inp2:SearchInputName field='$filter_field' filter_type='float_range' type='to' grid='$grid'/>_row">
+				<td style="width: 100%;<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> display: none;</inp2:m_ifnot>">
+					<input type="text"
+						class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='float_range' type='to' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
+						name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>"
+						value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>"
+						style="width: <inp2:m_Param name="filter_width"/>"
+						onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
+				</td>
+			</tr>
+		</table>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="grid_date_range_filter" calendar_format="" filter_width="80%">
+		<table class="range-filter">
+			<tr>
+				<td style="width: 100%">
+					<input type="text"
+						class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='date_range' type='from' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
+						style="width: <inp2:m_Param name="filter_width"/>"
+						name="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>"
+						id="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>"
+						value="<inp2:SearchField field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>"
+						onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
+				</td>
+				<td>
+					<img src="img/calendar_icon.gif" width="13" height="12" id="cal_img_<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>"
+					     style="cursor: pointer; margin-right: 5px"
+					     title="Date selector"
+					 />
+				</td>
+				<td rowspan="2" valign="middle">
+					<img src="<inp2:m_TemplatesBase/>/img/expand_filter.gif" width="7" height="9" alt="" onclick="filter_toggle('<inp2:SearchInputName field='$filter_field' filter_type='date_range' type='to' grid='$grid'/>_row', '<inp2:m_Param name='PrefixSpecial'/>');"/>
+				</td>
+			</tr>
+			<tr class="to-range-filter<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> hidden-filter</inp2:m_ifnot>" id="<inp2:SearchInputName field='$filter_field' filter_type='date_range' type='to' grid='$grid'/>_row">
+				<td style="width: 100%;<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> display: none;</inp2:m_ifnot>">
+					<input type="text"
+						class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='date_range' type='to' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"
+						style="width: <inp2:m_Param name="filter_width"/>"
+						name="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>"
+						id="<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>"
+						value="<inp2:SearchField field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>"
+						onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>
+				</td>
+				<td<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> style="display: none;"</inp2:m_ifnot>>
+					<img src="img/calendar_icon.gif" width="13" height="12" id="cal_img_<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>"
+					     style="cursor: pointer; margin-right: 5px"
+					     title="Date selector"
+					/>
+				</td>
+			</tr>
+		</table>
+		<script type="text/javascript">
+			var $format = "<inp2:m_if check='m_Param' name='calendar_format'><inp2:m_Param name='calendar_format'/><inp2:m_else/><inp2:Format field='{$sort_field}' input_format='1'/></inp2:m_if>";
+
+				Calendar.setup({
+	        inputField     :    "<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>",
+	        ifFormat       :    Calendar.phpDateFormat($format),
+	        button         :    "cal_img_<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="from" grid="$grid"/>",
+	        align          :    "br",
+	        singleClick    :    true,
+	        showsTime			 :		true,
+	        weekNumbers		 : 		false,
+	        firstDay			 :		<inp2:m_GetConfig var="FirstDayOfWeek"/>
+				});
+				Calendar.setup({
+	        inputField     :    "<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>",
+	        ifFormat       :    Calendar.phpDateFormat($format),
+	        button         :    "cal_img_<inp2:SearchInputName field="$filter_field" filter_type="date_range" type="to" grid="$grid"/>",
+	        align          :    "br",
+	        singleClick    :    true,
+	        showsTime			 :		true,
+	        weekNumbers		 : 		false,
+	        firstDay			 :		<inp2:m_GetConfig var="FirstDayOfWeek"/>
+				});
+		</script>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="viewmenu_sort_block">
-	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="$title" escape="1"/>','direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:m_param name="sort_field"/>","<inp2:{$PrefixSpecial}_OrderInfo type="direction" pos="1"/>", null, <inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_IsOrder" field="$sort_field" pos="1" >2</inp2:m_if>');
+	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="$title" js_escape="1"/>','direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:m_param name="sort_field"/>","<inp2:{$PrefixSpecial}_OrderInfo type="direction" pos="1"/>", null, <inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_IsOrder" field="$sort_field" pos="1" >2</inp2:m_if>');
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="viewmenu_filter_block">
@@ -312,146 +496,136 @@
 	$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuSeparator();
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="viewmenu_declaration" menu_filters="no" menu_sorting="yes" menu_perpage="yes" menu_select="yes" ajax="0">
-	// define ViewMenu
-	$fw_menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'] = function()
-	{
-		<inp2:m_if check="m_ParamEquals" name="menu_filters" value="yes">
-			// filtring menu
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'] = new Menu('<inp2:m_phrase name="la_Text_View" escape="1"/>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuItem('All','filters_remove_all("<inp2:m_param name="PrefixSpecial"/>", <inp2:m_param name="ajax"/>);');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuItem('None','filters_apply_all("<inp2:m_param name="PrefixSpecial"/>", <inp2:m_param name="ajax"/>);');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addMenuSeparator();
-			<inp2:{$PrefixSpecial}_DrawFilterMenu old_style="1" item_block="viewmenu_filter_block" spearator_block="viewmenu_filter_separator" ajax="$ajax"/>
-		</inp2:m_if>
-
-		<inp2:m_if check="m_ParamEquals" name="menu_sorting" value="yes">
-			// sorting menu
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'] = new Menu('<inp2:m_phrase name="la_Text_Sort" escape="1"/>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="la_common_ascending" escape="1"/>','direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" pos="1"/>","asc",null,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_IsOrder" direction="asc" pos="1" >2</inp2:m_if>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="la_common_descending" escape="1"/>','direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" pos="1"/>","desc",null,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_IsOrder" direction="desc" pos="1" >2</inp2:m_if>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuSeparator();
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addMenuItem('<inp2:m_phrase name="la_Text_Default" escape="1"/>','reset_sorting("<inp2:m_param name="PrefixSpecial"/>");');
-			<inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="header" block="viewmenu_sort_block" ajax="$ajax"/>
-		</inp2:m_if>
-
-		<inp2:m_if check="m_ParamEquals" name="menu_perpage" value="yes">
-			// per page menu
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'] = new Menu('<inp2:m_phrase name="la_prompt_PerPage" escape="1"/>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('10','set_per_page("<inp2:m_param name="PrefixSpecial"/>",10,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_PerPageEquals" value="10" >2</inp2:m_if>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('20','set_per_page("<inp2:m_param name="PrefixSpecial"/>",20,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_PerPageEquals" value="20" >2</inp2:m_if>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('50','set_per_page("<inp2:m_param name="PrefixSpecial"/>",50,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_PerPageEquals" value="50" >2</inp2:m_if>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('100','set_per_page("<inp2:m_param name="PrefixSpecial"/>",100,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_PerPageEquals" value="100" >2</inp2:m_if>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'].addMenuItem('500','set_per_page("<inp2:m_param name="PrefixSpecial"/>",500,<inp2:m_param name="ajax"/>);','<inp2:m_if check="{$PrefixSpecial}_PerPageEquals" value="500" >2</inp2:m_if>');
-		</inp2:m_if>
-
-		<inp2:m_if check="m_ParamEquals" name="menu_select" value="yes">
-			// select menu
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'] = new Menu('<inp2:m_phrase name="la_Text_Select" escape="1"/>');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'].addMenuItem('<inp2:m_phrase name="la_Text_All" escape="1"/>','Grids["<inp2:m_param name="PrefixSpecial"/>"].SelectAll();');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'].addMenuItem('<inp2:m_phrase name="la_Text_Unselect" escape="1"/>','Grids["<inp2:m_param name="PrefixSpecial"/>"].ClearSelection();');
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'].addMenuItem('<inp2:m_phrase name="la_Text_Invert" escape="1"/>','Grids["<inp2:m_param name="PrefixSpecial"/>"].InvertSelection();');
-		</inp2:m_if>
-
-		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'] = new Menu('<inp2:{$PrefixSpecial}_GetItemName/>');
-		<inp2:m_if check="m_ParamEquals" name="menu_filters" value="yes">
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addMenuItem( $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'] );
-		</inp2:m_if>
-		<inp2:m_if check="m_ParamEquals" name="menu_sorting" value="yes">
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addMenuItem( $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'] );
-		</inp2:m_if>
-		<inp2:m_if check="m_ParamEquals" name="menu_perpage" value="yes">
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addMenuItem( $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'] );
-		</inp2:m_if>
-		<inp2:m_if check="m_ParamEquals" name="menu_select" value="yes">
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addMenuItem( $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_select_menu'] );
-		</inp2:m_if>
-	}
-</inp2:m_DefineElement>
-
 <inp2:m_include template="incs/menu_blocks"/>
 
-<inp2:m_DefineElement name="grid_save_warning" >
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_<inp2:m_if check="m_ParamEquals" name="no_toolbar" value="no_toolbar" >nobottom<inp2:m_else/>notop</inp2:m_if>">
+<inp2:m_DefineElement name="grid_save_warning">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
   		<tr>
-    		<td valign="top" class="hint_red">
+    		<td valign="top" class="form-warning">
     			<inp2:m_phrase name="la_Warning_Save_Item"/>
     		</td>
   		</tr>
 	</table>
 	<script type="text/javascript">
 		$edit_mode = <inp2:m_if check="m_ParamEquals" name="edit_mode" value="1">true<inp2:m_else />false</inp2:m_if>;
+		if (Form) Form.Changed();
 //		window.parent.document.title += ' - MODE: ' + ($edit_mode ? 'EDIT' : 'LIVE');
 	</script>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="grid_status" no_special="0" pagination="1">
+	<table class="grid-status-bar">
+		<tr>
+			<td nowrap="nowrap" style="vertical-align: middle;">
+				<inp2:m_Phrase label="la_Records"/>: <inp2:GridInfo type="filtered" no_special="$no_special"/> (<inp2:GridInfo type="from" no_special="$no_special"/> - <inp2:GridInfo type="to" no_special="$no_special"/>) <inp2:m_Phrase label="la_OutOf"/> <inp2:GridInfo type="total" no_special="$no_special"/>
+			</td>
+			<td align="right" class="tablenav" valign="middle">
+				<inp2:m_if check="m_Param" name="pagination">
+					<inp2:m_RenderElement name="grid_pagination_elem" pass_params="1"/>
+				</inp2:m_if>
+			</td>
+		</tr>
+	</table>
+</inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="grid_column_title_html" no_special="0">
+	<table style="width: auto" class="layout-only-table"><tr>
+		<td style="vertical-align: middle; padding: 0px">
+			<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"
+				class="columntitle_small"><IMG alt="" src="img/list_arrow_<inp2:{$PrefixSpecial}_order field="$sort_field" no_special='$no_special'/>.gif" border="0" align="absmiddle">
+			</a>
+		</td>
+		<td style="vertical-align: middle; text-align: left; padding: 1px; white-space: normal">
+			<a href="javascript:resort_grid('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="sort_field"/>', <inp2:m_param name="ajax"/>);"
+				class="columntitle_small">
+				<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>
+			</a>
+		</td>
+	</tr></table>
+</inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid" main_prefix="" per_page="" main_special="" no_toolbar="" 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="grid_selector_icon_html" selector="checkbox">
+	<div style="white-space: nowrap;">
+		<inp2:m_if check="m_Param" name="selector">
+			<input type="<inp2:m_Param name='selector'/>" name="<inp2:InputName field='$IdField' IdField='$IdField'/>" id="<inp2:InputName field='$IdField' IdField='$IdField'/>">
+		</inp2:m_if>
+		<img src="<inp2:ModulePath/>img/itemicons/<inp2:ItemIcon grid='$grid'/>" width="16" height="16" alt=""/>
+	</div>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_selector_html" selector="checkbox">
+	<inp2:m_if check="m_Param" name="selector">
+		<input type="<inp2:m_Param name='selector'/>" name="<inp2:InputName field='$IdField' IdField='$IdField'/>" id="<inp2:InputName field='$IdField' IdField='$IdField'/>">
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_select_all_checkbox_html">
+	<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>
+
+<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>
+
+<inp2:m_DefineElement name="grid_js_data_td" format="" no_special="1" nl2br="" first_chars="" td_style="">
+	'<inp2:m_RenderElement name="$data_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_filter_block" use_phrases="0">
+	'<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_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>
+
+<inp2:m_DefineElement name="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"
+	 limited_heights="false"
+	 max_row_height="45"
+	 grid_height="auto"
+	 no_special="0"
+	 selector="checkbox"
+	 grid_status="1"
+	 totals_render_as=""
+	 >
+<!--##
 	grid_filters - show individual filters for each column
 	has_filters  - draw filter section in "View" menu in toolbar
--->
+##-->
 
-	<inp2:InitList pass_params="1"/> <!-- this is to avoid recalling prefix as an item in first iterate grid, by col-picker for instance -->
+	<inp2:InitList pass_params="1"/> <!--## this is to avoid recalling prefix as an item in first iterate grid, by col-picker for instance ##-->
 
-	<inp2:GridSelector grid="$grid" default="$selector" result_to_var="selector"/>
-
-	<inp2:{$PrefixSpecial}_SaveWarning name="grid_save_warning" main_prefix="$main_prefix" no_toolbar="$no_toolbar"/>
+	<inp2:{$PrefixSpecial}_SaveWarning name="grid_save_warning" pass_params="1"/>
 	<inp2:m_if check="m_RecallEquals" var="{$PrefixSpecial}_search_keyword" value="" inverse="inverse">
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_<inp2:m_if check="m_ParamEquals" name="no_toolbar" value="no_toolbar" >nobottom<inp2:m_else/>notop</inp2:m_if>">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
   		<tr>
-    		<td valign="top" class="hint_red">
+    		<td valign="top" class="form-warning">
     			<inp2:m_phrase name="la_Warning_Filter"/>
     		</td>
   		</tr>
 	</table>
 	</inp2:m_if>
 
-	<inp2:m_if check="m_ParamEquals" name="per_page" value="-1" inverse="1">
-		<inp2:m_RenderElement name="grid_pagination" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" search="$search" no_toolbar="$no_toolbar" ajax="$ajax"/>
+	<div id="grid_<inp2:m_Param name='PrefixSpecial'/>_container"></div>
+
+	<inp2:m_if check="m_Param" name="grid_status">
+		<inp2:m_RenderElement name="grid_status" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" no_special="$no_special" search="$search" ajax="$ajax"/>
 	</inp2:m_if>
-	<table width="100%" cellspacing="0" cellpadding="4" class="bordered">
 
-		<inp2:m_if check="m_ParamEquals" name="grid_filters" value="1">
-			<tr class="pagination_bar">
-				<inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="filter" block="$filter_block" ajax="$ajax"/>
-			</tr>
-		</inp2:m_if>
-
-		<tr class="subsectiontitle">
-			<inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="header" block="$header_block" ajax="$ajax"/>
-		</tr>
-
-		<inp2:m_DefineElement name="_row" td_style="">
-			<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" sequence="<inp2:m_get param="{$PrefixSpecial}_sequence"/>"><inp2:m_inc param="{$PrefixSpecial}_sequence" by="1"/>
-				<inp2:IterateGridFields grid="$grid" mode="data" block="$data_block"/>
-			</tr>
-		</inp2:m_DefineElement>
-		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
-		<inp2:{$PrefixSpecial}_PrintList block="$row_block" per_page="$per_page" main_special="$main_special" />
-
-		<inp2:m_DefineElement name="grid_total_td">
-			<inp2:m_if check="m_Param" name="total">
-				<td style="<inp2:m_param name="td_style"/>">
-					<inp2:FieldTotal name="$field" function="$total"/>
-				</td>
-			<inp2:m_else/>
-				<td style="<inp2:m_param name="td_style"/>">&nbsp;</td>
-			</inp2:m_if>
-		</inp2:m_DefineElement>
-
-		<inp2:m_if check="m_ParamEquals" name="totals" value="1">
-			<tr class="totals-row"/>
-				<inp2:IterateGridFields grid="$grid" mode="data" block="$totals_block"/>
-			</tr>
-		</inp2:m_if>
-	</table>
-
 	<inp2:m_if check="m_ParamEquals" name="ajax" value="0">
 		<inp2:m_if check="m_GetEquals" name="fw_menu_included" value="">
-			<script type="text/javascript" src="incs/fw_menu.js"></script>
-
 			<link rel="stylesheet" rev="stylesheet" href="incs/nlsmenu.css" type="text/css" />
 			<script type="text/javascript" src="js/nlsmenu.js"></script>
 			<script type="text/javascript" src="js/nlsmenueffect_1_2_1.js"></script>
@@ -466,19 +640,111 @@
 		</inp2:m_if>
 
 		<script type="text/javascript">
-			<inp2:m_RenderElement name="grid_js" selected_class="selected_div" tag_name="tr" pass_params="true"/>
+			<inp2:m_RenderElement name="grid_js" mouseover_class="grid-data-row-mouseover" selected_class="grid-data-row-selected:grid-data-row-even-selected" tag_name="tr" pass_params="true"/>
 		</script>
 	</inp2:m_if>
 
 	<input type="hidden" id="<inp2:m_param name="PrefixSpecial"/>_Sort1" name="<inp2:m_param name="PrefixSpecial"/>_Sort1" value="">
 	<input type="hidden" id="<inp2:m_param name="PrefixSpecial"/>_Sort1_Dir" name="<inp2:m_param name="PrefixSpecial"/>_Sort1_Dir" value="asc">
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid_js" view_menu="1" selector="checkbox" ajax="1">
+<inp2:m_DefineElement name="default_sorting_element" ajax="0">
+	<div style="text-align: center;">
+		<a href="#" onclick="reset_sorting('<inp2:m_Param name="prefix"/>', <inp2:m_param name="ajax"/>); return false;" title="<inp2:m_phrase name="la_Text_Default" html_escape="1"/>">
+			<img src="img/list_arrow_<inp2:m_if check='{$prefix}_OrderChanged'>no<inp2:m_else/>desc</inp2:m_if>_big.gif" width="16" height="16" alt="<inp2:m_phrase name="la_Text_Default" html_escape="1"/>"/>
+		</a>
+	</div>
+</inp2:m_DefineElement>
+
+<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"/>]
+		]
+	);
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_js"
+	main_prefix="" per_page="" main_special="" grid_filters=""
+	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"
+	limited_heights="false"
+	max_row_height="45"
+	grid_height="auto"
+	grid_status="1" ajax="1"
+	totals_render_as=""
+	no_special="0"
+	selector="checkbox"
+	mouseover_class="grid-data-row-mouseover" selected_class="grid-data-row-selected:grid-data-row-even-selected" tag_name="tr"
+>
 		<inp2:GridSelector grid="$grid" default="$selector" result_to_var="selector"/>
 
+		// 1. create grid
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'] = new GridScroller('grid_<inp2:m_Param name="PrefixSpecial" />', 'auto', <inp2:m_if check="m_Param" name="grid_height" equals_to="auto">'<inp2:m_Param name="grid_height"/>'<inp2:m_else/><inp2:m_Param name="grid_height"/></inp2:m_if>);
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].Spacer = 'img/spacer.gif';
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].LeftCells = <inp2:FreezerPosition grid="$grid"/>;
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].BottomOffset = <inp2:m_if check="m_Param" name="grid_status">30<inp2:m_else/>0</inp2:m_if>;
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].MinWidths = [<inp2:GridSelectorColumnWidth selector="$selector" icon_width="20" selector_width="30" grid="$grid"/>, <inp2:IterateGridFields grid="$grid" mode="width" block="grid_js_width_td" ajax="$ajax" no_special="$no_special"/>];
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].PickerCRC = '<inp2:PickerCRC grid="$grid"/>';
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].LimitedHeights = <inp2:m_param name="limited_heights"/>;
+		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" no_special="$no_special"/>],
+				['<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:IterateGridFields grid="$grid" mode="filter" force_block="grid_js_filter_block" ajax="$ajax" no_special="$no_special"/>]
+			]
+		)
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].FieldNames = ['_CheckboxColumn', <inp2:IterateGridFields grid="$grid" mode="fields" no_special="$no_special"/>];
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].SetData(
+			[
+				<inp2:m_DefineElement name="js_row" td_style="" row_class_render_as="" selector_render_as="grid_selector_html" row_class="">
+					{ 'row_class': '<inp2:m_if check="m_Param" name="row_class_render_as"><inp2:m_RenderElement name="$row_class_render_as" PrefixSpecial="$PrefixSpecial" trim="1"/><inp2:m_else/><inp2:m_Param name="row_class"/></inp2:m_if>',
+						'data': ['<inp2:m_RenderElement name="$selector_render_as" pass_params="1" js_escape="1"/>',<inp2:IterateGridFields grid="$grid" mode="data" force_block="grid_js_data_td" no_special="$no_special"/>]
+					}<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
+				</inp2:m_DefineElement>
+				<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
+
+				<inp2:m_if check="UseItemIcons" grid="$grid">
+					<inp2:PrintList block="js_row" selector_render_as="grid_selector_icon_html" per_page="$per_page" main_special="$main_special" no_special="$no_special" selector="$selector" grid="$grid"/>
+				<inp2:m_else/>
+					<inp2:PrintList block="js_row" selector_render_as="grid_selector_html" per_page="$per_page" main_special="$main_special" no_special="$no_special" selector="$selector" grid="$grid"/>
+				</inp2:m_if>
+			]
+		)
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].IDs = [
+			<inp2:m_DefineElement name="js_id">
+				'<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>'<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
+			</inp2:m_DefineElement>
+			<inp2:PrintList block="js_id" per_page="$per_page" main_special="$main_special" no_special="$no_special" />
+		]
+
+		/*GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].SetFooter(
+			['-', '-', '125', '-']
+		)*/
+
+		<inp2:m_if check="m_Param" name="totals_render_as">
+			<inp2:m_RenderElement name="$totals_render_as" pass_params="1"/>
+		</inp2:m_if>
+
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].Render('grid_<inp2:m_Param name="PrefixSpecial" />_container');
+
+		<inp2:m_ifnot check="m_Param" name="ajax">
+			<inp2:m_RenderElement name="grid_search_buttons" pass_params="1"/>
+		</inp2:m_ifnot>
+
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].SaveURL = '<inp2:m_t pass="m,$PrefixSpecial" {$PrefixSpecial}_event="OnSaveWidths" widths="#WIDTHS#" no_amp="1" grid_name="$grid"/>';
+
 		<inp2:m_if check="m_Param" name="selector">
+			// 2. scan grid (only when using selector)
 			Grids['<inp2:m_param name="PrefixSpecial"/>'] = new Grid('<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="selected_class"/>', ':original', edit, a_toolbar);
+
+			Grids['<inp2:m_param name="PrefixSpecial"/>'].MouseOverClass = '<inp2:m_param name="mouseover_class"/>';
+			Grids['<inp2:m_param name="PrefixSpecial"/>'].StickySelection = true;
 			Grids['<inp2:m_param name="PrefixSpecial"/>'].AddItemsByIdMask('<inp2:m_param name="tag_name"/>', /^<inp2:m_param name="PrefixSpecial"/>_([\d\w-]+)/, '<inp2:m_param name="PrefixSpecial"/>[$$ID$$][<inp2:m_param name="IdField"/>]');
 	  		Grids['<inp2:m_param name="PrefixSpecial"/>'].InitItems();
 
@@ -501,35 +767,72 @@
 	  		</inp2:m_if>
   		</inp2:m_if>
 
-  		<inp2:m_if check="m_Param" name="view_menu">
-	  		<inp2:m_RenderElement name="nlsmenu_declaration" pass_params="true"/>
-	  		$ViewMenus = new Array('<inp2:m_param name="PrefixSpecial"/>');
-  		</inp2:m_if>
+  		<inp2:m_RenderElement name="nlsmenu_declaration" pass_params="true"/>
+
+  		$ViewMenus = new Array('<inp2:m_param name="PrefixSpecial"/>');
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="white_grid" main_prefix="" per_page="" main_special="" no_toolbar="" search="on" render_as="" columns="2" direction="V" empty_cell_render_as="wg_empty_cell" ajax="0">
-	<inp2:{$PrefixSpecial}_SaveWarning name="grid_save_warning" main_prefix="$main_prefix" no_toolbar="$no_toolbar"/>
+<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">
+<!--##
+	DEPRICATED. LEFT FOR EDUCATION PURPOSES.
+
+	grid_filters - show individual filters for each column
+	has_filters  - draw filter section in "View" menu in toolbar
+##-->
+
+	<inp2:InitList pass_params="1"/> <!--## this is to avoid recalling prefix as an item in first iterate grid, by col-picker for instance ##-->
+
+	<inp2:GridSelector grid="$grid" default="$selector" result_to_var="selector"/>
+
+	<inp2:{$PrefixSpecial}_SaveWarning name="grid_save_warning" main_prefix="$main_prefix"/>
 	<inp2:m_if check="m_RecallEquals" var="{$PrefixSpecial}_search_keyword" value="" inverse="inverse">
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="table_border_<inp2:m_if check="m_ParamEquals" name="no_toolbar" value="no_toolbar" >nobottom<inp2:m_else/>notop</inp2:m_if>">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table" >
   		<tr>
     		<td valign="top" class="hint_red">
     			<inp2:m_phrase name="la_Warning_Filter"/>
     		</td>
   		</tr>
 	</table>
 	</inp2:m_if>
+
 	<inp2:m_if check="m_ParamEquals" name="per_page" value="-1" inverse="1">
-		<inp2:m_RenderElement name="grid_pagination" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" search="$search" no_toolbar="$no_toolbar" ajax="$ajax"/>
+		<inp2:m_RenderElement name="grid_pagination" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" search="$search" ajax="$ajax"/>
 	</inp2:m_if>
-	<br />
+	<table width="100%" cellspacing="0" cellpadding="4" class="bordered">
 
-	<inp2:m_DefineElement name="wg_empty_cell">
-		<td width="<inp2:m_param name="column_width"/>%">&nbsp;</td>
-	</inp2:m_DefineElement>
+		<inp2:m_if check="m_ParamEquals" name="grid_filters" value="1">
+			<tr class="pagination_bar">
+				<inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="filter" block="$filter_block" ajax="$ajax"/>
+			</tr>
+		</inp2:m_if>
 
-	<table width="100%" border="0" cellspacing="2" cellpadding="4">
+		<tr class="grid-header-row grid-header-row-1">
+			<inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="header" block="$header_block" ajax="$ajax"/>
+		</tr>
+
+		<inp2:m_DefineElement name="_row" td_style="">
+			<tr class="<inp2:m_odd_even odd="grid-data-row grid-data-row-even" even="grid-data-row"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" sequence="<inp2:m_get param="{$PrefixSpecial}_sequence"/>"><inp2:m_inc param="{$PrefixSpecial}_sequence" by="1"/>
+				<inp2:IterateGridFields grid="$grid" mode="data" block="$data_block"/>
+			</tr>
+		</inp2:m_DefineElement>
 		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
-		<inp2:{$PrefixSpecial}_PrintList2 pass_params="true"/>
+		<inp2:{$PrefixSpecial}_PrintList block="$row_block" per_page="$per_page" main_special="$main_special" />
+
+		<inp2:m_DefineElement name="grid_total_td">
+			<inp2:m_if check="m_Param" name="total">
+				<td style="<inp2:m_param name="td_style"/>">
+					<inp2:FieldTotal name="$field" function="$total"/>
+				</td>
+			<inp2:m_else/>
+				<td style="<inp2:m_param name="td_style"/>">&nbsp;</td>
+			</inp2:m_if>
+		</inp2:m_DefineElement>
+
+		<inp2:m_if check="m_ParamEquals" name="totals" value="1">
+			<tr class="totals-row"/>
+				<inp2:IterateGridFields grid="$grid" mode="data" block="$totals_block"/>
+			</tr>
+		</inp2:m_if>
 	</table>
 
 	<inp2:m_if check="m_ParamEquals" name="ajax" value="0">
@@ -550,10 +853,32 @@
 		</inp2:m_if>
 
 		<script type="text/javascript">
-			<inp2:m_RenderElement name="grid_js" selected_class="table_white_selected" tag_name="td" pass_params="true"/>
+			<inp2:m_RenderElement name="old_grid_js" mouseover_class="grid-data-row-mouseover" selected_class="grid-data-row-selected:grid-data-row-even-selected" tag_name="tr" pass_params="true"/>
 		</script>
 	</inp2:m_if>
 
 	<input type="hidden" id="<inp2:m_param name="PrefixSpecial"/>_Sort1" name="<inp2:m_param name="PrefixSpecial"/>_Sort1" value="">
 	<input type="hidden" id="<inp2:m_param name="PrefixSpecial"/>_Sort1_Dir" name="<inp2:m_param name="PrefixSpecial"/>_Sort1_Dir" value="asc">
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="old_grid_js" selector="checkbox" ajax="1">
+	<!--## DEPRICATED. LEFT FOR EDUCATION PURPOSES. ##-->
+	<inp2:GridSelector grid="$grid" default="$selector" result_to_var="selector"/>
+
+	<inp2:m_if check="m_Param" name="selector">
+		Grids['<inp2:m_param name="PrefixSpecial"/>'] = new Grid('<inp2:m_param name="PrefixSpecial"/>', 'grid-data-row-selected:grid-data-row-even-selected', ':original', edit, a_toolbar);
+
+		Grids['<inp2:m_param name="PrefixSpecial"/>'].MouseOverClass = 'grid-data-row-mouseover';
+		Grids['<inp2:m_param name="PrefixSpecial"/>'].StickySelection = true;
+		Grids['<inp2:m_param name="PrefixSpecial"/>'].AddItemsByIdMask('<inp2:m_param name="tag_name"/>', /^<inp2:m_param name="PrefixSpecial"/>_([\d\w-]+)/, '<inp2:m_param name="PrefixSpecial"/>[$$ID$$][<inp2:m_param name="IdField"/>]');
+  		Grids['<inp2:m_param name="PrefixSpecial"/>'].InitItems();
+
+  		<inp2:m_if check="m_Param" name="selector" equals_to="radio">
+	  		Grids['<inp2:m_param name="PrefixSpecial"/>'].EnableRadioMode();
+		</inp2:m_if>
+	</inp2:m_if>
+
+	<inp2:m_RenderElement name="nlsmenu_declaration" pass_params="true"/>
+
+	$ViewMenus = new Array('<inp2:m_param name="PrefixSpecial"/>');
 </inp2:m_DefineElement>
\ No newline at end of file
Index: branches/RC/core/admin_templates/logs/search_logs/search_log_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/logs/search_logs/search_log_list.tpl	(.../search_log_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/logs/search_logs/search_log_list.tpl	(.../search_log_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header" />
 <inp2:m_RenderElement name="combined_header" section="in-portal:searchlog" prefix="search-log" title_preset="search_log_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/tools/sql_query.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/tools/sql_query.tpl	(.../sql_query.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/tools/sql_query.tpl	(.../sql_query.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="sql_query"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/emails/mass_mail.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/emails/mass_mail.tpl	(.../mass_mail.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/emails/mass_mail.tpl	(.../mass_mail.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="emailevents" title_preset="email_send_form"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/categories/relations_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/categories/relations_edit.tpl	(.../relations_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/categories/relations_edit.tpl	(.../relations_edit.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" perm_section="CATEGORY" permission_type="VIEW" system_permission="0" title_preset="relations_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/agents/agent_edit.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/agents/agent_edit.tpl	(.../agent_edit.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/agents/agent_edit.tpl	(.../agent_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:agents" prefix="agent" title_preset="agent_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/skins/skin_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/skins/skin_list.tpl	(.../skin_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/skins/skin_list.tpl	(.../skin_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:skins" prefix="skin" title_preset="skin_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/forms/form_field_edit.tpl
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 11610)
+++ branches/RC/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header" />
 <inp2:m_RenderElement name="combined_header" section="in-portal:forms" prefix="form" title_preset="form_field_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/incs/tab_blocks.tpl
===================================================================
diff -u -r8929 -r11623
--- branches/RC/core/admin_templates/incs/tab_blocks.tpl	(.../tab_blocks.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/incs/tab_blocks.tpl	(.../tab_blocks.tpl)	(revision 11623)
@@ -1,58 +1,38 @@
-<inp2:m_DefineElement name="init_tab">
-	<inp2:m_if check="m_is_active" templ="$t$" >
-		<inp2:m_set main_prefix="$main_prefix"/>
+<inp2:m_DefineElement name="tab">
+	<td class="tab-spacer"><img src="img/spacer.gif" width="3" height="1"/></td>
+	<inp2:m_if check="m_is_active" templ="$t$">
+		<td class="tab tab-active">
+			<a href="javascript:go_to_tab('<inp2:m_param name="main_prefix"/>', '<inp2:m_param name="t"/>')" class="tab-link <inp2:m_get param='class'/>"><inp2:m_phrase name="$title"/></a><br>
+		</td>
+	<inp2:m_else/>
+		<td class="tab">
+			<a href="javascript:go_to_tab('<inp2:m_param name="main_prefix"/>', '<inp2:m_param name="t"/>')" class="tab-link <inp2:m_get param='class'/>"><inp2:m_phrase name="$title"/></a><br>
+		</td>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="prepare_tab">
+<inp2:m_DefineElement name="tab_direct" pass="m">
+	<td class="tab-spacer"><img src="img/spacer.gif" width="3" height="1"/></td>
 	<inp2:m_if check="m_is_active" templ="$t$" >
-		<inp2:m_set active="active_" bgcolor="#FFA916" class="tab"/>
+		<td class="tab tab-active">
+			<a href="<inp2:m_t t='$t' pass='$pass'/>" class="tab-link <inp2:m_get param='class'/>"><inp2:m_phrase name="$title"/></a><br>
+		</td>
 	<inp2:m_else/>
-		<inp2:m_set active="" bgcolor="#009FF0" class="tab2"/>
+		<td class="tab">
+			<a href="<inp2:m_t t='$t' pass='$pass'/>" class="tab-link <inp2:m_get param='class'/>"><inp2:m_phrase name="$title"/></a><br>
+		</td>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="tab">
-	<inp2:m_RenderElement name="prepare_tab" t="$t"/>
-	<td>
-		<table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param" name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
-			<tr>
-        		<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
-        		<td nowrap align="center" style="border-top: 1px solid #000000;">
-        			<a href="javascript:go_to_tab('<inp2:m_param name="main_prefix"/>', '<inp2:m_param name="t"/>')" class="<inp2:m_get param="class"/>" onClick=""><inp2:m_phrase name="$title"/></a><br>
-        		</td>
-        		<td><img alt="" src="img/tab_<inp2:m_get param="active"/>right.gif" width="15" height="23"></td>
-			</tr>
-		</table>
-	</td>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="tab_direct" pass="m">
-	<inp2:m_RenderElement name="prepare_tab" t="$t"/>
-	<td>
-		<table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param" name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
-			<tr>
-        		<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
-        		<td nowrap align="center" style="border-top: 1px solid #000000;">
-        			<a href="<inp2:m_t t="$t" pass="$pass"/>" class="<inp2:m_get param="class"/>" onClick=""><inp2:m_phrase name="$title"/></a><br>
-        		</td>
-        		<td><img alt="" src="img/tab_<inp2:m_get param="active"/>right.gif" width="15" height="23"></td>
-			</tr>
-		</table>
-	</td>
-</inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="tab_list">
-			<inp2:m_RenderElement name="prepare_tab" t="$t"/>
-			<td>
-				<table style="background: <inp2:m_get param="bgcolor"/> <inp2:m_if check="m_Param" name="active">url(img/tab_active_back3.jpg) no-repeat top left;</inp2:m_if>" cellpadding="0" cellspacing="0" border="0">
-				<tr>
-        	<td><img alt="" src="img/tab_<inp2:m_get param="active"/>left.gif" width="15" height="23"></td>
-        	<td nowrap align="center" <inp2:m_if check="m_getequals" name="active" value="active_">style="border-top: black 1px solid;"</inp2:m_if> background="img/tab_<inp2:m_get param="active"/>back.gif">
-        		<a href="javascript:go_to_list('<inp2:m_get param="main_prefix"/>', '<inp2:m_param name="t"/>')" class="<inp2:m_get param="class"/>" onClick=""><inp2:m_phrase name="$title"/></a><br>
-        	</td>
-        	<td><img alt="" src="img/tab_<inp2:m_get param="active"/>right.gif" width="15" height="23"></td>
-				</tr>
-				</table>
-			</td>
+	<td class="tab-spacer"><img src="img/spacer.gif" width="3" height="1"/></td>
+	<inp2:m_if check="m_is_active" templ="$t$">
+		<td class="tab tab-active">
+			<a href="javascript:go_to_list('<inp2:m_param name="main_prefix"/>', '<inp2:m_param name="t"/>')" class="tab-link <inp2:m_get param='class'/>"><inp2:m_phrase name="$title"/></a><br>
+		</td>
+	<inp2:m_else/>
+		<td class="tab">
+			<a href="javascript:go_to_list('<inp2:m_param name="main_prefix"/>', '<inp2:m_param name="t"/>')" class="tab-link <inp2:m_get param='class'/>"><inp2:m_phrase name="$title"/></a><br>
+		</td>
+	</inp2:m_if>
 </inp2:m_DefineElement>
\ No newline at end of file
Index: branches/RC/core/units/visits/visits_config.php
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 11612)
+++ branches/RC/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 11623)
@@ -130,7 +130,7 @@
 																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
 																	'Fields' => Array(
 																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter'),
-																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress', 'filter_block' => 'grid_like_filter' ),
+																			'IPAddress'		=>	Array( 'title'=>'la_col_IP', 'filter_block' => 'grid_like_filter' ),
 																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ),
 																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
 																		),
@@ -139,7 +139,7 @@
 																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
 																	'Fields' => Array(
 																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter' ),
-																			'IPAddress'		=>	Array( 'title'=>'la_col_IPAddress', 'filter_block' => 'grid_like_filter' ),
+																			'IPAddress'		=>	Array( 'title'=>'la_col_IP', 'filter_block' => 'grid_like_filter' ),
 																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ),
 																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
 																			'AffiliateUser'	=>	Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter'),
Index: branches/RC/core/admin_templates/catalog_tab.tpl
===================================================================
diff -u -r11576 -r11623
--- branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11576)
+++ branches/RC/core/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 11623)
@@ -57,7 +57,7 @@
 					<span class="field-required">&nbsp;*</span>
 				</inp2:m_if>
 				<br />
-		    	<span class="cats_stats">
+		    	<span class="small-statistics">
 		    		<inp2:Field name="ParentId" result_to_var="item_category" db="db"/>
 		    		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template="catalog/catalog" m_cat_id="$item_category" no_pass_through="1"/>"><inp2:CategoryName cat_id="$item_category"/></a><br />
 		    	</span>
@@ -68,7 +68,7 @@
 				</inp2:m_if>
 			</inp2:m_if>
 
-			<!--<span class="cats_stats">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span>-->
+			<!--<span class="small-statistics">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span>-->
 
 			<a href="<inp2:PageBrowseLink/>" title="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>">
 				<img src="<inp2:m_TemplatesBase/>/img/arrow.gif" width="15" height="15" alt="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>" border="0"/>
Index: branches/RC/core/admin_templates/config/config_search_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/config/config_search_edit.tpl	(.../config_search_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="confs" section="$section" perm_event="confs:OnLoad" title_preset="configsearch_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/thesaurus/thesaurus_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/thesaurus/thesaurus_list.tpl	(.../thesaurus_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/thesaurus/thesaurus_list.tpl	(.../thesaurus_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:thesaurus" prefix="thesaurus" title_preset="thesaurus_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/ban_rules/ban_rule_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/ban_rules/ban_rule_edit.tpl	(.../ban_rule_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/ban_rules/ban_rule_edit.tpl	(.../ban_rule_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_banlist"  prefix="ban-rule" title_preset="ban_rule_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/popups/editor.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/popups/editor.tpl	(.../editor.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/popups/editor.tpl	(.../editor.tpl)	(revision 11623)
@@ -2,7 +2,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="trans" section="in-portal:root" title_preset="trans_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/reviews/reviews_tab.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/reviews/reviews_tab.tpl	(.../reviews_tab.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/reviews/reviews_tab.tpl	(.../reviews_tab.tpl)	(revision 11623)
@@ -14,7 +14,7 @@
 		<inp2:m_DefineElement name="grid_reviewtext_td">
 			<inp2:Field field="$field" cut_first="100"/>
 			<br />
-	    	<span class="cats_stats">
+	    	<span class="small-statistics">
 				<a href="<inp2:ItemEditLink/>" onclick="return direct_edit('<inp2:m_param name="prefix"/>', this.href);"><inp2:Field field="CatalogItemName"/></a>
 	    	</span>
 		</inp2:m_DefineElement>
Index: branches/RC/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="phrase_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
@@ -78,6 +78,8 @@
 		<inp2:m_else/>
 			<inp2:m_RenderElement name="phrase_element"/>
 		</inp2:m_if>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
 
Index: branches/RC/core/kernel/utility/temp_handler.php
===================================================================
diff -u -r10294 -r11623
--- branches/RC/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 10294)
+++ branches/RC/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 11623)
@@ -768,46 +768,68 @@
 		}
 	}
 
-	function CheckSimultaniousEdit()
+	/**
+	 * Checks, that someone is editing selected records and returns true, when no one.
+	 *
+	 * @param Array $ids
+	 *
+	 * @return bool
+	 */
+	function CheckSimultaniousEdit($ids = null)
 	{
 		$tables = $this->Conn->GetCol('SHOW TABLES');
-		$mask_edit_table = '/'.TABLE_PREFIX.'ses_(.*)_edit_'.$this->MasterTable.'$/';
+		$mask_edit_table = '/' . TABLE_PREFIX . 'ses_(.*)_edit_' . $this->MasterTable . '$/';
 
-		$sql='SELECT COUNT(*) FROM '.$this->TableName.' WHERE '.$this->IDField.' = \'%s\'';
 		$my_sid = $this->Application->GetSID();
-		$ids = join(',',$this->Tables['IDs']);
-		$sids = array();
-		if (!$ids) return ;
-		foreach($tables as $table)
-		{
-			if( preg_match($mask_edit_table,$table,$rets) )
-			{
+		$ids = implode(',', isset($ids) ? $ids : $this->Tables['IDs']);
+		$sids = Array ();
+		if (!$ids) {
+			return true;
+		}
+
+		foreach ($tables as $table) {
+			if ( preg_match($mask_edit_table, $table, $rets) ) {
 				$sid = preg_replace('/(.*)_(.*)/', '\\1', $rets[1]); // remove popup's wid from sid
-				if ($sid == $my_sid) continue;
-				$found = $this->Conn->GetOne("SELECT COUNT({$this->Tables['IdField']}) FROM $table WHERE {$this->Tables['IdField']} IN ($ids)");
-				if (!$found || in_array($sid, $sids)) continue;
+				if ($sid == $my_sid) {
+					continue;
+				}
 
+				$sql = 'SELECT COUNT(' . $this->Tables['IdField'] . ')
+						FROM ' . $table . '
+						WHERE ' . $this->Tables['IdField'] . ' IN (' . $ids . ')';
+				$found = $this->Conn->GetOne($sql);
+
+				if (!$found || in_array($sid, $sids)) {
+					continue;
+				}
+
 				$sids[] = $sid;
 			}
 		}
+
 		if ($sids) {
-			//detect who is it
-			$users = $this->Conn->GetCol(
-				'	SELECT
+			// detect who is it
+			$sql = 'SELECT
 						CONCAT(IF (s.PortalUserId = -1, \'root\',
 							IF (s.PortalUserId = -2, \'Guest\',
 								CONCAT(FirstName, \' \', LastName, \' (\', Login, \')\')
 							)
-						), \' IP: \', s.IpAddress, \'\') FROM '.TABLE_PREFIX.'UserSession AS s
-					LEFT JOIN '.TABLE_PREFIX.'PortalUser AS u
+						), \' IP: \', s.IpAddress, \'\') FROM ' . TABLE_PREFIX . 'UserSession AS s
+					LEFT JOIN ' . TABLE_PREFIX . 'PortalUser AS u
 					ON u.PortalUserId = s.PortalUserId
-					WHERE s.SessionKey IN ('.join(',',$sids).')');
+					WHERE s.SessionKey IN (' . implode(',', $sids) . ')';
+			$users = $this->Conn->GetCol($sql);
+
 			if ($users) {
 				$this->Application->SetVar('_simultanious_edit_message',
 					sprintf($this->Application->Phrase('la_record_being_edited_by'), join(",\n", $users))
 				);
+
+				return false;
 			}
 		}
+
+		return true;
 	}
 }
 
Index: branches/RC/core/admin_templates/categories/related_searches_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/categories/related_searches_edit.tpl	(.../related_searches_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/categories/related_searches_edit.tpl	(.../related_searches_edit.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" perm_section="CATEGORY" permission_type="VIEW" system_permission="0" title_preset="related_searches_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/incs/header.tpl
===================================================================
diff -u -r11303 -r11623
--- branches/RC/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 11303)
+++ branches/RC/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 11623)
@@ -1,41 +1,53 @@
-<inp2:m_DefaultParam body_properties=""/>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <inp2:m_CheckSSL mode="required" condition="Require_AdminSSL" />
 <inp2:m_CheckSSL/>
+<inp2:m_DefaultParam body_properties=""/>
 <html>
 <head>
 <title><inp2:m_GetConfig var="Site_Name"/> - <inp2:m_Phrase label="la_AdministrativeConsole"/></title>
 
-<meta http-equiv="content-type" content="text/html; charset=<inp2:lang_GetCharset/>">
-<meta name="keywords" content="...">
-<meta name="description" content="...">
-<meta name="robots" content="all">
-<meta name="copyright" content="Copyright &#174; 2006 Test, Inc">
-<meta name="author" content="Intechnic Inc.">
+<meta http-equiv="content-type" content="text/html; charset=<inp2:lang_GetCharset/>"/>
+<meta name="keywords" content="..."/>
+<meta name="description" content="..."/>
+<meta name="robots" content="all"/>
+<meta name="copyright" content="Copyright &#174; 2006 Test, Inc"/>
+<meta name="author" content="Intechnic Inc."/>
 
 <inp2:m_base_ref/>
 
 <link rel="icon" href="img/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
-<link rel="stylesheet" rev="stylesheet" href="incs/style.css" type="text/css" />
 
-<style type="text/css">
-	table.edit-form > tbody > tr > td {
-		padding: 4px;
-	}
-</style>
+<inp2:adm_AdminSkin/>
 
+<link rel="stylesheet" href="js/jquery/thickbox/thickbox.css" type="text/css" media="screen" />
+
+<script type="text/javascript" src="js/jquery/jquery.pack.js"></script>
+<script type="text/javascript" src="js/jquery/jquery-ui.custom.min.js"></script>
+
 <script type="text/javascript" src="js/is.js"></script>
 <script type="text/javascript" src="js/ajax.js"></script>
-<script language="javascript" src="js/application.js"></script>
+<script type="text/javascript" src="js/application.js"></script>
 <script type="text/javascript" src="js/script.js"></script>
 <script type="text/javascript" src="js/in-portal.js"></script>
 <script type="text/javascript" src="js/toolbar.js"></script>
 <script type="text/javascript" src="js/grid.js"></script>
+<script type="text/javascript" src="js/simple_grid.js"></script>
+<script type="text/javascript" src="js/grid_scroller.js"></script>
 <script type="text/javascript" src="js/forms.js"></script>
+<script type="text/javascript" src="js/drag.js"></script>
+<script type="text/javascript" src="js/ajax_dropdown.js"></script>
 <script type="text/javascript" src="js/form_controls.js"></script>
-<script type="text/javascript" src="js/calendar.js"></script>
-<script language="javascript">
+
+<script type="text/javascript" src="js/jquery/thickbox/thickbox.js"></script>
+<script type="text/javascript" src="js/tab_scroller.js"></script>
+
+<link rel="stylesheet" rev="stylesheet" href="js/calendar/calendar-blue.css" type="text/css" />
+<script type="text/javascript" src="js/calendar/calendar.js"></script>
+<script type="text/javascript" src="js/calendar/calendar-setup.js"></script>
+<script type="text/javascript" src="js/calendar/calendar-en.js"></script>
+<script type="text/javascript">
+TB.pathToImage = 'js/jquery/thickbox/loadingAnimation.gif';
 var t = '<inp2:m_get param="t"/>';
 var popups = '1';
 var multiple_windows = '1';
@@ -53,19 +65,39 @@
 NumberFormatter.DecimalSep = '<inp2:lang.current_Field name="DecimalPoint" js_escape="1"/>';
 
 <inp2:m_if check="m_GetEquals" name="m_wid" value="" inverse="inverse">
-	window.name += '_<inp2:m_get name="m_wid"/>';
+	if (!window.name.match(/_<inp2:m_get name="m_wid"/>$/)) {
+		window.name += '_<inp2:m_get name="m_wid"/>'; // change window name only once per window
+		getFrame('main').TB.setWindowMetaData('window_name', window.name); // used to simulate window.opener functionality
+	}
 </inp2:m_if>
 
 var $use_popups = <inp2:m_if check="adm_UsePopups">true<inp2:m_else/>false</inp2:m_if>;
 var $use_toolbarlabels = <inp2:m_if check="adm_UseToolbarLabels">true<inp2:m_else/>false</inp2:m_if>;
 </script>
+
+<inp2:m_if check="m_get" var="m_wid">
+<style type="text/css">
+	.tableborder {
+		border: none;
+	}
+	.toolbar {
+		border-right: none;
+		border-left: none;
+	}
+	.tableborder_full {
+		border-right: none;
+		border-left: none;
+	}
+</style>
+</inp2:m_if>
+
 </head>
 
 <inp2:m_include t="incs/blocks"/>
 <inp2:m_include t="incs/in-portal"/>
 
 <inp2:m_if check="m_ParamEquals" name="nobody" value="yes" inverse="inverse">
-	<body <inp2:m_param name="body_properties"/>>
+	<body class="<inp2:m_if check="m_get" var="m_wid">edit-popup<inp2:m_else/>regular-body</inp2:m_if>" <inp2:m_param name="body_properties"/>>
 </inp2:m_if>
 
 <inp2:m_if check="m_ParamEquals" name="noform" value="yes" inverse="inverse">
Index: branches/RC/core/admin_templates/forms/forms_list.tpl
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/admin_templates/forms/forms_list.tpl	(.../forms_list.tpl)	(revision 11610)
+++ branches/RC/core/admin_templates/forms/forms_list.tpl	(.../forms_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:forms" pagination="1" prefix="form"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="export_language"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/stylesheets/stylesheets_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/stylesheets/stylesheets_edit.tpl	(.../stylesheets_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:configure_styles" prefix="css" title_preset="stylesheets_edit" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/users/user_selector.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/user_selector.tpl	(.../user_selector.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/user_selector.tpl	(.../user_selector.tpl)	(revision 11623)
@@ -2,7 +2,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="u.group" section="in-portal:user_list" grid="UserSelector" title_preset="group_user_select" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/config/config_email.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="emailevents.module" section="$section" perm_event="emailevents:OnLoad" grid="EmailSettings" title_preset="email_settings_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/themes/themes_edit_files.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/themes/themes_edit_files.tpl	(.../themes_edit_files.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/themes/themes_edit_files.tpl	(.../themes_edit_files.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:configure_themes" prefix="theme" title_preset="themes_edit_files" tab_preset="Default" pagination="1" pagination_prefix="theme-file"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/admin/admin_config.php
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 11538)
+++ branches/RC/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 11623)
@@ -42,9 +42,10 @@
 				'parent'		=>	null,
 				'icon'			=>	'site',
 				'label'			=>	$this->Application->ConfigValue('Site_Name'),
-				'url'			=>	Array ('t' => 'sections_list', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1),
+				'url'			=>	Array ('t' => 'index', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1),
 				'permissions'	=>	Array ('advanced:admin_login', 'advanced:front_login'),
 				'priority'		=>	0,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'icon_module' => 'in-portal',
 			),
Index: branches/RC/core/admin_templates/index.tpl
===================================================================
diff -u -r9643 -r11623
--- branches/RC/core/admin_templates/index.tpl	(.../index.tpl)	(revision 9643)
+++ branches/RC/core/admin_templates/index.tpl	(.../index.tpl)	(revision 11623)
@@ -17,28 +17,48 @@
 		<script type="text/javascript">
 			window.name = 'main_frame';
 
-			var $top_height = 94;
+			var $top_height = 117; // 94;
 			if (navigator.appName == 'Netscape') {
-				$top_height = navigator.appVersion.substring(0, 1) != '5' ? 96 : 95;
+				$top_height = navigator.appVersion.substring(0, 1) != '5' ? $top_height + 2 : $top_height + 1;
 			}
 
-			<inp2:m_if check="m_RecallEquals" name="ShowAdminMenu" value="0" persistent="1">
-				document.write('<frameset id="top_frameset" rows="' + $top_height + ',*" framespacing="0" scrolling="no" frameborder="0">');
+			<inp2:m_if check="m_GetConfig" name="ResizableFrames">
+				<inp2:m_if check="m_RecallEquals" name="ShowAdminMenu" value="0" persistent="1">
+					document.write('<frameset id="top_frameset" rows="' + $top_height + ',*" framespacing="0" scrolling="no" border="1">');
+				<inp2:m_else/>
+					document.write('<frameset id="top_frameset" rows="25,*" framespacing="0" scrolling="no" border="1">');
+				</inp2:m_if>
 			<inp2:m_else/>
-				document.write('<frameset id="top_frameset" rows="25,*" framespacing="0" scrolling="no" frameborder="0">');
+				<inp2:m_if check="m_RecallEquals" name="ShowAdminMenu" value="0" persistent="1">
+					document.write('<frameset id="top_frameset" rows="' + $top_height + ',*" framespacing="0" scrolling="no" frameborder="0">');
+				<inp2:m_else/>
+					document.write('<frameset id="top_frameset" rows="25,*" framespacing="0" scrolling="no" frameborder="0">');
+				</inp2:m_if>
 			</inp2:m_if>
 		</script>
 	</head>
 
-	<frame src="<inp2:m_t t="head" pass="m" m_cat_id="0" m_opener="s" no_pass_through="1"/>" name="head" scrolling="no" noresize="noresize">
-		<frameset id="sub_frameset" cols="<inp2:m_if check="m_RecallEquals" name="ShowAdminMenu" value="0" persistent="1"><inp2:adm_MenuFrameWidth/><inp2:m_else/>0</inp2:m_if>,*" border="0">
-			<frame src="<inp2:m_t t="tree" pass="m" m_cat_id="0" m_opener="s" no_pass_through="1"/>" name="menu" target="main" noresize scrolling="auto" marginwidth="0" marginheight="0">
-			<inp2:m_DefineElement name="root_node">
-				<frame src="<inp2:m_if check="adm_MainFrameLink"><inp2:adm_MainFrameLink/><inp2:m_else/><inp2:m_param name="section_url"/></inp2:m_if>" name="main" marginwidth="0" marginheight="0" frameborder="no" noresize scrolling="auto">
-			</inp2:m_DefineElement>
-			<inp2:adm_PrintSection render_as="root_node" section_name="in-portal:root"/>
+	<inp2:m_if check="m_GetConfig" name="ResizableFrames">
+		<frame src="<inp2:m_t t='head' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" name="head" id="head_frame" scrolling="no" noresize frameborder="0" border="0">
+		 	<frameset id="sub_frameset" cols="<inp2:m_if check='m_RecallEquals' name='ShowAdminMenu' value='0' persistent='1'><inp2:adm_MenuFrameWidth/><inp2:m_else/>0</inp2:m_if>,*" border="1">
+				<frame src="<inp2:m_t t='tree' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" name="menu" target="main" scrolling="auto" marginwidth="0" marginheight="0" border="1" frameborder="1">
+				<inp2:m_DefineElement name="root_node">
+					<frame src="<inp2:m_if check='adm_MainFrameLink'><inp2:adm_MainFrameLink/><inp2:m_else/><inp2:m_param name='section_url'/></inp2:m_if>" name="main" marginwidth="0" marginheight="0" scrolling="auto" border="1" frameborder="1">
+				</inp2:m_DefineElement>
+				<inp2:adm_PrintSection render_as="root_node" section_name="in-portal:root" use_first_child="1"/>
+			</frameset>
 		</frameset>
-	</frameset>
+	<inp2:m_else/>
+		<frame src="<inp2:m_t t='head' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" name="head" scrolling="no" noresize="noresize">
+		 	<frameset id="sub_frameset" cols="<inp2:m_if check='m_RecallEquals' name='ShowAdminMenu' value='0' persistent='1'><inp2:adm_MenuFrameWidth/><inp2:m_else/>0</inp2:m_if>,*" border="0">
+				<frame src="<inp2:m_t t='tree' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" name="menu" target="main" noresize scrolling="auto" marginwidth="0" marginheight="0">
+				<inp2:m_DefineElement name="root_node">
+					<frame src="<inp2:m_if check='adm_MainFrameLink'><inp2:adm_MainFrameLink/><inp2:m_else/><inp2:m_param name='section_url'/></inp2:m_if>" name="main" marginwidth="0" marginheight="0" frameborder="no" noresize scrolling="auto">
+				</inp2:m_DefineElement>
+				<inp2:adm_PrintSection render_as="root_node" section_name="in-portal:root" use_first_child="1"/>
+			</frameset>
+		</frameset>
+	</inp2:m_if>
 	<noframes>
 		<body bgcolor="#FFFFFF">
 			<p></p>
Index: branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl	(.../email_log_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl	(.../email_log_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <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"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/modules/modules_event_handler.php
===================================================================
diff -u -r10846 -r11623
--- branches/RC/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 10846)
+++ branches/RC/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 11623)
@@ -25,9 +25,8 @@
 			if ($event->Special) {
 				$object->addFilter('current_module', 'Name = '.$event->Special);
 			}
-			if (!$this->Application->isModuleEnabled('Proj-Base')) {
-				$object->addFilter('not_core', 'Name != '.$this->Conn->qstr('Core'));
-			}
+
+			$object->addFilter('not_core', '%1$s.Name <> "Core"');
 		}
 
 		function mapEvents()
@@ -58,25 +57,10 @@
 
 			$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );
 
-			if ($event->Name == 'OnMassDecline') {
-				$interface_modules = Array ('In-Portal', 'Proj-Base');
-
-				foreach ($interface_modules as $module_index => $interface_module) {
-					if (!$this->Application->findModule('Name', $interface_module)) {
-						// remove already disabled interface modules
-						unset($interface_modules[$module_index]);
-					}
-				}
-			}
-
 			foreach ($ids as $id) {
-				if ($event->Name == 'OnMassDecline') {
-					if (in_array($id, $interface_modules) && count($interface_modules) == 1) {
-						// don't allow to disable both interface modules
-						continue;
-					}
-
-					unset($interface_modules[ array_search($id, $interface_modules) ]);
+				if (($event->Name == 'OnMassDecline') && ($id == 'In-Portal')) {
+					// don't allow to disable in-portal
+					continue;
 				}
 
 				if ($id == 'Core') {
Index: branches/RC/core/admin_templates/logs/session_logs/session_log_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/logs/session_logs/session_log_list.tpl	(.../session_log_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/logs/session_logs/session_log_list.tpl	(.../session_log_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header" />
 <inp2:m_RenderElement name="combined_header" section="in-portal:session_logs" prefix="session-log" title_preset="session_log_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
@@ -54,15 +54,8 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="affected_td">
-	<inp2:m_if check="m_ModuleEnabled" module="Proj-Base">
-		<inp2:Field name="SessionLogId" result_to_var="sessionlog_id"/>
-		<a href="<inp2:m_t t="logs/change_logs/change_log_list" pass="m,change-log" grid_name="Default" custom_filters[change-log][Default][SessionLogId][like]="$sessionlog_id" change-log_event="OnSearch"/>"><inp2:Field name="AffectedItems"/></a>
-	<inp2:_else/>
-		<td valign="top" class="text" style="<inp2:m_param name="td_style"/>">
-			<inp2:Field name="SessionLogId" result_to_var="sessionlog_id"/>
-			<a href="<inp2:m_t t="logs/change_logs/change_log_list" pass="m,change-log" grid_name="Default" custom_filters[change-log][Default][SessionLogId][like]="$sessionlog_id" change-log_event="OnSearch"/>"><inp2:Field name="AffectedItems"/></a>
-		</td>
-	</inp2:m_if>
+	<inp2:Field name="SessionLogId" result_to_var="sessionlog_id"/>
+	<a href="<inp2:m_t t="logs/change_logs/change_log_list" pass="m,change-log" grid_name="Default" custom_filters[change-log][Default][SessionLogId][like]="$sessionlog_id" change-log_event="OnSearch"/>"><inp2:Field name="AffectedItems"/></a>
 </inp2:m_DefineElement>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="session-log" IdField="SessionLogId" grid="Default" grid_filters="1" limited_heights="1" row_class_render_as="row_class"/>
Index: branches/RC/core/admin_templates/groups/groups_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/groups/groups_edit.tpl	(.../groups_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/groups/groups_edit.tpl	(.../groups_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_groups" prefix="g" title_preset="groups_edit" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/install/install_data.sql
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 11610)
+++ branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 11623)
@@ -1,274 +1,221 @@
-INSERT INTO ConfigurationAdmin VALUES ('Site_Name', 'la_Text_Website', 'la_config_website_name', 'text', '', '', 10.02, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('SiteNameSubTitle', 'la_Text_Website', 'la_config_SiteNameSubTitle', 'text', '', '', 10.021, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('Site_Path', 'la_Text_Website', 'la_config_PathToWebsite', 'text', '', '', 10.01, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Backup_Path', 'la_Text_BackupPath', 'la_config_backup_path', 'text', '', '', 40.01, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Domain_Detect', 'la_Text_Website', 'la_config_detect_domain', 'text', '', '', 8, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Category_Sortfield', 'la_Text_General', 'la_category_sortfield_prompt', 'select', '', 'Name=la_Category_Name,Description=la_Category_Description,CreatedOn=la_Category_Date,EditorsPick=la_Category_Pick,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 1) AND (IsSystem = 0)</SQL>', 10.01, 1, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Category_Sortorder', 'la_Text_General', 'la_category_sortfield_prompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 10.01, 2, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Category_Sortfield2', 'la_Text_General', 'la_category_sortfield2_prompt', 'select', '', 'Name=la_Category_Name,Description=la_Category_Description,CreatedOn=la_Category_Date,EditorsPick=la_Category_Pick,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 1) AND (IsSystem = 0)</SQL>', 10.02, 1, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Category_Sortorder2', 'la_Text_General', 'la_category_sortfield2_prompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 10.02, 2, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Perpage_Category', 'la_Text_General', 'la_category_perpage_prompt', 'text', '', '', 10.03, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Category_DaysNew', 'la_Text_General', 'la_category_daysnew_prompt', 'text', '', '', 10.05, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Category_ShowPick', 'la_Text_General', 'la_category_showpick_prompt', 'checkbox', '', '', 10.06, 0, 1);
+# Section "in-portal:configure_categories":
+INSERT INTO ConfigurationAdmin VALUES ('Category_Sortfield', 'la_title_General', 'la_category_sortfield_prompt', 'select', '', 'Name=la_Category_Name,Description=la_Category_Description,CreatedOn=la_Category_Date,EditorsPick=la_Category_Pick,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 1) AND (IsSystem = 0)</SQL>', 10.01, 1, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_Sortfield', 'Name', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('Category_Sortorder', 'la_title_General', 'la_category_sortfield_prompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 10.01, 2, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_Sortorder', 'asc', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('Category_Sortfield2', 'la_title_General', 'la_category_sortfield2_prompt', 'select', '', 'Name=la_Category_Name,Description=la_Category_Description,CreatedOn=la_Category_Date,EditorsPick=la_Category_Pick,<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 1) AND (IsSystem = 0)</SQL>', 10.02, 1, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_Sortfield2', 'Description', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('Category_Sortorder2', 'la_title_General', 'la_category_sortfield2_prompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 10.02, 2, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_Sortorder2', 'asc', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('Perpage_Category', 'la_title_General', 'la_category_perpage_prompt', 'text', '', '', 10.03, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Category', '20', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('Perpage_Category_Short', 'la_title_General', 'la_category_perpage__short_prompt', 'text', '', '', 10.04, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Category_Short', '3', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('Category_DaysNew', 'la_title_General', 'la_category_daysnew_prompt', 'text', '', '', 10.05, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_DaysNew', '8', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('Category_ShowPick', 'la_title_General', 'la_category_showpick_prompt', 'checkbox', '', '', 10.06, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_ShowPick', '', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('Root_Name', 'la_title_General', 'la_prompt_root_name', 'text', '', '', 10.07, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Root_Name', 'lu_rootcategory_name', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('MaxImportCategoryLevels', 'la_title_General', 'la_prompt_max_import_category_levels', 'text', '', '', 10.08, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MaxImportCategoryLevels', '10', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('AllowDeleteRootCats', 'la_title_General', 'la_AllowDeleteRootCats', 'checkbox', NULL , NULL , 10.09, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowDeleteRootCats', '0', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('Catalog_PreselectModuleTab', 'la_title_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.10, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Catalog_PreselectModuleTab', 1, 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('RecycleBinFolder', 'la_title_General', 'la_config_RecycleBinFolder', 'text', NULL , NULL , 10.11, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RecycleBinFolder', '', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('QuickCategoryPermissionRebuild', 'la_title_General', 'la_config_QuickCategoryPermissionRebuild', 'checkbox', NULL , NULL , 10.12, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'QuickCategoryPermissionRebuild', '1', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('FilenameSpecialCharReplacement', 'la_title_General', 'la_config_FilenameSpecialCharReplacement', 'select', NULL, '_=+_,-=+-', 10.13, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'FilenameSpecialCharReplacement', '-', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('YahooApplicationId', 'la_title_General', 'la_config_YahooApplicationId', 'text', NULL, NULL, 10.14, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'YahooApplicationId', '', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('cms_DefaultDesign', 'la_title_General', 'la_prompt_DefaultDesignTemplate', 'text', NULL, NULL, 10.15, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'cms_DefaultDesign', '/platform/designs/general', 'In-Portal', 'in-portal:configure_categories');
+INSERT INTO ConfigurationAdmin VALUES ('Search_MinKeyword_Length', 'la_title_General', 'la_config_Search_MinKeyword_Length', 'text', NULL, NULL, 10.19, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Search_MinKeyword_Length', '3', 'In-Portal', 'in-portal:configure_categories');
 INSERT INTO ConfigurationAdmin VALUES ('Category_MetaKey', 'la_Text_MetaInfo', 'la_category_metakey', 'textarea', '', '', 20.01, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_MetaKey', '', 'In-Portal', 'in-portal:configure_categories');
 INSERT INTO ConfigurationAdmin VALUES ('Category_MetaDesc', 'la_Text_MetaInfo', 'la_category_metadesc', 'textarea', '', '', 20.02, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('User_NewGroup', 'la_Text_General', 'la_users_new_group', 'select', NULL, '0=lu_none,<SQL+>SELECT GroupId as OptionValue, Name as OptionName FROM <PREFIX>PortalGroup WHERE Enabled=1 AND Personal=0</SQL>', 10.08, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('User_GuestGroup', 'la_Text_General', 'la_users_guest_group', 'select', NULL, '0=lu_none,<SQL+>SELECT GroupId as OptionValue, Name as OptionName FROM <PREFIX>PortalGroup WHERE Enabled=1 AND Personal=0</SQL>', 10.1, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('RootPass', 'la_Text_General', 'la_prompt_root_pass', 'password', NULL, NULL, 10.12, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('AllowSelectGroupOnFront', 'la_Text_General', 'la_config_AllowSelectGroupOnFront', 'checkbox', NULL, NULL, 10.13, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('Users_AllowReset', 'la_Text_General', 'la_prompt_allow_reset', 'text', NULL, NULL, 10.05, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('User_Allow_New', 'la_Text_General', 'la_users_allow_new', 'radio', '', '1=la_User_Instant,2=la_User_Not_Allowed,3=la_User_Upon_Approval', 10.01, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('User_Password_Auto', 'la_Text_General', 'la_users_password_auto', 'checkbox', '', '', 10.06, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('User_Votes_Deny', 'la_Text_Restrictions', 'la_users_votes_deny', 'text', '', '', 20.01, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('User_MembershipExpirationReminder', 'la_Text_General', 'la_MembershipExpirationReminder', 'text', NULL, '', 10.07, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('User_Review_Deny', 'la_Text_Restrictions', 'la_users_review_deny', 'text', '', '', 20.02, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Server_Name', 'la_Text_Website', 'la_config_server_name', 'text', '', '', 4, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('Config_Server_Time', 'la_Text_Date_Time_Settings', 'la_config_time_server', 'select', '', '1=la_m12,2=la_m11,3=la_m10,5=la_m9,6=la_m8,7=la_m7,8=la_m6,9=la_m5,10=la_m4,11=la_m3,12=la_m2,13=la_m1,14=la_m0,15=la_p1,16=la_p2,17=la_p3,18=la_p4,19=la_p5,20=la_p6,21=la_p7,22=la_p8,23=la_p9,24=la_p10,25=la_p11,26=la_p12,27=la_p13', 20.01, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Config_Site_Time', 'la_Text_Date_Time_Settings', 'la_config_site_zone', 'select', '', '1=la_m12,2=la_m11,3=la_m10,5=la_m9,6=la_m8,7=la_m7,8=la_m6,9=la_m5,10=la_m4,11=la_m3,12=la_m2,13=la_m1,14=la_m0,15=la_p1,16=la_p2,17=la_p3,18=la_p4,19=la_p5,20=la_p6,21=la_p7,22=la_p8,23=la_p9,24=la_p10,25=la_p11,26=la_p12,27=la_p13', 20.02, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Smtp_Server', 'la_Text_smtp_server', 'la_prompt_mailserver', 'text', NULL, NULL, 30.01, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Smtp_Port', 'la_Text_smtp_server', 'la_prompt_mailport', 'text', NULL, NULL, 30.02, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Smtp_Authenticate', 'la_Text_smtp_server', 'la_prompt_mailauthenticate', 'checkbox', NULL, NULL, 30.03, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Smtp_User', 'la_Text_smtp_server', 'la_prompt_smtp_user', 'text', NULL, NULL, 30.04, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Smtp_Pass', 'la_Text_smtp_server', 'la_prompt_smtp_pass', 'text', NULL, NULL, 30.05, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Smtp_DefaultHeaders', 'la_Text_smtp_server', 'la_prompt_smtpheaders', 'textarea', NULL, 'COLS=40 ROWS=5', 30.06, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('Smtp_AdminMailFrom', 'la_Text_smtp_server', 'la_prompt_AdminMailFrom', 'text', NULL, NULL, 30.07, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Perpage_Category_Short', 'la_Text_General', 'la_category_perpage__short_prompt', 'text', '', '', 10.04, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('CookieSessions', 'la_Text_Website', 'la_prompt_session_management', 'select', NULL, '0=lu_query_string,1=lu_cookies,2=lu_auto', 10.03, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_MetaDesc', '', 'In-Portal', 'in-portal:configure_categories');
 
-INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Keyword_category', 'la_config_SearchRel_DefaultKeyword', 'la_text_keyword', 'text', NULL, NULL, 0, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Pop_category', 'la_config_DefaultPop', 'la_text_popularity', 'text', NULL, NULL, 0, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Rating_category', 'la_config_DefaultRating', 'la_prompt_Rating', 'text', NULL, NULL, 0, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Increase_category', 'la_config_DefaultIncreaseImportance', 'la_text_increase_importance', 'text', NULL, NULL, 0, 0, 1);
+# Section "in-portal:configure_general":
+INSERT INTO ConfigurationAdmin VALUES ('Site_Name', 'la_Text_Website', 'la_config_website_name', 'text', '', '', 10.02, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Site_Name', 'In-Portal', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin VALUES ('FirstDayOfWeek', 'la_Text_Date_Time_Settings', 'la_config_first_day_of_week', 'select', '', '0=la_sunday,1=la_monday', 20.03, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'FirstDayOfWeek', '1', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin VALUES ('Smtp_AdminMailFrom', 'la_Text_smtp_server', 'la_prompt_AdminMailFrom', 'text', NULL, 'size="40"', 30.07, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_AdminMailFrom', 'portal@user.domain.name', 'In-Portal', 'in-portal:configure_general');
 
+# Section "in-portal:configure_advanced":
+INSERT INTO ConfigurationAdmin VALUES ('Site_Path', 'la_Text_Website', 'la_config_PathToWebsite', 'text', '', '', 10.01, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Site_Path', '/', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('SiteNameSubTitle', 'la_Text_Website', 'la_config_SiteNameSubTitle', 'text', '', '', 10.021, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SiteNameSubTitle', 'Content Management System', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('CookieSessions', 'la_Text_Website', 'la_prompt_session_management', 'select', NULL, '0=lu_query_string,1=lu_cookies,2=lu_auto', 10.03, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CookieSessions', '2', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('SessionCookieName', 'la_Text_Website', 'la_prompt_session_cookie_name', 'text', '', '', 10.04, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionCookieName', 'sid', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('SessionTimeout', 'la_Text_Website', 'la_prompt_session_timeout', 'text', '', '', 10.05, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionTimeout', '3600', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('SessionReferrerCheck', 'la_Text_Website', 'la_promt_ReferrerCheck', 'checkbox', NULL, NULL, 10.06, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionReferrerCheck', '1', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('SystemTagCache', 'la_Text_Website', 'la_prompt_syscache_enable', 'checkbox', NULL, NULL, 10.07, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('User_SubscriberGroup', 'la_Text_General', 'la_users_subscriber_group', 'select', NULL, '0=lu_none,<SQL+>SELECT GroupId as OptionValue, Name as OptionName FROM <PREFIX>PortalGroup WHERE Enabled=1 AND Personal=0</SQL>', 10.11, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('AdvancedUserManagement', 'la_Text_General', 'la_prompt_AdvancedUserManagement', 'checkbox', NULL, NULL, '10.011', 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('Root_Name', 'la_Text_General', 'la_prompt_root_name', 'text', '', '', 10.07, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SystemTagCache', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('SocketBlockingMode', 'la_Text_Website', 'la_prompt_socket_blocking_mode', 'checkbox', NULL, NULL, 10.08, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('Min_UserName', 'la_Text_General', 'la_text_min_username', 'text', '', '', 10.03, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('Min_Password', 'la_Text_General', 'la_text_min_password', 'text', '', '', 10.04, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('Email_As_Login', 'la_Text_General', 'la_use_emails_as_login', 'checkbox', NULL, NULL, 10.02, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('RegistrationCaptcha', 'la_Text_General', 'la_registration_captcha', 'checkbox', NULL, NULL, 10.025, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('User_LoggedInGroup', 'la_Text_General', 'la_users_assign_all_to', 'select', NULL, '0=lu_none,<SQL+>SELECT GroupId as OptionValue, Name as OptionName FROM <PREFIX>PortalGroup WHERE Enabled=1 AND Personal=0</SQL>', 10.09, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('FirstDayOfWeek', 'la_Text_Date_Time_Settings', 'la_config_first_day_of_week', 'select', '', '0=la_sunday,1=la_monday', 20.03, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SocketBlockingMode', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('SSL_URL', 'la_Text_Website', 'la_config_ssl_url', 'text', '', '', 10.09, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SSL_URL', '', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('AdminSSL_URL', 'la_Text_Website', 'la_config_AdminSSL_URL', 'text', '', '', 10.091, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('Require_SSL', 'la_Text_Website', 'la_config_require_ssl', 'checkbox', '', '', 10.1, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AdminSSL_URL', '', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('Require_SSL', 'la_Text_Website', 'la_config_require_ssl', 'checkbox', '', '', 10.10, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Require_SSL', '', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('Require_AdminSSL', 'la_Text_Website', 'la_config_RequireSSLAdmin', 'checkbox', '', '', 10.105, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Require_AdminSSL', '', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('Force_HTTP_When_SSL_Not_Required', 'la_Text_Website', 'la_config_force_http', 'checkbox', '', '', 10.11, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('SessionCookieName', 'la_Text_Website', 'la_prompt_session_cookie_name', 'text', '', '', 10.04, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('SessionReferrerCheck', 'la_Text_Website', 'la_promt_ReferrerCheck', 'checkbox', NULL, NULL, 10.06, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Force_HTTP_When_SSL_Not_Required', '1', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UseModRewrite', 'la_Text_Website', 'la_config_use_modrewrite', 'checkbox', '', '', 10.12, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UseModRewriteWithSSL', 'la_Text_Website', 'la_config_use_modrewrite_with_ssl', 'checkbox', '', '', 10.13, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('ErrorTemplate', 'la_Text_Website', 'la_config_error_template', 'text', '', '', 10.16, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseModRewriteWithSSL', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UseJSRedirect', 'la_Text_Website', 'la_config_use_js_redirect', 'checkbox', '', '', 10.14, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('MaxImportCategoryLevels', 'la_Text_General', 'la_prompt_max_import_category_levels', 'text', '', '', 10.08, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseJSRedirect', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UseCronForRegularEvent', 'la_Text_Website', 'la_UseCronForRegularEvent', 'checkbox', NULL, NULL, 10.15, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('FilenameSpecialCharReplacement', 'la_Text_General', 'la_config_FilenameSpecialCharReplacement', 'select', NULL, '_=+_,-=+-', 10.16, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseCronForRegularEvent', '0', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('ErrorTemplate', 'la_Text_Website', 'la_config_error_template', 'text', '', '', 10.16, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('NoPermissionTemplate', 'la_Text_Website', 'la_config_nopermission_template', 'text', '', '', 10.17, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'NoPermissionTemplate', 'no_permission', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UseOutputCompression', 'la_Text_Website', 'la_config_UseOutputCompression', 'checkbox', '', '', 10.18, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseOutputCompression', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('OutputCompressionLevel', 'la_Text_Website', 'la_config_OutputCompressionLevel', 'text', '', '', 10.19, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('MailFunctionHeaderSeparator', 'la_Text_smtp_server', 'la_config_MailFunctionHeaderSeparator', 'radio', NULL, '1=la_Linux,2=la_Windows', 30.08, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('MailingListQueuePerStep', 'la_Text_smtp_server', 'la_config_MailingListQueuePerStep', 'text', NULL, NULL, 30.09, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('MailingListSendPerStep', 'la_Text_smtp_server', 'la_config_MailingListSendPerStep', 'text', NULL, NULL, 30.10, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'OutputCompressionLevel', '7', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UseToolbarLabels', 'la_Text_Website', 'la_config_UseToolbarLabels', 'checkbox', NULL , NULL , 10.20, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseToolbarLabels', '1', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UseSmallHeader', 'la_Text_Website', 'la_config_UseSmallHeader', 'checkbox', '', '', 10.21, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('User_Default_Registration_Country', 'la_Text_General', 'la_config_DefaultRegistrationCountry', 'select', NULL , '=+,<SQL>SELECT DestName AS OptionName, DestId AS OptionValue FROM <PREFIX>StdDestinations WHERE DestParentId IS NULL Order BY OptionName</SQL>', 10.111, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('CSVExportDelimiter', 'la_Text_CSV_Export', 'la_config_CSVExportDelimiter', 'select', NULL, '0=la_Tab,1=la_Comma,2=la_Semicolon,3=la_Space,4=la_Colon', 40.1, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('CSVExportEnclosure', 'la_Text_CSV_Export', 'la_config_CSVExportEnclosure', 'radio', NULL, '0=la_Doublequotes,1=la_Quotes', 40.2, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('CSVExportSeparator', 'la_Text_CSV_Export', 'la_config_CSVExportSeparator', 'radio', NULL, '0=la_Linux,1=la_Windows', 40.3, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('CSVExportEncoding', 'la_Text_CSV_Export', 'la_config_CSVExportEncoding', 'radio', NULL, '0=la_Unicode,1=la_Regular', 40.4, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('u_MaxImageCount', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 30.01, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('u_ThumbnailImageWidth', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 30.02, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('u_ThumbnailImageHeight', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 30.03, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('u_FullImageWidth', 'la_section_ImageSettings', 'la_config_FullImageWidth', 'text', '', '', 30.04, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('u_FullImageHeight', 'la_section_ImageSettings', 'la_config_FullImageHeight', 'text', '', '', 30.05, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseSmallHeader', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UseColumnFreezer', 'la_Text_Website', 'la_config_UseColumnFreezer', 'checkbox', '', '', 10.22, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseColumnFreezer', '0', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('UsePopups', 'la_Text_Website', 'la_config_UsePopups', 'radio', '', '1=la_Yes,0=la_No', 10.221, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UsePopups', '1', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('UseDoubleSorting', 'la_Text_Website', 'la_config_UseDoubleSorting', 'radio', '', '1=la_Yes,0=la_No', 10.222, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseDoubleSorting', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('TrimRequiredFields', 'la_Text_Website', 'la_config_TrimRequiredFields', 'checkbox', '', '', 10.23, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'TrimRequiredFields', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UsePageHitCounter', 'la_Text_Website', 'la_config_UsePageHitCounter', 'checkbox', '', '', 10.24, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UsePageHitCounter', 0, 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'PageHitCounter', 0, 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('UseChangeLog', 'la_Text_Website', 'la_config_UseChangeLog', 'checkbox', '', '', 10.25, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseChangeLog', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('AutoRefreshIntervals', 'la_Text_Website', 'la_config_AutoRefreshIntervals', 'text', '', '', 10.26, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AutoRefreshIntervals', '1,5,15,30,60,120,240', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('KeepSessionOnBrowserClose', 'la_Text_Website', 'la_config_KeepSessionOnBrowserClose', 'checkbox', '', '', 10.27, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'KeepSessionOnBrowserClose', '0', 'In-Portal', 'in-portal:configure_advanced');
 INSERT INTO ConfigurationAdmin VALUES ('ForceImageMagickResize', 'la_Text_Website', 'la_config_ForceImageMagickResize', 'checkbox', '', '', 10.28, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('RememberLastAdminTemplate', 'la_Text_General', 'la_config_RememberLastAdminTemplate', 'checkbox', '', '', 10.13, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES('YahooApplicationId', 'la_Text_General', 'la_config_YahooApplicationId', 'text', NULL, NULL, 10.28, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('MenuFrameWidth', 'la_title_General', 'la_prompt_MenuFrameWidth', 'text', NULL, NULL, 10.31, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MenuFrameWidth', 200, 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('CheckStopWords', 'la_Text_Website', 'la_config_CheckStopWords', 'checkbox', '', '', 10.29, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('ResizableFrames', 'la_Text_Website', 'la_config_ResizableFrames', 'checkbox', '', '', 10.30, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ResizableFrames', '0', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('Config_Server_Time', 'la_Text_Date_Time_Settings', 'la_config_time_server', 'select', '', '1=la_m12,2=la_m11,3=la_m10,5=la_m9,6=la_m8,7=la_m7,8=la_m6,9=la_m5,10=la_m4,11=la_m3,12=la_m2,13=la_m1,14=la_m0,15=la_p1,16=la_p2,17=la_p3,18=la_p4,19=la_p5,20=la_p6,21=la_p7,22=la_p8,23=la_p9,24=la_p10,25=la_p11,26=la_p12,27=la_p13', 20.01, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Server_Time', '14', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('Config_Site_Time', 'la_Text_Date_Time_Settings', 'la_config_site_zone', 'select', '', '1=la_m12,2=la_m11,3=la_m10,5=la_m9,6=la_m8,7=la_m7,8=la_m6,9=la_m5,10=la_m4,11=la_m3,12=la_m2,13=la_m1,14=la_m0,15=la_p1,16=la_p2,17=la_p3,18=la_p4,19=la_p5,20=la_p6,21=la_p7,22=la_p8,23=la_p9,24=la_p10,25=la_p11,26=la_p12,27=la_p13', 20.02, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Site_Time', '14', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('Smtp_Server', 'la_Text_smtp_server', 'la_prompt_mailserver', 'text', NULL, NULL, 30.01, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_Server', DEFAULT, 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('Smtp_Port', 'la_Text_smtp_server', 'la_prompt_mailport', 'text', NULL, NULL, 30.02, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_Port', DEFAULT, 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('Smtp_Authenticate', 'la_Text_smtp_server', 'la_prompt_mailauthenticate', 'checkbox', NULL, NULL, 30.03, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_Authenticate', '0', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('Smtp_User', 'la_Text_smtp_server', 'la_prompt_smtp_user', 'text', NULL, NULL, 30.04, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_User', DEFAULT, 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('Smtp_Pass', 'la_Text_smtp_server', 'la_prompt_smtp_pass', 'text', NULL, NULL, 30.05, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_Pass', DEFAULT, 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('Smtp_DefaultHeaders', 'la_Text_smtp_server', 'la_prompt_smtpheaders', 'textarea', NULL, 'COLS=40 ROWS=5', 30.06, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_DefaultHeaders', 'X-Priority: 1\r\nX-MSMail-Priority: High\r\nX-Mailer: In-Portal', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('MailFunctionHeaderSeparator', 'la_Text_smtp_server', 'la_config_MailFunctionHeaderSeparator', 'radio', NULL, '1=la_Linux,2=la_Windows', 30.08, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailFunctionHeaderSeparator', 1, 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('MailingListQueuePerStep', 'la_Text_smtp_server', 'la_config_MailingListQueuePerStep', 'text', NULL, NULL, 30.09, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailingListQueuePerStep', 10, 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('MailingListSendPerStep', 'la_Text_smtp_server', 'la_config_MailingListSendPerStep', 'text', NULL, NULL, 30.10, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailingListSendPerStep', 10, 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('Backup_Path', 'la_Text_BackupPath', 'la_config_backup_path', 'text', '', '', 40.01, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Backup_Path', '', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportDelimiter', 'la_Text_CSV_Export', 'la_config_CSVExportDelimiter', 'select', NULL, '0=la_Tab,1=la_Comma,2=la_Semicolon,3=la_Space,4=la_Colon', 50.01, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportDelimiter', '1', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportEnclosure', 'la_Text_CSV_Export', 'la_config_CSVExportEnclosure', 'radio', NULL, '0=la_Doublequotes,1=la_Quotes', 50.02, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportEnclosure', '0', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportSeparator', 'la_Text_CSV_Export', 'la_config_CSVExportSeparator', 'radio', NULL, '0=la_Linux,1=la_Windows', 50.03, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportSeparator', '0', 'In-Portal', 'in-portal:configure_advanced');
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportEncoding', 'la_Text_CSV_Export', 'la_config_CSVExportEncoding', 'radio', NULL, '0=la_Unicode,1=la_Regular', 50.04, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportEncoding', '0', 'In-Portal', 'in-portal:configure_advanced');
 
-INSERT INTO ConfigurationAdmin VALUES ('AllowDeleteRootCats', 'la_Text_General', 'la_AllowDeleteRootCats', 'checkbox', NULL , NULL , 10.09, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('Catalog_PreselectModuleTab', 'la_Text_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.10, 0, 1);
-INSERT INTO ConfigurationAdmin VALUES ('RecycleBinFolder', 'la_Text_General', 'la_config_RecycleBinFolder', 'text', NULL , NULL , 10.11, 0, 0);
-INSERT INTO ConfigurationAdmin VALUES ('QuickCategoryPermissionRebuild', 'la_Text_General', 'la_config_QuickCategoryPermissionRebuild', 'checkbox', NULL , NULL , 10.12, 0, 0);
-
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Columns_Category', '2', 'In-Portal', 'Categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'DomainSelect','1','In-Portal','in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Site_Path', '/', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Archive', '25', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'debug', '1', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_User', '100', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_LangEmail', '20', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Default_FromAddr', '', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'email_replyto', '', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'email_footer', 'message footer goes here', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Default_Theme', 'default', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Default_Language', 'English', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionTimeout', '3600', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_SortOrder', 'asc', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Suggest_MinInterval', '3600', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SubCat_ListCount', '3', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Timeout_Rating', '3600', 'In-Portal', 'System');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_SortField', 'u.CreatedOn', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Relations', '10', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Group_SortField', 'GroupName', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Group_SortOrder', 'asc', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Default_FromName', 'Webmaster', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Category', '20', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_Sortfield', 'Name', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_Sortorder', 'asc', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MetaKeywords', DEFAULT, 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Relation_LV_Sortfield', 'ItemType', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ampm_time', '1', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Template', '10', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Phrase', '40', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Sessionlist', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_Sortfield2', 'Description', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_Sortorder2', 'asc', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_DaysNew', '8', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_ShowPick', '', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_MetaKey', '', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_MetaDesc', '', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MetaDescription', DEFAULT, 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_NewGroup', '13', 'In-Portal:Users', 'in-portal:configure_users');
+# Section "in-portal:configure_users":
+INSERT INTO ConfigurationAdmin VALUES ('User_Allow_New', 'la_title_General', 'la_users_allow_new', 'radio', '', '1=la_User_Instant,2=la_User_Not_Allowed,3=la_User_Upon_Approval', 10.01, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_Allow_New', '3', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_Password_Auto', '0', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_Votes_Deny', '5', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_Review_Deny', '5', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Name', '', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Company', '', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Reg_Number', '', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Website_Name', '', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Web_Address', '', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Server_Time', '14', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Config_Site_Time', '14', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Site_Name', 'In-Portal', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SiteNameSubTitle', 'Content Management System', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Backup_Path', '', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Items', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'GuestSessions', '1', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_Server', DEFAULT, 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_Port', DEFAULT, 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_User', DEFAULT, 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_Pass', DEFAULT, 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_SendHTML', '1', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_Authenticate', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Email', '10', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_DefaultHeaders', 'X-Priority: 1\r\nX-MSMail-Priority: High\r\nX-Mailer: In-Portal', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_AdminMailFrom', 'portal@user.domain.name', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_Highlight_OpenTag', '<span class="match">', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_Highlight_CloseTag', '</span>', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_GuestGroup', '14', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RootPass', '', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowSelectGroupOnFront', '0', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Category_Short', '3', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CookieSessions', '2', 'In-Portal', 'in-portal:configure_general');
-
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Increase_category', '30', 'In-Portal', 'in-portal:configuration_search');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Keyword_category', '90', 'In-Portal', 'in-portal:configuration_search');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Pop_category', '5', 'In-Portal', 'in-portal:configuration_search');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Rating_category', '5', 'In-Portal', 'in-portal:configuration_search');
-
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_DefaultIncrease', '30', 'In-Portal', 'inportal:configure_searchdefault');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_DefaultKeyword', '80', 'In-Portal', 'SearchRel_DefaultKeyword');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_DefaultPop', '10', 'In-Portal', 'inportal:configuration_searchdefault');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_DefaultRating', '10', 'In-Portal', 'inportal:configure_searchdefault');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SystemTagCache', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Root_Name', 'lu_rootcategory_name', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_SubscriberGroup', '12', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('AdvancedUserManagement', 'la_title_General', 'la_prompt_AdvancedUserManagement', 'checkbox', NULL, NULL, 10.011, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AdvancedUserManagement', 0, 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SocketBlockingMode', '0', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin VALUES ('Email_As_Login', 'la_title_General', 'la_use_emails_as_login', 'checkbox', NULL, NULL, 10.02, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Email_As_Login', '0', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('RegistrationCaptcha', 'la_title_General', 'la_registration_captcha', 'checkbox', NULL, NULL, 10.025, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RegistrationCaptcha', '0', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('Min_UserName', 'la_title_General', 'la_text_min_username', 'text', '', '', 10.03, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Min_UserName', '3', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('Min_Password', 'la_title_General', 'la_text_min_password', 'text', '', '', 10.04, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Min_Password', '5', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'LinksValidation_LV_Sortfield', 'ValidationTime', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CustomConfig_LV_Sortfield', 'FieldName', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Event_LV_SortField', 'Description', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Theme_LV_SortField', 'Name', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Template_LV_SortField', 'FileName', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Lang_LV_SortField', 'PackName', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Phrase_LV_SortField', 'Phrase', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'LangEmail_LV_SortField', 'Description', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CustomData_LV_SortField', 'FieldName', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Summary_SortField', 'Module', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Session_SortField', 'UserName', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchLog_SortField', 'Keyword', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_StatItem', '10', 'inportal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Groups', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Event', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_BanRules', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_SearchLog', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_LV_lang', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_LV_Themes', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_LV_Catlist', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Reviews', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Modules', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Grouplist', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Images', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'EmailsL_SortField', 'time_sent', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_EmailsL', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_CustomData', '20', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Review', '10', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Search_MinKeyword_Length', '3', 'In-Portal', '');
+INSERT INTO ConfigurationAdmin VALUES ('Users_AllowReset', 'la_title_General', 'la_prompt_allow_reset', 'text', NULL, NULL, 10.05, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Users_AllowReset', '180', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Email_As_Login', '0', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RegistrationCaptcha', '0', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_LoggedInGroup', '15', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('User_Password_Auto', 'la_title_General', 'la_users_password_auto', 'checkbox', '', '', 10.06, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_Password_Auto', '0', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('User_MembershipExpirationReminder', 'la_title_General', 'la_MembershipExpirationReminder', 'text', NULL, '', 10.07, 0, 1);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_MembershipExpirationReminder', '10', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'FirstDayOfWeek', '1', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SSL_URL', '', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AdminSSL_URL', '', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Require_SSL', '', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Force_HTTP_When_SSL_Not_Required', '1', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionCookieName', 'sid', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseModRewrite', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseModRewriteWithSSL', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionReferrerCheck', '1', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseJSRedirect', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MaxImportCategoryLevels', '10', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseCronForRegularEvent', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'FilenameSpecialCharReplacement', '-', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'NoPermissionTemplate', 'no_permission', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseOutputCompression', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'OutputCompressionLevel', '7', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailFunctionHeaderSeparator', 1, 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailingListQueuePerStep', 10, 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailingListSendPerStep', 10, 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CategoriesRebuildSerial', '0', 'In-Portal', '');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseToolbarLabels', '1', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseSmallHeader', '0', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin VALUES ('User_NewGroup', 'la_title_General', 'la_users_new_group', 'select', NULL, '0=lu_none,<SQL+>SELECT GroupId as OptionValue, Name as OptionName FROM <PREFIX>PortalGroup WHERE Enabled=1 AND Personal=0</SQL>', 10.08, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_NewGroup', '13', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('User_LoggedInGroup', 'la_title_General', 'la_users_assign_all_to', 'select', NULL, '0=lu_none,<SQL+>SELECT GroupId as OptionValue, Name as OptionName FROM <PREFIX>PortalGroup WHERE Enabled=1 AND Personal=0</SQL>', 10.09, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_LoggedInGroup', '15', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('User_GuestGroup', 'la_title_General', 'la_users_guest_group', 'select', NULL, '0=lu_none,<SQL+>SELECT GroupId as OptionValue, Name as OptionName FROM <PREFIX>PortalGroup WHERE Enabled=1 AND Personal=0</SQL>', 10.10, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_GuestGroup', '14', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('User_SubscriberGroup', 'la_title_General', 'la_users_subscriber_group', 'select', NULL, '0=lu_none,<SQL+>SELECT GroupId as OptionValue, Name as OptionName FROM <PREFIX>PortalGroup WHERE Enabled=1 AND Personal=0</SQL>', 10.11, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_SubscriberGroup', '12', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('User_Default_Registration_Country', 'la_title_General', 'la_config_DefaultRegistrationCountry', 'select', NULL , '=+,<SQL>SELECT DestName AS OptionName, DestId AS OptionValue FROM <PREFIX>StdDestinations WHERE COALESCE(DestParentId, 0) = 0 ORDER BY OptionName</SQL>', 10.111, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_Default_Registration_Country', '', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportDelimiter', '1', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportEnclosure', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportSeparator', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportEncoding', '0', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin VALUES ('RootPass', 'la_title_General', 'la_prompt_root_pass', 'password', NULL, NULL, 10.12, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RootPass', '', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('AllowSelectGroupOnFront', 'la_title_General', 'la_config_AllowSelectGroupOnFront', 'checkbox', NULL, NULL, 10.13, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowSelectGroupOnFront', '0', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('RememberLastAdminTemplate', 'la_title_General', 'la_config_RememberLastAdminTemplate', 'checkbox', '', '', 10.14, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RememberLastAdminTemplate', '1', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('DefaultSettingsUserId', 'la_title_General', 'la_prompt_DefaultUserId', 'text', NULL, NULL, 10.15, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'DefaultSettingsUserId', -1, 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('User_Votes_Deny', 'la_Text_Restrictions', 'la_users_votes_deny', 'text', '', '', 20.01, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_Votes_Deny', '5', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('User_Review_Deny', 'la_Text_Restrictions', 'la_users_review_deny', 'text', '', '', 20.02, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_Review_Deny', '5', 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('u_MaxImageCount', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 30.01, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'u_MaxImageCount', 5, 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('u_ThumbnailImageWidth', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 30.02, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'u_ThumbnailImageWidth', 120, 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('u_ThumbnailImageHeight', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 30.03, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'u_ThumbnailImageHeight', 120, 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('u_FullImageWidth', 'la_section_ImageSettings', 'la_config_FullImageWidth', 'text', '', '', 30.04, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'u_FullImageWidth', 450, 'In-Portal:Users', 'in-portal:configure_users');
+INSERT INTO ConfigurationAdmin VALUES ('u_FullImageHeight', 'la_section_ImageSettings', 'la_config_FullImageHeight', 'text', '', '', 30.05, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'u_FullImageHeight', 450, 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseColumnFreezer', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'TrimRequiredFields', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UsePageHitCounter', 0, 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'PageHitCounter', 0, 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseChangeLog', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AutoRefreshIntervals', '1,5,15,30,60,120,240', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'KeepSessionOnBrowserClose', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_general');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RememberLastAdminTemplate', '', 'In-Portal:Users', 'in-portal:configure_users');
-INSERT INTO ConfigurationValues VALUES(NULL, 'YahooApplicationId', '', 'In-Portal', 'in-portal:configure_categories');
 
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowDeleteRootCats', '0', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Catalog_PreselectModuleTab', 1, 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RecycleBinFolder', '', 'In-Portal', 'in-portal:configure_categories');
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'QuickCategoryPermissionRebuild', '1', 'In-Portal', 'in-portal:configure_categories');
+# Section "in-portal:configuration_search":
+INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Increase_category', 'la_config_DefaultIncreaseImportance', 'la_text_increase_importance', 'text', NULL, NULL, 0, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Increase_category', '30', 'In-Portal', 'in-portal:configuration_search');
+INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Keyword_category', 'la_config_SearchRel_DefaultKeyword', 'la_text_keyword', 'text', NULL, NULL, 0, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Keyword_category', '90', 'In-Portal', 'in-portal:configuration_search');
+INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Pop_category', 'la_config_DefaultPop', 'la_text_popularity', 'text', NULL, NULL, 0, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Pop_category', '5', 'In-Portal', 'in-portal:configuration_search');
+INSERT INTO ConfigurationAdmin VALUES ('SearchRel_Rating_category', 'la_config_DefaultRating', 'la_prompt_Rating', 'text', NULL, NULL, 0, 0, 1);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SearchRel_Rating_category', '5', 'In-Portal', 'in-portal:configuration_search');
 
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CategoriesRebuildSerial', '0', 'In-Portal', '');
 
 INSERT INTO ItemTypes VALUES (1, 'In-Portal', 'c', 'Category', 'Name', 'CreatedById', NULL, NULL, 'la_ItemTab_Categories', 1, 'admin/category/addcategory.php', 'clsCategory', 'Category');
 INSERT INTO ItemTypes VALUES (6, 'In-Portal', 'u', 'PortalUser', 'Login', 'PortalUserId', NULL, NULL, '', 0, '', 'clsPortalUser', 'User');
@@ -309,13 +256,9 @@
 INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'Core:Users', 'la_event_user.membership_expiration_notice', '0');
 INSERT INTO Events VALUES (DEFAULT, 'USER.MEMBERSHIP.EXPIRATION.NOTICE', NULL, 1, 0, 'Core:Users', 'la_event_user.membership_expiration_notice', '1');
 INSERT INTO Events VALUES (DEFAULT, 'COMMON.FOOTER', NULL, 1, 0, 'Core', 'la_event_common.footer', 1);
-INSERT INTO Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_CMS_FormSubmitted', 1);
-INSERT INTO Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_CMS_FormSubmitted', 0);
+INSERT INTO Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_event_FormSubmitted', 1);
+INSERT INTO Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_event_FormSubmitted', 0);
 
-INSERT INTO ConfigurationAdmin VALUES ('cms_DefaultDesign', 'la_Text_General', 'la_prompt_DefaultDesignTemplate', 'text', NULL, NULL, 10.29, 0, 0);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'cms_DefaultDesign', '/platform/designs/general', 'In-Portal', 'in-portal:configure_categories');
-
-
 INSERT INTO IdGenerator VALUES ('100');
 
 INSERT INTO PortalGroup VALUES (15, 'Everyone', 'Everyone', 0, 1, 0, 1, 15, 0);
@@ -655,16 +598,34 @@
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:root.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:system.view', 11, 1, 1, 0);
 
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:website_setting_folder.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_setting_folder.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_advanced.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_advanced.edit', 11, 1, 1, 0);
+
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_list.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_list.add', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_list.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_list.delete', 11, 1, 1, 0);
 
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:admins.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:admins.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:admins.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:admins.delete', 11, 1, 1, 0);
+
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_lang.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_lang.add', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_lang.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_lang.delete', 11, 1, 1, 0);
 
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:phrases.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:phrases.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:phrases.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:phrases.delete', 11, 1, 1, 0);
+
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configemail.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configemail.edit', 11, 1, 1, 0);
+
 INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 11, 1, 0, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.ADD', 11, 1, 0, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.DELETE', 11, 1, 0, 0);
@@ -677,6 +638,11 @@
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:agents.add', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:agents.view', 11, 1, 1, 0);
 
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:spelling_dictionary.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:spelling_dictionary.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:spelling_dictionary.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:spelling_dictionary.view', 11, 1, 1, 0);
+
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:ban_rulelist.delete', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:ban_rulelist.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:ban_rulelist.add', 11, 1, 1, 0);
@@ -762,28 +728,32 @@
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:help.view', 11, 1, 1, 0);
 
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:browse_site.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configemail.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configemail.edit', 11, 1, 1, 0);
+
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:forms.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:forms.add', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:forms.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:forms.delete', 11, 1, 1, 0);
+
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:submissions.view', 11, 1, 1, 0);
+
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mailing_lists.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mailing_lists.add', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mailing_lists.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mailing_lists.delete', 11, 1, 1, 0);
+
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:email_queue.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:email_queue.delete', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:session_logs.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:session_logs.delete', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:change_logs.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:change_logs.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:change_logs.delete', 11, 1, 1, 0);
+
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:stop_words.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:stop_words.add', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:stop_words.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:stop_words.delete', 11, 1, 1, 0);
+
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:thesaurus.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:thesaurus.add', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:thesaurus.edit', 11, 1, 1, 0);
@@ -793,7 +763,7 @@
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:skins.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:skins.delete', 11, 1, 1, 0);
 
-INSERT INTO Skins VALUES (DEFAULT, 'Default', '/* General elements */\r\n\r\nhtml {\r\n	height: 100%;\r\n}\r\n\r\nbody {\r\n 	font-family: verdana,arial,helvetica,sans-serif;\r\n	font-size: 9pt;\r\n 	color: #000000;\r\n	overflow-x: auto; overflow-y: auto;\r\n	margin: 0px 0px 0px 0px;\r\n	text-decoration: none;\r\n}\r\n\r\na {\r\n	color: #006699;\r\n	text-decoration: none;\r\n}\r\n\r\na:hover {\r\n	color: #009ff0;\r\n	text-decoration: none;\r\n}\r\n\r\nform {\r\n   display: inline;\r\n}\r\n\r\nimg { border: 0px; }\r\n\r\nbody.height-100 {\r\n	height: 100%;\r\n}\r\n\r\nbody.regular-body {\r\n	margin: 0px 10px 5px 10px;\r\n	color: #000000;\r\n	background-color: @@SectionBgColor@@;\r\n}\r\n\r\nbody.edit-popup {\r\n	margin: 0px 0px 0px 0px;\r\n}\r\n\r\ntable.collapsed {\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered, table.bordered, .bordered-no-bottom {\r\n	border: 1px solid #000000;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered-no-bottom {\r\n	border-bottom: none;\r\n}\r\n\r\n.login-table td {\r\n	padding: 1px;\r\n}\r\n\r\n.disabled {\r\n	background-color: #ebebeb;\r\n}\r\n\r\n/* Head frame */\r\n.head-table tr td {\r\n	background-color: @@HeadBgColor@@;\r\n	color: @@HeadColor@@\r\n}\r\n\r\ntd.kx-block-header, .head-table tr td.kx-block-header{\r\n	color: @@HeadBarColor@@;\r\n	background-color: @@HeadBarBgColor@@;\r\n	padding-left: 7px;\r\n	padding-right: 7px;\r\n}\r\n\r\na.kx-header-link {\r\n	text-decoration: underline;\r\n	color: #FFFFFF;\r\n}\r\n\r\na.kx-header-link:hover {\r\n	color: #FFCB05;\r\n	text-decoration: none;\r\n}\r\n\r\n.kx-secondary-foreground 	{\r\n	color: @@HeadBarColor@@;\r\n	background-color: @@HeadBarBgColor@@;\r\n}\r\n\r\n.kx-login-button {\r\n	background-color: #2D79D6;\r\n	color: #FFFFFF;\r\n}\r\n\r\n/* General form button (yellow) */\r\n.button {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #000000;\r\n	background: url(@@base_url@@/proj-base/admin_templates/img/button_back.gif) #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Disabled (grayed-out) form button */\r\n.button-disabled {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #676767;\r\n	background: url(@@base_url@@/proj-base/admin_templates/img/button_back_disabled.gif) #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Tabs bar */\r\n\r\n.tab, .tab-active {\r\n	background-color: #F0F1EB;\r\n	padding: 3px 7px 2px 7px;\r\n	border-top: 1px solid black;\r\n	border-left: 1px solid black;\r\n	border-right: 1px solid black;\r\n}\r\n\r\n.tab-active {\r\n	background-color: #2D79D6;\r\n	border-bottom: 1px solid #2D79D6;\r\n}\r\n\r\n.tab a {\r\n	color: #00659C;\r\n	font-weight: bold;\r\n}\r\n\r\n.tab-active a {\r\n	color: #fff;\r\n	font-weight: bold;\r\n}\r\n\r\n\r\n/* Toolbar */\r\n\r\n.toolbar {\r\n	font-size: 8pt;\r\n	border: 1px solid #000000;\r\n	border-width: 0px 1px 1px 1px;\r\n	background-color: @@ToolbarBgColor@@;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.toolbar td {\r\n	height: 100%;\r\n}\r\n\r\n.toolbar-button, .toolbar-button-disabled, .toolbar-button-over {\r\n	float: left;\r\n	text-align: center;\r\n	font-size: 8pt;\r\n	padding: 5px 5px 5px 5px;\r\n	vertical-align: middle;\r\n	color: #006F99;\r\n}\r\n\r\n.toolbar-button-over {\r\n	color: #000;\r\n}\r\n\r\n.toolbar-button-disabled {\r\n	color: #444;\r\n}\r\n\r\n/*  Scrollable Grids */\r\n\r\n\r\n.layout-only-table td {\r\n  border: none !important;\r\n}\r\n\r\n/* Main Grid class */\r\n.grid-scrollable {\r\n	padding: 0px;\r\n	border: 1px solid black !important;\r\n	border-top: none !important;\r\n}\r\n\r\n/* Div generated by js, which contains all the scrollable grid elements, affects the style of scrollable area without data (if there are too few rows) */\r\n.grid-container {\r\n	background-color: #fff;\r\n}\r\n\r\n.grid-container table {\r\n	border-collapse: collapse;\r\n}\r\n\r\n/* Inner div generated in each data-cell */\r\n.grid-cell-div {\r\n	overflow: hidden;\r\n	height: auto;\r\n}\r\n\r\n/* Main row definition */\r\n.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2 {\r\n	font-weight: normal;\r\n	color: @@OddColor@@;\r\n	background-color: @@OddBgColor@@;\r\n	padding: 3px 5px 3px 5px;\r\n	overflow: hidden;\r\n	border-right: 1px solid #c9c9c9;\r\n}\r\n.grid-data-row-even td, .table-color2 {\r\n	background-color: @@EvenBgColor@@;\r\n	color: @@EvenColor@@;\r\n}\r\n.grid-data-row td a, .grid-data-row-selected td a, .grid-data-row-mouseover td a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* mouse-over rows */\r\n.grid-data-row-mouseover td, table tr.grid-data-row[_row_highlighted] td {\r\n	background: #FFFDF4;\r\n}\r\n\r\n/* Selected row, applies to both checkbox and data areas */\r\n.grid-data-row-selected td, table tr.grid-data-row[_row_selected] td {\r\n	background: #FEF2D6;\r\n}\r\n\r\n.grid-data-row-even-selected td, .grid-data-row-even[_row_selected] td {\r\n	background: #FFF7E0;\r\n}\r\n\r\n/* General header cell definition */\r\n.grid-header-row td {\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	text-decoration: none;\r\n	padding: 3px 5px 3px 5px;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-right: none;\r\n	text-align: left;\r\n	vertical-align: middle !important;\r\n	white-space: nowrap;\r\n	border-right: 1px solid #777;\r\n}\r\n\r\n/* Filters row */\r\ntr.grid-header-row-0 td {\r\n	background-color: @@FiltersBgColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\n/* Grid Filters */\r\ntable.range-filter {\r\n	width: 100%;\r\n}\r\n\r\n.range-filter td {\r\n	padding: 0px 0px 2px 2px !important;\r\n	border: none !important;\r\n	font-size: 8pt !important;\r\n	font-weight: normal !important;\r\n	text-align: left;\r\n	color: #000000 !important;\r\n}\r\n\r\ninput.filter, select.filter, input.filter-active, select.filter-active {\r\n	margin-bottom: 0px;\r\n	border: 1px solid #aaa;\r\n}\r\n\r\ninput.filter-active {\r\n  background-color: #FFFF00;\r\n}\r\n\r\nselect.filter-active {\r\n background-color: #FFFF00;\r\n}\r\n\r\n/* Column titles row */\r\ntr.grid-header-row-1 td {\r\n	height: 25px;\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-1 td a {\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-1 td a:hover {\r\n	color: #FFCC00;\r\n}\r\n\r\n\r\n.grid-footer-row td {\r\n	background-color: #D7D7D7;\r\n	font-weight: bold;\r\n	border-right: none;\r\n	padding: 3px 5px 3px 5px;\r\n}\r\n\r\ntd.grid-header-last-cell, td.grid-data-last-cell, td.grid-footer-last-cell {\r\n	border-right: none !important;\r\n}\r\n\r\ntd.grid-data-col-0, td.grid-data-col-0 div {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-0 td.grid-header-col-0 {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-0 td.grid-header-col-0 div {\r\n	display: table-cell;\r\n	vertical-align: middle;\r\n}\r\n\r\n.grid-status-bar {\r\n	border: 1px solid black;\r\n	border-top: none;\r\n	padding: 0px;\r\n	width: 100%;\r\n	border-collapse: collapse;\r\n	height: 30px;\r\n}\r\n\r\n.grid-status-bar td {\r\n	background-color: @@TitleBarBgColor@@;\r\n  color: @@TitleBarColor@@;\r\n	font-size: 11pt;\r\n	font-weight: normal;\r\n	padding: 2px 8px 2px 8px;\r\n}\r\n\r\n/*  /Scrollable Grids */\r\n\r\n\r\n/* Forms */\r\ntable.edit-form {\r\n	border: none;\r\n	border-top-width: 0px;\r\n	border-collapse: collapse;\r\n	width: 100%;\r\n}\r\n\r\n.edit-form-odd, .edit-form-even {\r\n	padding: 0px;\r\n}\r\n\r\n.subsectiontitle {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #4A92CE;\r\n	color: #fff;\r\n	height: 25px;\r\n	border-top: 1px solid black;\r\n	vertical-align: middle;\r\n}\r\n\r\n.subsectiontitle td {\r\n	vertical-align: middle;\r\n	padding: 3px 5px 3px 5px;\r\n}\r\n\r\n.label-cell {\r\n	background: #DEE7F6 url(@@base_url@@/proj-base/admin_templates/img/bgr_input_name_line.gif) no-repeat right bottom;\r\n  font: 12px arial, sans-serif;\r\n  padding: 4px 20px;\r\n  width: 150px;\r\n}\r\n\r\n.control-mid {\r\n	width: 13px;\r\n	border-left: 1px solid #7A95C2;\r\n	background: #fff url(@@base_url@@/proj-base/admin_templates/img/bgr_mid.gif) repeat-x left bottom;\r\n}\r\n\r\n.control-cell {\r\n	font: 11px arial, sans-serif;\r\n	padding: 4px 10px 5px 5px;\r\n	background: #fff url(@@base_url@@/proj-base/admin_templates/img/bgr_input_line.gif) no-repeat left bottom;\r\n	width: auto;\r\n	vertical-align: middle;\r\n}\r\n\r\n.label-cell-filler {\r\n	background: #DEE7F6 none;\r\n}\r\n.control-mid-filler {\r\n	background: #fff none;\r\n	border-left: 1px solid #7A95C2;\r\n}\r\n.control-cell-filler {\r\n	background: #fff none;\r\n}\r\n\r\n.error {\r\n	color: red;\r\n}\r\n.error-cell {\r\n	color: red;\r\n}\r\n\r\n.field-required {\r\n	color: red;\r\n}\r\n\r\n.form-warning {\r\n	color: red;\r\n}\r\n\r\n.req-note {\r\n	font-style: italic;\r\n	color: #333;\r\n}\r\n\r\n#scroll_container table.tableborder {\r\n	border-collapse: separate\r\n}\r\n\r\n\r\n/* Uploader */\r\n\r\n.uploader-main {\r\n	position: absolute;\r\n	display: none;\r\n	z-index: 10;\r\n	border: 1px solid #777;\r\n	padding: 10px;\r\n	width: 350px;\r\n	height: 120px;\r\n	overflow: hidden;\r\n	background-color: #fff;\r\n}\r\n\r\n.uploader-percent {\r\n	width: 100%;\r\n	padding-top: 3px;\r\n	text-align: center;\r\n	position: relative;\r\n	z-index: 20;\r\n	float: left;\r\n	font-weight: bold;\r\n}\r\n\r\n.uploader-left {\r\n	width: 100%;\r\n	border: 1px solid black;\r\n	height: 20px;\r\n	background: #fff url(@@base_url@@/core/admin_templates/img/progress_left.gif);\r\n}\r\n\r\n.uploader-done {\r\n	width: 0%;\r\n	background-color: green;\r\n	height: 20px;\r\n	background: #4A92CE url(@@base_url@@/core/admin_templates/img/progress_done.gif);\r\n}\r\n\r\n\r\n/* To be sorted */\r\n\r\n\r\n/* Section title, right to the big icon */\r\n.admintitle {\r\n	font-size: 16pt;\r\n	font-weight: bold;\r\n	color: @@SectionColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Left sid of bluebar */\r\n.header_left_bg {\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n	padding-left: 5px;\r\n}\r\n\r\n/* Right side of bluebar */\r\n.tablenav, tablenav a {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n\r\n	text-decoration: none;\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n}\r\n\r\n/* Section title in the bluebar * -- why ''link''? :S */\r\n.tablenav_link {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Active page in top and bottom bluebars pagination */\r\n.current_page {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #fff;\r\n	color: #2D79D6;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Other pages and arrows in pagination on blue */\r\n.nav_url {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	color: #fff;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Tree */\r\n.tree-body {\r\n	background-color: @@TreeBgColor@@;\r\n	height: 100%\r\n}\r\n\r\n.tree_head.td, .tree_head, .tree_head:hover {\r\n font-weight: bold;\r\n font-size: 10px;\r\n color: #FFFFFF;\r\n font-family: Verdana, Arial;\r\n text-decoration: none;\r\n}\r\n\r\n.tree {\r\n	padding: 0px;\r\n	border: none;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.tree tr td {\r\n	padding: 0px;\r\n	margin: 0px;\r\n	font-family: helvetica, arial, verdana,;\r\n	font-size: 11px;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tree tr td a {\r\n	font-size: 11px;\r\n	color: @@TreeColor@@;\r\n	font-family: Helvetica, Arial, Verdana;\r\n	text-decoration: none;\r\n	padding: 2px 0px 2px 2px;\r\n}\r\n\r\n.tree tr.highlighted td a {\r\n	background-color: @@TreeHighBgColor@@;\r\n	color: @@TreeHighColor@@;\r\n}\r\n\r\n.tree tr.highlighted td a:hover {\r\n	color: #fff;\r\n}\r\n\r\n.tree tr td a:hover {\r\n	color: #000000;\r\n}', 'in-portal_logo_img.jpg', 'in-portal_logo_img2.jpg', 'in-portal_logo_login.jpg', 'a:20:{s:11:"HeadBgColor";a:2:{s:11:"Description";s:27:"Head frame background color";s:5:"Value";s:7:"#1961B8";}s:9:"HeadColor";a:2:{s:11:"Description";s:21:"Head frame text color";s:5:"Value";s:7:"#CCFF00";}s:14:"SectionBgColor";a:2:{s:11:"Description";s:28:"Section bar background color";s:5:"Value";s:7:"#FFFFFF";}s:12:"SectionColor";a:2:{s:11:"Description";s:22:"Section bar text color";s:5:"Value";s:7:"#2D79D6";}s:12:"HeadBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:14:"HeadBarBgColor";a:1:{s:5:"Value";s:7:"#1961B8";}s:13:"TitleBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TitleBarBgColor";a:1:{s:5:"Value";s:7:"#2D79D6";}s:14:"ToolbarBgColor";a:1:{s:5:"Value";s:7:"#F0F1EB";}s:14:"FiltersBgColor";a:1:{s:5:"Value";s:7:"#D7D7D7";}s:17:"ColumnTitlesColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:19:"ColumnTitlesBgColor";a:1:{s:5:"Value";s:7:"#999999";}s:8:"OddColor";a:1:{s:5:"Value";s:7:"#000000";}s:10:"OddBgColor";a:1:{s:5:"Value";s:7:"#F6F6F6";}s:9:"EvenColor";a:1:{s:5:"Value";s:7:"#000000";}s:11:"EvenBgColor";a:1:{s:5:"Value";s:7:"#EBEBEB";}s:9:"TreeColor";a:1:{s:5:"Value";s:7:"#006F99";}s:11:"TreeBgColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:13:"TreeHighColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TreeHighBgColor";a:1:{s:5:"Value";s:7:"#4A92CE";}}', 1206520493, 1);
+INSERT INTO Skins VALUES(DEFAULT, 'Default', '/* General elements */\r\n\r\nhtml {\r\n	height: 100%;\r\n}\r\n\r\nbody {\r\n 	font-family: verdana,arial,helvetica,sans-serif;\r\n 	color: #000000;\r\n	overflow-x: auto; overflow-y: auto;\r\n	margin: 0px 0px 0px 0px;\r\n	text-decoration: none;\r\n}\r\n\r\nbody, td {\r\n	/* fix for Firefox, when font-size was not inherited in table cells */\r\n	font-size: 9pt;\r\n}\r\n\r\na {\r\n	color: #006699;\r\n	text-decoration: none;\r\n}\r\n\r\na:hover {\r\n	color: #009ff0;\r\n	text-decoration: none;\r\n}\r\n\r\nform {\r\n   display: inline;\r\n}\r\n\r\nimg { border: 0px; }\r\n\r\nbody.height-100 {\r\n	height: 100%;\r\n}\r\n\r\nbody.regular-body {\r\n	margin: 0px 10px 5px 10px;\r\n	color: #000000;\r\n	background-color: @@SectionBgColor@@;\r\n}\r\n\r\nbody.edit-popup {\r\n	margin: 0px 0px 0px 0px;\r\n}\r\n\r\ntable.collapsed {\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered, table.bordered, .bordered-no-bottom {\r\n	border: 1px solid #000000;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.bordered-no-bottom {\r\n	border-bottom: none;\r\n}\r\n\r\n.login-table td {\r\n	padding: 1px;\r\n}\r\n\r\n.disabled {\r\n	background-color: #ebebeb;\r\n}\r\n\r\n/* Head frame */\r\ntable.head-table {\r\n	background: url(@@base_url@@/core/admin_templates/img/top_frame/right_background.jpg) top right @@HeadBgColor@@ no-repeat;\r\n}\r\n\r\n.head-table tr td {\r\n	color: @@HeadColor@@\r\n}\r\n\r\ndiv#extra_toolbar td.button-active {\r\n	background: url(@@base_url@@/core/admin_templates/img/top_frame/toolbar_button_background.gif) bottom left repeat-x;\r\n	height: 22px;\r\n}\r\n\r\ntd.kx-block-header, .head-table tr td.kx-block-header{\r\n	color: @@HeadBarColor@@;\r\n	background: url(@@base_url@@/core/admin_templates/img/top_frame/toolbar_background.gif) repeat-x top left;\r\n	/*background-color: @@HeadBarBgColor@@;*/\r\n	padding-left: 7px;\r\n	padding-right: 7px;\r\n}\r\n\r\na.kx-header-link {\r\n	text-decoration: underline;\r\n	font-weight: bold;\r\n	color: #0080C8;\r\n}\r\n\r\na.kx-header-link:hover {\r\n	color: #FFCB05;\r\n	text-decoration: none;\r\n}\r\n\r\n.kx-secondary-foreground 	{\r\n	color: #FFFFFF;\r\n	/*background-color: @@HeadBarBgColor@@;*/\r\n}\r\n\r\n.kx-login-button {\r\n	background-color: #2D79D6;\r\n	color: #FFFFFF;\r\n}\r\n\r\n/* General form button (yellow) */\r\n.button {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #000000;\r\n	background: url(@@base_url@@/core/admin_templates/img/button_back.gif) #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Disabled (grayed-out) form button */\r\n.button-disabled {\r\n	font-size: 12px;\r\n	font-weight: normal;\r\n	color: #676767;\r\n	background: url(@@base_url@@/core/admin_templates/img/button_back_disabled.gif) #f9eeae repeat-x;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Tabs bar */\r\n\r\n.tab, .tab-active {\r\n	background-color: #F0F1EB;\r\n	padding: 3px 7px 2px 7px;\r\n	border-top: 1px solid black;\r\n	border-left: 1px solid black;\r\n	border-right: 1px solid black;\r\n	margin-left: 3px !important;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tab-active {\r\n	background-color: #4487D9;\r\n}\r\n\r\n.tab a {\r\n	color: #4487D9;\r\n	font-weight: bold;\r\n}\r\n\r\n.tab-active a {\r\n	color: #FFFFFF;\r\n	font-weight: bold;\r\n}\r\n\r\na.scroll-left, a.scroll-right {\r\n	cursor: pointer;\r\n	display: block;\r\n	float: left;\r\n	height: 18px;\r\n	margin: 0px 1px;\r\n	width: 18px;\r\n}\r\n\r\na.scroll-left {\r\n	background: transparent url(@@base_url@@/core/admin_templates/img/tabs/left.png) no-repeat scroll 0 0;\r\n}\r\n\r\na.scroll-right {\r\n	background: transparent url(@@base_url@@/core/admin_templates/img/tabs/right.png) no-repeat scroll 0 0;\r\n}\r\n\r\na.disabled {\r\n	visibility: hidden !important;\r\n}\r\n\r\na.scroll-left:hover, a.scroll-right:hover {\r\n	background-position: 0 -18px;\r\n}\r\n\r\n/* Toolbar */\r\n\r\n.toolbar {\r\n	font-size: 8pt;\r\n	border: 1px solid #000000;\r\n	border-width: 0px 1px 1px 1px;\r\n	background-color: @@ToolbarBgColor@@;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.toolbar td {\r\n	height: 100%;\r\n}\r\n\r\n.toolbar-button, .toolbar-button-disabled, .toolbar-button-over {\r\n	float: left;\r\n	text-align: center;\r\n	font-size: 8pt;\r\n	padding: 5px 5px 5px 5px;\r\n	vertical-align: middle;\r\n	color: #006F99;\r\n}\r\n\r\n.toolbar-button-over {\r\n	color: #000;\r\n}\r\n\r\n.toolbar-button-disabled {\r\n	color: #444;\r\n}\r\n\r\n/*  Scrollable Grids */\r\n\r\n\r\n.layout-only-table td {\r\n  border: none !important;\r\n}\r\n\r\n/* Main Grid class */\r\n.grid-scrollable {\r\n	padding: 0px;\r\n	border: 1px solid black !important;\r\n	border-top: none !important;\r\n}\r\n\r\n/* Div generated by js, which contains all the scrollable grid elements, affects the style of scrollable area without data (if there are too few rows) */\r\n.grid-container {\r\n	background-color: #fff;\r\n}\r\n\r\n.grid-container table {\r\n	border-collapse: collapse;\r\n}\r\n\r\n/* Inner div generated in each data-cell */\r\n.grid-cell-div {\r\n	overflow: hidden;\r\n	height: auto;\r\n}\r\n\r\n/* Main row definition */\r\n.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2 {\r\n	font-weight: normal;\r\n	color: @@OddColor@@;\r\n	background-color: @@OddBgColor@@;\r\n	padding: 3px 5px 3px 5px;\r\n	overflow: hidden;\r\n	border-right: 1px solid #c9c9c9;\r\n}\r\n.grid-data-row-even td, .table-color2 {\r\n	background-color: @@EvenBgColor@@;\r\n	color: @@EvenColor@@;\r\n}\r\n.grid-data-row td a, .grid-data-row-selected td a, .grid-data-row-mouseover td a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* mouse-over rows */\r\n.grid-data-row-mouseover td, table tr.grid-data-row[_row_highlighted] td {\r\n	background: #FFFDF4;\r\n}\r\n\r\n/* Selected row, applies to both checkbox and data areas */\r\n.grid-data-row-selected td, table tr.grid-data-row[_row_selected] td {\r\n	background: #FEF2D6;\r\n}\r\n\r\n.grid-data-row-even-selected td, .grid-data-row-even[_row_selected] td {\r\n	background: #FFF7E0;\r\n}\r\n\r\n/* General header cell definition */\r\n.grid-header-row td {\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	text-decoration: none;\r\n	padding: 3px 5px 3px 5px;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-right: none;\r\n	text-align: left;\r\n	vertical-align: middle !important;\r\n	white-space: nowrap;\r\n	border-right: 1px solid #777;\r\n}\r\n\r\n/* Filters row */\r\ntr.grid-header-row-1 td {\r\n	background-color: @@FiltersBgColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\n/* Grid Filters */\r\ntable.range-filter {\r\n	width: 100%;\r\n}\r\n\r\n.range-filter td {\r\n	padding: 0px 0px 2px 2px !important;\r\n	border: none !important;\r\n	font-size: 8pt !important;\r\n	font-weight: normal !important;\r\n	text-align: left;\r\n	color: #000000 !important;\r\n}\r\n\r\ninput.filter, select.filter, input.filter-active, select.filter-active {\r\n	margin-bottom: 0px;\r\n	border: 1px solid #aaa;\r\n}\r\n\r\ninput.filter-active {\r\n  background-color: #FFFF00;\r\n}\r\n\r\nselect.filter-active {\r\n background-color: #FFFF00;\r\n}\r\n\r\n/* Column titles row */\r\ntr.grid-header-row-0 td {\r\n	height: 25px;\r\n	font-weight: bold;\r\n	background-color: @@ColumnTitlesBgColor@@;\r\n	color: @@ColumnTitlesColor@@;\r\n	border-bottom: 1px solid black;\r\n}\r\n\r\ntr.grid-header-row-0 td a {\r\n	color: @@ColumnTitlesColor@@;\r\n}\r\n\r\ntr.grid-header-row-0 td a:hover {\r\n	color: #FFCC00;\r\n}\r\n\r\n\r\n.grid-footer-row td {\r\n	background-color: #D7D7D7;\r\n	font-weight: bold;\r\n	border-right: 1px solid #C9C9C9;\r\n	padding: 3px 5px 3px 5px;\r\n}\r\n\r\ntd.grid-header-last-cell, td.grid-data-last-cell, td.grid-footer-last-cell {\r\n	border-right: none !important;\r\n}\r\n\r\ntd.grid-data-col-0, td.grid-data-col-0 div {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-1 td.grid-header-col-1 {\r\n	text-align: center;\r\n	vertical-align: middle !important;\r\n}\r\n\r\ntr.grid-header-row-1 td.grid-header-col-1 div {\r\n	display: table-cell;\r\n	vertical-align: middle;\r\n}\r\n\r\n.grid-status-bar {\r\n	border: 1px solid black;\r\n	border-top: none;\r\n	padding: 0px;\r\n	width: 100%;\r\n	border-collapse: collapse;\r\n	height: 30px;\r\n}\r\n\r\n.grid-status-bar td {\r\n	background-color: @@TitleBarBgColor@@;\r\n  color: @@TitleBarColor@@;\r\n	font-size: 11pt;\r\n	font-weight: normal;\r\n	padding: 2px 8px 2px 8px;\r\n}\r\n\r\n/*  /Scrollable Grids */\r\n\r\n\r\n/* Forms */\r\ntable.edit-form {\r\n	border: none;\r\n	border-top-width: 0px;\r\n	border-collapse: collapse;\r\n	width: 100%;\r\n}\r\n\r\n.edit-form-odd, .edit-form-even {\r\n	padding: 0px;\r\n}\r\n\r\n.subsectiontitle {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #4A92CE;\r\n	color: #fff;\r\n	height: 25px;\r\n	border-top: 1px solid black;\r\n	vertical-align: middle;\r\n}\r\n\r\n.subsectiontitle td {\r\n	vertical-align: middle;\r\n	/*padding: 3px 5px 3px 5px;*/\r\n	padding: 1px 5px;\r\n}\r\n\r\n.label-cell {\r\n	background: #DEE7F6 url(@@base_url@@/core/admin_templates/img/bgr_input_name_line.gif) no-repeat right bottom;\r\n  font: 12px arial, sans-serif;\r\n  padding: 4px 20px;\r\n  width: 150px;\r\n}\r\n\r\n.control-mid {\r\n	width: 13px;\r\n	border-left: 1px solid #7A95C2;\r\n	background: #fff url(@@base_url@@/core/admin_templates/img/bgr_mid.gif) repeat-x left bottom;\r\n}\r\n\r\n.control-cell {\r\n	font: 11px arial, sans-serif;\r\n	padding: 4px 10px 5px 5px;\r\n	background: #fff url(@@base_url@@/core/admin_templates/img/bgr_input_line.gif) no-repeat left bottom;\r\n	width: auto;\r\n	vertical-align: middle;\r\n}\r\n\r\n.label-cell-filler {\r\n	background: #DEE7F6 none;\r\n}\r\n.control-mid-filler {\r\n	background: #fff none;\r\n	border-left: 1px solid #7A95C2;\r\n}\r\n.control-cell-filler {\r\n	background: #fff none;\r\n}\r\n\r\n.error {\r\n	color: red;\r\n}\r\n.error-cell {\r\n	color: red;\r\n}\r\n\r\n.field-required {\r\n	color: red;\r\n}\r\n\r\n.warning-table {\r\n	background-color: #F0F1EB;\r\n	border: 1px solid #000000;\r\n	border-collapse: collapse;\r\n	border-top-width: 0px;\r\n}\r\n\r\n.form-warning {\r\n	color: red;\r\n	font-size: 11px;\r\n}\r\n\r\n.priority {\r\n	color: red;\r\n	padding-left: 1px;\r\n	padding-right: 1px;\r\n	font-size: 11px;\r\n}\r\n\r\n.small-statistics {\r\n	font-size: 11px;\r\n	color: #707070;\r\n}\r\n\r\n.req-note {\r\n	font-style: italic;\r\n	color: #333;\r\n}\r\n\r\n#scroll_container table.tableborder {\r\n	border-collapse: separate\r\n}\r\n\r\n\r\n/* Uploader */\r\n\r\n.uploader-main {\r\n	position: absolute;\r\n	display: none;\r\n	z-index: 10;\r\n	border: 1px solid #777;\r\n	padding: 10px;\r\n	width: 350px;\r\n	height: 120px;\r\n	overflow: hidden;\r\n	background-color: #fff;\r\n}\r\n\r\n.uploader-percent {\r\n	width: 100%;\r\n	padding-top: 3px;\r\n	text-align: center;\r\n	position: relative;\r\n	z-index: 20;\r\n	float: left;\r\n	font-weight: bold;\r\n}\r\n\r\n.uploader-left {\r\n	width: 100%;\r\n	border: 1px solid black;\r\n	height: 20px;\r\n	background: #fff url(@@base_url@@/core/admin_templates/img/progress_left.gif);\r\n}\r\n\r\n.uploader-done {\r\n	width: 0%;\r\n	background-color: green;\r\n	height: 20px;\r\n	background: #4A92CE url(@@base_url@@/core/admin_templates/img/progress_done.gif);\r\n}\r\n\r\n\r\n/* To be sorted */\r\nspan#category_path, span#category_path a {\r\n	color: #FFFFFF;\r\n}\r\n\r\nspan#category_path a {\r\n	text-decoration: underline;\r\n}\r\n\r\n/* Section title, right to the big icon */\r\n.admintitle {\r\n	font-size: 16pt;\r\n	font-weight: bold;\r\n	color: @@SectionColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Left side of bluebar */\r\n.header_left_bg {\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n	padding-left: 5px;\r\n}\r\n\r\n/* Right side of bluebar */\r\n.tablenav, tablenav a {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n\r\n	text-decoration: none;\r\n	background-color: @@TitleBarBgColor@@;\r\n	background-image: none;\r\n}\r\n\r\n/* Section title in the bluebar * -- why ''link''? :S */\r\n.tablenav_link {\r\n	font-size: 11pt;\r\n	font-weight: bold;\r\n	color: @@TitleBarColor@@;\r\n	text-decoration: none;\r\n}\r\n\r\n/* Active page in top and bottom bluebars pagination */\r\n.current_page {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	background-color: #fff;\r\n	color: #2D79D6;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Other pages and arrows in pagination on blue */\r\n.nav_url {\r\n	font-size: 10pt;\r\n	font-weight: bold;\r\n	color: #fff;\r\n	padding: 3px 2px 3px 3px;\r\n}\r\n\r\n/* Tree */\r\n.tree-body {\r\n	background-color: @@TreeBgColor@@;\r\n	height: 100%\r\n}\r\n\r\n.tree_head.td, .tree_head, .tree_head:hover {\r\n font-weight: bold;\r\n font-size: 10px;\r\n color: #FFFFFF;\r\n font-family: Verdana, Arial;\r\n text-decoration: none;\r\n}\r\n\r\n.tree {\r\n	padding: 0px;\r\n	border: none;\r\n	border-collapse: collapse;\r\n}\r\n\r\n.tree tr td {\r\n	padding: 0px;\r\n	margin: 0px;\r\n	font-family: helvetica, arial, verdana,;\r\n	font-size: 11px;\r\n	white-space: nowrap;\r\n}\r\n\r\n.tree tr td a {\r\n	font-size: 11px;\r\n	color: @@TreeColor@@;\r\n	font-family: Helvetica, Arial, Verdana;\r\n	text-decoration: none;\r\n	padding: 2px 0px 2px 2px;\r\n}\r\n\r\n.tree tr.highlighted td a {\r\n	background-color: @@TreeHighBgColor@@;\r\n	color: @@TreeHighColor@@;\r\n}\r\n\r\n.tree tr.highlighted td a:hover {\r\n	color: #fff;\r\n}\r\n\r\n.tree tr td a:hover {\r\n	color: #000000;\r\n}', 'in-portal_logo_img.jpg', 'in-portal_logo_img2.jpg', '', 'a:20:{s:11:"HeadBgColor";a:2:{s:11:"Description";s:27:"Head frame background color";s:5:"Value";s:7:"#007BF4";}s:9:"HeadColor";a:2:{s:11:"Description";s:21:"Head frame text color";s:5:"Value";s:7:"#CCFF00";}s:14:"SectionBgColor";a:2:{s:11:"Description";s:28:"Section bar background color";s:5:"Value";s:7:"#FFFFFF";}s:12:"SectionColor";a:2:{s:11:"Description";s:22:"Section bar text color";s:5:"Value";s:7:"#2D79D6";}s:12:"HeadBarColor";a:1:{s:5:"Value";s:7:"#000000";}s:14:"HeadBarBgColor";a:1:{s:5:"Value";s:7:"#1961B8";}s:13:"TitleBarColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TitleBarBgColor";a:1:{s:5:"Value";s:7:"#2D79D6";}s:14:"ToolbarBgColor";a:1:{s:5:"Value";s:7:"#F0F1EB";}s:14:"FiltersBgColor";a:1:{s:5:"Value";s:7:"#D7D7D7";}s:17:"ColumnTitlesColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:19:"ColumnTitlesBgColor";a:1:{s:5:"Value";s:7:"#999999";}s:8:"OddColor";a:1:{s:5:"Value";s:7:"#000000";}s:10:"OddBgColor";a:1:{s:5:"Value";s:7:"#F6F6F6";}s:9:"EvenColor";a:1:{s:5:"Value";s:7:"#000000";}s:11:"EvenBgColor";a:1:{s:5:"Value";s:7:"#EBEBEB";}s:9:"TreeColor";a:1:{s:5:"Value";s:7:"#006F99";}s:11:"TreeBgColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:13:"TreeHighColor";a:1:{s:5:"Value";s:7:"#FFFFFF";}s:15:"TreeHighBgColor";a:1:{s:5:"Value";s:7:"#4A92CE";}}', 1239866526, 1);
 
 INSERT INTO LocalesList VALUES
 (1, '0x0436', 'Afrikaans (South Africa)', 'af-ZA', 'Latn', '1252'),
@@ -1140,12 +1110,6 @@
 
 INSERT INTO StopWords VALUES (90, '~'),(152, 'on'),(157, 'see'),(156, 'put'),(128, 'and'),(154, 'or'),(155, 'other'),(153, 'one'),(126, 'as'),(127, 'at'),(125, 'are'),(91, '!'),(92, '@'),(93, '#'),(94, '$'),(95, '%'),(96, '^'),(97, '&'),(98, '*'),(99, '('),(100, ')'),(101, '-'),(102, '_'),(103, '='),(104, '+'),(105, '['),(106, '{'),(107, ']'),(108, '}'),(109, '\\'),(110, '|'),(111, ';'),(112, ':'),(113, ''''),(114, '"'),(115, '<'),(116, '.'),(117, '>'),(118, '/'),(119, '?'),(120, 'ah'),(121, 'all'),(122, 'also'),(123, 'am'),(124, 'an'),(151, 'of'),(150, 'note'),(149, 'not'),(148, 'no'),(147, 'may'),(146, 'its'),(145, 'it'),(144, 'is'),(143, 'into'),(142, 'in'),(141, 'had'),(140, 'has'),(139, 'have'),(138, 'from'),(137, 'form'),(136, 'for'),(135, 'end'),(134, 'each'),(133, 'can'),(132, 'by'),(130, 'be'),(131, 'but'),(129, 'any'),(158, 'that'),(159, 'the'),(160, 'their'),(161, 'there'),(162, 'these'),(163, 'they'),(164, 'this'),(165, 'through'),(166, 'thus'),(167, 'to'),(168, 'two'),(169, 'too'),(170, 'up'),(171, 'where'),(172, 'which'),(173, 'with'),(174, 'were'),(175, 'was'),(176, 'you'),(177, 'yet');
 
-INSERT INTO ConfigurationAdmin VALUES ('CheckStopWords', 'la_Text_Website', 'la_config_CheckStopWords', 'checkbox', '', '', 10.29, 0, 0);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_general');
-
-INSERT INTO ConfigurationAdmin VALUES ('ResizableFrames', 'la_Text_Website', 'la_config_ResizableFrames', 'checkbox', '', '', 10.30, 0, 0);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ResizableFrames', '0', 'In-Portal', 'in-portal:configure_general');
-
 #INSERT INTO PageContent VALUES (DEFAULT, 1, 1, '<span style="font-weight: bold;">In-portal</span> is a revolutionary Web Site management system that allows you to automate and facilitate management of large portal and community web sites. Regardless of whether you are running a directory site or a content news portal, a community site or an online mall, In-portal will enhance your web site management experience with innovative.</span><br><br>We are proud to present our newly developed <b>"default"</b> theme that introduces a fresh look as well totally new approach in the template system.</span><br>', NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0);
 
 INSERT INTO Modules VALUES ('Core', 'core/', 'adm', DEFAULT, 1, 1, '', 0, '0');
Index: branches/RC/core/admin_templates/catalog/catalog_tabs.tpl
===================================================================
diff -u -r11541 -r11623
--- branches/RC/core/admin_templates/catalog/catalog_tabs.tpl	(.../catalog_tabs.tpl)	(revision 11541)
+++ branches/RC/core/admin_templates/catalog/catalog_tabs.tpl	(.../catalog_tabs.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 	<td id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_tab" class="tab">
 		<img src="<inp2:m_TemplatesBase module='$icon_module'/>/img/itemicons/<inp2:m_Param name='icon'/>" width="16" height="16" align="absmiddle" alt=""/>
 		<a href="#" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/><inp2:m_param name="special"/>'); return false;" class="tab-link">
-			<inp2:m_phrase name="$title"/> <span class="cats_stats" style="color: inherit;">(<span id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_item_count">?</span>)</span>
+			<inp2:m_phrase name="$title"/> <span class="small-statistics" style="color: inherit;">(<span id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_item_count">?</span>)</span>
 		</a>
 	</td>
 </inp2:m_DefineElement>
Index: branches/RC/core/admin_templates/groups/permissions_selector.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/groups/permissions_selector.tpl	(.../permissions_selector.tpl)	(revision 11623)
@@ -2,7 +2,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_groups" permission_type="advanced:manage_permissions" prefix="g" title_preset="groups_edit_additional_permissions"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 	<tbody>
 		<tr>
Index: branches/RC/core/install/step_templates/choose_modules.tpl
===================================================================
diff -u -r11074 -r11623
--- branches/RC/core/install/step_templates/choose_modules.tpl	(.../choose_modules.tpl)	(revision 11074)
+++ branches/RC/core/install/step_templates/choose_modules.tpl	(.../choose_modules.tpl)	(revision 11623)
@@ -23,7 +23,7 @@
 	$selected = $this->GetVar('modules');
 	if (!$selected) {
 		// preselect interface modules
-		$selected = Array ('kernel', 'proj-base');
+		$selected = Array ('core');
 	}
 
 	$modules_helper =& $this->Application->recallObject('ModulesHelper');
@@ -36,7 +36,7 @@
 		$module_version = $this->toolkit->GetMaxModuleVersion($module);
 		$prerequisites_errors = $this->toolkit->CheckPrerequisites($module . '/', Array ($module_version), 'install');
 
-		$license_module = $module == 'kernel' ? 'in-portal' : $module;
+		$license_module = $module;
 
 		if (!in_array(strtolower($license_module), $licensed_modules)) {
 			// when module isn't licensed user can't install it
Index: branches/RC/core/units/users/users_config.php
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 11612)
+++ branches/RC/core/units/users/users_config.php	(.../users_config.php)	(revision 11623)
@@ -173,7 +173,7 @@
 						'in-portal:user_list' => Array (
 							'parent'		=>	'in-portal:users',
 							'icon'			=>	'users',
-							'label'			=>	'la_tab_User_List',
+							'label'			=>	'la_title_Users', // 'la_tab_User_List',
 							'url'			=>	Array ('t' => 'users/users_list', 'pass' => 'm'),
 							'permissions'	=>	Array ('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /*'advanced:add_favorite', 'advanced:remove_favorite',*/),
 							'priority'		=>	1,
@@ -196,9 +196,10 @@
 							'parent'		=>	'in-portal:system',
 							'icon'			=>	'conf',
 							'label'			=>	'la_title_Users',
-							'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+							'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 							'permissions'	=>	Array ('view'),
 							'priority'		=>	2,
+							'container'		=>	true,
 							'type'			=>	stTREE,
 						),
 
@@ -253,11 +254,11 @@
 																LEFT JOIN '.TABLE_PREFIX.'%3$sPortalUserCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 											),
 
-					'ListSortings'	=> 	Array(
-																'' => Array(
-																	'Sorting' => Array('Login' => 'asc'),
-																)
-															),
+					'ListSortings'	=> 	Array (
+						'' => Array (
+							'Sorting' => Array ('Login' => 'asc'),
+						)
+					),
 
 					'SubItems'		=> Array('addr', 'u-cdata', 'u-ug', 'u-img', 'fav', 'user-profile'),
 
Index: branches/RC/core/admin_templates/languages/phrase_edit.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/languages/phrase_edit.tpl	(revision 0)
+++ branches/RC/core/admin_templates/languages/phrase_edit.tpl	(revision 11623)
@@ -0,0 +1,79 @@
+<inp2:adm_SetPopupSize width="888" height="415"/>
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:phrases" prefix="phrases" title_preset="phrase_edit_single"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<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('phrases','<inp2:phrases_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							cancel_edit('phrases','OnCancelEdit','<inp2:phrases_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('phrases', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+					}
+			 	) );
+
+				<inp2:m_if check="phrases_IsTopmostPrefix">
+					<inp2:m_if check="phrases_IsSingle" inverse="inverse">
+						a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+					</inp2:m_if>
+
+					a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+								go_to_id('phrases', '<inp2:phrases_PrevId/>');
+							}
+					 ) );
+					a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+								go_to_id('phrases', '<inp2:phrases_NextId/>');
+							}
+					 ) );
+				</inp2:m_if>
+
+				a_toolbar.Render();
+
+				<inp2:m_RenderElement name="edit_navigation" prefix="phrases"/>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:phrases_SaveWarning name="grid_save_warning"/>
+<inp2:phrases_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_get name="phrases_label"/>">
+		<inp2:m_DefineElement name="phrase_element">
+			<tr class="subsectiontitle">
+				<td colspan="4"><inp2:phrases_Field name="Phrase"/></td>
+			</tr>
+
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="phrases" field="LanguageId"/>
+			<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="!la_fld_PrimaryTranslation!"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="!la_fld_Phrase!" size="60"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="Translation" title="!la_fld_Translation!" rows="7" cols="50" allow_html="0"/>
+
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="!la_fld_PhraseType!"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="!la_fld_Module!"/>
+		</inp2:m_DefineElement>
+
+		<inp2:m_if check="m_GetEquals" name="phrases_label" value="ALEX, FIX IT!">
+			<inp2:phrases_MultipleEditing render_as="phrase_element"/>
+		<inp2:m_else/>
+			<inp2:m_RenderElement name="phrase_element"/>
+		</inp2:m_if>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/users/user_edit_password.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/user_edit_password.tpl	(.../user_edit_password.tpl)	(revision 11623)
@@ -2,7 +2,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_list" perm_section="ADMIN" permission_type="" prefix="u" title_preset="admins_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11612)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11623)
@@ -951,7 +951,6 @@
 UPDATE ConfigurationAdmin SET prompt = 'la_config_PathToWebsite' WHERE VariableName = 'Site_Path';
 
 # ===== v 5.0.0 =====
-
 CREATE TABLE StopWords (
   StopWordId int(11) NOT NULL auto_increment,
   StopWord varchar(255) NOT NULL default '',
@@ -961,6 +960,11 @@
 
 INSERT INTO StopWords VALUES (90, '~'),(152, 'on'),(157, 'see'),(156, 'put'),(128, 'and'),(154, 'or'),(155, 'other'),(153, 'one'),(126, 'as'),(127, 'at'),(125, 'are'),(91, '!'),(92, '@'),(93, '#'),(94, '$'),(95, '%'),(96, '^'),(97, '&'),(98, '*'),(99, '('),(100, ')'),(101, '-'),(102, '_'),(103, '='),(104, '+'),(105, '['),(106, '{'),(107, ']'),(108, '}'),(109, '\\'),(110, '|'),(111, ';'),(112, ':'),(113, ''''),(114, '"'),(115, '<'),(116, '.'),(117, '>'),(118, '/'),(119, '?'),(120, 'ah'),(121, 'all'),(122, 'also'),(123, 'am'),(124, 'an'),(151, 'of'),(150, 'note'),(149, 'not'),(148, 'no'),(147, 'may'),(146, 'its'),(145, 'it'),(144, 'is'),(143, 'into'),(142, 'in'),(141, 'had'),(140, 'has'),(139, 'have'),(138, 'from'),(137, 'form'),(136, 'for'),(135, 'end'),(134, 'each'),(133, 'can'),(132, 'by'),(130, 'be'),(131, 'but'),(129, 'any'),(158, 'that'),(159, 'the'),(160, 'their'),(161, 'there'),(162, 'these'),(163, 'they'),(164, 'this'),(165, 'through'),(166, 'thus'),(167, 'to'),(168, 'two'),(169, 'too'),(170, 'up'),(171, 'where'),(172, 'which'),(173, 'with'),(174, 'were'),(175, 'was'),(176, 'you'),(177, 'yet');
 
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:stop_words.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:stop_words.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:stop_words.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:stop_words.delete', 11, 1, 1, 0);
+
 INSERT INTO ConfigurationAdmin VALUES ('CheckStopWords', 'la_Text_Website', 'la_config_CheckStopWords', 'checkbox', '', '', 10.29, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CheckStopWords', '0', 'In-Portal', 'in-portal:configure_general');
 
@@ -987,6 +991,11 @@
   KEY PortalUserId (PortalUserId)
 );
 
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mailing_lists.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mailing_lists.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mailing_lists.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:mailing_lists.delete', 11, 1, 1, 0);
+
 ALTER TABLE EmailQueue
 	ADD MailingId INT UNSIGNED NOT NULL,
 	ADD INDEX (MailingId);
@@ -1100,25 +1109,36 @@
   PRIMARY KEY  (FormId)
 );
 
-UPDATE Events SET Module = 'Core:Category' WHERE Event = 'FORM.SUBMITTED';
+UPDATE Events SET Module = 'Core:Category', Description = 'la_event_FormSubmitted' WHERE Event = 'FORM.SUBMITTED';
 
 DELETE FROM PersistantSessionData WHERE VariableName LIKE '%img%';
 UPDATE Modules SET TemplatePath = Path WHERE TemplatePath <> '';
 
 UPDATE ConfigurationValues SET VariableValue = '/platform/designs/general' WHERE VariableName = 'cms_DefaultDesign';
 UPDATE ConfigurationValues SET ModuleOwner = 'In-Portal', Section = 'in-portal:configure_categories' WHERE VariableName = 'cms_DefaultDesign';
-UPDATE ConfigurationAdmin SET DisplayOrder = 10.29 WHERE VariableName = 'cms_DefaultDesign';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.15 WHERE VariableName = 'cms_DefaultDesign';
 
-UPDATE Phrase SET Module = 'Core' WHERE Phrase IN ('la_Hide', 'la_Show', 'la_fld_Requied', 'la_col_Modified');
+UPDATE Phrase SET Phrase = 'la_Regular' WHERE Phrase = 'la_regular';
+UPDATE Phrase SET Module = 'Core' WHERE Phrase IN ('la_Hide', 'la_Show', 'la_fld_Requied', 'la_col_Modified', 'la_col_Referer', 'la_Regular');
 UPDATE Phrase SET Phrase = 'la_title_Editing_E-mail' WHERE Phrase = 'la_title_editing_e-mail';
 
 ALTER TABLE Phrase ADD UNIQUE (LanguageId, Phrase);
 
-ALTER TABLE CustomField ADD IsRequired TINYINT(3) UNSIGNED;
+ALTER TABLE CustomField ADD IsRequired tinyint(3) unsigned NOT NULL default '0';
 
-DELETE FROM Permissions WHERE (Permission LIKE 'proj-cms:structure%') OR (Permission IN ('proj-cms:submissions', 'proj-base:users_management'));
+DELETE FROM Permissions
+WHERE
+	(Permission LIKE 'proj-cms:structure%') OR
+	(Permission LIKE 'proj-cms:submissions%') OR
+	(Permission LIKE 'proj-base:users%') OR
+	(Permission LIKE 'proj-base:system_variables%') OR
+	(Permission LIKE 'proj-base:email_settings%') OR
+	(Permission LIKE 'proj-base:other_settings%') OR
+	(Permission LIKE 'proj-base:sysconfig%');
+
 UPDATE Permissions SET Permission = REPLACE(Permission, 'proj-cms:browse', 'in-portal:browse_site');
 UPDATE Permissions SET Permission = REPLACE(Permission, 'proj-cms:', 'in-portal:');
+UPDATE Permissions SET Permission = REPLACE(Permission, 'proj-base:', 'in-portal:');
 
 ALTER TABLE CategoryItems ADD INDEX (ItemResourceId);
 ALTER TABLE CategoryItems
@@ -1134,7 +1154,100 @@
 DELETE FROM ConfigurationAdmin WHERE VariableName LIKE 'PerPage_Pages%';
 DELETE FROM ConfigurationValues WHERE VariableName LIKE 'PerPage_Pages%';
 
-UPDATE Modules SET Version = '5.0.0' WHERE Name = 'In-Portal';
-
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:website_setting_folder.view', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_setting_folder.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_advanced.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:configure_advanced.edit', 11, 1, 1, 0);
+
+#INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:spelling_dictionary.delete', 11, 1, 1, 0);
+#INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:spelling_dictionary.edit', 11, 1, 1, 0);
+#INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:spelling_dictionary.add', 11, 1, 1, 0);
+#INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:spelling_dictionary.view', 11, 1, 1, 0);
+
+UPDATE ConfigurationValues
+SET ModuleOwner = 'In-Portal', Section = 'in-portal:configure_general'
+WHERE ModuleOwner = 'Proj-Base' AND Section IN ('proj-base:system_variables', 'proj-base:email_settings');
+
+UPDATE ConfigurationValues
+SET ModuleOwner = 'In-Portal', Section = 'in-portal:configure_advanced'
+WHERE ModuleOwner = 'Proj-Base' AND Section IN ('proj-base:other_settings', 'proj-base:sysconfig');
+
+UPDATE ConfigurationAdmin SET heading = 'la_Text_General' WHERE VariableName IN ('AdvancedUserManagement', 'RememberLastAdminTemplate');
+UPDATE ConfigurationAdmin SET heading = 'la_Text_Website' WHERE VariableName IN ('UseToolbarLabels', 'KeepSessionOnBrowserClose');
+UPDATE ConfigurationAdmin SET heading = 'la_Text_smtp_server', prompt = 'la_prompt_AdminMailFrom', ValueList = 'size="40"', DisplayOrder = 30.07 WHERE VariableName = 'Smtp_AdminMailFrom';
+UPDATE ConfigurationAdmin SET heading = 'la_Text_Website', DisplayOrder = 10.221 WHERE VariableName = 'UsePopups';
+UPDATE ConfigurationAdmin SET heading = 'la_Text_Website', DisplayOrder = 10.222 WHERE VariableName = 'UseDoubleSorting';
+UPDATE ConfigurationAdmin SET heading = 'la_Text_Website', DisplayOrder = 10.31 WHERE VariableName = 'MenuFrameWidth';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.20 WHERE VariableName = 'UseToolbarLabels';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.27 WHERE VariableName = 'KeepSessionOnBrowserClose';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.011 WHERE VariableName = 'AdvancedUserManagement';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.21 WHERE VariableName = 'UseSmallHeader';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.22 WHERE VariableName = 'UseColumnFreezer';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.23 WHERE VariableName = 'TrimRequiredFields';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.25 WHERE VariableName = 'UseChangeLog';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.25 WHERE VariableName = 'AutoRefreshIntervals';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.14 WHERE VariableName = 'RememberLastAdminTemplate';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.28 WHERE VariableName = 'ForceImageMagickResize';
+UPDATE ConfigurationAdmin SET DisplayOrder = 50.01 WHERE VariableName = 'CSVExportDelimiter';
+UPDATE ConfigurationAdmin SET DisplayOrder = 50.02 WHERE VariableName = 'CSVExportEnclosure';
+UPDATE ConfigurationAdmin SET DisplayOrder = 50.03 WHERE VariableName = 'CSVExportSeparator';
+UPDATE ConfigurationAdmin SET DisplayOrder = 50.04 WHERE VariableName = 'CSVExportEncoding';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.13 WHERE VariableName = 'FilenameSpecialCharReplacement';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.14 WHERE VariableName = 'YahooApplicationId';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.15 WHERE VariableName = 'DefaultSettingsUserId';
+
+UPDATE ConfigurationValues
+SET VariableValue = 1, ModuleOwner = 'In-Portal:Users', Section = 'in-portal:configure_users'
+WHERE VariableName = 'RememberLastAdminTemplate';
+
+UPDATE ConfigurationValues
+SET ModuleOwner = 'In-Portal:Users', Section = 'in-portal:configure_users'
+WHERE VariableName IN ('AdvancedUserManagement', 'DefaultSettingsUserId');
+
+INSERT INTO ConfigurationAdmin VALUES ('Search_MinKeyword_Length', 'la_Text_General', 'la_config_Search_MinKeyword_Length', 'text', NULL, NULL, 10.19, 0, 0);
+UPDATE ConfigurationValues SET Section = 'in-portal:configure_categories' WHERE VariableName = 'Search_MinKeyword_Length';
+
+UPDATE ConfigurationAdmin SET heading = 'la_title_General' WHERE heading = 'la_Text_General';
+
+UPDATE ConfigurationAdmin
+SET ValueList = '=+,<SQL>SELECT DestName AS OptionName, DestId AS OptionValue FROM <PREFIX>StdDestinations WHERE COALESCE(DestParentId, 0) = 0 ORDER BY OptionName</SQL>'
+WHERE VariableName = 'User_Default_Registration_Country';
+
+UPDATE ConfigurationValues
+SET ModuleOwner = 'In-Portal', Section = 'in-portal:configure_advanced'
+WHERE VariableName IN (
+	'Site_Path', 'SiteNameSubTitle', 'CookieSessions', 'SessionCookieName', 'SessionTimeout', 'SessionReferrerCheck',
+	'SystemTagCache', 'SocketBlockingMode', 'SSL_URL', 'AdminSSL_URL', 'Require_SSL', 'Force_HTTP_When_SSL_Not_Required',
+	'UseModRewrite', 'UseModRewriteWithSSL', 'UseJSRedirect', 'UseCronForRegularEvent', 'ErrorTemplate',
+	'NoPermissionTemplate', 'UseOutputCompression', 'OutputCompressionLevel', 'UseToolbarLabels', 'UseSmallHeader',
+	'UseColumnFreezer', 'TrimRequiredFields', 'UsePageHitCounter', 'UseChangeLog', 'AutoRefreshIntervals',
+	'KeepSessionOnBrowserClose', 'ForceImageMagickResize', 'CheckStopWords', 'ResizableFrames', 'Config_Server_Time',
+	'Config_Site_Time', 'Smtp_Server', 'Smtp_Port', 'Smtp_Authenticate', 'Smtp_User', 'Smtp_Pass', 'Smtp_DefaultHeaders',
+	'MailFunctionHeaderSeparator', 'MailingListQueuePerStep', 'MailingListSendPerStep', 'Backup_Path',
+	'CSVExportDelimiter', 'CSVExportEnclosure', 'CSVExportSeparator', 'CSVExportEncoding'
+);
+
+DELETE FROM ConfigurationValues WHERE VariableName IN (
+	'Columns_Category', 'Perpage_Archive', 'debug', 'Perpage_User', 'Perpage_LangEmail', 'Default_FromAddr',
+	'email_replyto', 'email_footer', 'Default_Theme', 'Default_Language', 'User_SortField', 'User_SortOrder',
+	'Suggest_MinInterval', 'SubCat_ListCount', 'Timeout_Rating', 'Perpage_Relations', 'Group_SortField',
+	'Group_SortOrder', 'Default_FromName', 'Relation_LV_Sortfield', 'ampm_time', 'Perpage_Template',
+	'Perpage_Phrase', 'Perpage_Sessionlist', 'Perpage_Items', 'GuestSessions', 'Perpage_Email',
+	'LinksValidation_LV_Sortfield', 'CustomConfig_LV_Sortfield', 'Event_LV_SortField', 'Theme_LV_SortField',
+	'Template_LV_SortField', 'Lang_LV_SortField', 'Phrase_LV_SortField', 'LangEmail_LV_SortField',
+	'CustomData_LV_SortField', 'Summary_SortField', 'Session_SortField', 'SearchLog_SortField', 'Perpage_StatItem',
+	'Perpage_Groups', 'Perpage_Event', 'Perpage_BanRules', 'Perpage_SearchLog', 'Perpage_LV_lang',
+	'Perpage_LV_Themes', 'Perpage_LV_Catlist', 'Perpage_Reviews', 'Perpage_Modules', 'Perpage_Grouplist',
+	'Perpage_Images', 'EmailsL_SortField', 'Perpage_EmailsL', 'Perpage_CustomData', 'Perpage_Review',
+	'SearchRel_DefaultIncrease', 'SearchRel_DefaultKeyword', 'SearchRel_DefaultPop', 'SearchRel_DefaultRating',
+	'Category_Highlight_OpenTag', 'Category_Highlight_CloseTag', 'DomainSelect', 'MetaKeywords', 'MetaDescription',
+	'Config_Name', 'Config_Company', 'Config_Reg_Number', 'Config_Website_Name', 'Config_Web_Address',
+	'Smtp_SendHTML', 'ProjCMSAllowManualFilenames'
+);
+
+DELETE FROM ConfigurationAdmin WHERE VariableName IN ('Domain_Detect', 'Server_Name', 'ProjCMSAllowManualFilenames');
+
+DROP TABLE SuggestMail;
+
+DELETE FROM Modules WHERE Name = 'Proj-Base';
+UPDATE Modules SET Version = '5.0.0', Loaded = 1 WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/RC/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="languages_edit_general" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/modules/modules_config.php
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/units/modules/modules_config.php	(.../modules_config.php)	(revision 11612)
+++ branches/RC/core/units/modules/modules_config.php	(.../modules_config.php)	(revision 11623)
@@ -40,18 +40,7 @@
 						),
 
 						// "Configuration" -> "Modules and Settings"
-						/*'in-portal:modules'	=>	Array(
-							'parent'		=>	'in-portal:system',
-							'icon'			=>	'modules',
-							'label'			=>	'la_tab_ModulesManagement',
-							'url'			=>	Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array('view'),
-							'priority'		=>	5,
-							'type'			=>	stTREE,
-							'icon_module' => 'in-portal',
-						),
-
-						'in-portal:tag_library'	=>	Array(
+						/*'in-portal:tag_library'	=>	Array(
 							'parent'		=>	'in-portal:modules',
 							'icon'			=>	'modules',
 							'label'			=>	'la_tab_TagLibrary',
Index: branches/RC/core/admin_templates/forms/forms_edit_fields.tpl
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/admin_templates/forms/forms_edit_fields.tpl	(.../forms_edit_fields.tpl)	(revision 11610)
+++ branches/RC/core/admin_templates/forms/forms_edit_fields.tpl	(.../forms_edit_fields.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:forms" prefix="form" pagination="1" pagination_prefix="formflds" title_preset="forms_edit_fields" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/stylesheets/stylesheets_edit_base.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/stylesheets/stylesheets_edit_base.tpl	(.../stylesheets_edit_base.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:configure_styles" prefix="css" title_preset="base_styles" pagination="1" pagination_prefix="selectors.base" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r11576 -r11623
--- branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11576)
+++ branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 
 <!-- main kernel_form: begin -->
 <inp2:m_RenderElement name="kernel_form"/>
-<!-- ToolBar --->
+<!-- ToolBar -->
 
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
Index: branches/RC/core/admin_templates/reviews/reviews.tpl
===================================================================
diff -u -r11576 -r11623
--- branches/RC/core/admin_templates/reviews/reviews.tpl	(.../reviews.tpl)	(revision 11576)
+++ branches/RC/core/admin_templates/reviews/reviews.tpl	(.../reviews.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 
 <!-- main kernel_form: begin -->
 <inp2:m_RenderElement name="kernel_form"/>
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/config/email_messages_edit.tpl
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/admin_templates/config/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 11610)
+++ branches/RC/core/admin_templates/config/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 11623)
@@ -2,7 +2,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:configemail" prefix="emailmessages" title_preset="email_messages_edit_direct"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/login.tpl
===================================================================
diff -u -r8929 -r11623
--- branches/RC/core/admin_templates/login.tpl	(.../login.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/login.tpl	(.../login.tpl)	(revision 11623)
@@ -1,86 +1,151 @@
-<inp2:m_include t="incs/header" nobody="yes" noform="yes"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
 <inp2:m_Set skip_last_template="1"/>
 
-<body style="margin: 0px 8px 0px 8px; background-color: #fff;" text="#000000" style="height: 100%;" onLoad="document.getElementById($form_name).login.focus();">
+<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" bgcolor="#FFFFFF" onload="document.getElementById($form_name).login.focus();">
 
-	<table border="0" cellspacing="0" cellpadding="0" style="width: 100%; height: 90%;">
+	<table width="100%" border="0" cellpadding="0" cellspacing="0" class="head-table" style="background-image: none;">
 		<tr>
-		    <td valign="middle" align="center">
-		    	<inp2:m_RenderElement name="kernel_form"/>
-		      <div align="center">
-		        <img title="In-portal" src="img/globe.gif" width="84" height="82" border="0">
-		        <img title="In-portal" src="img/logo.gif" width="150" height="82" border="0"><br />
+			<td style="text-align: center; padding: 10px 5px 10px 5px">
+				<table border="0" cellpadding="0" cellspacing="0" style="margin: 0px auto;">
+					<tr>
+						<td height="81">
+							<div style="text-align: left;">
+								<a href="<inp2:m_t t="sections_list" section="in-portal:root" module="In-Portal" pass="m"/>" target="main">
+									<img src="<inp2:adm_AdminSkin type="logo"/>" alt="" border="0"/><br />
+								</a>
+							</div>
 
+							<inp2:m_if check="adm_AdminSkin" type='LogoBottom'>
+								<div style="text-align: left;">
+									<a href="<inp2:m_t t="sections_list" section="in-portal:root" module="In-Portal" pass="m"/>" target="main">
+										<img src="<inp2:adm_AdminSkin type='LogoBottom'/>" alt="" border="0"/><br />
+									</a>
+								</div>
+							</inp2:m_if>
+						</td>
+						<td style="font-family: impact, sans-serif; text-align: left;">
+							<span style="font-size: 48px; font-weight: bold;"><inp2:m_GetConfig var="Site_Name"/></span>
 
-		        <table border="0" cellpadding="2" cellspacing="0" class="bordered" style="border-width: 1px;" width="222" height="30">
-			        <tr>
-						<td align="right" valign="top" class="tablenav" width ="220" nowrap height="30" style="background: url(img/tabnav_left.gif);">
-							<span style="float: left;">
-			             		<img src="img/icons/icon24_lock_login.gif" width="16" height="22" alt="" border="0" align="absmiddle"> <inp2:m_phrase name="la_Login"/>
-			             	</span>
-			              	<a href="help/manual.pdf"><img src="img/blue_bar_help.gif" border="0"></a>
+							<inp2:m_if check="m_GetConfig" name="SiteNameSubTitle">
+								<br />
+								<span style="font-size: 20px;"><inp2:m_GetConfig name="SiteNameSubTitle"/></span>
+							</inp2:m_if>
 						</td>
-			        </tr>
+					</tr>
 					<tr>
-						<td colspan="2" bgcolor="#F0F0F0">
-		        			<table cellpadding="4" cellspacing="0" border="0">
-		        				<tr bgcolor="#F0F0F0">
-		              				<td class="text"><inp2:m_phrase name="la_Text_Login"/></td>
-		              				<td><input type="text" name="login" class="text" onkeypress="catchHotKeysA(event);"></td>
-		            			</tr>
-		            			<tr bgcolor="#F0F0F0">
-		              				<td class="text"><inp2:m_phrase name="la_prompt_Password"/></td>
-		              				<td><input type="password" name="password" class="text" onKeyPress="catchHotKeysA(event);"></td>
-		            			</tr>
-		            			<tr bgcolor="#F0F0F0">
-		              				<td colspan="2">
-		                				<div align="left">
-		                  					<input type="submit" name="login_button" onclick="doLogin();" value="<inp2:m_phrase name="la_Login"/>" class="button">
-											<input type="reset" name="cancel_button" value="<inp2:m_phrase name="la_Cancel"/>" class="button">
-		                				</div>
-		              				</td>
-		            			</tr>
-							</table>
+						<td colspan="2" style="font-size: 20px; text-align: center">
+							<span class="kx-secondary-foreground"><inp2:m_Phrase label="la_AdministrativeConsole"/></span>
 						</td>
 					</tr>
 				</table>
-				<inp2:m_if check="u.current_HasError" field="any">
-					<p class="error"><inp2:u.current_Error field="ValidateLogin"/></p>
-				</inp2:m_if>
+			</td>
+		</tr>
+	</table>
+
+	<table border="0" style="margin:0px auto; width: auto" >
+		<tr>
+    <td valign="middle">
+	      			<table class="login-table">
+	      				<tr>
+	      					<td colspan="2" style="text-align: center">
+	      						<inp2:m_if check="u.current_HasError" field="any">
+											<span class="error-cell"><inp2:u.current_Error field="ValidateLogin"/></span>
+										</inp2:m_if>
+										<br/>
+	      					</td>
+	      				</tr>
+	      				<tr>
+          				<td class="text"><inp2:m_phrase name="la_Text_Login"/>:</td>
+          				<td><input type="text" name="login" class="text" value="<inp2:u_CookieUsername submit_field="login"/>" style="width: 150px;"></td>
+          			</tr>
+          			<tr>
+          				<td class="text"><inp2:m_phrase name="la_prompt_Password"/>:</td>
+          				<td><input type="password" name="password" class="text" style="width: 150px;"></td>
+          			</tr>
+          			<tr>
+          				<td colspan="2">
+          					<input type="checkbox" id="save_username" name="cb_save_username"<inp2:m_if check="m_GetEquals" name="save_username" value="" inverse="inverse"> checked="checked"</inp2:m_if>/>&nbsp;
+          					<label for="save_username"><inp2:m_Phrase label="la_SaveLogin"/></label>
+          				</td>
+          			</tr>
+          			<tr>
+          				<td>&nbsp;</td>
+          				<td>
+            				<div align="left">
+              					<input type="submit" name="login_button" value="<inp2:m_phrase name='la_Login'/>" class="kx-login-button">
+            				</div>
+          				</td>
+          			</tr>
+							</table>
 	    	</td>
 		</tr>
 	</table>
-	<input type="hidden" name="next_template" value="<inp2:m_if check="m_GetEquals" name="next_template" value="">index<inp2:m_else/><inp2:m_get var="next_template"/></inp2:m_if>">
+
+	<input type="hidden" name="events[u]" value="OnLogin"/>
+	<input type="hidden" name="next_template" value="<inp2:m_if check="m_GetEquals" name="next_template" value="">index<inp2:m_else/><inp2:m_get var="next_template"/></inp2:m_if>"/>
 	<input type="hidden" name="skip_last_template" value="1"/>
-	
+
 	<script type="text/javascript">
-		function doLogin()
-		{
-			submit_event('u', 'OnLogin');
-		}
+		var a_parent = window.parent;
+		var to_close = new Array();
 
-		function catchHotKeysA(e)
-		{
-			if (!e) return;
-		 	if (e.keyCode == 13) doLogin();
-		}
+		function redirect() {
+//			alert('running redirect in "' + window.name + '"');
+//			window.name = 'redirect';
+			var $main_frame = getFrame('main');
+			a_parent = window;
 
-		var a_parent = window.parent;
-		function redirect()
-		{
-			window.name = 'redirect';
-			var i = 0;
-			while (i < 10) {
-				if (window.parent.name == 'main_frame') break;
-				a_parent = window.parent;
-				i++;
+			try {
+				var i = 0;
+				while (i < 10) {
+					i++;
+					var $opener = $main_frame.getWindowOpener(a_parent);
+//					console.log('window: ', a_parent.name, '; opener: ', $opener ? $opener.name : null);
+
+					if ($opener) {
+						to_close.push(a_parent);
+						a_parent = $opener;
+						continue;
+					}
+
+					if (a_parent.name == 'main_frame') {
+						break;
+					}
+
+					if (a_parent.parent && a_parent.parent.name != a_parent.name) {
+						a_parent = a_parent.parent;
+						continue;
+					}
+				}
 			}
-			page = '<inp2:m_t t="index" expired="1" escape="1" no_amp="1"/>'; // a_parent.location.href + '?expired=1';
+			catch (err) {
+				// another website is opened in parent window
+				alert('Error while trying to access window opener: [' + err.message + ']');
+				i = 10;
+			}
+
 			if (i < 10) {
-				setTimeout('a_parent.location.href=page',100);
+//				console.log('to close: ', to_close);
+				setTimeout(close_windows, 100);
 			}
 		}
-		redirect();
+
+		function close_windows() {
+			page = '<inp2:m_t t="index" expired="1" escape="1" no_amp="1" m_wid=""/>'; // a_parent.location.href + '?expired=1';
+//			alert('redirecting ' + a_parent.name + ' to ' + page);
+			a_parent.location.href = page;
+
+//			alert('closing ' + to_close.length + ' windows');
+			for (var c = (to_close.length - 1); c >= 0; c--) {
+//				alert('closing ' + to_close[c].name);
+				window_close(to_close[c]);
+			}
+		}
+
+		if (window.top.frames.length > 0) {
+			redirect();
+		}
 	</script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/mailing_lists/mailing_list_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:mailing_lists" prefix="mailing-list" title_preset="mailing_list_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/install/remove_schema.sql
===================================================================
diff -u -r11320 -r11623
--- branches/RC/core/install/remove_schema.sql	(.../remove_schema.sql)	(revision 11320)
+++ branches/RC/core/install/remove_schema.sql	(.../remove_schema.sql)	(revision 11623)
@@ -54,7 +54,6 @@
 DROP TABLE IgnoreKeywords;
 DROP TABLE SpamControl;
 DROP TABLE StatItem;
-DROP TABLE SuggestMail;
 DROP TABLE SysCache;
 DROP TABLE TagLibrary;
 DROP TABLE TagAttributes;
@@ -64,4 +63,8 @@
 DROP TABLE ImportCache;
 DROP TABLE RelatedSearches;
 DROP TABLE StopWords;
-DROP TABLE MailingLists;
\ No newline at end of file
+DROP TABLE MailingLists;
+DROP TABLE PageContent;
+DROP TABLE FormFields;
+DROP TABLE FormSubmissions;
+DROP TABLE Forms;
\ No newline at end of file
Index: branches/RC/core/admin_templates/regional/languages_export_step2.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/regional/languages_export_step2.tpl	(.../languages_export_step2.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="export_language_results"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/categories/xml/categories_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/categories/xml/categories_list.tpl	(.../categories_list.tpl)	(revision 11623)
@@ -9,7 +9,7 @@
 <inp2:m_DefineElement name="page_entercat_td" format="" no_special="">
 	<a href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>');">
 		<inp2:m_Phrase label="lu_ViewSubPages"/>
-	</a> <span class="cats_stats">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
+	</a> <span class="small-statistics">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="page_browse_td" format="" no_special="">
Index: branches/RC/core/admin_templates/languages/language_list.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/languages/language_list.tpl	(revision 0)
+++ branches/RC/core/admin_templates/languages/language_list.tpl	(revision 11623)
@@ -0,0 +1,56 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:lang_management" pagination="1" prefix="lang"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				std_edit_item('lang', 'regional/languages_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('new_language', '<inp2:m_phrase label="la_ToolTip_NewLanguage" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
+						function() {
+							std_precreate_item('lang', 'regional/languages_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('lang')
+						} ) );
+
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="lang" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="lang" IdField="LanguageId" grid="LangManagement" menu_filters="yes"/>
+<script type="text/javascript">
+	Grids['lang'].SetDependantToolbarButtons( new Array('edit','delete','primary_language','export_language') );
+</script>
+
+<inp2:m_if check="m_Recall" var="RefreshTopFrame" value="1">
+<script type="text/javascript">
+	getFrame('head').location.reload();
+	<inp2:m_RemoveVar var="RefreshTopFrame"/>
+</script>
+</inp2:m_if>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:admins" pagination="1" prefix="u.admins" title_preset="admin_list" grid="Admins"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/config/config_search.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/config/config_search.tpl	(.../config_search.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="confs" section="$section" perm_event="confs:OnLoad" title_preset="config_list_search"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/img/logo_intechnic.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/units/sections/site_config_eh.php
===================================================================
diff -u
--- branches/RC/core/units/sections/site_config_eh.php	(revision 0)
+++ branches/RC/core/units/sections/site_config_eh.php	(revision 11623)
@@ -0,0 +1,157 @@
+<?php
+
+	class SiteConfigEventHandler extends kEventHandler {
+
+		/**
+		 * [HOOK] Universal hook to modify all configs
+		 *
+		 * @param kEvent $event
+		 */
+		function OnApplySiteConfigChanges(&$event)
+		{
+			static $base_path = null;
+
+			if (!isset($base_path)) {
+				$base_path = FULL_PATH . dirname( $this->Application->UnitConfigReader->getPrefixFile('custom-sections') ) . '/../site_configs';
+			}
+
+			$prefix_file = basename( $this->Application->UnitConfigReader->getPrefixFile($event->MasterEvent->Prefix) );
+
+			$cut_pos = strrpos($prefix_file, '_config.php');
+			$prefix_file = substr($prefix_file, 0, $cut_pos) . '_' . $event->MasterEvent->Prefix . '.php';
+
+			if (file_exists($base_path . '/' . $prefix_file)) {
+				/*if ($this->Application->isDebugMode()) {
+					$this->Application->Debugger->appendHTML('Using site config: ' . $prefix_file);
+				}*/
+				require $base_path . '/' . $prefix_file;
+			}
+			else {
+				/*if ($this->Application->isDebugMode()) {
+					$this->Application->Debugger->appendHTML('Site config missing: ' . $prefix_file);
+				}*/
+
+				return ;
+			}
+
+			$change_names = Array (
+				'remove_sections', 'remove_buttons', 'hidden_fields', 'virtual_hidden_fields',
+				'required_fields', 'virtual_required_fields', 'hide_edit_tabs', 'hide_columns'
+			);
+
+			$changes = Array ();
+			foreach ($change_names as $change_name) {
+				if (isset($$change_name)) {
+					$changes[$change_name] = $$change_name;
+				}
+			}
+
+			// apply changes
+			$this->_processConfigChanges($event->MasterEvent->Prefix, $changes);
+		}
+
+		/**
+		 * Applies given changes to given prefix unit config
+		 *
+		 * @param string $prefix
+		 * @param Array $changes
+		 */
+		function _processConfigChanges($prefix, $changes)
+		{
+			extract($changes);
+
+			$section_adjustments = $this->Application->getUnitOption($this->Prefix, 'SectionAdjustments', Array ());
+			$title_presets = $this->Application->getUnitOption($prefix, 'TitlePresets', Array ());
+			$fields = $this->Application->getUnitOption($prefix, 'Fields', Array ());
+			$virtual_fields = $this->Application->getUnitOption($prefix, 'VirtualFields', Array ());
+			$edit_tab_presets = $this->Application->getUnitOption($prefix, 'EditTabPresets', Array ());
+			$grids = $this->Application->getUnitOption($prefix, 'Grids', Array ());
+
+			$field_names = array_keys($fields);
+			$virtual_field_names = array_keys($virtual_fields);
+
+			if (isset($remove_sections)) {
+				// process sections
+				foreach ($remove_sections as $remove_section) {
+					$section_adjustments[$remove_section] = 'remove';
+				}
+			}
+
+			if (isset($remove_buttons)) {
+				// process toolbar buttons
+				foreach ($remove_buttons as $title_preset => $toolbar_buttons) {
+					$title_presets[$title_preset]['toolbar_buttons'] = array_diff($title_presets[$title_preset]['toolbar_buttons'], $toolbar_buttons);
+				}
+			}
+
+			// process hidden fields
+			if (isset($hidden_fields)) {
+				$fields = $this->_setFieldOption($fields, $hidden_fields, 'hidden', 1);
+			}
+
+			if (isset($virtual_hidden_fields)) {
+				$virtual_fields = $this->_setFieldOption($virtual_fields, $virtual_hidden_fields, 'hidden', 1);
+			}
+
+			// process required fields
+			if (isset($required_fields)) {
+				$fields = $this->_setFieldOption($fields, $required_fields, 'required', 1);
+			}
+
+			if (isset($virtual_required_fields)) {
+				$virtual_fields = $this->_setFieldOption($virtual_fields, $virtual_required_fields, 'required', 1);
+			}
+
+			if (isset($hide_edit_tabs)) {
+				// hide edit tabs
+				foreach ($hide_edit_tabs as $preset_name => $edit_tabs) {
+					foreach ($edit_tabs as $edit_tab) {
+						unset($edit_tab_presets[$preset_name][$edit_tab]);
+					}
+				}
+			}
+
+			if (isset($hide_columns)) {
+				// hide columns in grids
+				foreach ($hide_columns as $grid_name => $columns) {
+					foreach ($columns as $column) {
+						unset($grids[$grid_name]['Fields'][$column]);
+					}
+				}
+			}
+
+			// save changes
+			$this->Application->setUnitOption($this->Prefix, 'SectionAdjustments', $section_adjustments);
+			$this->Application->setUnitOption($prefix, 'TitlePresets', $title_presets);
+			$this->Application->setUnitOption($prefix, 'Fields', $fields);
+			$this->Application->setUnitOption($prefix, 'VirtualFields', $virtual_fields);
+			$this->Application->setUnitOption($prefix, 'EditTabPresets', $edit_tab_presets);
+			$this->Application->setUnitOption($prefix, 'Grids', $grids);
+		}
+
+		/**
+		 * Sets given option for given fields and unsets it for all other fields
+		 *
+		 * @param Array $fields
+		 * @param Array $set_fields
+		 * @param string $option_name
+		 * @param mixed $option_value
+		 */
+		function _setFieldOption($fields, $set_fields, $option_name, $option_value)
+		{
+			// unset given option for rest of fields (all except $set_fields)
+			$unset_fields = array_diff(array_keys($fields), $set_fields);
+			foreach ($unset_fields as $unset_field) {
+				if (array_key_exists($option_name, $fields[$unset_field])) {
+					unset($fields[$unset_field][$option_name]);
+				}
+			}
+
+			// set given option to given fields
+			foreach ($set_fields as $set_field) {
+				$fields[$set_field][$option_name] = $option_value;
+			}
+
+			return $fields;
+		}
+	}
\ No newline at end of file
Index: branches/RC/core/admin_templates/tools/import1.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/tools/import1.tpl	(.../import1.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/tools/import1.tpl	(.../import1.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="import"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 11538)
+++ branches/RC/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 11623)
@@ -127,6 +127,22 @@
 
 			$this->Application->Session->SetCookie('last_module', $object->GetDBField('Module'));
 		}
+
+		/**
+		 * Changes default module to custom (when available)
+		 *
+		 * @param kEvent $event
+		 */
+		function OnAfterConfigRead(&$event)
+		{
+			parent::OnAfterConfigRead($event);
+
+			if ($this->Application->findModule('Name', 'Custom')) {
+				$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+				$fields['Module']['default'] = 'Custom';
+				$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+			}
+		}
 	}
 
 
Index: branches/RC/core/admin_templates/regional/languages_edit_phrases.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="phrases_list" tab_preset="Default" pagination="1" pagination_prefix="phrases"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/stop_words/stop_word_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/stop_words/stop_word_list.tpl	(.../stop_word_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/stop_words/stop_word_list.tpl	(.../stop_word_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:stop_words" prefix="stop-word" title_preset="stop_word_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/tools/backup1.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/tools/backup1.tpl	(.../backup1.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/tools/backup1.tpl	(.../backup1.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="backup"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/logs/change_logs/change_log_edit.tpl
===================================================================
diff -u -r11553 -r11623
--- branches/RC/core/admin_templates/logs/change_logs/change_log_edit.tpl	(.../change_log_edit.tpl)	(revision 11553)
+++ branches/RC/core/admin_templates/logs/change_logs/change_log_edit.tpl	(.../change_log_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:change_logs" prefix="change-log" title_preset="change_log_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/categories/categories_edit_images.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/categories/categories_edit_images.tpl	(.../categories_edit_images.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/categories/categories_edit_images.tpl	(.../categories_edit_images.tpl)	(revision 11623)
@@ -7,7 +7,7 @@
 
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" perm_section="CATEGORY" permission_type="VIEW" system_permission="0" title_preset="categories_images" tab_preset="Default" pagination="1" pagination_prefix="c-img"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/tools/backup3.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/tools/backup3.tpl	(.../backup3.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/tools/backup3.tpl	(.../backup3.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="backup"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 11610)
+++ branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl	(.../custom_fields_edit.tpl)	(revision 11623)
@@ -4,7 +4,7 @@
 <inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="cf" section="$section" perm_event="cf:OnLoad" title_preset="custom_fields_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -r11520 -r11623
--- branches/RC/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 11520)
+++ branches/RC/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 11623)
@@ -20,7 +20,7 @@
 
 	<inp2:m_if check="m_Param" name="Special" equals_to="showall|user">
 		<br />
-    	<span class="cats_stats">
+    	<span class="small-statistics">
     		<inp2:Field name="CategoryId" result_to_var="item_category"/>
     		<inp2:m_Phrase name="la_fld_PrimaryCategory"/>: <a href="<inp2:m_Link template='catalog/catalog' m_cat_id='$item_category' anchor='tab-{$Prefix}' no_pass_through='1'/>"><inp2:CategoryName /></a><br />
     	</span>
Index: branches/RC/core/admin_templates/config/email_events.tpl
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/admin_templates/config/email_events.tpl	(.../email_events.tpl)	(revision 11612)
+++ branches/RC/core/admin_templates/config/email_events.tpl	(.../email_events.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:configemail" pagination="1" prefix="emailmessages.module" grid="Emails" title_preset="email_messages_direct_list"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/popups/column_picker.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/popups/column_picker.tpl	(.../column_picker.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:root" title_preset="column_picker"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/categories/categories_edit_relations.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/categories/categories_edit_relations.tpl	(.../categories_edit_relations.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/categories/categories_edit_relations.tpl	(.../categories_edit_relations.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 
 <inp2:m_include t="categories/categories_tabs"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/general/helpers/rating_helper.php
===================================================================
diff -u -r11290 -r11623
--- branches/RC/core/units/general/helpers/rating_helper.php	(.../rating_helper.php)	(revision 11290)
+++ branches/RC/core/units/general/helpers/rating_helper.php	(.../rating_helper.php)	(revision 11623)
@@ -152,6 +152,15 @@
 			return $this->ratingBar($object, false, '<span class="thanks">' . $this->_replaceInPhrase('thanks_for_voting') . '</span>', $additional_style);
 		}
 
+		/*function purgeVotes()
+		{
+			$expired = adodb_mktime() - 86400 * $this->Application->ConfigValue('Timeout_Rating'); // 3600
+
+			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'ItemRating
+					WHERE CreatedOn < ' . $expired;
+			$this->Conn->Query($sql);
+		}*/
+
 		/**
 		 * Performs sprintf on phrase translation using given variables
 		 *
Index: branches/RC/core/units/forms/forms_config.php
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/units/forms/forms_config.php	(.../forms_config.php)	(revision 11612)
+++ branches/RC/core/units/forms/forms_config.php	(.../forms_config.php)	(revision 11623)
@@ -35,7 +35,7 @@
 							'parent'		=>	'in-portal:site',
 							'icon'			=>	'in-portal:form',
 							'label'			=>	'la_tab_CMSForms', //'la_tab_FormsConfig',
-							'url'			=>	Array('t' => 'forms/forms_list', 'pass' => 'm'), // set template to "sections_list" when form editing should be disabled
+							'url'			=>	Array('t' => 'forms/forms_list', 'pass' => 'm'), // set "container" parameter (in section definition, not url) to true when form editing should be disabled, but submissions still visible
 							'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
 							'priority'		=>	7,
 //							'show_mode'		=>	smSUPER_ADMIN,
Index: branches/RC/core/admin_templates/users/admins_edit_groups.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:admins" prefix="u" title_preset="user_edit_groups" tab_preset="Admins"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/submissions/submission_view.tpl
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 11610)
+++ branches/RC/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:submissions" prefix="formsubs" title_preset="formsubs_view"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/tools/restore1.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/tools/restore1.tpl	(.../restore1.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/tools/restore1.tpl	(.../restore1.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="restore"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/logs/search_logs/search_logs_config.php
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/units/logs/search_logs/search_logs_config.php	(.../search_logs_config.php)	(revision 11612)
+++ branches/RC/core/units/logs/search_logs/search_logs_config.php	(.../search_logs_config.php)	(revision 11623)
@@ -69,8 +69,4 @@
 				),
 			),
 		),
-
-		'ConfigMapping' => Array(
-			'PerPage' => 'Perpage_SearchLog',
-		),
 	);
\ No newline at end of file
Index: branches/RC/core/admin_templates/skins/skin_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:skins" prefix="skin" title_preset="skin_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/users/users_event_handler.php
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 11538)
+++ branches/RC/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 11623)
@@ -739,14 +739,31 @@
 
 			if (preg_match('/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', $friend_email))
 		    {
-				$send_params = array();
-				$send_params['to_email']=$friend_email;
-				$send_params['to_name']=$friend_name;
+		    	/*$cutoff = adodb_mktime() + (int)$this->Application->ConfigValue('Suggest_MinInterval');
+				$sql = 'SELECT *
+						FROM ' . TABLE_PREFIX . 'SuggestMail
+						WHERE email = ' . $this->Conn->qstr($friend_email) . ' AND sent < ' . $cutoff;
+             	if ($this->Conn->GetRow($sql) !== false) {
+             		$object->SetError('Email', 'send_error', 'lu_email_already_suggested');
+					$event->status = erFAIL;
+					return ;
+             	}*/
 
+		    	$send_params = Array ();
+				$send_params['to_email'] = $friend_email;
+				$send_params['to_name'] = $friend_name;
+
 				$user_id = $this->Application->RecallVar('user_id');
 				$email_event =& $this->Application->EmailEventUser('USER.SUGGEST', $user_id, $send_params);
 
 				if ($email_event->status == erSUCCESS){
+					/*$fields_hash = Array (
+						'email' => $friend_email,
+						'sent' => adodb_mktime(),
+					);
+
+					$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'SuggestMail');*/
+
 					$event->redirect_params = array('opener' => 's', 'pass' => 'all');
 					$event->redirect = $this->Application->GetVar('template_success');
 				}
Index: branches/RC/core/admin_templates/stylesheets/stylesheets_edit_block.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/stylesheets/stylesheets_edit_block.tpl	(.../stylesheets_edit_block.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:configure_styles" prefix="css" grid="BlockStyles" title_preset="block_styles" pagination="1" pagination_prefix="selectors.block" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 11623)
@@ -1,7 +1,8 @@
 <inp2:m_include t="incs/header"/>
+
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_list" grid="RegularUsers" title_preset="users_list" pagination="1" prefix="u"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/categories/edit_content.tpl
===================================================================
diff -u -r11520 -r11623
--- branches/RC/core/admin_templates/categories/edit_content.tpl	(.../edit_content.tpl)	(revision 11520)
+++ branches/RC/core/admin_templates/categories/edit_content.tpl	(.../edit_content.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:browse" prefix="c" title_preset="edit_content"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/categories/categories_edit_permissions.tpl	(.../categories_edit_permissions.tpl)	(revision 11623)
@@ -6,7 +6,7 @@
 <inp2:m_include template="catalog/catalog_elements"/>
 <inp2:m_include t="categories/categories_tabs"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/users/admin_edit_group.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/admin_edit_group.tpl	(.../admin_edit_group.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/admin_edit_group.tpl	(.../admin_edit_group.tpl)	(revision 11623)
@@ -2,7 +2,7 @@
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:admins" prefix="u" title_preset="user_edit_group"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/groups/groups_edit_users.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/groups/groups_edit_users.tpl	(.../groups_edit_users.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/groups/groups_edit_users.tpl	(.../groups_edit_users.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_groups" prefix="g" grid="GroupUsers" title_preset="groups_edit_users" tab_preset="Default" pagination="1" pagination_prefix="g-ug"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 	<tbody>
 		<tr>
Index: branches/RC/core/admin_templates/img/icons/icon24_site.gif
===================================================================
diff -u -r8929 -r11623
Binary files differ
Index: branches/RC/core/admin_templates/thesaurus/thesaurus_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/thesaurus/thesaurus_edit.tpl	(.../thesaurus_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/thesaurus/thesaurus_edit.tpl	(.../thesaurus_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:thesaurus" prefix="thesaurus" title_preset="thesaurus_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/logs/email_logs/email_logs_config.php
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 11612)
+++ branches/RC/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 11623)
@@ -72,8 +72,4 @@
 				),
 			),
 		),
-
-		'ConfigMapping' => Array(
-			'PerPage' => 'Perpage_EmailsL',
-		),
 	);
\ No newline at end of file
Index: branches/RC/core/admin_templates/img/icons/icon24_settings_general.gif
===================================================================
diff -u -r11612 -r11623
Binary files differ
Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl
===================================================================
diff -u -r11541 -r11623
--- branches/RC/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl	(.../item_selector_tabs.tpl)	(revision 11541)
+++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl	(.../item_selector_tabs.tpl)	(revision 11623)
@@ -4,7 +4,7 @@
 	<td id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_tab" class="tab">
 		<img src="<inp2:m_TemplatesBase module='$icon_module'/>/img/itemicons/<inp2:m_Param name='icon'/>" width="16" height="16" align="absmiddle" alt=""/>
 		<a href="#" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/><inp2:m_param name="special"/>'); return false;" class="tab-link">
-			<inp2:m_phrase name="$title"/> <span class="cats_stats" style="color: inherit;">(<span id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_item_count">?</span>)</span>
+			<inp2:m_phrase name="$title"/> <span class="small-statistics" style="color: inherit;">(<span id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_item_count">?</span>)</span>
 		</a>
 	</td>
 </inp2:m_DefineElement>
Index: branches/RC/core/admin_templates/reviews/review_direct_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/reviews/review_direct_edit.tpl	(.../review_direct_edit.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 <inp2:m_Get name="item_prefix" result_to_var="prefix"/>
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:reviews" title_preset="review_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/themes/themes_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/themes/themes_list.tpl	(.../themes_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/themes/themes_list.tpl	(.../themes_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:configure_themes" prefix="theme" title_preset="themes_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/install.php
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/install.php	(.../install.php)	(revision 11610)
+++ branches/RC/core/install.php	(.../install.php)	(revision 11623)
@@ -457,23 +457,11 @@
 						break;
 					}
 
-					// check interface modules
-					$available_modules = $selected_modules = Array ();
-					$interface_modules = Array ('Core', 'Proj-Base');
-					foreach ($interface_modules as $interface_module) {
-						$module_folder = strtolower($interface_module);
-
-						if (file_exists(MODULES_PATH . '/' . $module_folder)) {
-							array_push($available_modules, $interface_module);
-						}
-
-						$module_selected[$interface_module] = in_array($module_folder, $modules);
+					// check interface module
+					if (!in_array('core', $modules)) {
+						$this->errorMessage = 'Please select "Core" as interface module';
 					}
 
-					if (!$module_selected['Core'] && !$module_selected['Proj-Base']) {
-						$this->errorMessage = 'Please ' . ($modules ? 'also ' : '') . 'select "' . implode('" or "', $available_modules) . '" as interface module';
-					}
-
 					$status = $this->errorMessage == '';
 					break;
 			}
Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11623)
@@ -7,7 +7,7 @@
 
 <!-- main kernel_form: begin -->
 <inp2:m_RenderElement name="kernel_form"/>
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js
===================================================================
diff -u -r11482 -r11623
--- branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js	(.../thickbox.js)	(revision 11482)
+++ branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js	(.../thickbox.js)	(revision 11623)
@@ -535,7 +535,7 @@
 			width: TB.Width + 'px',
 			height: TB.Height + 'px',
 			left: Math.round((pagesize[0] - TB.Width) / 2) + 'px',
-			top: Math.round((pagesize[1] - TB.Height) / 2) + 'px'
+			top: $(window).scrollTop() + Math.round((pagesize[1] - TB.Height) / 2) + 'px'
 		}
 	);
 
Index: branches/RC/core/admin_templates/catalog/advanced_view.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 
 <!-- main kernel_form: begin -->
 <inp2:m_RenderElement name="kernel_form"/>
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/sections/sections_config.php
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 11612)
+++ branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 11623)
@@ -2,29 +2,31 @@
 
 	$config = Array (
 		'Prefix' => 'core-sections',
-		'EventHandlerClass' => Array ('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
+		'EventHandlerClass' => Array ('class' => 'SiteConfigEventHandler', 'file' => 'site_config_eh.php', 'build_event' => 'OnBuild'),
 		'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
 
-//		'SectionPrefix' => 'u',
-		'Sections' => Array (
-			/*'in-portal:root' => Array (
-				'parent'		=>	null,
-				'icon'			=>	'site',
-				'label'			=>	$this->Application->ConfigValue('Site_Name'),
-				'url'			=>	Array ('t' => 'sections_list', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1),
-				'permissions'	=>	Array ('advanced:admin_login', 'advanced:front_login'),
-				'priority'		=>	0,
-				'type'			=>	stTREE,
-				'SectionPrefix' => 'adm',
-			),*/
+		'Hooks' => Array (
+			Array (
+				'Mode' => hBEFORE,
+				'Conditional' => false,
+				'HookToPrefix' => '*',
+				'HookToSpecial' => '*',
+				'HookToEvent' => Array ('OnAfterConfigRead'),
+				'DoPrefix' => '',
+				'DoSpecial' => '*',
+				'DoEvent' => 'OnApplySiteConfigChanges',
+			),
+		),
 
+		'Sections' => Array (
 			'in-portal:site' => Array (
 				'parent'		=>	'in-portal:root',
 				'icon'			=>	'struct',
 				'label'			=>	'la_tab_Site_Structure',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	1,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'c',
 			),
@@ -51,16 +53,6 @@
 				'type'			=>	stTREE,
 			),
 
-			'in-portal:configemail'	=>	Array(
-				'parent'		=>	'in-portal:site',
-				'icon'			=>	'core:e-mail',
-				'label'			=>	'la_tab_E-mails',
-				'url'			=>	Array('t' => 'config/email_events', 'pass_section' => true, 'pass' => 'm'),
-				'permissions'	=>	Array('view', 'edit'),
-				'priority'		=>	6,
-				'type'			=>	stTREE,
-			),
-
 			'in-portal:reviews' => Array (
 				'parent'		=>	'in-portal:users',
 				'icon'			=>	'reviews',
@@ -75,9 +67,10 @@
 				'parent'		=>	'in-portal:root',
 				'icon'			=>	'community',
 				'label'			=>	'la_tab_Community',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	3,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'u',
 			),
@@ -109,9 +102,10 @@
 				'parent'		=>	'in-portal:root',
 				'icon'			=>	'summary_logs',
 				'label'			=>	'la_tab_Reports',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	4,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'adm',
 			),
@@ -131,9 +125,10 @@
 				'parent'		=>	'in-portal:root',
 				'icon'			=>	'conf',
 				'label'			=>	'la_tab_Sys_Config',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	5,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'adm',
 			),
@@ -142,36 +137,43 @@
 				'parent'		=>	'in-portal:system',
 				'icon'			=>	'conf',
 				'label'			=>	'la_title_Website',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	1,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'adm',
 			),
 
-
-
-
-
-
 			'in-portal:configure_general' => Array (
 				'parent'		=>	'in-portal:website_setting_folder',
 				'icon'			=>	'conf_general',
 				'label'			=>	'la_tab_General',
-				'url'			=>	Array ('t' => 'config/config_universal', 'pass_section' => true, 'module' => 'In-Portal', 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'edit'),
 				'priority'		=>	1,
 				'type'			=>	stTREE,
 			),
 
+			'in-portal:configure_advanced' => Array (
+				'parent'		=>	'in-portal:website_setting_folder',
+				'icon'			=>	'settings_general',
+				'label'			=>	'la_title_Advanced',
+				'url'			=>	Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
+				'permissions'	=>	Array ('view', 'edit'),
+				'priority'		=>	2,
+				'type'			=>	stTREE,
+			),
+
 			// "Tools" section
 			'in-portal:tools' => Array (
 				'parent'		=>	'in-portal:root',
 				'icon'			=>	'tools',
 				'label'			=>	'la_tab_Tools',
-				'url'			=>	Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
+				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	6,
+				'container'		=>	true,
 				'type'			=>	stTREE,
 				'SectionPrefix' => 'adm',
 			),
Index: branches/RC/core/admin_templates/spelling_dictionary/spelling_dictionary_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/spelling_dictionary/spelling_dictionary_list.tpl	(.../spelling_dictionary_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/spelling_dictionary/spelling_dictionary_list.tpl	(.../spelling_dictionary_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:spelling_dictionary" prefix="spelling-dictionary" title_preset="spelling_dictionary_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/import/import_start.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 11623)
@@ -7,7 +7,7 @@
 <inp2:{$importprefix}_PermSection section="main" result_to_var="permsection" />
 <inp2:m_RenderElement name="combined_header" section="$permsection" prefix="adm" title_preset="csv_import"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/img/icons/icon24_users.gif
===================================================================
diff -u -r11149 -r11623
Binary files differ
Index: branches/RC/core/admin_templates/users/root_edit_password.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/root_edit_password.tpl	(.../root_edit_password.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:admins" prefix="u" title_preset="root_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/install/install_toolkit.php
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 11610)
+++ branches/RC/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 11623)
@@ -573,6 +573,14 @@
 
 			$category->Create();
 
+			$priority_helper =& $this->Application->recallObject('PriorityHelper');
+			/* @var $priority_helper kPriorityHelper */
+
+			$event = new kEvent('c:OnListBuild');
+
+			// ensure, that newly created category has proper value in Priority field
+			$priority_helper->recalculatePriorities($event, 'ParentId = ' . $category_fields['ParentId']);
+
 			return $category;
 		}
 
Index: branches/RC/core/admin_templates/forms/forms_edit.tpl
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/admin_templates/forms/forms_edit.tpl	(.../forms_edit.tpl)	(revision 11610)
+++ branches/RC/core/admin_templates/forms/forms_edit.tpl	(.../forms_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:forms" prefix="form" title_preset="forms_edit" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/custom_data/custom_data_event_handler.php
===================================================================
diff -u -r11600 -r11623
--- branches/RC/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 11600)
+++ branches/RC/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 11623)
@@ -112,6 +112,7 @@
 				$custom_name = $custom_params['FieldName'];
 				$field_options = Array('type' => 'string', 'not_null' => 1, 'default' => $custom_params['DefaultValue']);
 
+				// raises warnings during 4.3.9 -> 5.0.0 upgrade, no fatal sqls though
 				if ($custom_params['IsRequired']) {
 					$field_options['required'] = 1;
 				}
Index: branches/RC/core/units/languages/languages_config.php
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 11612)
+++ branches/RC/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 11623)
@@ -129,6 +129,19 @@
 							'priority'		=>	4,
 							'type'			=>	stTREE,
 						),
+
+						// "Lang. Management"
+						/*'in-portal:lang_management' => Array (
+							'parent'		=>	'in-portal:system',
+							'icon'			=>	'core:settings_general',
+							'label'			=>	'la_title_LangManagement',
+							'url'			=>	Array ('t' => 'languages/language_list', 'pass' => 'm'),
+							'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
+							'perm_prefix'	=>	'lang',
+							'priority'		=>	10.03,
+							'show_mode'		=>	smSUPER_ADMIN,
+							'type'			=>	stTREE,
+						),*/
 					),
 
 					'TableName'			=>	TABLE_PREFIX.'Language',
@@ -220,15 +233,15 @@
 							),
 						),
 
-						'LangManagement' => Array (
+						/*'LangManagement' => Array (
 							'Icons' => Array ('default' => 'icon16_custom.gif', '0_0' => 'icon16_language_disabled.gif', '1_0' => 'icon16_language.gif', '0_1' => 'icon16_language_disabled.gif', '1_1' => 'icon16_language_primary.gif'),
 							'Fields' => Array (
 								'LanguageId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
 								'PackName' => Array ('title' => 'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 120),
 								'LocalName' => Array ('title' => 'la_col_Prefix', 'filter_block' => 'grid_options_filter', 'width' => 120),
 								'IconURL' => Array ('title' => 'la_col_Image', 'filter_block' => 'grid_empty_filter', 'width' => 80),
 							),
-						),
+						),*/
 					),
 	);
 
Index: branches/RC/core/admin_templates/categories/categories_edit_properties.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/categories/categories_edit_properties.tpl	(.../categories_edit_properties.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/categories/categories_edit_properties.tpl	(.../categories_edit_properties.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 
 <inp2:m_include t="categories/categories_tabs"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/users/user_edit_items.tpl
===================================================================
diff -u -r11576 -r11623
--- branches/RC/core/admin_templates/users/user_edit_items.tpl	(.../user_edit_items.tpl)	(revision 11576)
+++ branches/RC/core/admin_templates/users/user_edit_items.tpl	(.../user_edit_items.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 
 <inp2:m_include template="catalog/catalog_elements"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
@@ -139,7 +139,7 @@
 	<td id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_tab" class="tab">
 		<img src="<inp2:m_TemplatesBase module='$icon_module'/>/img/itemicons/<inp2:m_Param name='icon'/>" width="16" height="16" align="absmiddle" alt=""/>
 		<a href="#" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/><inp2:m_Param name="special"/>'); return false;" class="tab-link">
-			<inp2:m_Phrase name="$title"/> <span class="cats_stats" style="color: inherit;">(<span id="<inp2:m_param name="prefix"/><inp2:m_Param name="special"/>_item_count">?</span>)</span>
+			<inp2:m_Phrase name="$title"/> <span class="small-statistics" style="color: inherit;">(<span id="<inp2:m_param name="prefix"/><inp2:m_Param name="special"/>_item_count">?</span>)</span>
 		</a>
 	</td>
 </inp2:m_DefineElement>
Index: branches/RC/core/admin_templates/regional/languages_import.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/regional/languages_import.tpl	(.../languages_import.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="import_language"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/agents/agent_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/agents/agent_list.tpl	(.../agent_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/agents/agent_list.tpl	(.../agent_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:agents" prefix="agent" title_preset="agent_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/img/icons/icon24_e-mail-settings.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/users/group_selector.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/group_selector.tpl	(.../group_selector.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/group_selector.tpl	(.../group_selector.tpl)	(revision 11623)
@@ -2,7 +2,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="g.user" section="in-portal:user_groups" pagination="1" title_preset="select_group"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/install/step_templates/upgrade_modules.tpl
===================================================================
diff -u -r10836 -r11623
--- branches/RC/core/install/step_templates/upgrade_modules.tpl	(.../upgrade_modules.tpl)	(revision 10836)
+++ branches/RC/core/install/step_templates/upgrade_modules.tpl	(.../upgrade_modules.tpl)	(revision 11623)
@@ -19,7 +19,7 @@
 <?php
 	$module_tpl = ob_get_clean();
 
-	$selected = $this->GetVar('modules') ? $this->GetVar('modules') : Array ();
+	$selected = $this->GetVar('modules') ? $this->GetVar('modules') : Array ('core');
 	$modules = $this->GetUpgradableModules();
 	foreach ($modules as $module_name => $module_params) {
 		$module_name = strtolower($module_name);
Index: branches/RC/core/admin_templates/img/bgr_input_name_line.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/ban_rules/ban_rule_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/ban_rules/ban_rule_list.tpl	(.../ban_rule_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/ban_rules/ban_rule_list.tpl	(.../ban_rule_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_banlist" prefix="ban-rule" title_preset="ban_rule_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/email_queue/email_queue_config.php
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 11612)
+++ branches/RC/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 11623)
@@ -75,8 +75,4 @@
 				),
 			),
 		),
-
-		'ConfigMapping' => Array(
-			'PerPage' => 'Perpage_EmailsL',
-		),
 	);
\ No newline at end of file
Index: branches/RC/core/install/site_configs.zip
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/install/english.lang
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/install/english.lang	(.../english.lang)	(revision 11612)
+++ branches/RC/core/install/english.lang	(.../english.lang)	(revision 11623)
@@ -60,7 +60,6 @@
 			<PHRASE Label="la_category_sortfield2_prompt" Module="Core" Type="1">QW5kIHRoZW4gYnk=</PHRASE>
 			<PHRASE Label="la_category_sortfield_prompt" Module="Core" Type="1">T3JkZXIgY2F0ZWdvcmllcyBieQ==</PHRASE>
 			<PHRASE Label="la_Close" Module="Core" Type="1">Q2xvc2U=</PHRASE>
-			<PHRASE Label="la_CMS_FormSubmitted" Module="Core" Type="1">Rm9ybSBTdWJtaXR0ZWQ=</PHRASE>
 			<PHRASE Label="la_ColHeader_AltValue" Module="Core" Type="1">QWx0IFZhbHVl</PHRASE>
 			<PHRASE Label="la_ColHeader_BadWord" Module="Core" Type="1">Q2Vuc29yZWQgV29yZA==</PHRASE>
 			<PHRASE Label="la_ColHeader_CreatedOn" Module="Core" Type="2">Q3JlYXRlZCBPbg==</PHRASE>
@@ -179,6 +178,7 @@
 			<PHRASE Label="la_col_Prompt" Module="Core" Type="1">RmllbGQgUHJvbXB0</PHRASE>
 			<PHRASE Label="la_col_Queued" Module="Core" Type="1">UXVldWVk</PHRASE>
 			<PHRASE Label="la_col_Rating" Module="Core" Type="1">UmF0aW5n</PHRASE>
+			<PHRASE Label="la_col_Referer" Module="Core" Type="1">UmVmZXJlcg==</PHRASE>
 			<PHRASE Label="la_col_RelationshipType" Module="Core" Type="1">UmVsYXRpb24gVHlwZQ==</PHRASE>
 			<PHRASE Label="la_col_ReviewedBy" Module="Core" Type="1">UmV2aWV3ZWQgQnk=</PHRASE>
 			<PHRASE Label="la_col_ReviewText" Module="Core" Type="1">UmV2aWV3IFRleHQ=</PHRASE>
@@ -239,6 +239,8 @@
 			<PHRASE Label="la_config_FullImageWidth" Module="Core" Type="1">RnVsbCBpbWFnZSBXaWR0aA==</PHRASE>
 			<PHRASE Label="la_config_KeepSessionOnBrowserClose" Module="Core" Type="1">S2VlcCBTZXNzaW9uIGFsaXZlIG9uIEJyb3dzZXIgY2xvc2U=</PHRASE>
 			<PHRASE Label="la_config_MailFunctionHeaderSeparator" Module="Core" Type="1">TWFpbCBGdW5jdGlvbiBIZWFkZXIgU2VwYXJhdG9y</PHRASE>
+			<PHRASE Label="la_config_MailingListQueuePerStep" Module="Core" Type="1">TWFpbGluZyBMaXN0IFF1ZXVlIFBlciBTdGVw</PHRASE>
+			<PHRASE Label="la_config_MailingListSendPerStep" Module="Core" Type="1">TWFpbGluZyBMaXN0IFNlbmQgUGVyIFN0ZXA=</PHRASE>
 			<PHRASE Label="la_config_MaxImageCount" Module="Core" Type="1">TWF4aW11bSBudW1iZXIgb2YgaW1hZ2Vz</PHRASE>
 			<PHRASE Label="la_config_name" Module="Core" Type="1">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_config_nopermission_template" Module="Core" Type="1">SW5zdWZmaWNlbnQgcGVybWlzc2lvbnMgdGVtcGxhdGU=</PHRASE>
@@ -252,6 +254,7 @@
 			<PHRASE Label="la_config_RequireSSLAdmin" Module="Core" Type="1">UmVxdWlyZSBTU0wgZm9yIEFkbWluaXN0cmF0aXZlIENvbnNvbGU=</PHRASE>
 			<PHRASE Label="la_config_require_ssl" Module="Core" Type="1">UmVxdWlyZSBTU0wgZm9yIGxvZ2luICYgY2hlY2tvdXQ=</PHRASE>
 			<PHRASE Label="la_config_ResizableFrames" Module="Core" Type="1">RnJhbWVzIGluIGFkbWluaXN0cmF0aXZlIGNvbnNvbGUgYXJlIHJlc2l6YWJsZQ==</PHRASE>
+			<PHRASE Label="la_config_Search_MinKeyword_Length" Module="Core" Type="1">TWluaW1hbCBTZWFyY2ggS2V5d29yZCBMZW5ndGg=</PHRASE>
 			<PHRASE Label="la_config_server_name" Module="Core" Type="1">U2VydmVyIE5hbWU=</PHRASE>
 			<PHRASE Label="la_config_server_path" Module="Core" Type="1">U2VydmVyIFBhdGg=</PHRASE>
 			<PHRASE Label="la_config_SiteAdmin" Module="Core" Type="1">U2l0ZSBBZG1pbg==</PHRASE>
@@ -1485,6 +1488,7 @@
 			<PHRASE Label="la_Records" Module="Core" Type="1">UmVjb3Jkcw==</PHRASE>
 			<PHRASE Label="la_record_being_edited_by" Module="Core" Type="1">VGhpcyByZWNvcmQgaXMgYmVpbmcgZWRpdGVkIGJ5IHRoZSBmb2xsb3dpbmcgdXNlcnM6DQolcw==</PHRASE>
 			<PHRASE Label="la_registration_captcha" Module="Core" Type="1">VXNlIENhcHRjaGEgY29kZSBvbiBSZWdpc3RyYXRpb24=</PHRASE>
+			<PHRASE Label="la_Regular" Module="Core" Type="1">UmVndWxhcg==</PHRASE>
 			<PHRASE Label="la_RemoveFrom" Module="Core" Type="1">UmVtb3ZlIEZyb20=</PHRASE>
 			<PHRASE Label="la_RequiredWarning" Module="Core" Type="1">Tm90IGFsbCByZXF1aXJlZCBmaWVsZHMgYXJlIGZpbGxlZC4gUGxlYXNlIGZpbGwgdGhlbSBmaXJzdC4=</PHRASE>
 			<PHRASE Label="la_restore_access_denied" Module="Core" Type="1">QWNjZXNzIGRlbmllZA==</PHRASE>
@@ -2006,6 +2010,7 @@
 			<PHRASE Label="la_title_AdditionalPermissions" Module="Core" Type="1">QWRkaXRpb25hbCBQZXJtaXNzaW9ucw==</PHRASE>
 			<PHRASE Label="la_title_Add_Module" Module="Core" Type="1">QWRkIE1vZHVsZQ==</PHRASE>
 			<PHRASE Label="la_title_Administrators" Module="Core" Type="1">QWRtaW5pc3RyYXRvcnM=</PHRASE>
+			<PHRASE Label="la_title_Advanced" Module="Core" Type="1">QWR2YW5jZWQ=</PHRASE>
 			<PHRASE Label="la_title_AdvancedView" Module="Core" Type="1">QWR2YW5jZWQgVmlldw==</PHRASE>
 			<PHRASE Label="la_title_Agents" Module="Core" Type="1">QWdlbnRz</PHRASE>
 			<PHRASE Label="la_title_Backup" Module="Core" Type="1">QmFja3Vw</PHRASE>
Index: branches/RC/core/admin_templates/user_selector.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/user_selector.tpl	(.../user_selector.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/user_selector.tpl	(.../user_selector.tpl)	(revision 11623)
@@ -2,7 +2,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="u" section="in-portal:user_list" grid="UserSelector" title_preset="user_select" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 11623)
@@ -4,7 +4,7 @@
 
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" perm_section="CATEGORY" permission_type="VIEW" system_permission="0" title_preset="categories_edit" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
@@ -65,7 +65,7 @@
 			<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="!la_fld_PageTitle!" size="70"/> <!-- la_fld_Name -->
 			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="!la_fld_Description!" control_options="{min_height: 130}" rows="7" cols="70"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title=" la_fld_AutoCreateFileName" onclick="reflectFilename()"/> <!-- la_fld_CategoryAutomaticFilename -->
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="la_fld_AutoCreateFileName" onclick="reflectFilename()"/> <!-- la_fld_CategoryAutomaticFilename -->
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Filename" title="la_fld_Filename" size="70" /> <!-- la_fld_CategoryFilename -->
 			<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>
 
Index: branches/RC/core/admin_templates/regional/languages_edit_email_events.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/regional/languages_edit_email_events.tpl	(.../languages_edit_email_events.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/regional/languages_edit_email_events.tpl	(.../languages_edit_email_events.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="events_list" tab_preset="Default" pagination="1" pagination_prefix="emailevents"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/submissions/submissions_list.tpl
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/admin_templates/submissions/submissions_list.tpl	(.../submissions_list.tpl)	(revision 11610)
+++ branches/RC/core/admin_templates/submissions/submissions_list.tpl	(.../submissions_list.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <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"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/tree.tpl
===================================================================
diff -u -r11232 -r11623
--- branches/RC/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 11232)
+++ branches/RC/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 11623)
@@ -3,72 +3,36 @@
 
 <inp2:m_NoDebug/>
 
-<body style="margin: 0px; height: 100%" bgcolor="#DCEBF6">
-<inp2:m_RenderElement name="kernel_form"/>
+<body class="tree-body" onresize="onTreeFrameResize();">
+
 <script type="text/javascript">
-	function credits(url)
-	{
-		var width = 200;
-		var height = 200;
-		var screen_x = (screen.availWidth-width)/2;
-		var screen_y = (screen.availHeight-height)/2;
-		window.open(url, 'credits', 'width=280,height=520,left='+screen_x+',top='+screen_y);
-	}
-</script>
+	var $last_width = null;
 
-<script src="js/ajax.js"></script>
-<script src="js/tree.js"></script>
-
-<style type="text/css">
-	.tree_head.td, .tree_head, .tree_head:hover {
-	   font-weight: bold;
-	   font-size: 10px;
-	   color: #FFFFFF;
-	   font-family: Verdana, Arial;
-	   text-decoration: none;
+	function credits(url) {
+		openwin(url, 'credits', 280, 520);
 	}
 
-	.tree {
-		padding: 0px;
-		border: none;
-		border-collapse: collapse;
-	}
+	function onTreeFrameResize() {
+		var $width = $('#sub_frameset', window.parent.document).attr('cols').split(',')[0];
+		if (($width <= 0) || ($width == $last_width)) {
+			// don't save zero width
+			return ;
+		}
 
-	.tree tr td {
-		padding: 0px;
-		margin: 0px;
-		font-family: helvetica, arial, verdana,;
-		font-size: 11px;
-		white-space: nowrap;
-	}
+		getFrame('head').$FrameResizer.OpenWidth = $width;
 
-	.tree tr td a {
-		font-size: 11px;
-    	color: #000000;
-    	font-family: Helvetica, Arial, Verdana;
-		text-decoration: none;
-	}
+		$.get(
+			'<inp2:m_Link template="index" adm_event="OnSaveMenuFrameWidth" pass="m,adm" js_escape="1" no_amp="1"/>',
+			{width: $width}
+		);
 
-	.tree tr td a:hover {
-		color: #009FF0;
+		$last_width = $width;
 	}
-</style>
+</script>
 
-<table style="height: 100%; width: 100%; border-collapse: collapse;" border="0">
-	<tr style="background: #5291DE url(img/menu_bar.gif) repeat-x left bottom;" class="tree_head">
-	    <td align="left" width="80%" height="21">
-	       &nbsp;<a class="tree_head">In-Portal v <inp2:adm_ModuleVersion module="In-Portal"/></a>
-	    </td>
-	    <td align="right" width="20%">
-			<select name="language" style="width: 62px; border: 0px; background-color: #FFFFFF; font-size: 9px; color: black;" onchange="submit_event('lang', 'OnChangeLanguage', 'index');">
-				<inp2:m_DefineElement name="lang_elem">
-					<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="PackName"/></option>
-				</inp2:m_DefineElement>
-				<inp2:lang_ListLanguages render_as="lang_elem" row_start_render_as="html:" row_end_render_as="html:"/>
-			</select>
-	    </td>
-	</tr>
+<script src="js/tree.js"></script>
 
+<table style="height: 100%; width: 100%; border-right: 1px solid #777; border-bottom: 1px solid #777;">
 	<tr>
 		<td colspan="2" style="vertical-align: top; padding: 5px;">
 			<inp2:m_DefineElement name="xml_node" icon_module="">
@@ -80,8 +44,8 @@
 			</inp2:m_DefineElement>
 
 			<table class="tree">
-			<tbody id="tree">
-			</tbody>
+				<tbody id="tree">
+				</tbody>
 			</table>
 			<script type="text/javascript">
 				var TREE_ICONS_PATH = 'img/tree';
@@ -90,36 +54,95 @@
 					var the_tree = new TreeFolder('tree', '<inp2:m_param name="label"/>', '<inp2:m_param name="section_url"/>', '<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon24_<inp2:m_param name="icon"/>.gif', null, null, '<inp2:m_param name="priority"/>', '<inp2:m_param name="container"/>');
 				</inp2:m_DefineElement>
 				<inp2:adm_PrintSection render_as="root_node" section_name="in-portal:root"/>
+
 				the_tree.AddFromXML('<tree><inp2:adm_PrintSections render_as="xml_node" section_name="in-portal:root"/></tree>');
+
+				<inp2:m_if check="adm_MainFrameLink">
+					var fld = the_tree.locateItemByURL('<inp2:adm_MainFrameLink m_opener="r" no_amp="1"/>');
+					if (fld) {
+						fld.highLight();
+					}
+					else {
+						the_tree.highLight();
+					}
+				<inp2:m_else/>
+					the_tree.highLight();
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
 </table>
 
-<inp2:m_include t="incs/footer"/>
-
 <script type="text/javascript">
-	// when changing language submit is made to frameset, not the current frame
-	var $kf = document.getElementById($form_name);
-	$kf.target = 'main_frame';
+	function checkCatalog($cat_id) {
+		var $ret = checkEditMode(false);
+		var $right_frame = getFrame('main');
 
-	function checkCatalog($cat_id, $module_prefix) {
+		if ($ret && $right_frame.$is_catalog) {
+			$right_frame.$Catalog.go_to_cat($cat_id);
+			return 1; // this opens folder, but disables click
+		}
+
+		return $ret;
+	}
+
+	function setCatalogTab($prefix) {
 		var $ret = checkEditMode();
 		var $right_frame = getFrame('main');
-		if ($ret && $right_frame.$is_catalog) {
-			$right_frame.$Catalog.go_to_cat($cat_id, $module_prefix);
+		if ($ret && typeof $right_frame.$Catalog != 'undefined') {
+			$right_frame.$Catalog.switchTab($prefix);
 			return 1; // this opens folder, but disables click
 		}
 		return $ret;
 	}
 
-	function checkEditMode()
+	function checkEditMode($reset_toolbar)
 	{
-		var $phrase = "<inp2:adm_TreeEditWarrning label="la_EditingInProgress" escape="1"/>";
+		if (!isset($reset_toolbar)) {
+			$reset_toolbar = true;
+		}
+
+		if ($reset_toolbar) {
+			getFrame('head').$('#extra_toolbar').html('');
+		}
+
+		var $phrase = "<inp2:adm_TreeEditWarrning label='la_EditingInProgress' escape='1'/>";
 		if (getFrame('main').$edit_mode) {
 			return confirm($phrase) ? true : false;
 		}
 
 		return true;
 	}
-</script>
\ No newline at end of file
+
+	function ReloadFolder(url, with_late_load)
+	{
+		if (!with_late_load) with_late_load = false;
+		var fld = the_tree.locateItemByURL(url, with_late_load);
+		if (fld) {
+			fld.reload();
+		}
+	}
+
+	function ShowStructure($url, $visible)
+	{
+		var fld = the_tree.locateItemByURL($url, true);
+		if (fld) {
+			if ($visible) {
+				fld.expand();
+			}
+			else {
+				fld.collapse();
+			}
+
+		}
+	}
+
+	function SyncActive(url) {
+		var fld = the_tree.locateItemByURL(url);
+		if (fld) {
+			fld.highLight();
+		}
+	}
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/config/config_general.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="conf" section="$section" perm_event="conf:OnLoad" title_preset="config_list_general"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/stylesheets/stylesheets_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/stylesheets/stylesheets_list.tpl	(.../stylesheets_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/stylesheets/stylesheets_list.tpl	(.../stylesheets_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:configure_styles" prefix="css" module="core" title_preset="styles_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:admins" prefix="u" title_preset="admins_edit" tab_preset="Admins"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 11623)
@@ -15,7 +15,7 @@
 	}
 </style>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11623)
@@ -1,121 +1,118 @@
-<inp2:m_DefineElement name="combined_header" permission_type="view" perm_section="" system_permission="1" title_preset="" tab_preset="" grid="Default" module="" icon="">
+<inp2:m_DefineElement name="combined_header" permission_type="view" perm_section="" perm_prefix="" perm_event="" system_permission="1" title_preset="" tab_preset="" additional_title_render_as="" additional_blue_bar_render_as="" pagination_prefix="" grid="Default">
 	<inp2:m_if check="m_Param" name="perm_section" inverse="1">
 		<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
 	</inp2:m_if>
 	<inp2:m_if check="m_Param" name="permission_type">
-		<inp2:m_RequireLogin permissions="{$perm_section}.{$permission_type}" system="$system_permission"/>
+		<inp2:m_RequireLogin permissions="{$perm_section}.{$permission_type}" perm_event="$perm_event" perm_prefix="$perm_prefix" system="$system_permission"/>
 	<inp2:m_else/>
-		<inp2:m_RequireLogin permissions="{$perm_section}" system="$system_permission"/>
+		<inp2:m_RequireLogin permissions="{$perm_section}" perm_event="$perm_event" perm_prefix="$perm_prefix" system="$system_permission"/>
 	</inp2:m_if>
 	<inp2:m_if check="m_Param" name="prefix" inverse="1"><inp2:adm_SectionInfo section="$section" info="SectionPrefix" result_to_var="prefix"/></inp2:m_if>
 	<inp2:m_if check="m_get" var="m_wid" inverse="1">
-		<table cellpadding="0" cellspacing="0" border="0" width="100%">
-			<tr<inp2:m_ifnot check="m_ModuleEnabled" module="Proj-Base"> style="background: url(<inp2:adm_SectionInfo section="$section" info="module_path" module="$module"/>img/logo_bg.gif) no-repeat top right; height: 55px;"</inp2:m_ifnot>>
-				<td valign="top" class="admintitle" align="left" style="padding-top: 10px; padding-bottom: 10px;">
-		    		<img width="46" height="46" src="<inp2:adm_SectionInfo section="$section" info="module_path" module="$module"/>img/icons/icon46_<inp2:adm_SectionInfo section="$section" info="icon"/>.gif" align="absmiddle" title="<inp2:adm_SectionInfo section="$section" info="label"/>">&nbsp;<inp2:adm_SectionInfo section="$section" info="label"/>
-		   		</td>
-			</tr>
-		</table>
+		<inp2:m_if check="m_GetConfig" name="UseSmallHeader">
+			<img src="img/spacer.gif" height="8" width="1" alt=""/>
+		<inp2:m_else/>
+			<table cellpadding="0" cellspacing="0" border="0" width="100%">
+				<!--## <tr<inp2:m_ifnot check="m_ModuleEnabled" module="Proj-Base"> style="background: url(<inp2:adm_SectionInfo section="$section" parent="1" info="module_path"/>img/logo_bg.gif) no-repeat top right; height: 55px;"</inp2:m_ifnot>> ##-->
+				<tr>
+					<td valign="top" class="admintitle" align="left" style="padding-top: 10px; padding-bottom: 10px;">
+			    		<img width="46" height="46" src="<inp2:adm_SectionInfo section="$section" parent="1" info="module_path"/>img/icons/icon46_<inp2:adm_SectionInfo section="$section" parent="1" info="icon"/>.gif" align="absmiddle" title="<inp2:adm_SectionInfo section="$section" parent="1" info="label"/>" alt=""/>&nbsp;<inp2:adm_SectionInfo section="$section" parent="1" info="label"/>
+			   		</td>
+			   		<inp2:m_if check="m_Param" name="additional_title_render_as">
+						<inp2:m_RenderElement name="$additional_title_render_as" pass_params="1"/>
+					</inp2:m_if>
+				</tr>
+			</table>
+		</inp2:m_if>
+	<inp2:m_else/>
+		<inp2:m_if check="m_Param" name="additional_title_render_as">
+			<table cellpadding="0" cellspacing="0" border="0" width="100%">
+				<!--## <tr<inp2:m_ifnot check="m_ModuleEnabled" module="Proj-Base"> style="background: url(<inp2:adm_SectionInfo section="$section" parent="1" info="module_path"/>img/logo_bg.gif) no-repeat top right; height: 55px;"</inp2:m_ifnot>> ##-->
+				<tr>
+					<inp2:m_RenderElement name="$additional_title_render_as" pass_params="1"/>
+				</tr>
+			</table>
+		</inp2:m_if>
 	</inp2:m_if>
 
+	<inp2:$prefix_ModifyUnitConfig pass_params="1"/>
+
 	<inp2:m_if check="m_Param" name="tabs">
-		<inp2:m_include t="$tabs"/>
+		<inp2:m_include t="$tabs" pass_params="1"/>
 	</inp2:m_if>
 
 	<inp2:m_if check="m_Param" name="tab_preset">
 		<inp2:m_RenderElement name="edit_tabs" prefix="$prefix" preset_name="$tab_preset"/>
 	</inp2:m_if>
 
-	<table cellpadding="0" cellspacing="0" width="100%">
+	<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" style="height: 30px;">
 		<tr>
-			<td class="tablenav">
-				<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
-					<tr>
-						<td class="header_left_bg" nowrap valign="middle">
-							<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
-							<span class="tablenav_link" id="blue_bar"><inp2:{$prefix}_SectionTitle title_preset="$title_preset" title="$default_title" cut_first="100" {$prefix}[grid]="{$grid}" pass_params="true"/></span>
-						</td>
-						<td align="right" valign="middle">
-							<script type="text/javascript">
-								set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
-							</script>
-							<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
-								<script>
-									var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
-									$help_url = $help_url.replace(/#/g, '%23');
-								</script>
-								<a href="javascript: OpenHelp($help_url);">
-									<img src="img/blue_bar_help.gif" border="0">
-								</a>
-							</inp2:m_if>
-							<inp2:m_if check="m_Param" name="pagination">
-								<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="$prefix" pass_params="1"/>
-							</inp2:m_if>
-						</td>
-					</tr>
-				</table>
+			<td class="header_left_bg" nowrap="nowrap" style="vertical-align: middle;">
+				<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
+				<inp2:adm_SectionInfo section="$section" parent="1" info="label" result_to_var="group_title"/>
+				<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" section="$section" title="$default_title" group_title="$group_title" cut_first="100" pass_params="true"/></span>
 			</td>
+			<td align="right" class="tablenav" style="vertical-align: middle;">
+				<inp2:m_if check="m_Param" name="additional_blue_bar_render_as">
+					<inp2:m_RenderElement name="$additional_blue_bar_render_as" />
+				<inp2:m_else/>
+					<inp2:m_if check="m_Param" name="pagination">
+						<inp2:$prefix_SelectParam possible_names="pagination_prefix,prefix" result_to_var="pagination_prefix"/>
+						<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="$pagination_prefix" pass_params="1"/>
+					</inp2:m_if>
+				</inp2:m_if>
+			</td>
 		</tr>
 	</table>
 
+	<script type="text/javascript">
+		var $visible_toolbar_buttons = <inp2:m_if check="{$prefix}_VisibleToolbarButtons" title_preset="$title_preset">[<inp2:$prefix_VisibleToolbarButtons title_preset="$title_preset"/>]<inp2:m_else/>true</inp2:m_if>;
+		set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
+		setHelpLink('<inp2:lang.current_Field name="UserDocsUrl" js_escape="1"/>', '<inp2:m_Param name="title_preset" js_escape="1"/>');
+	</script>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="section_header">
-	<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse">
-		<inp2:m_RenderElement name="section_header_new" pass_params="true"/>
-	<inp2:m_else />
-		<table cellpadding="0" cellspacing="0" border="0" width="100%">
-			<tr class="section_header_bg">
-				<td valign="top" class="admintitle" align="left" style="padding-top: 2px; padding-bottom: 2px;">
-		    		<img width="46" height="46" src="img/icons/<inp2:adm_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$title"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$title"/>
-		   		</td>
-			</tr>
-		</table>
-	</inp2:m_if>
+	<strong>DEPRICATED. PLEASE USE "COMBINED_HEADER"</strong>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="section_header_new" module="#session#">
-		<table cellpadding="0" cellspacing="0" border="0" width="100%">
-			<tr style="background: url(<inp2:ModulePath module="$module"/>img/logo_bg.gif) no-repeat top right; height: 55px;">
-				<td valign="top" class="admintitle" align="left" style="padding-top: 10px; padding-bottom: 10px;">
-		    		<img width="46" height="46" src="<inp2:ModulePath module="$module"/>img/icons/<inp2:adm_GetSectionIcon icon="$icon"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$title"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$title"/>
-		   		</td>
+<inp2:m_DefineElement name="blue_bar" module="" icon="" pagination="0">
+	<!--## DEPRICATED, BUT USED IN "no_permission.tpl". ##-->
+		<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" style="height: 30px;">
+			<tr>
+				<td class="header_left_bg" nowrap="nowrap" valign="middle">
+					<span class="tablenav_link" id="blue_bar"><inp2:{$prefix}_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/></span>
+				</td>
+				<td align="right" class="tablenav" valign="middle">
+					<script type="text/javascript">
+						set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
+						setHelpLink('<inp2:lang.current_Field name="UserDocsUrl" js_escape="1"/>', '<inp2:m_Param name="title_preset" js_escape="1"/>');
+					</script>
+					<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
+						<script>
+							var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
+							$help_url = $help_url.replace(/#/g, '%23');
+						</script>
+					</inp2:m_if>
+					<inp2:m_if check="m_Param" name="pagination">
+						<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="$prefix" pass_params="1"/>
+					</inp2:m_if>
+				</td>
 			</tr>
 		</table>
-</inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="blue_bar" module="" icon="" pagination="0">
-	<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
-		<tr>
-			<td class="header_left_bg" nowrap width="80%" valign="middle">
-				<span class="tablenav_link" id="blue_bar"><inp2:{$prefix}_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/></span>
-			</td>
-			<td align="right" class="tablenav" width="20%" valign="middle">
-				<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
-					<script>
-						var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
-						$help_url = $help_url.replace(/#/g, '%23');
-						set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') );
-					</script>
-					<a href="javascript: OpenHelp($help_url);">
-						<img src="img/blue_bar_help.gif" border="0">
-					</a>
-				</inp2:m_if>
-				<inp2:m_if check="m_Param" name="pagination">
-					<inp2:m_RenderElement name="grid_pagination_elem" grid="st" PrefixSpecial="$prefix" pass_params="1"/>
-				</inp2:m_if>
-			</td>
-		</tr>
-	</table>
+		<script type="text/javascript">
+			var $visible_toolbar_buttons = <inp2:m_if check="{$prefix}_VisibleToolbarButtons" title_preset="$title_preset">[<inp2:$prefix_VisibleToolbarButtons title_preset="$title_preset"/>]<inp2:m_else/>true</inp2:m_if>;
+		</script>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_original_label">
 	<td><inp2:$prefix.original_Field field="$field" nl2br="1"/></td>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="subsection" prefix="">
+<inp2:m_DefineElement name="subsection" prefix="" colspan="4">
 	<tr class="subsectiontitle">
-		<td colspan="3"><inp2:m_phrase label="$title"/></td>
+		<td colspan="<inp2:m_param name='colspan'/>"><inp2:m_phrase label="$title"/></td>
 		<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse">
 			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 				<td><inp2:m_phrase name="$original_title"/></td>
@@ -126,26 +123,35 @@
 
 <inp2:m_DefineElement name="inp_edit_field_caption" title="" subfield="" NamePrefix="">
 	<inp2:m_inc param="tab_index" by="1"/>
-	<td class="text" nowrap>
+	<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', '<inp2:m_Param name="field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="prefix" js_escape="1"/>')">
 		<inp2:m_if check="m_Param" name="title">
-			<label for="<inp2:m_param name="NamePrefix"/><inp2:InputName field="$field" subfield="$subfield"/>">
-				<span class="<inp2:m_if check="HasError" field="$field" >error</inp2:m_if>">
-				<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field" ><span class="error">&nbsp;*</span></inp2:m_if>:
+			<label for="<inp2:m_param name="NamePrefix"/><inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>">
+				<span class="<inp2:m_if check="{$prefix}_HasError" field="$field">error-cell</inp2:m_if>" >
+				<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required">&nbsp;*</span></inp2:m_if>:
 			</label>
 		<inp2:m_else/>
 			&nbsp;
 		</inp2:m_if>
 	</td>
+	<td class="control-mid">&nbsp;</td>
+	<script type="text/javascript">
+		if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
+			fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
+		}
+		fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>'] = '<inp2:m_phrase label="$title" js_escape="1"/>'
+	</script>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_label" is_last="" as_label="" currency="" nl2br="0" is_last="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<inp2:m_DefineElement name="inp_label" is_last="" subfield="" style="" format="" hint_label="" as_label="" currency="" nl2br="0" is_last="">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td valign="top" class="text">
-			<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency" nl2br="$nl2br"/>
+		<td class="control-cell" valign="top">
+			<span style="<inp2:m_Param name="style"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>">
+				<inp2:{$prefix}_Field field="$field" format="$format" as_label="$as_label" currency="$currency" nl2br="$nl2br"/>
+			</span>
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
-    	<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+    	<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
     	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
@@ -160,41 +166,44 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_error">
-	<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+	<script type="text/javascript">
+		add_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', '<inp2:m_Param name="field" js_escape="1"/>', '<inp2:{$prefix}_InputName field="$field"/>', '<inp2:{$prefix}_Error field="$field" js_escape="1"/>')
+	</script>
+	<!--##<td class="error-cell"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_box" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<inp2:m_DefineElement name="inp_edit_box" subfield="" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" style="width: 100%">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
-		<td>
-			<input type="text" name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" value="<inp2:{$prefix}_Field field="$field" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
+		<td class="control-cell">
+			<input style="<inp2:m_Param name="style"/>" type="text" name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" value="<inp2:{$prefix}_Field field="$field" format="$format" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>" onkeyup="<inp2:m_Param name="onkeyup"/>" onchange="<inp2:m_Param name="onchange"/>">
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_password" class="" size="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<inp2:m_DefineElement name="inp_edit_password" class="" size="" style="">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td>
-			<input type="password" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" />
+		<td class="control-cell">
+			<input style="<inp2:m_Param name="style"/>" type="password" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" />
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_upload" class="" size="" thumbnail="" is_last="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<inp2:m_DefineElement name="inp_edit_upload" class="" size="" thumbnail="" is_last="" style="">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td>
+		<td class="control-cell">
 			<inp2:m_if check="m_Param" name="thumbnail">
 				<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
 					<img src="<inp2:{$prefix}_Field field="$field" format="resize:{$thumbnail}"/>" alt=""/><br />
@@ -219,17 +228,37 @@
 			</inp2:m_if>
 			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" id="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>">
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_box_ml">
+	<inp2:m_RenderElement name="inp_edit_box" format="no_default" pass_params="true"/>
+	<!--##
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+		<td class="label-cell" valign="top">
+			<span class="<inp2:m_if check="{$prefix}_HasError" field="$field">error-cell</inp2:m_if>" >
+			<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required">&nbsp;*</span></inp2:m_if>:</span><br>
+			<a href="javascript:PreSaveAndOpenTranslator('<inp2:m_param name="prefix"/>', '<inp2:m_param name="field"/>', 'popups/translator');" title="<inp2:m_Phrase label="la_Translate"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand" border="0"></a>
+		</td>
+		<td class="control-cell">
+			<input style="<inp2:m_Param name="style"/>" type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" format="no_default"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
+		</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
+	</tr>
+	##-->
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_swf_upload" class="" is_last="" style="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td class="uploader-text">
+		<td class="control-cell">
 			<div class="uploader-main" id="<inp2:{$prefix}_InputName field="$field"/>_progress">
 				<div class="uploader-percent" id="<inp2:{$prefix}_InputName field="$field"/>_percent">0%</div>
 				<div class="uploader-left">
@@ -302,136 +331,180 @@
 						buttonPlaceholderId: '<inp2:{$prefix}_InputName field="$field"/>_place_holder'
 					}
 				)
-				UploadsManager.formContainerId = 'scroll_container';
 			</script>
 
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_box_ml" class="" size="" onblur="" maxlength="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<td class="text" valign="top">
-			<span class="<inp2:m_if check="{$prefix}_HasError" field="$field" >error</inp2:m_if>">
-			<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="$field" ><span class="error"> *</span></inp2:m_if>:</span><br>
-			<a href="javascript:PreSaveAndOpenTranslator('<inp2:m_param name="prefix"/>', '<inp2:m_param name="field"/>', 'popups/translator');" title="<inp2:m_Phrase label="la_Translate"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand" border="0"></a>
-		</td>
-		<td>
-			<input type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" format="no_default"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
-		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
-	</tr>
-</inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="inp_edit_hidden" db="">
 	<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="$db"/>">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_date" class="" is_last="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td>
-			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="{$field}_date" title="$title" is_last="$is_last"/>
+		<td class="control-cell">
+			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;
+			<img src="img/calendar_icon.gif" id="cal_img_<inp2:{$prefix}_InputName field="{$field}"/>"
+					     style="cursor: pointer; margin-right: 5px"
+					     title="Date selector"
+					/>
+			<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
-				initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
+				Calendar.setup({
+			        inputField		:	"<inp2:{$prefix}_InputName field="{$field}_date"/>",
+			        ifFormat		:	Calendar.phpDateFormat("<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>"),
+			        button			:	"cal_img_<inp2:{$prefix}_InputName field="{$field}"/>",
+			        align			:	"br",
+			        singleClick		:	true,
+			        showsTime		:	true,
+			        weekNumbers		:	false,
+			        firstDay		:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
+			        onUpdate	:	function(cal) {
+			        	runOnChange('<inp2:$prefix_InputName field="{$field}_date"/>');
+			       	}
+				});
 			</script>
 			<input type="hidden" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time" input_format="1"/>" value="">
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="{$field}_date"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" field="{$field}_date" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_time" class="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="{$field}_time" title="$title" is_last="$is_last"/>
 		<td class="control-cell">
 			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time"/>" value="<inp2:{$prefix}_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>">&nbsp;
 			<span class="small">(<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
 
 			<input type="hidden" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date" input_format="1"/>" value="">
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="{$field}_time"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" field="{$field}_time" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_date_time" class="" is_last="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td>
+		<td class="control-cell">
 			<!-- <input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>"> -->
 			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
+			<img src="img/calendar_icon.gif" id="cal_img_<inp2:{$prefix}_InputName field="{$field}"/>"
+					     style="cursor: pointer; margin-right: 5px"
+					     title="Date selector"
+					/>
 				<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
-
-
+			<input type="hidden" id="full_date_<inp2:{$prefix}_InputName field="{$field}"/>" value="<inp2:{$prefix}_Field field="{$field}" format=""/>" />
 			<script type="text/javascript">
-				initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
+				Calendar.setup({
+			        inputField	:	"full_date_<inp2:{$prefix}_InputName field="{$field}"/>",
+			        ifFormat	:	Calendar.phpDateFormat("<inp2:{$prefix}_Format field="{$field}" input_format="1"/>"),
+			        button		:	"cal_img_<inp2:{$prefix}_InputName field="{$field}"/>",
+			        align		:	"br",
+			        singleClick	:	true,
+			        showsTime	:	true,
+			        weekNumbers	:	false,
+			        firstDay	:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
+			        onUpdate	:	function(cal) {
+			        	document.getElementById('<inp2:{$prefix}_InputName field="{$field}_date"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>") );
+			        	document.getElementById('<inp2:{$prefix}_InputName field="{$field}_time"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:{$prefix}_Format field="{$field}_time" input_format="1"/>") );
+			       	}
+				});
 			</script>
 			&nbsp;<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time"/>" value="<inp2:{$prefix}_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>"><span class="small"> (<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_textarea" class="" allow_html="allow_html">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<td class="text" valign="top">
-			<span class="<inp2:m_if check="{$prefix}_HasError" field="$field" >error</inp2:m_if>">
-			<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="$field" ><span class="error"> *</span></inp2:m_if>:</span><br>
+<inp2:m_DefineElement name="inp_edit_textarea" class="" format="" edit_template="popups/editor" allow_html="allow_html" style="text-align: left; width: 100%; height: 100px;" control_options="false">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>" style="height: auto">
+		<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', '<inp2:m_Param name="field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="prefix" js_escape="1"/>')" valign="top">
+			<span class="<inp2:m_if check="{$prefix}_HasError" field="$field">error-cell</inp2:m_if>" >
+			<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required">&nbsp;*</span></inp2:m_if>:</span><br>
 			<inp2:m_if check="m_ParamEquals" name="allow_html" value="allow_html">
-				<a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
+				<inp2:{$prefix}_InputName field="$field" result_to_var="input_name"/>
+				<a href="<inp2:m_Link template='$edit_template' TargetField='$input_name' pass_through='TargetField' pass='m,$prefix'/>" onclick="openwin(this.href, 'html_edit', 800, 575); return false;">
+					<img src="img/icons/icon24_link_editor.gif" style="cursor: hand;" border="0">
+				</a>
+				<!--## <a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a> ##-->
 			</inp2:m_if>
 		</td>
-		<td>
-			<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" class="<inp2:m_param name="class"/>"><inp2:{$prefix}_Field field="$field"/></textarea>
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label">
-				<br /><span class="small"><inp2:m_phrase label="$hint_label"/></span>
-			</inp2:m_if>
+		<td class="control-mid">&nbsp;</td>
+			<script type="text/javascript">
+				if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
+					fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
+				}
+				fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>'] = '<inp2:m_phrase label="$title" js_escape="1"/>'
+			</script>
+		<td class="control-cell">
+			<textarea style="<inp2:m_Param name='style'/>" tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" ><inp2:{$prefix}_Field field="$field" format="$format"/></textarea>
+			<script type="text/javascript">
+				Form.addControl('<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_param name="control_options"/>);
+			</script>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_textarea_ml" class="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<td class="text" valign="top">
-			<span class="<inp2:m_if check="{$prefix}_HasError" field="$field" >error</inp2:m_if>">
-			<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="$field" ><span class="error"> *</span></inp2:m_if>:</span><br>
+<inp2:m_DefineElement name="inp_edit_fck" subfield="" class="" is_last="" maxlength="" bgcolor="" onblur="" size="" onkeyup="" style="" control_options="false">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<td class="control-cell" colspan="4" onmouseover="show_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', '<inp2:m_Param name="field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="prefix" js_escape="1"/>')">
+			<inp2:FCKEditor field="$field" width="100%" bgcolor="$bgcolor" height="200" late_load="1"/>
+			<script type="text/javascript">
+				if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
+					fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
+				}
+				fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>'] = '<inp2:m_phrase label="$title" js_escape="1"/>'
+
+				Form.addControl('<inp2:$prefix_InputName field="$field"/>___Frame', <inp2:m_param name="control_options"/>);
+			</script>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_textarea_ml">
+	<inp2:m_RenderElement name="inp_edit_textarea" format="no_default" pass_params="true"/>
+	<!--##<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+		<td class="label-cell"valign="top">
+			<span class="<inp2:m_if check="{$prefix}_HasError" field="$field">error-cell</inp2:m_if>" >
+			<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required">&nbsp;*</span></inp2:m_if>:</span><br>
 			<a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
 			<a href="javascript:PreSaveAndOpenTranslator('<inp2:m_param name="prefix"/>', '<inp2:m_param name="field"/>', 'popups/translator', 1);" title="<inp2:m_Phrase label="la_Translate"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand" border="0"></a>
 		</td>
+		<td class="control-mid">&nbsp;</td>
 		<td>
 			<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" class="<inp2:m_param name="class"/>"><inp2:{$prefix}_Field field="$field"/></textarea>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
-	</tr>
+	</tr>##-->
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_user" class="" size="" is_last="" old_style="0" onkeyup="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td>
+		<td class="control-cell">
 			<input type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>" onkeyup="<inp2:m_Param name="onkeyup"/>">
 			<inp2:m_if check="m_ParamEquals" name="old_style" value="1">
 				<a href="#" onclick="return OpenUserSelector('','kernel_form','<inp2:{$prefix}_InputName field="$field"/>');">
@@ -441,17 +514,17 @@
           		 <img src="img/icons/icon24_link_user.gif" style="cursor:hand;" border="0">
          	</a>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_category" class="" size="" is_last="" old_style="0" onkeyup="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td>
+		<td class="control-cell">
 			<table cellpadding="0" cellspacing="0">
 				<tr>
 					<td id="<inp2:{$prefix}_InputName field="$field"/>_path">
@@ -462,7 +535,7 @@
 							<inp2:m_param name="cat_name"/>
 						</inp2:m_DefineElement>
 
-						<inp2:{$prefix}_FieldCategoryPath field="$field" separator=" &gt; " render_as="category_caption"/>
+						<inp2:$prefix_FieldCategoryPath field="$field" separator=" &gt; " render_as="category_caption"/>
 						<inp2:m_RenderElement name="inp_edit_hidden" pass_params="1"/>
 					</td>
 					<td valign="middle">
@@ -484,7 +557,7 @@
 				</tr>
 			</table>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 	</tr>
 </inp2:m_DefineElement>
 
@@ -496,10 +569,10 @@
 	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_options" is_last="" has_empty="0" empty_value="" onchange="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<inp2:m_DefineElement name="inp_edit_options" is_last="" onchange="" has_empty="0" empty_value="" style="">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td>
+		<td class="control-cell">
 			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" onchange="<inp2:m_Param name="onchange"/>">
 				<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
 					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
@@ -508,17 +581,17 @@
 				</inp2:m_if>
 			</select>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_multioptions" is_last="" has_empty="0" empty_value="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<inp2:m_DefineElement name="inp_edit_multioptions" is_last="" has_empty="0" empty_value="" style="">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td>
+		<td class="control-cell">
 			<select multiple tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:{$prefix}_InputName field="$field"/>_select" onchange="update_multiple_options('<inp2:{$prefix}_InputName field="$field"/>');">
 				<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
 					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
@@ -528,7 +601,7 @@
 			</select>
 			<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>"/>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
@@ -544,32 +617,32 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_radio" is_last="" pass_tabindex="" onclick="" onchange="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td>
+		<td class="control-cell">
 			<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
 				<inp2:{$prefix}_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_phrase" selected="checked" onclick="$onclick" onchange="$onchange" />
 			<inp2:m_else />
 				<inp2:{$prefix}_PredefinedOptions field="$field" tabindex="$pass_tabindex" block="inp_radio_item" selected="checked" onclick="$onclick" onchange="$onchange" />
 			</inp2:m_if>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_checkbox" is_last="" field_class="" onchange="" onclick="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last" NamePrefix="_cb_"/>
-		<td>
+		<td class="control-cell">
 			<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>">
 			<!--<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="$field"/>" name="_cb_<inp2:{$prefix}_InputName field="$field"/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'));" onchange="<inp2:m_param name="onchange"/>">-->
 			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="$field"/>" name="_cb_<inp2:{$prefix}_InputName field="$field"/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'));<inp2:m_param name="onchange"/>" onclick="<inp2:m_param name="onclick"/>">
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
@@ -585,40 +658,43 @@
 	<input type="checkbox" <inp2:m_param name="checked"/> id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="update_checkbox_options(/^<inp2:{$prefix}_InputName field="$field" as_preg="1"/>_([0-9A-Za-z-]+)/, '<inp2:{$prefix}_InputName field="$field"/>');"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_checkboxes" no_empty="" is_last="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+<inp2:m_DefineElement name="inp_edit_checkboxes" no_empty="" pass_tabindex="" is_last="">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td>
+		<td class="control-cell">
 			<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
 				<inp2:{$prefix}_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" block="inp_checkbox_phrase" selected="checked"/>
 			<inp2:m_else/>
 				<inp2:{$prefix}_PredefinedOptions field="$field" no_empty="$no_empty" tabindex="$pass_tabindex" block="inp_checkbox_item" selected="checked"/>
 			</inp2:m_if>
 			<inp2:m_RenderElement prefix="$prefix" name="inp_edit_hidden" field="$field" db="db"/>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_checkbox_allow_html" field_class="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<td colspan="2">
-			<label for="_cb_<inp2:m_param name="field"/>"><inp2:m_phrase label="la_enable_html"/></label>
-			<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>">
-			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:{$prefix}_Field field="$field" checked="checked"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'))">
-			<br>
-			<span class="hint"><img src="img/smicon7.gif" width="14" height="14" align="absmiddle"><inp2:m_phrase label="la_Warning_Enable_HTML"/></span>
+<inp2:m_DefineElement name="inp_edit_checkbox_allow_html" is_last="" field_class="" onchange="" onclick="" title="la_enable_html" hint_label="la_Warning_Enable_HTML">
+	<inp2:m_RenderElement name="inp_edit_checkbox" pass_params="1"/>
 
+	<!--##<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+
+		<td class="control-cell">
+			<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>">
+			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="$field"/>" name="_cb_<inp2:{$prefix}_InputName field="$field"/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'));<inp2:m_param name="onchange"/>" onclick="<inp2:m_param name="onclick"/>">
+			<inp2:m_if check="{$prefix}_HasParam" name="hint_label">
+				<span class="hint"><inp2:m_phrase label="$hint_label"/></span>
+			</inp2:m_if>
 		</td>
-		<td>&nbsp;</td>
-	</tr>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+	</tr>##-->
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_weight" subfield="" class="" is_last="" maxlength="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" is_last="$is_last"/>
 		<td>
 			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
@@ -632,20 +708,29 @@
 				<inp2:m_phrase label="la_oz" />
 			</inp2:m_if>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_filler" control_options="false">
-
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>" style="height: auto">
+		<td class="label-cell-filler" ></td>
+		<td class="control-mid-filler" ></td>
+		<td class="control-cell-filler">
+			<div id="form_filler" style="width: 100%; height: 5px; background-color: inherit"></div>
+			<script type="text/javascript">
+				Form.addControl('form_filler', <inp2:m_param name="control_options"/>);
+			</script>
+		</td>
+	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="ajax_progress_bar">
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
-		<tr class="table-color1">
+	<table width="100%" border="0" cellspacing="0" cellpadding="2" class="tableborder">
+		<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 			<td colspan="2">
 				<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
 				<!-- progress bar paddings: begin -->
@@ -683,19 +768,19 @@
 				<img src="img/spacer.gif" height="10" width="1" alt="" /><br />
 			</td>
 		</tr>
-		<tr class="table-color2">
+		<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 			<td width="50%" align="right"><inp2:m_phrase name="la_fld_PercentsCompleted"/>:</td>
 			<td id="progress_display[percents_completed]">0%</td>
 		</tr>
-		<tr class="table-color1">
+		<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 			<td align="right"><inp2:m_phrase name="la_fld_ElapsedTime"/>:</td>
 			<td id="progress_display[elapsed_time]">00:00</td>
 		</tr>
-		<tr class="table-color2">
+		<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 			<td align="right"><inp2:m_phrase name="la_fld_EstimatedTime"/>:</td>
 			<td id="progress_display[Estimated_time]">00:00</td>
 		</tr>
-		<tr class="table-color1">
+		<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
 			<td align="center" colspan="2">
 				<input type="button" class="button" onclick="<inp2:m_param name="cancel_action"/>" value="<inp2:m_phrase name="la_Cancel"/>" />
 			</td>
@@ -732,7 +817,7 @@
 				<div style="overflow: hidden; height: 23px;" class="tab-viewport">
 					<table class="tabs" cellpadding="0" cellspacing="0" height="23">
 						<tr>
-							<inp2:m_RenderElement name="$tabs_render_as" />
+							<inp2:m_RenderElement name="$tabs_render_as" pass_params="1"/>
 						</tr>
 					</table>
 				</div>
@@ -760,45 +845,89 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="ml_selector" prefix="">
-
+<inp2:m_DefineElement name="ml_selector" prefix="" field="Translated">
+	<inp2:m_if check="lang_IsMultiLanguage">
+		<td align="right" style="padding-right: 5px;">
+			<table width="100%" cellpadding="0" cellspacing="0">
+				<tr>
+					<td align="right">
+						<inp2:m_phrase name="la_fld_Language"/>:
+						<select name="language" onchange="submit_event('<inp2:m_param name="prefix"/>', 'OnPreSaveAndChangeLanguage');">
+							<inp2:m_DefineElement name="lang_elem">
+								<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="LocalName" no_special='no_special' /></option>
+							</inp2:m_DefineElement>
+							<inp2:lang_PrintList render_as="lang_elem"/>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td align="right">
+						<inp2:m_if check="lang_IsPrimaryLanguage">
+							<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="1">
+							<input type="checkbox" disabled id="_cb_<inp2:{$prefix}_InputName field="$field"/>" name="_cb_<inp2:{$prefix}_InputName field="$field"/>" checked="checked"/>
+						<inp2:m_else/>
+							<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>">
+							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="$field"/>" name="_cb_<inp2:{$prefix}_InputName field="$field"/>" <inp2:{$prefix}_Field field="$field" checked="checked"/> onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'));" />
+						</inp2:m_if>
+						<label for="_cb_<inp2:{$prefix}_InputName field="$field"/>"><inp2:m_Phrase label="la_Translated"/></label>
+					</td>
+				</tr>
+				<tr>
+					<td align="right" style="vertical-align: bottom; padding: 2px 0px 5px 2px;">
+						<span style="color: red">*</span>&nbsp;<span class="req-note"><inp2:m_Phrase name="la_text_RequiredFields"/></span>
+					</td>
+				</tr>
+			</table>
+		</td>
+	<inp2:m_else/>
+		<td align="right" style="vertical-align: bottom; padding: 2px 5px 5px 2px;">
+			<span style="color: red">*</span>&nbsp;<span class="req-note"><inp2:m_Phrase name="la_text_RequiredFields"/></span>
+		</td>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="form_error_warning">
-
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
+  		<tr>
+    		<td valign="top" class="form-warning">
+    			<inp2:m_phrase name="la_Warning_NewFormError"/><br/>
+    			<span id="error_msg_<inp2:m_Param name="prefix"/>" style="font-weight: bold"><br/></span>
+    		</td>
+  		</tr>
+	</table>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_minput" style="" format="" allow_add="1" allow_edit="1" allow_delete="1" allow_move="1" title="">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td>
+		<td class="control-cell">
 			<table>
 				<tr>
 					<td colspan="2">
-						<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name="la_btn_Add"/>" id="<inp2:{$prefix}_InputName field="$field"/>_add_button"/>
-						<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name="la_btn_Cancel"/>" id="<inp2:{$prefix}_InputName field="$field"/>_cancel_button"/>
+						<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name="la_btn_Add"/>" id="<inp2:$prefix_InputName field="$field"/>_add_button"/>
+						<input type="button" class="button" style="width: 70px;" value="<inp2:m_Phrase name="la_btn_Cancel"/>" id="<inp2:$prefix_InputName field="$field"/>_cancel_button"/>
 					</td>
 				</tr>
 				<tr>
 					<td valign="top">
-						<select multiple tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:{$prefix}_InputName field="$field"/>_minput" style="<inp2:m_Param name="style"/>">
+						<select multiple tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:$prefix_InputName field="$field"/>_minput" style="<inp2:m_Param name="style"/>">
 						</select>
 					</td>
 					<td valign="top">
 						<inp2:m_if check="m_Param" name="allow_edit">
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_Edit"/>" id="<inp2:{$prefix}_InputName field="$field"/>_edit_button"/><br />
+							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_Edit"/>" id="<inp2:$prefix_InputName field="$field"/>_edit_button"/><br />
 							<img src="img/spacer.gif" height="4" width="1" alt=""/><br />
 						</inp2:m_if>
 
 						<inp2:m_if check="m_Param" name="allow_delete">
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_Delete"/>" id="<inp2:{$prefix}_InputName field="$field"/>_delete_button"/><br />
+							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_Delete"/>" id="<inp2:$prefix_InputName field="$field"/>_delete_button"/><br />
 						</inp2:m_if>
 
 						<inp2:m_if check="m_Param" name="allow_move">
 							<br /><br />
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_MoveUp"/>" id="<inp2:{$prefix}_InputName field="$field"/>_moveup_button"/><br />
+							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_MoveUp"/>" id="<inp2:$prefix_InputName field="$field"/>_moveup_button"/><br />
 						<img src="img/spacer.gif" height="4" width="1" alt=""/><br />
-							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_MoveDown"/>" id="<inp2:{$prefix}_InputName field="$field"/>_movedown_button"/><br />
+							<input type="button" class="button" style="width: 100px;" value="<inp2:m_Phrase name="la_btn_MoveDown"/>" id="<inp2:$prefix_InputName field="$field"/>_movedown_button"/><br />
 						</inp2:m_if>
 					</td>
 				</tr>
@@ -828,14 +957,14 @@
 				</script>
 			</table>
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_picker" is_last="" has_empty="0" empty_value="" style="width: 225px;" size="15">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-		<td>
+		<td class="control-cell">
 			<table cellpadding="0" cellspacing="0">
 				<tr>
 					<td><strong><inp2:m_Phrase label="la_SelectedItems" /></strong></td>
@@ -853,8 +982,8 @@
 						</select>
 					</td>
 					<td align="center">
-						<img src="img/icons/icon_left.gif" id="<inp2:{$prefix}_InputName name="$field" />_move_left_button"/><br />
-						<img src="img/icons/icon_right.gif" id="<inp2:{$prefix}_InputName name="$field" />_move_right_button"/>
+						<img src="img/icons/icon_left.gif" id="<inp2:$prefix_InputName name="$field" />_move_left_button"/><br />
+						<img src="img/icons/icon_right.gif" id="<inp2:$prefix_InputName name="$field" />_move_right_button"/>
 					</td>
 					<td>
 						<select multiple id="<inp2:$prefix_InputName name="$field" />_available" style="<inp2:m_param name="style"/>" size="<inp2:m_param name="size"/>">
@@ -864,15 +993,15 @@
 				</tr>
 			</table>
 
-			<input type="hidden" name="<inp2:{$prefix}_InputName name="$field" />" id="<inp2:{$prefix}_InputName name="$field" />" value="<inp2:{$prefix}_Field field="$field" db="db"/>">
-			<input type="hidden" name="unselected_<inp2:{$prefix}_InputName name="$field" />" id="<inp2:{$prefix}_InputName name="$field" />_available_field" value="">
+			<input type="hidden" name="<inp2:$prefix_InputName name="$field" />" id="<inp2:$prefix_InputName name="$field" />" value="<inp2:$prefix_Field field="$field" db="db"/>">
+			<input type="hidden" name="unselected_<inp2:$prefix_InputName name="$field" />" id="<inp2:$prefix_InputName name="$field" />_available_field" value="">
 
 			<script type="text/javascript">
-				<inp2:m_Param name="field"/> = new EditPickerControl('<inp2:m_Param name="field"/>', '<inp2:{$prefix}_InputName name="$field" />');
+				<inp2:m_Param name="field"/> = new EditPickerControl('<inp2:m_Param name="field"/>', '<inp2:$prefix_InputName name="$field" />');
 				<inp2:m_Param name="field"/>.SetMessage('nothing_selected', '<inp2:m_Phrase label="la_SelectItemToMove" escape="1"/>');
 			</script>
 
 		</td>
-		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 	</tr>
 </inp2:m_DefineElement>
Index: branches/RC/core/admin_templates/popups/translator.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/popups/translator.tpl	(.../translator.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="trans" perm_event="trans:OnLoad" section="in-portal:root" title_preset="trans_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/incs/config_blocks.tpl
===================================================================
diff -u -r11201 -r11623
--- branches/RC/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 11201)
+++ branches/RC/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 11623)
@@ -69,7 +69,7 @@
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">
-				<br><small>[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
+				<br/><small style="color: gray;">[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
 			</inp2:m_if>
 		</td>
 
@@ -97,7 +97,7 @@
 		<td>
 			<inp2:Field field="prompt" as_label="1" />
 			<inp2:m_if check="m_IsDebugMode">
-				<br><small>[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
+				<br/><small style="color: gray;">[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
 			</inp2:m_if>
 		</td>
 
Index: branches/RC/core/admin_templates/stop_words/stop_word_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/stop_words/stop_word_edit.tpl	(.../stop_word_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/stop_words/stop_word_edit.tpl	(.../stop_word_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:stop_words"  prefix="stop-word" title_preset="stop_word_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl	(.../email_queue_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl	(.../email_queue_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header" />
 <inp2:m_RenderElement name="combined_header" section="in-portal:email_queue" prefix="email-queue" title_preset="email_queue_list" tabs="mailing_lists/mailing_list_tabs" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/groups/groups_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/groups/groups_list.tpl	(.../groups_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/groups/groups_list.tpl	(.../groups_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_groups" pagination="1" title_preset="group_list" prefix="g.total"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/users/users_edit_groups.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/users_edit_groups.tpl	(.../users_edit_groups.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_groups" tab_preset="Default" pagination="1" pagination_prefix="u-ug"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/stylesheets/block_style_edit.tpl	(.../block_style_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="css" section="in-portal:configure_styles" title_preset="block_style_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/categories/categories_edit_related_searches.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/categories/categories_edit_related_searches.tpl	(.../categories_edit_related_searches.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/categories/categories_edit_related_searches.tpl	(.../categories_edit_related_searches.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 
 <inp2:m_include t="categories/categories_tabs"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/languages/phrase_list.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/languages/phrase_list.tpl	(revision 0)
+++ branches/RC/core/admin_templates/languages/phrase_list.tpl	(revision 11623)
@@ -0,0 +1,60 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:phrases" pagination="1" grid="Phrases" prefix="phrases.st" title_preset=""/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				set_hidden_field('remove_specials[phrases.st]', 1);
+  				std_edit_item('phrases.st', 'languages/phrase_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+				<inp2:m_if check="m_IsDebugMode">
+					a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewPhrase" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
+							function() {
+								var $phrase = prompt('Enter Phrase name:', '');
+								if (!$phrase) {
+									return ;
+								}
+
+								$url_mask = '<inp2:m_Link template="regional/phrases_edit" m_opener="d" phrases_label="#PHRASE_NAME#" phrases_event="OnNew" pass="all,phrases" js_escape="1" no_amp="1"/>';
+								direct_edit('phrases', $url_mask.replace('#PHRASE_NAME#', $phrase));
+							}
+						)
+					);
+				</inp2:m_if>
+
+				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('phrases.st')
+						} ) );
+
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="phrases.st" grid="Phrases"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="phrases.st" IdField="PhraseId" grid="Phrases" menu_filters="yes"/>
+<script type="text/javascript">
+	Grids['phrases.st'].SetDependantToolbarButtons( new Array('edit','delete','primary_language','export_language') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/regional/languages_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/regional/languages_list.tpl	(.../languages_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/regional/languages_list.tpl	(.../languages_list.tpl)	(revision 11623)
@@ -2,7 +2,7 @@
 
 <inp2:m_RenderElement name="combined_header" section="in-portal:configure_lang" prefix="lang" module="core" title_preset="languages_list" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
@@ -36,7 +36,7 @@
 
 
 				a_toolbar.AddButton( new ToolBarButton('import_language', '<inp2:m_phrase label="la_ToolTip_ImportLanguage" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Import" escape="1"/>', function() {
-						openSelector('lang', '<inp2:m_t t="regional/languages_import" phrases.import_event="OnNew" pass="all,m,phrases.import" get_param="test" other_param="xxx" no_amp="1" js_escape="1"/>');
+						openSelector('lang', '<inp2:m_t t="regional/languages_import" phrases.import_event="OnNew" pass="all,m,phrases.import" no_amp="1" js_escape="1"/>');
 						}
 				 ) );
 
Index: branches/RC/core/admin_templates/tools/compile_complete.tpl
===================================================================
diff -u -r11482 -r11623
--- branches/RC/core/admin_templates/tools/compile_complete.tpl	(.../compile_complete.tpl)	(revision 11482)
+++ branches/RC/core/admin_templates/tools/compile_complete.tpl	(.../compile_complete.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="system_tools"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%">
 	<tbody>
 		<tr>
Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl
===================================================================
diff -u -r11546 -r11623
--- branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl	(.../item_selector_advanced_view.tpl)	(revision 11546)
+++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl	(.../item_selector_advanced_view.tpl)	(revision 11623)
@@ -9,7 +9,7 @@
 
 <!-- main kernel_form: begin -->
 <inp2:m_RenderElement name="kernel_form"/>
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/categories/categories_edit_custom.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/categories/categories_edit_custom.tpl	(.../categories_edit_custom.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" perm_section="CATEGORY" permission_type="VIEW" system_permission="0" title_preset="categories_custom" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/tools/server_info.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/tools/server_info.tpl	(.../server_info.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/tools/server_info.tpl	(.../server_info.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="server_info"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/users/user_edit_group.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/user_edit_group.tpl	(.../user_edit_group.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/user_edit_group.tpl	(.../user_edit_group.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_group"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/categories/images_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/categories/images_edit.tpl	(.../images_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/categories/images_edit.tpl	(.../images_edit.tpl)	(revision 11623)
@@ -4,7 +4,7 @@
 
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" perm_section="CATEGORY" permission_type="VIEW" system_permission="0" title_preset="images_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/phrases/phrases_config.php
===================================================================
diff -u -r11612 -r11623
--- branches/RC/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 11612)
+++ branches/RC/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 11623)
@@ -81,6 +81,21 @@
 			)
 		),
 
+		'Sections' => Array (
+			// "Phrases"
+			'in-portal:phrases' => Array (
+				'parent'		=>	'in-portal:site',
+				'icon'			=>	'core:settings_general',
+				'label'			=>	'la_title_Phrases',
+				'url'			=>	Array ('t' => 'languages/phrase_list', 'pass' => 'm'),
+				'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
+//				'perm_prefix'	=>	'lang',
+				'priority'		=>	5,
+//				'show_mode'		=>	smSUPER_ADMIN,
+				'type'			=>	stTREE,
+			),
+		),
+
 		'TableName' => TABLE_PREFIX . 'Phrase',
 
 		'CalculatedFields' => Array (
@@ -133,7 +148,11 @@
 
             'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => 0),
 			'LastChangeIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
-			'Module' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options'=>Array ('' => ''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field' => 'Name', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 'In-Portal'),
+			'Module' => Array (
+				'type' => 'string',
+				'formatter' => 'kOptionsFormatter', 'options'=>Array ('' => ''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Modules WHERE Loaded = 1 ORDER BY LoadOrder', 'option_key_field' => 'Name', 'option_title_field' => 'Name',
+				'not_null' => 1, 'default' => 'In-Portal'
+			),
         ),
 
 		'VirtualFields' => Array (
Index: branches/RC/core/admin_templates/tools/import2.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/tools/import2.tpl	(.../import2.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/tools/import2.tpl	(.../import2.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="import"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/users/user_edit_images.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/user_edit_images.tpl	(.../user_edit_images.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/user_edit_images.tpl	(.../user_edit_images.tpl)	(revision 11623)
@@ -5,7 +5,7 @@
 
 <inp2:m_include t="incs/image_blocks"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/img/icons/icon24_conf.gif
===================================================================
diff -u -r8929 -r11623
Binary files differ
Index: branches/RC/core/admin_templates/config/config_universal.tpl
===================================================================
diff -u -r11576 -r11623
--- branches/RC/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 11576)
+++ branches/RC/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 11623)
@@ -4,7 +4,7 @@
 <inp2:m_Get name="section" result_to_var="section"/>
 <inp2:m_RenderElement name="combined_header" prefix="conf" section="$section" title_preset="section_label" perm_event="conf:OnLoad"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/units/languages/languages_event_handler.php
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 11610)
+++ branches/RC/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 11623)
@@ -77,6 +77,10 @@
 		 */
 		function OnUpdatePrimary(&$event)
 		{
+			if ($event->MasterEvent->status != erSUCCESS) {
+				return ;
+			}
+
 			$object =& $event->getObject( Array('skip_autoload' => true) );
 			/* @var $object LanguagesItem */
 
Index: branches/RC/core/admin_templates/help.tpl
===================================================================
diff -u -r11482 -r11623
--- branches/RC/core/admin_templates/help.tpl	(.../help.tpl)	(revision 11482)
+++ branches/RC/core/admin_templates/help.tpl	(.../help.tpl)	(revision 11623)
@@ -25,7 +25,7 @@
 	</table>
 <!-- blue_bar: end -->
 <inp2:m_if check="m_ConstOn" name="DBG_HELP">
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/mailing_lists/mailing_list_list.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/mailing_lists/mailing_list_list.tpl	(.../mailing_list_list.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/mailing_lists/mailing_list_list.tpl	(.../mailing_list_list.tpl)	(revision 11623)
@@ -1,7 +1,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:mailing_lists" prefix="mailing-list" title_preset="mailing_list_list" tabs="mailing_lists/mailing_list_tabs" pagination="1"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/admin_templates/img/x.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 11623)
@@ -4,7 +4,7 @@
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="users_edit" tab_preset="Default"/>
 
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Fisheye: Tag 11623 refers to a dead (removed) revision in file `branches/RC/core/admin_templates/incs/style.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: branches/RC/core/units/general/helpers/modules.php
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/units/general/helpers/modules.php	(.../modules.php)	(revision 11610)
+++ branches/RC/core/units/general/helpers/modules.php	(.../modules.php)	(revision 11623)
@@ -172,7 +172,8 @@
 			    }
 		    }
 
-			array_push($modules, 'Core', 'In-Portal', 'In-Link', 'In-News', 'In-Bulletin', 'Proj-base', 'Custom');
+		    // TODO: find a ways to make all modules auto-licensed except in-commerce & in-auction without scanning directory structure
+			array_push($modules, 'Core', 'In-Portal', 'In-Link', 'In-News', 'In-Bulletin', 'Custom');
 		    return $modules;
 		}
 
Index: branches/RC/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="email_messages_edit"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
Index: branches/RC/core/install/upgrades.php
===================================================================
diff -u -r11610 -r11623
--- branches/RC/core/install/upgrades.php	(.../upgrades.php)	(revision 11610)
+++ branches/RC/core/install/upgrades.php	(.../upgrades.php)	(revision 11623)
@@ -677,15 +677,79 @@
 			if ($mode == 'before') {
 				$this->_removeDuplicatePhrases(); // because In-Commerce & In-Link share some phrases with Proj-CMS
 				$this->_createProjCMSTables();
+				$this->_addMissingConfigurationVariables();
 			}
 
 			if ($mode == 'after') {
 				$this->_fixSkinColors();
 				$this->_restructureCatalog();
+
+//				$this->_sortConfigurationVariables('In-Portal', 'in-portal:configure_general');
+//				$this->_sortConfigurationVariables('In-Portal', 'in-portal:configure_advanced');
 			}
 		}
 
+		function _sortConfigurationVariables($module, $section)
+		{
+			$sql = 'SELECT ca.heading, cv.VariableName
+					FROM ' . TABLE_PREFIX . 'ConfigurationAdmin ca
+					LEFT JOIN ' . TABLE_PREFIX . 'ConfigurationValues cv USING(VariableName)
+					WHERE (cv.ModuleOwner = ' . $this->Conn->qstr($module) . ') AND (cv.Section = ' . $this->Conn->qstr($section) . ')
+					ORDER BY ca.DisplayOrder asc, ca.GroupDisplayOrder asc';
+			$variables = $this->Conn->GetCol($sql, 'VariableName');
+
+			if (!$variables) {
+				return ;
+			}
+
+			$variables = $this->_groupRecords($variables);
+
+			$group_number = 0;
+			$variable_order = 1;
+
+			$prev_heading = '';
+
+			foreach ($variables as $variable_name => $variable_heading) {
+				if ($prev_heading != $variable_heading) {
+					$group_number++;
+					$variable_order = 1;
+				}
+
+				$sql = 'UPDATE ' . TABLE_PREFIX . 'ConfigurationAdmin
+						SET DisplayOrder = ' . $this->Conn->qstr($group_number * 10 + $variable_order / 100) . '
+						WHERE VariableName = ' . $this->Conn->qstr($variable_name);
+				$this->Conn->Query($sql);
+
+				$variable_order++;
+				$prev_heading = $variable_heading;
+			}
+		}
+
 		/**
+		 * Group list records by header, saves internal order in group
+		 *
+		 * @param Array $records
+		 * @param string $heading_field
+		 */
+		function _groupRecords($variables)
+		{
+			$sorted = Array();
+
+			foreach ($variables as $variable_name => $variable_heading) {
+				$sorted[$variable_heading][] = $variable_name;
+			}
+
+			$variables = Array();
+			foreach ($sorted as $heading => $heading_records) {
+				foreach ($heading_records as $variable_name) {
+					$variables[$variable_name] = $heading;
+				}
+			}
+
+			return $variables;
+		}
+
+		/**
 		 * Returns module root category
 		 *
 		 * @param string $module_name
@@ -930,6 +994,12 @@
 					$this->Conn->Query($sql);
 				}
 			}
+			else {
+				$this->Conn->Query("INSERT INTO " . TABLE_PREFIX . "Permissions VALUES (DEFAULT, 'in-portal:forms.view', 11, 1, 1, 0)");
+				$this->Conn->Query("INSERT INTO " . TABLE_PREFIX . "Permissions VALUES (DEFAULT, 'in-portal:forms.add', 11, 1, 1, 0)");
+				$this->Conn->Query("INSERT INTO " . TABLE_PREFIX . "Permissions VALUES (DEFAULT, 'in-portal:forms.edit', 11, 1, 1, 0)");
+				$this->Conn->Query("INSERT INTO " . TABLE_PREFIX . "Permissions VALUES (DEFAULT, 'in-portal:forms.delete', 11, 1, 1, 0)");
+			}
 
 			// 4. process "FormSubmissions" table
 			if ($this->Conn->TableFound(TABLE_PREFIX . 'FormSubmissions')) {
@@ -940,6 +1010,9 @@
 					$this->Conn->Query($sql);
 				}
 			}
+			else {
+				$this->Conn->Query("INSERT INTO " . TABLE_PREFIX . "Permissions VALUES (DEFAULT, 'in-portal:submissions.view', 11, 1, 1, 0)");
+			}
 
 			// 5. add missing event
 			$sql = 'SELECT EventId
@@ -948,7 +1021,7 @@
 			$event_id = $this->Conn->GetOne($sql);
 
 			if (!$event_id) {
-				$sql = "INSERT INTO " . TABLE_PREFIX . "Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_CMS_FormSubmitted', 1)";
+				$sql = "INSERT INTO " . TABLE_PREFIX . "Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_event_FormSubmitted', 1)";
 				$this->Conn->Query($sql);
 			}
 
@@ -958,22 +1031,58 @@
 			$event_id = $this->Conn->GetOne($sql);
 
 			if (!$event_id) {
-				$sql = "INSERT INTO " . TABLE_PREFIX . "Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_CMS_FormSubmitted', 0)";
+				$sql = "INSERT INTO " . TABLE_PREFIX . "Events VALUES (DEFAULT, 'FORM.SUBMITTED', NULL, 1, 0, 'Core:Category', 'la_event_FormSubmitted', 0)";
 				$this->Conn->Query($sql);
 			}
+		}
 
-			// 6. add missing variable
-			$sql = 'SELECT VariableId
-					FROM ' . TABLE_PREFIX . 'ConfigurationValues
-					WHERE VariableName = "cms_DefaultDesign"';
-			$variable_id = $this->Conn->GetOne($sql);
+		function _addMissingConfigurationVariables()
+		{
+			$variables = Array (
+				'cms_DefaultDesign' => Array (
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('cms_DefaultDesign', 'la_Text_General', 'la_prompt_DefaultDesignTemplate', 'text', NULL, NULL, 10.15, 0, 0)",
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'cms_DefaultDesign', '/platform/designs/general', 'In-Portal', 'in-portal:configure_categories')",
+				),
 
-			if (!$variable_id) {
-				$sql = "INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('cms_DefaultDesign', 'la_Text_General', 'la_prompt_DefaultDesignTemplate', 'text', NULL, NULL, 10.29, 0, 0)";
-				$this->Conn->Query($sql);
+				'Require_AdminSSL' => Array (
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('Require_AdminSSL', 'la_Text_Website', 'la_config_RequireSSLAdmin', 'checkbox', '', '', 10.105, 0, 1)",
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'Require_AdminSSL', '', 'In-Portal', 'in-portal:configure_advanced')",
+				),
 
-				$sql = "INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'cms_DefaultDesign', '/platform/designs/general', 'In-Portal', 'in-portal:configure_categories')";
-				$this->Conn->Query($sql);
+				'UsePopups' => Array (
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('UsePopups', 'la_Text_Website', 'la_config_UsePopups', 'radio', '', '1=la_Yes,0=la_No', 10.221, 0, 0)",
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'UsePopups', '1', 'In-Portal', 'in-portal:configure_advanced')",
+				),
+
+				'UseDoubleSorting' => Array (
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('UseDoubleSorting', 'la_Text_Website', 'la_config_UseDoubleSorting', 'radio', '', '1=la_Yes,0=la_No', 10.222, 0, 0)",
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'UseDoubleSorting', '0', 'In-Portal', 'in-portal:configure_advanced')",
+				),
+
+				'MenuFrameWidth' => Array (
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('MenuFrameWidth', 'la_title_General', 'la_prompt_MenuFrameWidth', 'text', NULL, NULL, 10.31, 0, 0)",
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'MenuFrameWidth', 200, 'In-Portal', 'in-portal:configure_advanced')",
+				),
+
+				'DefaultSettingsUserId' => Array (
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationAdmin VALUES ('DefaultSettingsUserId', 'la_title_General', 'la_prompt_DefaultUserId', 'text', NULL, NULL, '10.06', '0', '0')",
+					"INSERT INTO " . TABLE_PREFIX . "ConfigurationValues VALUES (DEFAULT, 'DefaultSettingsUserId', -1, 'In-Portal:Users', 'in-portal:configure_users')",
+				),
+			);
+
+			foreach ($variables as $variable_name => $variable_sqls) {
+				$sql = 'SELECT VariableId
+						FROM ' . TABLE_PREFIX . 'ConfigurationValues
+						WHERE VariableName = ' . $this->Conn->qstr($variable_name);
+				$variable_id = $this->Conn->GetOne($sql);
+
+				if ($variable_id) {
+					continue;
+				}
+
+				foreach ($variable_sqls as $variable_sql) {
+					$this->Conn->Query($variable_sql);
+				}
 			}
 		}
 
Index: branches/RC/core/admin_templates/users/users_edit_custom.tpl
===================================================================
diff -u -r11538 -r11623
--- branches/RC/core/admin_templates/users/users_edit_custom.tpl	(.../users_edit_custom.tpl)	(revision 11538)
+++ branches/RC/core/admin_templates/users/users_edit_custom.tpl	(.../users_edit_custom.tpl)	(revision 11623)
@@ -3,7 +3,7 @@
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_custom" tab_preset="Default"/>
 
-<!-- ToolBar --->
+<!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>