diff --git a/addons/counter/counter.addon.php b/addons/counter/counter.addon.php index fc2bed4ae..17cb19680 100644 --- a/addons/counter/counter.addon.php +++ b/addons/counter/counter.addon.php @@ -12,9 +12,17 @@ * 파일내에서 이루어집니다. **/ - // called_position가 before_module_init 이고 module이 admin이 아닐 경우 - if($called_position == 'before_module_init' && !$GLOBALS['__counter_addon_called__']) { - if($this->module != 'admin') Context::addJsFile('./modules/counter/tpl/js/counter.js'); - $GLOBALS['__counter_addon_called__'] = true; - } + // module이 admin이면 패스~ called_position가 before_display_content 이고 module이 admin이 아닐 경우 + if( + Context::get('act')=='procFileDelete' || + Context::get('module')=='admin' || + $called_position != 'before_display_content' || + Context::getRequestMethod()=='XMLRPC' || + $GLOBALS['__counter_addon_called__'] + ) return; + + $GLOBALS['__counter_addon_called__'] = true; + + $oCounterController = &getController('counter'); + $oCounterController->procCounterExecute(); ?> diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php index 55c0ebe50..372476e3e 100644 --- a/addons/member_extra_info/member_extra_info.addon.php +++ b/addons/member_extra_info/member_extra_info.addon.php @@ -65,7 +65,7 @@ // 로그인된 사용자 정보를 구함 $logged_info = Context::get('logged_info'); - $member_srl = Context::get('member_srl'); + $member_srl = Context::get('target_srl'); // 템플릿에서 사용되기 전의 menu_list를 가져옴 $menu_list = $this->get('menu_list'); diff --git a/addons/point/point.addon.php b/addons/point/point.addon.php index 1f5460140..fb42f882e 100644 --- a/addons/point/point.addon.php +++ b/addons/point/point.addon.php @@ -2,237 +2,7 @@ if(!defined("__ZBXE__")) exit(); /** - * @file point.addon.php - * @author zero (zero@nzeo.com) - * @brief 포인트 애드온 - * - * 포인트 시스템 모듈에 설정된 내용을 토대로 하여 포인트를 부여/차감하고, - * 다운로드를 금지시키고, - * 회원 이름 앞에 레벨 아이콘을 표시한다. + * @brief 포인트 애드온은 포인트 모듈의 trigger 기능으로 인하여 더 이상 사용하지 않음 **/ - - // 관리자 모듈이면 패스~ - if(Context::get('module')=='admin') return; - - // 로그인 상태일때만 실행 - $logged_info = Context::get('logged_info'); - if(!$logged_info->member_srl) return; - - // point action cache file을 가져와서 현재 속한 캐시파일인지 확인 - $act_cache_file = "./files/cache/point.act.cache"; - $buff = FileHandler::readFile($act_cache_file); - if(strpos($buff,$this->act)===false) return; - - // point 모듈 정보 가져옴 - $oModuleModel = &getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); - - // 현재 로그인 사용자의 포인트를 가져옴 - $member_srl = $logged_info->member_srl; - - $oPointModel = &getModel('point'); - $cur_point = $oPointModel->getPoint($member_srl, true); - - // 파일다운로드를 제외한 action은 called_position가 before_module_proc일때 실행 - if($called_position == 'after_module_proc') { - - // 게시글 작성 - if(strpos($config->insert_document_act,$this->act)!==false) { - if(!$this->toBool()) return; - $document_srl = $this->get('document_srl'); - - $oDocumentModel = &getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl); - - // 신규 글인지 체크 - if($oDocument->get('regdate')!=$oDocument->get('last_update')) return; - $module_srl = $oDocument->get('module_srl'); - - // 포인트를 구해옴 - $point = $config->module_point[$module_srl]['insert_document']; - if($point == null) $point = $config->insert_document; - - // 포인트 증감 - $cur_point += $point; - $oPointController = &getController('point'); - $oPointController->setPoint($member_srl,$cur_point); - - // 게시글 삭제 - } elseif(strpos($config->delete_document_act,$this->act)!==false) { - if(!$this->toBool()) return; - $target_member_srl = Context::get('_point_target_member_srl'); - if(!$target_member_srl) return; - - $module_srl = $this->module_srl; - - // 포인트를 구해옴 - $point = $config->module_point[$module_srl]['insert_document']; - if($point == null) $point = $config->insert_document; - - // 포인트 차감 - $cur_point = $oPointModel->getPoint($target_member_srl, true); - $cur_point -= $point; - - $oPointController = &getController('point'); - $oPointController->setPoint($target_member_srl,$cur_point); - - // 댓글 작성 - } elseif(strpos($config->insert_comment_act,$this->act)!==false) { - $comment_srl = $this->get('comment_srl'); - $oCommentModel = &getModel('comment'); - $comment = $oCommentModel->getComment($comment_srl); - - // 이미 존재하는 댓글인지 체크 - if($comment->last_update) return; - - // 포인트를 구해옴 - $module_srl = $comment->module_srl; - - // 포인트를 구해옴 - $point = $config->module_point[$module_srl]['insert_comment']; - if($point == null) $point = $config->insert_comment; - - // 포인트 증감 - $cur_point += $point; - $oPointController = &getController('point'); - $oPointController->setPoint($member_srl,$cur_point); - - - // 댓글 삭제 - } elseif(strpos($config->delete_comment_act,$this->act)!==false) { - if(!$this->toBool()) return; - $target_member_srl = Context::get('_point_target_member_srl'); - if(!$target_member_srl) return; - - // 포인트를 구해옴 - $module_srl = $this->module_srl; - - // 포인트를 구해옴 - $point = $config->module_point[$module_srl]['insert_comment']; - if($point == null) $point = $config->insert_comment; - - // 포인트 증감 - $cur_point = $oPointModel->getPoint($target_member_srl, true); - $cur_point -= $point; - - $oPointController = &getController('point'); - $oPointController->setPoint($target_member_srl,$cur_point); - - // 파일업로드 - } elseif(strpos($config->upload_file_act,$this->act)!==false) { - if(!$output->toBool()||!$output->get('file_srl')) return; - $file_srl = $output->get('file_srl'); - - $oFileModel = &getModel('file'); - $file_info = $oFileModel->getFile($file_srl); - - $module_srl = $this->module_srl; - - // 포인트를 구해옴 - $point = $config->module_point[$module_srl]['upload_file']; - if($point == null) $point = $config->upload_file; - - // 포인트 증감 - $cur_point += $point; - $oPointController = &getController('point'); - $oPointController->setPoint($member_srl,$cur_point); - - // 파일삭제 - } elseif(strpos($config->delete_file_act,$this->act)!==false) { - // 파일 정보를 구해옴 - $file_srl = Context::get('file_srl'); - if(!$file_srl) return; - $target_member_srl = Context::get('_point_target_member_srl'); - if(!$target_member_srl) return; - - $module_srl = $this->module_srl; - - $target_member_srl = Context::get('_point_target_member_srl'); - if(!$target_member_srl) return; - - // 포인트를 구해옴 - $point = $config->module_point[$module_srl]['upload_file']; - if($point == null) $point = $config->upload_file; - - // 포인트 차감 - $cur_point = $oPointModel->getPoint($target_member_srl, true); - $cur_point -= $point; - $oPointController = &getController('point'); - $oPointController->setPoint($target_member_srl,$cur_point); - - // 회원 가입일 경우 - } elseif(strpos($config->signup_act,$this->act)!==false) { - // 가입이 제대로 되었는지 체크 - if(!$this->toBool()||!$this->get('member_srl')) return; - $member_srl = $this->get('member_srl'); - - // 포인트를 구해옴 - $point = $config->module_point[$module_srl]['signup']; - if($point == null) $point = $config->signup; - - // 포인트 증감 - $cur_point += $point; - $oPointController = &getController('point'); - $oPointController->setPoint($member_srl,$cur_point); - } - - // 파일다운로드는 before_module_proc 일때 체크 - } else if($called_position == "before_module_proc") { - - // 파일다운로드 - if(strpos($config->download_file_act,$this->act)!==false) { - // 파일 정보를 구해옴 - $file_srl = Context::get('file_srl'); - if(!$file_srl) return; - - $oFileModel = &getModel('file'); - $file_info = $oFileModel->getFile($file_srl); - if($file_info->file_srl != $file_srl) return; - - $module_srl = $file_info->module_srl; - - // 포인트를 구해옴 - $point = $config->module_point[$module_srl]['download_file']; - if($point == null) $point = $config->download_file; - - // 포인트가 0보다 작고 포인트가 없으면 파일 다운로드가 안되도록 했다면 오류 - if($cur_point + $point < 0 && $config->disable_download == 'Y') { - $this->stop('msg_cannot_download'); - } else { - // 포인트 차감 - $cur_point += $point; - $oPointController = &getController('point'); - $oPointController->setPoint($member_srl,$cur_point); - } - - // 글 삭제일 경우 대상 글의 사용자 번호 저장 - } elseif(strpos($config->delete_document_act,$this->act)!==false) { - $document_srl = Context::get('document_srl'); - $oDocumentModel = &getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl); - $target_member_srl = $oDocument->get('member_srl'); - if($target_member_srl) Context::set('_point_target_member_srl', $target_member_srl); - - // 댓글 삭제일 경우 대상 댓글의 사용자 번호 저장 - } elseif(strpos($config->delete_comment_act,$this->act)!==false) { - $comment_srl = Context::get('comment_srl'); - $oCommentModel = &getModel('comment'); - $comment = $oCommentModel->getComment($comment_srl); - $target_member_srl = $comment->member_srl; - if($target_member_srl) Context::set('_point_target_member_srl', $target_member_srl); - - // 파일삭제일 경우 대상 파일의 정보에서 사용자 번호 저장 - } elseif(strpos($config->delete_file_act,$this->act)!==false) { - // 파일 정보를 구해옴 - $file_srl = Context::get('file_srl'); - if(!$file_srl) return; - - $oFileModel = &getModel('file'); - $file_info = $oFileModel->getFile($file_srl); - if($file_info->file_srl != $file_srl) return; - - $target_member_srl = $file_info->member_srl; - if($target_member_srl) Context::set('_point_target_member_srl', $target_member_srl); - } - } + return; ?> diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 5b9577b42..cbc33bf73 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -74,18 +74,18 @@ else $this->lang_type = $this->db_info->lang_type; // 등록된 기본 언어파일 찾기 - $lang_files = FileHandler::readDir('./common/lang'); + $langs = file('./common/lang/lang.info'); $accept_lang = strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']); - foreach($lang_files as $key => $val) { - list($lang_prefix) = explode('.',$val); - $lang_supported[] = $lang_prefix; + foreach($langs as $val) { + list($lang_prefix, $lang_text) = explode(',',$val); + $lang_supported[$lang_prefix] = $lang_text; if(!$this->lang_type && ereg($lang_prefix, strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']))) { $this->lang_type = $lang_prefix; setcookie('lang_type', $this->lang_type, time()+60*60*24*365, '/'); } } - if(!in_array($this->lang_type, $lang_supported)) $this->lang_type = $this->db_info->lang_type; + if(!in_array($this->lang_type, array_keys($lang_supported))) $this->lang_type = $this->db_info->lang_type; if(!$this->lang_type) $this->lang_type = "en"; Context::set('lang_supported', $lang_supported); @@ -282,6 +282,7 @@ function setLangType($lang_type = 'ko') { $oContext = &Context::getInstance(); $oContext->_setLangType($lang_type); + $_SESSION['lang_type'] = $lang_type; } /** diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php index 9624d0b70..13eec45ae 100644 --- a/classes/db/DBCubrid.class.php +++ b/classes/db/DBCubrid.class.php @@ -534,8 +534,8 @@ foreach($output->columns as $key => $val) { $name = $val['name']; $alias = $val['alias']; - if($name == '*') { - $column_list[] = '*'; + if(substr($name,-1) == '*') { + $column_list[] = $name; } elseif(strpos($name,'.')===false && strpos($name,'(')===false) { if($alias) $column_list[] = sprintf('"%s" as "%s"', $name, $alias); else $column_list[] = sprintf('"%s"',$name); diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php index f70048522..ed1b4624a 100644 --- a/classes/db/DBMysql.class.php +++ b/classes/db/DBMysql.class.php @@ -484,8 +484,8 @@ foreach($output->columns as $key => $val) { $name = $val['name']; $alias = $val['alias']; - if($name == '*') { - $column_list[] = '*'; + if(substr($name,-1) == '*') { + $column_list[] = $name; } elseif(strpos($name,'.')===false && strpos($name,'(')===false) { if($alias) $column_list[] = sprintf('`%s` as `%s`', $name, $alias); else $column_list[] = sprintf('`%s`',$name); diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php index a69773b7d..5521bca4c 100644 --- a/classes/db/DBMysql_innodb.class.php +++ b/classes/db/DBMysql_innodb.class.php @@ -493,8 +493,8 @@ foreach($output->columns as $key => $val) { $name = $val['name']; $alias = $val['alias']; - if($name == '*') { - $column_list[] = '*'; + if(substr($name,-1) == '*') { + $column_list[] = $name; } elseif(strpos($name,'.')===false && strpos($name,'(')===false) { if($alias) $column_list[] = sprintf('`%s` as `%s`', $name, $alias); else $column_list[] = sprintf('`%s`',$name); diff --git a/classes/db/DBSqlite2.class.php b/classes/db/DBSqlite2.class.php index 8ea701a61..2449b708f 100644 --- a/classes/db/DBSqlite2.class.php +++ b/classes/db/DBSqlite2.class.php @@ -505,8 +505,8 @@ foreach($output->columns as $key => $val) { $name = $val['name']; $alias = $val['alias']; - if($name == '*') { - $column_list[] = '*'; + if(substr($name,-1) == '*') { + $column_list[] = $name; } elseif(strpos($name,'.')===false && strpos($name,'(')===false) { if($alias) $column_list[] = sprintf('%s as %s', $name, $alias); else $column_list[] = sprintf('%s',$name); diff --git a/classes/db/DBSqlite3_pdo.class.php b/classes/db/DBSqlite3_pdo.class.php index dea4dff7b..b7aa27051 100644 --- a/classes/db/DBSqlite3_pdo.class.php +++ b/classes/db/DBSqlite3_pdo.class.php @@ -546,8 +546,8 @@ foreach($output->columns as $key => $val) { $name = $val['name']; $alias = $val['alias']; - if($name == '*') { - $column_list[] = '*'; + if(substr($name,-1) == '*') { + $column_list[] = $name; } elseif(strpos($name,'.')===false && strpos($name,'(')===false) { if($alias) $column_list[] = sprintf('%s as %s', $name, $alias); else $column_list[] = sprintf('%s',$name); diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index db6019f28..8a0946267 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -32,7 +32,7 @@ // 요청방식에 따라 출력을 별도로 if(Context::getResponseMethod()!="XMLRPC") { - + Context::set('content', $content); // 레이아웃을 컴파일 @@ -92,6 +92,10 @@ $content = preg_replace('!(href|src)=("|\'){0,1}(commons|modules|widgets|layouts|addons|files)!is', '\\1=\\2'.$path.'\\3', $content); $content = preg_replace('!(href|src)=("|\'){0,1}\.\/([a-zA-Z0-9\_^\/]+)\/!is', '\\1=\\2'.$path.'\\3/', $content); + // 출력하기 전에 trigger 호출 (after) + ModuleHandler::triggerCall('display', 'after', $content); + + if($this->gz_enabled) print ob_gzhandler($content, 5); else print $content; } diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php index 47e49e2ef..79e083e3d 100644 --- a/classes/file/FileHandler.class.php +++ b/classes/file/FileHandler.class.php @@ -209,6 +209,23 @@ break; } + // 이미지 정보가 정해진 크기보다 크면 크기를 바꿈 (%를 구해서 처리) + if($resize_width > 0 && $width >= $resize_width) $width_per = $resize_width / $width; + else $width_per = $width / $resize_width; + + if($resize_height>0 && $height >= $resize_height) $height_per = $resize_height / $height; + else $height_per = $height / $resize_height; + + if($thumbnail_type == 'ratio') { + $per = $width_per; + $resize_height = $height * $per; + } else { + if($width_per < $height_per) $per = $height_per; + else $per = $width_per; + } + + if(!$per) $per = 1; + // 타겟 파일의 type을 구함 if(!$target_type) $target_type = $type; $target_type = strtolower($target_type); @@ -220,24 +237,6 @@ $white = @imagecolorallocate($thumb, 255,255,255); @imagefilledrectangle($thumb,0,0,$resize_width-1,$resize_height-1,$white); - // 이미지 정보가 정해진 크기보다 크면 크기를 바꿈 (%를 구해서 처리) - if($resize_width > 0 && $width >= $resize_width) $width_per = $resize_width / $width; - else $width_per = $width / $resize_width; - - if($resize_height>0 && $height >= $resize_height) $height_per = $resize_height / $height; - else $height_per = $height / $resize_height; - - if($thumbnail_type == 'ratio') { - if($width_per > $height_per) $per = $height_per; - else $per = $width_per; - } else { - if($width_per < $height_per) $per = $height_per; - else $per = $width_per; - - } - - if(!$per) $per = 1; - // 원본 이미지의 타입으로 임시 이미지 생성 switch($type) { case 'gif' : @@ -269,8 +268,13 @@ $new_width = (int)($width * $per); $new_height = (int)($height * $per); - $x = (int)($resize_width/2 - $new_width/2); - $y = (int)($resize_height/2 - $new_height/2); + if($thumbnail_type == 'crop') { + $x = (int)($resize_width/2 - $new_width/2); + $y = (int)($resize_height/2 - $new_height/2); + } else { + $x = 0; + $y = 0; + } if($source) { if(function_exists('imagecopyresampled')) @imagecopyresampled($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height); diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 34a646126..1660ce888 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -107,6 +107,13 @@ // mid값이 있을 경우 mid값을 세팅 if($this->mid) Context::set('mid', $this->mid, true); + + // 현재 모듈의 정보를 세팅 + Context::set('current_module_info', $module_info); + + // 실제 동작을 하기 전에 trigger 호출 + $output = ModuleHandler::triggerCall('display', 'before', $content); + if(!$output->toBool()) die($output->getMessage()); } /** @@ -336,5 +343,45 @@ // 객체 리턴 return $GLOBALS['_loaded_module'][$module][$type][$kind]; } + + /** + * @brief trigger_name, called_position을 주고 trigger 호출 + **/ + function triggerCall($trigger_name, $called_position, &$obj) { + // 설치가 안되어 있다면 trigger call을 하지 않고 바로 return + if(!Context::isInstalled()) return new Object(); + + $oModuleModel = &getModel('module'); + + $cache_dir = sprintf("./files/cache/triggers/"); + if(!is_dir($cache_dir)) FileHandler::makeDir($cache_dir); + + $cache_file = sprintf("%s%s.%s", $cache_dir, $trigger_name, $called_position); + + if(!@file_exists($cache_file)) { + $triggers = $oModuleModel->getTriggers($trigger_name, $called_position); + FileHandler::writeFile($cache_file, serialize($triggers)); + } else { + $buff = FileHandler::readFile($cache_file); + $triggers = unserialize($buff); + } + + if(!$triggers || !count($triggers)) return new Object(); + + foreach($triggers as $item) { + $module = $item->module; + $type = $item->type; + $called_method = $item->called_method; + + $oModule = null; + $oModule = &getModule($module, $type); + if(!$oModule || !method_exists($oModule, $called_method)) continue; + + $output = $oModule->{$called_method}($obj); + if(!$output->toBool()) return $output; + } + + return new Object(); + } } ?> diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php index 2ff8ab3ca..5c8ffe41d 100644 --- a/classes/optimizer/Optimizer.class.php +++ b/classes/optimizer/Optimizer.class.php @@ -96,10 +96,13 @@ // css 일경우 background:url() 변경 if($type == "css") $str = $this->replaceCssPath($file, $str); - $content_buff .= $str."\r\n"; + $content_buff .= $str."\n"; } + if($type == "css") $content_buff = '@charset "utf-8";'."\n".$content_buff; + if($type!="css" && Context::isGzEnabled()) $content_buff = ob_gzhandler($content_buff, 5); + $content_file = eregi_replace("\.php$","",$filename); $content_filename = str_replace($this->cache_path, '', $content_file); @@ -142,6 +145,8 @@ EndOfBuff; $str = preg_replace('!\/([^\/]*)\/\.\.\/!is','/', $str); + $str = preg_replace('!@charset([^;]*?);!is','',$str); + return $str; } diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php index 005ee2398..00cb73109 100644 --- a/classes/widget/WidgetHandler.class.php +++ b/classes/widget/WidgetHandler.class.php @@ -41,6 +41,9 @@ if(!is_dir(sprintf('./widgets/%s/',$widget))) return; + $cache_path = './files/cache/widget_cache/'; + if(!is_dir($cache_path)) FileHandler::makeDir($cache_path); + // $widget의 객체를 받음 $oWidget = WidgetHandler::getObject($widget); diff --git a/common/css/button.css b/common/css/button.css index a89a8fb93..fb4ae9dbb 100644 --- a/common/css/button.css +++ b/common/css/button.css @@ -1,167 +1,211 @@ -/* - http://www.hedgerwow.com/360/dhtml/css-round-button/demo.php -*/ - -a.button, span.button, del.button { - display:-moz-inline-box; - display:inline-block; - cursor:pointer; - border:none; +a.button, span.button, del.button{ + + display:-moz-inline-box; + display:inline-block; + cursor:pointer; + border:none; font-size:0; line-height:0; - - /* - for Safari, read this first - http://creativebits.org/webdev/safari_background_repeat_bug_fix - */ - background-position:0 -3px; - background-repeat:no-repeat; - height:24px; - text-decoration:none; - color:#2e523b; - font-style:normal; - margin:0 6px 0px 0; - padding:0 10px 0 0; - vertical-align:middle; - + + /* + for Safari, read this first + http://creativebits.org/webdev/safari_background_repeat_bug_fix + */ + background-position:0 0; + background-repeat:no-repeat; + height:30px; + text-decoration:none; + color:#2e523b; + font-style:normal; + margin:0 6px 0px 0; + padding:0 10px 0 0; + vertical-align:middle; + padding-top:-2px; - position:relative; - _width:10px; - _overflow-y:hidden; + _position:relative; + _top:-4px; + _width:10px; + _overflow-y:hidden; +} +*:first-child+html a.button, *:first-child+html span.button,*:first-child+html del.button { + position:relative; + top:-4px; } -a.button, span.button, del.button, a.button span, span.button button, span.button input, del.button span { + + +a.button, span.button, del.button, +a.button span, span.button button, span.button input, del.button span{ background-image:url(../tpl/images/form_buttons.png); _background-image:url(../tpl/images/form_buttons.gif); } -a.button span, span.button button, span.button input, del.button span { - white-space:nowrap; - cursor:pointer; +a.button span, span.button button, span.button input, del.button span{ + + white-space:nowrap; + cursor:pointer; color:#222; - display:-moz-inline-box; - display:inline-block; - line-height:1; + display:-moz-inline-box; + display:inline-block; + line-height:1; letter-spacing:0 !important; + font-family:"Arial" !important; font-size:12px !important; font-style:normal; background-color:transparent; - background-position:100% -3px; - background-repeat:no-repeat; - height:24px; - padding:4px 11px 0 7px; - margin:0 -18px 0 6px; - border:none; - vertical-align:text-top; - zoom:1; - _position:relative; - _padding:3px 13px 0 4px; - _margin:0 -10px 0 4px; - _display:block; - _top:0; - _right:-5px; + background-position:100% 0; + background-repeat:no-repeat; + height:30px; + padding:8px 20px 0 10px; + margin:0 -16px 0 10px; + border:none; + zoom:1; + _position:relative; + _padding-left:0px; + _padding-right:12px; + _margin-right:-10px; + _display:block; + _right:-5px; + } -*:first-child+html a.button span, span.button button, span.button input, del.button span { padding-top:6px; } - - -span.button button { - line-height:2.5;/*Opera need this*/ +span.button button{ + line-height:2.5;/*Opera need this*/ } -html.safari a.button span, html.safari del.button span { - line-height:1.3; +html.safari a.button span, +html.safari del.button span{ + line-height:1.3; } -html.safari span.button button { - line-height:2.6; +html.safari span.button button{ + line-height:2.6; } -html.safari a.button:focus, html.safari span.button button:focus { +html.safari a.button:focus, +html.safari span.button button:focus{ outline:none; } + + del.button{ - /* cursor:not-allowed; */ - background-position:0 -123px; - + /* cursor:not-allowed; */ + background-position:0 -120px; + } -del.button span { - cursor:default; +del.button span{ + cursor:default; color:#aaa !important; - background-position:100% -123px; + background-position:100% -120px; } -a.button span { - _padding-top:7px; -} -*:first-child+html a.button span { padding-top:7px; } -span.button button, span.button input { - padding:0 6px 0 0; - line-height:2.5;/*Opera need this*/ +span.button button, span.button input{ + padding-top:0px; + line-height:2.5;/*Opera need this*/ } + /** optional **/ /* a.button:visited{ - color:#aaa; + color:#aaa; } */ + /*Hover Style*/ -a.button:hover, span.button:hover, a.button:focus, a.dom-button-focus, span.button-behavior-hover { - background-position:0 -63px; - color:#222; - text-decoration:none; -} -a.button:hover span, span.button:hover input, span.button:hover button, a.button:focus span, span.button-behavior-hover button, span.button-behavior-hover input { - background-position:100% -63px; +a.button:hover, +span.button:hover, +a.button:focus, + +a.dom-button-focus, +span.button-behavior-hover{ + background-position:0 -60px; + color:#222; + text-decoration:none; } -a.button:active, a.button:focus span { - color:#444; + + + +a.button:hover span, +span.button:hover button, +a.button:focus span, + +span.button-behavior-hover button, +span.button-behavior-hover input{ + background-position:100% -60px; } -del.button-behavior-hover, del.button:hover { - background-position:0 -183px; - /* cursor:not-allowed; */ + +a.button:active, a.button:focus span{ + color:#444; } -del.button-behavior-hover span, del.button:hover span { - background-position:100% -183px; - /* cursor:not-allowed; */ + + + +del.button-behavior-hover, del.button:hover{ + background-position:0 -180px; + /* cursor:not-allowed; */ } + +del.button-behavior-hover span, del.button:hover span{ + background-position:100% -180px; + /* cursor:not-allowed; */ + +} + + + + /*Optional hack for IE6 to simulate :hover selector*/ -span.button button, del.button span, span.button input { - _behavior:expression( - (function(el){ - if( typeof( behavior_onMouseEnter) == 'undefined'){ - behavior_onMouseEnter = function(el) { - var dEl = this.parentNode; - var sClass = dEl.className ; - dEl.__defaultClassName = sClass ; - dEl.className = sClass + ' button-behavior-hover'; - this.setCapture(); - }; +span.button button, del.button span, span.button input{ + + + + _behavior:expression( + (function(el){ + + if( typeof( behavior_onMouseEnter) == 'undefined'){ + + + behavior_onMouseEnter = function(el){ + + var dEl = this.parentNode; + var sClass = dEl.className ; + dEl.__defaultClassName = sClass ; + dEl.className = sClass + ' button-behavior-hover'; + this.setCapture(); + }; + + behavior_onMouseLeave = function(el) { + var dEl = this.parentNode; + dEl.className = dEl.__defaultClassName ; + dEl.__defaultClassName = undefined; + this.releaseCapture(); + }; + + + }; + + + el.runtimeStyle.behavior = 'none'; + el.onmouseenter = behavior_onMouseEnter; + el.onmouseleave = behavior_onMouseLeave; + + + })(this)); + + - behavior_onMouseLeave = function(el) { - var dEl = this.parentNode; - dEl.className = dEl.__defaultClassName ; - dEl.__defaultClassName = undefined; - this.releaseCapture(); - }; - }; - el.runtimeStyle.behavior = 'none'; - el.onmouseenter = behavior_onMouseEnter; - el.onmouseleave = behavior_onMouseLeave; - } - )(this)); } diff --git a/common/css/default.css b/common/css/default.css index f526befd6..567e73539 100644 --- a/common/css/default.css +++ b/common/css/default.css @@ -27,7 +27,7 @@ IE7 & IE6 & Below html { width:100%; } body { margin:0; font-size:.75em; font-family:sans-serif;} img { border:none; } -label { cursor:pointer; position:relative; left:5px; } +label { cursor:pointer; } form { margin:0; padding:0; } .iePngFix { behavior:url(./common/js/iePngFix.htc); } @@ -66,15 +66,16 @@ a.bold { font-weight:bold; } .folder_closer { display: none; } .folder_area { display: none; } -.zbxe_widget_output { background-image:url(../tpl/images/widget_text.gif) no-repeat center bottom; display:block;} -.member_signature { margin-top:10px; border:1px solid #DDDDDD; padding:10px; } +.zbxe_widget_output { background:url(../tpl/images/widget_text.gif) no-repeat center bottom; display:block;} +.member_signature { margin-top:10px; border:1px solid #DDDDDD; padding:10px; overflow:hidden;} +.member_profile_image { float:left; margin-right:10px; } #waitingforserverresponse { display:inline; border:2px solid #444444; background-color:#FFFFFF; padding:15px 20px 13px 20px; font-weight:bold; color:#444444; top:40px; left:40px; position:absolute; z-index:100; visibility:hidden; } #fororiginalimageareabg { z-index:1001; background-color:#FFFFFF; width:100%; height:100%; top:0px; left:0px; position:relative; padding:20px 10px 10px 10px; border:8px solid #DDDDDD; } #fororiginalimagearea { visibility:hidden; padding:0px; margin:0px; width:100%; height:100%; top:0px; left:0px; position:absolute; z-index:1000; text-align:left; overflow:hidden; } #fororiginalimage { z-index:1002; } #closeOriginalImageBtn { position:absolute; right:8px; top:5px; cursor:pointer; width:50px; height:12px; z-index:1003; } -#membermenuarea { position:absolute; left:0px; top:0px; z-index:1003; visibility:hidden; border:2px solid #D9D9D9; background-color:#FFFFFF; padding:0; } -#membermenuarea .box { border:1px solid #CACACA; background-color:#FFFFFF; padding:7px; line-height:22px;} -#membermenuarea .item { color:#333333; cursor:pointer; margin:0; padding:3px 0 3px 18px; white-space:nowrap; height:22px;} -#membermenuarea .item_on { color:#333333; font-weight:bold; margin:0; cursor:pointer; padding:3px 0 3px 18px; height:22px; letter-spacing:-1px; white-space:nowrap;} +#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; line-height:22px;} +#popup_menu_area .item { color:#333333; cursor:pointer; margin:0; padding:3px 0 3px 0; white-space:nowrap; height:22px;} +#popup_menu_area .item_on { color:#333333; font-weight:bold; margin:0; cursor:pointer; padding:3px 0 3px 0; height:22px; letter-spacing:-1px; white-space:nowrap;} diff --git a/common/js/common.js b/common/js/common.js index b3a07e38b..770282b6e 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -456,68 +456,91 @@ function origImageDragMouseMove(evt) { } /** - * @brief 이름을 클릭하였을 경우 메뉴를 보여주는 함수 - * 이름 클릭시 MemberModel::getMemberMenu 를 호출하여 그 결과를 보여줌 (사용자의 속성에 따라 메뉴가 달라지고 애드온의 연결을 하기 위해서임) + * @brief 이름, 게시글등을 클릭하였을 경우 팝업 메뉴를 보여주는 함수 **/ -xAddEventListener(document, 'click', chkMemberMenu); -xAddEventListener(window, 'load', function() { setMemberMenuObjCursor(xGetElementsByTagName("div")); xGetElementsByTagName("span"); } ); -var loaded_member_menu_list = new Array(); +xAddEventListener(document, 'click', chkPopupMenu); +var loaded_popup_menu_list = new Array(); -// className = "member_*" 일 경우의 object가 클릭되면 해당 회원의 메뉴를 출력함 -function chkMemberMenu(evt) { - var area = xGetElementById("membermenuarea"); +// 클릭 이벤트 발생시 이벤트가 일어난 대상을 검사하여 적절한 규칙에 맞으면 처리 +function chkPopupMenu(evt) { + // 이전에 호출되었을지 모르는 팝업메뉴 숨김 + var area = xGetElementById("popup_menu_area"); if(!area) return; if(area.style.visibility!="hidden") area.style.visibility="hidden"; + // 이벤트 대상이 없으면 무시 var e = new xEvent(evt); if(!e) return; + // 대상의 객체 구함 var obj = e.target; - while(obj) { - if(obj && obj.className && obj.className.search("member_")!=-1) break; + if(!obj) return; + + // obj의 nodeName이 div나 span이 아니면 나올대까지 상위를 찾음 + if(obj && obj.nodeName != 'DIV' && obj.nodeName != 'SPAN') { obj = obj.parentNode; } - if(!obj || !obj.className || obj.className.search("member_")==-1) { - return; + if(!obj || (obj.nodeName != 'DIV' && obj.nodeName != 'SPAN')) return; + + // 객체의 className값을 구함 + var class_name = obj.className; + if(!class_name) return; + + // className을 분리 + var class_name_list = class_name.split(' '); + var menu_id = ''; + var menu_id_regx = /^([a-zA-Z]+)_([0-9]+)$/ig; + for(var i in class_name_list) { + if(menu_id_regx.test(class_name_list[i])) { + menu_id = class_name_list[i]; + break; + } } + if(!menu_id) return; - if(obj.className.indexOf('member_-1')>=0) return; + // module명과 대상 번호가 없으면 return + var tmp_arr = menu_id.split('_'); + var module_name = tmp_arr[0]; + var target_srl = tmp_arr[1]; + if(!module_name || !target_srl || target_srl < 1) return; - var member_srl = parseInt(obj.className.replace(/member_([0-9]+)/ig,'$1').replace(/([^0-9]*)/ig,''),10); - if(!member_srl) return; - - // 현재 글의 mid, module를 구함 - var mid = current_mid; + // action이름을 규칙에 맞게 작성 + var action_name = "get" + module_name.substr(0,1).toUpperCase() + module_name.substr(1,module_name.length-1) + "Menu"; // 서버에 메뉴를 요청 var params = new Array(); - params["member_srl"] = member_srl; - params["cur_mid"] = mid; + params["target_srl"] = target_srl; + params["cur_mid"] = current_mid; params["cur_act"] = current_url.getQuery('act'); + params["menu_id"] = menu_id; params["page_x"] = e.pageX; params["page_y"] = e.pageY; var response_tags = new Array("error","message","menu_list"); - if(loaded_member_menu_list[member_srl]) { - params["menu_list"] = loaded_member_menu_list[member_srl]; - displayMemberMenu(params, response_tags, params); + if(loaded_popup_menu_list[menu_id]) { + params["menu_list"] = loaded_popup_menu_list[menu_id]; + displayPopupMenu(params, response_tags, params); return; } + show_waiting_message = false; - exec_xml("member", "getMemberMenu", params, displayMemberMenu, response_tags, params); + exec_xml(module_name, action_name, params, displayPopupMenu, response_tags, params); show_waiting_message = true; } -function displayMemberMenu(ret_obj, response_tags, params) { - var area = xGetElementById("membermenuarea"); +function displayPopupMenu(ret_obj, response_tags, params) { + var area = xGetElementById("popup_menu_area"); + var menu_list = ret_obj['menu_list']; - var member_srl = params["member_srl"]; + + var target_srl = params["target_srl"]; + var menu_id = params["menu_id"]; var html = ""; - if(loaded_member_menu_list[member_srl]) { - html = loaded_member_menu_list[member_srl]; + if(loaded_popup_menu_list[menu_id]) { + html = loaded_popup_menu_list[menu_id]; } else { var infos = menu_list.split("\n"); if(infos.length) { @@ -532,19 +555,19 @@ function displayMemberMenu(ret_obj, response_tags, params) { var func = info_str.substr(pos+1, info_str.length).trim(); var className = "item"; - //if(i==infos.length-1) className = "item"; if(!str || !func) continue; - html += ""+str+"
"; + if(icon) html += ""+str+"
"; + else html += ""+str+"
"; } } - loaded_member_menu_list[member_srl] = html; + loaded_popup_menu_list[menu_id] = html; } if(html) { // 레이어 출력 - xInnerHtml('membermenuarea', "
"+html+"
"); + xInnerHtml('popup_menu_area', "
"+html+"
"); xWidth(area, xWidth(area)); xLeft(area, params["page_x"]); xTop(area, params["page_y"]); @@ -554,19 +577,24 @@ function displayMemberMenu(ret_obj, response_tags, params) { } } -// className = "member_*" 의 object의 cursor를 pointer로 본경 -function setMemberMenuObjCursor(obj) { - for (var i = 0; i < obj.length; ++i) { - var node = obj[i]; - if(node.className && node.className.search(/member_([0-9]+)/ig)!=-1) { - var member_srl = parseInt(node.className.replace(/member_([0-9]+)/ig,'$1').replace(/([^0-9]*)/ig,''),10); - if(member_srl<1) continue; - node.style.cursor = "pointer"; - } - } +/** + * @brief 추천/비추천,스크랩,신고기능등 특정 srl에 대한 특정 module/action을 호출하는 함수 + **/ +function doCallModuleAction(module, action, target_srl) { + var params = new Array(); + params['target_srl'] = target_srl; + params['cur_mid'] = current_mid; + exec_xml(module, action, params, completeCallModuleAction); } -// 날짜 선택 (달력 열기) +function completeCallModuleAction(ret_obj, response_tags) { + if(ret_obj['message']!='success') alert(ret_obj['message']); + location.reload(); +} + +/** + * @brief 날짜 선택 (달력 열기) + **/ function open_calendar(fo_id, day_str, callback_func) { if(typeof(day_str)=="undefined") day_str = ""; @@ -601,8 +629,9 @@ function doDocumentPreview(obj) { fo_obj = fo_obj.parentNode; } if(fo_obj.nodeName != "FORM") return; + var editor_sequence = fo_obj.getAttribute('editor_sequence'); - var content = fo_obj.content.value; + var content = editorGetContent(editor_sequence); var win = window.open("","previewDocument","toolbars=no,width=700px;height=800px,scrollbars=yes,resizable=yes"); @@ -626,6 +655,49 @@ function doDocumentPreview(obj) { } } +/* 게시글 저장 */ +function doDocumentSave(obj) { + var editor_sequence = obj.form.getAttribute('editor_sequence'); + var prev_content = editorRelKeys[editor_sequence]['content'].value; + if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') { + var content = editorGetContent(editor_sequence); + editorRelKeys[editor_sequence]['content'].value = content; + } + + var oFilter = new XmlJsFilter(obj.form, "member", "procMemberSaveDocument", completeDocumentSave); + oFilter.addResponseItem("error"); + oFilter.addResponseItem("message"); + oFilter.proc(); + + editorRelKeys[editor_sequence]['content'].value = prev_content; + return false; +} + +function completeDocumentSave(ret_obj) { + alert(ret_obj['message']); +} + +/* 저장된 게시글 불러오기 */ +var objForSavedDoc = null; +function doDocumentLoad(obj) { + // 저장된 게시글 목록 불러오기 + objForSavedDoc = obj.form; + popopen(request_uri.setQuery('module','member').setQuery('act','dispSavedDocumentList')); +} + +/* 저장된 게시글의 선택 */ +function doDocumentSelect(document_srl) { + if(!opener || !opener.objForSavedDoc) { + window.close(); + return; + } + + // 게시글을 가져와서 등록하기 + opener.location.href = opener.current_url.setQuery('document_srl', document_srl); + window.close(); +} + + /* 스킨 정보 */ function viewSkinInfo(module, skin) { popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+module+"&skin="+skin, 'SkinInfo'); diff --git a/common/js/tree_menu.js b/common/js/tree_menu.js index ca2426694..7b2d6b39d 100644 --- a/common/js/tree_menu.js +++ b/common/js/tree_menu.js @@ -239,7 +239,7 @@ function drawNode(parent_node, menu_id) { // html 작성 - html += '
'; + html += '
'; if(hasChild) html+= ''; else html+= ''; diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php index 2c3955ab6..7c1bb2823 100644 --- a/common/lang/en.lang.php +++ b/common/lang/en.lang.php @@ -21,11 +21,15 @@ $lang->cmd_comment_registration = 'Add Comment'; $lang->cmd_insert = 'Insert'; $lang->cmd_save = 'Save'; + $lang->cmd_load = '불러오기'; $lang->cmd_input = 'Input'; $lang->cmd_search = 'Search'; $lang->cmd_cancel = 'Cancel'; $lang->cmd_back = 'Go Back'; $lang->cmd_vote = 'Vote'; + $lang->cmd_vote_down = '비추천'; + $lang->cmd_declare = '신고'; + $lang->cmd_declared_list = '신고 목록'; $lang->cmd_copy = 'Copy'; $lang->cmd_move = 'Move'; $lang->cmd_move_up = 'Up'; @@ -37,12 +41,14 @@ $lang->cmd_select = 'Select'; $lang->cmd_select_all = 'Select All'; $lang->cmd_unselect_all = 'Deselect All'; + $lang->cmd_reverse_all = 'Reverse'; $lang->cmd_close_all = 'Close All'; $lang->cmd_open_all = 'Open All'; $lang->cmd_reload = 'Reload'; $lang->cmd_close = 'Close'; $lang->cmd_open = 'Open'; $lang->cmd_setup = 'Configure'; + $lang->cmd_addition_setup = '추가 설정'; $lang->cmd_option = 'Option'; $lang->cmd_apply = 'Apply'; $lang->cmd_open_calendar = 'Select a Date'; @@ -52,6 +58,7 @@ $lang->cmd_preview = 'Preview'; $lang->cmd_reset = 'Reset'; $lang->cmd_remake_cache = "Re-create cache file"; + $lang->cmd_publish = "발행"; $lang->enable = 'Enable'; $lang->disable = 'Disable'; @@ -78,6 +85,8 @@ $lang->browser_title = 'Browser Title'; $lang->title = 'Subject'; $lang->title_content = 'Subject+Content'; + $lang->topic = '주제'; + $lang->replies = '응답'; $lang->content = 'Content'; $lang->document = 'Article'; $lang->comment = 'Comment'; @@ -120,6 +129,7 @@ $lang->date = 'Date'; $lang->regdate = 'Registered Date'; $lang->last_update = 'Latest Update'; + $lang->last_post = '최근 등록'; $lang->signup_date = 'Join Date'; $lang->last_login = 'Latest Login'; $lang->first_page = 'First Page'; @@ -168,6 +178,7 @@ $lang->msg_module_is_not_standalone = 'Requested module cannot be executed independently'; $lang->success_registed = 'Registered successfully'; + $lang->success_declared = '신고되었습니다'; $lang->success_updated = 'Updated successfully'; $lang->success_deleted = 'Deleted successfully'; $lang->success_voted = 'Voted successfully'; @@ -175,11 +186,13 @@ $lang->success_sended = 'Sent successfully'; $lang->success_reset = 'Reset successfully'; $lang->success_leaved = 'All member data have been deleted completely.'; + $lang->success_saved = '저장되었습니다'; $lang->fail_to_delete = 'Could not be deleted'; $lang->fail_to_move = 'Could not be moved'; $lang->failed_voted = 'Could not vote'; + $lang->failed_declared = '신고를 하실 수 없습니다'; $lang->fail_to_delete_have_children = 'Please try again after removing replies first'; $lang->confirm_submit = 'Are you sure to submit?'; diff --git a/common/lang/es.lang.php b/common/lang/es.lang.php index 0d1d5d132..da9ec15fc 100644 --- a/common/lang/es.lang.php +++ b/common/lang/es.lang.php @@ -21,11 +21,15 @@ $lang->cmd_comment_registration = 'Agregar commentarios'; $lang->cmd_insert = 'Insertar'; $lang->cmd_save = 'Guardar'; + $lang->cmd_load = '불러오기'; $lang->cmd_input = 'Ingresar'; $lang->cmd_search = 'Buscar'; $lang->cmd_cancel = 'Cancelar'; $lang->cmd_back = 'Atrás'; $lang->cmd_vote = 'Recomendar'; + $lang->cmd_vote_down = '비추천'; + $lang->cmd_declare = '신고'; + $lang->cmd_declared_list = '신고 목록'; $lang->cmd_copy = 'Copia'; $lang->cmd_move = 'Mover'; $lang->cmd_move_up = 'Arriba'; @@ -43,6 +47,7 @@ $lang->cmd_close = 'Cerrar'; $lang->cmd_open = 'Abrir'; $lang->cmd_setup = 'Configuración'; + $lang->cmd_addition_setup = '추가 설정'; $lang->cmd_option = 'Opción'; $lang->cmd_apply = 'Aplicar'; $lang->cmd_open_calendar = 'Abrir el calendario'; @@ -51,6 +56,8 @@ $lang->cmd_scrap = 'Scrap'; $lang->cmd_preview = 'Previo'; $lang->cmd_reset = 'Rehacer'; + $lang->cmd_remake_cache = "캐시파일 재생성"; + $lang->cmd_publish = "발행"; $lang->enable = 'Activar'; $lang->disable = 'Desactivar'; @@ -77,6 +84,8 @@ $lang->browser_title = 'Título del navegador'; $lang->title = 'Título'; $lang->title_content = 'Título+Contenido'; + $lang->topic = '주제'; + $lang->replies = '응답'; $lang->content = 'Contenidos'; $lang->document = 'Documentos'; $lang->comment = 'Commentarios'; @@ -119,6 +128,7 @@ $lang->date = 'Fecha'; $lang->regdate = 'Fecha publicada'; $lang->last_update = 'Ultima actualización'; + $lang->last_post = '최근 등록'; $lang->signup_date = 'Fecha del registro'; $lang->last_login = 'Ultima conección'; $lang->first_page = 'Primera página'; @@ -167,6 +177,7 @@ $lang->msg_module_is_not_standalone = 'Módulo solicitado no puede ser ejecutado independientemente'; $lang->success_registed = 'Agregado con éxito'; + $lang->success_declared = '신고되었습니다'; $lang->success_updated = 'Actualizado con éxito'; $lang->success_deleted = 'Boarrado con éxito'; $lang->success_voted = 'Recomendado con éxito'; @@ -174,11 +185,13 @@ $lang->success_sended = 'Enviado con éxito'; $lang->success_reset = 'Reajustado con éxito'; $lang->success_leaved = 'Abandonado con éxito'; + $lang->success_saved = '저장되었습니다'; $lang->fail_to_delete = 'No puede ser borrado'; $lang->fail_to_move = 'No puede ser movido'; $lang->failed_voted = 'No puede ser recomendado'; + $lang->failed_declared = '신고를 하실 수 없습니다'; $lang->fail_to_delete_have_children = 'No puede ser borrado, ya que el mensaje posee respuestas '; $lang->confirm_submit = '¿Está seguro que desea enviar?'; diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php index a19486c0d..2d6eed408 100644 --- a/common/lang/fr.lang.php +++ b/common/lang/fr.lang.php @@ -21,11 +21,15 @@ $lang->cmd_comment_registration = 'Ajouter le Commentaire'; $lang->cmd_insert = 'Insérer'; $lang->cmd_save = 'Economiser'; + $lang->cmd_load = '불러오기'; $lang->cmd_input = 'Entrer'; $lang->cmd_search = 'Rechercher'; $lang->cmd_cancel = 'Decommander'; $lang->cmd_back = 'Retour'; $lang->cmd_vote = 'Voter'; + $lang->cmd_vote_down = '비추천'; + $lang->cmd_declare = '신고'; + $lang->cmd_declared_list = '신고 목록'; $lang->cmd_copy = 'Copie'; $lang->cmd_move = 'Deplacer'; $lang->cmd_move_up = 'Relever'; @@ -43,11 +47,17 @@ $lang->cmd_close = 'Fermer'; $lang->cmd_open = 'Cloturer'; $lang->cmd_setup = 'Configurer'; + $lang->cmd_addition_setup = '추가 설정'; $lang->cmd_option = 'Option'; $lang->cmd_apply = 'Appliquer'; $lang->cmd_open_calendar = 'Choisir la Date'; $lang->cmd_send = 'Envoyer'; $lang->cmd_print = 'Imprimer'; + $lang->cmd_scrap = '스크랩'; + $lang->cmd_preview = '미리 보기'; + $lang->cmd_reset = '초기화'; + $lang->cmd_remake_cache = "캐시파일 재생성"; + $lang->cmd_publish = "발행"; $lang->enable = 'Permettre'; $lang->disable = 'Neutraliser'; @@ -74,6 +84,8 @@ $lang->browser_title = 'Titre de Navigateur'; $lang->title = 'Titre'; $lang->title_content = 'Titre + Contenu'; + $lang->topic = '주제'; + $lang->replies = '응답'; $lang->content = 'Contenu'; $lang->document = 'Article'; $lang->comment = 'Commentaire'; @@ -115,6 +127,7 @@ $lang->date = 'Date'; $lang->regdate = 'Date d\'Enregistrement'; $lang->last_update = 'La Dernière Mise a Jour'; + $lang->last_post = '최근 등록'; $lang->signup_date = 'Date d\'Enregistrement'; $lang->last_login = 'La Dernière Ouverture'; $lang->first_page = 'Première Page'; @@ -163,6 +176,7 @@ $lang->msg_module_is_not_standalone = 'Le module demandé ne peut pas être exécuté indépendamment.'; $lang->success_registed = 'L\'enregistrement a été avec succès exécuté.'; + $lang->success_declared = '신고되었습니다'; $lang->success_updated = 'Avec succès mis a jour.'; $lang->success_deleted = 'Avec succès supprime'; $lang->success_voted = 'Avec succès voté'; @@ -170,11 +184,13 @@ $lang->success_sended = 'Avec succès envoyé'; $lang->success_reset = 'Avec succès remisé'; $lang->success_leaved = 'Avec succès fait cécession'; + $lang->success_saved = '저장되었습니다'; $lang->fail_to_delete = 'N\'a pas pu être supprimé.'; $lang->fail_to_move = 'N\'a pas pu être déplacé'; $lang->failed_voted = 'La demande de voter a échoué'; + $lang->failed_declared = '신고를 하실 수 없습니다'; $lang->fail_to_delete_have_children = 'Une ou plusieurs reponses existent et ne pourraient pas être supprimees ainsi'; $lang->confirm_submit = 'Etes-vous sur vous voulez-vous soumettre?'; diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php index 839f363cf..b2fb601b4 100644 --- a/common/lang/jp.lang.php +++ b/common/lang/jp.lang.php @@ -21,11 +21,15 @@ $lang->cmd_comment_registration = 'コメント登録'; $lang->cmd_insert = '挿入'; $lang->cmd_save = '保存'; + $lang->cmd_load = '불러오기'; $lang->cmd_input = '入力'; $lang->cmd_search = '検索'; $lang->cmd_cancel = 'キャンセル'; $lang->cmd_back = '戻る'; $lang->cmd_vote = '推薦'; + $lang->cmd_vote_down = '비추천'; + $lang->cmd_declare = '신고'; + $lang->cmd_declared_list = '신고 목록'; $lang->cmd_copy = 'コピー'; $lang->cmd_move = '移動'; $lang->cmd_move_up = '上へ'; @@ -43,6 +47,7 @@ $lang->cmd_close = '閉じる'; $lang->cmd_open = '開く'; $lang->cmd_setup = '設定'; + $lang->cmd_addition_setup = '추가 설정'; $lang->cmd_apply = '適用'; $lang->cmd_option = 'オプション'; $lang->cmd_open_calendar = 'カレンダーを開く'; @@ -52,6 +57,7 @@ $lang->cmd_preview = 'プレビュー'; $lang->cmd_reset = '初期化'; $lang->cmd_remake_cache = "キャッシュファイル再生成"; + $lang->cmd_publish = "발행"; $lang->enable = '可能'; $lang->disable = '不可'; @@ -78,6 +84,8 @@ $lang->browser_title = 'ブラウザタイトル'; $lang->title = 'タイトル'; $lang->title_content = 'タイトル＋内容'; + $lang->topic = '주제'; + $lang->replies = '응답'; $lang->content = '内容'; $lang->document = '書き込み'; $lang->comment = 'コメント'; @@ -120,6 +128,7 @@ $lang->date = '年月日'; $lang->regdate = '登録日'; $lang->last_update = '最近修正日'; + $lang->last_post = '최근 등록'; $lang->signup_date = '加入日'; $lang->last_login = '最近ログイン'; $lang->first_page = '最初のページ'; @@ -168,6 +177,7 @@ $lang->msg_module_is_not_standalone = 'このモジュールはスタンドアローンでは作動しません。'; $lang->success_registed = '登録しました。'; + $lang->success_declared = '신고되었습니다'; $lang->success_updated = '修正しました。'; $lang->success_deleted = '削除しました。'; $lang->success_voted = '推薦しました。'; @@ -175,11 +185,13 @@ $lang->success_sended = '送信しました。'; $lang->success_reset = '初期化しました。'; $lang->success_leaved = '脱会しました。'; + $lang->success_saved = '저장되었습니다'; $lang->fail_to_delete = '削除に失敗しました。'; $lang->fail_to_move = '移動に失敗しました。'; $lang->failed_voted = '推薦できません。'; + $lang->failed_declared = '신고를 하실 수 없습니다'; $lang->fail_to_delete_have_children = '返信の書き込みがあり、削除できません。'; $lang->confirm_submit = '登録しますか？'; diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php index 1bdffd515..3d603aa46 100644 --- a/common/lang/ko.lang.php +++ b/common/lang/ko.lang.php @@ -21,11 +21,15 @@ $lang->cmd_comment_registration = '댓글 등록'; $lang->cmd_insert = '추가'; $lang->cmd_save = '저장'; + $lang->cmd_load = '불러오기'; $lang->cmd_input = '입력'; $lang->cmd_search = '검색'; $lang->cmd_cancel = '취소'; $lang->cmd_back = '돌아가기'; $lang->cmd_vote = '추천'; + $lang->cmd_vote_down = '비추천'; + $lang->cmd_declare = '신고'; + $lang->cmd_declared_list = '신고 목록'; $lang->cmd_copy = '복사'; $lang->cmd_move = '이동'; $lang->cmd_move_up = '위로'; @@ -44,6 +48,7 @@ $lang->cmd_close = '닫기'; $lang->cmd_open = '열기'; $lang->cmd_setup = '설정'; + $lang->cmd_addition_setup = '추가 설정'; $lang->cmd_option = '옵션'; $lang->cmd_apply = '적용'; $lang->cmd_open_calendar = '날짜 선택'; @@ -53,6 +58,7 @@ $lang->cmd_preview = '미리 보기'; $lang->cmd_reset = '초기화'; $lang->cmd_remake_cache = "캐시파일 재생성"; + $lang->cmd_publish = "발행"; $lang->enable = '가능'; $lang->disable = '불가능'; @@ -79,6 +85,8 @@ $lang->browser_title = '브라우저 제목'; $lang->title = '제목'; $lang->title_content = '제목+내용'; + $lang->topic = '주제'; + $lang->replies = '응답'; $lang->content = '내용'; $lang->document = '게시물'; $lang->comment = '댓글'; @@ -120,7 +128,8 @@ $lang->member_count = '회원수'; $lang->date = '날짜'; $lang->regdate = '등록일'; - $lang->last_update = '최근수정일'; + $lang->last_update = '최근 수정일'; + $lang->last_post = '최근 등록'; $lang->signup_date = '가입일'; $lang->last_login = '최근로그인'; $lang->first_page = '첫페이지'; @@ -169,6 +178,7 @@ $lang->msg_module_is_not_standalone = '요청하신 모듈은 독립적으로 동작할 수가 없습니다'; $lang->success_registed = '등록되었습니다'; + $lang->success_declared = '신고되었습니다'; $lang->success_updated = '수정되었습니다'; $lang->success_deleted = '삭제되었습니다'; $lang->success_voted = '추천되었습니다'; @@ -176,11 +186,13 @@ $lang->success_sended = '발송되었습니다'; $lang->success_reset = '초기화되었습니다'; $lang->success_leaved = '탈퇴되었습니다'; + $lang->success_saved = '저장되었습니다'; $lang->fail_to_delete = '삭제 실패하였습니다'; $lang->fail_to_move = '이동 실패하였습니다'; $lang->failed_voted = '추천하실 수 없습니다'; + $lang->failed_declared = '신고를 하실 수 없습니다'; $lang->fail_to_delete_have_children = '답글이 있어서 삭제할 수 없습니다'; $lang->confirm_submit = '등록하시겠습니까?'; diff --git a/common/lang/lang.info b/common/lang/lang.info new file mode 100644 index 000000000..c91900c85 --- /dev/null +++ b/common/lang/lang.info @@ -0,0 +1,5 @@ +ko,한국어 +en,English +zh-CN,中文 +jp,日本語 +es,Español diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php index a95f91c3f..970cdc4b3 100644 --- a/common/lang/zh-CN.lang.php +++ b/common/lang/zh-CN.lang.php @@ -21,11 +21,15 @@ $lang->cmd_comment_registration = '提交评论'; $lang->cmd_insert = '添加'; $lang->cmd_save = '保存'; + $lang->cmd_load = '불러오기'; $lang->cmd_input = '输入'; $lang->cmd_search = '搜索'; $lang->cmd_cancel = '取消'; $lang->cmd_back = '返回'; $lang->cmd_vote = '推荐'; + $lang->cmd_vote_down = '비추천'; + $lang->cmd_declare = '신고'; + $lang->cmd_declared_list = '신고 목록'; $lang->cmd_copy = '复制'; $lang->cmd_move = '查看'; $lang->cmd_move_up = '向上'; @@ -44,6 +48,7 @@ $lang->cmd_close = '关闭'; $lang->cmd_open = '打开'; $lang->cmd_setup = '设置'; + $lang->cmd_addition_setup = '추가 설정'; $lang->cmd_option = '选项'; $lang->cmd_apply = '应用'; $lang->cmd_open_calendar = '选择日期'; @@ -53,6 +58,7 @@ $lang->cmd_preview = '预览'; $lang->cmd_reset = '初始化'; $lang->cmd_remake_cache = "重新生成缓冲文件"; + $lang->cmd_publish = "발행"; $lang->enable = '可用'; $lang->disable = '禁用'; @@ -79,6 +85,8 @@ $lang->browser_title = '浏览器标题'; $lang->title = '标题'; $lang->title_content = '标题+内容'; + $lang->topic = '주제'; + $lang->replies = '응답'; $lang->content = '内容'; $lang->document = '文章'; $lang->comment = '评论'; @@ -121,6 +129,7 @@ $lang->date = '日期'; $lang->regdate = '登录日期'; $lang->last_update = '最后更新'; + $lang->last_post = '최근 등록'; $lang->signup_date = '注册日期'; $lang->last_login = '最近登录'; $lang->first_page = '第一页'; @@ -169,6 +178,7 @@ $lang->msg_module_is_not_standalone = '您请求的模块不能单独执行'; $lang->success_registed = '提交成功！'; + $lang->success_declared = '신고되었습니다'; $lang->success_updated = '修改成功！'; $lang->success_deleted = '删除成功！'; $lang->success_voted = '推荐成功！'; @@ -176,11 +186,13 @@ $lang->success_sended = '发送成功！'; $lang->success_reset = '初始化成功'; $lang->success_leaved = '注销成功！'; + $lang->success_saved = '저장되었습니다'; $lang->fail_to_delete = '删除成功！'; $lang->fail_to_move = '移动成功！'; $lang->failed_voted = '您不能推荐！'; + $lang->failed_declared = '신고를 하실 수 없습니다'; $lang->fail_to_delete_have_children = '不能删除有回复的评论！'; $lang->confirm_submit = '确定要提交吗?'; diff --git a/common/tpl/calendar.php b/common/tpl/calendar.php index b2bcef5d4..9d9d1035a 100644 --- a/common/tpl/calendar.php +++ b/common/tpl/calendar.php @@ -7,14 +7,14 @@ $min_year = 1900;//년 (0년 부터) #################### - $year = $_REQUEST['year']; - $month = $_REQUEST['month']; + $year = htmlspecialchars($_REQUEST['year']); + $month = htmlspecialchars($_REQUEST['month']); - $method = $_REQUEST['method']; - $fo_id = $_REQUEST['fo_id']; - $callback_func = $_REQUEST['callback_func']; + $method = htmlspecialchars($_REQUEST['method']); + $fo_id = htmlspecialchars($_REQUEST['fo_id']); + $callback_func = htmlspecialchars($_REQUEST['callback_func']); - $day_str = $_REQUEST['day_str']; // 날짜 (ex. 20080101) + $day_str = htmlspecialchars($_REQUEST['day_str']); // 날짜 (ex. 20080101) if($day_str && strlen($day_str)) { $year = substr($day_str, 0, 4); $month = substr($day_str, 4, 2); @@ -151,7 +151,7 @@ $before_month_month_day = convertDatetoDay( $month == 1 ? $year - 1 : $year, $mo
-

Calendar

+

Calendar

@@ -163,12 +163,11 @@ $before_month_month_day = convertDatetoDay( $month == 1 ? $year - 1 : $year, $mo
- <?php echo $year - 1?><?php echo $year + 1?> + <?php echo $year - 1?><?php echo $year + 1?>

- prevnext - + prevnext
@@ -184,7 +183,7 @@ $before_month_month_day = convertDatetoDay( $month == 1 ? $year - 1 : $year, $mo


-
Go Today
+
Go Today
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index c1458a9c2..9752cdc73 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -32,7 +32,7 @@ close original image -
+ {Context::getHtmlFooter()} diff --git a/config/func.inc.php b/config/func.inc.php index 6182ca72a..e7137efa9 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -198,13 +198,17 @@ * 손쉽고 확실한 변환을 위해 2byte unicode로 변형한후 처리를 한다 **/ function cut_str($string, $cut_size, $tail='...') { - if(!function_exists('iconv')) return $string; if(!$string || !$cut_size) return $string; - $unicode_str = iconv("UTF-8","UCS-2",$string); - if(strlen($unicode_str) < $cut_size*2) return $string; - $output_str = substr($unicode_str, 0, $cut_size*2); - return iconv("UCS-2","UTF-8",$output_str).$tail; + if(function_exists('iconv')) { + $unicode_str = iconv("UTF-8","UCS-2",$string); + if(strlen($unicode_str) < $cut_size*2) return $string; + $output_str = substr($unicode_str, 0, $cut_size*2); + return iconv("UCS-2","UTF-8",$output_str).$tail; + } + + $arr = array(); + return preg_match('/.{'.$cut_size.'}/su', $string, $arr) ? $arr[0].$tail : $string; } /** @@ -220,27 +224,24 @@ $year = (int)substr($str,0,4); $month = (int)substr($str,4,2); $day = (int)substr($str,6,2); - if(strlen($str) <= 8) - { - $gap = 0; - } - else - { - $time_zone = $GLOBALS['_time_zone']; - if($time_zone<0) $to = -1; else $to = 1; - $t_hour = substr($time_zone,1,2)*$to; - $t_min = substr($time_zone,3,2)*$to; + if(strlen($str) <= 8) { + $gap = 0; + } else { + $time_zone = $GLOBALS['_time_zone']; + if($time_zone<0) $to = -1; else $to = 1; + $t_hour = substr($time_zone,1,2)*$to; + $t_min = substr($time_zone,3,2)*$to; - $server_time_zone = date("O"); - if($server_time_zone<0) $so = -1; else $so = 1; - $c_hour = substr($server_time_zone,1,2)*$so; - $c_min = substr($server_time_zone,3,2)*$so; + $server_time_zone = date("O"); + if($server_time_zone<0) $so = -1; else $so = 1; + $c_hour = substr($server_time_zone,1,2)*$so; + $c_min = substr($server_time_zone,3,2)*$so; - $g_min = $t_min - $c_min; - $g_hour = $t_hour - $c_hour; + $g_min = $t_min - $c_min; + $g_hour = $t_hour - $c_hour; - $gap = $g_min*60 + $g_hour*60*60; - } + $gap = $g_min*60 + $g_hour*60*60; + } return mktime($hour, $min, $sec, $month?$month:1, $day?$day:1, $year)+$gap; } @@ -379,9 +380,6 @@ // script code 제거 $content = preg_replace("!!is","",$content); - // 제로보드XE전용 주석 태그를 본문에서 제거 - $content = preg_replace('!<\!--(Before|After)Document\(([0-9]+),([0-9]+)\)-->!is', '', $content); - return $content; } diff --git a/layouts/xe_official/layout.html b/layouts/xe_official/layout.html index 6ede0e1f2..2268a7a57 100644 --- a/layouts/xe_official/layout.html +++ b/layouts/xe_official/layout.html @@ -25,10 +25,10 @@

ZeroBoard™ XElogo

- {$lang_type} Select Language + {$lang_supported[$lang_type]} Select Language
@@ -67,12 +67,10 @@ - diff --git a/modules/addon/conf/info.xml b/modules/addon/conf/info.xml index 7c75b8112..aa04249ac 100644 --- a/modules/addon/conf/info.xml +++ b/modules/addon/conf/info.xml @@ -1,5 +1,5 @@ - + 애드온 Addon Addon diff --git a/modules/addon/tpl/addon_info.html b/modules/addon/tpl/addon_info.html index 422032907..201ca5f61 100644 --- a/modules/addon/tpl/addon_info.html +++ b/modules/addon/tpl/addon_info.html @@ -3,30 +3,32 @@
-
+ +
- + - + - + - - + - - + +
{$lang->title} {$addon_info->title} ver. {$addon_info->version}
{$lang->author} {$addon_info->author->name}
{$lang->homepage} {$addon_info->author->homepage}
{$addon_info->author->date} + {$lang->regdate}{$addon_info->author->date}
{$lang->description}{nl2br($addon_info->author->description)}{$lang->description}{nl2br(trim($addon_info->author->description))}
+
diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html index a0ac6763b..e853114a0 100644 --- a/modules/addon/tpl/addon_list.html +++ b/modules/addon/tpl/addon_list.html @@ -10,11 +10,18 @@ - +
+++++++ - + @@ -50,7 +57,7 @@ - diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html index 054930db2..0fefac97b 100644 --- a/modules/addon/tpl/setup_addon.html +++ b/modules/addon/tpl/setup_addon.html @@ -8,7 +8,7 @@
-
{$lang->addon_name}{$lang->version}{$lang->version} {$lang->author} {$lang->date} {$lang->installed_path}
+ {nl2br($val->author->description)}
+
@@ -29,7 +29,7 @@ diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index d8c739104..6e2260eeb 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -24,10 +24,11 @@ $this->setLayoutPath($this->getTemplatePath()); $this->setLayoutFile('layout.html'); - // shortcut 가져오기 - $oAdminModel = &getAdminModel('admin'); - $shortcut_list = $oAdminModel->getShortCuts(); - Context::set('shortcut_list', $shortcut_list); + // 설치된 모듈 목록 가져오기 + $oModuleModel = &getModel('module'); + $installed_module_list = $oModuleModel->getModulesXmlInfo(); + Context::set('installed_module_list', $installed_module_list); + // 현재 실행중인 모듈을 구해 놓음 $running_module = strtolower(preg_replace('/([a-z]+)([A-Z]+)([a-z]+)(.*)/', '\\2\\3', $this->act)); diff --git a/modules/admin/conf/info.xml b/modules/admin/conf/info.xml index d02f5770d..d07417106 100644 --- a/modules/admin/conf/info.xml +++ b/modules/admin/conf/info.xml @@ -1,5 +1,5 @@ - + 관리자 모듈 Administrator Module Módulo del administrador diff --git a/modules/admin/lang/en.lang.php b/modules/admin/lang/en.lang.php index 5a0e87639..3fd635e0d 100644 --- a/modules/admin/lang/en.lang.php +++ b/modules/admin/lang/en.lang.php @@ -5,6 +5,17 @@ * @brief English Language Pack (Only basic words are included here) **/ + $lang->admin_info = '관리자 정보'; + $lang->admin_index = '관리자 초기 페이지'; + + $lang->module_category_title = array( + 'service' => '서비스형 모듈', + 'manager' => '관리형 모듈', + 'utility' => '기능성 모듈', + 'accessory' => '부가 모듈', + 'base' => '기본 모듈', + ); + $lang->newest_news = "Latest News"; $lang->env_setup = "Setting"; diff --git a/modules/admin/lang/es.lang.php b/modules/admin/lang/es.lang.php index f1aeda66b..06761c41b 100644 --- a/modules/admin/lang/es.lang.php +++ b/modules/admin/lang/es.lang.php @@ -5,6 +5,17 @@ * @sumario Paquete del idioma español (sólo los básicos) **/ + $lang->admin_info = '관리자 정보'; + $lang->admin_index = '관리자 초기 페이지'; + + $lang->module_category_title = array( + 'service' => '서비스형 모듈', + 'manager' => '관리형 모듈', + 'utility' => '기능성 모듈', + 'accessory' => '부가 모듈', + 'base' => '기본 모듈', + ); + $lang->newest_news = "Noticias recientes"; $lang->env_setup = "Configuración"; diff --git a/modules/admin/lang/jp.lang.php b/modules/admin/lang/jp.lang.php index c9ce2dba0..2aca6812d 100644 --- a/modules/admin/lang/jp.lang.php +++ b/modules/admin/lang/jp.lang.php @@ -5,6 +5,17 @@ * @brief 日本語言語パッケージ（基本的な内容のみ） **/ + $lang->admin_info = '관리자 정보'; + $lang->admin_index = '관리자 초기 페이지'; + + $lang->module_category_title = array( + 'service' => '서비스형 모듈', + 'manager' => '관리형 모듈', + 'utility' => '기능성 모듈', + 'accessory' => '부가 모듈', + 'base' => '기본 모듈', + ); + $lang->newest_news = "最新ニュース"; $lang->env_setup = "環境設定"; diff --git a/modules/admin/lang/ko.lang.php b/modules/admin/lang/ko.lang.php index ef3c16613..95024a385 100644 --- a/modules/admin/lang/ko.lang.php +++ b/modules/admin/lang/ko.lang.php @@ -5,6 +5,17 @@ * @brief 한국어 언어팩 (기본적인 내용만 수록) **/ + $lang->admin_info = '관리자 정보'; + $lang->admin_index = '관리자 초기 페이지'; + + $lang->module_category_title = array( + 'service' => '서비스형 모듈', + 'manager' => '관리형 모듈', + 'utility' => '기능성 모듈', + 'accessory' => '부가 모듈', + 'base' => '기본 모듈', + ); + $lang->newest_news = "최신 소식"; $lang->env_setup = "환경 설정"; diff --git a/modules/admin/lang/zh-CN.lang.php b/modules/admin/lang/zh-CN.lang.php index 2794673a4..2e353908c 100644 --- a/modules/admin/lang/zh-CN.lang.php +++ b/modules/admin/lang/zh-CN.lang.php @@ -5,6 +5,17 @@ * @brief 简体中文语言包 (只收录基本内容) **/ + $lang->admin_info = '관리자 정보'; + $lang->admin_index = '관리자 초기 페이지'; + + $lang->module_category_title = array( + 'service' => '서비스형 모듈', + 'manager' => '관리형 모듈', + 'utility' => '기능성 모듈', + 'accessory' => '부가 모듈', + 'base' => '기본 모듈', + ); + $lang->newest_news = "最新消息"; $lang->env_setup = "环境设置"; diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index 05c807832..b91adb06c 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -15,29 +15,76 @@ IE7 Only */ -body { margin:0; } -li { list-style:none; } -a { text-decoration:none;} -a:hover { text-decoration:underline;} -address { font-style:normal;} - -/* Special Class Selector */ -.fr { float:right;} -.fl { float:left;} -.fwB { font-weight:bold;} -.gl3 { padding-left:2em; } - -/* ----- cBody | Start ----- */ - -h3 { padding:22px 0 7px 0; border-bottom:2px solid #f2250d; background:url(../images/h3.gif) no-repeat 1px 24px; font-size:1.4em; margin-bottom:10px; text-indent:24px; z-index:99;} +h3 { background:url("../images/top_head_title_bg.gif") repeat-x left top; font-size:1em; border:1px solid #E3E3E2; padding:11px 9px 7px 25px; color:#555555; } h3 .gray { color:#9d9d9d;} -.pass { background:url(../images/h4.gif) no-repeat .5em center; padding-left:1em; color:#606060; font-size:1em;} + +.adminTable { width:100%; border-left:1px solid #E3E3E2; border-top:1px solid #E3E3E2; margin-bottom:10px; table-layout:fixed;} +.adminTable caption { background:url("../images/s_application.gif") no-repeat 3px 5px; padding:6px 5px 4px 22px; text-align:left; border:1px solid #E3E3E2; border-bottom:none; font-weight:bold; background-color:#F9F8F5; color:#5E6266; } +.adminTable th { background-color:#FAF8F4; padding:5px; font-weight:normal; text-align:left; padding-left:10px; color:#606060; border-right:1px solid #E3E3E2; border-bottom:1px solid #E3E3E2; white-space:nowrap; } + +.adminTable th.button { text-align:right; } +.adminTable th.centerButton { text-align:center; } + +.adminTable th a { color:#555555; text-decoration:none; } +.adminTable th a:hover { text-decoration:underline; } + +.adminTable th.tahoma { font-family:tahoma; font-size:7pt; } +.adminTable th.tahoma a { font-family:tahoma; font-size:7pt; } + +.adminTable th.blue { color:#1473C3; } +.adminTable th.red { color:#C31414; } +.adminTable th.green { color:#218E08; } + +.adminTable th.blue a { color:#1473C3; } +.adminTable th.red a { color:#C31414; } +.adminTable th.green a { color:#218E08; } + +.adminTable th a.blue { color:#1473C3; } +.adminTable th a.red { color:#C31414; } +.adminTable th a.green { color:#218E08; } + +.adminTable th select { height:20px; } +.adminTable td { background-color:#FFFFFF; padding:5px; font-weight:normal; text-align:left; padding-left:10px; color:#5A5A5A; border-right:1px solid #E3E3E2; border-bottom:1px solid #E3E3E2;} + +.adminTable td.tahoma { font-family:tahoma; font-size:7pt; } +.adminTable td.tahoma a { font-family:tahoma; font-size:7pt; } + +.adminTable td.blue { color:#1473C3; } +.adminTable td.red { color:#C31414; } +.adminTable td.green { color:#218E08; } + +.adminTable td.blue a { color:#1473C3; } +.adminTable td.red a { color:#C31414; } +.adminTable td.green a { color:#218E08; } + +.adminTable td a.blue { color:#1473C3; } +.adminTable td a.red { color:#C31414; } +.adminTable td a.green { color:#218E08; } + +.adminTable td.tCenter { text-align:center; } + +.adminTable td select { height:20px; } +.adminTable td textarea { width:98%; height:50px; } +.adminTable td a { color:#555555; text-decoration:none; } +.adminTable td a:hover { text-decoration:underline; } +.adminTable td p, .adminTable td label { color:#AAAAAA; font-size:.9em; margin-top:5px; } +.adminTable td p a, .adminTable td label a { text-decoration:underline; color:#999999; } + +.adminTable.counter th { font-size:.9em; text-align:center; padding:0;} +.adminTable.counter th em { font:normal 1em Tahoma;} +.adminTable td .graph { width:90%; position:relative;} +.adminTable td .graph .bar { width:100%; position:absolute; margin-top:4px;} +.adminTable td .graph .num { position:relative; background:#ffffff; color:#636363; font:.9em Tahoma; padding-left:10px; white-space:nowrap;} + +.admin_news { width:540px; float:left; margin-right:10px; } +.admin_link { width:250px; float:right; } +select.time_zone { width:70%; position:relative; top:4px; } +.gap1 { margin-top:.8em; } + +.infoText { clear:both; border:1px solid #f2f2f0; margin-bottom:12px; background:#f9f9f6; padding:1.2em; color:#7b7972; font-size:1em; line-height:1.4em; border-top:none; } + .header4 { overflow:hidden;} -h4 { font-size:1em; color:#f2250d; float:left; padding:.5em 0 1.2em 2em;} -h4 .bracket { font-weight:normal; color:#9d9d9d;} -h4 .vr { font-weight:normal; color:#d1d1d1;} -h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background:url(../images/iconView.gif) no-repeat right center;} -.header4 div.summary { font:.9em Tahoma; color:#636363; float:left; padding:.5em 0 1.2em 2em;} +.header4 div.summary { font:.9em Tahoma; color:#636363; float:left; padding:.5em 0 1.2em 2em;}4v .header4 div.summary .vr { font-weight:normal; color:#d1d1d1; margin:0 .5em;} .header4 div.summary em { color:#ff1d00; font-style:normal;} .header4 table.summary { border-right:1px solid #f2f2f2; width:100%; height:35px; margin-bottom:15px;} @@ -46,22 +93,22 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: .header4 table.summary th .vr { color:#a3a39f; margin:0 4px; font-weight:normal;} .header4 table.summary td { border-top:1px solid #f2f2f2; border-bottom:1px solid #f2f2f2; font:.9em Tahoma; padding-left:17px;} -select.time_zone { width:70%; position:relative; top:4px; } +h4 { font-size:1em; color:#f2250d; padding-left:10px; } +h4 .bracket { font-weight:normal; color:#9d9d9d;} +h4 .vr { font-weight:normal; color:#d1d1d1;} +h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background:url(../images/iconView.gif) no-repeat right center; text-decoration:none; } -/* ----- cBody | End ----- */ - -/* ----- Content | Start ----- */ - -/* localNavigation */ -.localNavigation { float:right;margin-bottom:10px;} -.localNavigation li { float:left; margin-right:.3em;} +.localNavigation { float:right; margin-bottom:10px;} +.localNavigation li { float:left; margin-right:.3em; list-style:none;} .localNavigation li.on { margin-right:.3em;} -.localNavigation li a { padding:.4em 1em .2em 1em; display:block; float:left; font-size:.9em; color:#606060; border:2px solid #e0dfde;} +.localNavigation li a { padding:.4em 1em .2em 1em; display:block; float:left; font-size:.9em; color:#606060; border:2px solid #e0dfde; text-decoration:none; } .localNavigation li a:hover { border:2px solid #ff1a00; color:#f2250d; text-decoration:none;} .localNavigation li.on a { color:#f2250d; border:2px solid #ff1a00; text-decoration:none;} -/* pageNavigation */ -.pageNavigation { display:block; padding:1.5em 0 2em 0; text-align:center; font:bold .8em Tahoma; } +.tableSummaryType1 { font:bold .9em Tahoma; color:#a0a0a0; margin-bottom:10px;} +.tableSummaryType1 strong { font:bold 1em Tahoma; color:#ff1a00;} + +.pageNavigation { display:block; padding:1.5em 0 2em 0; text-align:center; font:bold .9em Tahoma; } .pageNavigation a { margin-left:-4px; font:bold 1em Tahoma; color:#666666; display:inline-block; padding:1px 7px 2px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } .pageNavigation a:hover { background:#F7F7F7; text-decoration:none; } .pageNavigation a:visited { color:#999999;} @@ -71,142 +118,18 @@ select.time_zone { width:70%; position:relative; top:4px; } .pageNavigation a.goToLast img { display:inline-block; padding:2px 0; top:2px; _top:1px;} .pageNavigation .current { margin-left:-4px; font:bold 1em Tahoma; color:#ff6600; display:inline-block; padding:1px 7px 1px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } -/* tableStyle */ -.infoText { clear:both; border:1px solid #f2f2f0; margin-bottom:12px; background:#f9f9f6; padding:1.2em; color:#7b7972; font-size:.9em; line-height:1.4em;} - -.gap1 { margin-top:.8em; } -.tableSummaryType1 { font:bold .8em Tahoma; color:#a0a0a0; margin-bottom:10px;} -.tableSummaryType1 strong { font:bold 1em Tahoma; color:#ff1a00;} - -.tableType1 { width:100%; border-bottom:2px solid #c1c0bd;} -.tableType1 caption { padding:2em 0 .5em 1.5em; font-weight:bold; text-align:left; background:url(../images/iconH3.gif) no-repeat .5em 2em;} -.tableType1 th { font-weight:normal; color:#ffffff; background:url(../images/tableType1Header.gif) repeat-x; height:28px;} -.tableType1 th select { vertical-align:middle; } -.tableType1 td { text-align:center; color:#636363; height:30px; border-top:1px solid #ededed;} -.tableType1 td.left { text-align:left } -.tableType1 td a { color:#1d1d1d;} -.tableType1 .tahoma { font-size:.9em; font-family:Tahoma;} -.tableType1 .tahoma a { font-size:1em;} -.tableType1 td.subject { padding:3px 0 3px 0; line-height:140%;} -.tableType1 td.blue a { color:#158692;} -.tableType1 td.red a { color:#c95b53;} -.tableType1 td.red { color:#c95b53;} -.tableType1 td .blue { color:#158692;} -.tableType1 td .red { color:#c95b53;} - -.tableType2 { border:2px solid #c1c0bd; border-left:none; border-right:none; width:100%;} -.tableType2 caption { padding:2em 0 .5em 1.5em; font-weight:bold; text-align:left; background:url(../images/iconH3.gif) no-repeat .5em 2em;} -.tableType2 th { border-top:1px solid #fbfbfb; border-bottom:1px solid #e4e4e4; background:#f5f5f5; padding:10px 10px 10px 2em; font-weight:normal; text-align:left; color:#606060;} -.tableType2 td { border-bottom:1px solid #ededed; padding:10px 10px 7px 10px; font-size:.9em; color:#7b7972;} -.tableType2 td input, -.tableType2 td textarea, -.tableType2 td select { margin-bottom:.5em; vertical-align:middle; font-size:1em; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6;} -.tableType2 td .w100 { width:100%; display:block;} -.tableType2 td .checkbox { margin:-3px;} -.tableType2 td p { line-height:1.4em;} -.tableType2 td a { color:#1d1d1d;} -.tableType2 td a.blue { color:#158692;} -.tableType2 td a.red { color:#c95b53;} - -.tableType3 { width:100%; border-bottom:2px solid #c1c0bd;} -.tableType3 caption { padding:2em 0 .5em 1.5em; font-weight:bold; text-align:left; background:url(../images/iconH3.gif) no-repeat .5em 2em;} -.tableType3 th.bold { font-weight:bold; } -.tableType3 th, -.tableType3 td { border-top:1px solid #bfbfbf;} -.tableType3 thead th { font-weight:normal; color:#ffffff; background:url(../images/tableType1Header.gif) repeat-x; height:28px;} -.tableType3 tbody th { font-weight:normal; color:#606060; text-align:left; background:#f5f5f5; padding:10px 10px 10px 2em;} -.tableType3 tbody th img { vertical-align:middle; margin-top:-2px;} -.tableType3 td { text-align:center; color:#636363; border-left:1px solid #ededed; padding:10px 10px 7px 10px;} -.tableType3 td.colSpan { text-align:left; border-top:1px solid #ededed;} -.tableType3 td a { color:#1d1d1d;} -.tableType3 th a.blue { color:#158692;} -.tableType3 th a.red { color:#c95b53;} -.tableType3 .tahoma { font-size:.9em; font-family:Tahoma;} -.tableType3 .tahoma a { font-size:1em;} -.tableType3 td.left { text-align:left; } -.tableType3 td label { margin-right:1em; } -.tableType3 td.blue a { color:#158692;} -.tableType3 td.red a { color:#c95b53;} -.tableType3 td a.blue { color:#158692;} -.tableType3 td a.red { color:#c95b53;} -/*.tableType3 td input,*/ -.tableType3 td textarea, -.tableType3 td select { margin-bottom:.5em; vertical-align:middle; font-size:1em; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6;} -.tableType3 td .w100 { width:100%; display:block;} - -.tableType4 { border:2px solid #c1c0bd; border-left:none; border-right:none; width:100%;} -.tableType4 th { border-top:1px solid #fbfbfb; border-bottom:1px solid #e4e4e4; background:#f5f5f5; padding:10px 10px 10px 2em; font-weight:normal; text-align:left; color:#606060;} -.tableType4 caption { padding:2em 0 .5em 1.5em; font-weight:bold; text-align:left; background:url(../images/iconH3.gif) no-repeat .5em 2em;} -.tableType4.counter th { font-size:.9em; text-align:center; padding:0;} -.tableType4.counter th em { font:normal 1em Tahoma;} -.tableType4 td { border-bottom:1px solid #ededed; padding:10px 10px 7px 10px; color:#7b7972;} -.tableType4 td a { color:#1d1d1d;} -.tableType4 .tahoma { font-size:.9em; font-family:Tahoma;} -.tableType4 .tahoma a { font-size:1em;} -.tableType4 td.blue a { color:#158692;} -.tableType4 td.red a { color:#c95b53;} -/*.tableType4 td input,*/ -.tableType4 td textarea, -.tableType4 td select { margin-bottom:.5em; vertical-align:middle;font-size:1em; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6;} -.tableType4 td label { margin-right:1em; } -.tableType4 td .w100 { width:100%; display:block;} -.tableType4 td .checkbox { margin:-3px;} -.tableType4 td p { line-height:1.4em;} -.tableType4 td .graph { width:90%; position:relative;} -.tableType4 td .graph .bar { width:100%; position:absolute; margin-top:4px;} -.tableType4 td .graph .num { position:relative; background:#ffffff; color:#636363; font:.9em Tahoma; padding-left:10px;} - - -.widgetBox { border:1px solid #c1c0bd; width:100%;} -.widgetBox th { text-align:center; font-weight:normal; background-color:#EFEFEF; } -.widgetBox td { text-align:left; padding:.5em; } - -/* ----- Content | End ----- */ - -/* ----- Popup | Start ----- */ - -/* popup */ -#popHeadder { width:620px; height:40px; background:url(../images/popupTopBg.png) repeat-x left top; } -#popHeadder h1 { padding:13px 0 0 19px; height:27px; background:url(../images/popupTopBgEnd.png) no-repeat right top; font-size:1.2em; color:#d8d8d8;} -#popBody { width:600px; padding:10px; background:#ffffff;} -#popFooter { width:620px; background:#f7f7f6; border-top:1px solid #e8e8e7; padding:.5em 0 .5em 0; overflow:hidden; } -#popFooter .close { position:relative; left:50%; margin-left:-1em; float:left;} - -#popBody .tableType5 { border:1px solid #c1c0bd; border-left:none; border-right:none; width:100%;} -#popBody .tableType5 th { border-top:1px solid #fbfbfb; border-bottom:1px solid #e4e4e4; background:#f5f5f5; padding:8px 10px 7px 2em; font-weight:normal; text-align:left; color:#606060;} -#popBody .tableType5 td { border-bottom:1px solid #ededed; padding:8px 10px 7px 10px; color:#7b7972;} -/*#popBody .tableType5 td input,*/ -#popBody .tableType5 td textarea, -#popBody .tableType5 td select { margin-bottom:.5em; vertical-align:middle;} -#popBody .tableType5 td .w100 { width:100%; display:block;} -#popBody .tableType5 td .checkbox { margin:-3px; margin-bottom:1em; } -#popBody .tableType5 td p { line-height:1.4em;} -#popBody .tableType5 td.blue a { color:#158692;} -#popBody .tableType5 .borderBottomNone { border-bottom:none;} - -/* ----- Popup | End ----- */ - -.widget_item { margin-bottom:.5em; } -.layout_editor { width:100%; height:500px; border:0px; font-size:1em; } -.layout_editor_box { padding:10px; border:1px solid #DDDDDD; } - -/* adminSearch */ .adminSearch { text-align:right; clear:both; width:100%;} .adminSearch fieldset { border:none; display:inline; overflow:visible; } .adminSearch * { vertical-align:middle;} -.title { font-size:1.5em; font-weight:bold; margin-top:2em; margin-bottom:.5em; color:#666666; } -.desc { font-size:1em; margin-bottom:.5em; color:#ADADAD;} +.buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; position:relative; top:-1px; font:.75em Tahoma; text-align:center; background:url(../images/buttonTypeInput24.gif) no-repeat; } -.w700 { width:700px; } -.w5 { width:5em; } +#popHeadder { height:40px; background:url(../images/popupTopBg.png) repeat-x left top; padding:10px;} +#popHeadder h1 { background:url("../images/top_head_title_bg.gif") repeat-x left top; font-size:1em; border:1px solid #E3E3E2; padding:9px; color:#555555; } +#popBody { width:600px; padding:10px; background:#ffffff;} +#popFooter { width:620px; background:#f7f7f6; border-top:1px solid #e8e8e7; padding:.5em 0 .5em 0; overflow:hidden; } +#popFooter .close { position:relative; left:50%; margin-left:-1em; float:left;} -.nowrap { white-space:nowrap; } -.mid_list { width:7em; } +.layout_editor { width:100%; height:500px; border:0px; font-size:1em; } +.layout_editor_box { padding:10px; border:1px solid #DDDDDD; } -ul.extra_vars li { margin-bottom:.5em;} -li.type_key { float:left; width:10em; } -li.type_value { clear:right; } - -.admin_news { width:49%; float:left; margin-right:10px; } -.admin_link { width:49%; float:right; } diff --git a/modules/admin/tpl/css/admin_layout.css b/modules/admin/tpl/css/admin_layout.css index 0bb015d71..42dfdea5f 100644 --- a/modules/admin/tpl/css/admin_layout.css +++ b/modules/admin/tpl/css/admin_layout.css @@ -1,65 +1,40 @@ @charset "utf-8"; -/* -NHN UIT Lab. WebStandardization Team (http://html.nhndesign.com/) -Jeong, Chan Myeong 070601~070630 -*/ -/* -Used Hack +body { background:url("../images/admin_background.gif") repeat-x left top; background-color:#DBD8D3; } -IE6 & Below -{ property:value; _property:value;} +#adminLayout { background:url("../images/admin_logo.gif") no-repeat left top; background-color:#F8F6F2; overflow:hidden; width:1000px; border-right:1px solid #B2B2B2; margin:5px 0 0 5px; } -IE7 Only -*:first-child+html #selector +#adminContentBody { width:800px; float:left; background-color:#FFFFFF; padding:25px 10px 20px 10px; vertical-align:top; background:url(../images/admin_top_bg.gif) repeat-x left top; background-color:#FFFFFF; } -*/ +#adminLayoutBottom { background:url("../images/admin_bottom_bg.gif") repeat-x left top; height:3px; clear:both; overflow:hidden; width:1001px; margin:0 0 0 5px; } -/* default.css - Type Selector Definition */ -li { list-style:none;} -a { text-decoration:none;} -a:hover { text-decoration:underline;} -address { font-style:normal;} +#adminMenuContent { width:179px; float:left; margin-top:70px; padding-bottom:20px; vertical-align:top; background:none; overflow:hidden; border-right:1px solid #B2B2B2; } -/* Special Class Selector */ -.fr { float:right;} -.fl { float:left;} -.fwB { font-weight:bold;} +#adminMenuContent .adminInfoBox { border:1px solid #E3E3E2; padding:3px; margin:0 0 0 8px; width:130px; background-color:#FFFFFF; overflow:hidden; width:154px; margin-bottom:10px;} +#adminMenuContent .adminInfoBox .adminInfo { border:1px solid #E3E3E2; padding:5px 3px 3px 23px; background:url("../images/icon_key.gif") no-repeat 3px 3px; color:#555555; font-weight:bold; overflow:hidden; background-color:#F8F6F2; } +#adminMenuContent .adminInfoBox .adminInfo div.expandButton { float:right; height:16px; overflow:hidden; } +#adminMenuContent .adminInfoBox div.logoutButton { margin-top:5px; text-align:center; clear:both; } +#adminMemberInfo { padding:10px 5px 10px 24px; background:url("../images/icon_user.gif") no-repeat 5px 8px; color:#336699; font-weight:bold; letter-spacing:-1px;} -/* ----- Header | Start ----- */ +#adminMenuContent h3 { border:1px solid #E3E3E2; border-top:none; color:#555555; font-size:1em; text-indent:none; padding:6px 5px 3px 25px; white-space:nowrap; margin:0 0 0 8px; width:130px; overflow:hidden;} +#adminMenuContent h3 a { color:#555555; text-decoration:none; } +#adminMenuContent h3 span.expandButton { float:right; height:16px; overflow:hidden; } +#adminMenuContent h3.summary { background:url("../images/icon_summary.gif") no-repeat 3px 3px; background-color:#FFFFFF; margin-top:0px; border-top:1px solid #E3E3E2; } +#adminMenuContent h3.service { background:url("../images/icon_service_module.gif") no-repeat 3px 5px; background-color:#FFFFFF; } +#adminMenuContent h3.manager { background:url("../images/icon_manager_module.gif") no-repeat 3px 5px; background-color:#FFFFFF;} +#adminMenuContent h3.utility { background:url("../images/icon_utility_module.gif") no-repeat 3px 5px; background-color:#FFFFFF;} +#adminMenuContent h3.accessory { background:url("../images/icon_accessory_module.gif") no-repeat 3px 5px; background-color:#FFFFFF;} +#adminMenuContent h3.base { background:url("../images/icon_base_module.gif") no-repeat 3px 5px; background-color:#FFFFFF;} -#header { position:relative; height:71px; background:url(../images/headerBg.gif) repeat-x; overflow:hidden; clear:both; z-index:99;} -#header h1 { float:left; width:180px; height:71px; position:relative; background:url(../images/h1_bg.gif) no-repeat;} -#header h1 img { position:absolute; top:29px; left:29px;} -#header #logout { width:470px; height:71px; float:right; background:url(../images/headerBgEnd.png) no-repeat right top;} -#header #logout a { float:right; position:relative; top:29px; right:24px;} +#adminMenuContent ul { width:170px; overflow:hidden; } +#adminMenuContent ul li { background-color:#F8F6F3; list-style:none; padding:5px 10px 3px 10px; margin-left:8px; white-space:nowrap; overflow:hidden; color:#888785; border-bottom:1px solid #E3E3E2; cursor:pointer; } +#adminMenuContent ul li:hover { background-color:#EFE6D3; border-left:1px solid #E3E3E2; border-right:1px solid #E3E3E2;} +#adminMenuContent li.on { background-color:#EFE6D3; border-left:1px solid #E3E3E2; border-right:1px solid #E3E3E2;} +#adminMenuContent ul li a { text-decoration:none; color:#888785; } +#adminMenuContent ul li:hover a { color:#000000; } +#adminMenuContent li.on a { color:#000000; } -/* ----- Header | End ----- */ - -#cBody { clear:both; padding:0px 18px 0px 198px; margin:-71px 0 -38px 0; overflow:hidden; background:#ffffff url(../images/menuBg.gif) repeat-y;} - -#gNavigation { float:left; width:180px; padding:71px 0 200px 0; margin-right:18px; margin-left:-198px; _margin-left:-99px; background:#ffffff url(../images/menuBg.gif) repeat-y;} -#gNavigation h2 { } -#gNavigation ul { width:180px;} -#gNavigation ul li { width:180px; height:30px; background:url(../images/menuBg.png) no-repeat left top; } /* behavior:url(./common/js/iePngFix.htc);}*/ -#gNavigation ul li.on { background-position:left -30px; margin-top:-2px; _background:url(../images/menuBgIeFix.png) no-repeat left top;} -#gNavigation ul li.on a { color:#ffffff; font-weight:bold;} -#gNavigation ul li a { display:block; padding:9px 0 0 28px; height:21px; color:#606060;} -#gNavigation ul li a:hover { background:url(../images/menuBgIeFix.png) no-repeat; margin-top:-2px; font-weight:bold; color:#ffffff; text-decoration:none;} -#gNavigation ul li.on a:hover { background:url(../images/menuBgIeFix.png) no-repeat; margin-top:0; font-weight:bold; color:#ffffff; text-decoration:none;} -#gNavigation .menuEdit { width:180px; height:30px; text-align:center; margin-top:1em;} - -#content { float:left; width:100%; padding:71px 0 100px 0;} - -/* ----- Footer | Start ----- */ - -#footer { width:100%; clear:both; height:38px; margin-bottom:-38px; overflow:hidden; background:url(../images/footerBg.gif) repeat-x left 3px;} -#footer .footerLine { height:3px; width:100%; float:left; clear:both;} -#footer .footerLeft { float:left;} -#footer address { float:right; width:350px; height:35px; background:url(../images/addressBg.gif) no-repeat right top;} -#footer address img { margin:15px 10px 0 0} -#footer address .version { font:.8em Tahoma; color:#ffffff;} -#footer address .version strong { font:bold 1em Tahoma; color:#ff0000; } - -/* ----- Footer | End ----- */ +#adminLayoutCopyright { width:1000px; text-align:right; margin-top:10px; font-size:.8em; font-family:tahoma; color:#888888; padding-bottom:50px; } +#adminLayoutCopyright a { color:#666666; text-decoration:none; } +#adminLayoutCopyright a span.red { color:#9A1827; } diff --git a/modules/admin/tpl/images/address.gif b/modules/admin/tpl/images/address.gif deleted file mode 100644 index 30e7a4c91..000000000 Binary files a/modules/admin/tpl/images/address.gif and /dev/null differ diff --git a/modules/admin/tpl/images/addressBg.gif b/modules/admin/tpl/images/addressBg.gif deleted file mode 100644 index ae501212c..000000000 Binary files a/modules/admin/tpl/images/addressBg.gif and /dev/null differ diff --git a/modules/admin/tpl/images/admin_background.gif b/modules/admin/tpl/images/admin_background.gif new file mode 100644 index 000000000..3665755c7 Binary files /dev/null and b/modules/admin/tpl/images/admin_background.gif differ diff --git a/modules/admin/tpl/images/admin_bottom_bg.gif b/modules/admin/tpl/images/admin_bottom_bg.gif new file mode 100644 index 000000000..102b23877 Binary files /dev/null and b/modules/admin/tpl/images/admin_bottom_bg.gif differ diff --git a/modules/admin/tpl/images/admin_logo.gif b/modules/admin/tpl/images/admin_logo.gif new file mode 100644 index 000000000..cbc783302 Binary files /dev/null and b/modules/admin/tpl/images/admin_logo.gif differ diff --git a/modules/admin/tpl/images/admin_top_bg.gif b/modules/admin/tpl/images/admin_top_bg.gif new file mode 100644 index 000000000..84562c2bb Binary files /dev/null and b/modules/admin/tpl/images/admin_top_bg.gif differ diff --git a/modules/admin/tpl/images/buttonLogout.png b/modules/admin/tpl/images/buttonLogout.png deleted file mode 100644 index 5352f97ec..000000000 Binary files a/modules/admin/tpl/images/buttonLogout.png and /dev/null differ diff --git a/modules/admin/tpl/images/buttonTypeACenter.gif b/modules/admin/tpl/images/buttonTypeACenter.gif deleted file mode 100644 index 56127ea2e..000000000 Binary files a/modules/admin/tpl/images/buttonTypeACenter.gif and /dev/null differ diff --git a/modules/admin/tpl/images/buttonTypeALeft.gif b/modules/admin/tpl/images/buttonTypeALeft.gif deleted file mode 100644 index e23080b50..000000000 Binary files a/modules/admin/tpl/images/buttonTypeALeft.gif and /dev/null differ diff --git a/modules/admin/tpl/images/buttonTypeARight.gif b/modules/admin/tpl/images/buttonTypeARight.gif deleted file mode 100644 index 1dd5aac05..000000000 Binary files a/modules/admin/tpl/images/buttonTypeARight.gif and /dev/null differ diff --git a/modules/admin/tpl/images/buttonTypeBCenter.gif b/modules/admin/tpl/images/buttonTypeBCenter.gif deleted file mode 100644 index cef8361e8..000000000 Binary files a/modules/admin/tpl/images/buttonTypeBCenter.gif and /dev/null differ diff --git a/modules/admin/tpl/images/buttonTypeBLeft.gif b/modules/admin/tpl/images/buttonTypeBLeft.gif deleted file mode 100644 index 4614e6946..000000000 Binary files a/modules/admin/tpl/images/buttonTypeBLeft.gif and /dev/null differ diff --git a/modules/admin/tpl/images/buttonTypeBRight.gif b/modules/admin/tpl/images/buttonTypeBRight.gif deleted file mode 100644 index 8136596ae..000000000 Binary files a/modules/admin/tpl/images/buttonTypeBRight.gif and /dev/null differ diff --git a/modules/admin/tpl/images/expand.gif b/modules/admin/tpl/images/expand.gif new file mode 100644 index 000000000..f59a9ce73 Binary files /dev/null and b/modules/admin/tpl/images/expand.gif differ diff --git a/modules/admin/tpl/images/footerBg.gif b/modules/admin/tpl/images/footerBg.gif deleted file mode 100644 index 945aa6cd6..000000000 Binary files a/modules/admin/tpl/images/footerBg.gif and /dev/null differ diff --git a/modules/admin/tpl/images/footerLeft.gif b/modules/admin/tpl/images/footerLeft.gif deleted file mode 100644 index 5a464f477..000000000 Binary files a/modules/admin/tpl/images/footerLeft.gif and /dev/null differ diff --git a/modules/admin/tpl/images/footerLine.gif b/modules/admin/tpl/images/footerLine.gif deleted file mode 100644 index b5555e828..000000000 Binary files a/modules/admin/tpl/images/footerLine.gif and /dev/null differ diff --git a/modules/admin/tpl/images/h1.png b/modules/admin/tpl/images/h1.png deleted file mode 100644 index 96fa3bdad..000000000 Binary files a/modules/admin/tpl/images/h1.png and /dev/null differ diff --git a/modules/admin/tpl/images/h1_bg.gif b/modules/admin/tpl/images/h1_bg.gif deleted file mode 100644 index 3ce4768b4..000000000 Binary files a/modules/admin/tpl/images/h1_bg.gif and /dev/null differ diff --git a/modules/admin/tpl/images/h2.gif b/modules/admin/tpl/images/h2.gif deleted file mode 100644 index 8e5918f8b..000000000 Binary files a/modules/admin/tpl/images/h2.gif and /dev/null differ diff --git a/modules/admin/tpl/images/h3.gif b/modules/admin/tpl/images/h3.gif deleted file mode 100644 index f159eaa5b..000000000 Binary files a/modules/admin/tpl/images/h3.gif and /dev/null differ diff --git a/modules/admin/tpl/images/h4.gif b/modules/admin/tpl/images/h4.gif deleted file mode 100644 index ace747f3f..000000000 Binary files a/modules/admin/tpl/images/h4.gif and /dev/null differ diff --git a/modules/admin/tpl/images/headerBg.gif b/modules/admin/tpl/images/headerBg.gif deleted file mode 100644 index 4ddc519c5..000000000 Binary files a/modules/admin/tpl/images/headerBg.gif and /dev/null differ diff --git a/modules/admin/tpl/images/headerBgEnd.png b/modules/admin/tpl/images/headerBgEnd.png deleted file mode 100644 index d484917b9..000000000 Binary files a/modules/admin/tpl/images/headerBgEnd.png and /dev/null differ diff --git a/modules/admin/tpl/images/iconCreate.gif b/modules/admin/tpl/images/iconCreate.gif deleted file mode 100644 index 0fdecf963..000000000 Binary files a/modules/admin/tpl/images/iconCreate.gif and /dev/null differ diff --git a/modules/admin/tpl/images/iconGallery.gif b/modules/admin/tpl/images/iconGallery.gif deleted file mode 100644 index d75fb10cb..000000000 Binary files a/modules/admin/tpl/images/iconGallery.gif and /dev/null differ diff --git a/modules/admin/tpl/images/iconGraph.gif b/modules/admin/tpl/images/iconGraph.gif deleted file mode 100644 index a6f66bb73..000000000 Binary files a/modules/admin/tpl/images/iconGraph.gif and /dev/null differ diff --git a/modules/admin/tpl/images/iconH3.gif b/modules/admin/tpl/images/iconH3.gif deleted file mode 100644 index 8ea0cec82..000000000 Binary files a/modules/admin/tpl/images/iconH3.gif and /dev/null differ diff --git a/modules/admin/tpl/images/iconHtml.gif b/modules/admin/tpl/images/iconHtml.gif deleted file mode 100644 index 7ca1ed109..000000000 Binary files a/modules/admin/tpl/images/iconHtml.gif and /dev/null differ diff --git a/modules/admin/tpl/images/iconImage.gif b/modules/admin/tpl/images/iconImage.gif deleted file mode 100644 index 1c3e4b1b8..000000000 Binary files a/modules/admin/tpl/images/iconImage.gif and /dev/null differ diff --git a/modules/admin/tpl/images/iconImoticon.gif b/modules/admin/tpl/images/iconImoticon.gif deleted file mode 100644 index 244ecbfcc..000000000 Binary files a/modules/admin/tpl/images/iconImoticon.gif and /dev/null differ diff --git a/modules/admin/tpl/images/iconLink.gif b/modules/admin/tpl/images/iconLink.gif deleted file mode 100644 index 71de70f13..000000000 Binary files a/modules/admin/tpl/images/iconLink.gif and /dev/null differ diff --git a/modules/admin/tpl/images/iconMap.gif b/modules/admin/tpl/images/iconMap.gif deleted file mode 100644 index 24a77f428..000000000 Binary files a/modules/admin/tpl/images/iconMap.gif and /dev/null differ diff --git a/modules/admin/tpl/images/iconMedia.gif b/modules/admin/tpl/images/iconMedia.gif deleted file mode 100644 index 104abed57..000000000 Binary files a/modules/admin/tpl/images/iconMedia.gif and /dev/null differ diff --git a/modules/admin/tpl/images/iconQuote.gif b/modules/admin/tpl/images/iconQuote.gif deleted file mode 100644 index 06ae37600..000000000 Binary files a/modules/admin/tpl/images/iconQuote.gif and /dev/null differ diff --git a/modules/admin/tpl/images/iconTable.gif b/modules/admin/tpl/images/iconTable.gif deleted file mode 100644 index a7ddb7ac4..000000000 Binary files a/modules/admin/tpl/images/iconTable.gif and /dev/null differ diff --git a/modules/admin/tpl/images/icon_accessory_module.gif b/modules/admin/tpl/images/icon_accessory_module.gif new file mode 100644 index 000000000..f4f1577f5 Binary files /dev/null and b/modules/admin/tpl/images/icon_accessory_module.gif differ diff --git a/modules/admin/tpl/images/icon_base_module.gif b/modules/admin/tpl/images/icon_base_module.gif new file mode 100644 index 000000000..c250046e9 Binary files /dev/null and b/modules/admin/tpl/images/icon_base_module.gif differ diff --git a/modules/admin/tpl/images/icon_key.gif b/modules/admin/tpl/images/icon_key.gif new file mode 100644 index 000000000..cdc6cf7d3 Binary files /dev/null and b/modules/admin/tpl/images/icon_key.gif differ diff --git a/modules/admin/tpl/images/icon_manager_module.gif b/modules/admin/tpl/images/icon_manager_module.gif new file mode 100644 index 000000000..516a619b4 Binary files /dev/null and b/modules/admin/tpl/images/icon_manager_module.gif differ diff --git a/modules/admin/tpl/images/icon_service_module.gif b/modules/admin/tpl/images/icon_service_module.gif new file mode 100644 index 000000000..7c5ef487e Binary files /dev/null and b/modules/admin/tpl/images/icon_service_module.gif differ diff --git a/modules/admin/tpl/images/icon_summary.gif b/modules/admin/tpl/images/icon_summary.gif new file mode 100644 index 000000000..39cf5f506 Binary files /dev/null and b/modules/admin/tpl/images/icon_summary.gif differ diff --git a/modules/admin/tpl/images/icon_user.gif b/modules/admin/tpl/images/icon_user.gif new file mode 100644 index 000000000..24c2b3ea3 Binary files /dev/null and b/modules/admin/tpl/images/icon_user.gif differ diff --git a/modules/admin/tpl/images/icon_utility_module.gif b/modules/admin/tpl/images/icon_utility_module.gif new file mode 100644 index 000000000..1d9164c36 Binary files /dev/null and b/modules/admin/tpl/images/icon_utility_module.gif differ diff --git a/modules/admin/tpl/images/icon_vcard.gif b/modules/admin/tpl/images/icon_vcard.gif new file mode 100644 index 000000000..96e207ebc Binary files /dev/null and b/modules/admin/tpl/images/icon_vcard.gif differ diff --git a/modules/admin/tpl/images/menuBg.gif b/modules/admin/tpl/images/menuBg.gif deleted file mode 100644 index 13362d836..000000000 Binary files a/modules/admin/tpl/images/menuBg.gif and /dev/null differ diff --git a/modules/admin/tpl/images/menuBg.png b/modules/admin/tpl/images/menuBg.png deleted file mode 100644 index 36af2bc80..000000000 Binary files a/modules/admin/tpl/images/menuBg.png and /dev/null differ diff --git a/modules/admin/tpl/images/menuBgIeFix.png b/modules/admin/tpl/images/menuBgIeFix.png deleted file mode 100644 index 4f270e064..000000000 Binary files a/modules/admin/tpl/images/menuBgIeFix.png and /dev/null differ diff --git a/modules/admin/tpl/images/popupTopBg.png b/modules/admin/tpl/images/popupTopBg.png deleted file mode 100644 index 13b6af023..000000000 Binary files a/modules/admin/tpl/images/popupTopBg.png and /dev/null differ diff --git a/modules/admin/tpl/images/popupTopBgEnd.png b/modules/admin/tpl/images/popupTopBgEnd.png deleted file mode 100644 index 9d52e19f9..000000000 Binary files a/modules/admin/tpl/images/popupTopBgEnd.png and /dev/null differ diff --git a/modules/admin/tpl/images/s_application.gif b/modules/admin/tpl/images/s_application.gif new file mode 100644 index 000000000..cbb7f3bfa Binary files /dev/null and b/modules/admin/tpl/images/s_application.gif differ diff --git a/modules/admin/tpl/images/tableType1Header.gif b/modules/admin/tpl/images/tableType1Header.gif deleted file mode 100644 index 13aa5ab9a..000000000 Binary files a/modules/admin/tpl/images/tableType1Header.gif and /dev/null differ diff --git a/modules/admin/tpl/images/top_head_title_bg.gif b/modules/admin/tpl/images/top_head_title_bg.gif new file mode 100644 index 000000000..6471749d3 Binary files /dev/null and b/modules/admin/tpl/images/top_head_title_bg.gif differ diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html index 16ca362f5..b3227c820 100644 --- a/modules/admin/tpl/index.html +++ b/modules/admin/tpl/index.html @@ -3,8 +3,10 @@

{$lang->welcome_to_zeroboard_xe}

-
{$val->title} -

{$val->description}

+

{$val->description}
-+
+ +
+ @@ -30,8 +32,8 @@
{$lang->env_information}
- -+
+ @@ -52,10 +54,10 @@ + + +
{$lang->env_setup}
Lang @@ -73,30 +75,27 @@

{$lang->about_time_zone}
+ + +
-
- -
-
- -
+ - +
+ + - - - - - - - - + + @@ -106,27 +105,16 @@
-
{$lang->newest_news}
{$lang->title}{$lang->regdate}
 {$val->title}{zdate($val->date,"Y-m-d H:i")}{zdate($val->date,"Y-m-d H:i")}{$val->title}
- - +
- - + -
{$lang->zeroboard_xe_user_links}
{$key}{$val}{$key}
- - - - - - - - +
{$lang->zeroboard_xe_developer_links}
{$key}{$val}{$key}
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index f06bb782b..de245ccfc 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -11,6 +11,11 @@ function doDeleteShortCut(selected_module) { procFilter(fo_obj, delete_shortcut); } +// 캐시파일 모두 재 생성 +function doRecompileCacheFile() { + exec_xml("admin","procAdminRecompileCacheFile"); +} + // footer를 화면 크기에 맞춰 설정 (폐기) //xAddEventListener(window, 'load', fixAdminLayoutFooter); //xAddEventListener(window, 'resize', fixAdminLayoutFooter); @@ -18,19 +23,30 @@ function fixAdminLayoutFooter(height) { return; } -if(xIE6) { - xAddEventListener(window,'load',fixAdminNaviHeight); +function setMenuContentScale() { + var menuHeight = xHeight("adminMenuContent")+70; + var bodyHeight = xHeight("adminContentBody"); + if(bodyHeight>menuHeight) xHeight("adminMenuContent", bodyHeight-70); + else if(bodyHeight - +
+ +
-
+
+
+
{$lang->admin_info}
+
toggle
+
+ +
+ {$lang->cmd_logout} +
+
-
-

Administration

- +
-
{$content}
+
{$content}
+
- diff --git a/modules/blog/skins/xe_blog/comment_form.html b/modules/blog/skins/xe_blog/comment_form.html index 53ff5c612..840b09f3e 100644 --- a/modules/blog/skins/xe_blog/comment_form.html +++ b/modules/blog/skins/xe_blog/comment_form.html @@ -1,69 +1,68 @@ - - - - - - + - -
    -
  • -
    {htmlspecialchars($source_comment->nick_name)}
    + +
    +
    +
    {$oSourceComment->getNickName()}
    - {zdate($source_comment->regdate, "Y.m.d H:i")} + {$oSourceComment->getRegdate("Y.m.d H:i")} - ({$source_comment->ipaddress}) + ({$oSourceComment->get('ipaddress')})
    +
    -
    - {$source_comment->content} +
    + {$oSourceComment->getContent(false)}
    -
    • -
+
+
+
fileupload)-->enctype="multipart/form-data" class="blogEditor" >
- - - - + + + + -
+ - + - + - -
- + + + useNotify())-->checked="checked" id="notify_message" /> + + -
-
{$editor?$editor:$comment_editor[$document_srl]}
-
- -
+ isSecret())-->checked="checked" id="is_secret" /> +
+
class="borderTop">{$editor}
+
- +
+ + +
- - - + diff --git a/modules/blog/skins/xe_blog/css/common.css b/modules/blog/skins/xe_blog/css/common.css index c15647f5a..61d2bc69c 100644 --- a/modules/blog/skins/xe_blog/css/common.css +++ b/modules/blog/skins/xe_blog/css/common.css @@ -1,63 +1,56 @@ @charset "utf-8"; + /* NHN UIT Lab. WebStandardization Team (http://html.nhndesign.com/) Jeong, Chan Myeong 070601~070630 */ -.gap1 { margin-top:.8em; } -.commentButton { margin:.8em 0 .8em 0; } -/* pathNavigation */ -.pathNavigation { background:url(../images/common/bullet_3x3_d8d8d8.gif) no-repeat left .4em; padding:0 0 0 .5em; color:#999999; margin:0 0 1.5em 0;} -.pathNavigation * { font-size:.9em;} -.pathNavigation a { color:#999999;} -.pathNavigation strong { color:#666666;} +/** + * Header + **/ -.blogHeader2 { width:100%; overflow:hidden; padding:1em 0 1em 0; color:#444444;} -.blogHeader2 h3 { float:left; font-size:1.4em; padding-left:1.2em; background:url(../images/common/iconH3.gif) no-repeat .5em center;} -.blogHeader2 .info { float:right; position:relative; top:.4em;} -.blogHeader2 .info q { quotes:none; font-weight:bold;} -.blogHeader2 .info strong { font:bold .9em Tahoma; color:#ff6600;} +/* blog Title */ +.blogHeader { border:1px solid #e1e1dd; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) repeat-x left bottom; overflow:hidden; _width:100%;} +.blogHeader h3 { float:left; font-size:1.2em; padding:1em 2em .7em 1.2em; background:#ffffff url(../images/common/lineH3.gif) no-repeat right bottom;} -/* blogComment */ -.blogComment { color:#AEAEAE; position:relative; border:1px solid #DDDDDD; overflow:hidden;padding:.8em; margin-top:.4em;} -.blogComment a { color:#f38d2a; text-decoration:none; border-bottom:1px dotted #f38d2a;} +/* blog Description */ +.blogDescription { color:#AEAEAE; border:1px solid #DDDDDD; overflow:hidden; padding:1em; margin-top:1em;} -/* blogInformation */ +/* blog Information */ .blogInformation { width:100%; clear:both; margin:1em 0 .5em 0; overflow:hidden; color:#666666;} +.articleNum { float:left; padding:0 0 0 15px; } -.accountNavigation { float:right; overflow:hidden;} -.accountNavigation li { float:left; padding:0 .5em 0 .6em; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat left .4em; list-style:none;} -.accountNavigation li a { font-size:11px; white-space:nowrap; color:#666666; text-decoration:none;} -.accountNavigation li.rss { background:none; padding-top:.4em;} -.accountNavigation li.join { background:none; padding-top:.4em;} -.accountNavigation li.myInfo { padding-top:.4em; background:none;} -.accountNavigation li.admin { padding-top:.4em;} -.accountNavigation li.admin a { display:block; background:url(../images/common/iconAdmin.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.accountNavigation li.setup { padding-top:.4em;} -.accountNavigation li.setup a { display:block; background:url(../images/common/iconSetup.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.accountNavigation li.loginAndLogout { background:none; padding-left:0;} +/* gallery sub menu */ +.blogSubMenu { margin:0 0 .5em 0; padding:1em 0 .5em .5em; border-bottom:1px solid #e0e1db;} +.blogSubMenu a { text-decoration:none; color:#666666; vertical-align:bottom; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat right 5px; padding-left:10px; padding-right:10px; _padding-top:5px; position:relative; top:5px; } +.blogSubMenu img.sort { vertical-align:middle; } -/* blogList */ -.blogList { width:100%; position:relative; border:1px solid #e0e1db;} -.blogList tr.notice { background:#f8f8f8;} -.blogList tr.notice .num { font-size:.9em; font-weight:bold;} +/* list */ +.blogList { width:100%; border:1px solid #e0e1db; border-top:none;} +.blogListNoTopBorder { border:none; } +.blogList th { color:#3e3f3e; font-weight:normal; border-top:1px solid #e0e1db; border-bottom:1px solid #ffffff; padding-top:5px; white-space:nowrap; height:33px; overflow:hidden;} +.blogList th.no_line { background-position:-3px bottom; } +.blogList th a { color:#3e3f3e; text-decoration:none; } +.blogList th.num { border-left:1px solid #ffffff; } +.blogList th.checkbox { text-align:center; } +.blogList th.title { text-align:center; padding-left:1em; } +.blogList th.topic { text-align:left; padding-left:1em; } +.blogList th.category { text-align:left; padding-left:1em; } +.blogList th.category select { vertical-align:middle; width:200px; height:20px;} +.blogList th.reading, th.recommend , th.date { white-space:nowrap;} +.blogList th .sort { padding:0 .2em; vertical-align:middle;} + +.blogList tr.notice { background:#f8f8f8; } +.blogList tr.notice .num { font-weight:bold;} .blogList tr.bg1 { background:#ffffff} .blogList tr.bg2 { background:#fbfbfb;} -.blogList th a { color:#3e3f3e; text-decoration:none; } -.blogList th.num { background-position:-3px bottom; border-left:1px solid #ffffff; } -.blogList th.title.first-child { background-position:-3px bottom;} -.blogList th.title { text-align:center; } -.blogList th.category { text-align:left; } -.blogList th.title select { vertical-align:middle; margin-left:.5em; } -.blogList th.reading { white-space:nowrap;} -.blogList th.recommend { white-space:nowrap;} -.blogList th.date { border-right:1px solid #ffffff;} -.blogList th .sort { padding:0 .2em; vertical-align:middle;} .blogList td { border-top:1px solid #eff0ed; padding:.5em;} .blogList td.num { font:.8em tahoma; color:#999999; padding:.5em 1em; text-align:center;} +.blogList td.checkbox { font:.8em tahoma; color:#999999; text-align:center;} .blogList tr.notice td.num { padding:.5em; white-space:nowrap;} -.blogList td.thumb { padding:.5em 0 .5em .5em; width:145px; table-layout:fixed; white-space:nowrap;} -.blogList td.thumb * { vertical-align:middle;} +.blogList tr.notice td.notice { font-size:.9em; color:#999999; font-weight:bold; text-align:center;} +.blogList td.thumb img { border:1px solid #E0E1DB; padding:3px; } + .blogList td.title {padding-left:1em; } .blogList td.title strong.category { font-size:1em; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat right 3px; padding-right:.5em; margin-right:.5em;} .blogList td.title.bold { font-size:1.2em; font-weight:bold;} @@ -66,99 +59,103 @@ Jeong, Chan Myeong 070601~070630 .blogList td.title, .blogList td.title a { color:#444444; text-decoration:none;} .blogList td.title a:visited { color:#777777;} + +.blogList td.topic { padding-left:1em; color:#888888; } +.blogList td.topic strong a { font-size:1.2em; font-weight:bold; text-decoration:none; color:#444444; } +.blogList td.topic strong a:visited { color:#777777; } +.blogList td.topic .category { background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat left 3px; padding-left:.5em; margin-left:.5em; color:#AAAAAA; } +.blogList td.topic div.author { margin-top:.5em; color:#BBBBBB; font-size:0.8em; } +.blogList td.topic div.author strong { font-size:1.2em; font-weight:normal; color:#666666; } +.blogList td.commentCount { font:bold .8em Tahoma; color:#888888; text-align:center; } + +.blogList td.latestPost { color:#888888; } +.blogList td.latestPost div.author { margin-top:.5em; color:#BBBBBB; font-size:0.8em; } +.blogList td.latestPost div.author strong { font-size:1.2em; font-weight:normal; color:#666666; } +.blogList td.latestPost div.date { font-size:0.8em; margin-top:.5em; } +.blogList td.latestPost div.date strong { font-family:Tahoma; font-weight:normal; color:#666666; } + +.blogListNoTopBorder td { border-top:none; border-bottom:1px solid #eff0ed; padding:.5em;} + +.blogList td.webzineTitle { padding-left:1em; color:#777777;} +.blogList td.webzineTitle strong.category { font-size:1em; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat right 3px; padding-right:.5em; margin-right:.5em;} +.blogList td.webzineTitle.bold { font-size:1.2em; font-weight:bold;} +.blogList td.webzineTitle * { vertical-align:middle;} +.blogList td.webzineTitle, +.blogList td.webzineTitle a { color:#444444; text-decoration:none;} +.blogList td.webzineTitle a:visited { color:#777777;} + +.blogList td.summary { border-top:none; vertical-align:top; color:#666666; line-height:1.25em; padding-left:1em;} +.blogList td.summary a { color:#666666; text-decoration:none; line-height:inherit;} +.blogList td.summary a:visited { color:#999999;} + +.blogList td .replyAndTrackback img.trackback { margin-bottom:-.1em;} +.blogList td .replyAndTrackback strong { font:bold 1em Tahoma;} +.blogList td .replyAndTrackback { font:.8em Tahoma; } .blogList td.author { color:#333333; font-size:.95em; padding-left:1em;} .blogList td.author a { font-size:1em; color:#333333;} .blogList td.reading { font:.8em Tahoma; color:#999999; text-align:center;} +.blogList td.recommend { font:bold .8em Tahoma; text-align:center;} .blogList td.date { font:.8em Tahoma; color:#999999; text-align:center; white-space:nowrap;} -.blogList td.summary { border-top:none; vertical-align:top; color:#666666; line-height:1.25em;} -.blogList td.summary a { color:#666666; text-decoration:none; line-height:inherit;} -.blogList td.summary a:visited { color:#999999;} .blogList td input { _margin:-3px;} -.blogList td .replyAndTrackback img.trackback { margin-bottom:-.1em;} -.blogList td .replyAndTrackback strong { font:bold 1em Tahoma;} -.blogList td.title.bold .replyAndTrackback { font:.6em Tahoma; color:#ff6600; position:relative; top:.3em;} -.blogList td .replyAndTrackback strong { font:bold 1em Tahoma;} -.blogList td .thumbnailSmall { margin:0 .3em 0 .3em;} -.blogList td .thumbnailSmall img { border:1px solid #bcbdb6;} -.blogList td .thumbnailMedium { margin:0 .3em 0 .3em;} -.blogList td .thumbnailMedium img { border:1px solid #e0e1db; padding:3px;} +.buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; _position:relative; _top:3px; font:.75em Tahoma; text-align:center;} +*:first-child+html .buttonTypeGo { position:relative; top:3px; } -.blogList.thumbnail { margin-top:-1px; border-bottom:none;} -.blogList.thumbnail td { border-top:none; border-bottom:1px solid #eff0ed; padding:1.5em 0 0 1.5em; overflow:hidden;} -.blogList.thumbnail div.cell { float:left; width:130px; margin:0 1.5em 0 0; padding-bottom:1.5em;} -.blogList.thumbnail div.cell img.thumb { padding:2px; border:1px solid #e0e1db; display:block; margin-bottom:1em;} -.blogList.thumbnail div.title { color:#444444; margin-bottom:.2em; padding-left:3px;} -.blogList.thumbnail div.title a { color:#444444;} -.blogList.thumbnail div.nameAndDate { font-size:.9em; color:#999999; margin-bottom:.2em; padding-left:3px;} -.blogList.thumbnail div.nameAndDate a { color:#999999;} -.blogList.thumbnail div.nameAndDate .date { font:.8em Tahoma; color:#999999;} -.blogList.thumbnail div.readAndRecommend { font-size:.9em; color:#666666; padding-left:3px;} -.blogList.thumbnail div.readAndRecommend .num { font:.8em Tahoma;} -.blogList.thumbnail div.readAndRecommend .vr { color:#dddddd;} -.blogList.thumbnail div.readAndRecommend strong.num { font:bold .8em Tahoma; color:#ff6600;} +.thumbnailBox { margin-top:1em; clear:both; overflow:hidden; border-bottom:1px solid #e0e1db; } +.thumbnailBox div.cell { display:block; float:left; overflow:hidden; margin-bottom:1em; margin-right:1em;} +.thumbnailBox div.cell img.thumb { padding:2px; border:1px solid #e0e1db; display:block; margin-bottom:1em; margin-left:auto;margin-right:auto;} +.thumbnailBox div.title { color:#3B96C0; margin-bottom:.2em; overflow:hidden; white-space:nowrap; text-align:center;} +.thumbnailBox div.title a { color:#3B96C0; text-decoration:none;} +.thumbnailBox div.nameAndDate { font-size:.9em; color:#999999; margin-bottom:.2em; text-align:center;} +.thumbnailBox div.nameAndDate a { color:#999999;} +.thumbnailBox div.nameAndDate .author { margin-left:auto; margin-right:right; } +.thumbnailBox div.nameAndDate .author div { display:inline; vertical-align:middle;} +.thumbnailBox div.nameAndDate .date { font:.8em Tahoma; color:#999999;} +.thumbnailBox div.readAndRecommend { font-size:.9em; color:#666666; text-align:center;} +.thumbnailBox div.readAndRecommend .num { font:.8em Tahoma;} +.thumbnailBox div.readAndRecommend .vr { color:#dddddd;} +.thumbnailBox div.readAndRecommend strong.num { font:bold .8em Tahoma; color:#ff6600;} + +/* list button */ +.leftButtonBox { float: left; margin-top:1em;} +.rightButtonBox { float: right; margin-top:1em;} /* pageNavigation */ -.pageNavigation { display:block; padding:1.5em 0 2em 0; text-align:center; font:bold .8em Tahoma; } +.pageNavigation { display:block; margin-top:1em; text-align:center; font:bold 11px Tahoma; margin-top:1.5em;} .pageNavigation a { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#666666; display:inline-block; padding:1px 7px 2px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } +.pageNavigation .current { position:relative; margin-left:-4px; font:bold 11px Tahoma; display:inline-block; padding:1px 7px 1px 6px; border-left:1px solid #dedfde; text-decoration:none; line-height:1em; } .pageNavigation a:hover { background:#F7F7F7; text-decoration:none; } -.pageNavigation a:visited { color:#999999;} -.pageNavigation a.goToFirst, -.pageNavigation a.goToLast { border:none; border-right:1px solid #ffffff; border-left:1px solid #ffffff; z-index:99; vertical-align:top; padding:0px 7px 4px 6px;} -.pageNavigation a.goToFirst img, -.pageNavigation a.goToLast img { display:inline-block; padding:2px 0; position:relative; top:2px; _top:1px;} +.pageNavigation a:visited { color:#999999; } +.pageNavigation a.goToFirst, .pageNavigation a.goToLast { border:none; border-right:1px solid #ffffff; border-left:1px solid #ffffff; z-index:99; vertical-align:top; padding:0px 7px 4px 6px;} +.pageNavigation a.goToFirst img, .pageNavigation a.goToLast img { display:inline-block; padding:2px 0; position:relative; top:2px; _top:1px;} -.blogRead .dateAndModify { float:right; white-space:nowrap;} -.blogRead .dateAndModify { font-size:.8em; color:#999999; float:left; position:relative; top:.3em;} -.blogRead .dateAndModify strong { font-size:1em; font-family:Tahoma;} -.blogRead .dateAndModify ul { display:inline;} -.blogRead .dateAndModify ul li { float:left; margin-left:.3em; list-style:none;} - -/* extraVars list */ -.extraVarsList { width:100%; border:1px solid #e0e1db; clear:both; margin-bottom:1em;} -.extraVarsList tr.notice { background:#f8f8f8;} -.extraVarsList tr.notice .num { font-size:.9em; font-weight:bold;} -.extraVarsList tr.bg1 { background:#ffffff} -.extraVarsList tr.bg2 { background:#fbfbfb;} -.extraVarsList th { color:#3e3f3e; font-weight:bold; padding:.8em .5em .5em .5em; border-bottom:1px solid #eff0ed; border-right:1px solid #eff0ed;} -.extraVarsList td { border-bottom:1px solid #eff0ed; padding:.5em .5em .5em 1em;} - -/* blogSearch */ -.blogSearch { text-align:center; clear:both; width:100%;} -.blogSearch fieldset { border:none; display:inline; overflow:visible; position:relative;} -.blogSearch fieldset legend { overflow:hidden; width:1px; height:1px; font-size:.001em;} -.blogSearch * { vertical-align:middle;} -.blogSearch select { float:left;} -.blogSearch input { float:left; margin:0 .3em; background:#fbfbfb;} -.searchButton ul { overflow:hidden;} -.searchButton li { float:left; margin-right:.3em; list-style:none;} +/* Search Form */ +.blogSearch { margin-left:auto; margin-right:auto; clear:both; text-align:center;} +.blogSearch select { height:20px; } +.blogSearch input { height:18px; } /* blogRead */ -.blogRead { position:relative; _width:100%; margin:0 0 0 0; border:1px solid #e0e1db;} -.blogRead .originalContent { padding:2em 1.2em 2em 1.2em;} -.blogRead .readHeader { width:100%; padding-bottom:.5em; margin-bottom:1em; border-bottom:1px solid #eff0ed; overflow:hidden;} +.blogRead { padding:0; margin:0; } +.blogRead .originalContent { padding:1.5em .5em .5em .5em;} +.blogRead .readHeader { padding:0 0 .5em 0; margin-bottom:1em; overflow:hidden;} -.blogRead .titleAndCategory { float:left;} -.blogRead .titleAndCategory h4 { font-size:1.4em; display:inline; padding-left:.2em;} -.blogRead .titleAndCategory h4 a { color:#000000; } -.blogRead .titleAndCategory .vr { font-size:.9em; margin:0 .3em; color:#c5c7c0;} -.blogRead .titleAndCategory .cotegory { font-size:.9em; color:#999999; white-space:nowrap;} +.blogRead .blogTitle{ clear:both; } +.blogRead .blogTitle h4 { font-size:1.4em; display:inline; } -.blogRead .dateAndModify { float:right; white-space:nowrap;} -.blogRead .dateAndModify .num { font-size:.9em; font-family:Tahoma; color:#999999; margin-right:.5em; float:left; position:relative; top:.3em;} -.blogRead .dateAndModify .num strong { font-size:1em; font-family:Tahoma;} -.blogRead .dateAndModify ul { display:inline;} -.blogRead .dateAndModify ul li { float:left; margin-left:.3em;} +.blogRead .dateAndCategory { float:left; overflow:hidden; white-space:nowrap; font-size:.9em; color:#888888; padding-top:1em; padding-left:.2em; } +.blogRead .dateAndCategory a { text-decoration:underline; color:#666666; } -.blogRead ul.uri { overflow:hidden; margin:0 0 2em .3em; float:right; clear:left;} +.blogRead .userInfo { white-space:nowrap; float:left; color:#3074a5; padding-top:1em; padding-left:.2em; font-size:.9em; margin-left:1em; } +.blogRead .userInfo a { font-size:.9em; color:#3074a5; text-decoration:none; } +.blogRead .userInfo .ipaddress { font-size:.9em; color:#AAAAAA; } + +.blogRead .readedAndVoted { float:right; overflow:hidden; white-space:nowrap; font-size:.9em; color:#888888; padding-top:1em; padding-left:.2em; } + +.blogRead ul.uri { overflow:hidden; margin:0 0 2em .3em; } .blogRead ul.uri li { font-size:8pt; color:#c5c7c0; } -.blogRead .userInfo { float:left; white-space:nowrap;} -.blogRead .userInfo .author { padding:0 .3em 0 0; color:#3074a5; margin-right:.3em;} -.blogRead .userInfo .ipaddress { font-size:.9em; font-family:Tahoma; color:#888888; margin-right:.5em; } - .blogRead .contentBody { width:100%; overflow:hidden; } -.blogRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both; } +.blogRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both; margin-top:2em;} .blogRead .readBody p { margin:1em 0; line-height:1.5em;} .blogRead .readBody .alignLeft { float:left; margin:0 1em 1em 0; } .blogRead .readBody .alignRight { float:right; margin:0 0 1em 1em; } @@ -171,76 +168,73 @@ Jeong, Chan Myeong 070601~070630 .blogRead .readFooter .tag li { display:inline;} .blogRead .readFooter .tag a { color:#444444;} .blogRead .readFooter .tag .tagIcon { vertical-align:middle;} -.blogRead .readFooter .fileAttached { _width:100%; border:1px solid #eaeae7; overflow:hidden; background:#fbfbfb;} +.blogRead .readFooter .fileAttached { border:1px solid #eaeae7; overflow:hidden; background:#fbfbfb;} .blogRead .readFooter .fileAttached h5 { font-weight:normal; color:#999999; float:left; font-size:1em; margin:.5em .5em 0 .5em; line-height:1.5em;} .blogRead .readFooter .fileAttached ul { float:left; margin-top:.5em; padding-bottom:1em; } .blogRead .readFooter .fileAttached li { display:inline; margin-right:.75em; line-height:1.5em;} +.blogRead .readFooter .fileAttached li a { text-decoration:none; font-size:.9em; padding:.1em 0 .1em 1.5em; white-space:nowrap; color:#444444; } .blogRead .readFooter .fileAttached li a:visited { color:#777777;} +.blogRead .buttonBox { float:right; height:40px; margin-right:1em;} -.blogRead .replyAndTrackback li { margin-left:1em; padding-left:1.4em; float:left; list-style:none;} - +.blogRead .replyAndTrackbackBox { overflow:hidden; height:40px; float:left;} +.blogRead .replyAndTrackback li { margin-top:10px; _margin-top:8px; margin-left:1em; padding-left:1.4em; float:left; list-style:none;} .blogRead .replyAndTrackback li.reply { background:url(../images/common/iconReply.gif) no-repeat left top;} -.blogRead .replyAndTrackback li.reply a { position:relative; top:-.3em; _top:-.6em;} - +.blogRead .replyAndTrackback li.reply a { _position:relative; _top:-.6em;} .blogRead .replyAndTrackback li.trackback { background:url(../images/common/iconTrackback.gif) no-repeat left top;} -.blogRead .replyAndTrackback li.trackback a { position:relative; top:-.3em; _top:0em;} - +.blogRead .replyAndTrackback li.trackback a { _position:relative; _top:0em;} .blogRead .replyAndTrackback a { color:#333333; white-space:nowrap; text-decoration:none;} .blogRead .replyAndTrackback a#toggleReply { background:url(../images/common/buttonToggleReply.gif) no-repeat right top;} .blogRead .replyAndTrackback a#toggleTrackback { background:url(../images/common/buttonToggleReply.gif) no-repeat right -13px;} +.blogRead .replyAndTrackback .listButton { position:relative; right: 10px; top:-7px; _top:-6px; float:right;} -.blogRead .replyAndTrackback .listButton { float:right; margin:0 1em 0 0; position:relative; top:-5px; _top:-7px;} +/* extraVars list */ +.extraVarsList { width:100%; border:1px solid #e0e1db; clear:both; margin-bottom:1em; margin-top:1em; border-bottom:none;} +.extraVarsList tr.notice { background:#f8f8f8;} +.extraVarsList tr.notice .num { font-size:.9em; font-weight:bold;} +.extraVarsList tr.bg1 { background:#ffffff} +.extraVarsList tr.bg2 { background:#fbfbfb;} +.extraVarsList th { color:#3e3f3e; font-weight:bold; padding:.8em .5em .5em .5em; border-bottom:1px solid #e0e1db; border-right:1px solid #e0e1db;} +.extraVarsList td { border-bottom:1px solid #e0e1db; padding:.5em .5em .5em 1em; white-space:nowrap; overflow:hidden;} -#trackbacks { padding:.6em .6em; color:#666666; border:1px solid #e0e1db;;margin-top:.5em;} -#trackbacks li { padding:.6em .8em .6em .6em; line-height:1.25em; border-bottom:1px dotted #EEEEEE; list-style:none;} -#trackbacks p { display:inline; margin-bottom:1em;} -#trackbacks a { color:#666666; text-decoration:none;} -#trackbacks div { clear:both; } -#trackbacks address { display:block; padding:0 .3em 0 0; } -#trackbacks address a { font-size:.9em; color:#3074a5; margin-right:.3em; float:left;} -#trackbacks address .date { font:.8em Tahoma; color:#cccccc; float:right;} +.trackbackBox { padding:.6em .6em; color:#666666; border-top:1px dotted #e0e1db;;margin-top:.5em;} +.trackbackBox .trackbackItem { padding:.6em .8em .6em .6em; line-height:1.25em; border-bottom:1px dotted #EEEEEE; list-style:none;} +.trackbackBox p { display:inline; margin-bottom:1em;} +.trackbackBox a { color:#666666; text-decoration:none;} +.trackbackBox div { clear:both; } +.trackbackBox address { display:block; padding:0 .3em 0 0; } +.trackbackBox address a { font-size:.9em; color:#3074a5; margin-right:.3em; float:left;} +.trackbackBox address .date { font:.8em Tahoma; color:#cccccc; float:right;} -ul.replyZone { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;} -ul.replyZone li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE;} -ul.replyZone p { display:inline; margin-bottom:1em;} -ul.replyZone .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;} -ul.replyZone .author a { font-size:.9em; color:#3074a5; margin-right:.3em;} -ul.replyZone .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;} +.replyBox { padding:.6em .6em; color:#666666; border-top:1px dotted #e0e1db; margin-top:.5em;} +.replyBox .replyItem { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;} +.replyBox p { display:inline; margin-bottom:1em;} +.replyBox .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;} +.replyBox .author a { color:#3074a5; margin-right:.3em; text-decoration:none; } +.replyBox .voted { float:left; font-size:.9em; color:#AAAAAA; margin:0 .3em .5em 1em;} +.replyBox .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;} -ul.replyZone .replyOption { float:right; white-space:nowrap; margin-left:.2em;} -ul.replyZone .replyOption img { vertical-align:middle;} +.replyBox .replyOption { float:right; white-space:nowrap; margin-left:.2em;} +.replyBox .replyOption img { vertical-align:middle;} -ul.replyZone .replyContent { clear:left; } -ul.replyZone .replyContent p { display:block; } -ul.replyZone .reply { background-color:#FAFAFA;} -ul.replyZone .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} +.replyBox .replyContent { clear:left; } +.replyBox .replyContent p { display:block; } +.replyBox .replyContent ul li { padding:0; border:none; line-height:1.25em; list-style:disc;} +.replyBox .replyContent ol li { padding:0; border:none; line-height:1.25em; list-style:decimal;} +.replyBox .reply { background-color:#FAFAFA;} +.replyBox .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} +.replyBox .fileAttached { _width:99%; border:1px solid #eaeae7; overflow:hidden; background:#fbfbfb; margin-top:.3em; list-style:none;} +.replyBox .fileAttached ul { float:left; padding:.3em 1em .2em 0; margin-left:.5em; _margin-left:.25em;} +.replyBox .fileAttached li a { font-size:.9em; white-space:nowrap; position:relative; color:#444444; } +.replyBox .fileAttached li a:visited { color:#777777;} -#reply { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;} -#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;} -#reply p { display:inline; margin-bottom:1em;} -#reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;} -#reply .author a { color:#3074a5; margin-right:.3em; text-decoration:none;} -#reply .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;} - -#reply .replyOption { float:right; white-space:nowrap; margin-left:.2em;} -#reply .replyOption img { vertical-align:middle;} - -#reply .replyContent { clear:left; } -#reply .replyContent p { display:block; } -#reply .reply { background-color:#FAFAFA;} -#reply .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;} - -#reply li .fileAttached { _width:100%; border:1px solid #eaeae7; overflow:hidden; background:#fbfbfb; margin-top:.3em; list-style:none;} -#reply li .fileAttached ul { float:left; padding:.3em 1em .2em 0; margin-left:.5em; _margin-left:.25em;} -#reply li .fileAttached li a { font-size:.9em; white-space:nowrap; position:relative; color:#444444; } -#reply li .fileAttached li a:visited { color:#777777;} +.commentButton { margin-top:.5em; } /* blogEditor */ .blogEditor { padding:.5em 0 1em 0; width:100%; overflow:hidden;} .blogEditor.reply { padding:.5em 1em 1em 1em; width:auto; overflow:hidden;} .blogEditor legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em;} -.blogEditor fieldset { _width:100%; border:1px solid #eaeae7; } +.blogEditor fieldset { _width:100%; border:1px solid #eaeae7; border-top:none;} .blogEditor .userNameAndPw { position:relative; background:#fbfbfb; border-top:1px solid #eaeae7; border-bottom:1px solid #e1e1e1; padding:.5em 1em; white-space:nowrap;} .blogEditor .userNameAndPw * { vertical-align:middle;} .blogEditor .userNameAndPw label { margin-right:.2em; color:#666760;} @@ -250,20 +244,20 @@ ul.replyZone .replyIndent { background:url(../images/common/iconReplyArrow.gif) .blogEditor .userNameAndPw .emailAddress { width:6em;} .blogEditor .userNameAndPw .homePage { width:6em;} .blogEditor .userNameAndPw .checkSecret { position:absolute; right:2em; top:.7em;} -.blogEditor .buttonReply { position:relative; float:left; left:50%; margin:.5em 0 0 -2em; _padding-bottom:1em;} -.blogEditor .commentForm { width:100%; padding-bottom:.5em;} +.blogEditor .borderTop { border-top:1px solid #eaeae7; } /* blogWrite */ .blogWrite { width:100%; position:relative;} .blogWrite .userNameAndPw { margin-bottom:-1px;} .blogWrite .blogEditor fieldset { width:auto; position:relative;} -.blogWrite div.title { border-bottom:1px solid #eff0ed; border-top:1px solid #eff0ed; padding:.5em 0; white-space:nowrap;} +.blogWrite div.title { border-bottom:1px solid #eff0ed; border-top:1px solid #eff0ed; padding:.5em 0 .5em 1em; white-space:nowrap;} .blogWrite div.title label.title { display:block; float:left; font-weight:bold; padding:.4em 0 0 1.5em; width:8em; white-space:nowrap;} .blogWrite div.title input#title { width:60%;} -.blogWrite .option { border-bottom:1px solid #e1e1e1; padding:.5em 0; overflow:hidden; width:100%;} +.blogWrite .option { border-bottom:1px solid #e1e1e1; padding:.5em 0 .5em 1em; overflow:hidden; _height:20px; } .blogWrite .option dt { display:block; float:left; font-weight:bold; padding:.3em 0 0 1.5em; width:8em; white-space:nowrap;} .blogWrite .option dd { float:left; margin-right:1em; padding-top:.2em; _padding-top:.1em;} .blogWrite .option dd * { vertical-align:middle;} +.blogWrite .option dd select { width:7em; font-size:.95em;height:20px;} .blogWrite .inputTypeText { background:#fbfbfb;} .blogWrite .trackbackURI { clear:both; border-top:1px solid #eff0ed; padding:4px 0 .8em 0;} .blogWrite .trackbackURI label { display:block; float:left; color:#333333; font-weight:bold; padding:.4em 0 0 1.5em; width:11em;} @@ -286,3 +280,8 @@ ul.replyZone .replyIndent { background:url(../images/common/iconReplyArrow.gif) .smallBox .inputPassword { position:relative; border:none; padding:2em 2em 1.5em 2em;} .smallBox .inputPassword .inputTypeText { float:left; margin-right:.5em; width:8em;} .smallBox .inputPassword legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;} + + +/* 게시물의 팝업 메뉴 */ +.comment_popup_menu, .document_popup_menu { text-align:right; margin-top:3em; clear:both; display:block; background:url(../images/common/document_menu.gif) no-repeat right top; padding-right:16px; height:18px; } +.comment_popup_menu span, .document_popup_menu span { cursor:pointer; display:inline; background:none; padding:0 0 0 0; margin:0 0 0 0; } diff --git a/modules/blog/skins/xe_blog/css/cyan.css b/modules/blog/skins/xe_blog/css/cyan.css index b257b5a74..0bc26d560 100644 --- a/modules/blog/skins/xe_blog/css/cyan.css +++ b/modules/blog/skins/xe_blog/css/cyan.css @@ -1,8 +1,8 @@ @charset "utf-8"; -/* -NHN UIT Lab. WebStandardization Team (http://html.nhndesign.com/) -Jeong, Chan Myeong 070601~070630 -*/ + +/* blog Title */ +.blogHeader { position:relative; _width:100%; border-top:1px solid #d1d9db; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) no-repeat right bottom; overflow:hidden;} +.blogHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #2895c0; background:url(../images/common/lineH3.gif) no-repeat right bottom;} #blog_category { position:relative; border:1px solid #e0e1db; background:url(../images/cyan/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } .boxTypeB { position:relative; border:1px solid #e0e1db; background:url(../images/cyan/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em;} @@ -11,31 +11,27 @@ Jeong, Chan Myeong 070601~070630 #bodyWrap #accountNavigation li { float:left; margin-right:-1px; background:url(../images/cyan/blogHeaderVr.gif) no-repeat right center;} #bodyWrap #header { clear:both; height:9.5em; margin:10px 10px .5em 10px; border:1px solid #e0e1dc; border-bottom:none; background:#fbfbfb url(../images/cyan/blogHeaderLine.gif) no-repeat left bottom; overflow:hidden;} -/* blogHeader */ -.blogHeader { position:relative; _width:100%; border-top:1px solid #d1d9db; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) no-repeat right bottom; overflow:hidden;} -.blogHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #2895c0; background:url(../images/common/lineH3.gif) no-repeat right bottom;} +/* account Navigation */ +#blogAccountNavigation li.join a { background:url(../images/cyan/iconMyInfo.gif) no-repeat left top; padding-left:14px; } +#blogAccountNavigation li.myInfo a { background:url(../images/cyan/iconMyInfo.gif) no-repeat left top; padding-left:14px; } -.accountNavigation li.join a { display:block; background:url(../images/cyan/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.accountNavigation li.myInfo a { display:block; background:url(../images/cyan/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} - -.articleNum { float:left; background:url(../images/cyan/iconArticle.gif) no-repeat left top; padding:0 0 0 1.5em; margin:.5em 0 0 0;} -#reply li .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em; padding:.1em 0 .1em 1.5em; background:url(../images/cyan/iconFile.gif) no-repeat left;} +/* blog Information */ +.articleNum { float:left; background:url(../images/cyan/iconArticle.gif) no-repeat left top; } .articleNum strong { font:bold 11px Tahoma; color:#2895c0;} -.blogHeader2 .info strong { font:bold .9em Tahoma; color:#2895c0;} -.blogList th { color:#3e3f3e; font-weight:normal; border-bottom:1px solid #ffffff; padding:.5em .5em .3em .5em; background:#ffffff url(../images/cyan/lineBoardListTh.gif) no-repeat left bottom;white-space:nowrap;} -.blogList td.recommend { font:bold .8em Tahoma; color:#2895c0; text-align:center;} -.blogList td .replyAndTrackback { font:.8em Tahoma; color:#2895c0; cursor:default; position:relative; top:-.2em;} -.blogList td.title.bold .replyAndTrackback { font:.6em Tahoma; color:#2895c0; cursor:default; position:relative; top:.3em;} -.blogList td.reply { font:bold .8em Tahoma; color:#2895c0; text-align:center;} +/* style.list */ +.blogList th { background:#ffffff url(../images/cyan/lineBlogListTh.gif) no-repeat left bottom; } +.blogList td.recommend { color:#2895c0; } +.blogList td .replyAndTrackback { color:#2895c0; } +.buttonTypeGo { background:url(../images/cyan/buttonTypeInput24.gif) no-repeat; } -.buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; background:url(../images/cyan/buttonTypeInput24.gif) no-repeat; font:.75em Tahoma; text-align:center;} +/* pageNavigation */ +.pageNavigation .current { color:#2895c0; border-right:1px solid #CCCCCC; } -.blogRead .replyAndTrackback { overflow:hidden; _width:100%; padding:.8em 0em; height:1.2em; background:url(../images/cyan/bgBoardListTh.gif) repeat-x left bottom; border-top:1px solid #b1c9d3; border-bottom:2px solid #2895c0;} -.blogRead .replyAndTrackback a strong { color:#2895c0;} -.blogRead .readFooter .fileAttached li a { font-size:.9em; padding:.1em 0 .1em 1.5em; white-space:nowrap; color:#444444; background:url(../images/cyan/iconFile.gif) no-repeat left top;} - - - -.pageNavigation .current { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#2895c0; display:inline-block; padding:1px 7px 1px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } +/* blogRead */ +blogRead .readFooter .fileAttached li a { background:url(../images/cyan/iconFile.gif) no-repeat left top;} +/* replyAndTrackback */ +.replyAndTrackback { background:url(../images/cyan/bgBlogListTh.gif) repeat-x left 0px; } +.replyAndTrackback a strong { color:#2895c0;} +.replyBox .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em; padding:.1em 0 .1em 1.5em; background:url(../images/cyan/iconFile.gif) no-repeat left;} diff --git a/modules/blog/skins/xe_blog/css/green.css b/modules/blog/skins/xe_blog/css/green.css index 2cc6ab17c..fdc6f2fb3 100644 --- a/modules/blog/skins/xe_blog/css/green.css +++ b/modules/blog/skins/xe_blog/css/green.css @@ -1,8 +1,8 @@ @charset "utf-8"; -/* -NHN UIT Lab. WebStandardization Team (http://html.nhndesign.com/) -Jeong, Chan Myeong 070601~070630 -*/ + +/* blog Title */ +.blogHeader { position:relative; _width:100%; border-top:1px solid #d1d9db; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) no-repeat right bottom; overflow:hidden;} +.blogHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d0dbd1; border-bottom:3px solid #38b549; background:url(../images/common/lineH3.gif) no-repeat right bottom;} #blog_category { position:relative; border:1px solid #e0e1db; background:url(../images/green/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } .boxTypeB { position:relative; border:1px solid #e0e1db; background:url(../images/green/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em;} @@ -11,30 +11,28 @@ Jeong, Chan Myeong 070601~070630 #bodyWrap #accountNavigation li { float:left; margin-right:-1px; background:url(../images/green/blogHeaderVr.gif) no-repeat right center;} #bodyWrap #header { clear:both; height:9.5em; margin:10px 10px .5em 10px; border:1px solid #e0e1dc; border-bottom:none; background:#fbfbfb url(../images/green/blogHeaderLine.gif) no-repeat left bottom; overflow:hidden;} -.articleNum { float:left; background:url(../images/green/iconArticle.gif) no-repeat left top; padding:0 0 0 1.5em; margin:.5em 0 0 0;} -#reply li .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em; padding:.1em 0 .1em 1.5em; background:url(../images/green/iconFile.gif) no-repeat left;} -.blogRead .readFooter .fileAttached li a { font-size:.9em; padding:.1em 0 .1em 1.5em; white-space:nowrap; color:#444444; background:url(../images/green/iconFile.gif) no-repeat left top;} -.accountNavigation li.join a { display:block; background:url(../images/green/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.accountNavigation li.myInfo a { display:block; background:url(../images/green/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.blogList th { color:#3e3f3e; font-weight:normal; border-bottom:1px solid #ffffff; padding:.5em .5em .3em .5em; background:#ffffff url(../images/green/lineBoardListTh.gif) no-repeat left bottom;white-space:nowrap;} +/* account Navigation */ +#blogAccountNavigation li.join a { background:url(../images/green/iconMyInfo.gif) no-repeat left top; padding-left:14px; } +#blogAccountNavigation li.myInfo a { background:url(../images/green/iconMyInfo.gif) no-repeat left top; padding-left:14px; } -.blogList td.recommend { font:bold .8em Tahoma; color:#38b549; text-align:center;} +/* blog Information */ +.articleNum { float:left; background:url(../images/green/iconArticle.gif) no-repeat left top; } +.articleNum strong { font:bold 11px Tahoma; color:#ff6600;} -.pageNavigation .current { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#38b549; display:inline-block; padding:1px 7px 1px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } +/* style.list */ +.blogList th { background:#ffffff url(../images/green/lineBlogListTh.gif) no-repeat left bottom; } +.blogList td.recommend { color:#38b549; } +.blogList td .replyAndTrackback { color:#38b549; } +.buttonTypeGo { background:url(../images/green/buttonTypeInput24.gif) no-repeat; } -.blogList td .replyAndTrackback { font:.8em Tahoma; color:#38b549; cursor:default; position:relative; top:-.2em;} -.blogList td.title.bold .replyAndTrackback { font:.6em Tahoma; color:#ff6600; cursor:default; position:relative; top:.3em;} -.blogList td.reply { font:bold .8em Tahoma; color:#38b549; text-align:center;} +/* pageNavigation */ +.pageNavigation .current { color:#38b549; border-right:1px solid #CCCCCC; } -/* blogHeader */ -.blogHeader { position:relative; _width:100%; border-top:1px solid #d1d9db; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) no-repeat right bottom; overflow:hidden;} -.blogHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d0dbd1; border-bottom:3px solid #38b549; background:url(../images/common/lineH3.gif) no-repeat right bottom;} +/* blogRead */ +.blogRead .readFooter .fileAttached li a { background:url(../images/green/iconFile.gif) no-repeat left top;} -.articleNum strong { font:bold 11px Tahoma; color:#d0dbd1;} -.blogHeader2 .info strong { font:bold .9em Tahoma; color:#d0dbd1;} - -.blogRead .replyAndTrackback { overflow:hidden; _width:100%; padding:.8em 0em; height:1.2em; background:url(../images/green/bgBoardListTh.gif) repeat-x left bottom; border-top:1px solid #bdd4b8; border-bottom:2px solid #38b549;} -.blogRead .replyAndTrackback a strong { color:#38b549;} - -.buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; background:url(../images/green/buttonTypeInput24.gif) no-repeat; font:.75em Tahoma; text-align:center;} +/* replyAndTrackback */ +.replyAndTrackback { background:url(../images/green/bgBlogListTh.gif) repeat-x left 0px; } +.replyAndTrackback a strong { color:#38b549;} +.replyBox .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em; padding:.1em 0 .1em 1.5em; background:url(../images/green/iconFile.gif) no-repeat left;} diff --git a/modules/blog/skins/xe_blog/css/layout.css b/modules/blog/skins/xe_blog/css/layout.css index 6f01e3b74..96c45ca3c 100644 --- a/modules/blog/skins/xe_blog/css/layout.css +++ b/modules/blog/skins/xe_blog/css/layout.css @@ -26,17 +26,16 @@ a { text-decoration:none; } #bodyWrap #accountNavigation { float:right; margin:1em 1em 0 0; padding-bottom:.5em; overflow:hidden;} #bodyWrap #accountNavigation li a { display:block; float:left; padding:0 .75em; color:#888888; white-space:nowrap;} -.accountNavigation { float:right; padding-bottom:.5em; overflow:hidden;} -.accountNavigation li { float:left; padding:0 .5em 0 .6em; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat left .4em;} -.accountNavigation li a { font-size:11px; white-space:nowrap; color:#666666;} -.accountNavigation li.rss { background:none; padding-top:.4em;} -.accountNavigation li.join { background:none; padding-top:.4em;} -.accountNavigation li.join a { display:block; background:url(../images/common/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.accountNavigation li.myInfo { padding-top:.4em;} -.accountNavigation li.myInfo a { display:block; background:url(../images/common/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.accountNavigation li.admin { background:none; padding-top:.4em;} -.accountNavigation li.admin a { display:block; background:url(../images/common/iconAdmin.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.accountNavigation li.loginAndLogout { background:none; padding-left:0;} +/* account Navigation */ +#blogAccountNavigation { float:right; margin:1em; } +#blogAccountNavigation li { float:left; margin-left:7px; list-style:none; padding-top:3px;} +#blogAccountNavigation li a { font-size:12px; white-space:nowrap; color:#666666; text-decoration:none;} +#blogAccountNavigation li.setup a { background:url(../images/common/iconSetup.gif) no-repeat left top; padding-left:14px; } +#blogAccountNavigation li.admin a { background:url(../images/common/iconAdmin.gif) no-repeat left top; padding-left:12px; } +#blogAccountNavigation li.listType { margin-left:5px; } +#blogAccountNavigation li.loginAndLogout { background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat left 5px; padding-left:8px; _padding-top:5px;} +#blogAccountNavigation li.write a { background:url(../images/common/iconWrite.gif) no-repeat left center; padding-left:14px;} +*:first-child+html #blogAccountNavigation li.loginAndLogout { padding-top:5px; } /* Blog header Child*/ #bodyWrap #header h1 { font-size:2em; padding:.8em 0 .2em 30px; letter-spacing:-.05em;} @@ -67,12 +66,6 @@ div#profile dl#hello dt { color:#333333; margin-bottom:.2em;} div#profile dl#hello dt a { color:#333333;} div#profile dl#hello dd { color:#777777; margin-bottom:1em;} div#profile ul#admin { overflow:hidden; height:1.2em;} -div#profile ul#admin li { float:left; padding-right:.6em;} -div#profile ul#admin li a { display:block; padding-left:1.2em;} -div#profile ul#admin li.write a { background:url(../images/common/iconWrite.gif) no-repeat left center;} -div#profile ul#admin li.setup { padding-left:.7em; background:url(../images/common/blogHeaderVr.gif) no-repeat left center;} -div#profile ul#admin li.setup a { background:url(../images/common/iconSetup.gif) no-repeat left center;} -div#profile ul#admin li a { color:#666666;} div#blog_category { background-color:#FFFFFF; } diff --git a/modules/blog/skins/xe_blog/css/purple.css b/modules/blog/skins/xe_blog/css/purple.css index 0cb69b79e..fb97dfa9f 100644 --- a/modules/blog/skins/xe_blog/css/purple.css +++ b/modules/blog/skins/xe_blog/css/purple.css @@ -1,8 +1,8 @@ @charset "utf-8"; -/* -NHN UIT Lab. WebStandardization Team (http://html.nhndesign.com/) -Jeong, Chan Myeong 070601~070630 -*/ + +/* blog Title */ +.blogHeader { position:relative; _width:100%; border-top:1px solid #d1d9db; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) no-repeat right bottom; overflow:hidden;} +.blogHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #ac19a9; background:url(../images/common/lineH3.gif) no-repeat right bottom;} #blog_category { position:relative; border:1px solid #e0e1db; background:url(../images/purple/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } .boxTypeB { position:relative; border:1px solid #e0e1db; background:url(../images/purple/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em;} @@ -11,30 +11,27 @@ Jeong, Chan Myeong 070601~070630 #bodyWrap #accountNavigation li { float:left; margin-right:-1px; background:url(../images/purple/blogHeaderVr.gif) no-repeat right center;} #bodyWrap #header { clear:both; height:9.5em; margin:10px 10px .5em 10px; border:1px solid #e0e1dc; border-bottom:none; background:#fbfbfb url(../images/purple/blogHeaderLine.gif) no-repeat left bottom; overflow:hidden;} -.articleNum { float:left; background:url(../images/purple/iconArticle.gif) no-repeat left top; padding:0 0 0 1.5em; margin:.5em 0 0 0;} -#reply li .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em; padding:.1em 0 .1em 1.5em; background:url(../images/purple/iconFile.gif) no-repeat left;} -.blogRead .readFooter .fileAttached li a { font-size:.9em; padding:.1em 0 .1em 1.5em; white-space:nowrap; color:#444444; background:url(../images/purple/iconFile.gif) no-repeat left top;} -.accountNavigation li.join a { display:block; background:url(../images/purple/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.accountNavigation li.myInfo a { display:block; background:url(../images/purple/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} - -.blogList th { color:#3e3f3e; font-weight:normal; border-bottom:1px solid #ffffff; padding:.5em .5em .3em .5em; background:#ffffff url(../images/purple/lineBoardListTh.gif) no-repeat left bottom;white-space:nowrap;} - -.blogList td.recommend { font:bold .8em Tahoma; color:#b1ae00; text-align:center;} - -.pageNavigation .current { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#b1ae00; display:inline-block; padding:1px 7px 1px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } - -.blogList td .replyAndTrackback { font:.8em Tahoma; color:#b1ae00; cursor:default; position:relative; top:-.2em;} -.blogList td.title.bold .replyAndTrackback { font:.6em Tahoma; color:#b1ae00; cursor:default; position:relative; top:.3em;} -.blogList td.reply { font:bold .8em Tahoma; color:#b1ae00; text-align:center;} - -/* blogHeader */ -.blogHeader { position:relative; _width:100%; border-top:1px solid #d1d9db; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) no-repeat right bottom; overflow:hidden;} -.blogHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #ac19a9; background:url(../images/common/lineH3.gif) no-repeat right bottom;} +/* account Navigation */ +#blogAccountNavigation li.join a { background:url(../images/purple/iconMyInfo.gif) no-repeat left top; padding-left:14px; } +#blogAccountNavigation li.myInfo a { background:url(../images/purple/iconMyInfo.gif) no-repeat left top; padding-left:14px; } +/* blog Information */ +.articleNum { float:left; background:url(../images/purple/iconArticle.gif) no-repeat left top; } .articleNum strong { font:bold 11px Tahoma; color:#b1ae00;} -.blogHeader2 .info strong { font:bold .9em Tahoma; color:#b1ae00;} -.blogRead .replyAndTrackback { overflow:hidden; _width:100%; padding:.8em 0em; height:1.2em; background:url(../images/purple/bgBoardListTh.gif) repeat-x left bottom; border-top:1px solid #dbc9db; border-bottom:2px solid #ac19a9;} -.blogRead .replyAndTrackback a strong { color:#b1ae00;} +/* style.list */ +.blogList th { background:#ffffff url(../images/purple/lineBlogListTh.gif) no-repeat left bottom; } +.blogList td.recommend { color:#b1ae00; } +.blogList td .replyAndTrackback { color:#b1ae00; } +.buttonTypeGo { background:url(../images/purple/buttonTypeInput24.gif) no-repeat; } -.buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; background:url(../images/purple/buttonTypeInput24.gif) no-repeat; font:.75em Tahoma; text-align:center;} +/* pageNavigation */ +.pageNavigation .current { color:#b1ae00; border-right:1px solid #CCCCCC; } + +/* blogRead */ +.blogRead .readFooter .fileAttached li a { background:url(../images/purple/iconFile.gif) no-repeat left top;} + +/* replyAndTrackback */ +.replyAndTrackback { background:url(../images/purple/bgBlogListTh.gif) repeat-x left 0px; } +.replyAndTrackback a strong { color:#b1ae00;} +.replyBox .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em; padding:.1em 0 .1em 1.5em; background:url(../images/purple/iconFile.gif) no-repeat left;} diff --git a/modules/blog/skins/xe_blog/css/red.css b/modules/blog/skins/xe_blog/css/red.css index 59a1b36d0..7895b2a8b 100644 --- a/modules/blog/skins/xe_blog/css/red.css +++ b/modules/blog/skins/xe_blog/css/red.css @@ -1,8 +1,8 @@ @charset "utf-8"; -/* -NHN UIT Lab. WebStandardization Team (http://html.nhndesign.com/) -Jeong, Chan Myeong 070601~070630 -*/ + +/* blog Title */ +.blogHeader { position:relative; _width:100%; border-top:1px solid #d1d9db; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) no-repeat right bottom; overflow:hidden;} +.blogHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #ed135a; background:url(../images/common/lineH3.gif) no-repeat right bottom;} #blog_category { position:relative; border:1px solid #e0e1db; background:url(../images/red/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } .boxTypeB { position:relative; border:1px solid #e0e1db; background:url(../images/red/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em;} @@ -11,30 +11,27 @@ Jeong, Chan Myeong 070601~070630 #bodyWrap #accountNavigation li { float:left; margin-right:-1px; background:url(../images/red/blogHeaderVr.gif) no-repeat right center;} #bodyWrap #header { clear:both; height:9.5em; margin:10px 10px .5em 10px; border:1px solid #e0e1dc; border-bottom:none; background:#fbfbfb url(../images/red/blogHeaderLine.gif) no-repeat left bottom; overflow:hidden;} -.articleNum { float:left; background:url(../images/red/iconArticle.gif) no-repeat left top; padding:0 0 0 1.5em; margin:.5em 0 0 0;} -#reply li .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em; padding:.1em 0 .1em 1.5em; background:url(../images/red/iconFile.gif) no-repeat left;} -.blogRead .readFooter .fileAttached li a { font-size:.9em; padding:.1em 0 .1em 1.5em; white-space:nowrap; color:#444444; background:url(../images/red/iconFile.gif) no-repeat left top;} -.accountNavigation li.join a { display:block; background:url(../images/red/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.accountNavigation li.myInfo a { display:block; background:url(../images/red/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} - -.blogList th { color:#3e3f3e; font-weight:normal; border-bottom:1px solid #ffffff; padding:.5em .5em .3em .5em; background:#ffffff url(../images/red/lineBoardListTh.gif) no-repeat left bottom; white-space:nowrap;} - -.blogList td.recommend { font:bold .8em Tahoma; color:#ff6600; text-align:center;} - -.pageNavigation .current { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#ff6600; display:inline-block; padding:1px 7px 1px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } - -.blogList td .replyAndTrackback { font:.8em Tahoma; color:#ff6600; cursor:default; position:relative; top:-.2em;} -.blogList td.title.bold .replyAndTrackback { font:.6em Tahoma; color:#ff6600; cursor:default; position:relative; top:.3em;} -.blogList td.reply { font:bold .8em Tahoma; color:#ff6600; text-align:center;} - -/* blogHeader */ -.blogHeader { position:relative; _width:100%; border-top:1px solid #d1d9db; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) no-repeat right bottom; overflow:hidden;} -.blogHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #ed135a; background:url(../images/common/lineH3.gif) no-repeat right bottom;} +/* account Navigation */ +#blogAccountNavigation li.join a { background:url(../images/red/iconMyInfo.gif) no-repeat left top; padding-left:14px; } +#blogAccountNavigation li.myInfo a { background:url(../images/red/iconMyInfo.gif) no-repeat left top; padding-left:14px; } +/* blog Information */ +.articleNum { float:left; background:url(../images/red/iconArticle.gif) no-repeat left top; } .articleNum strong { font:bold 11px Tahoma; color:#ff6600;} -.blogHeader2 .info strong { font:bold .9em Tahoma; color:#ff6600;} -.blogRead .replyAndTrackback { overflow:hidden; _width:100%; padding:.8em 0em; height:1.2em; background:url(../images/red/bgBoardListTh.gif) repeat-x left bottom; border-top:1px solid #e0e1db; border-bottom:2px solid #ed135a;} -.blogRead .replyAndTrackback a strong { color:#ff6600;} +/* style.list */ +.blogList th { background:#ffffff url(../images/red/lineBlogListTh.gif) no-repeat left bottom; } +.blogList td.recommend { color:#ff6600; } +.blogList td .replyAndTrackback { color:#ff6600; } +.buttonTypeGo { background:url(../images/red/buttonTypeInput24.gif) no-repeat; } -.buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; background:url(../images/red/buttonTypeInput24.gif) no-repeat; font:.75em Tahoma; text-align:center;} +/* pageNavigation */ +.pageNavigation .current { color:#ff6600; border-right:1px solid #CCCCCC; } + +/* blogRead */ +.blogRead .readFooter .fileAttached li a { background:url(../images/red/iconFile.gif) no-repeat left top;} + +/* replyAndTrackback */ +.replyAndTrackback { background:url(../images/red/bgBlogListTh.gif) repeat-x left 0px; } +.replyAndTrackback a strong { color:#ff6600;} +.replyBox .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em; padding:.1em 0 .1em 1.5em; background:url(../images/red/iconFile.gif) no-repeat left;} diff --git a/modules/blog/skins/xe_blog/css/white.css b/modules/blog/skins/xe_blog/css/white.css index f2fe4f7f6..4b10c6e92 100644 --- a/modules/blog/skins/xe_blog/css/white.css +++ b/modules/blog/skins/xe_blog/css/white.css @@ -1,8 +1,8 @@ @charset "utf-8"; -/* -NHN UIT Lab. WebStandardization Team (http://html.nhndesign.com/) -Jeong, Chan Myeong 070601~070630 -*/ + +/* blog Title */ +.blogHeader { position:relative; _width:100%; border:1px solid #e1e1dd; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) repeat-x left bottom; overflow:hidden;} +.blogHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-bottom:3px solid #fe3614; background:#ffffff url(../images/common/lineH3.gif) no-repeat right bottom;} #blog_category { position:relative; border:1px solid #e0e1db; background:url(../images/white/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em; } .boxTypeB { position:relative; border:1px solid #e0e1db; background:url(../images/white/bgBoxTypeB.gif) repeat-x left top; margin-bottom:.7em;} @@ -11,29 +11,27 @@ Jeong, Chan Myeong 070601~070630 #bodyWrap #accountNavigation li { float:left; margin-right:-1px; background:url(../images/white/blogHeaderVr.gif) no-repeat right center;} #bodyWrap #header { clear:both; height:9.5em; margin:10px 10px .5em 10px; border:1px solid #e0e1dc; border-bottom:none; background:#fbfbfb url(../images/white/blogHeaderLine.gif) no-repeat left bottom; overflow:hidden;} -.articleNum { float:left; background:url(../images/white/iconArticle.gif) no-repeat left top; padding:0 0 0 1.5em; margin:.5em 0 0 0;} -#reply li .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em; padding:.1em 0 .1em 1.5em; background:url(../images/white/iconFile.gif) no-repeat left;} -.blogRead .readFooter .fileAttached li a { font-size:.9em; padding:.1em 0 .1em 1.5em; white-space:nowrap; color:#444444; background:url(../images/white/iconFile.gif) no-repeat left top;} -.accountNavigation li.join a { display:block; background:url(../images/white/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.accountNavigation li.myInfo a { display:block; background:url(../images/white/iconMyInfo.gif) no-repeat left .1em; padding:0 0 0 1.2em;} -.blogList th { color:#3e3f3e; font-weight:normal; border-bottom:1px solid #ffffff; padding:.5em .5em .3em .5em; background:#ffffff url(../images/white/lineBoardListTh.gif) no-repeat left bottom;white-space:nowrap;} - -.blogList td.recommend { font:bold .8em Tahoma; color:#ff6600; text-align:center;} - -.pageNavigation .current { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#ff6600; display:inline-block; padding:1px 7px 1px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } - -.blogList td .replyAndTrackback { font:.8em Tahoma; color:#ff6600; position:relative; top:-.2em;} -.blogList td.title.bold .replyAndTrackback { font:.6em Tahoma; color:#ff6600; position:relative; top:.3em;} -.blogList td.reply { font:bold .8em Tahoma; color:#ff6600; text-align:center;} - -/* blogHeader */ -.blogHeader { position:relative; _width:100%; border:1px solid #e1e1dd; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) repeat-x left bottom; overflow:hidden;} -.blogHeader h3 { float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-bottom:3px solid #fe3614; background:#ffffff url(../images/common/lineH3.gif) no-repeat right bottom;} +/* account Navigation */ +#blogAccountNavigation li.join a { background:url(../images/white/iconMyInfo.gif) no-repeat left top; padding-left:14px; } +#blogAccountNavigation li.myInfo a { background:url(../images/white/iconMyInfo.gif) no-repeat left top; padding-left:14px; } +/* blog Information */ +.articleNum { float:left; background:url(../images/white/iconArticle.gif) no-repeat left top; } .articleNum strong { font:bold 11px Tahoma; color:#ff6600;} -.blogHeader2 .info strong { font:bold .9em Tahoma; color:#ff6600;} -.blogRead .replyAndTrackback { overflow:hidden; _width:100%; padding:.8em 0em; height:1.2em; background:url(../images/white/bgBoardListTh.gif) repeat-x left bottom; border-top:1px solid #e0e1db; border-bottom:2px solid #666760;} -.blogRead .replyAndTrackback a strong { color:#ff6600;} +/* style.list */ +.blogList th { background:#ffffff url(../images/white/lineBlogListTh.gif) no-repeat left bottom; } +.blogList td.recommend { color:#ff6600; } +.blogList td .replyAndTrackback { color:#ff6600; } +.buttonTypeGo { background:url(../images/white/buttonTypeInput24.gif) no-repeat; } -.buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; background:url(../images/white/buttonTypeInput24.gif) no-repeat; font:.75em Tahoma; text-align:center;} +/* pageNavigation */ +.pageNavigation .current { color:#ff6600; border-right:1px solid #CCCCCC; } + +/* blogRead */ +.blogRead .readFooter .fileAttached li a { background:url(../images/white/iconFile.gif) no-repeat left top;} + +/* replyAndTrackback */ +.replyAndTrackback { background:url(../images/white/bgBlogListTh.gif) repeat-x left 0px; } +.replyAndTrackback a strong { color:#ff6600;} +.replyBox .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em; padding:.1em 0 .1em 1.5em; background:url(../images/white/iconFile.gif) no-repeat left;} diff --git a/modules/blog/skins/xe_blog/delete_comment_form.html b/modules/blog/skins/xe_blog/delete_comment_form.html index 551597edf..d2d0ba4e2 100644 --- a/modules/blog/skins/xe_blog/delete_comment_form.html +++ b/modules/blog/skins/xe_blog/delete_comment_form.html @@ -10,12 +10,12 @@
- - + + -
+
- {$lang->cmd_cancel} + {$lang->cmd_cancel}
diff --git a/modules/blog/skins/xe_blog/delete_form.html b/modules/blog/skins/xe_blog/delete_form.html index 638bc0255..1ca638c93 100644 --- a/modules/blog/skins/xe_blog/delete_form.html +++ b/modules/blog/skins/xe_blog/delete_form.html @@ -12,7 +12,7 @@ -
+
{$lang->cmd_cancel}
diff --git a/modules/board/skins/xe_gallery/extra_var_form.html b/modules/blog/skins/xe_blog/extra_var_form.html similarity index 100% rename from modules/board/skins/xe_gallery/extra_var_form.html rename to modules/blog/skins/xe_blog/extra_var_form.html diff --git a/modules/board/skins/xe_gallery/extra_var_value.html b/modules/blog/skins/xe_blog/extra_var_value.html similarity index 100% rename from modules/board/skins/xe_gallery/extra_var_value.html rename to modules/blog/skins/xe_blog/extra_var_value.html diff --git a/modules/blog/skins/xe_blog/footer.html b/modules/blog/skins/xe_blog/footer.html index 9d5404ca8..e69de29bb 100644 --- a/modules/blog/skins/xe_blog/footer.html +++ b/modules/blog/skins/xe_blog/footer.html @@ -1 +0,0 @@ -{$module_info->footer_text} diff --git a/modules/blog/skins/xe_blog/header.html b/modules/blog/skins/xe_blog/header.html index 8a6469432..e69de29bb 100644 --- a/modules/blog/skins/xe_blog/header.html +++ b/modules/blog/skins/xe_blog/header.html @@ -1,2 +0,0 @@ - -{$module_info->header_text} diff --git a/modules/blog/skins/xe_blog/images/common/bgBoardEditorOption.gif b/modules/blog/skins/xe_blog/images/common/bgBlogEditorOption.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/common/bgBoardEditorOption.gif rename to modules/blog/skins/xe_blog/images/common/bgBlogEditorOption.gif diff --git a/modules/blog/skins/xe_blog/images/blank.gif b/modules/blog/skins/xe_blog/images/common/blank.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/blank.gif rename to modules/blog/skins/xe_blog/images/common/blank.gif diff --git a/modules/blog/skins/xe_blog/images/common/buttonHelp.gif b/modules/blog/skins/xe_blog/images/common/buttonHelp.gif index ca7a23a9f..d330e801f 100644 Binary files a/modules/blog/skins/xe_blog/images/common/buttonHelp.gif and b/modules/blog/skins/xe_blog/images/common/buttonHelp.gif differ diff --git a/modules/blog/skins/xe_blog/images/common/document_menu.gif b/modules/blog/skins/xe_blog/images/common/document_menu.gif new file mode 100644 index 000000000..548e48ec7 Binary files /dev/null and b/modules/blog/skins/xe_blog/images/common/document_menu.gif differ diff --git a/modules/blog/skins/xe_blog/images/common/find_button.gif b/modules/blog/skins/xe_blog/images/common/find_button.gif new file mode 100644 index 000000000..7520ec3f4 Binary files /dev/null and b/modules/blog/skins/xe_blog/images/common/find_button.gif differ diff --git a/modules/blog/skins/xe_blog/images/common/iconCheck.gif b/modules/blog/skins/xe_blog/images/common/iconCheck.gif index c4fb37ae0..2fa7ce694 100644 Binary files a/modules/blog/skins/xe_blog/images/common/iconCheck.gif and b/modules/blog/skins/xe_blog/images/common/iconCheck.gif differ diff --git a/modules/blog/skins/xe_blog/images/common/iconRss.gif b/modules/blog/skins/xe_blog/images/common/iconRss.gif index f495b3ebc..eec2d5ead 100644 Binary files a/modules/blog/skins/xe_blog/images/common/iconRss.gif and b/modules/blog/skins/xe_blog/images/common/iconRss.gif differ diff --git a/modules/blog/skins/xe_blog/images/poweredbyzbxe.png b/modules/blog/skins/xe_blog/images/common/poweredbyzbxe.png similarity index 100% rename from modules/blog/skins/xe_blog/images/poweredbyzbxe.png rename to modules/blog/skins/xe_blog/images/common/poweredbyzbxe.png diff --git a/modules/blog/skins/xe_blog/images/common/typeGallery.gif b/modules/blog/skins/xe_blog/images/common/typeGallery.gif new file mode 100644 index 000000000..8479abbbd Binary files /dev/null and b/modules/blog/skins/xe_blog/images/common/typeGallery.gif differ diff --git a/modules/blog/skins/xe_blog/images/common/typeList.gif b/modules/blog/skins/xe_blog/images/common/typeList.gif new file mode 100644 index 000000000..f031faa8c Binary files /dev/null and b/modules/blog/skins/xe_blog/images/common/typeList.gif differ diff --git a/modules/blog/skins/xe_blog/images/common/typeWebzine.gif b/modules/blog/skins/xe_blog/images/common/typeWebzine.gif new file mode 100644 index 000000000..09fcaac9b Binary files /dev/null and b/modules/blog/skins/xe_blog/images/common/typeWebzine.gif differ diff --git a/modules/blog/skins/xe_blog/images/cyan/bgBoardListTh.gif b/modules/blog/skins/xe_blog/images/cyan/bgBlogListTh.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/cyan/bgBoardListTh.gif rename to modules/blog/skins/xe_blog/images/cyan/bgBlogListTh.gif diff --git a/modules/blog/skins/xe_blog/images/cyan/lineBoardListTh.gif b/modules/blog/skins/xe_blog/images/cyan/lineBlogListTh.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/cyan/lineBoardListTh.gif rename to modules/blog/skins/xe_blog/images/cyan/lineBlogListTh.gif diff --git a/modules/blog/skins/xe_blog/images/green/bgBoardListTh.gif b/modules/blog/skins/xe_blog/images/green/bgBlogListTh.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/green/bgBoardListTh.gif rename to modules/blog/skins/xe_blog/images/green/bgBlogListTh.gif diff --git a/modules/blog/skins/xe_blog/images/green/lineBoardListTh.gif b/modules/blog/skins/xe_blog/images/green/lineBlogListTh.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/green/lineBoardListTh.gif rename to modules/blog/skins/xe_blog/images/green/lineBlogListTh.gif diff --git a/modules/blog/skins/xe_blog/images/iconRss.gif b/modules/blog/skins/xe_blog/images/iconRss.gif deleted file mode 100644 index f495b3ebc..000000000 Binary files a/modules/blog/skins/xe_blog/images/iconRss.gif and /dev/null differ diff --git a/modules/blog/skins/xe_blog/images/purple/bgBoardListTh.gif b/modules/blog/skins/xe_blog/images/purple/bgBlogListTh.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/purple/bgBoardListTh.gif rename to modules/blog/skins/xe_blog/images/purple/bgBlogListTh.gif diff --git a/modules/blog/skins/xe_blog/images/purple/lineBoardListTh.gif b/modules/blog/skins/xe_blog/images/purple/lineBlogListTh.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/purple/lineBoardListTh.gif rename to modules/blog/skins/xe_blog/images/purple/lineBlogListTh.gif diff --git a/modules/blog/skins/xe_blog/images/red/bgBoardListTh.gif b/modules/blog/skins/xe_blog/images/red/bgBlogListTh.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/red/bgBoardListTh.gif rename to modules/blog/skins/xe_blog/images/red/bgBlogListTh.gif diff --git a/modules/blog/skins/xe_blog/images/red/lineBoardListTh.gif b/modules/blog/skins/xe_blog/images/red/lineBlogListTh.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/red/lineBoardListTh.gif rename to modules/blog/skins/xe_blog/images/red/lineBlogListTh.gif diff --git a/modules/blog/skins/xe_blog/images/white/bgBoardListTh.gif b/modules/blog/skins/xe_blog/images/white/bgBlogListTh.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/white/bgBoardListTh.gif rename to modules/blog/skins/xe_blog/images/white/bgBlogListTh.gif diff --git a/modules/blog/skins/xe_blog/images/white/lineBoardListTh.gif b/modules/blog/skins/xe_blog/images/white/lineBlogListTh.gif similarity index 100% rename from modules/blog/skins/xe_blog/images/white/lineBoardListTh.gif rename to modules/blog/skins/xe_blog/images/white/lineBlogListTh.gif diff --git a/modules/blog/skins/xe_blog/input_password_form.html b/modules/blog/skins/xe_blog/input_password_form.html index 7655414d3..0f935eb92 100644 --- a/modules/blog/skins/xe_blog/input_password_form.html +++ b/modules/blog/skins/xe_blog/input_password_form.html @@ -1,7 +1,7 @@ -
+

{$lang->msg_input_password}

@@ -13,18 +13,14 @@ -
+
- -
- - {$lang->cmd_cancel} -
+ + {$lang->cmd_cancel}
- diff --git a/modules/blog/skins/xe_blog/js/blog_tree_menu.js b/modules/blog/skins/xe_blog/js/blog_tree_menu.js index e2abc7ec4..a62be3f79 100644 --- a/modules/blog/skins/xe_blog/js/blog_tree_menu.js +++ b/modules/blog/skins/xe_blog/js/blog_tree_menu.js @@ -13,16 +13,6 @@ var blog_tree_menu_folder_list = new Array(); // 노드의 정보를 가지고 있을 변수 var blog_node_info_list = new Array(); -// 카테고리별 문서 수를 가지고 있는 전역 변수 -var category_document_count = new Array(); -var total_document_count = 0; - -// 카테고리의 문서 갯수를 세팅하는 함수 -function setDocumentCount(node_srl, document_count) { - category_document_count[node_srl] = document_count; - total_document_count += document_count; -} - // 카테고리의 node_srl로 문서 갯수를 리턴하는 함수 function getDocumentCount(node_srl) { return parseInt(category_document_count[node_srl],10); @@ -60,6 +50,7 @@ function blogDrawTreeMenu(oXml, callback_func, resopnse_tags, null_func, param) var zone = xGetElementById("blog_category"); var html = ""; + var document_count = 0; // 받아온 xml내용을 이용하여 트리 메뉴 그림 var xmlDoc = oXml.getResponseXml(); @@ -74,13 +65,14 @@ function blogDrawTreeMenu(oXml, callback_func, resopnse_tags, null_func, param) var root = xmlDoc.getElementsByTagName("root")[0]; var output = blogDrawNode(root,0); html += output.html; + document_count += parseInt(output.document_count,10); } // 제목 지정 var title_class = "selected"; if(blog_menu_selected) title_class = "unselected"; var title_html = '
'+title+' '; - if(total_document_count) title_html += '('+total_document_count+')'; + if(document_count) title_html += '('+document_count+')'; html = title_html+'
'+html+'
'; // 출력하려는 zone이 없다면 load후에 출력하도록 함 @@ -102,7 +94,7 @@ function blogDrawTeeMenu(html) { // root부터 시작해서 recursive하게 노드를 표혐 function blogDrawNode(parent_node, depth) { - var output = {html:"", expand:"N"} + var output = {html:"", expand:"N", document_count:0} for (var i=0; i< parent_node.childNodes.length; i++) { var html = ""; @@ -117,6 +109,7 @@ function blogDrawNode(parent_node, depth) { var text = node.getAttribute("text"); var url = node.getAttribute("url"); var expand = node.getAttribute("expand"); + var document_count = parseInt(node.getAttribute("document_count"),10); if(!text) continue; // 자식 노드가 있는지 확인 @@ -161,6 +154,7 @@ function blogDrawNode(parent_node, depth) { var chtml = child_output.html; var cexpand = child_output.expand; if(cexpand == "Y") expand = "Y"; + document_count += parseInt(child_output.document_count,10); // 무조건 펼침이 아닐 경우 if(expand!="Y") { @@ -223,11 +217,10 @@ function blogDrawNode(parent_node, depth) { if(selected) text_class = "selected"; var document_count_text = ""; - var document_count = getDocumentCount(node_srl); - if(document_count>0) document_count_text = '('+document_count+')'; + if(document_count) document_count_text = '('+document_count+')'; // 왼쪽 폴더/페이지와 텍스트 위치를 맞추기 위해;;; table태그 일단 사용. 차후 바꾸자.. - html += '
'+ + html += '
'+ '
'+ ''+ '
'+text+''+document_count_text+'
'+ @@ -240,6 +233,8 @@ function blogDrawNode(parent_node, depth) { output.html += html; if(expand=="Y") output.expand = "Y"; + + output.document_count += parseInt(document_count,10); } return output; } diff --git a/modules/blog/skins/xe_blog/layout.html b/modules/blog/skins/xe_blog/layout.html index 935b092bc..0ba18eca5 100644 --- a/modules/blog/skins/xe_blog/layout.html +++ b/modules/blog/skins/xe_blog/layout.html @@ -1,24 +1,25 @@ - - + + - - + + - - {@$layout_info->colorset = "white"} - + + {@$layout_info->colorset = "white"} + - - - - - - - + + + + + + + +