--- Webpacus/root/editor/editor.js	2005/11/27 01:42:33	172
+++ Webpacus/root/editor/editor.js	2005/11/29 14:31:26	193
@@ -6,19 +6,33 @@
 var url = null;
 var template_filename = null;
 
+var pending_js = null;
+
 var css_rnd = 0;
 
-function update_status(text) {
-	var el = $('div_record_nr');
+function _ts(text) {
+	var el = $('div_template_status');
 	if (el) el.innerHTML = text;
 }
 
-function load_rec(nr) {
-	Logger.debug('load_rec '+nr);
+function _cs(text) {
+	var el = $('div_css_status');
+	if (el) el.innerHTML = text;
+}
+
+function load_rec(nr, tmp_template_filename) {
+
+	if (! nr) {
+		Logger.error('load_rec called without nr');
+		return false;
+	}
+
+	if (! tmp_template_filename) tmp_template_filename = template_filename;
+	Logger.info('load_rec '+nr+' in '+tmp_template_filename);
 
 	if (loading.record) {
 		Logger.info('loading of record '+nr+' skipped, load in progress');
-		return;
+		return false;
 	}
 
 	show_working();
@@ -30,7 +44,7 @@
 		Element.removeClassName('a_left_arr', 'nav_disable');
 	}
 
-	var args = '?mfn='+nr+'&template_filename='+template_filename;
+	var args = '?mfn='+nr+'&template_filename='+tmp_template_filename;
 
 	new Ajax.Updater( 'div_record',  url+'record'+args, {
 		asynchronous: 1,
@@ -48,6 +62,7 @@
 		}
 	} ) ;
 
+	return false;
 }
 
 function inc_rec() {
@@ -78,30 +93,33 @@
 var current_edit = '';
 
 function edit_template() {
-	$('div_css').style.visibility = "hidden";
-	$('div_css').style.zIndex = 1;
+	Element.hide('row_css');
+
 	Element.removeClassName('a_css', 'tab_selected');
 	Element.addClassName('a_template', 'tab_selected');
-	$('div_template').style.visibility = "visible";
-	$('div_template').style.zIndex = 2;
+
+	Element.show('row_template');
+
 	Logger.debug("switched to template editor");
 	var c = $('template_content');
 	if (c) c.focus();
-	Logger.debug('zIndex template:'+$('div_template').style.zIndex+' css:'+$('div_css').style.zIndex);
+	Logger.debug('zIndex template:'+$('row_template').style.zIndex+' css:'+$('row_css').style.zIndex);
 	return false;
 }
 
 function edit_css() {
-	$('div_template').style.visibility = "hidden";
-	$('div_template').style.zIndex = 1;
+
+	Element.hide('row_template');
+
 	Element.removeClassName('a_template', 'tab_selected');
 	Element.addClassName('a_css', 'tab_selected');
-	$('div_css').style.visibility = "visible";
-	$('div_css').style.zIndex = 2;
+
+	Element.show('row_css');
+
 	Logger.debug("switched to CSS editor");
 	var c = $('css_content');
 	if (c) c.focus();
-	Logger.debug('zIndex template:'+$('div_template').style.zIndex+' css:'+$('div_css').style.zIndex);
+	Logger.debug('zIndex template:'+$('row_template').style.zIndex+' css:'+$('row_css').style.zIndex);
 	return false;
 }
 
@@ -117,6 +135,8 @@
 	Logger.debug('refresh record');
 	load_rec(rec);
 
+	edKill('template_content');
+
 	hide_working();
 
 	return false;
@@ -139,7 +159,7 @@
 
 	var args = '?template_filename='+template_filename;
 
-	new Ajax.Updater( 'div_template',  url+'template'+args, {
+	new Ajax.Updater( 'row_template',  url+'template'+args, {
 		asynchronous: 1,
 		onLoading: function(request) {
 			loading.template = 1;
@@ -147,7 +167,6 @@
 		},
 		onLoaded: function(request) {
 			loading.template = 0;
-			Position.clone('div_template', 'div_css');
 			hide_working();
 			Logger.info('load_template.onLoaded: '+template_filename);
 		}
@@ -161,9 +180,11 @@
 		return;
 	}
 
+	Logger.info('load_css '+css_filename);
+
 	show_working();
 
-	new Ajax.Updater( 'div_css',  url+'css', {
+	new Ajax.Updater( 'row_css',  url+'css', {
 		asynchronous: 1,
 		onLoading: function(request) {
 			loading.css = 1;
@@ -173,15 +194,19 @@
 			loading.css = 0;
 			hide_working();
 			Logger.info('load_css.onLoaded: '+css_filename);
+			reload_css( css_filename );
 		}
 	} ) ;
 };
 
-function reload_css() {
+function reload_css( css_filename ) {
+
+	if (! css_filename) css_filename = 'user.css';
 
 	css_rnd++;
-	Logger.info('loading user.css?'+css_rnd);
-	$('user_css_link').href = 'user.css?'+css_rnd;
+	var css_url = url + 'css/' + css_filename + '?' + css_rnd;
+	Logger.info('reload_css from '+css_url);
+	$('user_css_link').href = css_url;
 
 	return false;
 }