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

modules/blog/blog.view.php

@@ -83,7 +83,7 @@
             $this->setTemplatePath($template_path);
 
             // rss url
-            if($this->grant->view) Context::set('rss_url', getUrl('','mid',$this->mid,'act','dispBlogRss'));
+            if($this->grant->list) Context::set('rss_url', getUrl('','mid',$this->mid,'act','dispBlogRss'));
         }
 
         /**
@@ -101,7 +101,7 @@
             $oDocumentModel = &getModel('document');
 
             // document_srl이 있다면 해당 글을 구해오자
-            if($this->grant->view && $document_srl) {
+            if($this->grant->list && $document_srl) {
 
                 // 글을 구함
                 $document = $oDocumentModel->getDocument($document_srl, $this->grant->manager, true);

modules/blog/skins/default/header.html

@@ -1,32 +1,2 @@
 <!--%import("js/blog.js")-->
 {$module_info->header_text}
-
-<!-- 정보 -->
-<div>
-    <!--@if($total_count)-->
-    {$lang->document_count} : {number_format($total_count)}, 
-    {$lang->page_count} : {number_format($page)} / {number_format($total_page)}
-    <!--@end-->
-
-    <!--@if($rss_url)-->
-        <a href="{$rss_url}">rss</a>
-    <!--@end-->
-
-    <!--@if($is_logged)-->
-        [
-        <a href="{getUrl('act','dispMemberInfo')}">{$lang->cmd_view_member_info}</a> |
-        <a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a>
-        ]
-
-    <!--@else-->
-        [
-        <a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a> |
-        <a href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a>
-        ]
-    <!--@end-->
-
-    <!--@if($logged_info->is_admin =='Y')-->
-        <a href="{getUrl('act','dispBlogAdminBlogInfo')}">[{$lang->cmd_management}]</a>
-    <!--@end-->
-</div>
-

modules/blog/skins/default/layout.html

@@ -3,14 +3,20 @@
 
 <!-- 블로그 메뉴를 common/js/tree_menu.js를 이용해서 표시 -->
 <script type="text/javascript">
-    //loadTreeMenu("{$blog_menu->xml_file}", "blog_menu", "menu", "{$layout_info->main_menu_name?$layout_info->main_menu_name:'home'}");
+    //loadTreeMenu("{$blog_menu->xml_file}", "blog_menu", "menu", "{$module_info->main_menu_name?$module_info->main_menu_name:'home'}");
 </script>
 
 
 <!-- 상단 로고 및 상단 메뉴 출력 -->
 <div class="layout_top">
     <div class="layout_logo">
-        <a href="{$layout_info->home_url}">{$layout_info->top_title}</a>
+        <!--@if($module_info->logo_image)-->
+            <a href="./?mid={$mid}"><img src="{$module_info->logo_image}" border="0" alt="{$module_info->browser_title}"/></a>
+        <!--@end-->
+
+        <!--@if($module_info->top_title)-->
+            <a href="./?mid={$mid}">{$module_info->top_title}</a>
+        <!--@end-->
     </div>
 
     <div class="layout_first_menu">
@@ -34,21 +40,34 @@
     </div>
 </div>
 
-<!-- 왼쪽 2차 메뉴 및 로그인과 기타 플러그인 부분 -->
+<!-- 왼쪽 분류 출력 -->
 <div class="layout_left">
-    <!-- 로그인 플러그인 -->
-    <img src="./common/tpl/images/blank.gif" class="zbxe_plugin_output" plugin="login_info" skin="default" colorset="normal" style="width:100px;height:100px;"/>
-
-    <!-- 카운터 플러그인 -->
-    <img src="./common/tpl/images/blank.gif" class="zbxe_plugin_output" plugin="counter_status" skin="default" colorset="normal" style="width:100px;height:100px;"/>
-
     <!-- 블로그 메뉴 출력 -->
     <div id="menu"></div>
 
     <!--@if($logged_info->is_admin == 'Y')-->
-    <!-- 관리자일 경우 레이아웃 관리 메뉴 -->
+    <!-- 관리자일 경우 블로그 관리 메뉴 -->
     <div class="layout_admin">
-        <a href="#" onclick="location.href='{getUrl('act','dispLayoutAdminModify','layout_srl',$layout_info->layout_srl)}';return false;">{$lang->cmd_layout_management}</a>
+        <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>
+        <a href="{$rss_url}">rss</a>
+    </div>
+    <!--@end-->
+
+    <!--@if($grant->list)-->
+    <!-- 검색 -->
+    <div>
+        <form action="./" method="get" onsubmit="return procFilter(this, search)">
+            <input type="hidden" name="mid" value="{$mid}" />
+            <input type="hidden" name="category" value="{$category}" />
+            <input type="hidden" name="search_target" value="title_content" />
+            <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+            <input type="submit" value="{$lang->cmd_search}" />
+        </form>
     </div>
     <!--@end-->
 </div>

modules/blog/skins/default/list.html

@@ -3,24 +3,8 @@
 
 <!-- 목록 -->
 <div>
-    <!--@if($category_list)-->
-    <table width="100%" border="1">
-    <tr>
-        <th>
-            <form action="./" method="get">
-                <select name="category" onchange="doChangeCategory(this, '{getUrl('category','')}')" >
-                    <option value="">{$lang->category}</option>
-                    <!--@foreach($category_list as $val)-->
-                    <option value="{$val->category_srl}" <!--@if($category==$val->category_srl)-->selected="true"<!--@end-->>{$val->title} <!--@if($val->document_count)-->({$val->document_count})<!--@end--></option>
-                    <!--@end-->
-                </select>
-            </form>
-        </th>
-    </table>
-    <!--@end-->
-
     <!--@foreach($document_list as $no => $document)-->
-        <!--@if($document && $grant->view)-->
+        <!--@if($document && $grant->list)-->
             <!--#include("./view_document.html")-->
         <!--@end-->
     <!--@end-->
@@ -34,24 +18,7 @@
     <!--@end-->
 </div>
 
-<!--@if($grant->view)-->
-
-<!-- 검색 -->
-<div>
-    <form action="./" method="get" onsubmit="return procFilter(this, search)">
-        <input type="hidden" name="mid" value="{$mid}" />
-        <input type="hidden" name="category" value="{$category}" />
-
-        <select name="search_target">
-            <!--@foreach($search_option as $key => $val)-->
-            <option value="{$key}" <!--@if($search_target==$key)-->selected="true"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-        <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
-        <input type="submit" value="{$lang->cmd_search}" />
-        <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('search_target','','search_keyword','','page','1','document_srl','')}'"/>
-    </form>
-</div>
+<!--@if($grant->list)-->
 
 <!-- 페이지 네비게이션 -->
 <div>

modules/blog/skins/default/skin.xml

@@ -14,35 +14,21 @@
     </color>
   </colorset>
   <extra_vars>
-    <var name="top_title">
-        <name xml:lang="ko">상단 제목</name>
-        <type>text</type>
+    <var name="top_title" type="text">
+        <title xml:lang="ko">상단 제목</title>
         <description xml:lang="ko">레이아웃의 상단에 표시할 제목을 입력하세요.</description>
     </var>
     <var name="logo_image" type="image" width="60" height="60">
-      <title xml:lang="ko">로고이미지</title>
-    </var>
-    <var name="home_url">
-        <name xml:lang="ko">홈 url</name>
-        <type>text</type>
-        <description xml:lang="ko">home이나 상단 제목(로고이미지) 클릭시 이동할 홈 url을 입력해주세요.</description>
-    </var>
-    <var name="colorset">
-        <name xml:lang="ko">컬러셋</name>
-        <type>select</type>
-        <description xml:lang="ko">원하시는 컬러셋을 선택해주세요.</description>
-        <options>
-            <name xml:lang="ko">적색</name>
-            <value>red</value>
-        </options>
-        <options>
-            <name xml:lang="ko">청색</name>
-            <value>blue</value>
-        </options>
+        <title xml:lang="ko">로고이미지</title>
+        <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요.</description>
     </var>
     <var name="memo" type="textarea">
-      <title xml:lang="ko">프로필</title>
-      <default lang="ko">간단한 프로필을 입력해주세요</default>
+        <title xml:lang="ko">프로필</title>
+        <description lang="ko">간단한 프로필을 입력해주세요</description>
+    </var>
+    <var name="memo" type="textarea">
+        <title xml:lang="ko">분류 메뉴명</title>
+        <description lang="ko">분류 메뉴의 제목을 입력해주세요.</description>
     </var>
   </extra_vars>
 </skin>

modules/blog/tpl/skin_info.html

@@ -57,7 +57,6 @@
         <tr>
             <th colspan="2">{$lang->extra_vars}</th>
         </tr>
-
         <!--@foreach($skin_info->extra_vars as $key => $val)-->
         <tr>
             <th <!--@if($val->description)-->rowspan="2"<!--@end-->>{$val->title}</th>