From cc54e8ba8bd2a357de300c4182950587d3a1e88d Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 16 Apr 2007 07:31:33 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1160
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 layouts/sample_layout/css/layout.css | 26 ++++++------
 layouts/sample_layout/js/layout.js   |  2 +
 layouts/sample_layout/layout.html    | 59 ++++++++++++++--------------
 modules/editor/tpl/editor.html       |  1 -
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/layouts/sample_layout/css/layout.css b/layouts/sample_layout/css/layout.css
index b6a883c6f..a489162df 100644
--- a/layouts/sample_layout/css/layout.css
+++ b/layouts/sample_layout/css/layout.css
@@ -13,7 +13,7 @@ body {
  * 상단 로고 및 메인 1차 메뉴 
  **/
 .layout_top {
-    margin:10px;
+    margin:10px 10px 0px 10px;
 }
 
 /* 상단 로고 부분 */
@@ -25,28 +25,23 @@ body {
 }
 
 /* 상단 1차 메뉴 */
-.layout_first_menu{
+.layout_first_menu {
     border-bottom:2px solid #DDDDDD;
     width:100%;
     text-align:right;
     padding:3px 0px 3px 0px;
 }
 
-/**
- * 중간 영역 (왼쪽 메뉴 + 컨텐츠)
- **/
-.layout_middle {
-    margin:10px;
-    clear:both;
-}
-
 /**
  * 좌측 메뉴 및 메인 2차 메뉴, 로그인 플러그인 및 기타
  **/
 .layout_left {
     width:220px;
-    margin-right:10px;
     float:left;
+    margin-top:10px;
+    position:absolute;
+    left:10px;
+    z-index:10;
 }
 
 /* 좌측 2차 메뉴 */
@@ -70,8 +65,11 @@ body {
 .layout_content {
     position:absolute;
     left:0px;
-    padding:0px 0px 0px 240px;
-    margin-right:10px;
+    padding:10px 10px 0px 240px;
+    z-index:1;
+}
+
+#content {
 }
 
 /**
@@ -79,6 +77,7 @@ body {
  **/
 .layout_bottom {
     clear:both;
+    margin-top:20px;
 }
 
 /* 하단 메뉴 */
@@ -190,3 +189,4 @@ body {
     font-weight:bold;
     text-decoration:none;
 }
+
diff --git a/layouts/sample_layout/js/layout.js b/layouts/sample_layout/js/layout.js
index 18f902f1e..af2acc9c6 100644
--- a/layouts/sample_layout/js/layout.js
+++ b/layouts/sample_layout/js/layout.js
@@ -41,6 +41,8 @@ function xe_print_menu(menu_name, depth, print_child) {
         var menu_obj = menu_list[menu_key];
         if(typeof(menu_obj)=='undefined'||!menu_obj) continue;
 
+        if(!menu_obj.text && !menu_obj.normal_btn) continue;
+
         var className = menu_obj.className;
         if(menu_obj.selected) className = menu_obj.selectedClassName;
 
diff --git a/layouts/sample_layout/layout.html b/layouts/sample_layout/layout.html
index 32e1446db..39eba088a 100644
--- a/layouts/sample_layout/layout.html
+++ b/layouts/sample_layout/layout.html
@@ -46,38 +46,37 @@ xe_layout_menu['bottom_menu'][1][{$first_key}] = { "text":"{htmlspecialchars($fi
 
 </div>
 
-<!-- 중간 영역 -->
-<div class="layout_middle">
+<!-- 왼쪽 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;"/>
 
-    <!-- 왼쪽 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;"/>
-
-        <!-- main_menu 2차 시작 -->
-        <div class="layout_second_menu">
-            <script type="text/javascript">
-                xe_print_menu('main_menu', 2, true);
-            </script>
-        </div>
-
-        <!--@if($logged_info->is_admin == 'Y')-->
-        <!-- 관리자일 경우 레이아웃 관리 메뉴 -->
-        <div class="layout_admin">
-            <a href="#" onclick="location.href='{getUrl('act','dispLayoutAdminMenu','layout_srl',$layout_info->layout_srl)}';return false;">{$lang->cmd_layout_management}</a>
-        </div>
-        <!--@end-->
-    </div>
-
-    <!-- 컨텐츠 출력 부분 -->
-    <div class="layout_content" id="content">{$content}</div>
-</div>
-
-<!-- bottom_menu 메뉴 시작 -->
-<div class="layout_bottom">
-    <div class="layout_bottom_menu">
+    <!-- main_menu 2차 시작 -->
+    <div class="layout_second_menu">
         <script type="text/javascript">
-            xe_print_menu('bottom_menu', 1);
+            xe_print_menu('main_menu', 2, true);
         </script>
     </div>
+
+    <!--@if($logged_info->is_admin == 'Y')-->
+    <!-- 관리자일 경우 레이아웃 관리 메뉴 -->
+    <div class="layout_admin">
+        <a href="#" onclick="location.href='{getUrl('act','dispLayoutAdminMenu','layout_srl',$layout_info->layout_srl)}';return false;">{$lang->cmd_layout_management}</a>
+    </div>
+    <!--@end-->
+</div>
+
+<!-- 컨텐츠 출력 부분 -->
+<div class="layout_content">
+    <div id="content">{$content}</div>
+
+    <!-- bottom_menu 메뉴 시작 -->
+    <div class="layout_bottom">
+        <div class="layout_bottom_menu">
+            <script type="text/javascript">
+                xe_print_menu('bottom_menu', 1);
+            </script>
+        </div>
+    </div>
+
 </div>
diff --git a/modules/editor/tpl/editor.html b/modules/editor/tpl/editor.html
index 138f864fe..0da2a700e 100644
--- a/modules/editor/tpl/editor.html
+++ b/modules/editor/tpl/editor.html
@@ -94,7 +94,6 @@
 <!--@if($allow_fileupload)-->
     <!-- 첨부파일 영역 -->
     <!--%import("./js/uploader.js")-->
-    <!--%import("./js/SWFUpload.js")-->
     <script type="text/javascript">
         var zbxe_session_name = "{session_name()}";
         var uploader_setting = { "allowed_filesize" : {$file_config->allowed_filesize}, "allowed_filetypes" : "{$file_config->allowed_filetypes}", "allowed_filetypes_description" : "{$file_config->allowed_filetypes}" }