diff --git a/modules/page/conf/module.xml b/modules/page/conf/module.xml index 6ae19f071..1bb5f6a6d 100644 --- a/modules/page/conf/module.xml +++ b/modules/page/conf/module.xml @@ -8,6 +8,7 @@ + diff --git a/modules/page/page.admin.controller.php b/modules/page/page.admin.controller.php index e52fcd930..627e3126f 100644 --- a/modules/page/page.admin.controller.php +++ b/modules/page/page.admin.controller.php @@ -18,9 +18,11 @@ **/ function procPageAdminInsert() { // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리 - $args = Context::gets('module_srl','module_category_srl','page_name','browser_title','content','is_default','layout_srl'); + $args = Context::gets('module_srl','module_category_srl','page_name','browser_title','is_default','layout_srl','content'); $args->module = 'page'; $args->mid = $args->page_name; + if(!$args->content) $args->content = $content; + else unset($args->conetnt); unset($args->page_name); if($args->is_default!='Y') $args->is_default = 'N'; diff --git a/modules/page/page.admin.view.php b/modules/page/page.admin.view.php index 9effe02c5..69e2f161a 100644 --- a/modules/page/page.admin.view.php +++ b/modules/page/page.admin.view.php @@ -93,6 +93,12 @@ $module_info->layout_title = $layout_info->layout_title; } + // 레이아웃 목록을 구해옴 + $oLayoutMode = &getModel('layout'); + $layout_list = $oLayoutMode->getLayoutList(); + Context::set('layout_list', $layout_list); + + // 템플릿 파일 지정 $this->setTemplateFile('page_info'); } @@ -120,6 +126,39 @@ if(!$module_srl) $module_srl = getNextSequence(); Context::set('module_srl',$module_srl); + // 레이아웃 목록을 구해옴 + $oLayoutMode = &getModel('layout'); + $layout_list = $oLayoutMode->getLayoutList(); + Context::set('layout_list', $layout_list); + + + // 템플릿 파일 지정 + $this->setTemplateFile('page_insert'); + } + + /** + * @brief 페이지 내용 수정 + **/ + function dispPageAdminContentModify() { + + // GET parameter에서 module_srl을 가져옴 + $module_srl = Context::get('module_srl'); + + // module_srl이 있으면 해당 모듈의 정보를 구해서 세팅 + if($module_srl) { + $oModuleModel = &getModel('module'); + $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); + if($module_info->module_srl == $module_srl) Context::set('module_info',$module_info); + else { + unset($module_info); + unset($module_srl); + } + } + + // module_srl이 없으면 sequence값으로 미리 구해 놓음 + if(!$module_srl) $module_srl = getNextSequence(); + Context::set('module_srl',$module_srl); + // 위젯 목록을 세팅 $oWidgetModel = &getModel('widget'); $widget_list = $oWidgetModel->getDownloadedWidgetList(); @@ -141,11 +180,11 @@ $layout_list = $oLayoutMode->getLayoutList(); Context::set('layout_list', $layout_list); - // 템플릿 파일 지정 - $this->setTemplateFile('page_insert'); + $this->setTemplateFile('page_content_modify'); } + /** * @brief 페이지 삭제 화면 출력 **/ diff --git a/modules/page/tpl/content.html b/modules/page/tpl/content.html index 081492832..3f03c9af0 100644 --- a/modules/page/tpl/content.html +++ b/modules/page/tpl/content.html @@ -2,6 +2,6 @@
- {$lang->cmd_page_modify} + {$lang->cmd_page_modify}
diff --git a/modules/page/tpl/css/page.css b/modules/page/tpl/css/page.css index e69de29bb..c33ce4db8 100644 --- a/modules/page/tpl/css/page.css +++ b/modules/page/tpl/css/page.css @@ -0,0 +1,6 @@ +@charset "utf-8"; +h3 { margin:0 10px 0 10px; } +.widget_list { margin:10px; } +.widget_list a { margin-bottom:10px; } +.editor_box { margin:0 10px 10px 10px; } +.button_box { margin:0 10px 10px 10px; text-align:right;} diff --git a/modules/page/tpl/filter/insert_page.xml b/modules/page/tpl/filter/insert_page.xml index f8fa7728a..f00e55ef5 100644 --- a/modules/page/tpl/filter/insert_page.xml +++ b/modules/page/tpl/filter/insert_page.xml @@ -2,7 +2,6 @@
- @@ -11,7 +10,6 @@ - diff --git a/modules/page/tpl/filter/insert_page_content.xml b/modules/page/tpl/filter/insert_page_content.xml new file mode 100644 index 000000000..949a2e006 --- /dev/null +++ b/modules/page/tpl/filter/insert_page_content.xml @@ -0,0 +1,22 @@ + +
+ + + + + + + + + + + + + + + + + + + +
 diff --git a/modules/page/tpl/header.html b/modules/page/tpl/header.html index e90559e6f..e35a5d100 100644 --- a/modules/page/tpl/header.html +++ b/modules/page/tpl/header.html @@ -1,3 +1,3 @@ - +

{$lang->page} {$lang->cmd_management}

diff --git a/modules/page/tpl/js/page_admin.js b/modules/page/tpl/js/page_admin.js index 664b957d0..e4e18a2da 100644 --- a/modules/page/tpl/js/page_admin.js +++ b/modules/page/tpl/js/page_admin.js @@ -25,6 +25,28 @@ function completeInsertPage(ret_obj) { location.href = url; } +/* 내용 저장 후 */ +function completeInsertPageContent(ret_obj) { + var error = ret_obj['error']; + var message = ret_obj['message']; + + var page = ret_obj['page']; + var module_srl = ret_obj['module_srl']; + + alert(message); + + var url = ''; + if(location.href.getQuery('module')=='admin') { + url = current_url.setQuery('module_srl',module_srl).setQuery('act','dispPageAdminInfo'); + if(page) url = url.setQuery('page',page); + } else { + url = current_url.setQuery('act','').setQuery('module_srl',''); + } + + if(opener) opener.location.reload(); + + window.close(); +} /* 모듈 삭제 후 */ function completeDeletePage(ret_obj) { diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html new file mode 100644 index 000000000..776291c80 --- /dev/null +++ b/modules/page/tpl/page_content_modify.html @@ -0,0 +1,39 @@ + + + + + + +
+ + + + + + + + + + + +
+ + {$widget->title} + +
+ +
+ + + +
+ +
{$editor}
+ +
+ + + +
+ +
diff --git a/modules/page/tpl/page_info.html b/modules/page/tpl/page_info.html index 55305d936..50f65fd24 100644 --- a/modules/page/tpl/page_info.html +++ b/modules/page/tpl/page_info.html @@ -1,43 +1,78 @@ + - --- - - - - - - - - - - - - - - - - - -
{$lang->category} - - {$lang->not_exists} - - {$module_category[$module_info->module_category_srl]->title} - -
{$lang->layout} - - {$module_info->layout_title} ({$module_info->layout}) - - {$lang->not_exists} - -
{$lang->browser_title}{$module_info->browser_title}
{$lang->content}
{$module_info->content}
+
+ + + + + + -
- {$lang->cmd_modify} - - {$lang->cmd_list} + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + +
{$lang->mid} + +

{$lang->about_mid}

+
{$lang->is_default} + is_default=='Y')-->checked="checked" id="fld_for_default" class="checkbox" /> + +
{$lang->module_category} + +

{$lang->about_module_category}

+
{$lang->browser_title} + +

{$lang->about_browser_title}

+
{$lang->layout} + +

{$lang->about_layout}

+
+ + {$lang->cmd_page_modify} + + {$lang->cmd_list} + +
{$lang->content}
{$module_info->content}
+ + diff --git a/modules/page/tpl/page_insert.html b/modules/page/tpl/page_insert.html index 9f6b4f05c..86cf7ee81 100644 --- a/modules/page/tpl/page_insert.html +++ b/modules/page/tpl/page_insert.html @@ -1,12 +1,9 @@ - -
- @@ -61,20 +58,9 @@

{$lang->about_layout}

- - {$lang->widget} - - -
{$widget->title}
- - - -
{$editor}
-
-