Index: trunk/kernel/admin_templates/incs/script.js
===================================================================
diff -u -r5185 -r5219
--- trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 5185)
+++ trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 5219)
@@ -108,7 +108,7 @@
 		set_hidden_field('events[' + prefix_special + ']', event);
 	}
 	if (t) set_hidden_field('t', t);
-	
+
 	if (form_action) {
 		var old_env = '';
 		if (!form_action.match(/\?/)) {
@@ -226,15 +226,18 @@
 }
 
 // in-portal compatibility functions: begin
-function getScriptURL($script_name)
+function getScriptURL($script_name, tpl)
 {
+	tpl = tpl ? '-'+tpl : '';
 	var $asid = get_hidden_field('sid');
-	return base_url+$script_name+'?env='+( isset($env)&&$env?$env:$asid )+'&en=0';
+	return base_url+$script_name+'?env='+( isset($env)&&$env?$env:$asid )+tpl+'&en=0';
 }
 
 function OpenEditor(extra_env,TargetForm,TargetField)
 {
-	var $url = getScriptURL('admin/editor/editor_new.php');
+//	var $url = getScriptURL('admin/editor/editor_new.php');
+	var $url = getScriptURL('admin/index.php', 'popups/editor');
+//	alert($url);
 	$url = $url+'&TargetForm='+TargetForm+'&TargetField='+TargetField+'&destform=popup';
 	if(extra_env.length>0) $url += extra_env;
 	openwin($url,'html_edit',800,575);
@@ -456,7 +459,7 @@
 // sets hidden field value
 // if the field does not exist - creates it
 function set_hidden_field($field_id, $value)
-{	
+{
 	var $kf = document.getElementById($form_name);
 	var $field = $kf.elements[$field_id];
 	if ($field) {
@@ -477,7 +480,7 @@
 // sets hidden field value
 // if the field does not exist - creates it
 function setInnerHTML($field_id, $value)
-{	
+{
 	var $element = document.getElementById($field_id);
 	if (!$element) return false;
 	$element.innerHTML = $value;
@@ -541,7 +544,7 @@
 		yPos += tempEl.offsetTop;
 		tempEl = tempEl.offsetParent;
 	}
-	
+
 //	if (obj.y) return obj.y;
 	return yPos;
 }
@@ -979,7 +982,7 @@
       el.removeEventListener(evname, func, true);
    }
 	};*/
-	
+
 	function setCookie($Name, $Value)
 	{
 		// set cookie
@@ -988,20 +991,20 @@
 			document.cookie = $Name+'='+escape($Value)+'; path=' + $base_path + '/';
 		}
 	}
-	
+
 	function getCookie($Name)
 	{
 		// get cookie
 		var $cookieString = document.cookie;
 		var $index = $cookieString.indexOf($Name+'=');
 		if($index == -1) return null;
-	
+
 		$index = $cookieString.indexOf('=',$index)+1;
 		var $endstr = $cookieString.indexOf(';',$index);
 		if($endstr == -1) $endstr = $cookieString.length;
-		return unescape($cookieString.substring($index, $endstr)); 
+		return unescape($cookieString.substring($index, $endstr));
 	}
-	
+
 	function deleteCookie($Name)
 	{
 		// deletes cookie
@@ -1010,7 +1013,7 @@
 	    	document.cookie = $Name+'=; expires=Thu, 01-Jan-70 00:00:01 GMT; path=/';
 	    }
 	}
-	
+
 	function addElement($dst_element, $tag_name) {
 		var $new_element = document.createElement($tag_name.toUpperCase());
 		$dst_element.appendChild($new_element);