diff --git a/layouts/xe_official/css/black.css b/layouts/xe_official/css/black.css index 14ad1a7c7..d4323907c 100644 --- a/layouts/xe_official/css/black.css +++ b/layouts/xe_official/css/black.css @@ -32,6 +32,23 @@ body { background:#3d3d3d url(../images/black/bgBody.gif) repeat-x;} #gnb li a:focus { color:#ffffff;} #gnb li.on a { font-weight:bold; color:#ffffff; background:url(../images/black/bgGnbOn.gif) no-repeat center top;} +#isSearch { position:absolute; top:48px; right:15px; width:214px; text-align:right;} +#isSearch .searchOrder { display:none;} +#isSearch .checked { position:absolute; left:0; top:0; text-align:left; display:block; padding:5px 0 0 5px; width:64px; height:14px; background:url(../images/black/bgSearchTerm.gif) no-repeat; font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#ffffff; line-height:normal;} +#isSearch ul { display:none; position:absolute; left:0; top:18px; padding:2px 0 3px 0; text-align:left; border:1px solid #6e8081; background:#385153;} +#isSearch ul li { width:67px; height:18px; list-style:none;} +#isSearch ul li input { display:none;} +#isSearch ul li label { display:block; padding:4px 0 0 4px; width:63px; height:15px; font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#ffffff;} +#isSearch ul li label.on { background:#2f4345; } +#isSearch ul li label:hover, +#isSearch ul li label:focus { background:#2f4345;} +#isSearch .inputText { vertical-align:middle; _position:relative; _top:-1px; padding:3px 3px 1px 3px; width:94px; height:15px; color:#ffffff; border:none; background:url(../images/black/bgSearch.gif) no-repeat;} +#isSearch .inputText:hover, +#isSearch .inputText:focus { background:url(../images/black/bgSearchOn.gif) no-repeat;} +*:first-child+html #isSearch .inputText { position:relative; top:-1px;} +#isSearch .submit { vertical-align:middle; _position:relative; _top:-1px;} +*:first-child+html #isSearch .submit { position:relative; top:-1px;} + /* Site Layout - Content Body */ #contentBody { position:relative; width:980px; padding-bottom:30px; overflow:hidden; background:url(../images/black/bgContentBody.gif) repeat-y left top; border-bottom:1px solid #515151;} diff --git a/layouts/xe_official/css/default.css b/layouts/xe_official/css/default.css index 13164fabd..0fd2ffbb9 100644 --- a/layouts/xe_official/css/default.css +++ b/layouts/xe_official/css/default.css @@ -32,6 +32,23 @@ body { background:url(../images/default/bgBody.gif) repeat-x;} #gnb li a:focus { color:#ffffff;} #gnb li.on a { font-weight:bold; color:#ffffff; background:url(../images/default/bgGnbOn.gif) no-repeat center top;} +#isSearch { position:absolute; top:48px; right:15px; width:214px; text-align:right;} +#isSearch .searchOrder { display:none;} +#isSearch .checked { position:absolute; left:0; top:0; text-align:left; display:block; padding:5px 0 0 5px; width:64px; height:14px; background:url(../images/default/bgSearchTerm.gif) no-repeat; font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#ffffff; line-height:normal;} +#isSearch ul { display:none; position:absolute; left:0; top:18px; padding:2px 0 3px 0; text-align:left; border:1px solid #919898; background:#536c6d;} +#isSearch ul li { width:67px; height:18px; list-style:none; } +#isSearch ul li input { display:none;} +#isSearch ul li label { display:block; padding:4px 0 0 4px; width:63px; height:15px; font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#ffffff;} +#isSearch ul li label.on { background:#455a5b; } +#isSearch ul li label:hover, +#isSearch ul li label:focus { background:#455a5b;} +#isSearch .inputText { vertical-align:middle; _position:relative; _top:-1px; padding:3px 3px 1px 3px; width:94px; height:15px; color:#ffffff; border:none; background:url(../images/default/bgSearch.gif) no-repeat;} +#isSearch .inputText:hover, +#isSearch .inputText:focus { background:url(../images/default/bgSearchOn.gif) no-repeat;} +*:first-child+html body#default #isSearch .inputText { position:relative; top:-1px;} +#isSearch .submit { vertical-align:middle; _position:relative; _top:-1px;} +*:first-child+html body#default #isSearch .submit { position:relative; top:-1px;} + /* Site Layout - Content Body */ #contentBody { position:relative; width:980px; padding-bottom:30px; overflow:hidden; background:url(../images/default/bgContentBody.gif) repeat-y left top; border-bottom:1px solid #dddddd;} diff --git a/layouts/xe_official/css/white.css b/layouts/xe_official/css/white.css index 99b6faee3..059a803e8 100644 --- a/layouts/xe_official/css/white.css +++ b/layouts/xe_official/css/white.css @@ -32,6 +32,23 @@ body { background:#ffffff;} #gnb li a:focus { color:#000000;} #gnb li.on a { font-weight:bold; color:#3f3f3f; background:url(../images/white/bgGnbOn.gif) no-repeat center top;} +#isSearch { position:absolute; top:48px; right:15px; width:214px; text-align:right;} +#isSearch .searchOrder { display:none;} +#isSearch .checked { position:absolute; left:0; top:0; text-align:left; display:block; padding:5px 0 0 5px; width:64px; height:14px; background:url(../images/white/bgSearchTerm.gif) no-repeat; font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#5c5c5c; line-height:normal;} +#isSearch ul { display:none; position:absolute; left:0; top:18px; padding:2px 0 3px 0; text-align:left; border:1px solid #b2b2b2; background:#ffffff; overflow:hidden;} +#isSearch ul li { width:67px; height:18px; list-style:none;} +#isSearch ul li input { display:none;} +#isSearch ul li label { display:block; padding:4px 0 0 4px; width:63px; height:15px; font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#5c5c5c;} +#isSearch ul li label.on { background:#ededed; } +#isSearch ul li label:hover, +#isSearch ul li label:focus { background:#ededed;} +#isSearch .inputText { vertical-align:middle; _position:relative; _top:-1px; padding:3px 3px 1px 3px; width:94px; height:15px; color:#5c5c5c; border:none; background:url(../images/white/bgSearch.gif) no-repeat;} +#isSearch .inputText:hover, +#isSearch .inputText:focus { background:url(../images/white/bgSearchOn.gif) no-repeat;} +*:first-child+html #isSearch .inputText { position:relative; top:-1px;} +#isSearch .submit { vertical-align:middle; _position:relative; _top:-1px;} +*:first-child+html #isSearch .submit { position:relative; top:-1px;} + /* Site Layout - Content Body */ #contentBody { position:relative; width:980px; padding-bottom:30px; overflow:hidden; background:url(../images/white/bgContentBody.gif) repeat-y left top; border-bottom:1px solid #dddddd;} diff --git a/layouts/xe_official/images/black/bgSearch.gif b/layouts/xe_official/images/black/bgSearch.gif new file mode 100644 index 000000000..693382a03 Binary files /dev/null and b/layouts/xe_official/images/black/bgSearch.gif differ diff --git a/layouts/xe_official/images/black/bgSearchOn.gif b/layouts/xe_official/images/black/bgSearchOn.gif new file mode 100644 index 000000000..67dce8d9a Binary files /dev/null and b/layouts/xe_official/images/black/bgSearchOn.gif differ diff --git a/layouts/xe_official/images/black/bgSearchTerm.gif b/layouts/xe_official/images/black/bgSearchTerm.gif new file mode 100644 index 000000000..7811700f0 Binary files /dev/null and b/layouts/xe_official/images/black/bgSearchTerm.gif differ diff --git a/layouts/xe_official/images/black/buttonSearch.gif b/layouts/xe_official/images/black/buttonSearch.gif new file mode 100644 index 000000000..38abbd359 Binary files /dev/null and b/layouts/xe_official/images/black/buttonSearch.gif differ diff --git a/layouts/xe_official/images/default/bgSearch.gif b/layouts/xe_official/images/default/bgSearch.gif new file mode 100644 index 000000000..09953f995 Binary files /dev/null and b/layouts/xe_official/images/default/bgSearch.gif differ diff --git a/layouts/xe_official/images/default/bgSearchOn.gif b/layouts/xe_official/images/default/bgSearchOn.gif new file mode 100644 index 000000000..0b9f92295 Binary files /dev/null and b/layouts/xe_official/images/default/bgSearchOn.gif differ diff --git a/layouts/xe_official/images/default/bgSearchTerm.gif b/layouts/xe_official/images/default/bgSearchTerm.gif new file mode 100644 index 000000000..a2836640c Binary files /dev/null and b/layouts/xe_official/images/default/bgSearchTerm.gif differ diff --git a/layouts/xe_official/images/default/buttonSearch.gif b/layouts/xe_official/images/default/buttonSearch.gif new file mode 100644 index 000000000..9001f7884 Binary files /dev/null and b/layouts/xe_official/images/default/buttonSearch.gif differ diff --git a/layouts/xe_official/images/white/bgSearch.gif b/layouts/xe_official/images/white/bgSearch.gif new file mode 100644 index 000000000..865872df3 Binary files /dev/null and b/layouts/xe_official/images/white/bgSearch.gif differ diff --git a/layouts/xe_official/images/white/bgSearchOn.gif b/layouts/xe_official/images/white/bgSearchOn.gif new file mode 100644 index 000000000..612f9613e Binary files /dev/null and b/layouts/xe_official/images/white/bgSearchOn.gif differ diff --git a/layouts/xe_official/images/white/bgSearchTerm.gif b/layouts/xe_official/images/white/bgSearchTerm.gif new file mode 100644 index 000000000..cc5dafe14 Binary files /dev/null and b/layouts/xe_official/images/white/bgSearchTerm.gif differ diff --git a/layouts/xe_official/images/white/buttonSearch.gif b/layouts/xe_official/images/white/buttonSearch.gif new file mode 100644 index 000000000..095b983e4 Binary files /dev/null and b/layouts/xe_official/images/white/buttonSearch.gif differ diff --git a/layouts/xe_official/js/xe_official.js b/layouts/xe_official/js/xe_official.js index 269887e69..66cba22ce 100644 --- a/layouts/xe_official/js/xe_official.js +++ b/layouts/xe_official/js/xe_official.js @@ -1,33 +1,25 @@ // Hide And Show Toggle -cc=0 -function hideShow(id) -{ -if (cc==0) -{ -cc=1 -document.getElementById(id).style.display="none"; -} -else -{ -cc=0 -document.getElementById(id).style.display="block"; -} +var cc=0 +function hideShow(id) { + if (cc==0) { + cc=1 + document.getElementById(id).style.display="none"; + } else { + cc=0 + document.getElementById(id).style.display="block"; + } } // Show And Hide Toggle -cc=0 -function showHide(id) -{ -if (cc==0) -{ -cc=1 -document.getElementById(id).style.display="block"; -} -else -{ -cc=0 -document.getElementById(id).style.display="none"; -} +var cc=0 +function showHide(id) { + if (cc==0) { + cc=1 + document.getElementById(id).style.display="block"; + } else { + cc=0 + document.getElementById(id).style.display="none"; + } } // Local Navigation Toggle @@ -35,3 +27,10 @@ function lnbToggle(id) { for(num=1; num<=3; num++) document.getElementById('D3MG'+num).style.display='none'; //D4MG1~D4MG3 까지 숨긴 다음 document.getElementById(id).style.display='block'; //해당 ID만 보임 } + +// IS +function chkIsKind(key, value) { + showHide('selectOrder'); + xGetElementById('search_kind'+key).checked = true; + xInnerHtml('search_kind_label', value); +} diff --git a/layouts/xe_official/layout.html b/layouts/xe_official/layout.html index 631d81c4d..80b8a081d 100644 --- a/layouts/xe_official/layout.html +++ b/layouts/xe_official/layout.html @@ -21,7 +21,7 @@

ZeroBoard™  XElogo

- {$lang_type} Select Language + {$lang_type} Select Language
-
-
-
- + +
+ + + + + + + + + +
+
diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php index 65ab38a4a..619e7af19 100644 --- a/modules/integration_search/integration_search.view.php +++ b/modules/integration_search/integration_search.view.php @@ -35,6 +35,7 @@ * @brief 통합 검색 출력 **/ function IS() { + // 검색이 가능한 목록을 구하기 위해 전체 목록을 구해옴 $oModuleModel = &getModel('module'); $module_list = $oModuleModel->getMidList($args); @@ -47,10 +48,18 @@ } } - // 변수 설정 + // 검색대상 변수 설정 + $search_target = Context::get('search_target'); + if(!in_array($search_target, array('title','content','title_content','comment'))) $search_target = 'title'; + + // 검색어 변수 설정 + $is_keyword = Context::get('is_keyword'); + + // 페이지 변수 설정 $page = (int)Context::get('page'); if(!$page) $page = 1; + $list_count = (int)Context::get('list_count'); if(!$list_count|| $list_count>20) $list_count = 20; @@ -59,22 +68,29 @@ $args->page = $page; $args->list_count = $list_count; $args->page_count = 10; - $args->search_target = 'title_content'; + $args->search_target = $search_target; $args->search_keyword = Context::get('is_keyword'); $args->sort_index = 'list_order'; $args->order_type = 'asc'; - // 검색어가 없으면 오류 표시 + // 검색글이 있을 경우 검색 시도 if($args->search_keyword) { - // 대상 문서들을 가져옴 - $oDocumentModel = &getModel('document'); - $output = $oDocumentModel->getDocumentList($args); - Context::set('total_count', $output->total_count); - Context::set('total_page', $output->total_page); - Context::set('page', $output->page); - Context::set('document_list', $output->data); - Context::set('page_navigation', $output->page_navigation); - } + + // 대상이 comment이면 댓글 검색 시도 + if($search_target == 'comment') { + + // 그외는 문서 검색 시도 + } else { + // 대상 문서들을 가져옴 + $oDocumentModel = &getModel('document'); + $output = $oDocumentModel->getDocumentList($args); + Context::set('total_count', $output->total_count); + Context::set('total_page', $output->total_page); + Context::set('page', $output->page); + Context::set('document_list', $output->data); + Context::set('page_navigation', $output->page_navigation); + } + } // 템플릿 파일 지정 $this->setTemplateFile('index');