Index: branches/5.2.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r15246 -r15257
--- branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 15246)
+++ branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 15257)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 15246 2012-03-27 11:51:06Z alex $
+* @version	$Id: categories_tag_processor.php 15257 2012-04-03 09:46:32Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1193,63 +1193,27 @@
 
 		$edit_code_before = $edit_code_after = '';
 
-		if (EDITING_MODE == EDITING_MODE_CONTENT) {
-			$bg_color = isset($params['bgcolor']) ? $params['bgcolor'] : '#ffffff';
-			$url_params = Array (
-				'pass'			=>	'm,c,content',
-				'm_opener'		=>	'd',
-				'c_id'			=>	$page->GetID(),
-				'content_id'	=>	$content->GetID(),
-				'front'			=>	1,
-				'admin'			=>	1,
-				'__URLENCODE__'	=>	1,
-				'__NO_REWRITE__'=>	1,
-				'escape'		=>	1,
-				'index_file' => 'index.php',
-//				'bgcolor' => $bg_color,
-//				'__FORCE_SID__' => 1
-			);
+		if ( EDITING_MODE == EDITING_MODE_CONTENT ) {
+			$button_code = $this->Application->ProcessParsedTag($content->getPrefixSpecial(), 'AdminEditButton', $params);
 
-			// link from Front-End to admin, don't remove "index.php"
-			$edit_url = $this->Application->HREF('categories/edit_content', ADMIN_DIRECTORY, $url_params, 'index.php');
 			$edit_code_before = '
 				<div class="cms-edit-btn-container">
-					<div class="cms-edit-btn" onclick="$form_name=\'kf_cont_'.$content->GetID().'\'; std_edit_item(\'content\', \'categories/edit_content\');">
-						<div class="cms-btn-image">
-							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.png" width="15" height="16" alt=""/>
-						</div>
-						<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_EditContent', false, true) . ' '.(defined('DEBUG_MODE') && DEBUG_MODE ? " - #{$num}" : '').'</div>
-					</div>
+					' . $button_code . '
 					<div class="cms-btn-content">';
 
-			$edit_form = '<form method="POST" style="display: inline; margin: 0px" name="kf_cont_'.$content->GetID().'" id="kf_cont_'.$content->GetID().'" action="'.$edit_url.'">';
-			$edit_form .= '<input type="hidden" name="c_id" value="'.$page->GetID().'"/>';
-			$edit_form .= '<input type="hidden" name="content_id" value="'.$content->GetID().'"/>';
-			$edit_form .= '<input type="hidden" name="front" value="1"/>';
-			$edit_form .= '<input type="hidden" name="bgcolor" value="'.$bg_color.'"/>';
-			$edit_form .= '<input type="hidden" name="m_lang" value="'.$this->Application->GetVar('m_lang').'"/>';
-			$edit_form .= '</form>';
-
 			$edit_code_after = '</div></div>';
-
-			if (array_key_exists('forms_later', $params) && $params['forms_later']) {
-				$all_forms = $this->Application->GetVar('all_forms');
-				$this->Application->SetVar('all_forms', $all_forms . $edit_form);
-			}
-			else {
-				$edit_code_after .= $edit_form;
-			}
 		}
 
-		if ($this->Application->GetVar('_editor_preview_') == 1) {
+		if ( $this->Application->GetVar('_editor_preview_') == 1 ) {
 			$data = $this->Application->RecallVar('_editor_preview_content_');
-		} else {
+		}
+		else {
 			$data = $content->GetField('Content');
 		}
 
 		$data = $edit_code_before . $this->_transformContentBlockData($data, $params) . $edit_code_after;
 
-		if ($data != '') {
+		if ( $data != '' ) {
 			$this->Application->Parser->DataExists = true;
 		}
 
@@ -1389,6 +1353,10 @@
 
 		$ret = '<link rel="stylesheet" href="' . $css_compressed . '" type="text/css" media="screen"/>' . "\n";
 
+		$ret .= '	<!--[if IE]>
+					<link rel="stylesheet" href="' . $js_url . '/../incs/cms_ie.css' . '" type="text/css" media="screen"/>
+					<![endif]-->';
+
 		if ( EDITING_MODE == EDITING_MODE_DESIGN ) {
 			$ret .= '	<style type="text/css" media="all">
 							div.movable-element .movable-header { cursor: move; }
@@ -1508,6 +1476,7 @@
 		}
 
 		$display_mode = array_key_exists('mode', $params) ? $params['mode'] : false;
+		unset($params['mode']);
 		$edit_code = '';
 
 		$page =& $this->_getPage($params);
@@ -1519,31 +1488,21 @@
 
 		// show "EditPage" button only for pages, that exists in structure
 		if ($display_mode != 'end') {
-			$edit_btn = '';
+			$edit_btn = $edit_url = '';
 
-			if (EDITING_MODE == EDITING_MODE_CONTENT) {
-				$url_params = Array(
-					'pass'			=>	'm,c',
-					'm_opener'		=>	'd',
-					'c_id'			=>	$page->GetID(),
-					'c_mode'		=>	't',
-					'c_event'		=>	'OnEdit',
-					'front'			=>	1,
-					'__URLENCODE__'	=>	1,
-					'__NO_REWRITE__'=>	1,
-					'index_file' => 'index.php',
-				);
+			if ( EDITING_MODE == EDITING_MODE_CONTENT ) {
+				$item_prefix = isset($params['item_prefix']) ? $params['item_prefix'] : '';
+				unset($params['item_prefix']);
 
-				$edit_url = $this->Application->HREF('categories/categories_edit', ADMIN_DIRECTORY, $url_params);
-
-				$edit_btn .= '
-					<div class="cms-section-properties-btn"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . ' onmouseover="window.status=\'' . addslashes($edit_url) . '\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; std_edit_item(\'c\', \'categories/categories_edit\');">
-						<div class="cms-btn-image">
-							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/section_properties.png" width="15" height="16" alt=""/>
-						</div>
-						<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_SectionProperties', false, true) . '</div>
-					</div>' . "\n";
-			} elseif (EDITING_MODE == EDITING_MODE_DESIGN) {
+				if ( $item_prefix ) {
+					$params['button_class'] = 'cms-section-properties-btn';
+					$edit_btn = $this->Application->ProcessParsedTag($item_prefix, 'AdminEditButton', $params) . "\n";
+				}
+				else {
+					$edit_btn = $this->AdminEditButton($params) . "\n"; // "st" object must be loaded before this
+				}
+			}
+			elseif ( EDITING_MODE == EDITING_MODE_DESIGN ) {
 				$url_params = Array(
 					'pass'			=>	'm,theme,theme-file',
 					'm_opener'		=>	'd',
@@ -1559,31 +1518,22 @@
 
 				$edit_url = $this->Application->HREF('themes/file_edit', ADMIN_DIRECTORY, $url_params);
 
-				$edit_btn .= '
-					<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/save_button.gif" width="16" height="16" alt=""/>
-							</div>
-							<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_SaveChanges', false, true) . '</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/cancel_button.gif" width="16" height="16" alt=""/>
-							</div>
-							<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_Cancel', false, true) . '</div>
-						</div>
-					</div>
+				$button1_icon = $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/save_button.gif';
+				$button1_title = $this->Application->Phrase('la_btn_SaveChanges', false, true);
+				$button1_code = '<button style="background-image: url(' . $button1_icon . '); onclick="aTemplateManager.saveLayout(); return false;" class="cms-btn-new cms-save-layout-btn">' . $button1_title . '</button>';
 
-					<div class="cms-section-properties-btn"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . ' onmouseover="window.status=\'' . addslashes($edit_url) . '\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; std_edit_item(\'theme\', \'themes/file_edit\');">
-						<div class="cms-btn-image">
-							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/section_properties.png" width="15" height="16" alt=""/>
-						</div>
-						<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_SectionTemplate', false, true) . '</div>
-					</div>' . "\n";
+				$button2_icon = $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/cancel_button.gif';
+				$button2_title = $this->Application->Phrase('la_btn_Cancel', false, true);
+				$button2_code = '<button style="background-image: url(' . $button2_icon . '); onclick="aTemplateManager.cancelLayout(); return false;" class="cms-btn-new cms-cancel-layout-btn">' . $button2_title . '</button>';
+
+				$button3_icon = $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/section_properties.png';
+				$button3_title = $this->Application->Phrase('la_btn_SectionTemplate', false, true);
+				$button3_code = '<button style="background-image: url(' . $button3_icon . ');' . ($display_mode === false ? ' margin: 0px;' : '') . '" onclick="$form_name=\'kf_'.$page->GetID().'\'; std_edit_item(\'theme\', \'themes/file_edit\');" class="cms-btn-new cms-section-properties-btn">' . $button3_title . '</button>';
+
+				$edit_btn .= '<div class="cms-layout-btn-container"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . '>' . $button1_code . $button2_code . '</div>' . $button3_code . "\n";
 			}
 
-			if ($display_mode == 'start') {
+			if ( $display_mode == 'start' ) {
 				// button with border around the page
 				if ( EDITING_MODE == EDITING_MODE_CONTENT ) {
 					$tabs = "\n" . str_repeat("\t", 9);
@@ -1696,7 +1646,9 @@
 				</form>';
 			}
 
-			$edit_code .= '<form method="POST" style="display: inline; margin: 0px" name="kf_'.$page->GetID().'" id="kf_'.$page->GetID().'" action="'.$edit_url.'"></form>';
+			if ( $edit_url ) {
+				$edit_code .= '<form method="POST" style="display: inline; margin: 0px" name="kf_' . $page->GetID() . '" id="kf_' . $page->GetID() . '" action="' . $edit_url . '"></form>';
+			}
 
 			// when "EditingScripts" tag is not used, make sure, that scripts are also included
 			$edit_code .= $this->EditingScripts($params);
@@ -1733,6 +1685,33 @@
 	}
 
 	/**
+	 * Creates a button for editing item in Admin Console
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function AdminEditButton($params)
+	{
+		if ( EDITING_MODE != EDITING_MODE_CONTENT ) {
+			return '';
+		}
+
+		$object = $this->getObject($params);
+		/* @var $object kDBItem */
+
+		$params['item_prefix'] = 'c';
+
+		if ( $this->Prefix == 'st' ) {
+			$params['button_icon'] = 'section_properties.png';
+			$params['button_class'] = 'cms-section-properties-btn';
+			$params['button_title'] = 'la_btn_SectionProperties';
+		}
+
+		return parent::AdminEditButton($params);
+	}
+
+	/**
 	 * Builds site menu
 	 *
 	 * @param Array $params