diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index 47d794691..caebf5370 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -33,11 +33,14 @@ $content = $oContext->transContent($content); Context::set('content', $content); - // content 래핑 (common/tpl/default.html) + // 레이아웃을 컴파일 require_once("./classes/template/TemplateHandler.class.php"); - $oTemplate = new TemplateHandler(); - $output = $oTemplate->compile($oModule->getLayoutPath(), $oModule->getLayoutFile()); + $zbxe_final_content = $oTemplate->compile($oModule->getLayoutPath(), $oModule->getLayoutFile()); + + // 최종 결과를 common_layout에 넣어버림 + Context::set('zbxe_final_content', $zbxe_final_content); + $output = $oTemplate->compile('./common/tpl', 'common_layout'); } else { $output = $content; diff --git a/common/tpl/common_footer.html b/common/tpl/common_footer.html deleted file mode 100644 index 6d8d3177a..000000000 --- a/common/tpl/common_footer.html +++ /dev/null @@ -1,8 +0,0 @@ -{Context::getHtmlFooter()} -
{$lang->msg_call_server}
-
- close original image - original image -
- - diff --git a/common/tpl/common_header.html b/common/tpl/common_header.html deleted file mode 100644 index 16aa06a9d..000000000 --- a/common/tpl/common_header.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - -{Context::getBrowserTitle()} - - - - - - - - - - - - - -{Context::getHtmlHeader()} - - diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html new file mode 100644 index 000000000..570496271 --- /dev/null +++ b/common/tpl/common_layout.html @@ -0,0 +1,32 @@ + + + + + {Context::getBrowserTitle()} + + + + + + + + + + + + + + {Context::getHtmlHeader()} + + + {$zbxe_final_content} + {Context::getHtmlFooter()} +
{$lang->msg_call_server}
+
+ close original image + original image +
+ + diff --git a/common/tpl/default_layout.html b/common/tpl/default_layout.html index d1da8601d..d9f1e44a0 100644 --- a/common/tpl/default_layout.html +++ b/common/tpl/default_layout.html @@ -1,3 +1 @@ - {$content} - diff --git a/common/tpl/popup_layout.html b/common/tpl/popup_layout.html index 43092a502..01b8d7e61 100644 --- a/common/tpl/popup_layout.html +++ b/common/tpl/popup_layout.html @@ -1,9 +1,6 @@ - -
{$content}
- diff --git a/layouts/sample_layout/layout.html b/layouts/sample_layout/layout.html index ae46d79e1..1a3a9b174 100644 --- a/layouts/sample_layout/layout.html +++ b/layouts/sample_layout/layout.html @@ -1,4 +1,3 @@ - @@ -103,6 +102,3 @@ - - - diff --git a/modules/admin/tpl/layout.html b/modules/admin/tpl/layout.html index 08ae61f0c..12db95e64 100644 --- a/modules/admin/tpl/layout.html +++ b/modules/admin/tpl/layout.html @@ -1,8 +1,6 @@ - -
zeroboard XE
@@ -32,5 +30,3 @@
{$content}
- -