diff --git a/common/tpl/common_footer.html b/common/tpl/common_footer.html index 4dd6196d3..6d8d3177a 100644 --- a/common/tpl/common_footer.html +++ b/common/tpl/common_footer.html @@ -1,8 +1,8 @@ {Context::getHtmlFooter()} -
{$lang->msg_call_server}
-
- close original image - original image -
+
{$lang->msg_call_server}
+
+ close original image + original image +
diff --git a/modules/pagemaker/pagemaker.view.php b/modules/pagemaker/pagemaker.view.php index e43468c3d..bffdc5640 100644 --- a/modules/pagemaker/pagemaker.view.php +++ b/modules/pagemaker/pagemaker.view.php @@ -145,7 +145,7 @@ // GET parameter에서 module_srl을 가져옴 $module_srl = Context::get('module_srl'); - // module model 객체 생성 + // module_srl이 있으면 해당 모듈의 정보를 구해서 세팅 if($module_srl) { $oModuleModel = &getModel('module'); $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); @@ -155,13 +155,19 @@ unset($module_srl); } } + + // module_srl이 없으면 sequence값으로 미리 구해 놓음 if(!$module_srl) { $oDB = &DB::getInstance(); $module_srl = $oDB->getNextSequence(); } - Context::set('module_srl',$module_srl); + // 플러그인 목록을 세팅 + $oPluginModel = &getModel('plugin'); + $plugin_list = $oPluginModel->getDownloadedPluginList(); + Context::set('plugin_list', $plugin_list); + // 에디터 모듈의 getEditor를 호출하여 세팅 $oEditorView = &getView('editor'); $editor = $oEditorView->getEditor($module_srl, true); diff --git a/modules/pagemaker/tpl.admin/page_insert.html b/modules/pagemaker/tpl.admin/page_insert.html index 2a8f392a0..9414be976 100644 --- a/modules/pagemaker/tpl.admin/page_insert.html +++ b/modules/pagemaker/tpl.admin/page_insert.html @@ -70,6 +70,14 @@ {$lang->about_default} + + {$lang->plugin} + + + {$plugin->title} + + + {$lang->content} diff --git a/modules/plugin/conf/module.xml b/modules/plugin/conf/module.xml index 7b51171e9..990fb9d75 100644 --- a/modules/plugin/conf/module.xml +++ b/modules/plugin/conf/module.xml @@ -4,6 +4,7 @@ + diff --git a/modules/plugin/plugin.view.php b/modules/plugin/plugin.view.php index 5631af224..2b30e0844 100644 --- a/modules/plugin/plugin.view.php +++ b/modules/plugin/plugin.view.php @@ -63,5 +63,13 @@ $this->setTemplateFile('plugin_generate_code'); } + /** + * @brief 페이지 관리에서 사용될 코드 생성 팝업 + **/ + function dispGenerateCodeInPage() { + $this->dispGenerateCode(); + $this->setTemplateFile('plugin_generate_code_in_page'); + } + } ?> diff --git a/modules/plugin/tpl.admin/css/plugin.css b/modules/plugin/tpl.admin/css/plugin.css new file mode 100644 index 000000000..b21a16d84 --- /dev/null +++ b/modules/plugin/tpl.admin/css/plugin.css @@ -0,0 +1,75 @@ +.plugin_detail_info_window { + width:500px; + clear:both; +} + +.plugin_title { + font-weight:bold; + font-size:10pt; + text-align:center; + padding:5px 0px 5px 0px; + color:#EEEEEE; + background-color:#444444; +} + +.plugin_description { + margin:2px; + border:1px solid #EEEEEE; + color:#444444; + clear:both; + padding:5px; + height:30px; +} + +.plugin_header { + clear:left; + font-weight:bold; + float:left; + width:90px; + margin-left:10px; + padding:5px 0px 5px 0px; +} + +.plugin_body { + float:left; + width:390px; + padding:5px 0px 5px 0px; +} + +.plugin_var_description { + clear:both; + padding:5px 0px 5px 0px; + margin-left:100px; + color:#AAAAAA; +} + +.plugin_button_area { + clear:both; + text-align:center; + padding:5px 0px 5px 0px; + background-color:#EFEFEF; + border-top:1px solid #AAAAAA; +} + +.plugin_button { + border:1px solid #AAAAAA; + background-color:#FFFFFF; + font-weight:bold; + height:16px; +} + +.plugin_code_area { + clear:both; + padding:4px; + border:1px solid #AAAAAA; + margin:5px; + height:100px; +} + +.plugin_code_area textarea { + border:0px; + height:100px; + width:470px; + font-family:tahoma; + font-size:8pt; +} diff --git a/modules/plugin/tpl.admin/downloaded_plugin_list.html b/modules/plugin/tpl.admin/downloaded_plugin_list.html index edcf606c6..77a65b441 100644 --- a/modules/plugin/tpl.admin/downloaded_plugin_list.html +++ b/modules/plugin/tpl.admin/downloaded_plugin_list.html @@ -20,8 +20,8 @@ {$val->author->name} {$val->author->date} {$val->path} - {$lang->cmd_generate_code} - {$lang->cmd_view} + {$lang->cmd_generate_code} + {$lang->cmd_view} diff --git a/modules/plugin/tpl.admin/plugin_detail_info.html b/modules/plugin/tpl.admin/plugin_detail_info.html index da5462c63..a8ff81e95 100644 --- a/modules/plugin/tpl.admin/plugin_detail_info.html +++ b/modules/plugin/tpl.admin/plugin_detail_info.html @@ -1,58 +1,26 @@ - --- - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->plugin_maker}
{$lang->title}{$plugin_info->title} ver {$plugin_info->version}
{$lang->author}{$plugin_info->author->name}
{$lang->homepage}{$plugin_info->author->homepage}
{$lang->regdate}{$plugin_info->author->date}
{$lang->description}{nl2br($plugin_info->author->description)}
{$lang->plugin_history}
{$lang->name}{$history->name}
{$lang->homepage}{$history->homepage}
{$lang->regdate}{$history->date}
{$lang->description}{nl2br($history->description)}
- {$lang->cmd_close} -
+
+ +
{$lang->plugin_maker}
+ +
{$lang->title}
+
{$plugin_info->title} ver {$plugin_info->version}
+ +
{$lang->author}
+
{$plugin_info->author->name}
+ +
{$lang->homepage}
+
{$plugin_info->author->homepage}
+ +
{$lang->regdate}
+
{$plugin_info->author->date}
+ +
{$lang->description}
+
{nl2br($plugin_info->author->description)}
+ +
+ {$lang->cmd_close} +
+ +
diff --git a/modules/plugin/tpl.admin/plugin_generate_code.html b/modules/plugin/tpl.admin/plugin_generate_code.html index f3e1e4c80..64a54cb37 100644 --- a/modules/plugin/tpl.admin/plugin_generate_code.html +++ b/modules/plugin/tpl.admin/plugin_generate_code.html @@ -1,63 +1,55 @@ +
- - - - - - - - - - - - - +
- -
- +
{$lang->cmd_generate_code}
- - - - - - - - +
{$lang->about_plugin_code}
+ +
{$lang->plugin}
+
{$plugin_info->title} ver {$plugin_info->version}
+ + +
{$var->name}
+ +
+ + + + + + + + + + + +
+ + +
+ + +
+
{$var->description}
- - - - - - - - - - - -
{$lang->cmd_generate_code}
{$lang->about_plugin_code}
{$lang->plugin}{$plugin_info->title} ver {$plugin_info->version}
{$var->name} - - - -
- - -
- -
{$var->description}
- - {$lang->cmd_close} -
+ +
+ + +
+ +
+ +