")
+ .attr("id","xe_gallery_screen")
+ .css({
+ position:"absolute",
+ display:"none",
+ backgroundColor:"black",
+ zIndex:500,
+ opacity:0.5
+ });
+
+ // 이미지를 보여주고 컨트롤 버튼을 다룰 레이어
+ controls = $("")
+ .attr("id","xe_gallery_controls")
+ .css({
+ position:"absolute",
+ display:"none",
+ overflow:"hidden",
+ zIndex:510
+ });
+
+ // 닫기 버튼
+ closebtn = $("
![]()
")
+ .attr("id", "xe_gallery_closebtn")
+ .attr("src", request_uri+"addons/resize_image/iconClose.png")
+ .css({
+ top : "10px"
+ })
+ .click(function(){xScreen.xeHide()})
+ .appendTo(controls);
+
+ // 이전 버튼
+ prevbtn = $("
![]()
")
+ .attr("id", "xe_gallery_prevbtn")
+ .attr("src", request_uri+"addons/resize_image/iconLeft.png")
+ .css("left","10px")
+ .click(function(){xScreen.xePrev()})
+ .appendTo(controls);
+
+ // 다음 버튼
+ nextbtn = $("
![]()
")
+ .attr("id", "xe_gallery_nextbtn")
+ .attr("src", request_uri+"addons/resize_image/iconRight.png")
+ .css("right","10px")
+ .click(function(){xScreen.xeNext()})
+ .appendTo(controls);
+
+ // 버튼 공통 속성
+ controls.find("img")
+ .attr({
+ width : 60,
+ height : 60,
+ className : "iePngFix"
+ })
+ .css({
+ position : "absolute",
+ width : "60px",
+ height : "60px",
+ zIndex : 530,
+ cursor : "pointer"
+ });
+
+ // 이미지 홀더
+ imgframe = $("
![]()
")
+ .attr("id", "xe_gallery_holder")
+ .css("border", "7px solid white")
+ .css("zIndex", 520)
+ .appendTo(controls).draggable();
- var html = xInnerHtml(xe_objs[j]);
- if(!img_regx.test(html)) continue;
+ body.append(xScreen).append(controls);
+
+ // xScreen 객체를 확장한다.
+ xScreen.xeShow = function() {
+ var clientWidth = $(window).width();
+ var clientHeight = $(window).height();
+
+ $("#xe_gallery_controls,#xe_gallery_screen").css({
+ display:"block",
+ width : clientWidth + "px",
+ height : clientHeight + "px",
+ left : $(document).scrollLeft(),
+ top : $(document).scrollTop()
+ });
- // 모든 이미지에 대한 체크를 시작
- var objs = xGetElementsByTagName("IMG", xe_objs[j]);
+ closebtn.css("left", Math.round((clientWidth-60)/2) + "px");
- for(var i=0;i
parent_width - 2) {
- obj.style.cursor = "pointer";
- var new_w = parent_width - 2;
- var new_h = Math.round(obj_height * new_w/obj_width);
- xWidth(obj, new_w);
- xHeight(obj, new_h);
- }
-
- obj.style.cursor = "pointer";
-
- // 만약 대상 이미지에 링크가 설정되어 있거나 onclick 이벤트가 부여되어 있으면 원본 보기를 하지 않음
- if(obj.parentNode.nodeName.toLowerCase()!='a' && !obj.getAttribute('onclick')) xAddEventListener(obj,"click", showOriginalImage);
-
- obj.setAttribute("rel", j+','+imageGalleryIndex[j].length);
- imageGalleryIndex[j][imageGalleryIndex[j].length] = obj.src;
- }
- }
- }
-}
-xAddEventListener(window, "load", function() { setTimeout(resizeImageContents,1500); });
-
-/**
- * @brief 본문내에서 컨텐츠 영역보다 큰 이미지의 경우 원본 크기를 보여줌
- **/
-function showOriginalImage(evt) {
- var e = new xEvent(evt);
- var obj = e.target;
- var src = obj.src;
- var rel = obj.getAttribute('rel');
- displayOriginalImage(src, rel);
+ prevbtn.css("visibility", (this.index>0)?"visible":"hidden");
+ nextbtn.css("visibility", (this.index1) {
-
- var prev = i-1;
- var next = i+1;
- if(prev>=0) {
- iconLeft.style.visibility = 'visible';
- iconLeft.onclick = function() { displayOriginalImage(imageGalleryIndex[j][prev], j+','+prev); }
- } else {
- iconLeft.style.visibility = 'hidden';
- }
-
- if(nextoffsetWidth) {
+ img.attr("width",offsetWidth-1);
+ img.attr("height",parseInt(offsetWidth/width*height,10));
}
- }
+ // 링크가 설정되어 있거나 onclick 이벤트가 부여되어 있으면 원본 보기를 하지 않음
+ if ( !img.parent("a").size() && !img.attr("onclick") ) {
+ // 스타일 설정
+ img.css("cursor", "pointer");
+
+ // 클릭하면 슬라이드쇼 시작
+ img.click(slideshow);
+ }
- // 원본 이미지를 추가
- var origObj = xGetElementById("forOriginalImage");
- if(origObj) foreObj.removeChild(origObj);
-
- origObj = null;
- origObj = xCreateElement("img");
- origObj.id = "forOriginalImage";
- origObj.style.border = "7px solid #ffffff";
- origObj.style.visibility = "hidden";
- origObj.style.cursor = "move";
- origObj.style.zIndex = 520;
- foreObj.appendChild(origObj);
-
- origObj.style.position = "relative";
- origObj.src = src;
-
- var objWidth = xWidth(origObj);
- var objHeight = xHeight(origObj);
-
- var posX = 0;
- var posY = 0;
-
- if(objWidth < foreWidth) posX = parseInt( (foreWidth - objWidth) / 2, 10);
- if(objHeight < foreHeight) posY = parseInt( (foreHeight - objHeight) / 2, 10);
-
- xLeft(origObj, posX);
- xTop(origObj, posY);
-
- origObj.style.visibility = "visible";
-
- var sel_list = xGetElementsByTagName("select");
- for (var i = 0; i < sel_list.length; ++i) sel_list[i].style.visibility = "hidden";
-
- xAddEventListener(origObj, "mousedown", origImageDragEnable);
- xAddEventListener(origObj, "dblclick", closeOriginalImage);
- xAddEventListener(iconClose, "mousedown", closeOriginalImage);
- xAddEventListener(window, "scroll", closeOriginalImage);
- xAddEventListener(window, "resize", closeOriginalImage);
- xAddEventListener(document, 'keydown',closeOriginalImage);
-}
-
-/**
- * @brief 원본 이미지 보여준 후 닫는 함수
- **/
-function closeOriginalImage(evt) {
- var bgObj = xGetElementById("forOriginalImageBGArea");
- var foreObj = xGetElementById("forOriginalImageArea");
- var origObj = xGetElementById("forOriginalImage");
- var iconClose = xGetElementById("forOriginalImageIconClose");
- var iconLeft = xGetElementById("forOriginalImageIconLeft");
- var iconRight = xGetElementById("forOriginalImageIconRight");
-
- var sel_list = xGetElementsByTagName("select");
- for (var i = 0; i < sel_list.length; ++i) sel_list[i].style.visibility = "visible";
-
- xRemoveEventListener(origObj, "mousedown", origImageDragEnable);
- xRemoveEventListener(origObj, "dblclick", closeOriginalImage);
- xRemoveEventListener(iconClose, "mousedown", closeOriginalImage);
- xRemoveEventListener(window, "scroll", closeOriginalImage);
- xRemoveEventListener(window, "resize", closeOriginalImage);
- xRemoveEventListener(document, 'keydown',closeOriginalImage);
-
- bgObj.style.visibility = "hidden";
- foreObj.style.visibility = "hidden";
- origObj.style.visibility = "hidden";
- iconClose.style.visibility = 'hidden';
- iconLeft.style.visibility = 'hidden';
- iconRight.style.visibility = 'hidden';
-}
-
-/**
- * @brief 원본 이미지 드래그
- **/
-var origDragManager = {obj:null, isDrag:false}
-function origImageDragEnable(evt) {
- var e = new xEvent(evt);
- var obj = e.target;
- if(obj.id != "forOriginalImage") return;
-
- obj.draggable = true;
- obj.startX = e.pageX;
- obj.startY = e.pageY;
-
- if(!origDragManager.isDrag) {
- origDragManager.isDrag = true;
- xAddEventListener(document, "mousemove", origImageDragMouseMove, false);
- }
-
- xAddEventListener(document, "mousedown", origImageDragMouseDown, false);
-}
-
-function origImageDrag(obj, px, py) {
- var x = px - obj.startX;
- var y = py - obj.startY;
-
- var origObj = xGetElementById("forOriginalImage");
- xLeft(origObj, xLeft(origObj)+x);
- xTop(origObj, xTop(origObj)+y);
-
- obj.startX = px;
- obj.startY = py;
-}
-
-function origImageDragMouseDown(evt) {
- var e = new xEvent(evt);
- var obj = e.target;
- if(obj.id != "forOriginalImage" || !obj.draggable) return;
-
- if(obj) {
- xPreventDefault(evt);
- obj.startX = e.pageX;
- obj.startY = e.pageY;
- origDragManager.obj = obj;
- xAddEventListener(document, 'mouseup', origImageDragMouseUp, false);
- origImageDrag(obj, e.pageX, e.pageY);
- }
-}
-
-function origImageDragMouseUp(evt) {
- if(origDragManager.obj) {
- xPreventDefault(evt);
- xRemoveEventListener(document, 'mouseup', origImageDragMouseUp, false);
- xRemoveEventListener(document, 'mousemove', origImageDragMouseMove, false);
- xRemoveEventListener(document, 'mousemdown', origImageDragMouseDown, false);
- origDragManager.obj.draggable = false;
- origDragManager.obj = null;
- origDragManager.isDrag = false;
- }
-}
-
-function origImageDragMouseMove(evt) {
- var e = new xEvent(evt);
- var obj = e.target;
- if(!obj) return;
- if(obj.id != "forOriginalImage") {
- xPreventDefault(evt);
- xRemoveEventListener(document, 'mouseup', origImageDragMouseUp, false);
- xRemoveEventListener(document, 'mousemove', origImageDragMouseMove, false);
- xRemoveEventListener(document, 'mousemdown', origImageDragMouseDown, false);
- origDragManager.obj.draggable = false;
- origDragManager.obj = null;
- origDragManager.isDrag = false;
- return;
- }
-
- xPreventDefault(evt);
- origDragManager.obj = obj;
- xAddEventListener(document, 'mouseup', origImageDragMouseUp, false);
- origImageDrag(obj, e.pageX, e.pageY);
-}
+ });
+});
+})(jQuery);
diff --git a/addons/resize_image/resize_image.addon.php b/addons/resize_image/resize_image.addon.php
index cb906ddad..dab03da71 100644
--- a/addons/resize_image/resize_image.addon.php
+++ b/addons/resize_image/resize_image.addon.php
@@ -7,7 +7,8 @@
* @brief 본문내 이미지 조절 애드온
**/
- if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC") {
+ if($called_position == 'after_module_proc' && Context::getResponseMethod()=="HTML") {
+ Context::loadJavascriptPlugin('ui');
Context::addJsFile('./addons/resize_image/js/resize_image.js',false);
}
?>
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 401f09575..5469475d6 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1203,8 +1203,8 @@
// 코드 변환
$content = preg_replace('/<(img|br)([^>\/]*)(\/>|>)/i','<$1$2 />', $content);
- // 주소/?mid등과 같은 index.php가 명시되지 않은 파일의 target 변경
- //$content = str_replace(Context::getRequestUri().'?',Context::getRequestUri().'index.php?',$content);
+ // templateHandler의 이미지 경로로 인하여 생기는 절대경로 이미지등의 경로 중복 처리
+ $content = preg_replace('/src=(["|\']?)http:\/\/([^ ]+)http:\/\//is','src=$1http://', $content);
return $content;
}
diff --git a/classes/db/DBFirebird.class.php b/classes/db/DBFirebird.class.php
index e5181f810..71283b9af 100644
--- a/classes/db/DBFirebird.class.php
+++ b/classes/db/DBFirebird.class.php
@@ -623,8 +623,12 @@
$type = $this->getColumnType($column_type,$name);
$pipe = $v['pipe'];
- $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
+ $value = $this->getConditionValue('"'.$name.'"', $value, $operation, $type, $column_type);
if(!$value) $value = $v['value'];
+
+ $name = $this->autoQuotes($name);
+ $value = $this->autoValueQuotes($value, $output);
+
$str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' ';
$sub_condition .= $str;
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 0d12fca41..ea8e7fdcb 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -161,97 +161,44 @@
}
/**
- * @brief 디버그 모드일 경우 디버기 메세지 출력
+ * @brief 디버그 모드일 경우 디버깅 메시지 출력
*
- * __DEBUG__가 1이상일 경우 각 부분의 실행시간등을 debugPrint 함수를 이용해서 출력\n
- * 개발시나 테스트시에 config/config.inc.php의 __DEBUG__를 세팅하고\n
- * tail -f ./files/_debug_message.php로 하여 console로 확인하면 편리함\n
+ * __DEBUG__ 값이 1 이상이면 __DEBUG_OUTPUT__ 값에 따라 메시지 출력.
+ * __DEBUG__를 세팅하고, __DEBUG_OUTPUT__ == 0 이면
+ * tail -f ./files/_debug_message.php로 하여 console로 확인하면 편리함
**/
function _debugOutput() {
if(!__DEBUG__) return;
$end = getMicroTime();
- if(__DEBUG_OUTPUT__ != 2 || (__DEBUG_OUTPUT__ == 2 && !version_compare(PHP_VERSION, '5.2.0', '>'))) {
- // debug string 작성 시작
- $buff = "\n\n** Debug at ".date('Y-m-d H:i:s')." ************************************************************\n";
-
- // Request/Response 정보 작성
- $buff .= "\n- Request/ Response info\n";
- $buff .= sprintf("\tRequest URI \t\t\t: %s:%s%s%s%s\n", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING']?'?':'', $_SERVER['QUERY_STRING']);
- $buff .= sprintf("\tRequest method \t\t\t: %s\n", $_SERVER['REQUEST_METHOD']);
- $buff .= sprintf("\tResponse method \t\t: %s\n", Context::getResponseMethod());
- $buff .= sprintf("\tResponse contents size\t\t: %d byte\n", $this->getContentSize());
-
- // DB 로그 작성
- if(__DEBUG__ > 1) {
- if($GLOBALS['__db_queries__']) {
- $buff .= "\n- DB Queries\n";
- $num = 0;
- foreach($GLOBALS['__db_queries__'] as $query) {
- $buff .= sprintf("\t%02d. %s (%0.6f sec)\n", ++$num, $query['query'], $query['elapsed_time']);
- if($query['result'] == 'Success') {
- $buff .= "\t Query Success\n";
- } else {
- $buff .= sprintf("\t Query $s : %d\n\t\t\t %s\n", $query['result'], $query['errno'], $query['errstr']);
- }
- }
- }
- $buff .= "\n- Elapsed time\n";
-
- if($GLOBALS['__db_elapsed_time__']) $buff .= sprintf("\tDB queries elapsed time\t\t: %0.5f sec\n", $GLOBALS['__db_elapsed_time__']);
- }
-
- // 기타 로그 작성
- if(__DEBUG__==3) {
- $buff .= sprintf("\tclass file load elapsed time \t: %0.5f sec\n", $GLOBALS['__elapsed_class_load__']);
- $buff .= sprintf("\tTemplate compile elapsed time\t: %0.5f sec (%d called)\n", $GLOBALS['__template_elapsed__'], $GLOBALS['__TemplateHandlerCalled__']);
- $buff .= sprintf("\tXmlParse compile elapsed time\t: %0.5f sec\n", $GLOBALS['__xmlparse_elapsed__']);
- $buff .= sprintf("\tPHP elapsed time \t\t: %0.5f sec\n", $end-__StartTime__-$GLOBALS['__template_elapsed__']-$GLOBALS['__xmlparse_elapsed__']-$GLOBALS['__db_elapsed_time__']-$GLOBALS['__elapsed_class_load__']);
-
- // 위젯 실행 시간 작성
- $buff .= sprintf("\n\tWidgets elapsed time \t\t: %0.5f sec", $GLOBALS['__widget_excute_elapsed__']);
-
- // 레이아웃 실행 시간
- $buff .= sprintf("\n\tLayout compile elapsed time \t: %0.5f sec", $GLOBALS['__layout_compile_elapsed__']);
-
- // 위젯, 에디터 컴포넌트 치환 시간
- $buff .= sprintf("\n\tTrans widget&editor elapsed time: %0.5f sec\n\n", $GLOBALS['__trans_widget_editor_elapsed__']);
- }
-
- // 전체 실행 시간 작성
- $buff .= sprintf("\tTotal elapsed time \t\t: %0.5f sec", $end-__StartTime__);
- }
-
- if(__DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML') {
- if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
- $buff = '허용되지 않은 IP 입니다. config/config.inc.php 파일의 __DEBUG_PROTECT_IP__ 상수 값을 자신의 IP로 변경하세요.';
- }
- return "";
- }
-
- if(__DEBUG_OUTPUT__==0) debugPrint($buff, false);
-
// Firebug 콘솔 출력
- if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '5.2.0', '>')) {
- debugPrint(
- array('Request / Response info >>> '.Context::getResponseMethod().' / '.$_SERVER['REQUEST_METHOD'],
- array(
- array('Request URI', 'Request method', 'Response method', 'Response contents size'),
- array(
- sprintf("%s:%s%s%s%s", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING']?'?':'', $_SERVER['QUERY_STRING']),
- $_SERVER['REQUEST_METHOD'],
- Context::getResponseMethod(),
- $this->getContentSize().' byte'
- )
- )
- ),
- 'TABLE'
- );
+ if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '5.2.0', '>=')) {
+ static $firephp;
+ if(!isset($firephp)) $firephp = FirePHP::getInstance(true);
- // 기타 로그 작성
- if(__DEBUG__ == 3 || __DEBUG__ == 1) {
- debugPrint(
+ if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
+ $firephp->fb('Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php', 'The IP address is not allowed.');
+ return;
+ }
+
+ // 전체 실행 시간 출력, Request/Response info 출력
+ if(__DEBUG__ & 2) {
+ $firephp->fb(
+ array('Request / Response info >>> '.$_SERVER['REQUEST_METHOD'].' / '.Context::getResponseMethod(),
+ array(
+ array('Request URI', 'Request method', 'Response method', 'Response contents size'),
+ array(
+ sprintf("%s:%s%s%s%s", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING']?'?':'', $_SERVER['QUERY_STRING']),
+ $_SERVER['REQUEST_METHOD'],
+ Context::getResponseMethod(),
+ $this->getContentSize().' byte'
+ )
+ )
+ ),
+ 'TABLE'
+ );
+ $firephp->fb(
array('Elapsed time >>> Total : '.sprintf('%0.5f sec', $end - __StartTime__),
array(array('DB queries', 'class file load', 'Template compile', 'XmlParse compile', 'PHP', 'Widgets', 'Trans widget&editor'),
array(
@@ -269,21 +216,95 @@
);
}
- // DB 쿼리 로그
- if(__DEBUG__ > 1) {
+ // DB 쿼리 내역 출력
+ if((__DEBUG__ & 4) && $GLOBALS['__db_queries__']) {
$queries_output = array(array('Query', 'Elapsed time', 'Result'));
foreach($GLOBALS['__db_queries__'] as $query) {
array_push($queries_output, array($query['query'], sprintf('%0.5f', $query['elapsed_time']), $query['result']));
}
- debugPrint(
- array('DB Queries >>> '.count($GLOBALS['__db_queries__']).' Queries, '.sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']), $queries_output),
+ $firephp->fb(
+ array(
+ 'DB Queries >>> '.count($GLOBALS['__db_queries__']).' Queries, '.sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
+ $queries_output
+ ),
'TABLE'
);
}
+
+ // 파일 및 HTML 주석으로 출력
+ } else {
+ // debug string 작성 시작
+ $buff = "** Debug at ".date('Y-m-d H:i:s').str_repeat('*', 60)."\n";
+
+ // 전체 실행 시간 출력, Request/Response info 출력
+ if(__DEBUG__ & 2) {
+ // Request/Response 정보 작성
+ $buff .= "\n- Request/ Response info\n";
+ $buff .= sprintf("\tRequest URI \t\t\t: %s:%s%s%s%s\n", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING']?'?':'', $_SERVER['QUERY_STRING']);
+ $buff .= sprintf("\tRequest method \t\t\t: %s\n", $_SERVER['REQUEST_METHOD']);
+ $buff .= sprintf("\tResponse method \t\t: %s\n", Context::getResponseMethod());
+ $buff .= sprintf("\tResponse contents size\t\t: %d byte\n", $this->getContentSize());
+
+ // 전체 실행 시간
+ $buff .= sprintf("\n- Total elapsed time : %0.5f sec\n", $end-__StartTime__);
+
+ $buff .= sprintf("\tclass file load elapsed time \t: %0.5f sec\n", $GLOBALS['__elapsed_class_load__']);
+ $buff .= sprintf("\tTemplate compile elapsed time\t: %0.5f sec (%d called)\n", $GLOBALS['__template_elapsed__'], $GLOBALS['__TemplateHandlerCalled__']);
+ $buff .= sprintf("\tXmlParse compile elapsed time\t: %0.5f sec\n", $GLOBALS['__xmlparse_elapsed__']);
+ $buff .= sprintf("\tPHP elapsed time \t\t: %0.5f sec\n", $end-__StartTime__-$GLOBALS['__template_elapsed__']-$GLOBALS['__xmlparse_elapsed__']-$GLOBALS['__db_elapsed_time__']-$GLOBALS['__elapsed_class_load__']);
+
+ // 위젯 실행 시간 작성
+ $buff .= sprintf("\n\tWidgets elapsed time \t\t: %0.5f sec", $GLOBALS['__widget_excute_elapsed__']);
+
+ // 레이아웃 실행 시간
+ $buff .= sprintf("\n\tLayout compile elapsed time \t: %0.5f sec", $GLOBALS['__layout_compile_elapsed__']);
+
+ // 위젯, 에디터 컴포넌트 치환 시간
+ $buff .= sprintf("\n\tTrans widget&editor elapsed time: %0.5f sec\n", $GLOBALS['__trans_widget_editor_elapsed__']);
+ }
+
+ // DB 로그 작성
+ if(__DEBUG__ & 4) {
+ if($GLOBALS['__db_queries__']) {
+ $buff .= sprintf("\n- DB Queries : %d Queries. %0.5f sec\n", count($GLOBALS['__db_queries__']), $GLOBALS['__db_elapsed_time__']);
+ $num = 0;
+
+ foreach($GLOBALS['__db_queries__'] as $query) {
+ $buff .= sprintf("\t%02d. %s\n\t\t%0.6f sec. ", ++$num, $query['query'], $query['elapsed_time']);
+ if($query['result'] == 'Success') {
+ $buff .= "Query Success\n";
+ } else {
+ $buff .= sprintf("Query $s : %d\n\t\t\t %s\n", $query['result'], $query['errno'], $query['errstr']);
+ }
+ }
+ }
+ }
+
+ // HTML 주석으로 출력
+ if(__DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML') {
+ if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
+ $buff = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
+ }
+ return "";
+ }
+
+ // 파일에 출력
+ if(__DEBUG_OUTPUT__ == 0) {
+ $debug_file = _XE_PATH_.'files/_debug_message.php';
+ $debug_output = sprintf("[%s %s:%d]\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($debug_output, true));
+
+ if($display_option === true) $debug_output = str_repeat('=', 40)."\n".$debug_output.str_repeat('-', 40);
+ $debug_output = "\n\n";
+
+ if(@!$fp = fopen($debug_file, 'a')) return;
+ fwrite($fp, $debug_output);
+ fclose($fp);
+ }
}
}
+
/**
* @brief RequestMethod에 맞춰 헤더 출력
***/
diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php
index 69d41c548..e0d4dd988 100644
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@@ -18,6 +18,39 @@
return $source;
}
+
+
+ /**
+ * @brief 특정 디렉토리를 복사
+ **/
+ function copyDir($source_dir, $target_dir, $filter=null,$type=null){
+ $source_dir = FileHandler::getRealPath($source_dir);
+ $target_dir = FileHandler::getRealPath($target_dir);
+ if(!is_dir($source_dir)) return false;
+
+ // target이 없을땐 생성
+ if(!file_exists($target_dir)) FileHandler::makeDir($target_dir);
+
+ if(substr($source_dir, -1) != '/') $source_dir .= '/';
+ if(substr($target_dir, -1) != '/') $target_dir .= '/';
+
+ $oDir = dir($source_dir);
+ while($file = $oDir->read()) {
+ if(substr($file,0,1)=='.') continue;
+ if($filter && preg_match($filter, $file)) continue;
+ if(is_dir($source_dir.$file)){
+ FileHandler::copyDir($source_dir.$file,$target_dir.$file,$type);
+ }else{
+ if($type == 'force'){
+ @unlink($target_dir.$file);
+ }else{
+ if(!file_exists($target_dir.$file)) @copy($source_dir.$file,$target_dir.$file);
+ }
+ }
+ }
+ }
+
+
/**
* @brief 파일의 내용을 읽어서 return
**/
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 0b2dc757f..4eef5fd67 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -331,6 +331,10 @@
$instance_name = sprintf("%s%s",$module,"API");
$class_file = sprintf('%s%s%s.api.php', _XE_PATH_, $class_path, $module);
break;
+ case 'wap' :
+ $instance_name = sprintf("%s%s",$module,"WAP");
+ $class_file = sprintf('%s%s%s.wap.php', _XE_PATH_, $class_path, $module);
+ break;
case 'class' :
$instance_name = $module;
$class_file = sprintf('%s%s%s.class.php', _XE_PATH_, $class_path, $module);
diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php
index 376279249..ba6d603eb 100644
--- a/classes/optimizer/Optimizer.class.php
+++ b/classes/optimizer/Optimizer.class.php
@@ -66,7 +66,13 @@
array_unshift($files, array('file' => $path.'/'.$filename, 'media' => 'all'));
- return $this->_getOptimizedRemoved($files);
+ $files = $this->_getOptimizedRemoved($files);
+ if(!count($files)) return $files;
+
+ foreach($files as $key => $val) {
+ if(substr($val['file'],0,2)=='./') $files[$key]['file'] = Context::getRequestUri().substr($val['file'],2);
+ }
+ return $files;
}
/**
@@ -208,10 +214,15 @@ if(!$cached) {
}
function _replaceCssPath($matches) {
+ static $abpath = null;
+ if(is_null($abpath)) {
+ $url_info = parse_url(Context::getRequestUri());
+ $abpath = $url_info['path'];
+ }
$path = str_replace(array('"',"'"),'',$matches[1]);
if(preg_match('/^http|^\//i', $path) || preg_match('/\.htc$/i',$path) ) return $matches[0];
- return 'url("../../../../'.$this->tmp_css_path.$path.'")';
+ return 'url("'.$abpath.$this->tmp_css_path.$path.'")';
}
}
diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index dd7f2e1a5..b00d16a0d 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -47,7 +47,7 @@
// tpl_file이 비어 있거나 해당 파일이 없으면 return
if(!$tpl_file || !file_exists(FileHandler::getRealPath($tpl_file))) return;
- $this->tpl_path = $tpl_path;
+ $this->tpl_path = preg_replace('/^\.\//','',$tpl_path);
$this->tpl_file = $tpl_file;
// compiled된(or 될) 파일이름을 구함
@@ -155,12 +155,11 @@
$str1 = $matches[0];
$str2 = $path = $matches[3];
- if(!preg_match('/^([a-z0-9\_\.])/i',$path)) return $str1;
+ if(substr($path,0,1)=='/') return $str1;
- $path = preg_replace('/^(\.\/|\/)/','',$path);
- $path = 'tpl_path?>'.$path;
- $output = str_replace($str2, $path, $str1);
- return $output;
+ if(substr($path,0,2)=='./') $path = substr($path,2);
+ $path = 'tpl_path; ?>'.$path;
+ return str_replace($str2, $path, $str1);
}
/**
diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php
index 4bd1aa7df..d5afaab30 100644
--- a/classes/widget/WidgetHandler.class.php
+++ b/classes/widget/WidgetHandler.class.php
@@ -112,7 +112,7 @@
* 관리자가 지정한 위젯의 style을 구함
**/
// 가끔 잘못된 코드인 background-image:url(none)이 들어 있을 수가 있는데 이럴 경우 none에 대한 url을 요청하므로 무조건 제거함
- $style = preg_replace('/background\-image: url\(none\)/is','', $args->style);
+ $style = preg_replace('/background\-image: url\((.+)(\/?)none\)/is','', $args->style);
// 내부 여백을 둔 것을 구해서 style문으로 미리 변경해 놓음
$widget_padding_left = $args->widget_padding_left;
@@ -132,7 +132,7 @@
case 'widgetContent' :
if($args->document_srl) {
$oDocument = $oDocumentModel->getDocument($args->document_srl);
- $body = $oDocument->getContent(false,false,false);
+ $body = $oDocument->getContent(false,false,false, false);
} else {
$body = base64_decode($args->body);
}
diff --git a/common/js/common.js b/common/js/common.js
index e0078c0c8..f8ac5ef19 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -472,7 +472,7 @@ function displayMultimedia(src, width, height, options) {
var codebase = "";
var html = "";
- if(/\.swf/i.test(src)) {
+ if(/\.swf$/i.test(src)) {
clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
codebase = "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0";
html = '';
- } else if(/\.flv/i.test(src)) {
- html = '';
- } else {
- html = '';
+ } else if(/\.flv$/i.test(src) || /\.mov$/i.test(src) || /\.moov$/i.test(src) || /\.m4v$/i.test(src)) {
+ html = '';
+ } else {
+ html = '
|
- {nl2br($val->description)}
+ {nl2br($val->description)}
|
diff --git a/modules/admin/lang/fr.lang.php b/modules/admin/lang/fr.lang.php
index 299c3f7e2..8ffdb5730 100644
--- a/modules/admin/lang/fr.lang.php
+++ b/modules/admin/lang/fr.lang.php
@@ -54,16 +54,16 @@
$lang->yesterday = "Yesterday";
$lang->today = "Today";
- $lang->cmd_lang_select = "언어선택";
- $lang->about_cmd_lang_select = "선택된 언어들만 서비스 됩니다";
- $lang->about_recompile_cache = "쓸모없어졌거나 잘못된 캐시파일들을 정리할 수 있습니다";
- $lang->use_ssl = "SSL 사용";
+ $lang->cmd_lang_select = "langue";
+ $lang->about_cmd_lang_select = "La langue choisie seulement sera servie";
+ $lang->about_recompile_cache = "Vous pouvez arranger les fichiers inutils ou les fichiers invalides d'antémémoire";
+ $lang->use_ssl = "Utiliser SSL";
$lang->ssl_options = array(
- 'none' => "사용안함",
- 'optional' => "선택적으로",
- 'always' => "항상사용"
+ 'none' => "Ne Pas utiliser",
+ 'optional' => "Optionnel",
+ 'always' => "Toujours"
);
- $lang->about_use_ssl = "선택적으로에서는 회원가입/정보수정등의 지정된 action에서 SSL을 사용하고 항상 사용은 모든 서비스가 SSL을 이용하게 됩니다.";
- $lang->server_ports = "서버포트지정";
- $lang->about_server_ports = "HTTP는 80, HTTPS는 443이외의 다른 포트를 사용하는 경우에 포트를 지정해주어야합니다.";
+ $lang->about_use_ssl = "Si l'on choisit 'Optionnel' , on utilise protocole SSL seulement dans quelques services comme inscription ou modification. Si l'on choisit 'Toujours', on utilise protocole SSL dans tous les services.";
+ $lang->server_ports = "déclarer le port de serveur";
+ $lang->about_server_ports = "Si l'on ne veut pas utiliser le port 80 pour HTTP mais un autre port, ou bien, si l'on ne veut pas utiliser le port 443 pour HTTPS mais un autre port, on doit déclarer les ports.";
?>
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index bffc33d95..b58ebac07 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -89,7 +89,7 @@ ul.localNavigation li.on a { background-position:right top; padding:8px 15px 5px
#popHeadder, #popHistoryHeadder { margin-bottom:10px;}
#popHeadder h1, #popHistoryHeadder h1 { background:url("../images/top_head_title_bg.gif") repeat-x left top; font-size:1em; border:1px solid #E3E3E2; padding:9px; color:#555555; margin:0; }
-#popBody, #popHistoryBody { width:600px; padding:10px; background:#ffffff;}
+#popBody, #popHistoryBody { width:600px; padding:10px; background:#ffffff; *zoom:1; position:relative;}
#popHistoryBody { height: 200px; overflow: auto; padding-right:0; }
#popFooter { width:620px; background:#70A2C6; border-top:1px solid #e8e8e7; padding:.5em 0 .5em 0; overflow:hidden; }
#popFooter .close { position:relative; left:50%; margin-left:-1em; float:left;}
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html
index be488a4d2..35b4d1349 100644
--- a/modules/admin/tpl/index.html
+++ b/modules/admin/tpl/index.html
@@ -61,7 +61,7 @@
{$val->version} |
- {$author->name}
+ {$author->name}
|
diff --git a/modules/board/board.api.php b/modules/board/board.api.php
index f717cfa27..ff594f2eb 100644
--- a/modules/board/board.api.php
+++ b/modules/board/board.api.php
@@ -43,6 +43,15 @@
$oModule->add('oDocument',$this->arrangeContent(Context::get('oDocument')));
}
+
+ /**
+ * @brief 컨텐츠의 파일 목록
+ **/
+ function dispBoardContentFileList(&$oModule) {
+ $oModule->add('file_list',$this->arrangeFile(Context::get('file_list')));
+ }
+
+
/**
* @brief 태그 목록
**/
@@ -50,8 +59,10 @@
$oModule->add('tag_list',Context::get('tag_list'));
}
-
- function dispBoardConentCommentList(&$oModule) {
+ /**
+ * @brief 컨텐츠의 코멘트 목록
+ **/
+ function dispBoardContentCommentList(&$oModule) {
$oModule->add('comment_list',$this->arrangeComment(Context::get('comment_list')));
}
@@ -83,5 +94,24 @@
}
return $output;
}
+
+
+ function arrangeFile($file_list) {
+ $output = array();
+ if(count($file_list)) {
+ foreach($file_list as $key => $val){
+ $item = null;
+ $item->sid = $val->sid;
+ $item->download_count = $val->download_count;
+ $item->source_filename = $val->source_filename;
+ $item->uploaded_filename = $val->uploaded_filename;
+ $item->file_size = $val->file_size;
+ $item->regdate = $val->regdate;
+ $item->download_url = $val->download_url;
+ $output[] = $item;
+ }
+ }
+ return $output;
+ }
}
?>
diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index c78217907..adaf4e49c 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -25,7 +25,8 @@
$obj->module_srl = $this->module_srl;
if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
- if(!$obj->title) $obj->title = cut_str(strip_tags($obj->content),20,'...');
+ settype($obj->title, "string");
+ if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
// 관리자가 아니라면 게시글 색상/굵기 제거
if(!$this->grant->manager) {
diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index ec7f1f964..644ea1dbc 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -67,8 +67,7 @@
/**
* 카테고리를 사용하는지 확인후 사용시 카테고리 목록을 구해와서 Context에 세팅
**/
- $this->dispBoardCatogoryList();
-
+ $this->dispBoardCategoryList();
/**
* 목록이 노출될때 같이 나오는 검색 옵션을 정리하여 스킨에서 쓸 수 있도록 context set
@@ -98,7 +97,7 @@
$this->setTemplateFile('list');
}
- function dispBoardCatogoryList(){
+ function dispBoardCategoryList(){
if($this->module_info->use_category=='Y') {
$oDocumentModel = &getModel('document');
Context::set('category_list', $oDocumentModel->getCategoryList($this->module_srl));
@@ -113,10 +112,8 @@
$document_srl = Context::get('document_srl');
$page = Context::get('page');
- // document model 객체를 생성
- $oDocumentModel = &getModel('document');
-
- // 혹시 선택된 문서가 있다면 해당 문서에 대한 객체를 생성함 (일단 빈객체를 만드는 것은 선택된 글이 없을때 스킨에서 object 오류발생하는 것을 막기 위함)
+ // 혹시 선택된 문서가 있다면 해당 문서에 대한 객체를 생성함
+ // (일단 빈객체를 만드는 것은 선택된 글이 없을때 스킨에서 object 오류발생하는 것을 막기 위함)
$oDocument = $oDocumentModel->getDocument(0);
// document_srl이 있다면 해당 글을 구해와서 $oDocument로 세팅
@@ -177,6 +174,14 @@
Context::set('oDocument', $oDocument);
}
+
+ function dispBoardContentFileList(){
+ $oDocumentModel = &getModel('document');
+ $document_srl = Context::get('document_srl');
+ $oDocument = $oDocumentModel->getDocument($document_srl);
+ Context::set('file_list',$oDocument->getUploadedFiles());
+ }
+
function dispBoardContentCommentList(){
$oDocumentModel = &getModel('document');
$document_srl = Context::get('document_srl');
@@ -202,6 +207,7 @@
function dispBoardContentList(){
$oDocumentModel = &getModel('document');
$args->module_srl = $this->module_srl; ///< 현재 모듈의 module_srl
+
// 목록을 구하기 위한 대상 모듈/ 페이지 수/ 목록 수/ 페이지 목록 수에 대한 옵션 설정
$args->page = Context::get('page');; ///< 페이지
$args->list_count = $this->list_count; ///< 한페이지에 보여줄 글 수
diff --git a/modules/board/board.wap.php b/modules/board/board.wap.php
new file mode 100644
index 000000000..1f96197ed
--- /dev/null
+++ b/modules/board/board.wap.php
@@ -0,0 +1,115 @@
+grant->list || $this->module_info->consultation == 'Y') return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+
+ // document model 객체 생성
+ $oDocumentModel = &getModel('document');
+
+ // 선택된 게시글이 있을 경우
+ $document_srl = Context::get('document_srl');
+ if($document_srl) {
+ $oDocument = $oDocumentModel->getDocument($document_srl);
+ if($oDocument->isExists()) {
+ // 권한 확인
+ if(!$this->grant->view) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+
+ // 글 제목 설정
+ Context::setBrowserTitle($oDocument->getTitleText());
+
+ // 댓글 보기 일 경우
+ if($this->act=='dispBoardContentCommentList') {
+
+ $oCommentModel = &getModel('comment');
+ $output = $oCommentModel->getCommentList($oDocument->document_srl, 0, false, $oDocument->getCommentCount());
+
+ $content = '';
+ if(count($output->data)) {
+ foreach($output->data as $key => $val){
+ $oComment = new commentItem();
+ $oComment->setAttribute($val);
+ if(!$oComment->isAccessible()) continue;
+ $content .= "".$oComment->getNickName()." (".$oComment->getRegdate("Y-m-d").")
\r\n".$oComment->getContent(false,false)."
\r\n";
+ }
+ }
+
+ // 내용 설정
+ $oMobile->setContent( $content );
+
+ // 상위 페이지를 목록으로 돌아가기로 지정
+ $oMobile->setUpperUrl( getUrl('act',''), Context::getLang('cmd_go_upper') );
+
+ // 댓글 보기가 아니면 글 보여줌
+ } else {
+
+ // 내용 지정 (태그를 모두 제거한 내용을 설정)
+ $content = strip_tags($oDocument->getContent(false,false,false));
+
+
+ // 내용 상단에 정보 출력 (댓글 보기 링크 포함)
+ $content = Context::getLang('replies').' : '.$oDocument->getCommentCount().'
'."\r\n".$content;
+ $content = ''.$oDocument->getNickName()." (".$oDocument->getRegdate("Y-m-d").")
\r\n".$content;
+
+ // 내용 설정
+ $oMobile->setContent( $content );
+
+ // 상위 페이지를 목록으로 돌아가기로 지정
+ $oMobile->setUpperUrl( getUrl('document_srl',''), Context::getLang('cmd_list') );
+
+ }
+
+ return;
+ }
+ }
+
+ // 게시글 목록
+ $args->module_srl = $this->module_srl;
+ $args->page = Context::get('page');;
+ $args->list_count = 9;
+ $args->sort_index = $this->module_info->order_target?$this->module_info->order_target:'list_order';
+ $args->order_type = $this->module_info->order_type?$this->module_info->order_type:'asc';
+ $output = $oDocumentModel->getDocumentList($args, $this->except_notice);
+ $document_list = $output->data;
+ $page_navigation = $output->page_navigation;
+
+ $childs = array();
+ if($document_list && count($document_list)) {
+ foreach($document_list as $key => $val) {
+ $href = getUrl('mid',$_GET['mid'],'document_srl',$val->document_srl);
+ $obj = null;
+ $obj['href'] = $val->getPermanentUrl();
+
+ $title = $val->getTitleText();
+ if($val->getCommentCount()) $title .= ' ['.$val->getCommentCount().']';
+ $obj['link'] = $obj['text'] = '['.$val->getNickName().'] '.$title;
+ $childs[] = $obj;
+ }
+ $oMobile->setChilds($childs);
+ }
+
+ $totalPage = $page_navigation->last_page;
+ $page = (int)Context::get('page');
+ if(!$page) $page = 1;
+
+ // next/prevUrl 지정
+ if($page>1) $oMobile->setPrevUrl(getUrl('mid',$_GET['mid'],'page',$page-1), sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $page-1, $totalPage));
+
+ if($page<$totalPage) $oMobile->setNextUrl(getUrl('mid',$_GET['mid'],'page',$page+1), sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $page+1, $totalPage));
+
+ $oMobile->mobilePage = $page;
+ $oMobile->totalPage = $totalPage;
+ }
+ }
+
+?>
diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml
index 65b1b6517..f51274914 100644
--- a/modules/board/conf/module.xml
+++ b/modules/board/conf/module.xml
@@ -86,7 +86,7 @@
-
+
diff --git a/modules/board/skins/xe_board/write_form.html b/modules/board/skins/xe_board/write_form.html
index c951736e5..cee49c1e6 100644
--- a/modules/board/skins/xe_board/write_form.html
+++ b/modules/board/skins/xe_board/write_form.html
@@ -110,11 +110,11 @@
+
-
diff --git a/modules/board/skins/xe_guestbook/write_form.html b/modules/board/skins/xe_guestbook/write_form.html
index 465767498..7668469dd 100644
--- a/modules/board/skins/xe_guestbook/write_form.html
+++ b/modules/board/skins/xe_guestbook/write_form.html
@@ -92,8 +92,12 @@
+
+
+
+
diff --git a/modules/board/tpl/category_info.html b/modules/board/tpl/category_info.html
index e679da5e1..faee29b33 100644
--- a/modules/board/tpl/category_info.html
+++ b/modules/board/tpl/category_info.html
@@ -22,7 +22,13 @@
{$lang->about_category_color}
|
-
+
+ {$lang->expand} |
+
+ expand=="Y")-->checked="checked" class="checkbox" />
+ {$lang->about_expand}
+ |
+
{$lang->category_group_srls} |
diff --git a/modules/board/tpl/skin_info.html b/modules/board/tpl/skin_info.html
index ad54348d1..36fede0b1 100644
--- a/modules/board/tpl/skin_info.html
+++ b/modules/board/tpl/skin_info.html
@@ -17,18 +17,20 @@
| {$lang->skin_author} |
- {$author->name} ({$author->homepage}, {$author->email_address})
+ {$author->name} ({$author->homepage}, {$author->email_address})
|
+
{$lang->homepage} |
{$skin_info->homepage} |
-
+
{$lang->date} |
{zdate($skin_info->date, 'Y-m-d')} |
+
{$lang->skin_license} |
@@ -36,13 +38,13 @@
{$skin_info->license_link}
-
|
-
+
+
{$lang->description} |
{nl2br(trim($skin_info->description))} |
-
+
diff --git a/modules/board/tpl/top_refresh.html b/modules/board/tpl/top_refresh.html
index 2f4983d1d..a739609df 100644
--- a/modules/board/tpl/top_refresh.html
+++ b/modules/board/tpl/top_refresh.html
@@ -1,3 +1,4 @@
-
diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index c1f863862..c867acf05 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -170,7 +170,7 @@
return htmlspecialchars($content);
}
- function getContent($add_popup_menu = true, $add_content_info = true) {
+ function getContent($add_popup_menu = true, $add_content_info = true, $add_xe_content_class = true) {
if($this->isSecret() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
$content = $this->get('content');
@@ -195,7 +195,7 @@
);
// 컨텐츠에 대한 조작이 필요하지 않더라도 xe_content라는 클래스명을 꼭 부여
} else {
- $content = sprintf('%s
', $content);
+ if($add_xe_content_class) $content = sprintf('%s
', $content);
}
return $content;
diff --git a/modules/counter/counter.controller.php b/modules/counter/counter.controller.php
index 9f30c1963..86f3654d4 100644
--- a/modules/counter/counter.controller.php
+++ b/modules/counter/counter.controller.php
@@ -68,9 +68,8 @@
* @brief pageview 등록
**/
function insertPageView() {
- $args->regdate = date("Ymd");
+ $args->regdate = '0, '.date('Ymd');
executeQuery('counter.updateCounterPageview', $args);
- executeQuery('counter.updateTotalCounterPageview');
}
/**
diff --git a/modules/counter/queries/updateCounterPageview.xml b/modules/counter/queries/updateCounterPageview.xml
index d4ec933b4..a950964c0 100644
--- a/modules/counter/queries/updateCounterPageview.xml
+++ b/modules/counter/queries/updateCounterPageview.xml
@@ -6,6 +6,6 @@
-
+
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index 71c66e3dd..0bc5357ee 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -112,58 +112,6 @@
$oModuleModel = &getModel('module');
- // 모듈 카테고리 목록을 구함
- $module_categories = $oModuleModel->getModuleCategories();
-
- // 모듈의 목록을 가져옴
- $site_module_info = Context::get('site_module_info');
- $args->site_srl = $site_module_info->site_srl;
- $module_list = $oModuleModel->getMidList($args);
-
- // 사이트 운영자가 아닌 경우
- if(!$oModuleModel->isSiteAdmin()) {
- $logged_info = Context::get('logged_info');
- $user_id = $logged_info->user_id;
- $group_list = $logged_info->group_list;
-
- if($logged_info->is_admin != 'Y') {
- foreach($module_list as $key => $val) {
- $info = $oModuleModel->arrangeModuleInfo($val);
-
- // 직접 최고 관리자로 지정이 안되어 있으면 그룹을 체크
- if(!in_array($user_id, $info->admin_id)) {
-
- $is_granted = false;
- $manager_group = $info->grants['manager'];
- if(count($group_list) && count($manager_group)) {
- foreach($group_list as $group_srl => $group_info) {
- if(in_array($group_srl, $manager_group)) {
- $is_granted = true;
- break;
- }
- }
- }
- if(!$is_granted) unset($module_list[$key]);
- }
- }
- }
- }
-
- // 게시판만 뽑자
- foreach($module_list as $module_srl => $module) {
- if($module->module != 'board') unset($module_list[$module_srl]);
- }
-
- // module_category와 module의 조합
- if($module_categories) {
- foreach($module_list as $module_srl => $module) {
- $module_categories[$module->module_category_srl]->list[$module_srl] = $module;
- }
- } else {
- $module_categories[0]->list = $module_list;
- }
-
-
// 모듈 카테고리 목록과 모듈 목록의 조합
if(count($module_list)>1) Context::set('module_list', $module_categories);
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index d6c2265be..53b3dca23 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -137,7 +137,8 @@
}
// 제목이 없으면 내용에서 추출
- if(!$obj->title) $obj->title = cut_str(strip_tags($obj->content),20,'...');
+ settype($obj->title, "string");
+ if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
// 내용에서 XE만의 태그를 삭제
$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
@@ -238,7 +239,8 @@
}
// 제목이 없으면 내용에서 추출
- if(!$obj->title) $obj->title = cut_str(strip_tags($obj->content),20,'...');
+ settype($obj->title, "string");
+ if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
// 내용에서 XE만의 태그를 삭제
$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 28120daca..13a56d4db 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -235,7 +235,7 @@
return htmlspecialchars($content);
}
- function getContent($add_popup_menu = true, $add_content_info = true, $resource_realpath = false) {
+ function getContent($add_popup_menu = true, $add_content_info = true, $resource_realpath = false, $add_xe_content_class = true) {
if(!$this->document_srl) return;
if($this->isSecret() && !$this->isGranted()) return Context::getLang('msg_is_secret');
@@ -271,7 +271,7 @@
);
// 컨텐츠에 대한 조작이 필요하지 않더라도 xe_content라는 클래스명을 꼭 부여
} else {
- $content = sprintf('%s
', $content);
+ if($add_xe_content_class) $content = sprintf('%s
', $content);
}
// resource_realpath가 true이면 내용내 이미지의 경로를 절대 경로로 변경
@@ -282,9 +282,21 @@
return $content;
}
+ /**
+ * 에디터 코드가 변환된 내용 반환
+ **/
+ function getTransContent($add_popup_menu = true, $add_content_info = true, $resource_realpath = false, $add_xe_content_class = true) {
+ $oContext = &Context::getInstance();
+
+ $content = $this->getContent($add_popup_menu, $add_content_info, $resource_realpath, $add_xe_content_class);
+ $content = $oContext->transContent($content);
+
+ return $content;
+ }
+
function getSummary($str_size = 50) {
- // 영문이나 숫자가 연결되어서 20개 이상으로 연결시에 강제 띄움 시도
- $content = preg_replace('/([a-z0-9\-\+:\/\.\~,\|\!\@\#\$\%\^\&\*\(\)\_\+]){20,}/is',"$0 ",$this->getContent(false,false));
+ // 영문이나 숫자가 연결되어서 20개 이상으로 연결시에 강제 띄움 시도 - {20,}으로 길이를 정하면, 20개 이상 문자열 맨 마지막에 스페이스를 추가할 뿐 원하는 의도는 달성되지 못함
+ $content = preg_replace('/([a-z0-9\+:\/\.\~,\|\!\@\#\$\%\^\&\*\(\)\_]){20}/is',"$0-",$this->getContent(false,false));
// 태그 제거
$content = preg_replace('!<([^>]*?)>!is','', $content);
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index bc1248588..dade66bc0 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -485,7 +485,8 @@
* @brief 특정 카테고리에 child가 있는지 체크
**/
function getCategoryChlidCount($category_srl) {
- $output = executeQuery('document.getChildCategoryCount');
+ $args->category_srl = $category_srl;
+ $output = executeQuery('document.getChildCategoryCount',$args);
if($output->data->count > 0) return true;
return false;
}
diff --git a/modules/document/tpl/checked_list.html b/modules/document/tpl/checked_list.html
index 3d3699b4c..8e53a9b2d 100644
--- a/modules/document/tpl/checked_list.html
+++ b/modules/document/tpl/checked_list.html
@@ -25,22 +25,12 @@
-
+
{$lang->move_target_module} |
-
+
+ {$lang->cmd_select}
|
diff --git a/modules/document/tpl/js/document_admin.js b/modules/document/tpl/js/document_admin.js
index 442f0a5ce..59f2ccd5f 100644
--- a/modules/document/tpl/js/document_admin.js
+++ b/modules/document/tpl/js/document_admin.js
@@ -27,10 +27,7 @@ function completeManageDocument(ret_obj) {
}
/* 선택된 모듈의 카테고리 목록을 가져오는 함수 */
-function doGetCategoryFromModule(obj) {
- if(!obj) return;
- var module_srl = obj.options[obj.selectedIndex].value;
-
+function doGetCategoryFromModule(module_srl) {
var params = new Array();
params['module_srl'] = module_srl;
@@ -85,3 +82,11 @@ function doCancelDeclare() {
function completeCancelDeclare(ret_obj) {
location.reload();
}
+
+function insertSelectedModule(id, module_srl, mid, browser_title) {
+ var obj= xGetElementById('_'+id);
+ var sObj = xGetElementById(id);
+ sObj.value = module_srl;
+ obj.value = browser_title+' ('+mid+')';
+ doGetCategoryFromModule(module_srl);
+}
diff --git a/modules/editor/components/image_link/image_link.class.php b/modules/editor/components/image_link/image_link.class.php
index 996dde41e..8f91428b8 100644
--- a/modules/editor/components/image_link/image_link.class.php
+++ b/modules/editor/components/image_link/image_link.class.php
@@ -49,6 +49,7 @@
$link_url = $xml_obj->attrs->link_url;
$open_window = $xml_obj->attrs->open_window;
$style = $xml_obj->attrs->style;
+ $margin = (int)$xml_obj->attrs->margin;
if(!$alt) {
$tmp_arr = explode('/',$src);
@@ -64,15 +65,26 @@
$attr_output[] = "alt=\"".$alt."\"";
$attr_output[] = "title=\"".$alt."\"";
}
+ if($margin) {
+ $style = trim(preg_replace('/margin[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i','', $style)).';';
+ $style = str_replace(';;',';',$style);
+ if($style == ';') $style = '';
+ $style .= ' margin:'.$margin.'px;';
+ }
if($align) $attr_output[] = "align=\"".$align."\"";
if(preg_match("/\.png$/i",$src)) $attr_output[] = "class=\"iePngFix\"";
if($width) $attr_output[] = 'width="'.$width.'"';
if($height) $attr_output[] = 'height="'.$height.'"';
- if($border) $attr_output[] = 'border="'.$border.'"';
+ if($border) {
+ $style = trim(preg_replace('/border[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i','', $style)).';';
+ $style = str_replace(';;',';',$style);
+ if($style == ';') $style = '';
+ $style .= ' border-style: solid; border-width:'.$border.'px;';
+ }
- $code = sprintf("![]()
", implode(" ",$attr_output), $style);
+ $code = sprintf("![]()
", implode(' ',$attr_output), $style);
if($link_url) {
if($open_window =='Y') $code = sprintf('%s', $link_url, $code);
diff --git a/modules/editor/components/image_link/lang/en.lang.php b/modules/editor/components/image_link/lang/en.lang.php
index ecc125a8f..568914d1d 100644
--- a/modules/editor/components/image_link/lang/en.lang.php
+++ b/modules/editor/components/image_link/lang/en.lang.php
@@ -15,6 +15,7 @@
$lang->image_align_right = "Right of Article";
$lang->image_border = "Border Thickness";
$lang->urllink_url = "URL";
+ $lang->image_margin = 'Image Margin';
$lang->about_url_link_open_window = "Make the link to open as a new window";
$lang->cmd_get_scale = "Get Image Size";
diff --git a/modules/editor/components/image_link/lang/es.lang.php b/modules/editor/components/image_link/lang/es.lang.php
index 65b2606e2..221d794a0 100644
--- a/modules/editor/components/image_link/lang/es.lang.php
+++ b/modules/editor/components/image_link/lang/es.lang.php
@@ -15,6 +15,7 @@
$lang->image_align_right = "Derecho de articulo";
$lang->image_border = "Grosor de Fronteras";
$lang->urllink_url = "URL";
+ $lang->image_margin = 'Image Margin';
$lang->about_url_link_open_window = "Hacer el vinculo para abrir una nueva ventana";
$lang->cmd_get_scale = "Obtener tamano de la imagen";
diff --git a/modules/editor/components/image_link/lang/jp.lang.php b/modules/editor/components/image_link/lang/jp.lang.php
index 88aa8ac88..fe87b5f59 100644
--- a/modules/editor/components/image_link/lang/jp.lang.php
+++ b/modules/editor/components/image_link/lang/jp.lang.php
@@ -14,9 +14,10 @@
$lang->image_align_middle = "中央揃え";
$lang->image_align_right = "右揃え";
$lang->image_border = "ボーダー";
+ $lang->image_margin = '外側の空白(Margin)';
$lang->urllink_open_window = "新しいウィンドウで開く";
- $lang->about_url_link_open_window = "チェックすると、リンクをクリックした時に新しいウィンドウで開きます。";
+ $lang->about_url_link_open_window = "チェックすると、リンクをクリックする際、新しいウィンドウで開きます。";
- $lang->cmd_get_scale = "イメージサイズ表示";
+ $lang->cmd_get_scale = "イメージサイズを計算";
?>
diff --git a/modules/editor/components/image_link/lang/ko.lang.php b/modules/editor/components/image_link/lang/ko.lang.php
index d8f9bfbbe..20eeb8d87 100644
--- a/modules/editor/components/image_link/lang/ko.lang.php
+++ b/modules/editor/components/image_link/lang/ko.lang.php
@@ -5,18 +5,19 @@
* @brief 위지윅에디터(editor) 모듈 > 이미지링크(image_link) 컴포넌트의 언어팩
**/
- $lang->image_url = "이미지 경로";
- $lang->image_alt = "설명 입력";
- $lang->image_scale = "이미지크기";
- $lang->image_align = "정렬 방법 ";
- $lang->image_align_normal = "한 문단을 차지";
- $lang->image_align_left = "글의 왼쪽으로";
- $lang->image_align_middle = "가운데";
- $lang->image_align_right = "글의 우측으로";
- $lang->image_border = "경계선 두께";
+ $lang->image_url = '이미지 경로';
+ $lang->image_alt = '설명 입력';
+ $lang->image_scale = '이미지크기';
+ $lang->image_align = '정렬 방법';
+ $lang->image_align_normal = '한 문단을 차지';
+ $lang->image_align_left = '글의 왼쪽으로';
+ $lang->image_align_middle = '가운데';
+ $lang->image_align_right = '글의 우측으로';
+ $lang->image_border = '경계선 두께';
+ $lang->image_margin = '바깥 여백';
- $lang->urllink_open_window = "새창열기";
- $lang->about_url_link_open_window = "선택하시면 링크 선택시 새창으로 열립니다";
+ $lang->urllink_open_window = '새창열기';
+ $lang->about_url_link_open_window = '선택하시면 링크 선택시 새창으로 열립니다';
- $lang->cmd_get_scale = "크기 구하기";
+ $lang->cmd_get_scale = '크기 구하기';
?>
diff --git a/modules/editor/components/image_link/lang/ru.lang.php b/modules/editor/components/image_link/lang/ru.lang.php
index 1d5ac7536..26424e0e1 100644
--- a/modules/editor/components/image_link/lang/ru.lang.php
+++ b/modules/editor/components/image_link/lang/ru.lang.php
@@ -15,6 +15,7 @@
$lang->image_align_right = "Право";
$lang->image_border = "Толщина рамки";
$lang->urllink_url = "URL";
+ $lang->image_margin = 'Image Margin';
$lang->about_url_link_open_window = "Создайте ссылку для открытия в новом окне";
$lang->cmd_get_scale = "Получить размер изображения";
diff --git a/modules/editor/components/image_link/lang/zh-CN.lang.php b/modules/editor/components/image_link/lang/zh-CN.lang.php
index 72163ad03..c936ab8d9 100644
--- a/modules/editor/components/image_link/lang/zh-CN.lang.php
+++ b/modules/editor/components/image_link/lang/zh-CN.lang.php
@@ -15,6 +15,7 @@
$lang->image_align_right = "内容右侧";
$lang->image_border = "边框粗细";
$lang->urllink_url = "URL";
+ $lang->image_margin = 'Image Margin';
$lang->about_url_link_open_window = "将在新窗口中打开链接。";
$lang->cmd_get_scale = "获得图片大小";
diff --git a/modules/editor/components/image_link/lang/zh-TW.lang.php b/modules/editor/components/image_link/lang/zh-TW.lang.php
index 70bd13441..355cd395f 100644
--- a/modules/editor/components/image_link/lang/zh-TW.lang.php
+++ b/modules/editor/components/image_link/lang/zh-TW.lang.php
@@ -15,6 +15,7 @@
$lang->image_align_right = "靠右";
$lang->image_border = "邊框粗細";
$lang->urllink_url = "網址";
+ $lang->image_margin = 'Image Margin';
$lang->about_url_link_open_window = "開啟連結於新視窗。";
$lang->cmd_get_scale = "取得圖片大小";
diff --git a/modules/editor/components/image_link/tpl/popup.html b/modules/editor/components/image_link/tpl/popup.html
index 6890d935c..85d3cf5f4 100644
--- a/modules/editor/components/image_link/tpl/popup.html
+++ b/modules/editor/components/image_link/tpl/popup.html
@@ -79,6 +79,10 @@
{$lang->image_border} |
px |
+
+ {$lang->image_margin} |
+ px |
+
diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html
index badc09176..c76b9cef0 100644
--- a/modules/module/tpl/module_list.html
+++ b/modules/module/tpl/module_list.html
@@ -24,7 +24,7 @@
{$val->version} |
- {$author->name}
+ {$author->name}
|
diff --git a/modules/module/tpl/module_selector.html b/modules/module/tpl/module_selector.html
new file mode 100644
index 000000000..8f5e459fd
--- /dev/null
+++ b/modules/module/tpl/module_selector.html
@@ -0,0 +1,80 @@
+
+
+
+ {$lang->module_selector}
+
+
+
+
+
+
diff --git a/modules/module/tpl/skin_info.html b/modules/module/tpl/skin_info.html
index 41f90128d..9a99722f6 100644
--- a/modules/module/tpl/skin_info.html
+++ b/modules/module/tpl/skin_info.html
@@ -15,7 +15,7 @@
| |
- {$author->name} ({$author->homepage}, {$author->email_address})
+ {$author->name} ({$author->homepage}, {$author->email_address})
|
@@ -40,10 +40,12 @@
+
| {$lang->description} |
{nl2br(trim($skin_info->description))} |
+
diff --git a/modules/opage/opage.controller.php b/modules/opage/opage.controller.php
index 177b663fb..b6599c748 100644
--- a/modules/opage/opage.controller.php
+++ b/modules/opage/opage.controller.php
@@ -71,11 +71,11 @@
if(substr($path,-1)!='/') $path.='/';
$this->target_path = $path;
- // element의 속성중 value에 " 로 안 묶여 있는 것을 검사하여 묶어줌
- $content = preg_replace_callback('/([^=^"^ ]*)=([^ ^>]*)/i', fixQuotation, $content);
+ // element의 속성중 value에 " 로 안 묶여 있는 것을 검사하여 묶어줌 - 에러날 수 있음 ex) window.open('*','*','width=320, height=240 ,left=100,top=100')
+ //$content = preg_replace_callback('/([^=^"^ ]*)=([^ ^>]*)/i', fixQuotation, $content);
// img, input, a, link등의 href, src값 변경
- $content = preg_replace_callback('!(script|link|a|img|input)([^>]*)(href|src)=[\'"](.*?)[\'"]!is', array($this, '_replaceSrc'), $content);
+ $content = preg_replace_callback('!<(script|link|a|img|input|iframe)([^>]*)(href|src)=[\'"](.*?)[\'"]!is', array($this, '_replaceSrc'), $content);
// background:url의 값 변경
$content = preg_replace_callback('!url\((.*?)\)!is', array($this, '_replaceBackgroundUrl'), $content);
@@ -90,7 +90,7 @@
if(substr($href,0,1)=='/') $href = substr($href,1);
$href = $this->target_path.$href;
- $buff = sprintf('%s%s%s="%s"', $matches[1], $matches[2], $matches[3], $href);
+ $buff = sprintf('<%s%s%s="%s"', $matches[1], $matches[2], $matches[3], $href);
return $buff;
}
diff --git a/modules/opage/opage.view.php b/modules/opage/opage.view.php
index 72114bcaa..2addbd7bc 100644
--- a/modules/opage/opage.view.php
+++ b/modules/opage/opage.view.php
@@ -35,7 +35,7 @@
$cache_file = sprintf("./files/cache/opage/%d.cache.php", $module_info->module_srl);
// http 인지 내부 파일인지 점검
- if(preg_match("/^http:\/\//i",$path)) $content = $this->getHtmlPage($path, $caching_interval, $cache_file);
+ if(preg_match("/^([a-z]+):\/\//i",$path)) $content = $this->getHtmlPage($path, $caching_interval, $cache_file);
else $content = $this->executeFile($path, $caching_interval, $cache_file);
Context::set('opage_content', $content);
diff --git a/modules/page/page.view.php b/modules/page/page.view.php
index 4c2cfe99a..835f3d48e 100644
--- a/modules/page/page.view.php
+++ b/modules/page/page.view.php
@@ -34,6 +34,5 @@
$this->setTemplateFile('content');
}
-
}
?>
diff --git a/modules/page/page.wap.php b/modules/page/page.wap.php
new file mode 100644
index 000000000..ae3096b90
--- /dev/null
+++ b/modules/page/page.wap.php
@@ -0,0 +1,24 @@
+grant->view) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+
+ // 위젯의 내용을 추출/ 정리해서 보여줌
+ $oMobile->setContent( Context::transContent($this->module_info->content) );
+ }
+
+ }
+?>
diff --git a/modules/planet/planet.controller.php b/modules/planet/planet.controller.php
index 22715aa5d..0de007c8a 100644
--- a/modules/planet/planet.controller.php
+++ b/modules/planet/planet.controller.php
@@ -126,7 +126,8 @@
$obj->content = str_replace(array('<','>'),array('<','>'),$obj->content);
$obj->content = str_replace('...', '…', $obj->content);
$obj->content = str_replace('--', '—', $obj->content);
- $obj->content = preg_replace('/"([^"]*)":(http|ftp|https|mms)([^ ]+)/is','$1$4', $obj->content);
+ $obj->content = preg_replace('/"([^"]+)":([0-9]+)/i', '$1', $obj->content);
+ $obj->content = preg_replace('/"([^"]+)":(http|ftp|https|mms)([^ ]+)/is','$1$4', $obj->content);
$oDocumentController = &getController('document');
$output = $oDocumentController->insertDocument($obj,$manual_inserted);
if(!$output->toBool()) return $output;
diff --git a/modules/planet/planet.view.php b/modules/planet/planet.view.php
index cdfa77069..45a145932 100644
--- a/modules/planet/planet.view.php
+++ b/modules/planet/planet.view.php
@@ -12,13 +12,14 @@
**/
function init() {
- if(!preg_match('/planet/i', $this->act)) return;
+ if(!preg_match('/planet/i', $this->act) && !in_array($this->act, array('favorite','countContentTagSearch','dispReplyList'))) return;
+
/**
* @brief 플래닛 모듈의 기본 설정은 view에서는 언제든지 사용하도록 load하여 Context setting
**/
$oPlanetModel = &getModel('planet');
Context::set('config',$this->config = $oPlanetModel->getPlanetConfig());
- $this->module_info->layout_srl = $this->config->layout_srl;
+ $this->module_info->layout_srl = $this->config->layout_srl;
/**
* 스킨이 없으면 플래닛 기본 설정의 스킨으로 설정
diff --git a/modules/planet/skins/xe_planet/content_list.html b/modules/planet/skins/xe_planet/content_list.html
index 03e3aec1f..4f0f2b231 100644
--- a/modules/planet/skins/xe_planet/content_list.html
+++ b/modules/planet/skins/xe_planet/content_list.html
@@ -29,7 +29,7 @@
{@ $regdate = $item->get('regdate') }
-
{getTimeGap($item->get('regdate'), sprintf('y/m/d a H%s i%s', $lang->unit_hour,$lang->unit_min))}
+
{getTimeGap($item->get('regdate'), sprintf('y/m/d a H%s i%s', $lang->unit_hour,$lang->unit_min))}
- TAG
@@ -104,6 +104,11 @@
diff --git a/modules/planet/skins/xe_planet/css/default.css b/modules/planet/skins/xe_planet/css/default.css
index ca504123d..7443c53e7 100644
--- a/modules/planet/skins/xe_planet/css/default.css
+++ b/modules/planet/skins/xe_planet/css/default.css
@@ -1,15 +1,7 @@
@charset "utf-8";
/* NHN > UIT Center > Open UI Platform Team > Jeong Chan Myeong(dece24@nhncorp.com) */
-/* xe layer */
-#waitingforserverresponse { border:2px solid #000000; font-weight:bold; color:#BBBBBB; padding: 7px 5px 5px 25px; background-color:#222222; top:40px; left:40px; position:absolute; z-index:100; visibility:hidden; }
-#popup_menu_area { position:absolute; left:0px; top:0px; z-index:1003; visibility:hidden; border:2px solid #D9D9D9; background-color:#FFFFFF; padding:0; }
-#popup_menu_area .box { border:1px solid #CACACA; background-color:#FFFFFF; padding:7px; }
-#popup_menu_area .item { color:#333333; cursor:pointer; margin:0; padding:3px 0 3px 0; white-space:nowrap; }
-#popup_menu_area .item_on { color:#333333; font-weight:bold; margin:0; cursor:pointer; padding:3px 0 3px 0; letter-spacing:-1px; white-space:nowrap;}
-
/* Reset */
-body{ margin:35px 30px; font-family:Sans-serif;}
img, fieldset, button{border:0;}
fieldset{ padding:0;}
hr, button img{display:none;}
@@ -27,68 +19,61 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
.blind, legend {position:absolute; top:0; left:0; width:0; height:0; overflow:hidden; visibility:hidden; font-size:0 !important; line-height:0;}
/* Layout */
+#planet {font-family:Sans-serif; margin:0; padding:0; }
#container {}
-#header{ position:relative; z-index:30; clear:both; margin:0 0 20px 0;}
-#header *{ margin:0; padding:0;}
-#header li{ list-style:none;}
-#body{ clear:both; z-index:20;}
-.nTop #navigation{ right:0; top:0 !important; z-index:100; }
-.nTop #navigation .gnb ul{ margin:0;}
-.nTop #navigation li{ list-style:none;}
-.buttonArea{ text-align:center;}
-.languageSelect { position:absolute; right:0; top:-30px; }
-.languageSelect select{ font-size:12px;}
+#planetHeader{ z-index:30; clear:both; margin:0 0 15px 0; overflow:hidden; *zoom:1;}
+#planetHeader *{ margin:0; padding:0;}
+#planetHeader li{ list-style:none;}
+#planetBody{ clear:both; z-index:20;}
/* Heading */
-h1 { position:relative; top:-10px; white-space:nowrap; font-family:"Malgun Gothic", AppleGothic, Dotum, Sans-serif;}
-h1, x:-moz-any-link{ top:0;}
-h1, x:-moz-any-link, x:default{ top:-10px;}
-h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-decoration:none !important;}
+#planetHeader h1 { white-space:nowrap; margin:0; padding:0;}
+#planetHeader h1 a { font-weight:bold; font-size:26px; color:#000; text-decoration:none !important;}
/* Time Navigation */
-.timeNav{ font:11px Dotum, Tahoma; white-space:nowrap; color:#999;}
+.timeNav{ font:11px Dotum, Tahoma; white-space:nowrap; color:#999; float:left;}
.timeNav *{ color:#000;}
.timeNav strong{ font-family:Arial; font-size:18px;}
.timeNav em{ font-style:normal; font-weight:bold; font-size:18px; font-family:"Malgun Gothic", AppleGothic, Dotum, Tahoma, Sans-serif;}
.timeNav .prev,
-.timeNav .next{ display:inline-block; font-size:18px; font-family:Arial; font-weight:bold; color:#000; padding:0 5px !important; text-decoration:none !important;}
+.timeNav .next { display:inline-block; font-size:18px; font-family:Arial; font-weight:bold; color:#000; padding:0 5px !important; text-decoration:none !important;}
+.timeNav span.prev,
+.timeNav span.next { color:#AAA; }
+
+#navigation{ float:right; z-index:100; }
+#navigation .gnb { clear:both; margin:0;}
+#navigation .gnb ul{ margin:0;}
+#navigation li{ list-style:none;}
+.buttonArea{ text-align:center;}
+
/* Footer */
-#footer{margin:0; clear:both; text-align:center; padding:30px 0;}
-#footer *{margin:0; padding:0; color:#444; list-style:none; font:9px Verdana; line-height:normal;}
-#footer a{text-decoration:none; color:#444;}
-#footer a:visited{text-decoration:none; color:#666;}
-#footer a:hover{text-decoration:underline;}
-#footer address a{font-weight:bold; font-family:Tahoma; color:#00535d;}
+#planetFooter{margin:0; clear:both; text-align:center; padding:30px 0;}
+#planetFooter *{margin:0; padding:0; color:#444; list-style:none; font:9px Verdana; line-height:normal;}
+#planetFooter a{text-decoration:none; color:#444;}
+#planetFooter a:visited{text-decoration:none; color:#666;}
+#planetFooter a:hover{text-decoration:underline;}
+#planetFooter address a{font-weight:bold; font-family:Tahoma; color:#00535d;}
/* ---------- Navigation ---------- */
/* Search */
-#header .search{ position:relative; top:2px; float:right; margin:0; padding:0; white-space:nowrap; text-align:right; *zoom:1;}
-#header .search .inputText{ padding:4px 5px 2px 5px; height:21px; width:160px; border:1px solid #e7e7e7; vertical-align:top; font:bold 14px AppleGothic, Dotum, Gulim, Sans-serif;}
-#header .search .inputText.focus{ border:3px solid #4ba300; height:17px; width:156px;}
-#header .search .button{ top:1px;}
-#header .search .button button{ padding:0 10px 0 8px; font-family:Dotum;}
-#header .search .suggestion{ position:absolute; top:3px; left:174px; /* border:1px solid; */}
-#header .search .suggestion .autoComplete{ position:absolute; top:0; left:0; width:23px; height:23px; background:#fff url(../images/buttonAutoComplete.gif) no-repeat center -10px;}
-#header .search .suggestion ul.recommendation{ display:none; position:absolute; top:26px; left:-174px; width:198px; border:1px solid #e7e7e7; border-top:none; background:#fff;}
-#header .search .suggestion li button{ width:100%; text-align:left; padding:5px 4px 2px 4px; font:.75em AppleGothic, Gulim, Dotum, Sans-serif;}
-#header .search .suggestion li button:hover,
-#header .search .suggestion li button:active,
-#header .search .suggestion li button:focus{ background:#eee;}
-#header .search .suggestion.open .autoComplete{ background-position:center 10px;}
-#header .search .suggestion.open ul.recommendation{ display:block;}
+#planetHeader .search{ clear:both; padding:0; white-space:nowrap; text-align:right; *zoom:1; margin-right:2px; float:right;}
+#planetHeader .search .inputText{ padding:4px 0 0 4px; height:17px; width:160px; border:1px solid #e7e7e7; vertical-align:top; font:12px AppleGothic, Dotum, Gulim, Sans-serif;}
+#planetHeader .search .inputText.focus{padding:3px 0 1px 4px; border:3px solid #4ba300; height:13px; width:156px;}
+#planetHeader .search .button{ *top:1px;}
+#planetHeader .search .button button{ padding:0 10px 0 8px; font-family:Dotum;}
/* GNB */
-#header .gnb{ position:relative; float:right; margin-left:20px; }
-#header .gnb ul{ margin:0; padding:0; position:relative; float:left; overflow:hidden;}
-#header .gnb ul li{ position:relative; float:left;}
-#header .gnb ul li a{ position:relative; display:block; float:left; background:url(../images/buttonGnb.gif) no-repeat center top; padding:11px 25px 11px 25px; font:12px AppleGothic, Dotum, Gulim, Sans-serif; color:#fff !important; text-decoration:none !important; letter-spacing:-1px; white-space:nowrap;}
-#header .gnb ul li.active a{ opacity:0.7; filter:alpha(opacity=70); font-weight:bold;}
-#header .gnb ul li a:hover,
-#header .gnb ul li a:active,
-#header .gnb ul li a:focus{ opacity:0.9; filter:alpha(opacity=90);}
-#header .gnb ul li.first a{ background-position:left top;}
-#header .gnb ul li.last a{ background-position:right top;}
+#planetHeader .gnb{ position:relative; float:right; margin-left:20px; margin-bottom:5px; }
+#planetHeader .gnb ul{ margin:0; padding:0; position:relative; float:left; overflow:hidden;}
+#planetHeader .gnb ul li{ position:relative; float:left;}
+#planetHeader .gnb ul li a{ position:relative; display:block; float:left; background:url(../images/buttonGnb.gif) no-repeat center top; padding:11px 25px 11px 25px; font:12px AppleGothic, Dotum, Gulim, Sans-serif; color:#fff !important; text-decoration:none !important; letter-spacing:-1px; white-space:nowrap;}
+#planetHeader .gnb ul li.active a{ opacity:0.7; filter:alpha(opacity=70); font-weight:bold;}
+#planetHeader .gnb ul li a:hover,
+#planetHeader .gnb ul li a:active,
+#planetHeader .gnb ul li a:focus{ opacity:0.9; filter:alpha(opacity=90);}
+#planetHeader .gnb ul li.first a{ background-position:left top;}
+#planetHeader .gnb ul li.last a{ background-position:right top;}
/* ---------- Content ---------- */
@@ -151,7 +136,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
/* Personal Header */
.personalHeader{ position:relative; height:90px; background:url(../images/boxTryPlanet.gif) repeat-x 0 0; margin-bottom:15px;}
.personalHeader *{ margin:0; padding:0; font-family:NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif;}
-.personalHeader h2{ position:absolute; top:15px; left:30px; padding-top:15px; font-size:2em; _zoom:1; padding-left:30px; background:url(../images/bgPerson.png) no-repeat; _behavior:url(./common/js/iePngFix.htc); }
+.personalHeader h2{ position:absolute; top:15px; left:30px; padding-top:15px; font-size:24px; _zoom:1; padding-left:30px; background:url(../images/bgPerson.png) no-repeat; _behavior:url(./common/js/iePngFix.htc); }
.personalHeader p{ position:absolute; top:46px; left:220px;}
.personalHeader .leftCap,
.personalHeader .rightCap{ position:absolute; display:block; top:0; width:5px; height:90px; overflow:hidden; background:url(../images/boxTryPlanet.gif) no-repeat; white-space:nowrap;}
@@ -162,7 +147,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.searchHeader{ position:relative; height:90px; background:url(../images/boxTryPlanet.gif) repeat-x 0 0; margin-bottom:30px;}
.searchHeader *{ margin:0; padding:0;}
.searchHeader p{ position:absolute; top:27px; margin-left:80px; font-family:NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#50606b;}
-.searchHeader p strong{ font:bold 1.5em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif;}
+.searchHeader p strong{ font:bold 18px NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif;}
.searchHeader .leftCap,
.searchHeader .rightCap{ position:absolute; display:block; top:0; width:5px; height:90px; overflow:hidden; background:url(../images/boxTryPlanet.gif) no-repeat; white-space:nowrap;}
.searchHeader .leftCap{ left:0; background-position:left bottom;}
@@ -186,7 +171,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.myInfo .bl{ bottom:-1px; left:-1px; background-position:0 -4px;}
.myInfo .br{ bottom:-1px; right:-1px; background-position:-4px -4px;}
.myInfo button{ width:90px; height:60px; position:absolute; top:90px; left:50%; margin-left:80px; background:url(../images/buttonLogin.gif) no-repeat;}
-.myInfo button span{ position:relative; display:block; *padding-top:15px; visibility:visible; width:auto; height:auto; text-align:center; font:bold 1.2em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#fff;}
+.myInfo button span{ position:relative; display:block; *padding-top:15px; visibility:visible; width:auto; height:auto; text-align:center; font:bold 14px NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#fff;}
/* Tag Cloud */
.tagCloud{ display:none; padding:20px 20px 30px 20px; margin-bottom:15px; position:relative; border:1px solid #e9e9e9; *zoom:1;}
@@ -236,7 +221,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.commentList .tagChoiceAfter{ display:none; position:absolute; top:45px; left:50%; width:289px; height:121px; text-align:center; margin-left:-145px;}
.commentList .tagChoiceAfter.alert{ display:block;}
-.commentList .tagChoiceAfter p{ position:absolute; top:0; left:0; width:289px; height:94px; _height /**/:121px; font-size:.75em; color:#fff; padding:37px 0 0 0; background:url(../images/boxTagChoice.png) no-repeat; _behavior:url(./common/js/iePngFix.htc);}
+.commentList .tagChoiceAfter p{ position:absolute; top:0; left:0; width:289px; height:94px; _height /**/:121px; font-size:12px; color:#fff; padding:37px 0 0 0; background:url(../images/boxTagChoice.png) no-repeat; _behavior:url(./common/js/iePngFix.htc);}
.commentList .tagChoiceAfter button,
.commentList .tagChoiceAfter a{ position:relative; display:inline-block; top:60px; font-size:12px; color:#fff; text-decoration:none; vertical-align:top; cursor:pointer; _cursor /**/:hand;}
.commentList .tagChoiceAfter button{ width:45px; height:23px; text-align:center; background:url(../images/buttonFixedBlack45.png) no-repeat; _behavior:url(./common/js/iePngFix.htc);}
@@ -251,41 +236,42 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.commentBody{ position:relative; margin:10px 0; border:1px solid #d7dfe2; background:#fff; *zoom:1; clear:both;}
.commentBody .comment{ position:relative; margin:0 15px; padding:15px 0 15px 0; clear:both; *zoom:1;}
.commentBody .comment:after { content:""; display:block; width:0; height:0; font:0/0 Sans-serif; overflow:hidden; visibility:hidden; clear:both; float:none;}
-.commentBody .comment .identity{ position:relative; width:98px; float:left; margin:0 -98px 0 0; font-size:1em; background:none; *zoom:1;}
-.commentBody .comment .identity a{ position:relative; display:block; text-align:center; font-size:.75em; color:#fff !important; font-weight:bold;}
+.commentBody .comment .identity{ position:relative; width:98px; float:left; margin:0 -98px 0 0; font-size:12px; background:none; *zoom:1;}
+.commentBody .comment .identity a{ position:relative; display:block; text-align:center; font-size:12px; color:#fff !important; font-weight:bold;}
.commentBody .comment .identity a img{ display:block; border:1px solid #ddd;}
.commentBody .comment .identity a em{ position:absolute; width:96px; text-align:center; left:1px; bottom:1px; display:block; padding:5px 0; font-style:normal; background:#000; opacity:.6; filter:alpha(opacity=60); line-height:normal;}
.commentBody .comment .tongue{ position:relative; margin-left:113px; *zoom:1;}
-.commentBody .comment .tongue .post{ margin:0 0 7px 0; font:1.2em/1.4em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif;}
+.commentBody .comment .tongue .post{ margin:0 0 7px 0; font:16px/1.6 NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; word-break:break-all; }
.commentBody .comment .tongue .post a { font:1em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#06C;}
.commentBody .comment .tongue .post strong{ background:#f7b100; font:normal 1em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#fff;}
-.commentBody .comment .tongue .postScript{ margin:0 0 10px 0; font-size:.75em; color:#999;}
+.commentBody .comment .tongue .postScript{ margin:0 0 10px 0; font-size:12px; color:#999;}
.commentBody .comment .tongue .postScript strong{ font-family:Arial; letter-spacing:-1px; margin-right:5px;}
.commentBody .comment .tongue .postExtra{ overflow:hidden; padding-top:10px; border-top:1px dotted #ccc; *zoom:1;}
.commentBody .comment .tongue .postExtra *{ margin:0; padding:0;}
.commentBody .comment .tongue .postExtra .tag { float:left;}
-.commentBody .comment .tongue .postExtra .tag .time{ display:inline; margin-right:5px; color:#999; font:.7em AppleGothic, Dotum, Gulim, Sans-serif;}
+.commentBody .comment .tongue .postExtra .tag .time{ display:inline; margin-right:5px; color:#999; font:11px AppleGothic, Dotum, Gulim, Sans-serif;}
+.commentBody .comment .tongue .postExtra .tag .time a{color:#999;}
.commentBody .comment .tongue .postExtra .tag dl{ display:inline;}
-.commentBody .comment .tongue .postExtra .tag dt{ text-align:center; padding:0 7px; margin-right:5px; display:inline; background:url(../images/bgTag.gif) no-repeat center; font:bold .7em Tahoma; color:#fff;}
+.commentBody .comment .tongue .postExtra .tag dt{ text-align:center; padding:0 7px; margin-right:5px; display:inline; background:url(../images/bgTag.gif) no-repeat center; font:bold 11px Tahoma; color:#fff;}
.commentBody .comment .tongue .postExtra .tag dd{ display:inline; position:relative;}
-.commentBody .comment .tongue .postExtra .tag dd.tagRead a{ position:relative; margin-right:2px; font:.7em AppleGothic, Dotum, Gulim, Sans-serif; color:#999;}
+.commentBody .comment .tongue .postExtra .tag dd.tagRead a{ position:relative; margin-right:2px; font:11px AppleGothic, Dotum, Gulim, Sans-serif; color:#999;}
.commentBody .comment .tongue .postExtra .tag dd.tagRead a strong{ font:normal 1em AppleGothic, Dotum, Gulim, Sans-serif; background:#f7b100; color:#fff;}
.commentBody .comment .tongue .postExtra .tag dd.tagRead .delete{ position:relative; top:-7px; left:-8px; display:none; width:12px; height:11px; margin-right:-12px; background:url(../images/buttonX.gif) no-repeat center;}
.commentBody .comment .tongue .postExtra .tag dd.tagRead .delete.hover{ display:inline-block;}
.commentBody .comment .tongue .postExtra .tag dd.tagRead .modify{ position:relative; width:13px; height:13px; background:url(../images/buttonModify.gif) no-repeat center; vertical-align:middle; *vertical-align:baseline; *top:-1px; *left:5px;}
.commentBody .comment .tongue .postExtra .tag dd.tagModify{ display:none; top:2px;}
.commentBody .comment .tongue .postExtra .tag dd.tagModify form{ display:inline;}
-.commentBody .comment .tongue .postExtra .tag dd.tagModify .inputText{ border:1px solid #ccc; padding:2px 4px; height:13px; width:290px; font-size:.75em;}
-.commentBody .comment .tongue .postExtra .tag dd.tagModify button{ height:19px; font-size:.7em; background:#eee; border:1px solid #ccc; margin-left:5px; vertical-align:top;}
+.commentBody .comment .tongue .postExtra .tag dd.tagModify .inputText{ border:1px solid #ccc; padding:2px 4px; height:13px; width:290px; font-size:12px;}
+.commentBody .comment .tongue .postExtra .tag dd.tagModify button{ height:19px; font-size:11px; background:#eee; border:1px solid #ccc; margin-left:5px; vertical-align:top;}
.commentBody .comment .tongue .postExtra .tag.edit dd{ display:none;}
.commentBody .comment .tongue .postExtra .tag.edit dd.tagModify{ display:inline;}
.commentBody .comment .tongue .postExtra .sympathy{ float:right; position:relative; top:-2px;}
.commentBody .comment .tongue .postExtra .sympathy span.btnPlus { display:block; float:left; margin-right:10px; padding-top:3px;}
.commentBody .comment .tongue .postExtra .sympathy button { color:#999;}
-.commentBody .comment .tongue .postExtra .sympathy .num{ position:relative; display:inline-block; width:22px; height:22px; padding-top:6px; letter-spacing:-1px; color:#fff; text-align:center; font:bold .7em AppleGothic, Dotum, Gulim, Sans-serif; background:url(../images/bgSympathy.gif) no-repeat center top; *margin-bottom:-10px;}
+.commentBody .comment .tongue .postExtra .sympathy .num{ position:relative; display:inline-block; width:22px; height:22px; padding-top:6px; letter-spacing:-1px; color:#fff; text-align:center; font:bold 11px AppleGothic, Dotum, Gulim, Sans-serif; background:url(../images/bgSympathy.gif) no-repeat center top; *margin-bottom:-10px;}
.commentBody .comment .tongue .postExtra .sympathy .num, x:-moz-any-link { padding-left:11px; padding-right:11px;}
.commentBody .comment .tongue .postExtra .sympathy .num, x:-moz-any-link, x:default { padding-left:0; padding-right:0;}
-.commentBody .comment .tongue .postExtra .sympathy a{ position:relative; *top:-2px; margin-right:1px; color:#999; padding-left:8px; font:.7em AppleGothic, Dotum, Gulim, Sans-serif; letter-spacing:-1px; background:url(../images/arrowReplyOpen.gif) no-repeat left 3px;}
+.commentBody .comment .tongue .postExtra .sympathy a{ position:relative; *top:-2px; margin-right:1px; color:#999; padding-left:8px; font:11px AppleGothic, Dotum, Gulim, Sans-serif; letter-spacing:-1px; background:url(../images/arrowReplyOpen.gif) no-repeat left 3px;}
/* Todo Manager */
.commentList .commentHeader h3.exTitle{ font-family:"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; line-height:normal; background:none; float:left;}
@@ -301,9 +287,9 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.commentBody .reply{ display:none; clear:both; padding:15px; background:#f3f3f3; *zoom:1;}
.commentBody .reply.open{ display:block;}
.commentBody .reply dl{ position:relative; clear:both; overflow:hidden; *zoom:1; margin:0 0 5px 0;}
-.commentBody .reply dt{ float:left; width:83px; padding-left:15px; margin-right:-98px; font-size:.75em; font-weight:bold; color:#666;}
+.commentBody .reply dt{ float:left; width:83px; padding-left:15px; margin-right:-98px; font-size:12px; font-weight:bold; color:#666;}
.commentBody .reply dt a{ color:#a5b2c2; }
-.commentBody .reply dd{ margin:0 80px 0 113px; font-size:.75em; color:#666; line-height:1.4em;}
+.commentBody .reply dd{ margin:0 80px 0 113px; font-size:12px; color:#666; line-height:1.4em;}
.commentBody .reply dd a{ text-decoration:underline; color:#333;}
.commentBody .reply dd .time{ position:absolute; top:0; right:0;}
.commentBody .reply dd input{ position:relative; border:1px solid #ccc; padding:4px 5px; width:96%; height:14px; vertical-align:top; font-size:1em; *zoom:1;}
@@ -333,7 +319,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.authorHeader .thumb a:hover span,
.authorHeader .thumb a:active span,
.authorHeader .thumb a:focus span{ display:block;}
-.authorHeader .thumb .file{ display:none; position:absolute; top:0; left:115px; background:#fff; border:2px solid #eee; padding:15px; height:66px; _height /**/:100px; width:446px; font-size:.75em;}
+.authorHeader .thumb .file{ display:none; position:absolute; top:0; left:115px; background:#fff; border:2px solid #eee; padding:15px; height:66px; _height /**/:100px; width:446px; font-size:12px;}
.authorHeader .thumb .file p{ margin-bottom:5px;}
.authorHeader .thumb .file input{ padding:2px 4px; width:400px;}
.authorHeader .thumb .file .buttonArea{ padding-top:10px;}
@@ -364,16 +350,16 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.authorHeader .title *.edit .inputText,
.authorHeader .title *.edit button{ display:inline; vertical-align:top;}
.authorHeader .title .authorPersonality{ float:left;}
-.authorHeader .title .authorPersonality a{ position:relative; float:left; color:#fff; font-size:.75em; font-family:AppleGothic, Dotum, Gulim, Sans-serif; text-decoration:none;}
+.authorHeader .title .authorPersonality a{ position:relative; float:left; color:#fff; font-size:12px; font-family:AppleGothic, Dotum, Gulim, Sans-serif; text-decoration:none;}
.authorHeader .title .addFavorite{ position:relative; top:-3px; float:right; clear:right; background:url(../images/iconAddFavorite.gif) no-repeat left center; padding-left:7px; }
-.authorHeader .title .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:.7em; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; text-align:right; letter-spacing:-1px;}
+.authorHeader .title .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:11px; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; text-align:right; letter-spacing:-1px;}
.authorHeader .authorTag{ position:relative; border-top:1px solid #ddd; margin-left:120px; padding-top:10px; *zoom:1;}
.authorHeader .authorTag dl{ position:relative; display:block; float:left;}
-.authorHeader .authorTag dt{ text-align:center; padding:0 7px; margin-right:5px; display:inline; background:url(../images/bgTag.png) no-repeat center; _behavior:url(./common/js/iePngFix.htc); font:bold .7em Tahoma; color:#fff; *zoom:1;}
+.authorHeader .authorTag dt{ text-align:center; padding:0 7px; _padding:0 3px; margin-right:5px; display:inline; background:url(../images/bgTag.png) no-repeat center; _behavior:url(./common/js/iePngFix.htc); font:bold 11px Tahoma; color:#fff; *zoom:1;}
.authorHeader .authorTag dd{ display:inline;}
.authorHeader .authorTag.edit dd{ display:none;}
-.authorHeader .authorTag dd a{ font-size:.7em; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; margin-right:2px;}
+.authorHeader .authorTag dd a{ font-size:11px; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; margin-right:2px;}
.authorHeader .authorTag dd .delete{ position:relative; top:-7px; left:-8px; display:none; width:12px; height:11px; margin-right:-12px; background:url(../images/buttonX.gif) no-repeat center;}
.authorHeader .authorTag dd .delete span{ display:inline-block; width:0; height:0; font:0/0 Sans-serif; visibility:hidden;}
.authorHeader .authorTag dd .delete.hover{ display:inline-block;}
@@ -381,8 +367,8 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.authorHeader .authorTag dd.tagModify{ display:none;}
.authorHeader .authorTag.edit dd.tagModify{ display:inline;}
.authorHeader .authorTag dd.tagModify .inputText{ border:1px solid #ccc; padding:2px 4px; height:13px; width:290px;}
-.authorHeader .authorTag dd.tagModify button{ height:19px; font-size:.7em; background:#eee; border:1px solid #ccc; margin-left:5px; vertical-align:top;}
-.authorHeader .authorTag .planetUri{ position:relative; float:right; color:#fff; font-size:.7em; font-family:Tahoma Sans-serif;}
+.authorHeader .authorTag dd.tagModify button{ height:19px; font-size:11px; background:#eee; border:1px solid #ccc; margin-left:5px; vertical-align:top;}
+.authorHeader .authorTag .planetUri{ position:relative; float:right; color:#fff; font-size:11px; font-family:Tahoma Sans-serif;}
.authorHeader .authorTag .rssFeed{ float:right; display:block; margin:0 0 0 5px; width:12px; height:12px; cursor:pointer; background:url(../images/rssFeed.png) no-repeat; _behavior:url(./common/js/iePngFix.htc);}
.authorHeader .authorTag .rssFeed span{ position:absolute; width:0; height:0; overflow:hidden;}
.authorHeader .tl,
@@ -419,7 +405,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.authorHeader .apiMe2day .apiProtocol.open{ display:block;}
.authorHeader .apiMe2day .apiProtocol.close{ display:none;}
.authorHeader .apiMe2day .apiProtocol .summary{ font-weight:bold; margin-bottom:10px;}
-.authorHeader .apiMe2day .apiProtocol dl{ font-size:.75em; overflow:hidden;}
+.authorHeader .apiMe2day .apiProtocol dl{ font-size:12px; overflow:hidden;}
.authorHeader .apiMe2day .apiProtocol dt{ float:left; clear:left; margin:0 4px 0 0; padding-top:3px;}
.authorHeader .apiMe2day .apiProtocol dd{ clear:right; margin-bottom:2px;}
.authorHeader .apiMe2day .apiProtocol dd input{ width:120px; border:1px solid #ccc; padding:2px 4px; *margin:-1px 0;}
@@ -478,12 +464,9 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.authorFooter .memoWrite .button, x:-moz-any-link, x:default{ padding:0;}
.authorFooter .button *{ font-size:12px !important;}
.authorFooter .nav{ float:right; }
-.authorFooter .nav .button{ vertical-align:top;}
-.authorFooter .nav .button, x:-moz-any-link { vertical-align:middle;}
-.authorFooter .nav .button, x:-moz-any-link, x:default { vertical-align:top; }
-.authorFooter .nav a.button, x:-moz-any-link{ padding:4px 0 6px 0;}
-.authorFooter .nav a.button, x:-moz-any-link, x:default { padding:0;}
-.authorFooter .nav span.button{ top:0;}
+.authorFooter .nav *{ font:11px Dotum; letter-spacing:-1px; color:#333; text-decoration:none !important;}
+.authorFooter .nav li{ list-style:none; text-align:right;}
+.authorFooter .nav li button{ position:relative; height:16px; text-align:right; left:3px; *left:1px;}
.authorFooter .tl,
.authorFooter .tr{position:absolute; bottom:-1px; display:block; width:4px; height:4px; overflow:hidden; background:url(../images/boxCommentOut.gif) no-repeat;}
.authorFooter .tl{ left:-1px; background-position:left bottom;}
@@ -498,15 +481,15 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.authorList .authorBody .title{ position:relative; margin-left:120px; margin-bottom:10px; *zoom:1;}
.authorList .authorBody .title h2{ margin-bottom:5px;}
.authorList .authorBody .title h2 a{ font:bold 1em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#465f7d;}
-.authorList .authorBody .title p{ color:#a2afbe; font-size:.75em;}
-.authorList .authorBody .title .planetUri{ position:absolute; right:0; bottom:0; font-size:.7em; color:#999;}
-.authorList .authorBody .authorTag{ position:relative; padding-top:10px; margin-left:120px; border-top:1px dotted #ccc; font-size:.75em; *zoom:1;}
+.authorList .authorBody .title p{ color:#a2afbe; font-size:12px;}
+.authorList .authorBody .title .planetUri{ position:absolute; right:0; bottom:0; font-size:11px; color:#999;}
+.authorList .authorBody .authorTag{ position:relative; padding-top:10px; margin-left:120px; border-top:1px dotted #ccc; font-size:12px; *zoom:1;}
.authorList .authorBody .authorTag dt{ display:inline;}
.authorList .authorBody .authorTag dd{ display:inline;}
.authorList .authorBody .authorTag dd a{ color:#747474;}
.authorList .authorBody .authorTag dd a strong{ font-weight:normal; color:#fff; background:#ffba00;}
.authorList .authorBody .authorTag .addFavorite{ position:absolute; top:7px; right:0; background:url(../images/iconAddFavorite.gif) no-repeat left center;}
-.authorList .authorBody .authorTag .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:.9em; color:#999; font-family:AppleGothic, Dotum, Gulim, Sans-serif; text-align:right; letter-spacing:-1px;}
+.authorList .authorBody .authorTag .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:11px; color:#999; font-family:AppleGothic, Dotum, Gulim, Sans-serif; text-align:right; letter-spacing:-1px;}
.authorList .tl,
.authorList .tr,
.authorList .bl,
@@ -541,7 +524,7 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.writePost .writeBody dd .inputText{ padding:3px 10px;}
.writePost .writeBody dd.preview{ display:block; clear:both;}
.writePost .writeBody dd.preview.off{ display:none;}
-.writePost .writeBody dd.preview p{ padding:5px 10px; border:1px solid #ccc; width:96%; background:#fff; color:#000; opacity:.5; filter:alpha(opacity=50);}
+.writePost .writeBody dd.preview p{ padding:5px 10px; border:1px solid #ccc; width:96%; background:#fff; color:#000; opacity:.5; filter:alpha(opacity=50); font-size:12px;}
.writePost .writeBody dd.preview p a{ color:#00f;}
.writePost .writeBody .writeOptions{ position:absolute; top:-8px; left:100%; margin-left:-105px;}
.writePost .writeBody .writeOptions p{ white-space:nowrap; margin:0; padding:0;}
@@ -554,8 +537,8 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.writePost .br{ position:absolute; display:block; width:4px; height:4px; overflow:hidden; background:url(../images/boxAuthorHeader.png) no-repeat; _background:url(../images/boxAuthorHeader.gif) no-repeat;}
.writePost .tl{ top:0; left:0; background-position:left top;}
.writePost .tr{ top:0; right:0; background-position:right top;}
-.writePost .bl{ bottom:0; left:0; background-position:left -4px;}
-.writePost .br{ bottom:0; right:0; background-position:right -4px;}
+.writePost .bl{ bottom:0; _bottom:-1px; left:0; background-position:left -4px;}
+.writePost .br{ bottom:0; _bottom:-1px; right:0; background-position:right -4px;}
/* My Favorite Tag */
.myFavoriteTag{ display:none; position:relative; background:#7b735d; margin-bottom:10px; *zoom:1; padding:15px 20px 15px 20px;}
@@ -565,15 +548,15 @@ h1 a{ font-weight:bold; font-size:30px; color:#000; letter-spacing:-3px; text-de
.myFavoriteTag ul{ position:relative; padding:5px 0; overflow:hidden; *zoom:1;}
.myFavoriteTag li{ position:relative; padding:0 6px 0 10px; left:-11px; display:inline; background:url(../images/lineVccc.gif) no-repeat left center; line-height:18px;}
.myFavoriteTag li a,
-.myFavoriteTag li strong{ font-size:.75em; white-space:nowrap;}
+.myFavoriteTag li strong{ font-size:12px; white-space:nowrap;}
.myFavoriteTag li strong{ color:#ffba00;}
.myFavoriteTag li .delete{ position:relative; top:-7px; left:-6px; display:none; width:12px; height:11px; margin-right:-12px; background:url(../images/buttonX.gif) no-repeat center;}
.myFavoriteTag li .delete span{ display:inline-block; width:0; height:0; font:0/0 Sans-serif; visibility:hidden;}
.myFavoriteTag li .delete.hover{ display:inline-block;}
.myFavoriteTag .addTag{ text-align:right;}
-.myFavoriteTag .addTag .inputText{ border:1px solid #ccc; padding:3px 4px; color:#000; font-size:.75em; margin-right:5px;}
+.myFavoriteTag .addTag .inputText{ border:1px solid #ccc; padding:3px 4px; color:#000; font-size:12px; margin-right:5px;}
.myFavoriteTag .addTag .addFavorite{ display:inline-block; position:relative; background:url(../images/iconAddFavorite.gif) no-repeat left center;}
-.myFavoriteTag .addTag .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:.7em; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; text-align:right; letter-spacing:-1px;}
+.myFavoriteTag .addTag .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:11px; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; text-align:right; letter-spacing:-1px;}
.myFavoriteTag .tl,
.myFavoriteTag .tr,
.myFavoriteTag .bl,
diff --git a/modules/planet/skins/xe_planet/css/layout.css b/modules/planet/skins/xe_planet/css/layout.css
deleted file mode 100644
index dcac00227..000000000
--- a/modules/planet/skins/xe_planet/css/layout.css
+++ /dev/null
@@ -1,391 +0,0 @@
-@charset "utf-8";
-/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
-
-/* Float Clear */
-.fClear { display:block; float:none; clear:both; margin:0; padding:0; width:0; height:0; overflow:hidden; font:0/0 Sans-serif; visibility:hidden; } /* Use it when you want to float clearing */
-
-/* Container */
-#container { position:relative; margin:0 auto; height:auto !important; } /* alignCenter = margin:0 auto | alignLeft = margin:0 | alignRight = margin:0 0 0 auto */
-
-/* Header */
-#header { }
-
-/* Body */
-#body { position:relative; }
-#body:after { content:""; display:block; clear:both; }
-
-/* Content */
-#content { position:relative; }
-#content .section { position:relative; }
-
-/* Navigation */
-#navigation { position:relative; }
-#navigation .section { position:relative; }
-
-/* Extra */
-#extra { position:relative; }
-#extra .section { position:relative; }
-
-/* Footer */
-#footer { position:relative; }
-
-/* ---------- Common Display ---------- */
-/* c = #content, n = #navigation, e = #extra */
-.c1 #navigation,
-.c2 #navigation,
-.c3 #navigation,
-.c1 #extra,
-.c2 #extra,
-.c3 #extra
-.cn #extra,
-.nc #extra { display:none; }
-
-.cn #navigation,
-.nc #navigation,
-.ce #navigation,
-.ec #navigation,
-.ne #navigation,
-.en #navigation,
-.cne #navigation,
-.ecn #navigation,
-.nec #navigation,
-.cen #navigation,
-.nce #navigation,
-.enc #navigation,
-.cee #navigation,
-.eec #navigation,
-.ece #navigation,
-.ce #extra,
-.ec #extra,
-.ne #extra,
-.en #extra,
-.cne #extra,
-.ecn #extra,
-.nec #extra,
-.cen #extra,
-.nce #extra,
-.enc #extra,
-.cee #extra,
-.eec #extra,
-.ece #extra { display:block; }
-
-#extra .section{ display:none; }
-.e0 #extra { display:none;}
-.e1 #extra,
-.e2 #extra,
-.e3 #extra,
-.e4 #extra,
-.e5 #extra,
-.e1 #extra .extra1,
-.e2 #extra .extra1,
-.e2 #extra .extra2,
-.e3 #extra .extra1,
-.e3 #extra .extra2,
-.e3 #extra .extra3,
-.e4 #extra .extra1,
-.e4 #extra .extra2,
-.e4 #extra .extra3,
-.e4 #extra .extra4,
-.e5 #extra .extra1,
-.e5 #extra .extra2,
-.e5 #extra .extra3,
-.e5 #extra .extra4,
-.e5 #extra .extra5,
-.cee #extra .section,
-.eec #extra .section,
-.ece #extra .section { display:block;}
-
-.nTop #navigation { display:block; }
-
-.ne #navigation,
-.ne #extra,
-.ne #extra .section { float:left; }
-.en #navigation,
-.en #extra,
-.en #extra .section { float:right; }
-
-/* ---------- Fixed Layout Preset ---------- */
-/* c = #content, n = #navigation, e = #extra */
-
-/* Width */
-.fixed #container { width:960px; }
-.fixed #body { width:auto; }
-.fixed #navigation,
-.fixed #extra .section { width:200px; }
-.fixed .c1 #content { width:100%; }
-.fixed .c1 #navigation { width:300px; }
-.fixed .c1 #extra { width:auto; }
-.fixed .c1 #extra .section { width:300px; }
-.fixed .c2 #content { width:740px; }
-.fixed .c3 #content { width:520px;}
-.fixed .cee #extra,
-.fixed .eec #extra{ width:420px;}
-.fixed .ece #extra { width:100%;}
-
-/* Floating 1 Columns */
-.fixed .c1 #content { clear:both; }
-
-.fixed .ne #navigation,
-.fixed .ne #extra .extra1 { margin-right:30px; }
-
-.fixed .en #navigation,
-.fixed .en #extra .extra1 { margin-left:30px; }
-
-/* Floating 2 Columns */
-.fixed .cn #content { float:left; }
-.fixed .cn #navigation,
-.fixed .cn #extra { float:right; }
-
-.fixed .nc #content { float:right; }
-.fixed .nc #navigation,
-.fixed .nc #extra { float:left; }
-
-.fixed .ce #content { float:left; }
-.fixed .ce #navigation,
-.fixed .ce #extra { float:right; *float:none; *left:20px; _left:17px; }
-
-.fixed .ec #content { float:right; }
-.fixed .ec #navigation,
-.fixed .ec #extra { float:left; *float:none; }
-
-/* Floating 3 Columns */
-.fixed .cne #content { float:left; margin-right:20px; }
-.fixed .cne #navigation { float:left; }
-.fixed .cne #extra { float:right; }
-
-.fixed .ecn #content { float:left; margin-right:-520px; left:220px; }
-.fixed .ecn #navigation { float:right; }
-.fixed .ecn #extra { float:left; }
-
-.fixed .nec #content { float:right; }
-.fixed .nec #navigation { float:left; margin-right:20px; }
-.fixed .nec #extra { float:left; }
-
-.fixed .cen #content { float:left; margin-right:20px; }
-.fixed .cen #navigation { float:right; }
-.fixed .cen #extra { float:left; }
-
-.fixed .nce #content { float:left; margin-right:-520px; left:220px; }
-.fixed .nce #navigation { float:left; }
-.fixed .nce #extra { float:right; }
-
-.fixed .enc #content { float:right; margin-left:20px; }
-.fixed .enc #navigation { float:right; }
-.fixed .enc #extra { float:left; }
-
-.fixed .cee #content { float:left; _margin-right:-3px; }
-.fixed .cee #extra { float:right; *float:none; *left:20px; }
-.fixed .cee .section { float:left; }
-.fixed .cee .extra1 { margin-right:20px; }
-
-.fixed .eec #content { float:right; _margin-left:-3px; }
-.fixed .eec #extra { float:left; *float:none; *left:0; }
-.fixed .eec .section{ float:left;}
-.fixed .eec .extra1{ margin-right:20px; }
-
-.fixed .ece #content { float:left; margin-right:-100%; left:220px;}
-.fixed .ece #extra { float:none; }
-.fixed .ece .extra1{ float:left; }
-.fixed .ece .extra2{ float:right; }
-
-/* ---------- Liquid Layout Preset ---------- */
-/* c = #content, n = #navigation, e = #extra */
-
-/* Width */
-.liquid #container { width:100%; }
-.liquid #body { width:auto; }
-.liquid .c1 #content { width:100%; }
-.liquid .c1 #navigation { width:32%; }
-.liquid .c1 #extra { width:66%; }
-.liquid .c1 #extra .section { width:48.4%; }
-.liquid .c2 #content { width:75%; }
-.liquid .c2 #navigation,
-.liquid .c2 #extra { width:23%; }
-.liquid .c3 #content { width:56%; }
-.liquid .c3 #navigation { width:20%; }
-.liquid .c3 #extra { width:20%; }
-.liquid .cee #extra,
-.liquid .eec #extra { width:42%;}
-.liquid .ece #extra { width:100%;}
-.liquid .cee #extra .section,
-.liquid .eec #extra .section{ width:48%; }
-.liquid .ece #extra .section { width:20%; }
-
-/* Floating 1 Columns */
-.liquid .c1 #content { clear:both; }
-
-.liquid .ne #navigation { margin-right:2%; }
-.liquid .ne #extra .extra1 { float:left; }
-.liquid .ne #extra .extra2 { float:right; }
-
-.liquid .en #navigation { margin-left:2%; }
-.liquid .en #extra .extra1 { float:right; }
-.liquid .en #extra .extra2 { float:left; }
-
-/* Floating 2 Columns */
-.liquid .cn #content { float:left; }
-.liquid .cn #navigation,
-.liquid .cn #extra { float:right; }
-
-.liquid .nc #content { float:right; }
-.liquid .nc #navigation,
-.liquid .nc #extra { float:left; }
-
-.liquid .ce #content { float:left; _margin-right:-3px; }
-.liquid .ce #navigation,
-.liquid .ce #extra { float:right; *float:none; *left:2%; }
-
-.liquid .ec #content { float:right; }
-.liquid .ec #navigation,
-.liquid .ec #extra { float:left; *float:none; }
-
-/* Floating 3 Columns */
-.liquid .cne #content { float:left; margin-right:2%; }
-.liquid .cne #navigation { float:left; }
-.liquid .cne #extra { float:right; }
-
-.liquid .ecn #content { float:left; margin-right:-100%; left:22%; }
-.liquid .ecn #navigation { float:right; }
-.liquid .ecn #extra { float:left; }
-
-.liquid .nec #content { float:right; }
-.liquid .nec #navigation { float:left; margin-right:2%; }
-.liquid .nec #extra { float:left; }
-
-.liquid .cen #content { float:left; margin-right:2%; }
-.liquid .cen #navigation { float:right; }
-.liquid .cen #extra { float:left; }
-
-.liquid .nce #content { float:left; margin-right:-100%; left:22%; }
-.liquid .nce #navigation { float:left; }
-.liquid .nce #extra { float:right; }
-
-.liquid .enc #content { float:right; margin-left:2%; }
-.liquid .enc #navigation { float:right; }
-.liquid .enc #extra { float:left; }
-
-.liquid .cee #content { float:left; _margin-right:-3px; }
-.liquid .cee #extra { float:right; *float:none; *left:2%; }
-.liquid .cee .extra1 { float:left; }
-.liquid .cee .extra2 { float:right; }
-
-.liquid .eec #content { float:right; _margin-left:-3px; }
-.liquid .eec #extra { float:left; *float:none; *left:0; }
-.liquid .eec .extra1{ float:left; }
-.liquid .eec .extra2{ float:right; }
-
-.liquid .ece #content { float:left; margin-right:-100%; left:22%;}
-.liquid .ece #extra { float:none; }
-.liquid .ece .extra1{ float:left; }
-.liquid .ece .extra2{ float:right; }
-
-/* ---------- Hybrid Layout Preset ---------- */
-/* c = #content, n = #navigation, e = #extra */
-
-/* Width */
-.hybrid #container { width:100%; }
-.hybrid #body { width:auto; }
-.hybrid #content { width:100%; }
-.hybrid #navigation { width:200px; }
-.hybrid #extra { width:200px; }
-.hybrid .c1 #navigation { width:300px; }
-.hybrid .c1 #extra { width:auto; }
-.hybrid .c1 #extra .section { width:300px; }
-.hybrid .cee #extra,
-.hybrid .eec #extra { width:420px;}
-.hybrid .ece #extra { width:100%;}
-.hybrid .cee #extra .section,
-.hybrid .eec #extra .section,
-.hybrid .ece #extra .section { width:200px; }
-
-/* Floating 1 Columns */
-.hybrid .c1 #content { clear:both; }
-
-.hybrid .ne #navigation,
-.hybrid .ne #extra .extra1 { margin-right:30px; }
-
-.hybrid .en #navigation,
-.hybrid .en #extra .extra1 { margin-left:30px; }
-
-/* Floating 2 Columns */
-.hybrid .cn #body { margin-right:220px; }
-.hybrid .cn #content { float:left; margin-right:-100%; }
-.hybrid .cn #navigation,
-.hybrid .cn #extra { float:right; left:220px; clear:right; }
-
-.hybrid .nc #body { margin-left:220px; }
-.hybrid .nc #content { float:right; margin-left:-100%; *margin-left:0; }
-.hybrid .nc #navigation,
-.hybrid .nc #extra { float:left; left:-220px; clear:left; }
-
-.hybrid .ce #body { margin-right:220px; }
-.hybrid .ce #content { float:left; margin-right:-100%; }
-.hybrid .ce #navigation,
-.hybrid .ce #extra { float:right; left:220px; clear:right; *float:none; *left:100%; *margin-left:20px; *margin-right:-200px; }
-.hybrid .ce #navigation { width:100% !important; right:-220px; }
-
-.hybrid .ec #body { margin-left:220px; }
-.hybrid .ec #content { float:right; margin-left:-100%; _float:left; _margin-left:0; _margin-right:-100%; }
-.hybrid .ec #navigation,
-.hybrid .ec #extra { float:left; left:-220px; clear:left; *float:none; *margin-right:-200px; }
-.hybrid .ec #navigation { width:100% !important; }
-
-/* Floating 3 Columns */
-.hybrid .cne #body { margin-right:440px; }
-.hybrid .cne #content { float:left; }
-.hybrid .cne #navigation { float:left; margin-right:-200px; left:20px; }
-.hybrid .cne #extra { float:right; margin-left:-200px; left:440px; }
-
-.hybrid .ecn #body { margin-left:220px; margin-right:220px; }
-.hybrid .ecn #content { float:left; margin-right:-100%; }
-.hybrid .ecn #navigation { float:right; margin-left:-200px; left:220px; }
-.hybrid .ecn #extra { float:left; left:-220px; }
-
-.hybrid .nec #body { margin-left:440px; }
-.hybrid .nec #content { float:right; }
-.hybrid .nec #navigation { float:left; margin-right:-200px; left:-440px; }
-.hybrid .nec #extra { float:left; margin-right:-200px; left:-220px; }
-
-.hybrid .cen #body { margin-right:440px; }
-.hybrid .cen #content { float:left; }
-.hybrid .cen #navigation { float:right; margin-left:-200px; left:440px; }
-.hybrid .cen #extra { float:left; margin-right:-200px; left:20px; }
-
-.hybrid .nce #body { margin-left:220px; margin-right:220px; }
-.hybrid .nce #content { float:left; margin-right:-100%; }
-.hybrid .nce #navigation { float:left; margin-right:-200px; left:-220px; }
-.hybrid .nce #extra { float:right; right:-220px; }
-
-.hybrid .enc #body { margin-left:440px; }
-.hybrid .enc #content { float:right; }
-.hybrid .enc #navigation { float:right; margin-left:-200px; left:-20px; }
-.hybrid .enc #extra { float:left; margin-right:-200px; left:-440px; }
-
-.hybrid .cee #body { margin-right:440px;}
-.hybrid .cee #content { float:left; margin-right:-100%; }
-.hybrid .cee #navigation { right:-440px;}
-.hybrid .cee #extra { float:right; left:440px; *float:none; *left:100%; *margin-left:20px; *margin-right:-420px; }
-.hybrid .cee .extra1 { float:left; }
-.hybrid .cee .extra2 { float:right; }
-
-.hybrid .eec #body { margin-left:440px;}
-.hybrid .eec #content { float:left; margin-right:-100%; }
-.hybrid .eec #extra { float:left; left:-440px; *float:none; *margin-right:-420px; }
-.hybrid .eec .section{ float:left;}
-.hybrid .eec .extra1{ float:left; }
-.hybrid .eec .extra2{ float:right; }
-
-.hybrid .ece #body { margin:0 220px; }
-.hybrid .ece #content { float:left; margin-right:-100%; }
-.hybrid .ece #navigation { right:-220px; }
-.hybrid .ece #extra { float:none; }
-.hybrid .ece .extra1{ float:left; left:-220px; margin-right:-200px; }
-.hybrid .ece .extra2{ float:right; right:-220px; margin-left:-200px; }
-
-/* Navigation Top */
-.nTop #navigation { position:absolute; float:right !important; width:auto !important; margin:0 !important; *clear:none !important; overflow:visible; top:-4em; left:auto !important; right:0; }
-.nTop #navigation .section { position:absolute; float:right; top:0; right:0; width:auto; margin:0; padding:0; }
-.nTop #navigation .section:after { content:""; display:block; clear:both; width:0; height:0; overflow:hidden; visibility:hidden; font:0/0 Sans-serif;}
-.nTop #navigation h2 { position:absolute; left:0; top:0; width:0; height:0; border:0; overflow:hidden; visibility:hidden; font:0/0 Sans-serif; }
-.nTop #navigation ul.nav { position:relative; display:block; float:right; margin:0; padding:0; list-style:none; overflow:hidden; text-align:right; white-space:nowrap; }
-.nTop #navigation ul.nav li { position:relative; left:-1px; display:inline; white-space:nowrap; border-left:1px solid #ccc; padding-left:5px; }
diff --git a/modules/planet/skins/xe_planet/footer.html b/modules/planet/skins/xe_planet/footer.html
index 64d09e3c9..c52c78da0 100644
--- a/modules/planet/skins/xe_planet/footer.html
+++ b/modules/planet/skins/xe_planet/footer.html
@@ -1,8 +1,10 @@
-
diff --git a/modules/planet/skins/xe_planet/header.html b/modules/planet/skins/xe_planet/header.html
index fa6880ce5..610e29b8c 100644
--- a/modules/planet/skins/xe_planet/header.html
+++ b/modules/planet/skins/xe_planet/header.html
@@ -1,5 +1,4 @@
-
-
+
@@ -22,79 +21,83 @@
-