diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index c114ef14a..cc4cc4e9e 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -67,10 +67,10 @@ // 컨텐츠 출력 if(Context::getResponseMethod()!="XMLRPC") { - ini_set('zlib.output_compression_level',3); - ob_start('ob_gzhandler'); + //ini_set('zlib.output_compression_level',3); + //ob_start('ob_gzhandler'); print trim($output); - ob_end_flush(); + //ob_end_flush(); } else { print trim($output); } diff --git a/layouts/sample_layout_js_menu/conf/info.xml b/layouts/sample_layout_js_menu/conf/info.xml index 8fa3378ec..f76c70272 100644 --- a/layouts/sample_layout_js_menu/conf/info.xml +++ b/layouts/sample_layout_js_menu/conf/info.xml @@ -10,37 +10,30 @@ - - 상단 제목 - text - 레이아웃의 상단에 표시할 제목을 입력하세요. - - - 메인 메뉴 명 - text - 트리메뉴의 가장 상위에 표시될 이름을 입력하세요. - - - 컬러셋 - select + + 컬러셋 원하시는 컬러셋을 선택해주세요. - - 적색 + + 적색 red - - 청색 + + 청색 blue + + 상단 제목 + 레이아웃의 상단에 표시할 제목을 입력하세요. + - - 주 메뉴 + + 주 메뉴 2 - - 하단 메뉴 + + 하단 메뉴 1 diff --git a/layouts/sample_layout_php_menu/conf/info.xml b/layouts/sample_layout_php_menu/conf/info.xml index 11896643e..3cad460ee 100644 --- a/layouts/sample_layout_php_menu/conf/info.xml +++ b/layouts/sample_layout_php_menu/conf/info.xml @@ -10,37 +10,30 @@ - - 상단 제목 - text - 레이아웃의 상단에 표시할 제목을 입력하세요. - - - 메인 메뉴 명 - text - 트리메뉴의 가장 상위에 표시될 이름을 입력하세요. - - - 컬러셋 - select + + 컬러셋 원하시는 컬러셋을 선택해주세요. - - 적색 + + 적색 red - - 청색 + + 청색 blue + + 상단 제목 + 레이아웃의 상단에 표시할 제목을 입력하세요. + - - 주 메뉴 + + 주 메뉴 2 - - 하단 메뉴 + + 하단 메뉴 1 diff --git a/modules/blog/blog.view.php b/modules/blog/blog.view.php index 9222657d0..7b211cef4 100644 --- a/modules/blog/blog.view.php +++ b/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); diff --git a/modules/blog/skins/default/header.html b/modules/blog/skins/default/header.html index 970bf8bfe..ea9306d6b 100644 --- a/modules/blog/skins/default/header.html +++ b/modules/blog/skins/default/header.html @@ -1,32 +1,2 @@ {$module_info->header_text} - - -
- - {$lang->document_count} : {number_format($total_count)}, - {$lang->page_count} : {number_format($page)} / {number_format($total_page)} - - - - rss - - - - [ - {$lang->cmd_view_member_info} | - {$lang->cmd_logout} - ] - - - [ - {$lang->cmd_signup} | - {$lang->cmd_login} - ] - - - - [{$lang->cmd_management}] - -
- diff --git a/modules/blog/skins/default/layout.html b/modules/blog/skins/default/layout.html index 515e07bc9..5e59792f1 100644 --- a/modules/blog/skins/default/layout.html +++ b/modules/blog/skins/default/layout.html @@ -3,14 +3,20 @@
@@ -34,21 +40,34 @@
- +
- - - - - - - +
- {$lang->cmd_layout_management} + {$lang->cmd_management} +
+ + + +
+ rss +
+ + + + +
+
+ + + + + +
diff --git a/modules/blog/skins/default/list.html b/modules/blog/skins/default/list.html index c4bdf748e..110e1b77a 100644 --- a/modules/blog/skins/default/list.html +++ b/modules/blog/skins/default/list.html @@ -3,24 +3,8 @@
- - - - -
-
- -
-
- - - + @@ -34,24 +18,7 @@
- - - -
-
- - - - - - - -
-
+
diff --git a/modules/blog/skins/default/skin.xml b/modules/blog/skins/default/skin.xml index 7a52e7cd1..a523190cc 100644 --- a/modules/blog/skins/default/skin.xml +++ b/modules/blog/skins/default/skin.xml @@ -14,35 +14,21 @@ - - 상단 제목 - text + + 상단 제목 레이아웃의 상단에 표시할 제목을 입력하세요. - 로고이미지 - - - 홈 url - text - home이나 상단 제목(로고이미지) 클릭시 이동할 홈 url을 입력해주세요. - - - 컬러셋 - select - 원하시는 컬러셋을 선택해주세요. - - 적색 - red - - - 청색 - blue - + 로고이미지 + 레이아웃의 상단에 표시될 로고이미지를 입력하세요. - 프로필 - 간단한 프로필을 입력해주세요 + 프로필 + 간단한 프로필을 입력해주세요 + + + 분류 메뉴명 + 분류 메뉴의 제목을 입력해주세요. diff --git a/modules/blog/tpl/skin_info.html b/modules/blog/tpl/skin_info.html index 3eb6bfee8..380793262 100644 --- a/modules/blog/tpl/skin_info.html +++ b/modules/blog/tpl/skin_info.html @@ -57,7 +57,6 @@ {$lang->extra_vars} - description)-->rowspan="2">{$val->title} diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index 11d44a846..324b89fbf 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -122,46 +122,53 @@ $buff .= sprintf('$layout_info->author->description = "%s";', $xml_obj->author->description->body); // 추가 변수 (템플릿에서 사용할 제작자 정의 변수) - if(!is_array($xml_obj->extra_vars->var)) $extra_vars[] = $xml_obj->extra_vars->var; - else $extra_vars = $xml_obj->extra_vars->var; - $extra_var_count = count($extra_vars); - $buff .= sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count); - for($i=0;$i<$extra_var_count;$i++) { - unset($var); - unset($options); - $var = $extra_vars[$i]; + $extra_vars = $xml_obj->extra_vars->var; + if($extra_vars) { + if(!is_array($extra_vars)) $extra_vars = array($extra_vars); - $buff .= sprintf('$layout_info->extra_var->%s->name = "%s";', $var->attrs->name, $var->name->body); - $buff .= sprintf('$layout_info->extra_var->%s->type = "%s";', $var->attrs->name, $var->type->body); - $buff .= sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $var->attrs->name, $var->attrs->name); - $buff .= sprintf('$layout_info->extra_var->%s->description = "%s";', $var->attrs->name, str_replace('"','\"',$var->description->body)); + $extra_var_count = count($extra_vars); + + $buff .= sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count); + for($i=0;$i<$extra_var_count;$i++) { + unset($var); + unset($options); + $var = $extra_vars[$i]; + $name = $var->attrs->name; - $options = $var->options; - if(!$options) continue; + $buff .= sprintf('$layout_info->extra_var->%s->title = "%s";', $name, $var->title->body); + $buff .= sprintf('$layout_info->extra_var->%s->type = "%s";', $name, $var->attrs->type); + $buff .= sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $name, $name); + $buff .= sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body)); - if(!is_array($options)) $options = array($options); - $options_count = count($options); - for($j=0;$j<$options_count;$j++) { - $buff .= sprintf('$layout_info->extra_var->%s->options["%s"] = "%s";', $var->attrs->name, $options[$j]->value->body, $options[$j]->name->body); + $options = $var->options; + if(!$options) continue; + + if(!is_array($options)) $options = array($options); + $options_count = count($options); + for($j=0;$j<$options_count;$j++) { + $buff .= sprintf('$layout_info->extra_var->%s->options["%s"] = "%s";', $var->attrs->name, $options[$j]->value->body, $options[$j]->title->body); + } } } // 메뉴 - if(!is_array($xml_obj->menus->menu)) $menus[] = $xml_obj->menus->menu; - else $menus = $xml_obj->menus->menu; + if($xml_obj->menus->menu) { + $menus = $xml_obj->menus->menu; + if(!is_array($menus)) $menus[] = $menus; - $menu_count = count($menus); - $buff .= sprintf('$layout_info->menu_count = "%s";', $menu_count); - for($i=0;$i<$menu_count;$i++) { - $id = $menus[$i]->attrs->id; - if($menus[$i]->attrs->default == "true") $buff .= sprintf('$layout_info->default_menu = "%s";', $id); - $buff .= sprintf('$layout_info->menu->%s->id = "%s";',$id, $menus[$i]->attrs->id); - $buff .= sprintf('$layout_info->menu->%s->name = "%s";',$id, $menus[$i]->name->body); - $buff .= sprintf('$layout_info->menu->%s->maxdepth = "%s";',$id, $menus[$i]->maxdepth->body); + $menu_count = count($menus); + $buff .= sprintf('$layout_info->menu_count = "%s";', $menu_count); + for($i=0;$i<$menu_count;$i++) { + $name = $menus[$i]->attrs->name; + if($menus[$i]->attrs->default == "true") $buff .= sprintf('$layout_info->default_menu = "%s";', $name); + $buff .= sprintf('$layout_info->menu->%s->name = "%s";',$name, $menus[$i]->attrs->name); + $buff .= sprintf('$layout_info->menu->%s->title = "%s";',$name, $menus[$i]->title->body); + $buff .= sprintf('$layout_info->menu->%s->maxdepth = "%s";',$name, $menus[$i]->maxdepth->body); - $buff .= sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $id, $id); - $buff .= sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$id, $id); - $buff .= sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$id, $id); + $buff .= sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $name, $name); + $buff .= sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$name, $name); + $buff .= sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name); + } } $buff = ''; diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html index a6664fa1b..d51ebec10 100644 --- a/modules/layout/tpl/layout_modify.html +++ b/modules/layout/tpl/layout_modify.html @@ -40,18 +40,18 @@ {$lang->about_title} - + - {$var->name} + {$var->title} - + - + - @@ -63,17 +63,17 @@ {$var->description} - + - {$menu_info->name} ({$menu_id}) + {$menu_info->name} ({$menu_name}) - - + diff --git a/modules/module/queries/getModuleInfoByDocument.xml b/modules/module/queries/getModuleInfoByDocument.xml index 5daea9e2c..2a5a63719 100644 --- a/modules/module/queries/getModuleInfoByDocument.xml +++ b/modules/module/queries/getModuleInfoByDocument.xml @@ -4,20 +4,7 @@ - - - - - - - - - - - - - - +