Index: branches/5.0.x/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r12343 -r12382
--- branches/5.0.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 12343)
+++ branches/5.0.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_tag_processor.php 12343 2009-08-18 10:32:30Z alex $
+* @version	$Id: db_tag_processor.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -362,14 +362,15 @@
 	 */
 	function getUniqueListKey($params)
 	{
-		$types = $this->SelectParam($params, 'types');
-		$except = $this->SelectParam($params, 'except');
-		$list_name = $this->SelectParam($params, 'list_name');
+		$types = array_key_exists('types', $params) ? $params['types'] : '';
+		$except = array_key_exists('except', $params) ? $params['except'] : '';
+		$list_name = array_key_exists('list_name', $params) ? $params['list_name'] : '';
+
 		if (!$list_name) {
 			$list_name = $this->Application->Parser->GetParam('list_name');
 		}
 
-		return $types.$except.$list_name;
+		return $types . $except . $list_name;
 	}
 
 	/**
@@ -435,7 +436,11 @@
 	{
 		$list =& $this->GetList($params);
 		$ret = $list->getPrefixSpecial();
-		if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
+
+		if (array_key_exists('as_preg', $params) && $params['as_preg']) {
+			$ret = preg_quote($ret, '/');
+		}
+
 		return $ret;
 	}
 
@@ -730,68 +735,72 @@
 
 		$object =& $this->getObject($params);
 
-		if ( $this->HasParam($params, 'db')  )
-		{
+		if (array_key_exists('db', $params) && $params['db']) {
 			$value = $object->GetDBField($field);
 		}
-		else
-		{
-			if( $this->HasParam($params, 'currency') )
-			{
+		else {
+			if (array_key_exists('currency', $params) && $params['currency']) {
 				$iso = $this->GetISO($params['currency']);
 				$original = $object->GetDBField($field);
 				$value = $this->ConvertCurrency($original, $iso);
 				$object->SetDBField($field, $value);
 				$object->Fields[$field]['converted'] = true;
 			}
 
-			$format = getArrayValue($params, 'format');
+			$format = array_key_exists('format', $params) ? $params['format'] : false;
 			if (!$format || $format == '$format') {
 				$format = null;
 			}
 
 			$value = $object->GetField($field, $format);
 
-			if( $this->SelectParam($params, 'negative') )
-			{
-				if(strpos($value, '-') === 0)
-				{
+			if (array_key_exists('negative', $params) && $params['negative']) {
+				if (strpos($value, '-') === 0) {
 					$value = substr($value, 1);
 				}
-				else
-				{
-					$value = '-'.$value;
+				else {
+					$value = '-' . $value;
 				}
 			}
 
-			if( $this->HasParam($params, 'currency') )
-			{
+			if (array_key_exists('currency', $params) && $params['currency']) {
 				$value = $this->AddCurrencySymbol($value, $iso);
 				$params['no_special'] = 1;
 			}
 		}
 
-		if( !$this->HasParam($params, 'no_special') ) $value = htmlspecialchars($value);
-		if( getArrayValue($params,'checked'	) ) $value = ($value == ( isset($params['value']) ? $params['value'] : 1)) ? 'checked' : '';
-		if( isset($params['plus_or_as_label']) ) {
+		if (!array_key_exists('no_special', $params) || !$params['no_special']) {
+			$value = htmlspecialchars($value);
+		}
+
+		if (array_key_exists('checked', $params) && $params['checked']) {
+			$value = ($value == ( isset($params['value']) ? $params['value'] : 1)) ? 'checked' : '';
+		}
+
+		if (array_key_exists('plus_or_as_label', $params) && $params['plus_or_as_label']) {
 			$value = substr($value, 0,1) == '+' ? substr($value, 1) : $this->Application->Phrase($value);
 		}
-		elseif( isset($params['as_label']) && $params['as_label']  ) $value = $this->Application->Phrase($value);
+		elseif (array_key_exists('as_label', $params) && $params['as_label']) {
+			$value = $this->Application->Phrase($value);
+		}
 
 		$first_chars = $this->SelectParam($params,'first_chars,cut_first');
-		if($first_chars)
-		{
+		if ($first_chars) {
 			$needs_cut = mb_strlen($value) > $first_chars;
 			$value = mb_substr($value, 0, $first_chars);
 			if ($needs_cut) $value .= ' ...';
 		}
-		if( getArrayValue($params,'nl2br'	) ) $value = nl2br($value);
 
-		if ($value != '') $this->Application->Parser->DataExists = true;
+		if (array_key_exists('nl2br', $params) && $params['nl2br']) {
+			$value = nl2br($value);
+		}
 
-		if( $this->HasParam($params, 'currency') )
-		{
-			//restoring value in original currency, for other Field tags to work properly
+		if ($value != '') {
+			$this->Application->Parser->DataExists = true;
+		}
+
+		if (array_key_exists('currency', $params) && $params['currency']) {
+			// restoring value in original currency, for other Field tags to work properly
 			$object->SetDBField($field, $original);
 		}
 
@@ -810,26 +819,6 @@
 		$object->SetDBField($dst_field, $src_object->GetDBField($src_field));
 	}
 
-	/**
-	 * Checks if parameter is passed
-	 * Note: works like Tag and line simple method too
-	 *
-	 * @param Array $params
-	 * @param string $param_name
-	 * @return bool
-	 */
-	function HasParam($params, $param_name = null)
-	{
-		if ( !isset($param_name) ) {
-			$param_name = $this->SelectParam($params, 'name');
-			$params = $this->Application->Parser->Params;
-		}
-
-		$value = isset($params[$param_name]) ? $params[$param_name] : false;
-
-		return $value && ($value != '$'.$param_name);
-	}
-
 	function PhraseField($params)
 	{
 		$field_label = $this->Field($params);
@@ -851,7 +840,7 @@
 		{
 			$object =& $this->getObject($params);
 
-			$skip_fields = getArrayValue($params, 'except');
+			$skip_fields = array_key_exists('except', $params) ? $params['except'] : false;
 			$skip_fields = $skip_fields ? explode(',', $skip_fields) : Array();
 
 			return $object->HasErrors($skip_fields);
@@ -894,7 +883,8 @@
 		}
 
 		$options = $object->GetFieldOptions($field);
-		return getArrayValue($options,'required');
+
+		return array_key_exists('required', $options) ? $options['required'] : false;
 	}
 
 	function FieldOption($params)
@@ -920,7 +910,7 @@
 
 		$options = $field_options['options'];
 
-		if ($this->HasParam($params, 'has_empty')) {
+		if (array_key_exists('has_empty', $params) && $params['has_empty']) {
 			$empty_value = array_key_exists('empty_value', $params) ? $params['empty_value'] : '';
 			$options = array_merge_recursive2(Array ($empty_value => ''), $options); // don't use other array merge function, because they will reset keys !!!
 		}
@@ -936,14 +926,14 @@
 			$block_params['field_name'] = $this->InputName($params); // depricated (produces warning when used as grid filter), but used in Front-End (submission create), admin (submission view)
 		}
 
-		$selected_param_name = getArrayValue($params, 'selected_param');
+		$selected_param_name = array_key_exists('selected_param', $params) ? $params['selected_param'] : false;
 		if (!$selected_param_name) {
 			$selected_param_name = $params['selected'];
 		}
 		$selected = $params['selected'];
 
 		$o = '';
-		if ($this->HasParam($params, 'no_empty') && !getArrayValue($options, '')) {
+		if (array_key_exists('no_empty', $params) && $params['no_empty'] && !getArrayValue($options, '')) {
 			// removes empty option, when present (needed?)
 			array_shift($options);
 		}
@@ -989,18 +979,17 @@
 
 		$format = $options[ $this->SelectParam($params, 'input_format') ? 'input_format' : 'format' ];
 
-		$formatter_class = getArrayValue($options,'formatter');
+		$formatter_class = array_key_exists('formatter', $options) ? $options['formatter'] : false;
+
 		if ($formatter_class) {
 			$formatter =& $this->Application->recallObject($formatter_class);
-			$human_format = getArrayValue($params,'human');
-			$edit_size = getArrayValue($params,'edit_size');
-			$sample = getArrayValue($params,'sample');
-			if($sample)
-			{
+			$human_format = array_key_exists('human', $params) ? $params['human'] : false;
+			$edit_size = array_key_exists('edit_size', $params) ? $params['edit_size'] : false;
+			$sample = array_key_exists('sample', $params) ? $params['sample'] : false;
+			if ($sample) {
 				return $formatter->GetSample($field, $options, $object);
 			}
-			elseif($human_format || $edit_size)
-			{
+			elseif ($human_format || $edit_size) {
 				$format = $formatter->HumanFormat($format);
 				return $edit_size ? strlen($format) : $format;
 			}
@@ -1209,7 +1198,7 @@
 			$id = $params['force_id'];
 		}
 		else {
-			$id_field = getArrayValue($params, 'IdField');
+			$id_field = array_key_exists('IdField', $params) ? $params['IdField'] : false;
 			$id = $id_field ? $object->GetDBField($id_field) : $object->GetID();
 		}
 
@@ -1231,7 +1220,11 @@
 		list($id, $field) = $this->prepareInputName($params);
 
 		$ret = $this->getPrefixSpecial().'['.$id.']['.$field.']';
-		if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
+
+		if (array_key_exists('as_preg', $params) && $params['as_preg']) {
+			$ret = preg_quote($ret, '/');
+		}
+
 		return $ret;
 	}
 
@@ -1248,8 +1241,11 @@
 		list($id, $field) = $this->prepareInputName($params);
 
 		$ret = 'field_modifiers['.$this->getPrefixSpecial().']['.$field.']['.$params['type'].']';
-		if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
 
+		if (array_key_exists('as_preg', $params) && $params['as_preg']) {
+			$ret = preg_quote($ret, '/');
+		}
+
 		if (isset($params['value'])) {
 			$object =& $this->getObject($params);
 			$field_modifiers[$field][$params['type']] = $params['value'];
@@ -1485,9 +1481,8 @@
 	function FieldEquals($params)
 	{
 		$object =& $this->getObject($params);
-		$ret = $object->GetDBField($this->SelectParam($params, 'name,field')) == $params['value'];
-//		if( getArrayValue($params,'inverse') ) $ret = !$ret;
-		return $ret;
+
+		return $object->GetDBField( $this->SelectParam($params, 'name,field') ) == $params['value'];
 	}
 
 	/**
@@ -1566,7 +1561,8 @@
 	{
 		$preset_name = replaceModuleSection($params['title_preset']);
 		$title_presets = $this->Application->getUnitOption($this->Prefix,'TitlePresets');
-		$title_info = getArrayValue($title_presets, $preset_name);
+		$title_info = array_key_exists($preset_name, $title_presets) ? $title_presets[$preset_name] : false;
+
 		if ($title_info === false) {
 			$title = str_replace('#preset_name#', $preset_name, $params['title']);
 			if ($this->Application->ConfigValue('UseSmallHeader') && isset($params['group_title']) && $params['group_title']) {
@@ -1575,7 +1571,7 @@
 			return $title;
 		}
 
-		if (getArrayValue($title_presets,'default')) {
+		if (array_key_exists('default', $title_presets) && $title_presets['default']) {
 			// use default labels + custom labels specified in preset used
 			$title_info = array_merge_recursive2($title_presets['default'], $title_info);
 		}
@@ -1587,8 +1583,9 @@
 		$object_status = Array();
 		$status_labels = Array();
 
-		$prefixes = getArrayValue($title_info,'prefixes');
-		$all_tag_params = getArrayValue($title_info,'tag_params');
+		$prefixes = array_key_exists('prefixes', $title_info) ? $title_info['prefixes'] : false;
+		$all_tag_params = array_key_exists('tag_params', $title_info) ? $title_info['tag_params'] : false;
+
 		if ($prefixes) {
 			// extract tag_perams passed directly to SectionTitle tag for specific prefix
 			foreach ($params as $tp_name => $tp_value) {
@@ -1605,7 +1602,9 @@
 
 				if ($all_tag_params) {
 					$tag_params = getArrayValue($all_tag_params, $prefix_data['prefix_special']);
-					if (!$tag_params) $tag_params = Array();
+					if (!$tag_params) {
+						$tag_params = Array();
+					}
 				}
 
 				$tag_params = array_merge_recursive2($params, $tag_params);
@@ -1659,7 +1658,8 @@
 			$title .= ' - '.$params['group_title'];
 		}
 
-		$cut_first = getArrayValue($params, 'cut_first');
+		$cut_first = array_key_exists('cut_first', $params) && $params['cut_first'];
+
 		if ($cut_first && mb_strlen($title) > $cut_first) {
 			if (!preg_match('/<a href="(.*)">(.*)<\/a>/',$title)) {
 				$title = mb_substr($title, 0, $cut_first).' ...';
@@ -1829,8 +1829,8 @@
 	 */
 	function SaveWarning($params)
 	{
-		$main_prefix = getArrayValue($params, 'main_prefix');
-		if ($main_prefix && $main_prefix != '$main_prefix') {
+		$main_prefix = array_key_exists('main_prefix', $params) ? $params['main_prefix'] : false;
+		if ($main_prefix) {
 			$top_prefix = $main_prefix;
 		}
 		else {
@@ -1902,35 +1902,55 @@
 				$ret = $ret[ $params['type'] ];
 			}
 
-			if( !$this->HasParam($params, 'no_special') ) $ret = htmlspecialchars($ret);
+			if (!array_key_exists('no_special', $params) || !$params['no_special']) {
+				$ret = htmlspecialchars($ret);
+			}
+
 			return $ret;
 		}
 
 		return '';
 	}
 
+	/**
+	 * Tells, that at least one of search filters is used by now
+	 *
+	 * @param Array $params
+	 * @return bool
+	 */
+	function SearchActive($params)
+	{
+		if ($this->Application->RecallVar($this->getPrefixSpecial() . '_search_keyword')) {
+			// simple search filter is used
+			return true;
+		}
+
+		$view_name = $this->Application->RecallVar($this->getPrefixSpecial().'_current_view');
+		$custom_filter = $this->Application->RecallPersistentVar($this->getPrefixSpecial().'_custom_filter.'.$view_name/*, ALLOW_DEFAULT_SETTINGS*/);
+		$custom_filter = $custom_filter ? unserialize($custom_filter) : Array();
+
+		return array_key_exists($params['grid'], $custom_filter);
+	}
+
 	function SearchFormat($params)
 	{
 		$field = $params['field'];
 		$object =& $this->GetList($params);
 
 		$options = $object->GetFieldOptions($field);
-
 		$format = $options[ $this->SelectParam($params, 'input_format') ? 'input_format' : 'format' ];
+		$formatter_class = array_key_exists('formatter', $options) ? $options['formatter'] : false;
 
-		$formatter_class = getArrayValue($options,'formatter');
-		if($formatter_class)
-		{
+		if ($formatter_class) {
 			$formatter =& $this->Application->recallObject($formatter_class);
-			$human_format = getArrayValue($params,'human');
-			$edit_size = getArrayValue($params,'edit_size');
-			$sample = getArrayValue($params,'sample');
-			if($sample)
-			{
+			$human_format = array_key_exists('human', $params) ? $params['human'] : false;
+			$edit_size = array_key_exists('edit_size', $params) ? $params['edit_size'] : false;
+			$sample = array_key_exists('sample', $params) ? $params['sample'] : false;
+
+			if ($sample) {
 				return $formatter->GetSample($field, $options, $object);
 			}
-			elseif($human_format || $edit_size)
-			{
+			elseif ($human_format || $edit_size) {
 				$format = $formatter->HumanFormat($format);
 				return $edit_size ? strlen($format) : $format;
 			}
@@ -2081,8 +2101,7 @@
 	{
 		$ret = EXPORT_PATH.'/';
 
-		if( getArrayValue($params, 'as_url') )
-		{
+		if (array_key_exists('as_url', $params) && $params['as_url']) {
 			$ret = str_replace( FULL_PATH.'/', $this->Application->BaseURL(), $ret);
 		}
 
Index: branches/5.0.x/core/admin_templates/languages/email_message_list.tpl
===================================================================
diff -u -r12244 -r12382
--- branches/5.0.x/core/admin_templates/languages/email_message_list.tpl	(.../email_message_list.tpl)	(revision 12244)
+++ branches/5.0.x/core/admin_templates/languages/email_message_list.tpl	(.../email_message_list.tpl)	(revision 12382)
@@ -63,6 +63,10 @@
 	tr.row-disabled td {
 		background-color: #FFDFE0;
 	}
+
+	tr.grid-data-row-even.row-disabled td {
+		background-color: #F4D4D5;
+	}
 </style>
 
 <inp2:m_DefineElement name="row_class">
Index: branches/5.0.x/core/admin_templates/img/tab_back.jpg
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/units/permissions/permissions_tag_processor.php
===================================================================
diff -u -r12299 -r12382
--- branches/5.0.x/core/units/permissions/permissions_tag_processor.php	(.../permissions_tag_processor.php)	(revision 12299)
+++ branches/5.0.x/core/units/permissions/permissions_tag_processor.php	(.../permissions_tag_processor.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: permissions_tag_processor.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: permissions_tag_processor.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -167,8 +167,9 @@
 			foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
 				if (!$this->Application->prefixRegistred($module_data['Var']) || !$this->Application->getUnitOption($module_data['Var'], 'CatalogItem')) continue;
 				$params['item_prefix'] = $module_data['Var'];
-				$ret .= $this->Application->ProcessParsedTag('m', 'MyInclude', $params);
+				$ret .= $this->Application->IncludeTemplate($params);
 			}
+
 			return $ret;
 		}
 
Index: branches/5.0.x/themes/default2009/platform/elements/forms.elm.tpl
===================================================================
diff -u -r12337 -r12382
--- branches/5.0.x/themes/default2009/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 12337)
+++ branches/5.0.x/themes/default2009/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 12382)
@@ -95,7 +95,7 @@
 				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
 			</inp2:m_if>
 			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" maxlength="<inp2:m_param name="maxlength"/>" style="<inp2:m_param name="style"/>">
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+			<inp2:m_if check="m_Param" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
 	</tr>
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
@@ -153,7 +153,7 @@
 		<td class="field-value">
 			<inp2:lang.enabled_PrintList render_as="ml_input_element" pass_params="1"/>
 
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+			<inp2:m_if check="m_Param" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
 	</tr>
 	<script type="text/javascript">
@@ -171,7 +171,7 @@
 				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
 			</inp2:m_if>
 			<input type="password" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+			<inp2:m_if check="m_Param" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
 	</tr>
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
@@ -354,7 +354,7 @@
 		<td class="field-value">
 			<inp2:lang.enabled_PrintList render_as="ml_textarea_element" pass_params="1"/>
 
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+			<inp2:m_if check="m_Param" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
 	</tr>
 	<script type="text/javascript">
@@ -440,7 +440,7 @@
 			</inp2:m_if>
 			<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"/> style="<inp2:m_param name="style"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'));">
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
+			<inp2:m_if check="m_Param" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
 		</td>
 	</tr>
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
Index: branches/5.0.x/core/admin_templates/img/tab_left.gif
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/js/tree.js
===================================================================
diff -u -r12117 -r12382
--- branches/5.0.x/core/admin_templates/js/tree.js	(.../tree.js)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/js/tree.js	(.../tree.js)	(revision 12382)
@@ -133,8 +133,11 @@
 				}
 				else {
 					// ensures, that click is made before AJAX request will be sent
-					if (res === true) {
-						// only in case of "true" is returned, used in catalog
+					var $res_type = Object.prototype.toString.call(res);
+
+					if ((res === true) || ($res_type == '[object Object]')) {
+						// in case of "true" is returned, used in catalog
+						// in case of object (tree node) is returned, used in advanced view
 						if (this.treeItem.isContainer()) {
 							this.href = this.treeItem.locateFirstItem().Url;
 						}
@@ -145,7 +148,15 @@
 					if (!this.treeItem.Expanded && this.treeItem.isFolder()) {
 						if (this.treeItem.folderClick());
 					}
-					this.treeItem.highLight();
+
+					if ($res_type == '[object Object]') {
+						// highlight returned tree node instead of clicked one
+						res.highLight(false); // don't expand such node
+					}
+					else {
+						this.treeItem.highLight();
+					}
+
 					return false;
 				}
 			}
@@ -167,7 +178,7 @@
 
 TreeItem.prototype.display = function()
 {
-	this.Tr.style.display = is.ie ? 'block' : 'table-row';
+	this.Tr.style.display = ''; // is.ie ? 'block' : 'table-row';
 	this.Displayed = true;
 
 	var do_sub =  TreeManager.isExpanded(this.Key);
@@ -186,21 +197,29 @@
 	this.Displayed = false;
 }
 
-TreeItem.prototype.highLight = function()
+TreeItem.prototype.highLight = function($auto_expand)
 {
-	if (last_hightlighted) last_hightlighted.Tr.className = '';
+	if ($auto_expand === undefined) {
+		$auto_expand = true;
+	}
+
+	if (last_hightlighted) {
+		last_hightlighted.Tr.className = '';
+	}
+
 	if (this.Children && this.Children.length > 0 && this.isContainer()) {
-		if (!this.Expanded) {
+		if (!this.Expanded && $auto_expand) {
 			this.expand();
 		}
-		this.Children[0].highLight();
+
+		this.Children[0].highLight($auto_expand);
 		return;
 	}
 
 	this.Tr.className = "highlighted";
 	last_hightlighted = this;
 	last_highlighted_key = this.Key;
-	if (!this.Expanded) {
+	if (!this.Expanded && $auto_expand) {
 		this.expand();
 	}
 }
Index: branches/5.0.x/core/admin_templates/catalog/catalog_counters.tpl
===================================================================
diff -u -r12117 -r12382
--- branches/5.0.x/core/admin_templates/catalog/catalog_counters.tpl	(.../catalog_counters.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/catalog/catalog_counters.tpl	(.../catalog_counters.tpl)	(revision 12382)
@@ -5,7 +5,7 @@
 $Catalog.ParentCategoryID = <inp2:c_GetParentCategory/>;
 
 <inp2:m_DefineElement name="category_caption">
-	<inp2:m_ifnot check="c_HomeCategory" equals_to="$cat_id">
+	<inp2:m_ifnot check="m_Param" name="is_first">
 		<inp2:m_param name="separator"/>
 	</inp2:m_ifnot>
 	<inp2:m_if check="m_ParamEquals" name="current" value="1" inverse="1">
Index: branches/5.0.x/core/admin_templates/catalog/catalog_elements.tpl
===================================================================
diff -u -r12117 -r12382
--- branches/5.0.x/core/admin_templates/catalog/catalog_elements.tpl	(.../catalog_elements.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/catalog/catalog_elements.tpl	(.../catalog_elements.tpl)	(revision 12382)
@@ -58,13 +58,13 @@
 					<td>
 						<input 	type="text"
 							id="search_keyword"
+							class="filter"
 							name="search_keyword"
 							value=""
 							PrefixSpecial=""
 							Grid=""
 							ajax="1"
-							onkeydown="searchKeydown(event);"
-							style="border: 1px solid grey;">
+							onkeydown="searchKeydown(event);"/>
 						<input type="text" style="display: none;"/>
 					</td>
 					<td style="white-space: nowrap;">
Index: branches/5.0.x/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -r12299 -r12382
--- branches/5.0.x/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_messages_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: email_messages_config.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -54,7 +54,7 @@
 				'label'			=>	'la_tab_E-mails',
 				'url'			=>	Array('t' => 'languages/email_message_list', 'pass' => 'm'),
 				'permissions'	=>	Array('view', 'edit'),
-				'priority'		=>	6,
+				'priority'		=>	5,
 				'type'			=>	stTREE,
 			),
 		),
Index: branches/5.0.x/core/units/forms/forms_config.php
===================================================================
diff -u -r12299 -r12382
--- branches/5.0.x/core/units/forms/forms_config.php	(.../forms_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/forms/forms_config.php	(.../forms_config.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: forms_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: forms_config.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -51,7 +51,7 @@
 							'label'			=>	'la_tab_CMSForms', //'la_tab_FormsConfig',
 							'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,
+							'priority'		=>	6,
 //							'show_mode'		=>	smSUPER_ADMIN,
 							'type'			=>	stTREE,
 						),
Index: branches/5.0.x/core/units/admin/admin_config.php
===================================================================
diff -u -r12299 -r12382
--- branches/5.0.x/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: admin_config.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -70,7 +70,7 @@
 				'label'			=>	'la_tab_Service',
 				'url'			=>	Array ('t' => 'tools/system_tools', 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	10,
+				'priority'		=>	6,
 				'type'			=>	stTREE,
 			),
 		),
Index: branches/5.0.x/core/admin_templates/languages/phrase_edit.tpl
===================================================================
diff -u -r12320 -r12382
--- branches/5.0.x/core/admin_templates/languages/phrase_edit.tpl	(.../phrase_edit.tpl)	(revision 12320)
+++ branches/5.0.x/core/admin_templates/languages/phrase_edit.tpl	(.../phrase_edit.tpl)	(revision 12382)
@@ -73,7 +73,6 @@
 
 <inp2:m_DefineElement name="phrase_element">
 	<inp2:m_if check="m_Get" name="simple_mode">
-		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="!la_fld_PrimaryTranslation!"/>
 		<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="Translation" title="!la_fld_Translation!" rows="7" cols="50" allow_html="0"/>
 	<inp2:m_else/>
 		<tr class="subsectiontitle">
Index: branches/5.0.x/core/units/email_queue/email_queue_config.php
===================================================================
diff -u -r12299 -r12382
--- branches/5.0.x/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_queue_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: email_queue_config.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -47,7 +47,7 @@
 				'label'			=>	'la_tab_EmailQueue',
 				'url'			=>	Array('t' => 'logs/email_logs/email_queue_list', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'delete'),
-				'priority'		=>	7.2,
+				'priority'		=>	5.2, // <parent_priority>.<own_priority>, because this section replaces parent in tree
 				'type'			=>	stTAB,
 			),
 		),
Index: branches/5.0.x/core/admin_templates/img/tab.gif
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/img/top_frame/icons/cancel_button.gif
===================================================================
diff -u
Binary files differ
Index: branches/5.0.x/core/admin_templates/img/hint_icon.png
===================================================================
diff -u
Binary files differ
Index: branches/5.0.x/core/admin_templates/img/tab_active_back2.jpg
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/img/tab_active_back3.jpg
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/img/itemtabs/tab_middle.gif
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/img/itemtabs/tab_left.gif
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/img/itemtabs/tab_right.gif
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/custom_fields/custom_fields_list.tpl
===================================================================
diff -u -r12117 -r12382
--- branches/5.0.x/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 12382)
@@ -68,7 +68,23 @@
 	<inp2:Field field="$field" grid="$grid" no_special="no_special" as_label="1" />
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" grid="Default"/>
+<style type="text/css">
+	tr.row-disabled td {
+		background-color: #FFDFE0;
+	}
+
+	tr.grid-data-row-even.row-disabled td {
+		background-color: #F4D4D5;
+	}
+</style>
+
+<inp2:m_DefineElement name="row_class">
+	<inp2:m_if check="Field" field="IsSystem" db="db">
+		row-disabled
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" grid="Default" row_class_render_as="row_class"/>
 <script type="text/javascript">
 	Grids['cf'].SetDependantToolbarButtons( new Array('edit','delete', 'clone', 'move_down', 'move_up') );
 </script>
Index: branches/5.0.x/core/admin_templates/tree.tpl
===================================================================
diff -u -r12117 -r12382
--- branches/5.0.x/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 12382)
@@ -91,16 +91,23 @@
 	}
 
 	function setCatalogTab($prefix) {
-		var $ret = checkEditMode();
+		var $ret = checkEditMode(false);
 
 		if ($ret) {
 			var $right_frame = getFrame('main');
 			var $catalog_type = (typeof $right_frame.$Catalog != 'undefined') ? $right_frame.$Catalog.type : '';
 
+			// highlight "Structure & Data" node, when one of it's shortcut nodes are clicked
+			<inp2:m_DefineElement name="section_url_element"><inp2:m_param name="section_url"/></inp2:m_DefineElement>
+			var $structure_node = the_tree.locateItemByURL('<inp2:adm_PrintSection render_as="section_url_element" section_name="in-portal:browse"/>');
+
 			if ($catalog_type == 'AdvancedView') {
 				$right_frame.$Catalog.switchTab($prefix);
-				return 1; // this opens folder, but disables click
+				return $structure_node; // this opens folder, but disables click
 			}
+
+			// this disabled click and causes other node to be highlighted
+			return $structure_node;
 		}
 
 		return $ret;
Index: branches/5.0.x/core/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -r12117 -r12382
--- branches/5.0.x/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 12382)
@@ -83,7 +83,7 @@
 	 		<inp2:m_if check="m_IsDebugMode">
 	 			<br />
 	 			<img src="img/spacer.gif" height="1" width="<inp2:g-perm_LevelIndicator level="$deep_level" multiply="20"/>" alt="" border="0"/>
-	 			<span class="small">[<inp2:m_param name="section_name"/>, <b><inp2:m_param name="SectionPrefix"/></b>]</span>
+	 			<small style="color: gray;">[<inp2:m_param name="section_name"/>, <b><inp2:m_param name="SectionPrefix"/></b>]</small>
 	 		</inp2:m_if>
 	 	</td>
 
Index: branches/5.0.x/core/admin_templates/img/tab_back3.jpg
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/incs/cms.css
===================================================================
diff -u -r12375 -r12382
--- branches/5.0.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 12375)
+++ branches/5.0.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 12382)
@@ -33,12 +33,32 @@
 	margin-top: -10px;
 }
 
+div.cms-edit-design-btn-container {
+	position: absolute;
+	margin-left: -10px;
+	margin-top: -10px;
+	display: none;
+}
+
+div.cms-edit-design-btn-container div.cms-edit-block-btn, div.cms-edit-design-btn-container div.cms-edit-design-btn {
+	float: left;
+	display: block;
+	position: relative;
+	margin: 0px;
+}
+
+div.cms-edit-design-btn-container div.cms-edit-design-btn {
+	margin-left: 4px;
+}
+
 /* === Styles for "Section Properties" button === */
 div.cms-section-properties-btn {
 	float: right;
 	position: relative;
 	border: 2px solid #A1D0A1;
 	background-color: #CCFF00;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
 }
 
 div.cms-section-properties-btn-container {
@@ -70,8 +90,6 @@
 	margin-left: -10px;
 	border: 2px solid #A1D0A1;
 	background-color: #CCFF00;
-	/*opacity: 0.5;
-	filter: alpha(opacity=50);*/
 	display: none;
 }
 
@@ -91,17 +109,21 @@
 	width: auto;
 	color: black;
 	cursor: pointer;
+	/*opacity: 0.5;
+	filter: alpha(opacity=50);*/
 	-moz-border-radius: 10px;
 }
 
 div.cms-save-layout-btn {
-	border: 2px solid #A1D0A1;
-	background-color: #CCFF00;
+	color: white;
+	border: 2px solid #1C960C;
+	background-color: #24B30D;
 }
 
 div.cms-cancel-layout-btn {
-	border: 2px solid #FF0000;
-	background-color: #FF6A5D;
+	color: white;
+	border: 2px solid #C81900;
+	background-color: #DE2A00;
 }
 
 div.cms-cancel-layout-btn {
@@ -113,13 +135,13 @@
 	border: 1px dashed transparent;
 }
 
-div.block-edit-block-btn-container-over {
+div.block-edit-block-btn-container-over, div.block-edit-design-btn-container-over {
 	border-color: #FF6E00;
 }
 
-div.block-edit-design-btn-container-over {
+/*div.block-edit-design-btn-container-over {
 	border-color: #A1D0A1;
-}
+}*/
 
 /* === Styles for element moving/sorting in theme === */
 div.movable-area {
@@ -150,5 +172,5 @@
 span[name='cms-translate-phrase'] .cms-edit-btn {
 	display: none;
 	opacity: 1;
-	filter: alpha(opacity=0);
+	filter: alpha(opacity=100);
 }
\ No newline at end of file
Index: branches/5.0.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl
===================================================================
diff -u -r12117 -r12382
--- branches/5.0.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 12382)
@@ -86,19 +86,17 @@
 	<inp2:m_if check="m_Param" name="not_last">; </inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_recipient_box" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" style="width: 100%">
+<inp2:m_DefineElement name="inp_recipient_box" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" hint_label="" style="width: 100%">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<td class="control-cell">
 				<inp2:m_if check="{$prefix}_IsManualRecipient">
 					<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="$format"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>">
 				<inp2:m_else/>
 					<inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/>
 					<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
 				</inp2:m_if>
-
-				<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 			</td>
 			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		</tr>
Index: branches/5.0.x/core/units/ban_rules/ban_rules_config.php
===================================================================
diff -u -r12299 -r12382
--- branches/5.0.x/core/units/ban_rules/ban_rules_config.php	(.../ban_rules_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/ban_rules/ban_rules_config.php	(.../ban_rules_config.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: ban_rules_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: ban_rules_config.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -61,7 +61,7 @@
 				'label'			=>	'la_tab_BanList',
 				'url'			=>	Array('t' => 'ban_rules/ban_rule_list', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
-				'priority'		=>	6,
+				'priority'		=>	4,
 				'type'			=>	stTREE,
 			),
 		),
Index: branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r12375 -r12382
--- branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 12375)
+++ branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 12382)
@@ -58,13 +58,13 @@
 				<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;"/>
+							id="<inp2:m_param name='prefix'/>_search_keyword"
+							class="filter <inp2:m_ifnot check='m_Recall' var='{$prefix}_search_keyword' equals_to=''>filter-active</inp2:m_ifnot>"
+							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"/>
 					</td>
 					<td style="white-space: nowrap;">
 						<script type="text/javascript">
@@ -97,13 +97,13 @@
 							<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"/>"
-										PrefixSpecial="<inp2:m_param name="PrefixSpecial"/>"
-										Grid="<inp2:m_param name="grid"/>"
-										ajax="<inp2:m_param name="ajax"/>"
-										style="border: 1px solid grey;"/>
+										id="<inp2:m_param name='PrefixSpecial'/>_search_keyword"
+										class="filter <inp2:m_ifnot check='m_Recall' var='{$PrefixSpecial}_search_keyword' equals_to=''>filter-active</inp2:m_ifnot>"
+										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'/>"/>
 								<input type="text" style="display: none;"/>
 							</td>
 							<td style="white-space: nowrap;" id="search_buttons[<inp2:m_param name="PrefixSpecial"/>]">
@@ -609,14 +609,14 @@
 	<inp2:InitList pass_params="1"/> <!--## this is to avoid recalling prefix as an item in first iterate grid, by col-picker for instance ##-->
 
 	<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="warning-table">
-  		<tr>
-    		<td valign="top" class="form-warning">
-    			<inp2:m_phrase name="la_Warning_Filter"/>
-    		</td>
-  		</tr>
-	</table>
+	<inp2:m_if check="{$PrefixSpecial}_SearchActive" grid="$grid">
+		<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_Filter"/>
+	    		</td>
+	  		</tr>
+		</table>
 	</inp2:m_if>
 
 	<div id="grid_<inp2:m_Param name='PrefixSpecial'/>_container"></div>
@@ -782,14 +782,14 @@
 	<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="warning-table" >
-  		<tr>
-    		<td valign="top" class="hint_red">
-    			<inp2:m_phrase name="la_Warning_Filter"/>
-    		</td>
-  		</tr>
-	</table>
+	<inp2:m_if check="{$PrefixSpecial}_SearchActive" grid="$grid">
+		<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">
Index: branches/5.0.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r12296 -r12382
--- branches/5.0.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 12296)
+++ branches/5.0.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 12382)
@@ -97,13 +97,12 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_field_caption" title="" subfield="" NamePrefix="">
+<inp2:m_DefineElement name="inp_edit_field_caption" title="" subfield="" hint_label="" NamePrefix="">
 	<inp2:m_inc param="tab_index" by="1"/>
 	<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:{$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>:
+				<span class="<inp2:m_if check='{$prefix}_HasError' field='$field'>error-cell</inp2:m_if>"><inp2:m_phrase label="$title"/></span></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required">&nbsp;*</span></inp2:m_if>:<inp2:m_if check="m_Param" name="hint_label"><span>&nbsp;<img src="<inp2:m_TemplatesBase/>/img/hint_icon.png" width="12" height="13" title="<inp2:m_Phrase label='$hint_label' html_escape='1'/>" alt="<inp2:m_Phrase label='$hint_label' html_escape='1'/>"/></inp2:m_if>
 			</label>
 		<inp2:m_else/>
 			&nbsp;
@@ -121,12 +120,11 @@
 <inp2:m_DefineElement name="inp_label" is_last="" subfield="" style="" format="" db="" hint_label="" as_label="" currency="" no_special="" nl2br="0" is_last="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<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" no_special="$no_special"/>
 				</span>
-				<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 				<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='$db'/>">
 			</td>
 	    	<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
@@ -150,13 +148,12 @@
 	<!--##<td class="error-cell"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_box" subfield="" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" style="width: 100%">
+<inp2:m_DefineElement name="inp_edit_box" subfield="" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" hint_label="" style="width: 100%">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<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>
 			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
@@ -166,13 +163,12 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_password" class="" size="" style="">
+<inp2:m_DefineElement name="inp_edit_password" class="" size="" hint_label="" style="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" hint_label="$hint_label" title="$title"/>
 			<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="<inp2:{$prefix}_Field name='{$field}_plain'/>" 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>
 
 				<script type="text/javascript">
 					$(document).ready(
@@ -192,10 +188,10 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_upload" class="" size="" thumbnail="" is_last="" style="">
+<inp2:m_DefineElement name="inp_edit_upload" class="" size="" thumbnail="" is_last="" hint_label="" style="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<td class="control-cell">
 				<inp2:m_if check="m_Param" name="thumbnail">
 					<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
@@ -252,10 +248,10 @@
 	##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_swf_upload" class="" is_last="" style="">
+<inp2:m_DefineElement name="inp_edit_swf_upload" class="" is_last="" hint_label="" style="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<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>
@@ -344,10 +340,10 @@
 	<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="">
+<inp2:m_DefineElement name="inp_edit_date" class="" hint_label="" is_last="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="{$field}_date" title="$title" hint_label="$hint_label" 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}'/>"
@@ -380,10 +376,10 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_time" class="" is_last="">
+<inp2:m_DefineElement name="inp_edit_time" class="" hint_label="" is_last="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="{$field}_time" title="$title" hint_label="$hint_label" 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>
@@ -398,10 +394,10 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_date_time" class="" is_last="">
+<inp2:m_DefineElement name="inp_edit_date_time" class="" hint_label="" is_last="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" 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 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">
@@ -548,10 +544,10 @@
 	##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_user" class="" size="" is_last="" old_style="0" onkeyup="">
+<inp2:m_DefineElement name="inp_edit_user" class="" size="" is_last="" old_style="0" hint_label="" onkeyup="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<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">
@@ -570,10 +566,10 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_category" class="" size="" is_last="" old_style="0" onkeyup="">
+<inp2:m_DefineElement name="inp_edit_category" class="" size="" is_last="" old_style="0" hint_label="" onkeyup="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<td class="control-cell">
 				<table cellpadding="0" cellspacing="0">
 					<tr>
@@ -620,10 +616,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="" onchange="" has_empty="0" empty_value="" style="">
+<inp2:m_DefineElement name="inp_edit_options" is_last="" onchange="" has_empty="0" empty_value="" hint_label="" style="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<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">
@@ -641,10 +637,10 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_multioptions" is_last="" has_empty="0" empty_value="" style="">
+<inp2:m_DefineElement name="inp_edit_multioptions" is_last="" has_empty="0" empty_value="" hint_label="" style="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<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">
@@ -671,10 +667,10 @@
 	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>" onclick="<inp2:m_param name="onclick"/>" onchange="<inp2:m_param name="onchange"/>"><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_radio" is_last="" pass_tabindex="" onclick="" onchange="">
+<inp2:m_DefineElement name="inp_edit_radio" is_last="" pass_tabindex="" onclick="" hint_label="" onchange="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<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" />
@@ -690,15 +686,14 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_checkbox" is_last="" field_class="" onchange="" onclick="">
+<inp2:m_DefineElement name="inp_edit_checkbox" is_last="" field_class="" onchange="" hint_label="" onclick="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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_"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last" NamePrefix="_cb_"/>
 			<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>
 			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
@@ -716,10 +711,10 @@
 	<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="" pass_tabindex="" is_last="">
+<inp2:m_DefineElement name="inp_edit_checkboxes" no_empty="" pass_tabindex="" hint_label="" is_last="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<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"/>
@@ -742,25 +737,22 @@
 	<!--##
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" 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>
 			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		</tr>
 	</inp2:m_if>
 	##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_weight" class="" is_last="" maxlength="">
+<inp2:m_DefineElement name="inp_edit_weight" class="" is_last="" hint_label="" maxlength="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<td class="control-cell">
 				<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
 					<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'/>" maxlength="<inp2:m_param name='maxlength'/>" class="<inp2:m_param name='class'/>" onblur="<inp2:m_Param name='onblur'/>">
@@ -781,10 +773,10 @@
 	</inp2:m_if>
 </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="">
+<inp2:m_DefineElement name="inp_edit_minput" style="" format="" allow_add="1" allow_edit="1" allow_delete="1" allow_move="1" hint_label="" title="">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" hint_label="$hint_label" title="$title"/>
 			<td class="control-cell">
 				<table>
 					<tr>
@@ -847,10 +839,10 @@
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_picker" is_last="" has_empty="0" empty_value="" style="width: 225px;" size="15">
+<inp2:m_DefineElement name="inp_edit_picker" is_last="" has_empty="0" empty_value="" style="width: 225px;" hint_label="" size="15">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<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"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<td class="control-cell">
 				<table cellpadding="0" cellspacing="0">
 					<tr>
Index: branches/5.0.x/admin/system_presets/simple/settings.php
===================================================================
diff -u -r12329 -r12382
--- branches/5.0.x/admin/system_presets/simple/settings.php	(.../settings.php)	(revision 12329)
+++ branches/5.0.x/admin/system_presets/simple/settings.php	(.../settings.php)	(revision 12382)
@@ -2,8 +2,11 @@
 
 	defined('FULL_PATH') or die('restricted access!');
 
-	$visible_editing_modes = Array (
-		EDITING_MODE_BROWSE,
-		EDITING_MODE_CONTENT,
-		EDITING_MODE_DESIGN,
+	$settings = Array (
+		'default_editing_mode' => EDITING_MODE_CONTENT,
+		'visible_editing_modes' => Array (
+//			EDITING_MODE_BROWSE,
+			EDITING_MODE_CONTENT,
+//			EDITING_MODE_DESIGN,
+		),
 	);
\ No newline at end of file
Index: branches/5.0.x/core/admin_templates/img/tab_active_right.gif
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/units/mailing_lists/mailing_lists_config.php
===================================================================
diff -u -r12299 -r12382
--- branches/5.0.x/core/units/mailing_lists/mailing_lists_config.php	(.../mailing_lists_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/mailing_lists/mailing_lists_config.php	(.../mailing_lists_config.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_lists_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: mailing_lists_config.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -63,8 +63,9 @@
 				'parent'		=>	'in-portal:users',
 				'icon'			=>	'custom',
 				'label'			=>	'la_title_MailingLists',
+				'use_parent_header' => 1,
 				'permissions'	=>	Array (),
-				'priority'		=>	7,
+				'priority'		=>	5,
 				'type'			=>	stTREE,
 			),
 
@@ -74,7 +75,7 @@
 				'label'			=>	'la_title_MailingLists',
 				'url'			=>	Array('t' => 'mailing_lists/mailing_list_list', 'pass' => 'm'),
 				'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
-				'priority'		=>	7.1,
+				'priority'		=>	5.1, // <parent_priority>.<own_priority>, because this section replaces parent in tree
 				'type'			=>	stTAB,
 			),
 		),
Index: branches/5.0.x/core/admin_templates/img/tab_back.gif
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl
===================================================================
diff -u -r12117 -r12382
--- branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 12382)
@@ -12,9 +12,7 @@
 		<item
 			href="<inp2:CategoryLink template='catalog/catalog' pass='m' m_opener='r'/>"
 			icon="<inp2:c_ModulePath module='core'/>img/icons/icon24_folder<inp2:m_if check='FieldEquals' name='IsMenu' value='0'>-red</inp2:m_if>.gif"
-			onclick="checkCatalog(<inp2:m_if check="Field" name="SymLinkCategoryId" db="db"><inp2:Field name="SymLinkCategoryId" db="db"/><inp2:m_else/><inp2:Field name='CategoryId' db="db"/></inp2:m_if>, '<inp2:GetModulePrefix/>')">
-			<inp2:Field name="Name"/>
-		</item>
+			onclick="checkCatalog(<inp2:m_if check="Field" name="SymLinkCategoryId" db="db"><inp2:Field name="SymLinkCategoryId" db="db"/><inp2:m_else/><inp2:Field name='CategoryId' db="db"/></inp2:m_if>, '<inp2:GetModulePrefix/>')"><inp2:Field name="Name"/></item>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 <tree>
Index: branches/5.0.x/core/admin_templates/img/blue_bar_help.gif
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/units/sections/sections_config.php
===================================================================
diff -u -r12299 -r12382
--- branches/5.0.x/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: sections_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: sections_config.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -68,12 +68,12 @@
 			),
 
 			'in-portal:reviews' => Array (
-				'parent'		=>	'in-portal:users',
+				'parent'		=>	'in-portal:site',
 				'icon'			=>	'reviews',
 				'label'			=>	'la_tab_Reviews',
 				'url'			=>	Array ('t' => 'reviews/reviews', 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	5,
+				'priority'		=>	3.3,
 				'type'			=>	stTREE,
 			),
 
@@ -201,7 +201,7 @@
 				'label'			=>	'la_tab_Backup',
 				'url'			=>	Array ('t' => 'tools/backup1', 'section' => 'in-portal:configure_general', 'module' => 'In-Portal',  'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	2,
+				'priority'		=>	1,
 				'type'			=>	stTREE,
 			),
 
@@ -211,7 +211,7 @@
 				'label'			=>	'la_tab_Restore',
 				'url'			=>	Array ('t' => 'tools/restore1', 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	3,
+				'priority'		=>	2,
 				'type'			=>	stTREE,
 			),
 
@@ -222,7 +222,7 @@
 				'url'			=>	Array ('t' => 'tools/import1'),
 				'onclick'		=>	'direct_edit(\'adm\', this.href);',
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	4,
+				'priority'		=>	3,
 				'type'			=>	stTREE,
 			),
 
@@ -232,7 +232,7 @@
 				'label'			=>	'la_tab_QueryDB',
 				'url'			=>	Array ('t' => 'tools/sql_query', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'edit'),
-				'priority'		=>	5,
+				'priority'		=>	4,
 				'type'			=>	stTREE,
 			),
 
@@ -242,7 +242,7 @@
 				'label'			=>	'la_tab_ServerInfo',
 				'url'			=>	Array ('t' => 'tools/server_info', 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	6,
+				'priority'		=>	5,
 				'type'			=>	stTREE,
 			),
 		),
Index: branches/5.0.x/core/admin_templates/img/tab_right.gif
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/img/tab_active_back.jpg
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/img/top_frame/icons/save_button.gif
===================================================================
diff -u
Binary files differ
Index: branches/5.0.x/core/admin_templates/img/tab_active_left.gif
===================================================================
diff -u -r12117 -r12382
Binary files differ
Index: branches/5.0.x/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -r12320 -r12382
--- branches/5.0.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 12320)
+++ branches/5.0.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 12382)
@@ -73,7 +73,6 @@
 
 <inp2:m_DefineElement name="phrase_element">
 	<inp2:m_if check="m_Get" name="simple_mode">
-		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="!la_fld_PrimaryTranslation!"/>
 		<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="Translation" title="!la_fld_Translation!" rows="7" cols="50" allow_html="0"/>
 	<inp2:m_else/>
 		<tr class="subsectiontitle">
Index: branches/5.0.x/core/kernel/nparser/nparser.php
===================================================================
diff -u -r12344 -r12382
--- branches/5.0.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 12344)
+++ branches/5.0.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: nparser.php 12344 2009-08-18 10:35:00Z alex $
+* @version	$Id: nparser.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -528,6 +528,7 @@
 			else {
 				if (strpos($block_params['name'], '__capture_') === 0) {
 					// capture tag (usually inside pair RenderElement)
+					$decorate = false;
 				}
 				elseif (array_key_exists('content', $block_params)) {
 					// pair RenderElement (on template, were it's used)
Index: branches/5.0.x/core/admin_templates/js/catalog.js
===================================================================
diff -u -r12230 -r12382
--- branches/5.0.x/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 12230)
+++ branches/5.0.x/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 12382)
@@ -374,14 +374,28 @@
 }
 
 Catalog.prototype.displaySearch = function ($prefix) {
-	var $search_input = document.getElementById('search_keyword')
+	var $search_input = $('#search_keyword');
 
-	$search_input.setAttribute('PrefixSpecial', $prefix);
+	$search_input.attr('PrefixSpecial', $prefix);
 
 	if (this.searchInfo[$prefix]) {
-		$search_input.value = this.searchInfo[$prefix].keyword;
-		$search_input.setAttribute('Grid', this.searchInfo[$prefix].grid);
+		$search_input
+		.val(this.searchInfo[$prefix].keyword)
+		.attr('Grid', this.searchInfo[$prefix].grid);
+
+		if (this.searchInfo[$prefix].keyword) {
+			// catalog tab found and keyword present
+			$search_input.addClass('filter-active');
+		}
+		else {
+			// catalog tab found and keyword missing
+			$search_input.removeClass('filter-active');
+		}
 	}
+	else {
+		// catalog tab not found
+		$search_input.removeClass('filter-active');
+	}
 }
 
 Catalog.prototype.setCurrentCategory = function($prefix, $category_id) {
Index: branches/5.0.x/core/units/phrases/phrases_config.php
===================================================================
diff -u -r12299 -r12382
--- branches/5.0.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/phrases/phrases_config.php	(.../phrases_config.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: phrases_config.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -22,6 +22,21 @@
 				'ForeignKey' => false,
 				'ParentTableKey' => false,
 				'ParentPrefix' => false,
+
+				'Sections' => Array (
+					// "Phrases"
+					'in-portal:phrases' => Array (
+						'parent'		=>	'in-portal:site',
+						'icon'			=>	'conf_regional',
+						'label'			=>	'la_title_Phrases',
+						'url'			=>	Array ('t' => 'languages/phrase_list', 'pass' => 'm'),
+						'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
+//						'perm_prefix'	=>	'lang',
+						'priority'		=>	4,
+//						'show_mode'		=>	smSUPER_ADMIN,
+						'type'			=>	stTREE,
+					),
+				),
 			)
 		),
 
@@ -105,21 +120,6 @@
 			)
 		),
 
-		'Sections' => Array (
-			// "Phrases"
-			'in-portal:phrases' => Array (
-				'parent'		=>	'in-portal:site',
-				'icon'			=>	'conf_regional',
-				'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 (
@@ -182,7 +182,7 @@
 		'VirtualFields' => Array (
 			'PrimaryTranslation' => Array (),
 			'LangFile' => Array (),
-			'ImportOverwrite' => Array (),
+			'ImportOverwrite' => Array ('type' => 'int', 'default' => 0),
 			'DoNotEncode' => Array (),
 			'PackName' => Array (
 				'type' => 'string',
Index: branches/5.0.x/core/units/visits/visits_tag_processor.php
===================================================================
diff -u -r12299 -r12382
--- branches/5.0.x/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 12299)
+++ branches/5.0.x/core/units/visits/visits_tag_processor.php	(.../visits_tag_processor.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: visits_tag_processor.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: visits_tag_processor.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -83,8 +83,7 @@
 
 			$format_fields = Array('OrderTotalAmount', 'OrderAffiliateCommission');
 
-			if( $this->HasParam($params, 'currency') )
-			{
+			if (array_key_exists('currency', $params) && $params['currency']) {
 				$iso = $this->GetISO($params['currency']);
 				foreach($format_fields as $format_field)
 				{
Index: branches/5.0.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r12342 -r12382
--- branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12342)
+++ branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 12342 2009-08-18 10:17:30Z alex $
+* @version	$Id: categories_tag_processor.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1472,13 +1472,13 @@
 					<div class="cms-layout-btn-container"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . '>
 						<div class="cms-save-layout-btn" onclick="aTemplateManager.saveLayout(); return false;">
 							<div class="cms-btn-image">
-								<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
+								<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/save_button.gif" width="16" height="16" alt=""/>
 							</div>
 							<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_SaveChanges', false) . '</div>
 						</div>
 						<div class="cms-cancel-layout-btn" onclick="aTemplateManager.cancelLayout(); return false;">
 							<div class="cms-btn-image">
-								<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
+								<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/cancel_button.gif" width="16" height="16" alt=""/>
 							</div>
 							<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_Cancel', false) . '</div>
 						</div>
Index: branches/5.0.x/core/units/skins/skins_config.php
===================================================================
diff -u -r12299 -r12382
--- branches/5.0.x/core/units/skins/skins_config.php	(.../skins_config.php)	(revision 12299)
+++ branches/5.0.x/core/units/skins/skins_config.php	(.../skins_config.php)	(revision 12382)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: skins_config.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: skins_config.php 12382 2009-08-25 18:27:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -84,7 +84,7 @@
 			'label'			=>	'la_tab_Skins',
 			'url'			=>	Array('t' => 'skins/skin_list', 'pass' => 'm'),
 			'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
-			'priority'		=>	11,
+			'priority'		=>	7,
 			'show_mode'		=>	smSUPER_ADMIN,
 			'type'			=>	stTREE,
 		),
Index: branches/5.0.x/core/admin_templates/js/template_manager.js
===================================================================
diff -u -r12320 -r12382
--- branches/5.0.x/core/admin_templates/js/template_manager.js	(.../template_manager.js)	(revision 12320)
+++ branches/5.0.x/core/admin_templates/js/template_manager.js	(.../template_manager.js)	(revision 12382)
@@ -38,27 +38,24 @@
 
 			$head_frame.$('#extra_toolbar').html( $extra_toolbar.html() );
 
+			var $hover_effect = [];
+
+			if ($template_manager.editingMode > 1) {
+				// all modes except for "Browse Mode"
+				$hover_effect.push('div.cms-section-properties-btn:first');
+			}
+
 			if ($template_manager.editingMode == 2) {
 				// Content Mode
+				$hover_effect.push('div.cms-edit-btn');
 
-				$('div.cms-edit-btn')
-				.mouseover(
-					function(e) {
-						$(this).css('opacity', 1);
-					}
-				)
-				.mouseout(
-					function(e) {
-						$(this).css('opacity', 0.5);
-					}
-				);
-
 				// make all spans with phrases clickable
 				$template_manager.setupEditTranslationButtons(document);
 			}
 
 			if ($template_manager.editingMode == 3) {
 				// Design Mode
+//				$hover_effect.push('div.cms-save-layout-btn:first, div.cms-cancel-layout-btn:first');
 
 				$template_manager.renumberMovableElements();
 
@@ -86,6 +83,19 @@
 					}
 				);
 			}
+
+			// make requested elements fully visible on mouseover
+			$($hover_effect.join(', '))
+			.mouseover(
+				function(e) {
+					$(this).css('opacity', 1);
+				}
+			)
+			.mouseout(
+				function(e) {
+					$(this).css('opacity', 0.5);
+				}
+			);
 		}
 	);
 }
@@ -232,7 +242,14 @@
 
 	if ($element.hasClass('block-edit-design-btn-container')) {
 		$($element).addClass('block-edit-design-btn-container-over');
-		$('div.cms-edit-design-btn:first', $element).show();
+
+		var $button_group = $('div.cms-edit-design-btn-container:first', $element);
+		if ($button_group.length) {
+			$button_group.show();
+		}
+		else {
+			$('div.cms-edit-design-btn:first', $element).show();
+		}
 	}
 	else {
 		$($element).addClass('block-edit-block-btn-container-over');
@@ -251,7 +268,14 @@
 
 	if ($element.hasClass('block-edit-design-btn-container')) {
 		$($element).removeClass('block-edit-design-btn-container-over');
-		$('div.cms-edit-design-btn:first', $element).hide();
+
+		var $button_group = $('div.cms-edit-design-btn-container:first', $element);
+		if ($button_group.length) {
+			$button_group.hide();
+		}
+		else {
+			$('div.cms-edit-design-btn:first', $element).hide();
+		}
 	}
 	else {
 		$($element).removeClass('block-edit-block-btn-container-over');
@@ -262,21 +286,59 @@
 }
 
 TemplateManager.prototype.searchBlocks = function () {
-	$('div').each (
-		function () {
-			var $id = $(this).attr('id');
+	var $design_containers = $('div.block-edit-design-btn-container');
+	var $block_containers = $('div.block-edit-block-btn-container');
 
-			if (!$id || $id.match(/parser_block\[.*\].*_btn$/) || !$id.match(/parser_block\[.*\]/)) {
-				// skip other divs
-				return true;
+	$design_containers.each(
+		function() {
+			var $block_container = $('div.block-edit-block-btn-container:first', this);
+
+			if ($block_container.length) {
+				$block_containers = $block_containers.not($block_container);
+
+				// place "Edit Block" button near "Edit Design" button
+				var $edit_design_btn = $('div.cms-edit-design-btn:first', this);
+				var $edit_block_btn = $('div.cms-edit-block-btn:first', $block_container);
+
+				$edit_design_btn
+				.wrap('<div class="cms-edit-design-btn-container"></div>')
+				.before( $edit_block_btn.clone() );
+
+				$edit_block_btn.remove();
+
+				// make "hint" from "Edit Block" button container main
+				$(this).attr('title', $block_container.attr('title'));
+				$block_container.attr('title', '');
+
+				TemplateManager.prototype.registerBlock.call(aTemplateManager, $block_container.get(0), ['hover']);
 			}
 
+			TemplateManager.prototype.registerBlock.call(aTemplateManager, this, ['dblclick']);
+		}
+	);
+
+	$block_containers.each(
+		function() {
 			TemplateManager.prototype.registerBlock.call(aTemplateManager, this);
 		}
 	);
+
+//	$('div').each (
+//		function () {
+//			/*var $id = $(this).attr('id');
+//
+//			if (!$id || $id.match(/parser_block\[.*\].*_btn$/) || !$id.match(/parser_block\[.*\]/)) {
+//				// skip other divs
+//				return true;
+//			}*/
+//
+//
+//			TemplateManager.prototype.registerBlock.call(aTemplateManager, this);
+//		}
+//	);
 }
 
-TemplateManager.prototype.registerBlock = function ($element) {
+TemplateManager.prototype.registerBlock = function ($element, $skip_events) {
 	var $params = $element.getAttribute('params').split(':');
 
 	this._blocks[$element.id] = {
@@ -292,22 +354,32 @@
 		}
 	);
 
-	$($element)
-	.dblclick(
-		function(ev) {
-			TemplateManager.prototype.onBtnClick.call(aTemplateManager, ev, this);
-		}
-	)
-	.mouseover(
-		function(ev) {
-			TemplateManager.prototype.onMouseOver.call(aTemplateManager, ev, this);
-		}
-	)
-	.mouseout(
-		function(ev) {
-			TemplateManager.prototype.onMouseOut.call(aTemplateManager, ev, this);
-		}
-	);
+	if ($skip_events === undefined) {
+		$skip_events = [];
+	}
 
+	if (!in_array('dblclick', $skip_events)) {
+		$($element)
+		.dblclick(
+			function(ev) {
+				TemplateManager.prototype.onBtnClick.call(aTemplateManager, ev, this);
+			}
+		)
+	}
+
+	if (!in_array('hover', $skip_events)) {
+		$($element)
+		.mouseover(
+			function(ev) {
+				TemplateManager.prototype.onMouseOver.call(aTemplateManager, ev, this);
+			}
+		)
+		.mouseout(
+			function(ev) {
+				TemplateManager.prototype.onMouseOut.call(aTemplateManager, ev, this);
+			}
+		);
+	}
+
 	this._blockOrder.push($element.id);
 }
\ No newline at end of file