git-svn-id: http://xe-core.googlecode.com/svn/trunk@695 201d5d3c-b55e-5fd7-737f-ddc643e51545

common/tpl/common_footer.html

@@ -1,8 +1,8 @@
 {Context::getHtmlFooter()}
-<div id="waitingforserverresponse">{$lang->msg_call_server}</div>
+    <div id="waitingforserverresponse">{$lang->msg_call_server}</div>
-<div id="fororiginalimagearea">
+    <div id="fororiginalimagearea">
-  <img src="./images/original_image_box_close.gif" alt="close original image" border="0" onclick="closeOriginalImage()" id="closeOriginalImageBtn"/>
+      <img src="./images/original_image_box_close.gif" alt="close original image" border="0" onclick="closeOriginalImage()" id="closeOriginalImageBtn"/>
-  <img src="./images/blank.gif" alt="original image" border="0" id="fororiginalimage" />
+      <img src="./images/blank.gif" alt="original image" border="0" id="fororiginalimage" />
-</div>
+    </div>
 </body>
 </html>

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);

modules/pagemaker/tpl.admin/page_insert.html

@@ -70,6 +70,14 @@
     <td>{$lang->about_default}</td>
   </tr>
   <!--@end-->
+  <tr>
+    <th>{$lang->plugin}</th>
+    <td>
+        <!--@foreach($plugin_list as $plugin)-->
+        <a href="#" onclick="winopen('./?module=plugin&amp;act=dispGenerateCodeInPage&amp;plugin={$plugin->plugin}&amp;module_srl={$module_srl}','GenerateCodeInPage','left=10,top10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;">{$plugin->title}</a>
+        <!--@end-->
+    </td>
+  </tr>
   <tr>
     <th>{$lang->content}</th>
     <td>

modules/plugin/conf/module.xml

@@ -4,6 +4,7 @@
         <action name="dispDownloadedPluginList" type="view" standalone="true" admin_index="true" />
         <action name="dispPluginInfo" type="view" standalone="true" />
         <action name="dispGenerateCode" type="view" standalone="true" />
+        <action name="dispGenerateCodeInPage" type="view" standalone="true" />
 
         <action name="procGenerateCode" type="controller" standalone="true" />
     </actions>

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');
+        }
+
     }
 ?>

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;
+}

modules/plugin/tpl.admin/downloaded_plugin_list.html

@@ -20,8 +20,8 @@
     <td><a href="#" onclick="window.open('{$val->author->homepage}')">{$val->author->name}</a></td>
     <td>{$val->author->date}</td>
     <td>{$val->path}</td>
-  <td><a href="#" onclick="winopen('{getUrl('','module','plugin','act','dispGenerateCode','selected_plugin',$val->plugin)}','plugin_code_generate','width=10,height=10,toolbars=no,scrollbars=yes,resizable=yes');return false">{$lang->cmd_generate_code}</a></td>
+  <td><a href="#" onclick="winopen('{getUrl('','module','plugin','act','dispGenerateCode','selected_plugin',$val->plugin)}','plugin_code_generate','width=10,height=10,toolbars=no,scrollbars=no,resizable=yes,left=10,top=10');return false">{$lang->cmd_generate_code}</a></td>
-  <td><a href="#" onclick="winopen('{getUrl('','module','plugin','act','dispPluginInfo','selected_plugin',$val->plugin)}','plugin_info','width=10,height=10,toolbars=no,scrollbars=yes,resizable=yes');return false">{$lang->cmd_view}</a></td>
+  <td><a href="#" onclick="winopen('{getUrl('','module','plugin','act','dispPluginInfo','selected_plugin',$val->plugin)}','plugin_info','width=10,height=10,toolbars=no,scrollbars=no,resizable=yes,left=10,top=10');return false">{$lang->cmd_view}</a></td>
   </tr>
   <tr>
     <td colspan="6">

modules/plugin/tpl.admin/plugin_detail_info.html

@@ -1,58 +1,26 @@
-<table border="1" width="400">
+<!--%import("css/plugin.css")-->
-<col width="100" />
-<col width="300" />
-<tr>
-  <th colspan="2">{$lang->plugin_maker}</th>
-</tr>
-<tr>
-  <th>{$lang->title}</th>
-  <td>{$plugin_info->title} ver {$plugin_info->version}</td>
-</tr>
-<tr>
-  <th>{$lang->author}</th>
-  <td><a href="mailto:{$plugin_info->author->email_address}">{$plugin_info->author->name}</a></td>
-</tr>
-<tr>
-  <th>{$lang->homepage}</th>
-  <td><a href="#" onclick="window.open('{$plugin_info->author->homepage}');return false;">{$plugin_info->author->homepage}</a></td>
-</tr>
-<tr>
-  <th>{$lang->regdate}</th>
-  <td>{$plugin_info->author->date}</td>
-</tr>
-<tr>
-  <th>{$lang->description}</th>
-  <td>{nl2br($plugin_info->author->description)}</td>
-</tr>
 
-<!--@if($plugin_history->history->name)-->
+<div class="plugin_detail_info_window">
-<tr>
+
-  <th colspan="2">{$lang->plugin_history}</th>
+    <div class="plugin_title">{$lang->plugin_maker}</div>
-</tr>
+
-<!--@foreach($plugin_info->history as $history)-->
+    <div class="plugin_header">{$lang->title}</div>
-<!--@if($history->name)-->
+    <div class="plugin_body">{$plugin_info->title} ver {$plugin_info->version}</div>
-<tr>
+
-  <th>{$lang->name}</th>
+    <div class="plugin_header">{$lang->author}</div>
-  <td><a href="mailto:{$history->email_address}">{$history->name}</a></td>
+    <div class="plugin_body"><a href="mailto:{$plugin_info->author->email_address}">{$plugin_info->author->name}</a></div>
-</tr>
+
-<tr>
+    <div class="plugin_header">{$lang->homepage}</div>
-  <th>{$lang->homepage}</th>
+    <div class="plugin_body"><a href="#" onclick="window.open('{$plugin_info->author->homepage}');return false;">{$plugin_info->author->homepage}</a></div>
-  <td><a href="#" onclick="window.open('{$history->homepage}');return false;">{$history->homepage}</a></td>
+
-</tr>
+    <div class="plugin_header">{$lang->regdate}</div>
-<tr>
+    <div class="plugin_body">{$plugin_info->author->date}</div>
-  <th>{$lang->regdate}</th>
+
-  <td>{$history->date}</td>
+    <div class="plugin_header">{$lang->description}</div>
-</tr>
+    <div class="plugin_body">{nl2br($plugin_info->author->description)}</div>
-<tr>
+
-  <th>{$lang->description}</th>
+    <div class="plugin_button_area">
-  <td>{nl2br($history->description)}</td>
+        <a href="#" onclick="window.close();">{$lang->cmd_close}</a>
-</tr>
+    </div>
-<!--@end-->
+
-<!--@end-->
+</div>
-<!--@end-->
-<tr>
-  <td colspan="2">
-    <a href="#" onclick="self.close()">{$lang->cmd_close}</a>
-  </td>
-</tr>
-</table>

modules/plugin/tpl.admin/plugin_generate_code.html

@@ -1,63 +1,55 @@
 <!--%import("filter/generate_code.xml")-->
 <!--%import("js/admin.js")-->
+<!--%import("css/plugin.css")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, generate_code);">
 <input type="hidden" name="selected_plugin" value="{$selected_plugin}" />
 
-  <table border="1" width="400">
+<div class="plugin_detail_info_window">
-  <col width="100" />
-  <col width="300" />
-  <tr>
-    <th colspan="2">{$lang->cmd_generate_code}</th>
-  </tr>
-  <tr>
-    <td colspan="2">{$lang->about_plugin_code}</td>
-  </tr>
-  <tr>
-    <th>{$lang->plugin}</th>
-    <td>{$plugin_info->title} ver {$plugin_info->version}</td>
-  </tr>
 
-  <!--@foreach($plugin_info->extra_var as $id => $var)-->
+    <div class="plugin_title">{$lang->cmd_generate_code}</div>
-  <tr>
-    <th rowspan="2">{$var->name}</th>
 
-    <!--@if($var->type == "text")-->
+    <div class="plugin_description">{$lang->about_plugin_code}</div>
-    <td><input type="text" name="{$id}" value="" /></td>
+
-    <!--@elseif($var->type == "textarea")-->
+    <div class="plugin_header">{$lang->plugin}</div>
-    <td><textarea name="{$id}"></textarea></td>
+    <div class="plugin_body">{$plugin_info->title} ver {$plugin_info->version}</div>
-    <!--@elseif($var->type == "select")-->
+
-    <td>
+    <!--@foreach($plugin_info->extra_var as $id => $var)-->
-      <select name="{$id}">
+    <div class="plugin_header">{$var->name}</div>
-      <!--@foreach($var->options as $key => $val)-->
+
-        <option value="{$key}">{$val}</option>
+    <div class="plugin_body">
-      <!--@end-->
+        <!--@if($var->type == "text")-->
-      </select>
+        <input type="text" name="{$id}" value="" />
-    </td>
+
-    <!--@elseif($var->type == "mid_list")-->
+        <!--@elseif($var->type == "textarea")-->
-    <td>
+        <textarea name="{$id}"></textarea>
-      <!--@foreach($mid_list as $key => $val)-->
+
-      <div>
+        <!--@elseif($var->type == "select")-->
-        <input type="checkbox" value="{$key}" name="{$id}" id="chk_mid_list_{$key}" /> 
+            <select name="{$id}">
-        <label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
+            <!--@foreach($var->options as $key => $val)-->
-      </div>
+            <option value="{$key}">{$val}</option>
-      <!--@end-->
+            <!--@end-->
-    </td>
+            </select>
+
+        <!--@elseif($var->type == "mid_list")-->
+            <!--@foreach($mid_list as $key => $val)-->
+                <div>
+                <input type="checkbox" value="{$key}" name="{$id}" id="chk_mid_list_{$key}" /> 
+                <label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
+                </div>
+            <!--@end-->
+        <!--@end-->
+    </div>
+    <div class="plugin_var_description">{$var->description}</div>
     <!--@end-->
-  </tr>
+
-  <tr>
+    <div class="plugin_button_area">
-    <td>{$var->description}</td>
+        <input type="submit" value="{$lang->cmd_generate_code}" class="plugin_button" />
-  </tr>
+        <input type="button" onclick="self.close()" value="{$lang->cmd_close}" class="plugin_button" />
-  <!--@end-->
+    </div>
-  <tr>
+
-    <td colspan="2">
+    <div class="plugin_code_area"><textarea readonly="true" id="plugin_code"></textarea></div>
-      <input type="submit" value="{$lang->cmd_generate_code}" />
+
-      <a href="#" onclick="self.close()">{$lang->cmd_close}</a>
+</div>
-    </td>
-  </tr>
-  <tr>  
-    <td colspan="2"><textarea readonly="true" id="plugin_code" style="width:100%;height:100px;"></textarea></td>
-  </tr>
-  </table>
 
 </form>