From 90861943651c5a0628a5e579407e1a33e956f36c Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 13 Mar 2007 07:50:09 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@396
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/admin/admin.class.php                 | 14 ++------
 modules/admin/admin.view.php                  | 34 -------------------
 modules/admin/conf/module.xml                 |  3 --
 modules/admin/tpl/layout.html                 |  9 -----
 modules/layout/conf/module.xml                |  2 +-
 modules/layout/lang/ko.lang.php               |  4 +++
 .../tpl.admin/downloaded_layout_list.html     |  6 ++--
 modules/layout/tpl.admin/header.html          |  7 ++++
 modules/layout/tpl.admin/index.html           |  2 ++
 modules/layout/tpl.admin/insert_layout.html   |  2 ++
 modules/layout/tpl.admin/layout_info.html     |  2 ++
 11 files changed, 22 insertions(+), 63 deletions(-)
 create mode 100644 modules/layout/tpl.admin/header.html

diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php
index d090631d2..fdcb05e57 100644
--- a/modules/admin/admin.class.php
+++ b/modules/admin/admin.class.php
@@ -11,18 +11,6 @@
          * @brief MVC 에서 공통으로 사용되는 설정등을 모아 놓은것..
          **/
         function init() {
-
-            // 메뉴 아이템 지정
-            $menu_item->module->title = Context::getLang('item_module');
-            $menu_item->module->act   = 'dispModuleList';
-            $menu_item->addon->title  = Context::getLang('item_addon');
-            $menu_item->addon->act    = 'dispAddonList';
-            $menu_item->plugin->title = Context::getLang('item_plugin');
-            $menu_item->plugin->act   = 'dispPluginList';
-            $menu_item->layout->title = Context::getLang('item_layout');
-            $menu_item->layout->act   = 'dispLayoutList';
-
-            Context::set('menu_item', $menu_item);
         }
 
         /**
@@ -33,6 +21,8 @@
             $oAdminController = &getController('admin');
             $oAdminController->insertShortCut('board');
             $oAdminController->insertShortCut('member');
+            $oAdminController->insertShortCut('module');
+            $oAdminController->insertShortCut('addon');
             $oAdminController->insertShortCut('layout');
            
             return new Object();
diff --git a/modules/admin/admin.view.php b/modules/admin/admin.view.php
index c4f2b47a4..96f387e8d 100644
--- a/modules/admin/admin.view.php
+++ b/modules/admin/admin.view.php
@@ -75,40 +75,6 @@
             $this->setTemplateFile('shortcut_list');
         }
 
-        /**
-         * @brief 모듈의 목록을 보여줌
-         **/
-        function dispModuleList() {
-            // moduleView::dispModuleList()를 실행하고 템플릿 파일을 구해옴
-            $oModuleView = &getView('module');
-            $oModuleView->dispModuleList();
-
-            $this->setTemplatePath($oModuleView->getTemplatePath());
-            $this->setTemplateFile($oModuleView->getTemplateFile());
-        }
-
-        /**
-         * @brief애드온의 목록을 보여줌
-         **/
-        function dispAddonList() {
-            $oAddonView = &getView('addon');
-            $oAddonView->dispAddonList();
-
-            $this->setTemplatePath($oAddonView->getTemplatePath());
-            $this->setTemplateFile($oAddonView->getTemplateFile());
-        }
-
-        /**
-         * @brief 레이아웃의 목록을 보여줌
-         **/
-        function dispLayoutList() {
-            $oLayoutView = &getView('layout');
-            $oLayoutView->dispDownloadedLayoutList();
-
-            $this->setTemplatePath($oLayoutView->getTemplatePath());
-            $this->setTemplateFile($oLayoutView->getTemplateFile());
-        }
-
         /**
          * @brief 관리자 로그인 페이지 출력
          **/
diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml
index 05a73cf94..23bdded21 100644
--- a/modules/admin/conf/module.xml
+++ b/modules/admin/conf/module.xml
@@ -2,9 +2,6 @@
 <module>
     <actions>
         <action name="dispIndex" type="view" standalone="true" index="true"/>
-        <action name="dispModuleList" type="view" standalone="true" />
-        <action name="dispAddonList" type="view" standalone="true" />
-        <action name="dispLayoutList" type="view" standalone="true" />
         <action name="dispShortCut" type="view" standalone="true" />
 
         <action name="dispLogin" type="view" standalone="true" />
diff --git a/modules/admin/tpl/layout.html b/modules/admin/tpl/layout.html
index 5e17b7095..08ae61f0c 100644
--- a/modules/admin/tpl/layout.html
+++ b/modules/admin/tpl/layout.html
@@ -21,15 +21,6 @@
     <!--@end-->
     [<a href="#" onclick="location.href='{getUrl('','module','admin','act','dispShortCut')}';return false;">{$lang->cmd_management}</a>]
   </div>
-
-  <!-- 애드온,플러그인,레이아웃,에디터컴포넌트등의 목록을 보여줄 메뉴 -->
-  <div>
-    <!--@foreach($menu_item as $key => $val)-->
-    <span <!--@if($act==$val->act)-->class="selected"<!--@end-->>
-      <a href="#" onclick="location.href='{getUrl('','module', $module, 'act',$val->act,'mo','','module_srl','')}';return false;">{$val->title}</a>
-    </span>
-    <!--@end-->
-  </div>
 </div>
 
 <!--@if($selected_module_info)-->
diff --git a/modules/layout/conf/module.xml b/modules/layout/conf/module.xml
index 2c27c28cb..90a8478e0 100644
--- a/modules/layout/conf/module.xml
+++ b/modules/layout/conf/module.xml
@@ -4,7 +4,7 @@
         <action name="dispContent" type="view" admin_index="true" standalone="true" />
         <action name="dispInsertLayout" type="view" standalone="true" />
         <action name="dispLayoutInfo" type="view" standalone="true" />
-        <action name="dispList" type="controller" standalone="true" />
+        <action name="dispDownloadedLayoutList" type="view" standalone="true" />
         <action name="getLayoutMenuSrl" type="model" standalone="true" />
         <action name="getMenuTplInfo" type="model" standalone="true" />
         <action name="procInsertLayout" type="controller" standalone="true" />
diff --git a/modules/layout/lang/ko.lang.php b/modules/layout/lang/ko.lang.php
index de9b40a35..20d850c85 100644
--- a/modules/layout/lang/ko.lang.php
+++ b/modules/layout/lang/ko.lang.php
@@ -23,6 +23,10 @@
     $lang->menu_hover_btn = '마우스오버';
     $lang->menu_active_btn = '선택시';
     $lang->menu_group_srls = '그룹 제한';
+
+    $lang->layout_list = '레이아웃 목록';
+    $lang->downloaded_list = '다운로드 목록';
+
     $lang->cmd_move_to_installed_list = "생성된 목록 보기";
 
     $lang->cmd_enable_move_menu = "메뉴 옮기기";
diff --git a/modules/layout/tpl.admin/downloaded_layout_list.html b/modules/layout/tpl.admin/downloaded_layout_list.html
index 298c075d5..deb8fe359 100644
--- a/modules/layout/tpl.admin/downloaded_layout_list.html
+++ b/modules/layout/tpl.admin/downloaded_layout_list.html
@@ -1,8 +1,6 @@
+<!--#include("header.html")-->
+
 <!-- 레이아웃의 목록 -->
-<div>
-  {$lang->about_downloaded_layouts} |
-  <a href="#" onclick="location.href='./?module=admin&mo=layout&act=dispContent';return false;">{$lang->cmd_move_to_installed_list}</a>
-</div>
 <div>
   <table border="1" width="100%">
   <tr>
diff --git a/modules/layout/tpl.admin/header.html b/modules/layout/tpl.admin/header.html
new file mode 100644
index 000000000..37855aa62
--- /dev/null
+++ b/modules/layout/tpl.admin/header.html
@@ -0,0 +1,7 @@
+<!--%import("js/admin.js")-->
+
+<div style="margin-bottom:20px;">
+    <span <!--@if($act=='dispContent')-->style="font-weight:bold"<!--@end-->>[<a href="{getUrl('act','dispContent')}">{$lang->layout_list}</a>]</span>
+    <span <!--@if($act=='dispDownloadedLayoutList')-->style="font-weight:bold"<!--@end-->>[<a href="{getUrl('act','dispDownloadedLayoutList')}">{$lang->downloaded_list}</a>]</span>
+</div>
+
diff --git a/modules/layout/tpl.admin/index.html b/modules/layout/tpl.admin/index.html
index de6e05354..e3a975322 100644
--- a/modules/layout/tpl.admin/index.html
+++ b/modules/layout/tpl.admin/index.html
@@ -1,6 +1,8 @@
 <!--%import("js/admin.js")-->
 <!--%import("filter/delete_layout.xml")-->
 
+<!--#include("header.html")-->
+
 <div>
   {$lang->total_count} {number_format(count($layout_list))}
 </div>
diff --git a/modules/layout/tpl.admin/insert_layout.html b/modules/layout/tpl.admin/insert_layout.html
index a37133e4a..48a485ced 100644
--- a/modules/layout/tpl.admin/insert_layout.html
+++ b/modules/layout/tpl.admin/insert_layout.html
@@ -1,6 +1,8 @@
 <!--%import("js/admin.js")-->
 <!--%import("filter/insert_layout.xml")-->
 
+<!--#include("header.html")-->
+
 <form action="./" method="get" onsubmit="return procFilter(this, insert_layout)">
   <div style="margin-bottom:10px;">
     <table border="1" width="100%">
diff --git a/modules/layout/tpl.admin/layout_info.html b/modules/layout/tpl.admin/layout_info.html
index bf0f40d28..a2ddaf0bd 100644
--- a/modules/layout/tpl.admin/layout_info.html
+++ b/modules/layout/tpl.admin/layout_info.html
@@ -4,6 +4,8 @@
 <!--%import("filter/delete_layout_menu.xml")-->
 <!--%import("filter/move_layout_menu.xml")-->
 
+<!--#include("header.html")-->
+
 <!-- 메뉴 이동을 위해 임시로 사용하는 form -->
 <form id="fo_move_menu">
   <input type="hidden" name="menu_id" />