git-svn-id: http://xe-core.googlecode.com/svn/trunk@1236 201d5d3c-b55e-5fd7-737f-ddc643e51545

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;

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]);
                 }

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;
 
             // 전체 페이지를 구함

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;
 
             // 전체 페이지를 구함

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;
 
             // 전체 페이지를 구함

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 {
+.layout_profile {
-    padding:5px 0px 5px 5px;
+    border:2px solid #EEEEEE;
-    background-color:#AAAAAA;
+    text-align:center;
-    display:block;
+    padding:10px 0px 10px 0px;
-    border-bottom:1px solid #999999;
+    margin-bottom:10px;
 }
 
-.second_menu A {
+.layout_profile .profile_image {
-    color:#FFFFFF;
+    margin-bottom:10px;
-    text-decoration:none;
-    font-weight:normal;
 }
 
-.second_menu_selected {
+.layout_profile .profile{
-    padding:5px 0px 5px 5px;
+    color:#555555;
-    background-color:#666666;
+    text-align:left;
-    display:block;
+    padding:0px 10px 0px 10px;
-    border-bottom:1px solid #444444;
 }
 
-.second_menu_selected A {
+/* rss 버튼 */
-    color:#FFFFFF;
+.layout_rss {
-    font-weight:bold;
+    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;
+#content {
-    text-decoration:none;
 }
-
-.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;
-}
-

modules/blog/skins/default/layout.html

@@ -9,6 +9,7 @@
 
 <!-- 상단 로고 및 상단 메뉴 출력 -->
 <div class="layout_top">
+
     <div class="layout_logo">
         <!--@if($module_info->logo_image)-->
             <a href="./?mid={$mid}"><img src="{$module_info->logo_image}" border="0" alt="{$module_info->browser_title}"/></a>
@@ -42,34 +43,54 @@
 
 <!-- 왼쪽 분류 출력 -->
 <div class="layout_left">
+    <!--@if($module_info->profile || $module_info->profile_image)-->
+        <!-- 프로필 -->
+        <div class="layout_profile">
+            <!--@if($module_info->profile_image)-->
+            <div class="profile_image">
+                <img src="{$module_info->profile_image}" border="0" alt="profile image" />
+            </div>
+            <!--@end-->
+
+            <!--@if($module_info->profile)-->
+            <div class="profile">
+                {$module_info->profile}
+            </div>
+            <!--@end-->
+            
+        </div>
+    <!--@end-->
+
     <!-- 블로그 메뉴 출력 -->
     <div id="menu"></div>
 
-    <!--@if($logged_info->is_admin == 'Y')-->
-    <!-- 관리자일 경우 블로그 관리 메뉴 -->
-    <div class="layout_admin">
-        <a href="#" onclick="location.href='{getUrl('act','dispBlogAdminBlogInfo','layout_srl',$module_info->layout_srl)}';return false;">{$lang->cmd_management}</a>
-    </div>
-    <!--@end-->
-
     <!--@if($rss_url)-->
-    <div>
+        <!-- rss 버튼 -->
-        <a href="{$rss_url}">rss</a>
+        <div class="layout_rss">
-    </div>
+            <a href="{$rss_url}">rss</a>
+        </div>
     <!--@end-->
 
     <!--@if($grant->list)-->
-    <!-- 검색 -->
+        <!-- 검색 -->
-    <div>
+        <div class="layout_search">
-        <form action="./" method="get" onsubmit="return procFilter(this, search)">
+            <form action="./" method="get" onsubmit="return procFilter(this, search)">
-            <input type="hidden" name="mid" value="{$mid}" />
+                <input type="hidden" name="mid" value="{$mid}" />
-            <input type="hidden" name="category" value="{$category}" />
+                <input type="hidden" name="category" value="{$category}" />
-            <input type="hidden" name="search_target" value="title_content" />
+                <input type="hidden" name="search_target" value="title_content" />
-            <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+                <input type="text" class="search_keyword" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
-            <input type="submit" value="{$lang->cmd_search}" />
+                <input type="submit" class="search_button" value="{$lang->cmd_search}" />
-        </form>
+            </form>
-    </div>
+        </div>
     <!--@end-->
+
+    <!--@if($logged_info->is_admin == 'Y')-->
+        <!-- 관리자일 경우 블로그 관리 메뉴 -->
+        <div class="layout_admin">
+            <a href="#" onclick="location.href='{getUrl('act','dispBlogAdminBlogInfo','layout_srl',$module_info->layout_srl)}';return false;">{$lang->cmd_management}</a>
+        </div>
+    <!--@end-->
+
 </div>
 
 <!-- 컨텐츠 출력 부분 -->

modules/blog/skins/default/skin.xml

@@ -22,7 +22,11 @@
         <title xml:lang="ko">로고이미지</title>
         <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요.</description>
     </var>
-    <var name="memo" type="textarea">
+    <var name="profile_image" type="image" width="60" height="60">
+        <title xml:lang="ko">프로필 이미지</title>
+        <description xml:lang="ko">프로필 이미지를 입력해 주세요 (가로 사이즈는 200px이 가장 보기 좋습니다)</description>
+    </var>
+    <var name="profile" type="textarea">
         <title xml:lang="ko">프로필</title>
         <description lang="ko">간단한 프로필을 입력해주세요</description>
     </var>