diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php index fd8d460c9..2ff8ab3ca 100644 --- a/classes/optimizer/Optimizer.class.php +++ b/classes/optimizer/Optimizer.class.php @@ -121,9 +121,6 @@ header("Content-Type: {$content_type}; charset=UTF-8"); header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); header("Content-Length: ".filesize('{$content_filename}')); {$gzip_header} if(@file_exists("{$content_filename}")) { diff --git a/common/css/default.css b/common/css/default.css index f9667221b..f526befd6 100644 --- a/common/css/default.css +++ b/common/css/default.css @@ -27,7 +27,7 @@ IE7 & IE6 & Below html { width:100%; } body { margin:0; font-size:.75em; font-family:sans-serif;} img { border:none; } -label { cursor:pointer; } +label { cursor:pointer; position:relative; left:5px; } form { margin:0; padding:0; } .iePngFix { behavior:url(./common/js/iePngFix.htc); } diff --git a/common/js/x.js b/common/js/x.js index dc2f90356..fa6df72d3 100644 --- a/common/js/x.js +++ b/common/js/x.js @@ -21,6 +21,7 @@ else if(navigator.vendor!='KDE' && document.all && xUA.indexOf('msie')!=-1){ } else if(document.layers){xNN4=true;} var xMac=xUA.indexOf('mac')!=-1; +var xFF=xUA.indexOf('firefox')!=-1; // (element, event(without 'on'), event listener(function name)[, caption]) function xAddEventListener(e,eT,eL,cap) diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js index 0844dc418..bb9c3fcf9 100644 --- a/common/js/xml_js_filter.js +++ b/common/js/xml_js_filter.js @@ -300,6 +300,13 @@ function XmlJsFilterProc(confirm_msg) { // form proc function procFilter(fo_obj, filter_func) { + // form문 안에 위지윅 에디터가 세팅되어 있을 경우 에디터의 값과 지정된 content field를 sync + var editor_sequence = fo_obj.getAttribute('editor_sequence'); + if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') { + var content = editorGetContent(editor_sequence); + editorRelKeys[editor_sequence]['content'].value = content; + } + filter_func(fo_obj); return false; } diff --git a/config/config.inc.php b/config/config.inc.php index 02abfd2b7..9ec50bf5f 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -14,7 +14,7 @@ * 이 내용은 제로보드XE의 버전을 관리자 페이지에 표시하기 위한 용도이며 * config.inc.php의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함 **/ - define('__ZBXE_VERSION__', '0.2.2'); + define('__ZBXE_VERSION__', '0.2.3'); /** * @brief 디버깅 메세지 출력 diff --git a/layouts/xe_official/layout.html b/layouts/xe_official/layout.html index b1bbcdce6..6ede0e1f2 100644 --- a/layouts/xe_official/layout.html +++ b/layouts/xe_official/layout.html @@ -16,6 +16,10 @@ + + {@$layout_info->colorset = "default"} + +