Index: branches/RC/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r11649 -r11661
--- branches/RC/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 11649)
+++ branches/RC/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 11661)
@@ -1351,8 +1351,17 @@
 		$ret .= '<script type="text/javascript" src="' . $js_url . '/application.js"></script>' . "\n";
 		$ret .= '<script type="text/javascript" src="' . $js_url . '/script.js"></script>' . "\n";
 		$ret .= '<script type="text/javascript" src="' . $js_url . '/jquery/thickbox/thickbox.js"></script>' . "\n";
+		$ret .= '<script type="text/javascript" src="' . $js_url . '/template_manager.js"></script>' . "\n";
 		$ret .= '<script language="javascript">' . "\n";
 		$ret .= "TB.pathToImage = 'js/jquery/thickbox/loadingAnimation.gif';" . "\n";
+
+		$template = $this->Application->GetVar('t');
+		$theme_id = $this->Application->GetVar('m_theme');
+
+		$url_params = Array ('block' => '#BLOCK#', 'theme-file_event' => '#EVENT#', 'theme_id' => $theme_id, 'source' => $template, 'pass' => 'all,theme-file', 'front' => 1, 'no_amp' => 1);
+		$edit_template_url = $this->Application->HREF('themes/template_edit', ADMIN_DIRECTORY, $url_params, 'index.php');
+		$ret .= "var aTemplateManager = new TemplateManager('" . $edit_template_url . "');\n";
+
 		$ret .= "var main_title = '" . addslashes( $this->Application->ConfigValue('Site_Name') ) . "';" . "\n";
 		$ret .= "var base_url = '" . $this->Application->BaseURL() . "';" . "\n";
 		$ret .= 'TB.closeHtml = \'<img src="' . $js_url . '/../img/close_window15.gif" width="15" height="15" style="border-width: 0px;" alt="close"/><br/>\';' . "\n";
@@ -1379,6 +1388,7 @@
 		// add form, so admin scripts could work
 		$ret .= '<form id="kernel_form" name="kernel_form" enctype="multipart/form-data" method="post" action="' . $browse_url . '">
 					<input type="hidden" name="MAX_FILE_SIZE" id="MAX_FILE_SIZE" value="' . MAX_UPLOAD_SIZE . '" />
+					<input type="hidden" name="sid" id="sid" value="' . $this->Application->GetSID() . '" />
 				</form>';
 
 		return $ret;
@@ -1968,29 +1978,6 @@
 	}
 
 	/**
-	 * Returns formatted title for template editor
-	 *
-	 * @param Array $params
-	 * @return string
-	 */
-	function TemplateEditorTitle($params)
-	{
-		if (!EDITING_MODE) {
-			return '';
-		}
-
-		$text = $this->Application->Phrase($params['phrase']);
-
-		$template_helper =& $this->Application->recallObject('TemplateHelper');
-		/* @var $template_helper TemplateHelper */
-
-		$text = sprintf($text, $template_helper->blockInfo(template_file), $template_helper->blockInfo('start_pos'), $template_helper->blockInfo('end_pos'));
-
-
-		return $text;
-	}
-
-	/**
 	 * Hide all editing tabs except permission tab, when editing "Home" (ID = 0) category
 	 *
 	 * @param Array $params
Index: branches/RC/core/admin_templates/themes/themes_edit_files.tpl
===================================================================
diff -u -r11623 -r11661
--- branches/RC/core/admin_templates/themes/themes_edit_files.tpl	(.../themes_edit_files.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/themes/themes_edit_files.tpl	(.../themes_edit_files.tpl)	(revision 11661)
@@ -12,7 +12,7 @@
 
   				function edit()
 	  			{
-
+					std_edit_temp_item('theme-file', 'themes/file_edit');
 	  			}
 
   				a_toolbar = new ToolBar();
@@ -38,6 +38,7 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('theme-file')
@@ -74,6 +75,6 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="theme-file" IdField="FileId" grid="Default"/>
 <script type="text/javascript">
-//	Grids['theme-file'].SetDependantToolbarButtons( new Array('edit','delete') );
+	Grids['theme-file'].SetDependantToolbarButtons( new Array('edit','delete') );
 </script>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -r11623 -r11661
--- branches/RC/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 11623)
+++ branches/RC/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 11661)
@@ -114,7 +114,7 @@
 					'Subject' => Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter'),
 					'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
 					'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'),
-					'LanguageId' => Array( 'title'=>'la_col_PackName', 'filter_block' => 'grid_options_filter'),
+					'LanguageId' => Array( 'title'=>'la_col_Language', 'filter_block' => 'grid_options_filter'),
 				),
 
 			),
Index: branches/RC/core/units/general/helpers/template_helper.php
===================================================================
diff -u -r11495 -r11661
--- branches/RC/core/units/general/helpers/template_helper.php	(.../template_helper.php)	(revision 11495)
+++ branches/RC/core/units/general/helpers/template_helper.php	(.../template_helper.php)	(revision 11661)
@@ -37,41 +37,67 @@
 		 */
 		var $_sourceTemplate = '';
 
-		function TemplateHelper()
+		var $_initMade = false;
+
+		/**
+		 * Performs init ot helper
+		 *
+		 * @param kDBItem $object
+		 */
+		function InitHelper(&$object)
 		{
-			parent::kHelper();
+			if ($this->_initMade) {
+				return ;
+			}
 
+			define('DBG_IGNORE_FATAL_ERRORS', 1);
+
 			// 1. get block information
 			$block_info = $this->Application->GetVar('block');
 			list ($this->_blockName, $this->_functionName) = explode(':', $block_info);
 
-			$this->_parseTemplate();
+			$this->_parseTemplate($object);
 
 			if (array_key_exists($this->_functionName, $this->Application->Parser->ElementLocations)) {
 				$this->_blockLocation = $this->Application->Parser->ElementLocations[$this->_functionName];
 			}
+
+			$this->_initMade = true;
 		}
 
 		function _getSourceTemplate()
 		{
 			// get source template
 			$t = $this->Application->GetVar('source');
-			
-			$cms_handler =& $this->Application->recallObject('st_EventHandler');
-			/* @var $cms_handler StructureEventHandler */
 
-			if (!$this->Application->TemplatesCache->TemplateExists($t) && !$this->Application->IsAdmin()) {
+			if (!$this->Application->TemplatesCache->TemplateExists($t)) {
+				$cms_handler =& $this->Application->recallObject('st_EventHandler');
+				/* @var $cms_handler StructureEventHandler */
+
 				$t = $cms_handler->GetDesignTemplate($t);
 			}
 
 			$this->_sourceTemplate = $t;
 		}
 
+		function _getThemeName()
+		{
+			$theme_id = (int)$this->Application->GetVar('theme_id');
+
+			$sql = 'SELECT Name
+					FROM ' . $this->Application->getUnitOption('theme', 'TableName') . '
+					WHERE ' . $this->Application->getUnitOption('theme', 'IDField') . ' = ' . $theme_id;
+			return $this->Conn->GetOne($sql);
+		}
+
 		/**
 		 * Render source template to get parse errors OR it's element locations
 		 *
+		 * @param kDBItem $object
+		 * @param string $append
+		 * @return bool
 		 */
-		function _parseTemplate($append = '')
+		function _parseTemplate(&$object, $append = '')
 		{
 			// 1. set internal error handler to catch all parsing errors
 			$error_handlers = $this->Application->errorHandlers;
@@ -80,10 +106,12 @@
 			);
 
 			// 2. parse template
-			$this->Application->InitParser(); // we have no parser when saving block content
+			$this->Application->InitParser( $this->_getThemeName() ); // we have no parser when saving block content
+
 			$this->_getSourceTemplate();
 
-			$this->Application->Parser->Run($this->_sourceTemplate . $append);
+			// design templates have leading "/" in the beginning
+			$this->Application->Parser->Run(ltrim($this->_sourceTemplate, '/') . $append);
 
 			// 3. restore original error handler
 			$this->Application->errorHandlers = $error_handlers;
@@ -94,15 +122,15 @@
 					$filename = $this->_getTemplateFile(false, $append . '.tpl');
 					if (!unlink($filename)) {
 						$error_file = $this->_getTemplateFile(true, $append . '.tpl');
-						$this->Application->SetVar('Failed to delete temporary template "<strong>' . $error_file . '</strong>"');
+						$object->SetError('FileContents', 'template_delete_failed', '+Failed to delete temporary template "<strong>' . $error_file . '</strong>"');
 						return false;
 					}
 				}
 				else {
 					// 3.2. restore backup
 					if (!rename($this->_getTemplateFile(false, '.tpl.bak'), $this->_getTemplateFile(false))) {
 						$error_file = $this->_getTemplateFile(true);
-						$this->Application->SetVar('Failed to restore template "<strong>' . $error_file . '</strong>" from backup.');
+						$object->SetError('FileContents', 'template_restore_failed', '+Failed to restore template "<strong>' . $error_file . '</strong>" from backup.');
 						return false;
 					}
 				}
@@ -146,12 +174,6 @@
 					break;
 
 				case 'content':
-					$function_body = $this->Application->GetVar('function_body');
-					if ($function_body !== false) {
-						// error happened -> use unsaved template content
-						return unhtmlentities( $function_body );
-					}
-
 					$template_body = file_get_contents( $this->_getTemplateFile() );
 					$length = $this->_blockLocation['end_pos'] - $this->_blockLocation['start_pos'];
 
@@ -191,26 +213,25 @@
 		/**
 		 * Saves new version of block to template, where it's located
 		 *
-		 * @param kEvent $event
+		 * @param kDBItem $object
 		 */
-		function saveBlock(&$event)
+		function saveBlock(&$object)
 		{
 			$main_template = $this->_isMainTemplate();
 			$filename = $this->_getTemplateFile(false);
 
 			// 1. get new template content
-			$new_template_body = $this->_getNewTemplateContent($filename, $lines_before);
+			$new_template_body = $this->_getNewTemplateContent($object, $filename, $lines_before);
 			if (is_bool($new_template_body) && ($new_template_body === true)) {
 				// when nothing changed -> stop processing
-				echo '0';
 				return true;
 			}
 
 			// 2. backup original template
 			if (!$main_template && !copy($filename, $filename . '.bak')) {
 				// backup failed
 				$error_file = $this->_getTemplateFile(true, '.tpl.bak');
-				$this->Application->SetVar('error_msg', 'Failed to create backup template "<strong>' . $error_file . '</strong>" backup.');
+				$object->SetError('FileContents', 'template_backup_failed', '+Failed to create backup template "<strong>' . $error_file . '</strong>" backup.');
 				return false;
 			}
 
@@ -220,14 +241,14 @@
 			if (!$fp) {
 				// backup template create failed OR existing template save
 				$error_file = $this->_getTemplateFile(true, $main_template ? '.tmp.tpl' : '.tpl');
-				$this->Application->SetVar('error_msg', 'Failed to save template "<strong>' . $error_file . '</strong>" changes.');
+				$object->SetError('FileContents', 'template_changes_save_failed', '+Failed to save template "<strong>' . $error_file . '</strong>" changes.');
 				return false;
 			}
 			fwrite($fp, $new_template_body);
 			fclose($fp);
 
 			// 3. parse template to check for errors
-			$this->_parseTemplate($main_template ? '.tmp' : '');
+			$this->_parseTemplate($object, $main_template ? '.tmp' : '');
 
 			if ($this->_parseErrors) {
 				$error_msg = Array ();
@@ -240,7 +261,7 @@
 					$error_msg[] = $error_data['msg'] . ' at line ' . ($error_data['line'] - $lines_before);
 				}
 
-				$this->Application->SetVar('error_msg', 'Template syntax errors:<br/>' . implode('<br/>', $error_msg));
+				$object->SetError('FileContents', 'template_syntax_error', '+Template syntax errors:<br/>' . implode('<br/>', $error_msg));
 				return false;
 			}
 
@@ -249,7 +270,7 @@
 				if (!rename($this->_getTemplateFile(false, '.tmp.tpl'), $filename)) {
 					// failed to save new content to original template
 					$error_file = $this->_getTemplateFile(true);
-					$this->Application->SetVar('error_msg', 'Failed to save template "<strong>' . $error_file . '</strong>".');
+					$object->SetError('FileContents', 'template_save_failed', '+Failed to save template "<strong>' . $error_file . '</strong>".');
 					return false;
 				}
 			}
@@ -258,23 +279,20 @@
 				unlink( $this->_getTemplateFile(false, '.tpl.bak') );
 			}
 
-			define('DBG_SKIP_REPORTING', 1);
-			$this->Application->Redirect($this->Application->GetVar('source'));
-			echo 1; // were changes
-
 			return true;
 		}
 
 		/**
 		 * Returns new template content of "true", when nothing is changed
 		 *
+		 * @param kDBItem $object
 		 * @param string $filename
 		 * @param int $lines_before
 		 * @return mixed
 		 */
-		function _getNewTemplateContent($filename, &$lines_before)
+		function _getNewTemplateContent(&$object, $filename, &$lines_before)
 		{
-			$new_content = unhtmlentities( $this->Application->GetVar('function_body') );
+			$new_content = $object->GetDBField('FileContents');
 
 			$template_body = file_get_contents($filename);
 			$lines_before = substr_count(substr($template_body, 0,  $this->_blockLocation['start_pos']), "\n");
@@ -288,11 +306,16 @@
 
 		function _saveError($errno, $errstr, $errfile, $errline, $errcontext)
 		{
-			if (defined('E_STRICT') && ($errno == E_STRICT)) {
-				// always ignore strict errors here (specially when not in debug mode)
+			if ($errno != E_USER_ERROR) {
+				// ignore all minor errors, except fatals from parser
 				return true;
 			}
 
+			/*if (defined('E_STRICT') && ($errno == E_STRICT)) {
+				// always ignore strict errors here (specially when not in debug mode)
+				return true;
+			}*/
+
 			$this->_parseErrors[] = Array ('msg' => $errstr, 'file' => $errfile, 'line' => $errline);
 			return true;
 		}
Index: branches/RC/core/admin_templates/themes/codepress/languages/html.css
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/codepress/languages/html.css	(revision 0)
+++ branches/RC/core/admin_templates/themes/codepress/languages/html.css	(revision 11661)
@@ -0,0 +1,18 @@
+/*
+ * CodePress color styles for HTML syntax highlighting
+ */
+
+b {color:#000080;} /* tags */
+ins, ins b, ins s, ins em {color:gray;} /* comments */
+s, s b {color:#7777e4;} /* attribute values */
+a {color:green;} /* links */
+u {color:#E67300;} /* forms */
+big {color:#db0000;} /* images */
+em, em b {color:#800080;} /* style */
+strong {color:#800000;} /* script */
+tt i {color:darkblue;font-weight:bold;} /* script reserved words */
+
+b.inp-tag {
+	color: #CF3E33;
+	font-style: italic;
+}
\ No newline at end of file
Index: branches/RC/core/install/english.lang
===================================================================
diff -u -r11641 -r11661
--- branches/RC/core/install/english.lang	(.../english.lang)	(revision 11641)
+++ branches/RC/core/install/english.lang	(.../english.lang)	(revision 11661)
@@ -709,6 +709,7 @@
 			<PHRASE Label="la_fld_BackgroundImage" Module="Core" Type="1">QmFja2dyb3VuZCBJbWFnZQ==</PHRASE>
 			<PHRASE Label="la_fld_BackgroundPosition" Module="Core" Type="1">QmFja2dyb3VuZCBQb3NpdGlvbg==</PHRASE>
 			<PHRASE Label="la_fld_BackgroundRepeat" Module="Core" Type="1">QmFja2dyb3VuZCBSZXBlYXQ=</PHRASE>
+			<PHRASE Label="la_fld_BlockPosition" Module="Core" Type="1">RWxlbWVudCBQb3NpdGlvbg==</PHRASE>
 			<PHRASE Label="la_fld_BorderBottom" Module="Core" Type="1">Qm9yZGVyIEJvdHRvbQ==</PHRASE>
 			<PHRASE Label="la_fld_BorderLeft" Module="Core" Type="1">Qm9yZGVyIExlZnQ=</PHRASE>
 			<PHRASE Label="la_fld_BorderRight" Module="Core" Type="1">Qm9yZGVyIFJpZ2h0</PHRASE>
@@ -770,6 +771,7 @@
 			<PHRASE Label="la_fld_FieldsSeparatedBy" Module="Core" Type="1">RmllbGRzIHNlcGFyYXRlZCBieQ==</PHRASE>
 			<PHRASE Label="la_fld_FieldTitles" Module="Core" Type="1">RmllbGQgVGl0bGVz</PHRASE>
 			<PHRASE Label="la_fld_FieldValue" Module="Core" Type="1">RmllbGQgVmFsdWU=</PHRASE>
+			<PHRASE Label="la_fld_FileContents" Module="Core" Type="1">RmlsZSBDb250ZW50cw==</PHRASE>
 			<PHRASE Label="la_fld_Filename" Module="Core" Type="1">RmlsZW5hbWU=</PHRASE>
 			<PHRASE Label="la_fld_FilenameReplacements" Module="Core" Type="1">RmlsZW5hbWUgUmVwbGFjZW1lbnRz</PHRASE>
 			<PHRASE Label="la_fld_FirstName" Module="Core" Type="1">Rmlyc3QgTmFtZQ==</PHRASE>
@@ -2042,6 +2044,7 @@
 			<PHRASE Label="la_title_EditingSpellingDictionary" Module="Core" Type="1">RWRpdGluZyBTcGVsbGluZyBEaWN0aW9uYXJ5</PHRASE>
 			<PHRASE Label="la_title_EditingStopWord" Module="Core" Type="1">RWRpdGluZyBTdG9wIFdvcmQ=</PHRASE>
 			<PHRASE Label="la_title_EditingStyle" Module="Core" Type="1">RWRpdGluZyBTdHlsZQ==</PHRASE>
+			<PHRASE Label="la_title_EditingThemeFile" Module="Core" Type="1">RWRpdGluZyBUaGVtZSBGaWxl</PHRASE>
 			<PHRASE Label="la_title_EditingThesaurus" Module="Core" Type="1">RWRpdGluZyBUaGVzYXVydXM=</PHRASE>
 			<PHRASE Label="la_title_EditingTranslation" Module="Core" Type="1">RWRpdGluZyBUcmFuc2xhdGlvbg==</PHRASE>
 			<PHRASE Label="la_title_Editing_BaseStyle" Module="Core" Type="1">RWRpdGluZyBCYXNlIFN0eWxl</PHRASE>
Index: branches/RC/core/admin_templates/themes/codepress/languages/html.js
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/codepress/languages/html.js	(revision 0)
+++ branches/RC/core/admin_templates/themes/codepress/languages/html.js	(revision 11661)
@@ -0,0 +1,60 @@
+/*
+ * CodePress regular expressions for HTML syntax highlighting
+ */
+
+// HTML
+Language.syntax = [
+	{ input : /(&lt;[^!]*?&gt;)/g, output : '<b>$1</b>'	}, // all tags
+	{ input : /(&lt;a .*?&gt;|&lt;\/a&gt;)/g, output : '<a>$1</a>' }, // links
+	{ input : /(&lt;img .*?&gt;)/g, output : '<big>$1</big>' }, // images
+	{ input : /(&lt;\/?(button|textarea|form|input|select|option|label).*?&gt;)/g, output : '<u>$1</u>' }, // forms
+	{ input : /(&lt;style.*?&gt;)(.*?)(&lt;\/style&gt;)/g, output : '<em>$1</em><em>$2</em><em>$3</em>' }, // style tags
+	{ input : /(&lt;script.*?&gt;)(.*?)(&lt;\/script&gt;)/g, output : '<strong>$1</strong><tt>$2</tt><strong>$3</strong>' }, // script tags
+	{ input : /=(".*?")/g, output : '=<s>$1</s>' }, // atributes double quote
+	{ input : /=('.*?')/g, output : '=<s>$1</s>' }, // atributes single quote
+	{ input : /(&lt;!--.*?--&gt.)/g, output : '<ins>$1</ins>' }, // comments
+	{ input : /(&lt;[\/]?)(inp2\:.*?)(\s|[\/]?&gt;)/g, output : '$1<b class="inp-tag">$2</b>$3' }, // inp2 tags
+	{ input : /\b(alert|window|document|break|continue|do|for|new|this|void|case|default|else|function|return|typeof|while|if|label|switch|var|with|catch|boolean|int|try|false|throws|null|true|goto)\b/g, output : '<i>$1</i>' } // script reserved words
+]
+
+Language.snippets = [
+	{ input : 'aref', output : '<a href="$0"></a>' },
+	{ input : 'h1', output : '<h1>$0</h1>' },
+	{ input : 'h2', output : '<h2>$0</h2>' },
+	{ input : 'h3', output : '<h3>$0</h3>' },
+	{ input : 'h4', output : '<h4>$0</h4>' },
+	{ input : 'h5', output : '<h5>$0</h5>' },
+	{ input : 'h6', output : '<h6>$0</h6>' },
+	{ input : 'html', output : '<html>\n\t$0\n</html>' },
+	{ input : 'head', output : '<head>\n\t<meta http-equiv="content-type" content="text/html; charset=utf-8" />\n\t<title>$0</title>\n\t\n</head>' },
+	{ input : 'img', output : '<img src="$0" alt="" />' },
+	{ input : 'input', output : '<input name="$0" id="" type="" value="" />' },
+	{ input : 'label', output : '<label for="$0"></label>' },
+	{ input : 'legend', output : '<legend>\n\t$0\n</legend>' },
+	{ input : 'link', output : '<link rel="stylesheet" href="$0" type="text/css" media="screen" charset="utf-8" />' },
+	{ input : 'base', output : '<base href="$0" />' },
+	{ input : 'body', output : '<body>\n\t$0\n</body>' },
+	{ input : 'css', output : '<link rel="stylesheet" href="$0" type="text/css" media="screen" charset="utf-8" />' },
+	{ input : 'div', output : '<div>\n\t$0\n</div>' },
+	{ input : 'divid', output : '<div id="$0">\n\t\n</div>' },
+	{ input : 'dl', output : '<dl>\n\t<dt>\n\t\t$0\n\t</dt>\n\t<dd></dd>\n</dl>' },
+	{ input : 'fieldset', output : '<fieldset>\n\t$0\n</fieldset>' },
+	{ input : 'form', output : '<form action="$0" method="" name="">\n\t\n</form>' },
+	{ input : 'meta', output : '<meta name="$0" content="" />' },
+	{ input : 'p', output : '<p>$0</p>' },
+	{ input : 'script', output : '<script type="text/javascript" language="javascript" charset="utf-8">\n\t$0\t\n</script>' },
+	{ input : 'scriptsrc', output : '<script src="$0" type="text/javascript" language="javascript" charset="utf-8"></script>' },
+	{ input : 'span', output : '<span>$0</span>' },
+	{ input : 'table', output : '<table border="$0" cellspacing="" cellpadding="">\n\t<tr><th></th></tr>\n\t<tr><td></td></tr>\n</table>' },
+	{ input : 'style', output : '<style type="text/css" media="screen">\n\t$0\n</style>' }
+]
+
+Language.complete = [
+	{ input : '\'',output : '\'$0\'' },
+	{ input : '"', output : '"$0"' },
+	{ input : '(', output : '\($0\)' },
+	{ input : '[', output : '\[$0\]' },
+	{ input : '{', output : '{\n\t$0\n}' }
+]
+
+Language.shortcuts = []
Index: branches/RC/core/admin_templates/index.tpl
===================================================================
diff -u -r11623 -r11661
--- branches/RC/core/admin_templates/index.tpl	(.../index.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/index.tpl	(.../index.tpl)	(revision 11661)
@@ -12,7 +12,6 @@
 
 		<link rel="icon" href="img/favicon.ico" type="image/x-icon" />
 		<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
-		<link rel="stylesheet" rev="stylesheet" href="incs/style.css" type="text/css" />
 
 		<script type="text/javascript">
 			window.name = 'main_frame';
Index: branches/RC/themes/default2009/platform/template_manager/html_head.tpl
===================================================================
diff -u -r11648 -r11661
--- branches/RC/themes/default2009/platform/template_manager/html_head.tpl	(.../html_head.tpl)	(revision 11648)
+++ branches/RC/themes/default2009/platform/template_manager/html_head.tpl	(.../html_head.tpl)	(revision 11661)
@@ -1,5 +1,3 @@
-<link rel="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>template_manager/inc/template_manager.css" type="text/css" media="screen" />
-
 <!--<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/jquery-ui-personalized-1.5.2.js"></script>-->
 
 <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/interface/iutil.js"></script>
@@ -9,9 +7,6 @@
 <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/interface/iautoscroller.js"></script>
 
 
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>template_manager/inc/template_manager.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>template_manager/inc/codepress/codepress.js" ></script>
-
 <style type="text/css" media="all">
 	.groupWrapper {
 		/*width: 32%;
@@ -108,11 +103,6 @@
 </inp2:m_if>
 
 <script type="text/javascript">
-	TB.pathToImage = '<inp2:m_TemplatesBase module="In-Portal"/>inc/jquery/thickbox/loadingAnimation.gif';
-
-	<inp2:m_Get name="t" result_to_var="template"/>
-	var aTemplateManager = new TemplateManager('<inp2:m_Link template="platform/template_manager/edit_template" width="800" height="550" events[st]="#EVENT#" block="#BLOCK#" source="$template" pass="all" no_amp="1"/>');
-
 	$(
 		function () {
 			<inp2:m_if check="m_GetConst" name="EDITING_MODE">
Index: branches/RC/core/admin_templates/browser/browser_footer.tpl
===================================================================
diff -u -r11055 -r11661
--- branches/RC/core/admin_templates/browser/browser_footer.tpl	(.../browser_footer.tpl)	(revision 11055)
+++ branches/RC/core/admin_templates/browser/browser_footer.tpl	(.../browser_footer.tpl)	(revision 11661)
@@ -14,9 +14,9 @@
 
 	</script>
 <inp2:m_else/>
-	<inp2:m_if check="adm_TemplateMatches" templates="head,tree" inverse="inverse">
+	<inp2:m_ifnot check="m_Get" name="template" equals_to="head|tree">
 	<br /><br />
-	</inp2:m_if>
+	</inp2:m_ifnot>
 </inp2:m_if>
 
 <inp2:adm_AfterScript/>
Index: branches/RC/core/kernel/parser/template.php
===================================================================
diff -u -r11501 -r11661
--- branches/RC/core/kernel/parser/template.php	(.../template.php)	(revision 11501)
+++ branches/RC/core/kernel/parser/template.php	(.../template.php)	(revision 11661)
@@ -80,6 +80,16 @@
 	var $BasePath;
 	var $FileNames = Array();
 
+	/**
+	 * Force templates cache to search templates on front-end:
+	 * true - search for theme name in template name
+	 * false - don't search anywhere
+	 * name - theme name to prepend for each template name
+	 *
+	 * @var mixed
+	 */
+	var $forceThemeName = false;
+
 	function TemplatesCache()
 	{
 		parent::kBase();
@@ -112,6 +122,11 @@
 			$module_filename = $filename;
 		}
 
+		if (is_string($this->forceThemeName)) {
+			// when defined, then all templates are read from given theme name
+			$first_dir = 'theme:' . $this->forceThemeName . ($first_dir ? '/' . $first_dir : '');
+		}
+
 		// !preg_match for backward compatability with full-path plugins
 		if ($this->Application->IsAdmin() && $first_dir == 'plugins' && !preg_match('/admin_templates/', $module_filename)) {
 			if (preg_match('#^[\/]{0,1}([^\/]*)\/(.*)#', $module_filename, $regs)) {;
@@ -129,7 +144,7 @@
 			}
 			$path = MODULES_PATH.'/'.mb_strtolower($first_dir).'/admin_templates';
 		}
-		elseif (defined('DBG_NPARSER_FORCE_COMPILE') && DBG_NPARSER_FORCE_COMPILE && preg_match('/^theme:(.*)/', $first_dir, $regs)) {
+		elseif ($this->forceThemeName && preg_match('/^theme:(.*)/', $first_dir, $regs)) {
 			// ability to use Front-End templates in admin (only during mass compilation)
 			$path = FULL_PATH . '/themes/' . $regs[1];
 		}
Index: branches/RC/core/admin_templates/incs/footer.tpl
===================================================================
diff -u -r11482 -r11661
--- branches/RC/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 11482)
+++ branches/RC/core/admin_templates/incs/footer.tpl	(.../footer.tpl)	(revision 11661)
@@ -1,14 +1,14 @@
-<inp2:m_if check="adm_UsePopups">
-	<script type="text/javascript">
+<script type="text/javascript">
+	var _Simultanious_Edit_Message = '<inp2:m_Get var="_simultanious_edit_message" js_escape="1"/>';
+
+	<inp2:m_if check="adm_UsePopups">
 		var o = '';
 		var el = document.getElementById('scroll_container');
 		if (el) {
 			document.body.style.height = '100%';
 			document.body.style.overflow = 'hidden';
 			document.body.scroll = 'no'
 
-			var _Simultanious_Edit_Message = '<inp2:m_Get var="_simultanious_edit_message" js_escape="1"/>';
-
 			addLoadEvent(
 				function() {
 					Form.Init('scroll_container');
@@ -25,30 +25,32 @@
 		</inp2:m_ifnot>
 
 		Application.footerInit();
-	</script>
-<inp2:m_else/>
-	<script type="text/javascript">
+	<inp2:m_else/>
 		addLoadEvent(
 			function() {
 				IterateUploaders('moveOutside');
+
 				if (typeof UploadsManager != 'undefined') {
 					UploadsManager.setScrollEvents();
 				}
 			}
 		);
 
 		InitEditors();
-	</script>
-	<inp2:m_if check="adm_TemplateMatches" templates="head,tree" inverse="inverse">
-	<br /><br />
 	</inp2:m_if>
-</inp2:m_if>
+</script>
 
+<inp2:m_ifnot check="adm_UsePopups">
+	<inp2:m_ifnot check="m_Get" name="template" equals_to="head|tree">
+		<br /><br />
+	</inp2:m_ifnot>
+</inp2:m_ifnot>
+
 <inp2:adm_AfterScript/>
 
-<inp2:m_if check="m_ParamEquals" name="noform" value="yes" inverse="inverse">
+<inp2:m_ifnot check="m_Param" name="noform" equals_to="yes">
 	<inp2:m_RenderElement name="kernel_form_end"/>
-</inp2:m_if>
+</inp2:m_ifnot>
 
 <div id="nlsMenuPlace"></div>
 </body>
Index: branches/RC/core/admin_templates/themes/codepress/engines/khtml.js
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/codepress/engines/khtml.js	(revision 0)
+++ branches/RC/core/admin_templates/themes/codepress/engines/khtml.js	(revision 11661)
@@ -0,0 +1 @@

\ No newline at end of file
Index: branches/RC/core/admin_templates/themes/codepress/codepress.js
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/codepress/codepress.js	(revision 0)
+++ branches/RC/core/admin_templates/themes/codepress/codepress.js	(revision 11661)
@@ -0,0 +1,152 @@
+/*
+ * CodePress - Real Time Syntax Highlighting Editor written in JavaScript - http://codepress.org/
+ *
+ * Copyright (C) 2006 Fernando M.A.d.S. <fermads@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU Lesser General Public License as published by the Free Software Foundation.
+ *
+ * Read the full licence: http://www.opensource.org/licenses/lgpl-license.php
+ */
+
+CodePress = function(obj, $on_complete_callback) {
+	var self = document.createElement('iframe');
+	self.completeCallback = $on_complete_callback;
+	self.textarea = obj;
+	self.textarea.disabled = true;
+	self.textarea.style.overflow = 'hidden';
+	self.style.height = self.textarea.clientHeight +'px';
+	self.style.width = $(self.textarea).css('width'); // self.textarea.clientWidth + 'px'
+	self.textarea.style.overflow = 'auto';
+	self.style.border = '1px solid gray';
+	self.frameBorder = 0; // remove IE internal iframe border
+	self.style.visibility = 'hidden';
+	self.style.position = 'absolute';
+	self.options = self.textarea.className;
+
+	self.initialize = function() {
+		self.editor = self.contentWindow.CodePress;
+		self.editor.body = self.contentWindow.document.getElementsByTagName('body')[0];
+
+		self.editor.setCode(self.textarea.value);
+		self.setOptions();
+		self.editor.syntaxHighlight('init');
+		self.textarea.style.display = 'none';
+		self.style.position = 'static';
+		self.style.visibility = 'visible';
+		self.style.display = 'inline';
+
+		if ($.isFunction(self.completeCallback)) {
+			self.completeCallback();
+		}
+	}
+
+	// obj can by a textarea id or a string (code)
+	self.edit = function(obj,language) {
+		if(obj) self.textarea.value = document.getElementById(obj) ? document.getElementById(obj).value : obj;
+		if(!self.textarea.disabled) return;
+		self.language = language ? language : self.getLanguage();
+		self.src = CodePress.path+'codepress.html?language='+self.language+'&ts='+(new Date).getTime();
+		if(self.attachEvent) self.attachEvent('onload',self.initialize);
+		else self.addEventListener('load',self.initialize,false);
+	}
+
+	self.getLanguage = function() {
+		for (language in CodePress.languages)
+			if(self.options.match('\\b'+language+'\\b'))
+				return CodePress.languages[language] ? language : 'generic';
+	}
+
+	self.setOptions = function() {
+		if(self.options.match('autocomplete-off')) self.toggleAutoComplete();
+		if(self.options.match('readonly-on')) self.toggleReadOnly();
+		if(self.options.match('linenumbers-off')) self.toggleLineNumbers();
+	}
+
+	self.getCode = function() {
+		return self.textarea.disabled ? self.editor.getCode() : self.textarea.value;
+	}
+
+	self.setCode = function(code) {
+		self.textarea.disabled ? self.editor.setCode(code) : self.textarea.value = code;
+	}
+
+	self.toggleAutoComplete = function() {
+		self.editor.autocomplete = (self.editor.autocomplete) ? false : true;
+	}
+
+	self.toggleReadOnly = function() {
+		self.textarea.readOnly = (self.textarea.readOnly) ? false : true;
+		if(self.style.display != 'none') // prevent exception on FF + iframe with display:none
+			self.editor.readOnly(self.textarea.readOnly ? true : false);
+	}
+
+	self.toggleLineNumbers = function() {
+		var cn = self.editor.body.className;
+		self.editor.body.className = (cn==''||cn=='show-line-numbers') ? 'hide-line-numbers' : 'show-line-numbers';
+	}
+
+	self.toggleEditor = function() {
+		if(self.textarea.disabled) {
+			self.textarea.value = self.getCode();
+			self.textarea.disabled = false;
+			self.style.display = 'none';
+			self.textarea.style.display = 'inline';
+		}
+		else {
+			self.textarea.disabled = true;
+			self.setCode(self.textarea.value);
+			self.editor.syntaxHighlight('init');
+			self.style.display = 'inline';
+			self.textarea.style.display = 'none';
+		}
+	}
+
+	self.edit();
+	return self;
+}
+
+CodePress.languages = {
+	csharp : 'C#',
+	css : 'CSS',
+	generic : 'Generic',
+	html : 'HTML',
+	java : 'Java',
+	javascript : 'JavaScript',
+	perl : 'Perl',
+	ruby : 'Ruby',
+	php : 'PHP',
+	text : 'Text',
+	sql : 'SQL',
+	vbscript : 'VBScript'
+}
+
+
+CodePress.run = function($on_complete_callback) {
+	s = document.getElementsByTagName('script');
+	for(var i=0,n=s.length;i<n;i++) {
+		if(s[i].src.match('codepress.js')) {
+			CodePress.path = s[i].src.replace('codepress.js','');
+		}
+	}
+
+	t = document.getElementsByTagName('textarea');
+	for(var i=0,n=t.length;i<n;i++) {
+		if(t[i].className.match('codepress')) {
+			var $instance_name = t[i].id;
+			if ($instance_name.match(/^.*?\[[\d]+\]\[(.*?)\]$/)) {
+				// format like K4 inputs -> use only field name then
+				$instance_name = RegExp.$1;
+			}
+
+			window[$instance_name] = new CodePress(t[i], $on_complete_callback);
+			t[i].parentNode.insertBefore(window[$instance_name], t[i]);
+
+			/*eval(id+' = new CodePress(t[i])');
+			t[i].parentNode.insertBefore(eval(id), t[i]);*/
+		}
+	}
+}
+
+/*if(window.attachEvent) window.attachEvent('onload',CodePress.run);
+else window.addEventListener('DOMContentLoaded',CodePress.run,false);*/
Index: branches/RC/core/admin_templates/themes/codepress/engines/older.js
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/codepress/engines/older.js	(revision 0)
+++ branches/RC/core/admin_templates/themes/codepress/engines/older.js	(revision 11661)
@@ -0,0 +1 @@

\ No newline at end of file
Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r11635 -r11661
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11635)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 11661)
@@ -1,4 +1,4 @@
-<inp2:m_DefineElement name="combined_header" permission_type="view" perm_section="" perm_prefix="" perm_event="" system_permission="1" title_preset="" tab_preset="" additional_title_render_as="" additional_blue_bar_render_as="" pagination_prefix="" grid="Default">
+<inp2:m_DefineElement name="combined_header" permission_type="view" perm_section="" perm_prefix="" perm_event="" system_permission="1" title_preset="" title_render_as="" tab_preset="" additional_title_render_as="" additional_blue_bar_render_as="" pagination_prefix="" grid="Default">
 	<inp2:m_if check="m_Param" name="perm_section" inverse="1">
 		<inp2:adm_SectionInfo section="$section" info="perm_section" result_to_var="perm_section"/>
 	</inp2:m_if>
@@ -50,11 +50,17 @@
 			<td class="header_left_bg" nowrap="nowrap" style="vertical-align: middle;">
 				<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
 				<inp2:adm_SectionInfo section="$section" parent="1" info="label" result_to_var="group_title"/>
-				<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" section="$section" title="$default_title" group_title="$group_title" cut_first="100" pass_params="true"/></span>
+				<span class="tablenav_link" id="blue_bar">
+					<inp2:m_if check="m_Param" name="title_render_as">
+						<inp2:m_RenderElement name="$title_render_as" pass_params="1"/>
+					<inp2:m_else/>
+						<inp2:$prefix_SectionTitle title_preset="$title_preset" section="$section" title="$default_title" group_title="$group_title" cut_first="100" pass_params="true"/>
+					</inp2:m_if>
+				</span>
 			</td>
 			<td align="right" class="tablenav" style="vertical-align: middle;">
 				<inp2:m_if check="m_Param" name="additional_blue_bar_render_as">
-					<inp2:m_RenderElement name="$additional_blue_bar_render_as" />
+					<inp2:m_RenderElement name="$additional_blue_bar_render_as" pass_params="1"/>
 				<inp2:m_else/>
 					<inp2:m_if check="m_Param" name="pagination">
 						<inp2:$prefix_SelectParam possible_names="pagination_prefix,prefix" result_to_var="pagination_prefix"/>
@@ -67,7 +73,7 @@
 
 	<script type="text/javascript">
 		var $visible_toolbar_buttons = <inp2:m_if check="{$prefix}_VisibleToolbarButtons" title_preset="$title_preset">[<inp2:$prefix_VisibleToolbarButtons title_preset="$title_preset"/>]<inp2:m_else/>true</inp2:m_if>;
-		set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
+		set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '').replace(/\s+/g, ' ').trim() + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
 		setHelpLink('<inp2:lang.current_Field name="UserDocsUrl" js_escape="1"/>', '<inp2:m_Param name="title_preset" js_escape="1"/>');
 	</script>
 </inp2:m_DefineElement>
@@ -110,7 +116,7 @@
 	<td><inp2:$prefix.original_Field field="$field" nl2br="1"/></td>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="subsection" prefix="" colspan="4">
+<inp2:m_DefineElement name="subsection" prefix="" colspan="3">
 	<tr class="subsectiontitle">
 		<td colspan="<inp2:m_param name='colspan'/>"><inp2:m_phrase label="$title"/></td>
 		<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse">
@@ -142,14 +148,15 @@
 	</script>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_label" is_last="" subfield="" style="" format="" hint_label="" as_label="" currency="" nl2br="0" is_last="">
+<inp2:m_DefineElement name="inp_label" is_last="" subfield="" style="" format="" db="" hint_label="" as_label="" currency="" nl2br="0" is_last="">
 	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td class="control-cell" valign="top">
 			<span style="<inp2:m_Param name="style"/>" id="<inp2:$prefix_InputName field="$field" subfield="$subfield"/>">
 				<inp2:{$prefix}_Field field="$field" format="$format" as_label="$as_label" currency="$currency" nl2br="$nl2br"/>
 			</span>
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
+			<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"/>
     	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
@@ -158,11 +165,10 @@
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_id_label" db="">
-	<inp2:m_if check="{$prefix}_FieldEquals" field="$field" value="" inverse="inverse">
+<inp2:m_DefineElement name="inp_id_label">
+	<inp2:m_ifnot check="Field" field="$field" equals_to="">
 		<inp2:m_RenderElement name="inp_label" pass_params="true"/>
-	</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"/>">
+	</inp2:m_ifnot>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_error">
@@ -465,9 +471,9 @@
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_fck" subfield="" class="" is_last="" maxlength="" bgcolor="" onblur="" size="" onkeyup="" style="" control_options="false">
+<inp2:m_DefineElement name="inp_edit_fck" class="" is_last="" maxlength="" bgcolor="" onblur="" size="" onkeyup="" style="" control_options="false">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<td class="control-cell" colspan="4" onmouseover="show_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', '<inp2:m_Param name="field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="prefix" js_escape="1"/>')">
+		<td class="control-cell" colspan="3" onmouseover="show_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', '<inp2:m_Param name="field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="prefix" js_escape="1"/>')">
 			<inp2:FCKEditor field="$field" width="100%" bgcolor="$bgcolor" height="200" late_load="1"/>
 			<script type="text/javascript">
 				if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
@@ -481,6 +487,38 @@
 	</tr>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_codepress" is_last="" style="width: 100%;" language="html" control_options="false">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<td class="control-cell" colspan="3" 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_ifnot check="m_Get" name="codepress_included">
+				<script type="text/javascript" src="<inp2:m_TemplatesBase/>/themes/codepress/codepress.js"></script>
+				<script type="text/javascript">
+					CodePress.path = '<inp2:m_TemplatesBase/>/themes/codepress/'; // set path here, because script tags are not found in table cells
+				</script>
+				<inp2:m_Set codepress_included="1"/>
+			</inp2:m_ifnot>
+			<textarea id="<inp2:$prefix_InputName field='$field'/>" name="<inp2:$prefix_InputName field='$field'/>" class="codepress <inp2:m_Param name='language'/>" style="<inp2:m_Param name='style'/>"><inp2:$prefix_Field field="$field"/></textarea>
+
+			<script type="text/javascript">
+				Application.setHook(
+					new Array ('<inp2:m_Param name="prefix" js_escape="1"/>:OnPreSaveAndGoToTab', '<inp2:m_Param name="prefix" js_escape="1"/>:OnPreSaveAndGo', '<inp2:m_Param name="prefix" js_escape="1"/>:OnSave', '<inp2:m_Param name="prefix" js_escape="1"/>:OnCreate', '<inp2:m_Param name="prefix" js_escape="1"/>:OnUpdate'),
+					function($event) {
+						<inp2:m_Param name="field"/>.toggleEditor(); // enable textarea back to save data
+						$event.status = true;
+					}
+				);
+				if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
+					fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
+				}
+				fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>'] = '<inp2:m_phrase label="$title" js_escape="1"/>'
+
+				Form.addControl('<inp2:$prefix_InputName field="$field"/>', <inp2:m_param name="control_options"/>);
+			</script>
+		</td>
+		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
+	</tr>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_textarea_ml">
 	<inp2:m_RenderElement name="inp_edit_textarea" format="no_default" pass_params="true"/>
 	<!--##<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
@@ -693,18 +731,18 @@
 	</tr>##-->
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_weight" subfield="" class="" is_last="" maxlength="">
+<inp2:m_DefineElement name="inp_edit_weight" class="" is_last="" maxlength="">
 	<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" title="$title" 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" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" value="<inp2:{$prefix}_Field field="$field" subfield="$subfield"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
+				<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"/>">
 				<inp2:m_phrase label="la_kg" />
 			</inp2:m_if>
 			<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="2">
-				<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_a" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="{$field}_a" subfield="$subfield"/>" value="<inp2:{$prefix}_Field field="{$field}_a" 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"/>">
+				<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_a"/>" id="<inp2:{$prefix}_InputName field="{$field}_a"/>" value="<inp2:{$prefix}_Field field="{$field}_a"/>" 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"/>">
 				<inp2:m_phrase label="la_lbs" />
-				<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_b" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="{$field}_b" subfield="$subfield"/>" value="<inp2:{$prefix}_Field field="{$field}_b" 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"/>">
+				<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_b"/>" id="<inp2:{$prefix}_InputName field="{$field}_b"/>" value="<inp2:{$prefix}_Field field="{$field}_b"/>" 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"/>">
 				<inp2:m_phrase label="la_oz" />
 			</inp2:m_if>
 		</td>
Index: branches/RC/core/admin_templates/themes/file_edit.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/file_edit.tpl	(revision 0)
+++ branches/RC/core/admin_templates/themes/file_edit.tpl	(revision 11661)
@@ -0,0 +1,52 @@
+<inp2:adm_SetPopupSize width="1100" height="700"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:configure_themes" prefix="theme" title_preset="theme_file_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('theme-file','<inp2:theme-file_SaveEvent/>');
+						}
+					) );
+
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							cancel_edit('theme-file', 'OnCancelEdit','<inp2:theme-file_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						}
+				 ) );
+
+			 	a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
+						reset_form('theme-file', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+					}
+			 	) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:theme-file_SaveWarning name="grid_save_warning"/>
+<inp2:theme-file_ErrorWarning name="form_error_warning"/>
+
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="theme-file" field="ThemeId"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="theme-file" field="FileId" title="!la_fld_Id!"/>
+			<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="FileName" title="la_fld_FileName"/>
+			<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="FilePath" title="la_fld_FileName"/>
+			<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="Description" title="la_fld_Description"/>
+			<inp2:m_RenderElement name="inp_edit_codepress" prefix="theme-file" field="FileContents" title="la_fld_FileContents"/>
+			<inp2:m_RenderElement name="inp_edit_filler" control_options="{height: 8}"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/themes/template_edit.tpl
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/template_edit.tpl	(revision 0)
+++ branches/RC/core/admin_templates/themes/template_edit.tpl	(revision 11661)
@@ -0,0 +1,56 @@
+<inp2:adm_SetPopupSize width="1100" height="700"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:configure_themes" prefix="theme" title_preset="block_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('theme-file','OnSaveBlock');
+						}
+					) );
+
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('theme-file', 'OnGoBack');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:theme-file_SaveWarning name="grid_save_warning"/>
+<inp2:theme-file_ErrorWarning name="form_error_warning"/>
+
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="theme-file" field="ThemeId"/>
+<input type="hidden" id="block" name="block" value="<inp2:m_Get name='block'/>"/>
+<input type="hidden" id="theme_id" name="theme_id" value="<inp2:m_Get name='theme_id'/>"/>
+<input type="hidden" id="source" name="source" value="<inp2:m_Get name='source'/>"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="FileName" title="la_fld_FileName"/>
+		<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="BlockPosition" title="la_fld_BlockPosition"/>
+		<inp2:m_RenderElement name="inp_edit_codepress" prefix="theme-file" field="FileContents" title="la_fld_FileContents"/>
+		<!--<inp2:m_RenderElement name="inp_edit_filler" control_options="{height: 8}"/>-->
+	</table>
+</div>
+
+<script type="text/javascript">
+Application.setHook(
+	new Array ('theme-file:OnSaveBlock'),
+	function($event) {
+		FileContents.toggleEditor(); // enable textarea back to save data
+		$event.status = true;
+	}
+);
+</script>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/themes/codepress/codepress.css
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/codepress/codepress.css	(revision 0)
+++ branches/RC/core/admin_templates/themes/codepress/codepress.css	(revision 11661)
@@ -0,0 +1,21 @@
+body {
+	margin-top:13px;
+	_margin-top:14px;
+	background:white;
+	margin-left:32px;
+	font-family:monospace;
+	font-size:13px;
+	white-space:pre;
+	background-image:url("images/line-numbers.png");
+	background-repeat:repeat-y;
+	background-position:0 3px;
+	line-height:16px;
+	height:100%;
+}
+pre {margin:0;}
+html>body{background-position:0 2px;}
+P {margin:0;padding:0;border:0;outline:0;display:block;white-space:pre;}
+b, i, s, u, a, em, tt, ins, big, cite, strong, var, dfn {text-decoration:none;font-weight:normal;font-style:normal;font-size:13px;}
+
+body.hide-line-numbers {background:white;margin-left:16px;}
+body.show-line-numbers {background-image:url("images/line-numbers.png");margin-left:32px;}
\ No newline at end of file
Index: branches/RC/core/kernel/kbase.php
===================================================================
diff -u -r11495 -r11661
--- branches/RC/core/kernel/kbase.php	(.../kbase.php)	(revision 11495)
+++ branches/RC/core/kernel/kbase.php	(.../kbase.php)	(revision 11661)
@@ -443,6 +443,11 @@
 	{
 		$allowed_modifiers = Array('required');
 
+		if ($this->Application->IsAdmin()) {
+			// can change upload dir on the fly (admin only!)
+			$allowed_modifiers[] = 'upload_dir';
+		}
+
 		if (!isset($field_modifiers)) {
 			$field_modifiers = $this->Application->GetVar('field_modifiers');
 			if (!$field_modifiers) {
Index: branches/RC/core/admin_templates/themes/codepress/engines/gecko.js
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/codepress/engines/gecko.js	(revision 0)
+++ branches/RC/core/admin_templates/themes/codepress/engines/gecko.js	(revision 11661)
@@ -0,0 +1,313 @@
+/*
+ * CodePress - Real Time Syntax Highlighting Editor written in JavaScript - http://codepress.org/
+ *
+ * Copyright (C) 2007 Fernando M.A.d.S. <fermads@gmail.com>
+ *
+ * Developers:
+ *		Fernando M.A.d.S. <fermads@gmail.com>
+ *		Michael Hurni <michael.hurni@gmail.com>
+ * Contributors:
+ *		Martin D. Kirk
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU Lesser General Public License as published by the Free Software Foundation.
+ *
+ * Read the full licence: http://www.opensource.org/licenses/lgpl-license.php
+ */
+
+CodePress = {
+	scrolling : false,
+	autocomplete : true,
+
+	// set initial vars and start sh
+	initialize : function() {
+		if(typeof(editor)=='undefined' && !arguments[0]) return;
+		body = document.getElementsByTagName('body')[0];
+		body.innerHTML = body.innerHTML.replace(/\n/g,"");
+		chars = '|32|46|62|8|'; // charcodes that trigger syntax highlighting
+		cc = '\u2009'; // carret char
+		editor = document.getElementsByTagName('pre')[0];
+		document.designMode = 'on';
+		document.addEventListener('keypress', this.keyHandler, true);
+		window.addEventListener('scroll', function() { if(!CodePress.scrolling) CodePress.syntaxHighlight('scroll') }, false);
+		completeChars = this.getCompleteChars();
+		completeEndingChars =  this.getCompleteEndingChars();
+	},
+
+	// treat key bindings
+	keyHandler : function(evt) {
+    	keyCode = evt.keyCode;
+		charCode = evt.charCode;
+		fromChar = String.fromCharCode(charCode);
+
+		if((evt.ctrlKey || evt.metaKey) && evt.shiftKey && charCode!=90)  { // shortcuts = ctrl||appleKey+shift+key!=z(undo)
+			CodePress.shortcuts(charCode?charCode:keyCode);
+		}
+		else if( (completeEndingChars.indexOf('|'+fromChar+'|')!= -1 || completeChars.indexOf('|'+fromChar+'|')!=-1) && CodePress.autocomplete) { // auto complete
+			if(!CodePress.completeEnding(fromChar))
+			     CodePress.complete(fromChar);
+		}
+	    else if(chars.indexOf('|'+charCode+'|')!=-1||keyCode==13) { // syntax highlighting
+			top.setTimeout(function(){CodePress.syntaxHighlight('generic');},100);
+		}
+		else if(keyCode==9 || evt.tabKey) {  // snippets activation (tab)
+			CodePress.snippets(evt);
+		}
+		else if(keyCode==46||keyCode==8) { // save to history when delete or backspace pressed
+		 	CodePress.actions.history[CodePress.actions.next()] = editor.innerHTML;
+		}
+		else if((charCode==122||charCode==121||charCode==90) && evt.ctrlKey) { // undo and redo
+			(charCode==121||evt.shiftKey) ? CodePress.actions.redo() :  CodePress.actions.undo();
+			evt.preventDefault();
+		}
+		else if(charCode==118 && evt.ctrlKey)  { // handle paste
+		 	top.setTimeout(function(){CodePress.syntaxHighlight('generic');},100);
+		}
+		else if(charCode==99 && evt.ctrlKey)  { // handle cut
+		 	//alert(window.getSelection().getRangeAt(0).toString().replace(/\t/g,'FFF'));
+		}
+
+	},
+
+	// put cursor back to its original position after every parsing
+	findString : function() {
+		if(self.find(cc))
+			window.getSelection().getRangeAt(0).deleteContents();
+	},
+
+	// split big files, highlighting parts of it
+	split : function(code,flag) {
+		if(flag=='scroll') {
+			this.scrolling = true;
+			return code;
+		}
+		else {
+			this.scrolling = false;
+			mid = code.indexOf(cc);
+			if(mid-2000<0) {ini=0;end=4000;}
+			else if(mid+2000>code.length) {ini=code.length-4000;end=code.length;}
+			else {ini=mid-2000;end=mid+2000;}
+			code = code.substring(ini,end);
+			return code;
+		}
+	},
+
+	getEditor : function() {
+		if(!document.getElementsByTagName('pre')[0]) {
+			body = document.getElementsByTagName('body')[0];
+			if(!body.innerHTML) return body;
+			if(body.innerHTML=="<br>") body.innerHTML = "<pre> </pre>";
+			else body.innerHTML = "<pre>"+body.innerHTML+"</pre>";
+		}
+		return document.getElementsByTagName('pre')[0];
+	},
+
+	// syntax highlighting parser
+	syntaxHighlight : function(flag) {
+		//if(document.designMode=='off') document.designMode='on'
+		if(flag != 'init') { window.getSelection().getRangeAt(0).insertNode(document.createTextNode(cc));}
+		editor = CodePress.getEditor();
+		o = editor.innerHTML;
+		o = o.replace(/<br>/g,'\n');
+		o = o.replace(/<.*?>/g,'');
+		x = z = this.split(o,flag);
+		x = x.replace(/\n/g,'<br>');
+
+		if(arguments[1]&&arguments[2]) x = x.replace(arguments[1],arguments[2]);
+
+		for(i=0;i<Language.syntax.length;i++)
+			x = x.replace(Language.syntax[i].input,Language.syntax[i].output);
+
+		editor.innerHTML = this.actions.history[this.actions.next()] = (flag=='scroll') ? x : o.split(z).join(x);
+		if(flag!='init') this.findString();
+	},
+
+	getLastWord : function() {
+		var rangeAndCaret = CodePress.getRangeAndCaret();
+		words = rangeAndCaret[0].substring(rangeAndCaret[1]-40,rangeAndCaret[1]);
+		words = words.replace(/[\s\n\r\);\W]/g,'\n').split('\n');
+		return words[words.length-1].replace(/[\W]/gi,'').toLowerCase();
+	},
+
+	snippets : function(evt) {
+		var snippets = Language.snippets;
+		var trigger = this.getLastWord();
+
+		// modified to insert tab on FF
+		var noInsertion = 1;
+		for (var i=0; i<snippets.length; i++) {
+			if(snippets[i].input == trigger) {
+				noInsertion = 0;
+				var content = snippets[i].output.replace(/</g,'&lt;');
+				content = content.replace(/>/g,'&gt;');
+				if(content.indexOf('$0')<0) content += cc;
+				else content = content.replace(/\$0/,cc);
+				content = content.replace(/\n/g,'<br>');
+				var pattern = new RegExp(trigger+cc,'gi');
+				evt.preventDefault(); // prevent the tab key from being added
+				this.syntaxHighlight('snippets',pattern,content);
+			}
+		}
+
+		/* Modified to insert tab on FF
+		* @author Asad Khan <asadkn [at-the-rate-of] gmail [dot] com>
+		*/
+		if (noInsertion == 1) {
+			var range = window.getSelection().getRangeAt(0);
+
+			// for the single line
+			range.setEnd(range.startContainer, range.startOffset);
+
+			var ele = document.createTextNode('\t');
+			range.insertNode(ele);
+			range.setStartAfter(ele);
+
+			evt.preventDefault();
+		}
+	},
+
+	readOnly : function() {
+		document.designMode = (arguments[0]) ? 'off' : 'on';
+	},
+
+	complete : function(trigger) {
+		window.getSelection().getRangeAt(0).deleteContents();
+		var complete = Language.complete;
+		for (var i=0; i<complete.length; i++) {
+			if(complete[i].input == trigger) {
+				var pattern = new RegExp('\\'+trigger+cc);
+				var content = complete[i].output.replace(/\$0/g,cc);
+				parent.setTimeout(function () { CodePress.syntaxHighlight('complete',pattern,content)},0); // wait for char to appear on screen
+			}
+		}
+	},
+
+	getCompleteChars : function() {
+		var cChars = '';
+		for(var i=0;i<Language.complete.length;i++)
+			cChars += '|'+Language.complete[i].input;
+		return cChars+'|';
+	},
+
+	getCompleteEndingChars : function() {
+		var cChars = '';
+		for(var i=0;i<Language.complete.length;i++)
+			cChars += '|'+Language.complete[i].output.charAt(Language.complete[i].output.length-1);
+		return cChars+'|';
+	},
+
+	completeEnding : function(trigger) {
+		var range = window.getSelection().getRangeAt(0);
+		try {
+			range.setEnd(range.endContainer, range.endOffset+1)
+		}
+		catch(e) {
+			return false;
+		}
+		var next_character = range.toString()
+		range.setEnd(range.endContainer, range.endOffset-1)
+		if(next_character != trigger) return false;
+		else {
+			range.setEnd(range.endContainer, range.endOffset+1)
+			range.deleteContents();
+			return true;
+		}
+	},
+
+	shortcuts : function() {
+		var cCode = arguments[0];
+		if(cCode==13) cCode = '[enter]';
+		else if(cCode==32) cCode = '[space]';
+		else cCode = '['+String.fromCharCode(charCode).toLowerCase()+']';
+		for(var i=0;i<Language.shortcuts.length;i++)
+			if(Language.shortcuts[i].input == cCode)
+				this.insertCode(Language.shortcuts[i].output,false);
+	},
+
+	getRangeAndCaret : function() {
+		var range = window.getSelection().getRangeAt(0);
+		var range2 = range.cloneRange();
+		var node = range.endContainer;
+		var caret = range.endOffset;
+		range2.selectNode(node);
+		return [range2.toString(),caret];
+	},
+
+	insertCode : function(code,replaceCursorBefore) {
+		var range = window.getSelection().getRangeAt(0);
+		var node = window.document.createTextNode(code);
+		var selct = window.getSelection();
+		var range2 = range.cloneRange();
+		// Insert text at cursor position
+		selct.removeAllRanges();
+		range.deleteContents();
+		range.insertNode(node);
+		// Move the cursor to the end of text
+		range2.selectNode(node);
+		range2.collapse(replaceCursorBefore);
+		selct.removeAllRanges();
+		selct.addRange(range2);
+	},
+
+	// get code from editor
+	getCode : function() {
+		if(!document.getElementsByTagName('pre')[0] || editor.innerHTML == '')
+			editor = CodePress.getEditor();
+		var code = editor.innerHTML;
+		code = code.replace(/<br>/g,'\n');
+		code = code.replace(/\u2009/g,'');
+		code = code.replace(/<.*?>/g,'');
+		code = code.replace(/&lt;/g,'<');
+		code = code.replace(/&gt;/g,'>');
+		code = code.replace(/&amp;/gi,'&');
+		return code;
+	},
+
+	// put code inside editor
+	setCode : function() {
+		var code = arguments[0];
+		code = code.replace(/\u2009/gi,'');
+		code = code.replace(/&/gi,'&amp;');
+		code = code.replace(/</g,'&lt;');
+		code = code.replace(/>/g,'&gt;');
+		editor.innerHTML = code;
+		if (code == '')
+			document.getElementsByTagName('body')[0].innerHTML = '';
+	},
+
+	// undo and redo methods
+	actions : {
+		pos : -1, // actual history position
+		history : [], // history vector
+
+		undo : function() {
+			editor = CodePress.getEditor();
+			if(editor.innerHTML.indexOf(cc)==-1){
+				if(editor.innerHTML != " ")
+					window.getSelection().getRangeAt(0).insertNode(document.createTextNode(cc));
+				this.history[this.pos] = editor.innerHTML;
+			}
+			this.pos --;
+			if(typeof(this.history[this.pos])=='undefined') this.pos ++;
+			editor.innerHTML = this.history[this.pos];
+			if(editor.innerHTML.indexOf(cc)>-1) editor.innerHTML+=cc;
+			CodePress.findString();
+		},
+
+		redo : function() {
+			// editor = CodePress.getEditor();
+			this.pos++;
+			if(typeof(this.history[this.pos])=='undefined') this.pos--;
+			editor.innerHTML = this.history[this.pos];
+			CodePress.findString();
+		},
+
+		next : function() { // get next vector position and clean old ones
+			if(this.pos>20) this.history[this.pos-21] = undefined;
+			return ++this.pos;
+		}
+	}
+}
+
+Language={};
+window.addEventListener('load', function() { CodePress.initialize('new'); }, true);
\ No newline at end of file
Index: branches/RC/core/units/theme_files/theme_files_config.php
===================================================================
diff -u -r11646 -r11661
--- branches/RC/core/units/theme_files/theme_files_config.php	(.../theme_files_config.php)	(revision 11646)
+++ branches/RC/core/units/theme_files/theme_files_config.php	(.../theme_files_config.php)	(revision 11661)
@@ -4,7 +4,7 @@
 					'Prefix'			=>	'theme-file',
 					'ItemClass'			=>	Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 					'ListClass'			=>	Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-					'EventHandlerClass'	=>	Array('class' => 'kDBEventHandler', 'file' => '', 'build_event'=>'OnBuild'),
+					'EventHandlerClass'	=>	Array('class' => 'ThemeFileEventHandler', 'file' => 'theme_file_eh.php', 'build_event'=>'OnBuild'),
 					'TagProcessorClass' =>	Array('class' => 'kDBTagProcessor', 'file' => '', 'build_event'=>'OnBuild'),
 					'AutoLoad'			=>	true,
 
@@ -46,6 +46,11 @@
 						'FileMetaInfo' => Array ('type' => 'string', 'default' => NULL),
 					),
 
+					'VirtualFields' => Array (
+						'FileContents' => Array ('type' => 'string', 'required' => 1, 'default' => ''),
+						'BlockPosition' => Array ('type' => 'string', 'default' => ''),
+					),
+
 					'Grids' => Array (
 						'Default' => Array (
 							'Icons' => Array('default' => 'icon16_custom.gif'),
Index: branches/RC/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -r11650 -r11661
--- branches/RC/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 11650)
+++ branches/RC/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 11661)
@@ -50,19 +50,6 @@
 		}
 
 		/**
-		 * Allows to detect if current template is one of listed ones
-		 *
-		 * @param Array $params
-		 * @return int
-		 */
-		function TemplateMatches($params)
-		{
-			$templates = explode(',' ,$params['templates']);
-			$t = $this->Application->GetVar('t');
-			return in_array($t, $templates) ? 1 : 0;
-		}
-
-		/**
 		 * Save return script in cases, when old sections are opened from new sections
 		 *
 		 * @param Array $params
Index: branches/RC/core/admin_templates/js/forms.js
===================================================================
diff -u -r11648 -r11661
--- branches/RC/core/admin_templates/js/forms.js	(.../forms.js)	(revision 11648)
+++ branches/RC/core/admin_templates/js/forms.js	(.../forms.js)	(revision 11661)
@@ -59,14 +59,19 @@
 }
 
 function InitEditors() {
+	// process all FCKEditor instances
 	var iframes = document.getElementsByTagName('IFRAME');
 
 	for (var i=0; i<iframes.length; i++) {
 		if (iframes[i].id.match(/___Frame$/)) {
-//			iframes[i].src = iframes[i].getAttribute('latesrc');
 			iframes[i].contentWindow.location = iframes[i].getAttribute('latesrc');
 		}
 	}
+
+	// process all CodePress instances
+	if ($.isFunction(window.CodePress)) {
+		CodePress.run(/*FCKeditor_OnComplete*/);
+	}
 }
 
 function Form() {}
Index: branches/RC/core/units/themes/themes_config.php
===================================================================
diff -u -r11612 -r11661
--- branches/RC/core/units/themes/themes_config.php	(.../themes_config.php)	(revision 11612)
+++ branches/RC/core/units/themes/themes_config.php	(.../themes_config.php)	(revision 11661)
@@ -44,6 +44,16 @@
 						'themes_list' => Array('prefixes' => Array('theme_List'), 'format' => "!la_tab_Themes!"),
 						'themes_edit_general' => Array('prefixes' => Array('theme'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_General!"),
 						'themes_edit_files' => Array('prefixes' => Array('theme', 'theme-file_List'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_ThemeFiles!"),
+
+						'theme_file_edit' => Array (
+							'prefixes' => Array ('theme', 'theme-file'),
+							'new_status_labels' => Array ('theme-file' => '!la_title_AddingThemeFile!'),
+							'edit_status_labels' => Array ('theme-file' => '!la_title_EditingThemeFile!'),
+							'new_titlefield' => Array ('theme-file' => '!la_title_NewThemeFile!'),
+							'format' => "#theme_status# '#theme_titlefield#' - #theme-file_status# '#theme-file_titlefield#'",
+						),
+
+						'block_edit' => Array('prefixes' => Array('theme-file'), 'format' => "!la_title_EditingThemeFile! '#theme-file_titlefield#'"),
 					),
 
 					'EditTabPresets' => Array (
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/edit_template.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: branches/RC/core/units/theme_files/theme_file_eh.php
===================================================================
diff -u
--- branches/RC/core/units/theme_files/theme_file_eh.php	(revision 0)
+++ branches/RC/core/units/theme_files/theme_file_eh.php	(revision 11661)
@@ -0,0 +1,182 @@
+<?php
+
+	class ThemeFileEventHandler extends kDBEventHandler {
+
+		/**
+		 * Allows to override standart permission mapping
+		 *
+		 */
+		function mapPermissions()
+		{
+			parent::mapPermissions();
+
+			$permissions = Array (
+				'OnLoadBlock' => Array ('subitem' => true),
+				'OnSaveBlock' => Array ('subitem' => true),
+			);
+
+			$this->permMapping = array_merge($this->permMapping, $permissions);
+		}
+
+		/**
+		 * Changes permission section to one from REQUEST, not from config
+		 *
+		 * @param kEvent $event
+		 */
+		function CheckPermission(&$event)
+		{
+			if ($event->Name == 'OnLoadBlock' || $event->Name == 'OnSaveBlock') {
+				return $this->Application->LoggedIn() && $this->Application->IsAdmin();
+			}
+
+			return parent::CheckPermission($event);
+		}
+
+		/**
+		 * Loads template contents into virtual field
+		 *
+		 * @param kEvent $event
+		 */
+		function OnAfterItemLoad(&$event)
+		{
+			parent::OnAfterItemLoad($event);
+
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$filename = $this->_getTemplatePath($object);
+
+			if (file_exists($filename)) {
+				$object->SetDBField('FileContents', file_get_contents($filename));
+			}
+			else {
+				$object->SetError('FileContents', 'template_file_missing', 'la_error_TemplateFileMissing');
+			}
+		}
+
+		/**
+		 * Trim contents of edited template
+		 *
+		 * @param kEvent $event
+		 */
+		function OnBeforeItemUpdate(&$event)
+		{
+			parent::OnBeforeItemUpdate($event);
+
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$file_data = $object->GetDBField('FileContents');
+
+			$file_data = str_replace("\r\n", "\n", $file_data);
+			$file_data = str_replace("\r", "\n", $file_data);
+
+			$object->SetDBField('FileContents', trim($file_data));
+		}
+
+		/**
+		 * Saves updated content to template
+		 *
+		 * @param kEvent $event
+		 */
+		function OnAfterItemUpdate(&$event)
+		{
+			parent::OnAfterItemUpdate($event);
+
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$filename = $this->_getTemplatePath($object);
+
+			if (file_exists($filename) && is_writable($filename)) {
+				$fp = fopen($filename, 'w');
+				fwrite($fp, $object->GetDBField('FileContents'));
+				fclose($fp);
+
+				$themes_helper =& $this->Application->recallObject('ThemesHelper');
+				/* @var $themes_helper kThemesHelper */
+
+				$meta_info = $themes_helper->parseTemplateMetaInfo($filename);
+				$file_description = array_key_exists('desc', $meta_info) ? $meta_info['desc'] : '';
+
+				$object->SetDBField('Description', $file_description);
+				$object->SetDBField('FileMetaInfo', serialize($meta_info));
+				$object->Update();
+			}
+		}
+
+		/**
+		 * Returns full path to template file
+		 *
+		 * @param kDBItem $object
+		 * @return string
+		 */
+		function _getTemplatePath(&$object)
+		{
+			$theme =& $this->Application->recallObject('theme');
+			/* @var $theme kDBItem */
+
+			$path = FULL_PATH . '/themes/' . $theme->GetDBField('Name');
+
+			$path .= $object->GetDBField('FilePath') . '/' . $object->GetDBField('FileName');
+
+			return $path;
+		}
+
+		/**
+		 * Loads block data based on it's name in request
+		 *
+		 * @param kEvent $event
+		 */
+		function OnLoadBlock(&$event)
+		{
+			parent::OnNew($event);
+
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$template_helper =& $this->Application->recallObject('TemplateHelper');
+			/* @var $template_helper TemplateHelper */
+
+			$template_helper->InitHelper($object);
+
+			$object->SetDBField('FileName', $template_helper->blockInfo('template_file'));
+			$object->SetDBField('BlockPosition', $template_helper->blockInfo('start_pos') . ' - ' . $template_helper->blockInfo('end_pos'));
+			$object->SetDBField('FileContents', $template_helper->blockInfo('content'));
+
+		}
+
+		/**
+		 * Saves changed template block
+		 *
+		 * @param kEvent $event
+		 */
+		function OnSaveBlock(&$event)
+		{
+			$object =& $event->getObject( Array('skip_autoload' => true) );
+			/* @var $object kDBItem */
+
+			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
+			if ($items_info) {
+				list ($id, $field_values) = each($items_info);
+				$object->SetFieldsFromHash($field_values);
+				$object->setID($id);
+			}
+
+			$status = $object->Validate();
+
+			$template_helper =& $this->Application->recallObject('TemplateHelper');
+			/* @var $template_helper TemplateHelper */
+
+			$template_helper->InitHelper($object);
+
+			$status = $status && $template_helper->saveBlock($object);
+
+			if ($status) {
+				$event->SetRedirectParam('opener', 'u');
+			}
+			else {
+				$event->status = erFAIL;
+			}
+		}
+	}
\ No newline at end of file
Index: branches/RC/core/admin_templates/themes/codepress/engines/msie.js
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/codepress/engines/msie.js	(revision 0)
+++ branches/RC/core/admin_templates/themes/codepress/engines/msie.js	(revision 11661)
@@ -0,0 +1,304 @@
+/*
+ * CodePress - Real Time Syntax Highlighting Editor written in JavaScript - http://codepress.org/
+ * 
+ * Copyright (C) 2007 Fernando M.A.d.S. <fermads@gmail.com>
+ *
+ * Developers:
+ *		Fernando M.A.d.S. <fermads@gmail.com>
+ *		Michael Hurni <michael.hurni@gmail.com>
+ * Contributors: 	
+ *		Martin D. Kirk
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the 
+ * GNU Lesser General Public License as published by the Free Software Foundation.
+ * 
+ * Read the full licence: http://www.opensource.org/licenses/lgpl-license.php
+ */
+
+CodePress = {
+	scrolling : false,
+	autocomplete : true,
+	
+	// set initial vars and start sh
+	initialize : function() {
+		if(typeof(editor)=='undefined' && !arguments[0]) return;
+		chars = '|32|46|62|'; // charcodes that trigger syntax highlighting
+		cc = '\u2009'; // carret char
+		editor = document.getElementsByTagName('pre')[0];
+		editor.contentEditable = 'true';
+		document.getElementsByTagName('body')[0].onfocus = function() {editor.focus();}
+		document.attachEvent('onkeydown', this.metaHandler);
+		document.attachEvent('onkeypress', this.keyHandler);
+		window.attachEvent('onscroll', function() { if(!CodePress.scrolling) setTimeout(function(){CodePress.syntaxHighlight('scroll')},1)});
+		completeChars = this.getCompleteChars();
+		completeEndingChars =  this.getCompleteEndingChars();
+		setTimeout(function() { window.scroll(0,0) },50); // scroll IE to top
+	},
+	
+	// treat key bindings
+	keyHandler : function(evt) {
+		charCode = evt.keyCode;
+		fromChar = String.fromCharCode(charCode);
+		
+		if( (completeEndingChars.indexOf('|'+fromChar+'|')!= -1 || completeChars.indexOf('|'+fromChar+'|')!=-1  )&& CodePress.autocomplete) { // auto complete
+			if(!CodePress.completeEnding(fromChar))
+			     CodePress.complete(fromChar);
+		}
+	    else if(chars.indexOf('|'+charCode+'|')!=-1||charCode==13) { // syntax highlighting
+		 	CodePress.syntaxHighlight('generic');
+		}
+	},
+
+	metaHandler : function(evt) {
+		keyCode = evt.keyCode;
+		
+		if(keyCode==9 || evt.tabKey) { 
+			CodePress.snippets();
+		}
+		else if((keyCode==122||keyCode==121||keyCode==90) && evt.ctrlKey) { // undo and redo
+			(keyCode==121||evt.shiftKey) ? CodePress.actions.redo() :  CodePress.actions.undo(); 
+			evt.returnValue = false;
+		}
+		else if(keyCode==34||keyCode==33) { // handle page up/down for IE
+			self.scrollBy(0, (keyCode==34) ? 200 : -200); 
+			evt.returnValue = false;
+		}
+		else if(keyCode==46||keyCode==8) { // save to history when delete or backspace pressed
+		 	CodePress.actions.history[CodePress.actions.next()] = editor.innerHTML;
+		}
+		else if((evt.ctrlKey || evt.metaKey) && evt.shiftKey && keyCode!=90)  { // shortcuts = ctrl||appleKey+shift+key!=z(undo) 
+			CodePress.shortcuts(keyCode);
+			evt.returnValue = false;
+		}
+		else if(keyCode==86 && evt.ctrlKey)  { // handle paste
+			window.clipboardData.setData('Text',window.clipboardData.getData('Text').replace(/\t/g,'\u2008'));
+		 	top.setTimeout(function(){CodePress.syntaxHighlight('paste');},10);
+		}
+		else if(keyCode==67 && evt.ctrlKey)  { // handle cut
+			// window.clipboardData.setData('Text',x[0]);
+			// code = window.clipboardData.getData('Text');
+		}
+	},
+
+	// put cursor back to its original position after every parsing
+	
+	
+	findString : function() {
+		range = self.document.body.createTextRange();
+		if(range.findText(cc)){
+			range.select();
+			range.text = '';
+		}
+	},
+	
+	// split big files, highlighting parts of it
+	split : function(code,flag) {
+		if(flag=='scroll') {
+			this.scrolling = true;
+			return code;
+		}
+		else {
+			this.scrolling = false;
+			mid = code.indexOf(cc);
+			if(mid-2000<0) {ini=0;end=4000;}
+			else if(mid+2000>code.length) {ini=code.length-4000;end=code.length;}
+			else {ini=mid-2000;end=mid+2000;}
+			code = code.substring(ini,end);
+			return code.substring(code.indexOf('<P>'),code.lastIndexOf('</P>')+4);
+		}
+	},
+	
+	// syntax highlighting parser
+	syntaxHighlight : function(flag) {
+		if(flag!='init') document.selection.createRange().text = cc;
+		o = editor.innerHTML;
+		if(flag=='paste') { // fix pasted text
+			o = o.replace(/<BR>/g,'\r\n'); 
+			o = o.replace(/\u2008/g,'\t');
+		}
+		o = o.replace(/<P>/g,'\n');
+		o = o.replace(/<\/P>/g,'\r');
+		o = o.replace(/<.*?>/g,'');
+		o = o.replace(/&nbsp;/g,'');			
+		o = '<PRE><P>'+o+'</P></PRE>';
+		o = o.replace(/\n\r/g,'<P></P>');
+		o = o.replace(/\n/g,'<P>');
+		o = o.replace(/\r/g,'<\/P>');
+		o = o.replace(/<P>(<P>)+/,'<P>');
+		o = o.replace(/<\/P>(<\/P>)+/,'</P>');
+		o = o.replace(/<P><\/P>/g,'<P><BR/></P>');
+		x = z = this.split(o,flag);
+
+		if(arguments[1]&&arguments[2]) x = x.replace(arguments[1],arguments[2]);
+	
+		for(i=0;i<Language.syntax.length;i++) 
+			x = x.replace(Language.syntax[i].input,Language.syntax[i].output);
+			
+		editor.innerHTML = this.actions.history[this.actions.next()] = (flag=='scroll') ? x : o.replace(z,x);
+		if(flag!='init') this.findString();
+	},
+
+	snippets : function(evt) {
+		var snippets = Language.snippets;
+		var trigger = this.getLastWord();
+		for (var i=0; i<snippets.length; i++) {
+			if(snippets[i].input == trigger) {
+				var content = snippets[i].output.replace(/</g,'&lt;');
+				content = content.replace(/>/g,'&gt;');
+				if(content.indexOf('$0')<0) content += cc;
+				else content = content.replace(/\$0/,cc);
+				content = content.replace(/\n/g,'</P><P>');
+				var pattern = new RegExp(trigger+cc,"gi");
+				this.syntaxHighlight('snippets',pattern,content);
+			}
+		}
+	},
+	
+	readOnly : function() {
+		editor.contentEditable = (arguments[0]) ? 'false' : 'true';
+	},
+	
+	complete : function(trigger) {
+		var complete = Language.complete;
+		for (var i=0; i<complete.length; i++) {
+			if(complete[i].input == trigger) {
+				var pattern = new RegExp('\\'+trigger+cc);
+				var content = complete[i].output.replace(/\$0/g,cc);
+				setTimeout(function () { CodePress.syntaxHighlight('complete',pattern,content)},0); // wait for char to appear on screen
+			}
+		}
+	},
+	
+	getCompleteChars : function() {
+		var cChars = '';
+		for(var i=0;i<Language.complete.length;i++)
+			cChars += '|'+Language.complete[i].input;
+		return cChars+'|';
+	},
+
+	getCompleteEndingChars : function() {
+		var cChars = '';
+		for(var i=0;i<Language.complete.length;i++)
+			cChars += '|'+Language.complete[i].output.charAt(Language.complete[i].output.length-1);
+		return cChars+'|';
+	},
+
+	completeEnding : function(trigger) {
+		var range = document.selection.createRange();
+		try {
+			range.moveEnd('character', 1)
+		}
+		catch(e) {
+			return false;
+		}
+		var next_character = range.text
+		range.moveEnd('character', -1)
+		if(next_character != trigger )  return false;
+		else {
+			range.moveEnd('character', 1)
+			range.text=''
+			return true;
+		}
+	},	
+
+	shortcuts : function() {
+		var cCode = arguments[0];
+		if(cCode==13) cCode = '[enter]';
+		else if(cCode==32) cCode = '[space]';
+		else cCode = '['+String.fromCharCode(keyCode).toLowerCase()+']';
+		for(var i=0;i<Language.shortcuts.length;i++)
+			if(Language.shortcuts[i].input == cCode)
+				this.insertCode(Language.shortcuts[i].output,false);
+	},
+	
+	getLastWord : function() {
+		var rangeAndCaret = CodePress.getRangeAndCaret();
+		words = rangeAndCaret[0].substring(rangeAndCaret[1]-40,rangeAndCaret[1]);
+		words = words.replace(/[\s\n\r\);\W]/g,'\n').split('\n');
+		return words[words.length-1].replace(/[\W]/gi,'').toLowerCase();
+	}, 
+
+	getRangeAndCaret : function() {	
+		var range = document.selection.createRange();
+		var caret = Math.abs(range.moveStart('character', -1000000)+1);
+		range = this.getCode();
+		range = range.replace(/\n\r/gi,'  ');
+		range = range.replace(/\n/gi,'');
+		return [range.toString(),caret];
+	},
+	
+	insertCode : function(code,replaceCursorBefore) {
+		var repdeb = '';
+		var repfin = '';
+		
+		if(replaceCursorBefore) { repfin = code; }
+		else { repdeb = code; }
+		
+		if(typeof document.selection != 'undefined') {
+			var range = document.selection.createRange();
+			range.text = repdeb + repfin;
+			range = document.selection.createRange();
+			range.move('character', -repfin.length);
+			range.select();	
+		}	
+	},
+
+	// get code from editor	
+	getCode : function() {
+		var code = editor.innerHTML;
+		code = code.replace(/<br>/g,'\n');
+		code = code.replace(/<\/p>/gi,'\r');
+		code = code.replace(/<p>/i,''); // IE first line fix
+		code = code.replace(/<p>/gi,'\n');
+		code = code.replace(/&nbsp;/gi,'');
+		code = code.replace(/\u2009/g,'');
+		code = code.replace(/<.*?>/g,'');
+		code = code.replace(/&lt;/g,'<');
+		code = code.replace(/&gt;/g,'>');
+		code = code.replace(/&amp;/gi,'&');
+		return code;
+	},
+
+	// put code inside editor
+	setCode : function() {
+		var code = arguments[0];
+		code = code.replace(/\u2009/gi,'');
+		code = code.replace(/&/gi,'&amp;');		
+       	code = code.replace(/</g,'&lt;');
+        code = code.replace(/>/g,'&gt;');
+		editor.innerHTML = '<pre>'+code+'</pre>';
+	},
+
+	
+	// undo and redo methods
+	actions : {
+		pos : -1, // actual history position
+		history : [], // history vector
+		
+		undo : function() {
+			if(editor.innerHTML.indexOf(cc)==-1){
+				document.selection.createRange().text = cc;
+			 	this.history[this.pos] = editor.innerHTML;
+			}
+			this.pos--;
+			if(typeof(this.history[this.pos])=='undefined') this.pos++;
+			editor.innerHTML = this.history[this.pos];
+			CodePress.findString();
+		},
+		
+		redo : function() {
+			this.pos++;
+			if(typeof(this.history[this.pos])=='undefined') this.pos--;
+			editor.innerHTML = this.history[this.pos];
+			CodePress.findString();
+		},
+		
+		next : function() { // get next vector position and clean old ones
+			if(this.pos>20) this.history[this.pos-21] = undefined;
+			return ++this.pos;
+		}
+	}
+}
+
+Language={};
+window.attachEvent('onload', function() { CodePress.initialize('new');});
\ No newline at end of file
Index: branches/RC/core/kernel/application.php
===================================================================
diff -u -r11610 -r11661
--- branches/RC/core/kernel/application.php	(.../application.php)	(revision 11610)
+++ branches/RC/core/kernel/application.php	(.../application.php)	(revision 11661)
@@ -856,7 +856,7 @@
 		}
 	}
 
-	function InitParser()
+	function InitParser($theme_name = false)
 	{
 		if (defined('NPARSER') && 'NPARSER') {
 			if( !is_object($this->NParser) ) {
@@ -874,6 +874,8 @@
 				$this->TemplatesCache =& $this->recallObject('TemplatesCache');
 			}
 		}
+
+		$this->TemplatesCache->forceThemeName = $theme_name;
 	}
 
 	/**
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/codepress/languages/html.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/codepress/engines/gecko.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/codepress/codepress.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/codepress/engines/opera.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/codepress/codepress.html'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/codepress/engines/msie.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: branches/RC/themes/default2009/platform/template_manager/inc/codepress/images/line-numbers.png
===================================================================
diff -u -r11427 -r11661
Binary files differ
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/codepress/languages/html.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/template_manager.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/codepress/engines/khtml.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/codepress/codepress.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/codepress/engines/older.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 11661 refers to a dead (removed) revision in file `branches/RC/themes/default2009/platform/template_manager/inc/template_manager.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: branches/RC/core/admin_templates/themes/codepress/images/line-numbers.png
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/themes/codepress/engines/opera.js
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/codepress/engines/opera.js	(revision 0)
+++ branches/RC/core/admin_templates/themes/codepress/engines/opera.js	(revision 11661)
@@ -0,0 +1,260 @@
+/*
+ * CodePress - Real Time Syntax Highlighting Editor written in JavaScript - http://codepress.org/
+ * 
+ * Copyright (C) 2007 Fernando M.A.d.S. <fermads@gmail.com>
+ *
+ * Contributors :
+ *
+ * 	Michael Hurni <michael.hurni@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the 
+ * GNU Lesser General Public License as published by the Free Software Foundation.
+ * 
+ * Read the full licence: http://www.opensource.org/licenses/lgpl-license.php
+ */
+
+
+CodePress = {
+	scrolling : false,
+	autocomplete : true,
+
+	// set initial vars and start sh
+	initialize : function() {
+		if(typeof(editor)=='undefined' && !arguments[0]) return;
+		chars = '|32|46|62|'; // charcodes that trigger syntax highlighting
+		cc = '\u2009'; // control char
+		editor = document.getElementsByTagName('body')[0];
+		document.designMode = 'on';
+		document.addEventListener('keyup', this.keyHandler, true);
+		window.addEventListener('scroll', function() { if(!CodePress.scrolling) CodePress.syntaxHighlight('scroll') }, false);
+		completeChars = this.getCompleteChars();
+//		CodePress.syntaxHighlight('init');
+	},
+
+	// treat key bindings
+	keyHandler : function(evt) {
+    	keyCode = evt.keyCode;	
+		charCode = evt.charCode;
+
+		if((evt.ctrlKey || evt.metaKey) && evt.shiftKey && charCode!=90)  { // shortcuts = ctrl||appleKey+shift+key!=z(undo) 
+			CodePress.shortcuts(charCode?charCode:keyCode);
+		}
+		else if(completeChars.indexOf('|'+String.fromCharCode(charCode)+'|')!=-1 && CodePress.autocomplete) { // auto complete
+			CodePress.complete(String.fromCharCode(charCode));
+		}
+	    else if(chars.indexOf('|'+charCode+'|')!=-1||keyCode==13) { // syntax highlighting
+		 	CodePress.syntaxHighlight('generic');
+		}
+		else if(keyCode==9 || evt.tabKey) {  // snippets activation (tab)
+			CodePress.snippets(evt);
+		}
+		else if(keyCode==46||keyCode==8) { // save to history when delete or backspace pressed
+		 	CodePress.actions.history[CodePress.actions.next()] = editor.innerHTML;
+		}
+		else if((charCode==122||charCode==121||charCode==90) && evt.ctrlKey) { // undo and redo
+			(charCode==121||evt.shiftKey) ? CodePress.actions.redo() :  CodePress.actions.undo(); 
+			evt.preventDefault();
+		}
+		else if(keyCode==86 && evt.ctrlKey)  { // paste
+			// TODO: pasted text should be parsed and highlighted
+		}
+	},
+
+	// put cursor back to its original position after every parsing
+	findString : function() {
+		var sel = window.getSelection();
+		var range = window.document.createRange();
+		var span = window.document.getElementsByTagName('span')[0];
+			
+		range.selectNode(span);
+		sel.removeAllRanges();
+		sel.addRange(range);
+		span.parentNode.removeChild(span);
+		//if(self.find(cc))
+		//window.getSelection().getRangeAt(0).deleteContents();
+	},
+	
+	// split big files, highlighting parts of it
+	split : function(code,flag) {
+		if(flag=='scroll') {
+			this.scrolling = true;
+			return code;
+		}
+		else {
+			this.scrolling = false;
+			mid = code.indexOf('<SPAN>');
+			if(mid-2000<0) {ini=0;end=4000;}
+			else if(mid+2000>code.length) {ini=code.length-4000;end=code.length;}
+			else {ini=mid-2000;end=mid+2000;}
+			code = code.substring(ini,end);
+			return code;
+		}
+	},
+	
+	// syntax highlighting parser
+	syntaxHighlight : function(flag) {
+		//if(document.designMode=='off') document.designMode='on'
+		if(flag!='init') {
+			var span = document.createElement('span');
+			window.getSelection().getRangeAt(0).insertNode(span);
+		}
+
+		o = editor.innerHTML;
+//		o = o.replace(/<br>/g,'\r\n');
+//		o = o.replace(/<(b|i|s|u|a|em|tt|ins|big|cite|strong)?>/g,'');
+		//alert(o)
+		o = o.replace(/<(?!span|\/span|br).*?>/gi,'');
+//		alert(o)
+//		x = o;
+		x = z = this.split(o,flag);
+		//alert(z)
+//		x = x.replace(/\r\n/g,'<br>');
+		x = x.replace(/\t/g, '        ');
+
+
+		if(arguments[1]&&arguments[2]) x = x.replace(arguments[1],arguments[2]);
+	
+		for(i=0;i<Language.syntax.length;i++) 
+			x = x.replace(Language.syntax[i].input,Language.syntax[i].output);
+
+		editor.innerHTML = this.actions.history[this.actions.next()] = (flag=='scroll') ? x : o.split(z).join(x); 
+
+		if(flag!='init') this.findString();
+	},
+	
+	getLastWord : function() {
+		var rangeAndCaret = CodePress.getRangeAndCaret();
+		words = rangeAndCaret[0].substring(rangeAndCaret[1]-40,rangeAndCaret[1]);
+		words = words.replace(/[\s\n\r\);\W]/g,'\n').split('\n');
+		return words[words.length-1].replace(/[\W]/gi,'').toLowerCase();
+	}, 
+	
+	snippets : function(evt) {
+		var snippets = Language.snippets;	
+		var trigger = this.getLastWord();
+		for (var i=0; i<snippets.length; i++) {
+			if(snippets[i].input == trigger) {
+				var content = snippets[i].output.replace(/</g,'&lt;');
+				content = content.replace(/>/g,'&gt;');
+				if(content.indexOf('$0')<0) content += cc;
+				else content = content.replace(/\$0/,cc);
+				content = content.replace(/\n/g,'<br>');
+				var pattern = new RegExp(trigger+cc,'gi');
+				evt.preventDefault(); // prevent the tab key from being added
+				this.syntaxHighlight('snippets',pattern,content);
+			}
+		}
+	},
+	
+	readOnly : function() {
+		document.designMode = (arguments[0]) ? 'off' : 'on';
+	},
+
+	complete : function(trigger) {
+		window.getSelection().getRangeAt(0).deleteContents();
+		var complete = Language.complete;
+		for (var i=0; i<complete.length; i++) {
+			if(complete[i].input == trigger) {
+				var pattern = new RegExp('\\'+trigger+cc);
+				var content = complete[i].output.replace(/\$0/g,cc);
+				parent.setTimeout(function () { CodePress.syntaxHighlight('complete',pattern,content)},0); // wait for char to appear on screen
+			}
+		}
+	},
+
+	getCompleteChars : function() {
+		var cChars = '';
+		for(var i=0;i<Language.complete.length;i++)
+			cChars += '|'+Language.complete[i].input;
+		return cChars+'|';
+	},
+
+	shortcuts : function() {
+		var cCode = arguments[0];
+		if(cCode==13) cCode = '[enter]';
+		else if(cCode==32) cCode = '[space]';
+		else cCode = '['+String.fromCharCode(charCode).toLowerCase()+']';
+		for(var i=0;i<Language.shortcuts.length;i++)
+			if(Language.shortcuts[i].input == cCode)
+				this.insertCode(Language.shortcuts[i].output,false);
+	},
+	
+	getRangeAndCaret : function() {	
+		var range = window.getSelection().getRangeAt(0);
+		var range2 = range.cloneRange();
+		var node = range.endContainer;			
+		var caret = range.endOffset;
+		range2.selectNode(node);	
+		return [range2.toString(),caret];
+	},
+	
+	insertCode : function(code,replaceCursorBefore) {
+		var range = window.getSelection().getRangeAt(0);
+		var node = window.document.createTextNode(code);
+		var selct = window.getSelection();
+		var range2 = range.cloneRange();
+		// Insert text at cursor position
+		selct.removeAllRanges();
+		range.deleteContents();
+		range.insertNode(node);
+		// Move the cursor to the end of text
+		range2.selectNode(node);		
+		range2.collapse(replaceCursorBefore);
+		selct.removeAllRanges();
+		selct.addRange(range2);
+	},
+	
+	// get code from editor
+	getCode : function() {
+		var code = editor.innerHTML;
+		code = code.replace(/<br>/g,'\n');
+		code = code.replace(/\u2009/g,'');
+		code = code.replace(/<.*?>/g,'');
+		code = code.replace(/&lt;/g,'<');
+		code = code.replace(/&gt;/g,'>');
+		code = code.replace(/&amp;/gi,'&');
+		return code;
+	},
+
+	// put code inside editor
+	setCode : function() {
+		var code = arguments[0];
+		code = code.replace(/\u2009/gi,'');
+		code = code.replace(/&/gi,'&amp;');
+       	code = code.replace(/</g,'&lt;');
+        code = code.replace(/>/g,'&gt;');
+		editor.innerHTML = code;
+	},
+
+	// undo and redo methods
+	actions : {
+		pos : -1, // actual history position
+		history : [], // history vector
+		
+		undo : function() {
+			if(editor.innerHTML.indexOf(cc)==-1){
+				window.getSelection().getRangeAt(0).insertNode(document.createTextNode(cc));
+			 	this.history[this.pos] = editor.innerHTML;
+			}
+			this.pos--;
+			if(typeof(this.history[this.pos])=='undefined') this.pos++;
+			editor.innerHTML = this.history[this.pos];
+			CodePress.findString();
+		},
+		
+		redo : function() {
+			this.pos++;
+			if(typeof(this.history[this.pos])=='undefined') this.pos--;
+			editor.innerHTML = this.history[this.pos];
+			CodePress.findString();
+		},
+		
+		next : function() { // get next vector position and clean old ones
+			if(this.pos>20) this.history[this.pos-21] = undefined;
+			return ++this.pos;
+		}
+	}
+}
+
+Language={};
+window.addEventListener('load', function() { CodePress.initialize('new'); }, true);
Index: branches/RC/core/admin_templates/themes/codepress/codepress.html
===================================================================
diff -u
--- branches/RC/core/admin_templates/themes/codepress/codepress.html	(revision 0)
+++ branches/RC/core/admin_templates/themes/codepress/codepress.html	(revision 11661)
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+	<title>CodePress - Real Time Syntax Highlighting Editor written in JavaScript</title>
+	<meta name="description" content="CodePress - source code editor window" />
+
+	<script type="text/javascript">
+	var language = 'generic';
+	var engine = 'older';
+	var ua = navigator.userAgent;
+	var ts = (new Date).getTime(); // timestamp to avoid cache
+	var lh = location.href;
+	
+	if(ua.match('MSIE')) engine = 'msie';
+	else if(ua.match('KHTML')) engine = 'khtml'; 
+	else if(ua.match('Opera')) engine = 'opera'; 
+	else if(ua.match('Gecko')) engine = 'gecko';
+
+	if(lh.match('language=')) language = lh.replace(/.*language=(.*?)(&.*)?$/,'$1');
+
+	document.write('<link type="text/css" href="codepress.css?ts='+ts+'" rel="stylesheet" />');
+	document.write('<link type="text/css" href="languages/'+language+'.css?ts='+ts+'" rel="stylesheet" id="cp-lang-style" />');
+	document.write('<scr'+'ipt type="text/javascript" src="engines/'+engine+'.js?ts='+ts+'"></scr'+'ipt>');
+	document.write('<scr'+'ipt type="text/javascript" src="languages/'+language+'.js?ts='+ts+'"></scr'+'ipt>');
+	</script>
+
+</head>
+
+<script type="text/javascript">
+if(engine == "msie" || engine == "gecko") document.write('<body><pre> </pre></body>');
+else if(engine == "opera") document.write('<body></body>');
+// else if(engine == "khtml") document.write('<body> </body>');
+</script>
+
+</html>
Index: branches/RC/core/units/general/helpers/themes_helper.php
===================================================================
diff -u -r11646 -r11661
--- branches/RC/core/units/general/helpers/themes_helper.php	(.../themes_helper.php)	(revision 11646)
+++ branches/RC/core/units/general/helpers/themes_helper.php	(.../themes_helper.php)	(revision 11661)
@@ -193,14 +193,20 @@
 		 */
 		function _getTemplateMetaInfo($template, $theme_id)
 		{
-			if (!defined('DBG_NPARSER_FORCE_COMPILE')) {
-				$this->Application->InitParser();
-				define('DBG_NPARSER_FORCE_COMPILE', 1);
+			static $init_made = false;
+			if (!$init_made) {
+				$this->Application->InitParser(true);
+				$init_made = true;
 			}
 
 			$template = 'theme:' . $this->_themeNames[$theme_id] . '/' . $template;
 			$template_file = $this->Application->TemplatesCache->GetRealFilename($template); // ".tpl" was added before
 
+			return $this->parseTemplateMetaInfo($template_file);
+		}
+
+		function parseTemplateMetaInfo($template_file)
+		{
 			if (!file_exists($template_file)) {
 				// when template without info it's placed in top category
 				return Array ();
Index: branches/RC/core/kernel/nparser/compiler.php
===================================================================
diff -u -r11610 -r11661
--- branches/RC/core/kernel/nparser/compiler.php	(.../compiler.php)	(revision 11610)
+++ branches/RC/core/kernel/nparser/compiler.php	(.../compiler.php)	(revision 11661)
@@ -30,7 +30,7 @@
 		safeDefine('DBG_IGNORE_FATAL_ERRORS', 1);
 
 		$i = $current;
-		$this->Application->InitParser();
+		$this->Application->InitParser(true);
 		while ($i < $total && $i < ($current + 20)) {
 			$a_template = $templates[$i];
 
Index: branches/RC/core/admin_templates/js/template_manager.js
===================================================================
diff -u
--- branches/RC/core/admin_templates/js/template_manager.js	(revision 0)
+++ branches/RC/core/admin_templates/js/template_manager.js	(revision 11661)
@@ -0,0 +1,82 @@
+function TemplateManager ($edit_url) {
+	this._editUrl = $edit_url;
+
+	this._blocks = {};
+
+	this._blockOrder = Array ();
+
+	$(document).ready(
+		function() {
+			aTemplateManager.searchBlocks();
+		}
+	);
+}
+
+TemplateManager.prototype.onBtnClick = function ($e, $element) {
+	var $id = $element.id.replace(/_btn$/, '');
+	var $block_info = this._blocks[$id];
+	var $url = this._editUrl.replace('#BLOCK#', $block_info.block_name + ':' + $block_info.function_name).replace('#EVENT#', 'OnLoadBlock');
+
+	openSelector('theme-file', $url);
+
+	$e.stopPropagation();
+}
+
+TemplateManager.prototype.onMouseOver = function ($e, $element) {
+	$($element).addClass('block-edit-btn-container-over');
+	$e.stopPropagation();
+}
+
+TemplateManager.prototype.onMouseOut = function ($e, $element) {
+	$($element).removeClass('block-edit-btn-container-over');
+	$e.stopPropagation();
+}
+
+TemplateManager.prototype.searchBlocks = function () {
+	$('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) {
+	var $params = $element.getAttribute('params').split(':');
+
+	this._blocks[$element.id] = {
+		block_name: $params[0],
+		function_name: $params[1]
+	};
+
+	var $btn = document.getElementById($element.id + '_btn');
+
+	$($btn).bind(
+		'click',
+		function(ev) {
+			TemplateManager.prototype.onBtnClick.call(aTemplateManager, ev, this);
+		}
+	);
+
+	$($element).bind(
+		'mouseover',
+		function(ev) {
+			TemplateManager.prototype.onMouseOver.call(aTemplateManager, ev, this);
+		}
+	);
+
+	$($element).bind(
+		'mouseout',
+		function(ev) {
+			TemplateManager.prototype.onMouseOut.call(aTemplateManager, ev, this);
+		}
+	);
+
+	this._blockOrder.push($element.id);
+}
\ No newline at end of file
Index: branches/RC/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r11649 -r11661
--- branches/RC/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 11649)
+++ branches/RC/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 11661)
@@ -20,8 +20,6 @@
 			'OnRecalculatePriorities' => Array ('self' => 'add|edit'), // category ordering
 			'OnItemBuild' => Array ('self' => true), // always allow to view individual categories (regardless of CATEGORY.VIEW right)
 			'OnUpdatePreviewBlock' => Array ('self' => true), // for FCKEditor integration
-
-			'OnSaveBlock' => Array ('self' => true), // saves RenderElements from Front-End
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
@@ -763,9 +761,11 @@
 	 */
 	function _templateFound($template, $theme_id = null)
 	{
-		if (!defined('DBG_NPARSER_FORCE_COMPILE')) {
-			$this->Application->InitParser();
-			define('DBG_NPARSER_FORCE_COMPILE', 1);
+		static $init_made = false;
+
+		if (!$init_made) {
+			$this->Application->InitParser(true);
+			$init_made = true;
 		}
 
 		if (!isset($theme_id)) {
@@ -1283,7 +1283,7 @@
 
 		if ($object->GetDBField('IsSystem') == 1) {
 			if (!$this->_templateFound($object->GetDBField('Template'), $object->GetDBField('ThemeId'))) {
-				$object->SetError('Template', 'template_file_missing', 'la_err_TemplateFileMissing');
+				$object->SetError('Template', 'template_file_missing', 'la_error_TemplateFileMissing');
 			}
 		}
 
@@ -1847,25 +1847,6 @@
 
 		$this->Application->StoreVar('_editor_preview_content_', $string);
 	}
-
-	/**
-	 * Saves changed template block
-	 *
-	 * @param kEvent $event
-	 */
-	function OnSaveBlock(&$event)
-	{
-		if (!EDITING_MODE) {
-			$event->status = erSTOP;
-			echo '0';
-			return ;
-		}
-
-		$template_helper =& $this->Application->recallObject('TemplateHelper');
-		/* @var $template_helper TemplateHelper */
-
-		$event->status = $template_helper->saveBlock($event) ? erSTOP : erFAIL;
-	}
 }
 
 ?>
\ No newline at end of file
Index: branches/RC/core/units/structure/structure_config.php
===================================================================
diff -u -r11635 -r11661
--- branches/RC/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 11635)
+++ branches/RC/core/units/structure/structure_config.php	(.../structure_config.php)	(revision 11661)
@@ -181,6 +181,20 @@
 				),
 			),
 
+			'Radio'		=>	Array(
+				'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
+				'Selector' => 'radio',
+				'Fields' => Array(
+					'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'filter_width' => '20' ),
+					'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'),
+					'Modified_formatted' => Array( 'title'=>'la_col_Modified', 'sort_field' => 'Modified', 'filter_block' => 'grid_date_range_filter' ),
+					'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ),
+					'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
+					'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
+					'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'use_phrases'=>1 ),
+				),
+			),
+
 			'AllPages'		=>	Array(
 				'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
 				'Fields' => Array(
Index: branches/RC/core/kernel/session/session.php
===================================================================
diff -u -r11648 -r11661
--- branches/RC/core/kernel/session/session.php	(.../session.php)	(revision 11648)
+++ branches/RC/core/kernel/session/session.php	(.../session.php)	(revision 11661)
@@ -921,7 +921,7 @@
 		}
 	}
 
-	function SaveData($params)
+	function SaveData($params = Array ())
 	{
 		if (!$this->SetSession()) { // call it here - it may be not set before, because there was no need; if there is a need, it will be set here
 			return;