diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php index f275e301e..e7e79de09 100644 --- a/classes/file/FileHandler.class.php +++ b/classes/file/FileHandler.class.php @@ -204,13 +204,8 @@ if(function_exists('imagecreatetruecolor')) $thumb = @imagecreatetruecolor($resize_width, $resize_height); else $thumb = @imagecreate($resize_width, $resize_height); - if(!function_exists('imagecolortransparent')) { - $white = @imagecolorallocate($thumb, 255,255,255); - @imagefilledrectangle($thumb,0,0,$resize_width-1,$resize_height-1,$white); - } else { - $trans = @imagecolorat($thumb, 1,1); - @imagecolortransparent($thumb, $trans); - } + $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; diff --git a/layouts/xe_official/js/xe_official.js b/layouts/xe_official/js/xe_official.js index 66cba22ce..bf49ce705 100644 --- a/layouts/xe_official/js/xe_official.js +++ b/layouts/xe_official/js/xe_official.js @@ -31,6 +31,6 @@ function lnbToggle(id) { // IS function chkIsKind(key, value) { showHide('selectOrder'); - xGetElementById('search_kind'+key).checked = true; - xInnerHtml('search_kind_label', value); + xGetElementById('search_target'+key).checked = true; + xInnerHtml('search_target_label', value); } diff --git a/layouts/xe_official/layout.html b/layouts/xe_official/layout.html index 80b8a081d..b1bbcdce6 100644 --- a/layouts/xe_official/layout.html +++ b/layouts/xe_official/layout.html @@ -44,7 +44,7 @@ -
+ @@ -63,10 +63,12 @@ + diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php index 619e7af19..975f57f70 100644 --- a/modules/integration_search/integration_search.view.php +++ b/modules/integration_search/integration_search.view.php @@ -92,6 +92,10 @@ } } + // 텍스트 생성 + $result_text = sprintf(Context::getLang("is_result_text"), $is_keyword, $output->total_count); + Context::set('result_text', $result_text); + // 템플릿 파일 지정 $this->setTemplateFile('index'); } diff --git a/modules/integration_search/lang/ko.lang.php b/modules/integration_search/lang/ko.lang.php index 99c4bdc1a..ff308ab0d 100644 --- a/modules/integration_search/lang/ko.lang.php +++ b/modules/integration_search/lang/ko.lang.php @@ -11,4 +11,20 @@ $lang->about_target_module = "선택된 모듈만 검색 대상으로 정합니다. 권한설정에 대한 주의를 바랍니다"; $lang->about_sample_code = "위 코드를 레이아웃등에 추가하시면 통합검색이 가능합니다"; $lang->msg_no_keyword = "검색어를 입력해주세요"; + + $lang->is_result_text = "'%s' 에 대한 검색결과 %d건"; + + $lang->is_search_option = array( + 'title' => '제목', + 'content' => '내용', + 'title_content' => '제목+내용', + //'comment' => '댓글', + ); + + $lang->is_sort_option = array( + 'regdate' => '등록일', + 'comment_count' => '댓글수', + 'readed_count' => '조회수', + 'voted_count' => '추천수', + ); ?> diff --git a/modules/integration_search/skins/default/css/white.css b/modules/integration_search/skins/default/css/white.css index 957134df3..e420908e5 100644 --- a/modules/integration_search/skins/default/css/white.css +++ b/modules/integration_search/skins/default/css/white.css @@ -1,30 +1,42 @@ @charset "utf-8"; +#spot { border:8px solid #cecece; width:754px; height:64px; position:relative; margin:0 -15px 30px 0;} +#spot h2 { position:absolute; top:24px; left:-8px;} +#spot .search { text-align:center; position:relative; top:22px;} +#spot .search * { vertical-align:middle;} +#spot .search select { margin-top:1px;} +#spot .search .inputText { border:1px solid #b6b6b6; padding:2px 3px; width:252px; height:14px;} +#spot .search .submit {} -/* boardInformation */ -.boardInformation { clear:both; margin:1em 0 .5em 0; overflow:hidden; color:#666666;} -.search strong { color:#ff6600;} -.articleNum strong { font:bold 11px Tahoma; color:#ff6600;} +#content { width:100%; overflow:hidden; position:relative;} +#content h3.result { width:100%; height:23px; border-bottom:1px solid #cecece; _margin-top:-2px; margin-bottom:23px; margin-left:15px;} +*:first-child+html #content h3.result { margin-top:-2px;} +#content h3.result strong { color:#ff1a00;} +#content .sortBy { position:absolute; top:0; right:0; overflow:hidden;} +#content .sortBy li { list-style:none; float:left; padding:0 6px; position:relative; right:-6px; background:url(../images/white/vrType2.gif) no-repeat right 1px;} +#content .sortBy li a { display:block; float:left; padding-left:9px; color:#3e3e3e; white-space:nowrap; background:url(../images/white/bulletSortBy.gif) no-repeat left 4px; text-decoration:none; } +#content .sortBy li.on a { color:#ff1a00; background:url(../images/white/bulletSortByOn.gif) no-repeat left 4px;} -.no_result { text-align:center; padding:3em; border-top:1px solid #EEEEEE; border-bottom:1px solid #EEEEEE;} - -/* search_result */ -.search_result { margin:1em 0 3em 0; list-style:none; clear:both;} -.search_result .thumbnail { float:left; padding:10px; } -.search_result .thumbnail img { width:100px; height:100px; border:1px solid #555555; } -.search_result .title { margin-bottom:.5em; border-top:1px solid #EEEEEE; padding-top:.5em; } -.search_result .title a { color:#4831F6; font-size:1.2em; font-weight:bold; text-decoration:none; } -.search_result .title a:visited { color:#A59AFD;} -.search_result .replyAndTrackback { font:.8em Tahoma; color:#ff6600; position:relative; top:-.2em;} -.search_result .replyAndTrackback img.trackback { margin-bottom:-.1em;} -.search_result .summary { margin-bottom:.5em; padding-left:2em; } -.search_result .summary a { color:#888888; font-size:1em; text-decoration:none; } -.search_result .summary a:visited { color:#BBBBBB;} -.search_result .summary a:hover { color:#BBBBBB; text-decoration:none;} -.search_result .author { padding-left:2em; float:left; color:#000000; font-size:.9em;} -.search_result .date { padding-left:2em; float:left; color:#888888; font-size:.9em;} +.searchResult { margin-left:15px;} +.searchResult li { width:100%; margin-bottom:29px; clear:both; overflow:hidden;list-style:none; } +.searchResult li .thumb { display:block; float:left; margin-right:14px;} +.searchResult li dl {} +.searchResult li dl dt { color:#d8d8d8; margin-bottom:1px;} +.searchResult li dl dt a { color:#1a3588; text-decoration:underline;} +.searchResult li dl dt .reply { color:#fe6700; font:.9em Tahoma;} +.searchResult li dl dt .reply em { color:#fe6700; font:bold 1em Tahoma;} +.searchResult li dl dt .category { color:#818181;} +.searchResult li dl dd { line-height:18px; color:#555555; margin-bottom:4px;} +.searchResult li address { color:#d8d8d8; font-size:11px;} +.searchResult li address strong { color:#3e3e3e; font-size:1em; font-weight:normal;} +.searchResult li address img { vertical-align:middle; margin-right:2px;} +.searchResult li address .time { color:#818181; font:.8em Tahoma;} +.searchResult li address .read { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;} +.searchResult li address .readNum { color:#818181; font:.8em Tahoma;} +.searchResult li address .recom { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;} +.searchResult li address .recomNum { color:#fe6700; font:bold .8em Tahoma;} /* pageNavigation */ -.pageNavigation { display:block; padding:1.5em 0 2em 0; text-align:center; font:bold .8em Tahoma; border-top:1px solid #EEEEEE; padding-top:.5em; } +.pageNavigation { position:relative; display:block; text-align:center; font:bold .8em Tahoma; } .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 a:hover { background:#F7F7F7; text-decoration:none; } .pageNavigation a:visited { color:#999999;} diff --git a/modules/integration_search/skins/default/images/white/a b/modules/integration_search/skins/default/images/white/a new file mode 100644 index 000000000..38a5ea8c3 --- /dev/null +++ b/modules/integration_search/skins/default/images/white/a @@ -0,0 +1,7 @@ +svn remove bottomGotoFirst.gif +svn remove bottomGotoLast.gif +svn remove iconArticle.gif +svn remove iconReply.gif +svn remove iconTrackback.gif +svn remove lineBoardListTh.gif +svn remove line_1x10_e0e0e0.gif diff --git a/modules/integration_search/skins/default/images/white/bottomGotoFirst.gif b/modules/integration_search/skins/default/images/white/bottomGotoFirst.gif deleted file mode 100644 index e0297fecb..000000000 Binary files a/modules/integration_search/skins/default/images/white/bottomGotoFirst.gif and /dev/null differ diff --git a/modules/integration_search/skins/default/images/white/bottomGotoLast.gif b/modules/integration_search/skins/default/images/white/bottomGotoLast.gif deleted file mode 100644 index 0a7141d0d..000000000 Binary files a/modules/integration_search/skins/default/images/white/bottomGotoLast.gif and /dev/null differ diff --git a/modules/integration_search/skins/default/images/white/bulletSortBy.gif b/modules/integration_search/skins/default/images/white/bulletSortBy.gif new file mode 100644 index 000000000..d90dcc88a Binary files /dev/null and b/modules/integration_search/skins/default/images/white/bulletSortBy.gif differ diff --git a/modules/integration_search/skins/default/images/white/bulletSortByOn.gif b/modules/integration_search/skins/default/images/white/bulletSortByOn.gif new file mode 100644 index 000000000..a1d5c3244 Binary files /dev/null and b/modules/integration_search/skins/default/images/white/bulletSortByOn.gif differ diff --git a/modules/integration_search/skins/default/images/white/buttonSearch2.gif b/modules/integration_search/skins/default/images/white/buttonSearch2.gif new file mode 100644 index 000000000..65e49c9dd Binary files /dev/null and b/modules/integration_search/skins/default/images/white/buttonSearch2.gif differ diff --git a/modules/integration_search/skins/default/images/white/h2Search.gif b/modules/integration_search/skins/default/images/white/h2Search.gif new file mode 100644 index 000000000..fba3fb0f5 Binary files /dev/null and b/modules/integration_search/skins/default/images/white/h2Search.gif differ diff --git a/modules/integration_search/skins/default/images/white/iconArticle.gif b/modules/integration_search/skins/default/images/white/iconArticle.gif deleted file mode 100644 index 59c1c8019..000000000 Binary files a/modules/integration_search/skins/default/images/white/iconArticle.gif and /dev/null differ diff --git a/modules/integration_search/skins/default/images/white/iconReply.gif b/modules/integration_search/skins/default/images/white/iconReply.gif deleted file mode 100644 index a6d4ea112..000000000 Binary files a/modules/integration_search/skins/default/images/white/iconReply.gif and /dev/null differ diff --git a/modules/integration_search/skins/default/images/white/iconTrackback.gif b/modules/integration_search/skins/default/images/white/iconTrackback.gif deleted file mode 100644 index 1c83bcadd..000000000 Binary files a/modules/integration_search/skins/default/images/white/iconTrackback.gif and /dev/null differ diff --git a/modules/integration_search/skins/default/images/white/lineBoardListTh.gif b/modules/integration_search/skins/default/images/white/lineBoardListTh.gif deleted file mode 100644 index 6d891d82c..000000000 Binary files a/modules/integration_search/skins/default/images/white/lineBoardListTh.gif and /dev/null differ diff --git a/modules/integration_search/skins/default/images/white/line_1x10_e0e0e0.gif b/modules/integration_search/skins/default/images/white/line_1x10_e0e0e0.gif deleted file mode 100644 index 6a848dd58..000000000 Binary files a/modules/integration_search/skins/default/images/white/line_1x10_e0e0e0.gif and /dev/null differ diff --git a/modules/integration_search/skins/default/images/white/vrType2.gif b/modules/integration_search/skins/default/images/white/vrType2.gif new file mode 100644 index 000000000..a5e4df11d Binary files /dev/null and b/modules/integration_search/skins/default/images/white/vrType2.gif differ diff --git a/modules/integration_search/skins/default/index.html b/modules/integration_search/skins/default/index.html index 1a4294dde..3d4c5cdb3 100644 --- a/modules/integration_search/skins/default/index.html +++ b/modules/integration_search/skins/default/index.html @@ -8,60 +8,67 @@ -
-
- {$lang->search_keyword} : {$is_keyword} -
-
- {$lang->document_count} : {number_format($total_count)} -
+
+

검색하기

+ + + + + + +
- -
- - {$lang->msg_no_keyword} - - {$lang->no_search_result} - -
- - - -
- - - - -
- - {$lang->first_page} - - - {$page_no} - - {$page_no} - - - {$lang->last_page}
+ +
+

{$result_text}

+ +
  • {$val}
    • + + + --> +
      + +
    • + + + +
      +
      {$document->getTitleText()} [{$document->getCommentCount()}] | 자유게시판
      + +
      {$document->getSummary(140)}
      +
      +
      {$document->getNickName()} | {$document->getRegdate("Y-m-d H:i")} | {$lang->readed_count} {$document->get('readed_count')} | {$lang->voted_count} {$document->get('voted_count')}
      + +
      • + +
    +
    + {$lang->first_page} + + + {$page_no} + + {$page_no} + + + {$lang->last_page} +
    +
    + +