Index: branches/unlabeled/unlabeled-1.65.4/core/kernel/processors/main_processor.php
===================================================================
diff -u -r6673 -r6826
--- branches/unlabeled/unlabeled-1.65.4/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 6673)
+++ branches/unlabeled/unlabeled-1.65.4/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 6826)
@@ -522,6 +522,11 @@
 		$parser =& $this->Application->Parser;
 		$this->Application->Parser =& $BlockParser;
 
+		// this is for the parser to know the master template in case an error occurs,
+		// ParseTemplate will reset it anyway, but this will allow error handler to display the tempalte
+		// which tries to include missing template for example
+		$this->Application->Parser->TemplateName = $parser->TemplateName;
+
 		$t = $this->SelectParam($params, 't,template,block,name');
 		$t = eregi_replace("\.tpl$", '', $t);
 
Index: branches/unlabeled/unlabeled-1.26.8/core/kernel/parser/template_parser.php
===================================================================
diff -u -r6437 -r6826
--- branches/unlabeled/unlabeled-1.26.8/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 6437)
+++ branches/unlabeled/unlabeled-1.26.8/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 6826)
@@ -393,6 +393,7 @@
 				$this->SetParams($params, 0); // 0 to disable params sorting and regexp generation - not needed when processing pre-parsed
 				ob_start();
 				if ($pre_parsed['mode'] == 'file') {
+					$this->TemplateName = str_replace(FULL_PATH, '', realpath($pre_parsed['fname']));
 					include($pre_parsed['fname']);
 				}
 				else {
@@ -412,7 +413,9 @@
 
 				$this->CompiledBuffer .= '$o = \'\';'."\n";
 
-				$output = $this->NewParse($this->Application->TemplatesCache->GetTemplateBody($name, $silent), $name);
+				$body = $this->Application->TemplatesCache->GetTemplateBody($name, $silent);
+				$this->TemplateName = $name;
+				$output = $this->NewParse($body, $name);
 
 				$this->CompiledBuffer .= '?'.'>'."\n";
 
Index: branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php
===================================================================
diff -u -r6820 -r6826
--- branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 6820)
+++ branches/unlabeled/unlabeled-1.1.2/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 6826)
@@ -264,6 +264,16 @@
 																								'type'			=>	stTREE,
 																						),
 
+													'in-portal:configure_themes'	=>	Array(
+																								'parent'		=>	'in-portal:system',
+																								'icon'			=>	'in-portal:conf_themes',
+																								'label'			=>	'la_tab_Themes',
+																								'url'			=>	Array('index_file' => 'config/config_theme.php', 'pass' => 'm'),
+																								'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
+																								'priority'		=>	3,
+																								'type'			=>	stTREE,
+																						),
+
 													// "Tools" section
 													'in-portal:tools'	=>	Array(
 																						'parent'		=>	'in-portal:root',
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_clone_f2.gif
===================================================================
diff -u
Binary files differ
Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js
===================================================================
diff -u -r6820 -r6826
--- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 6820)
+++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js	(.../script.js)	(revision 6826)
@@ -407,7 +407,9 @@
 
 function openwin($url,$name,$width,$height)
 {
-	var $window_params = 'width='+$width+',height='+$height+',status=yes,resizable=yes,menubar=no,scrollbars=yes,toolbar=no';
+	var left = Math.round((screen.width - $width)/2);
+	var top = Math.round((screen.height - $height)/2);
+	var $window_params = 'left='+left+',top='+top+',width='+$width+',height='+$height+',status=yes,resizable=yes,menubar=no,scrollbars=yes,toolbar=no';
 	return window.open($url,$name,$window_params);
 }
 
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_clone_f3.gif
===================================================================
diff -u
Binary files differ
Index: branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php
===================================================================
diff -u -r6820 -r6826
--- branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 6820)
+++ branches/unlabeled/unlabeled-1.1.2/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 6826)
@@ -264,6 +264,16 @@
 																								'type'			=>	stTREE,
 																						),
 
+													'in-portal:configure_themes'	=>	Array(
+																								'parent'		=>	'in-portal:system',
+																								'icon'			=>	'in-portal:conf_themes',
+																								'label'			=>	'la_tab_Themes',
+																								'url'			=>	Array('index_file' => 'config/config_theme.php', 'pass' => 'm'),
+																								'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
+																								'priority'		=>	3,
+																								'type'			=>	stTREE,
+																						),
+
 													// "Tools" section
 													'in-portal:tools'	=>	Array(
 																						'parent'		=>	'in-portal:root',
Index: branches/unlabeled/unlabeled-1.18.4/core/kernel/parser/template.php
===================================================================
diff -u -r6704 -r6826
--- branches/unlabeled/unlabeled-1.18.4/core/kernel/parser/template.php	(.../template.php)	(revision 6704)
+++ branches/unlabeled/unlabeled-1.18.4/core/kernel/parser/template.php	(.../template.php)	(revision 6826)
@@ -57,7 +57,7 @@
 				if ($application->isDebugMode()) {
 					$application->Debugger->appendTrace();
 				}
-				trigger_error("File or block not found: <b>$filename</b>", ($silent ? E_USER_NOTICE : E_USER_ERROR) );
+				trigger_error("File or block not found: <b>$filename</b> at ".$application->Parser->TemplateName, ($silent ? E_USER_NOTICE : E_USER_ERROR) );
 			}
 			return false;
 		}
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_clone.gif
===================================================================
diff -u
Binary files differ
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/close_popup.tpl
===================================================================
diff -u
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/close_popup.tpl	(revision 0)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/close_popup.tpl	(revision 6826)
@@ -0,0 +1,14 @@
+<html>
+	<head>
+		<title></title>
+		<script type="text/javascript">
+			var $redirect_url = '<inp2:m_t t="dummy" opener="u" escape="escape"/>';
+		//	alert('url to redirect = ['+$redirect_url.replace('%5C', '\\')+']');
+			window.opener.location = $redirect_url.replace('%5C', '\\');
+			window.close();
+			window.opener.focus();
+		</script>
+	</head>
+	<body>
+	</body>
+</html>
\ No newline at end of file