diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php index ab23959c1..c23cf46a8 100644 --- a/classes/db/DBCubrid.class.php +++ b/classes/db/DBCubrid.class.php @@ -495,11 +495,11 @@ if(!$list_count) $list_count = 20; $page_count = $output->page_count['value']; if(!$page_count) $page_count = 10; - $page = $output->page->value; + $page = $output->page['value']; if(!$page) $page = 1; // 전체 페이지를 구함 - $total_page = (int)(($total_count-1)/$list_count) +1; + $total_page = (int)(($total_count-1)/$list_count)+1; // 페이지 변수를 체크 if($page > $total_page) $page = $total_page; diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php index 6eb7b573f..25fed955d 100644 --- a/classes/db/DBMysql.class.php +++ b/classes/db/DBMysql.class.php @@ -448,11 +448,11 @@ if(!$list_count) $list_count = 20; $page_count = $output->page_count['value']; if(!$page_count) $page_count = 10; - $page = $output->page->value; + $page = $output->page['value']; if(!$page) $page = 1; // 전체 페이지를 구함 - $total_page = (int)(($total_count-1)/$list_count) +1; + $total_page = (int)(($total_count-1)/$list_count)+1; // 페이지 변수를 체크 if($page > $total_page) $page = $total_page; @@ -460,7 +460,7 @@ $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition); - if($output->order) { + if(count($output->order)) { foreach($output->order as $key => $val) { $index_list[] = sprintf('%s %s', $val[0], $val[1]); } diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php index 1ad4ac323..3b307d665 100644 --- a/classes/db/DBMysql_innodb.class.php +++ b/classes/db/DBMysql_innodb.class.php @@ -457,7 +457,7 @@ if(!$list_count) $list_count = 20; $page_count = $output->page_count['value']; if(!$page_count) $page_count = 10; - $page = $output->page->value; + $page = $output->page['value']; if(!$page) $page = 1; // 전체 페이지를 구함 diff --git a/classes/db/DBSqlite2.class.php b/classes/db/DBSqlite2.class.php index b5a0c1291..1a7a82ea1 100644 --- a/classes/db/DBSqlite2.class.php +++ b/classes/db/DBSqlite2.class.php @@ -452,7 +452,7 @@ if(!$list_count) $list_count = 20; $page_count = $output->page_count['value']; if(!$page_count) $page_count = 10; - $page = $output->page->value; + $page = $output->page['value']; if(!$page) $page = 1; // 전체 페이지를 구함 diff --git a/classes/db/DBSqlite3_pdo.class.php b/classes/db/DBSqlite3_pdo.class.php index fcaa48117..63ba246e6 100644 --- a/classes/db/DBSqlite3_pdo.class.php +++ b/classes/db/DBSqlite3_pdo.class.php @@ -495,7 +495,7 @@ if(!$list_count) $list_count = 20; $page_count = $output->page_count['value']; if(!$page_count) $page_count = 10; - $page = $output->page->value; + $page = $output->page['value']; if(!$page) $page = 1; // 전체 페이지를 구함 diff --git a/modules/blog/skins/default/css/layout.css b/modules/blog/skins/default/css/layout.css index bcae51220..daeab6348 100644 --- a/modules/blog/skins/default/css/layout.css +++ b/modules/blog/skins/default/css/layout.css @@ -5,10 +5,6 @@ body { padding:0px; } -/** - * 레이아웃 style - **/ - /** * 상단 로고 및 메인 1차 메뉴 **/ @@ -45,23 +41,6 @@ body { z-index:10; } -/* 좌측 2차 메뉴 */ -.layout_second_menu { -} - -/* 좌측 관리자 메뉴 */ -.layout_admin { - margin-top:10px; - border:3px solid #EEEEEE; - padding:5px; - text-align:center; -} - -.layout_admin A { - color:#AAAAAA; - text-decoration:none; -} - /* 컨텐츠 */ .layout_content { position:absolute; @@ -71,28 +50,7 @@ body { width:660px; } -#content { -} - -/** - * 하단 메뉴 영역 - **/ -.layout_bottom { - clear:both; - margin-top:20px; -} - -/* 하단 메뉴 */ -.layout_bottom_menu { - width:100%; - text-align:center; -} - -/** - * 메뉴 style, main_menu:1~3차, bottom_menu로 구성 - **/ - -/* 1차 메뉴 */ +/* 상단 메뉴 */ .first_menu { background-color:#999999; padding:3px 10px 3px 10px; @@ -117,78 +75,64 @@ body { text-decoration:none; } -/* 2차 메뉴 */ -.second_menu { - padding:5px 0px 5px 5px; - background-color:#AAAAAA; - display:block; - border-bottom:1px solid #999999; +/* 프로필 영역 */ +.layout_profile { + border:2px solid #EEEEEE; + text-align:center; + padding:10px 0px 10px 0px; + margin-bottom:10px; } -.second_menu A { - color:#FFFFFF; - text-decoration:none; - font-weight:normal; +.layout_profile .profile_image { + margin-bottom:10px; } -.second_menu_selected { - padding:5px 0px 5px 5px; - background-color:#666666; - display:block; - border-bottom:1px solid #444444; +.layout_profile .profile{ + color:#555555; + text-align:left; + padding:0px 10px 0px 10px; } -.second_menu_selected A { - color:#FFFFFF; - font-weight:bold; +/* rss 버튼 */ +.layout_rss { + border:2px solid #EEEEEE; + height:20px; + text-align:center; + margin-bottom:10px; +} + +/* 검색 */ +.layout_search { + border:2px solid #EEEEEE; + padding:10px; + margin-bottom:10px; +} + +.layout_search .search_keyword { + border:1px solid #EEEEEE; + width:100px; +} + +.layout_search .search_button { + border:1px solid #AAAAAA; + background-color:#FFFFFF; + width:40px; +} + +/* 좌측 관리자 메뉴 */ +.layout_admin { + border:3px solid #EEEEEE; + padding:5px; + text-align:center; + margin-bottom:10px; +} + +.layout_admin A { + color:#AAAAAA; text-decoration:none; } -/* 3차 메뉴 */ -.third_menu { - padding:5px 0px 5px 20px; - border-bottom:1px solid #EEEEEE; - display:block; -} -.third_menu A { - color:#000000; - text-decoration:none; +/* 내용 */ +#content { } - -.third_menu_selected { - padding:5px 0px 5px 20px; - border-bottom:1px solid #EEEEEE; - font-weight:bold; - display:block; - background-color:#EFEFEF; -} - -.third_menu_selected A { - color:#000000; - font-weight:bold; - text-decoration:none; -} - -/* 하단 메뉴 */ -.bottom_menu { - margin-right:5px; - font-weight:normal; -} - -.bottom_menu A { - color:#000000; - text-decoration:none; -} - -.bottom_menu_selected { - margin-right:5px; - font-weight:bold; -} - -.bottom_menu_selected A { - color:#000000; - font-weight:bold; - text-decoration:none; -} - diff --git a/modules/blog/skins/default/layout.html b/modules/blog/skins/default/layout.html index 5e59792f1..28d128238 100644 --- a/modules/blog/skins/default/layout.html +++ b/modules/blog/skins/default/layout.html @@ -9,6 +9,7 @@
+