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

modules/admin/tpl/css/admin.css

@@ -187,6 +187,7 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background:
 #popBody .tableType5 td .w100 { width:100%; display:block;}
 #popBody .tableType5 td .checkbox { margin:-3px; margin-bottom:1em; }
 #popBody .tableType5 td p { line-height:1.4em;}
+#popBody .tableType5 td.blue a { color:#158692;}
 #popBody .tableType5 .borderBottomNone { border-bottom:none;}
 
 /* ----- Popup | End ----- */
@@ -210,3 +211,5 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background:
 .title { font-size:1.5em; font-weight:bold; margin-top:2em; margin-bottom:.5em; color:#666666; }
 .desc { font-size:1em; margin-bottom:.5em; color:#ADADAD;}
 
+.w700 { width:700px; }
+.w5 { width:5em; }

modules/blog/tpl/index.html

@@ -16,7 +16,7 @@
             <form action="./" method="get" onsubmit="return doChangeCategory(this);">
                 <input type="hidden" name="module" value="{$module}" />
                 <input type="hidden" name="act" value="{$act}" />
-                <select name="category">
+                <select name="module_category_srl">
                     <option value="">{$lang->module_category}</option>
                     <!--@foreach($module_category as $key => $val)-->
                     <option value="{$key}" <!--@if($module_category_srl==$key)-->selected="true"<!--@end-->>{$val->title}</option>
@@ -33,7 +33,7 @@
         <th scope="col">{$lang->skin}</th>
         <th scope="col">{$lang->admin_id}</th>
         <th scope="col">{$lang->regdate}</th>
-        <th scope="col">{$lang->cmd_move}</th>
+        <th scope="col">{$lang->cmd_view}</th>
         <th scope="col">{$lang->cmd_delete}</th>
     </tr>
 </thead>
@@ -49,13 +49,13 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><a href="{getUrl('act','dispBlogAdminBlogInfo','module_srl',$val->module_srl)}">{$val->mid}</a></td>
+        <td><a href="{getUrl('act','dispBlogAdminBlogInfo','module_srl',$val->module_srl)}" class="blue">{$val->mid}</a></td>
         <td>{htmlspecialchars($val->browser_title)}</td>
         <td class="tahoma">{$val->is_default}</td>
         <td class="tahoma">{$val->skin}</td>
         <td class="tahoma">{$val->admin_id}</td>
         <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="tahoma blue"><a href="./?mid={$val->mid}" target="_blank">{$lang->cmd_move}</a></td>
+        <td class="tahoma blue"><a href="./?mid={$val->mid}" target="_blank">{$lang->cmd_view}</a></td>
         <td class="tahoma red"><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispBlogAdminDeleteBlog','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@end--></td>
     </tr>
     <!--@end-->

modules/blog/tpl/js/blog_admin.js

@@ -93,7 +93,7 @@ function completeInsertGrant(ret_obj) {
 
 /* 카테고리 이동 */
 function doChangeCategory(fo_obj) {
-    var module_category_srl = fo_obj.category.options[fo_obj.category.selectedIndex].value;
+    var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value;
     if(module_category_srl==-1) {
         location.href = current_url.setQuery('act','dispModuleAdminCategory');
         return false;

modules/board/tpl/category_list.html

@@ -29,7 +29,7 @@
 
 <!--@foreach($category_list as $category_srl => $category_info)-->
 <tr>
-    <td class="tahoma">{htmlspecialchars($category_info->title)}</td>
+    <td>{htmlspecialchars($category_info->title)}</td>
     <td class="tahoma">{zdate($category_info->last_update,"Y-m-d H:i:s")}</td>
     <td class="tahoma blue"><a href="{getUrl('category_srl',$category_info->category_srl)}">{$lang->cmd_modify}</a></td>
     <td>

modules/board/tpl/index.html

@@ -16,7 +16,7 @@
             <form action="./" method="get" onsubmit="return doChangeCategory(this);">
                 <input type="hidden" name="module" value="{$module}" />
                 <input type="hidden" name="act" value="{$act}" />
-                <select name="category">
+                <select name="module_category_srl">
                     <option value="">{$lang->module_category}</option>
                     <!--@foreach($module_category as $key => $val)-->
                     <option value="{$key}" <!--@if($module_category_srl==$key)-->selected="true"<!--@end-->>{$val->title}</option>
@@ -33,7 +33,7 @@
         <th scope="col">{$lang->skin}</th>
         <th scope="col">{$lang->admin_id}</th>
         <th scope="col">{$lang->regdate}</th>
-        <th scope="col">{$lang->cmd_move}</th>
+        <th scope="col">{$lang->cmd_view}</th>
         <th scope="col">{$lang->cmd_delete}</th>
     </tr>
 </thead>
@@ -48,13 +48,13 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><a href="{getUrl('act','dispBoardAdminBoardInfo','module_srl',$val->module_srl)}">{$val->mid}</a></td>
+        <td><a href="{getUrl('act','dispBoardAdminBoardInfo','module_srl',$val->module_srl)}" class="blue">{$val->mid}</a></td>
         <td>{htmlspecialchars($val->browser_title)}</td>
         <td class="tahoma">{$val->is_default}</td>
         <td class="tahoma">{$val->skin}</td>
         <td class="tahoma">{$val->admin_id}</td>
         <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="tahoma blue"><a href="#" onclick="winopen('{getUrl('','mid',$val->mid)}'); return false;">{$lang->cmd_move}</a></td>
+        <td class="tahoma blue"><a href="#" onclick="winopen('{getUrl('','mid',$val->mid)}'); return false;">{$lang->cmd_view}</a></td>
         <td class="tahoma red"><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispBoardAdminDeleteBoard','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@end--></td>
     </tr>
     <!--@end-->

modules/board/tpl/js/board_admin.js

@@ -15,6 +15,7 @@ function completeInsertBoard(ret_obj) {
     alert(message);
 
     var url = current_url.setQuery('act','dispBoardAdminBoardInfo');
+    if(module_srl) url = url.setQuery('module_srl',module_srl);
     if(page) url.setQuery('page',page);
     location.href = url;
 }
@@ -91,7 +92,7 @@ function completeInsertGrant(ret_obj) {
 
 /* 카테고리 이동 */
 function doChangeCategory(fo_obj) {
-    var module_category_srl = fo_obj.category.options[fo_obj.category.selectedIndex].value;
+    var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value;
     if(module_category_srl==-1) {
         location.href = current_url.setQuery('act','dispModuleAdminCategory');
         return false;

modules/menu/menu.admin.view.php

@@ -78,9 +78,20 @@
          * @brief 메뉴에서 선택할 수 있는 mid목록을 보여줌
          **/
         function dispMenuAdminMidList() {
-            // mid 목록을 구해옴
             $oModuleModel = &getModel('module');
-            $mid_list = $oModuleModel->getMidList();
+
+            // 모듈 카테고리 목록을 구함
+            $module_category = $oModuleModel->getModuleCategories();
+            Context::set('module_category', $module_category);
+
+            // 모듈 목록을 구함 
+            $module_list = $oModuleModel->getModuleList();
+            Context::set('module_list', $module_list);
+
+            // mid 목록을 구해옴
+            $args->module_category_srl = Context::get('module_category_srl');
+            $args->module = Context::get('target_module');
+            $mid_list = $oModuleModel->getMidList($args);
             Context::set('mid_list', $mid_list);
 
             // 메뉴을 팝업으로 지정

modules/menu/tpl/mid_list.html

@@ -1,19 +1,67 @@
 <!--%import("js/menu_admin.js")-->
-<div style="width:450px;height:500px;overflow:scroll;">
-    <table border="1" width="400">
-    <tr>
-        <th>{$lang->mid}</th>
-        <th>{$lang->title}</th>
-        <th>{$lang->cmd_select}</th>
-    </tr>
+<div id="popHeadder" class="w700">
+    <h1>{$lang->cmd_search_mid}</h1>
+</div>
+
+<div id="popBody" class="w700">
+    <table cellspacing="0" class="tableType5">
+    <thead>
+      <tr>
+          <th scope="row">
+              <form action="./" method="get">
+                  <input type="hidden" name="module" value="{$module}" />
+                  <input type="hidden" name="act" value="{$act}" />
+                  <input type="hidden" name="target_module" value="{$target_module}" />
+                  <select name="module_category_srl" class="w5">
+                      <option value="">{$lang->module_category}</option>
+                      <!--@foreach($module_category as $key => $val)-->
+                      <option value="{$key}" <!--@if($module_category_srl==$key)-->selected="true"<!--@end-->>{$val->title}</option>
+                      <!--@end-->
+                  </select>
+                  <input type="submit" name="go_button" value="GO" class="buttonTypeGo" />
+              </form>
+          </th>
+          <th scope="row">
+              <form action="./" method="get">
+                  <input type="hidden" name="module" value="{$module}" />
+                  <input type="hidden" name="act" value="{$act}" />
+                  <input type="hidden" name="module_category_srl" value="{$module_category_srl}" />
+                  <select name="target_module" class="w5">
+                      <option value="">{$lang->module}</option>
+                      <!--@foreach($module_list as $key => $val)-->
+                      <option value="{$val->module}" <!--@if($target_module ==$val->module)-->selected="true"<!--@end-->>{$val->module}</option>
+                      <!--@end-->
+                  </select>
+                  <input type="submit" name="go_button" value="GO" class="buttonTypeGo" />
+              </form>
+          </th>
+          <th scope="row">{$lang->mid}</th>
+          <th scope="row">{$lang->title}</th>
+          <th scope="row">{$lang->cmd_select}</th>
+      </tr>
+    </thead>
     <tbody>
     <!--@foreach($mid_list as $key => $val)-->
     <tr>
-        <td>{$key}</td>
+        <td>
+            <!--@if(!$val->module_category_srl)-->
+                {$lang->not_exists}
+            <!--@else-->
+                {$module_category[$val->module_category_srl]->title}
+            <!--@end-->
+        </td>
+        <td class="tahoma">{$val->module}</td>
+        <td class="tahoma">{$key}</td>
         <td>{$val->browser_title}</td>
-        <td><a href="#" onclick="doInsertMid('{$key}','{$menu_id}'); return false;">{$lang->cmd_select}</a></td>
+        <td class="blue"><a href="#" onclick="doInsertMid('{$key}','{$menu_id}'); return false;">{$lang->cmd_select}</a></td>
     </tr>
     <!--@end-->
     </tbody>
     </table>
 </div>
+
+<div id="popFooter" class="w700">
+    <ul class="buttonRight nospace">
+        <li><span class="buttonTypeA"><a href="#" onclick="window.close(); return false;" class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" />{$lang->cmd_close}<img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></a></span></li>
+    </ul>
+</div>

modules/module/module.model.php

@@ -112,8 +112,8 @@
         /**
          * @brief DB에 생성된 mid목록을 구해옴
          **/
-        function getMidList() {
-            $output = executeQuery('module.getMidList');
+        function getMidList($args = null) {
+            $output = executeQuery('module.getMidList', $args);
             if(!$output->toBool()) return $output;
 
             $list = $output->data;

modules/module/queries/getMidList.xml

@@ -5,6 +5,10 @@
     <columns>
         <column name="*" />
     </columns>
+    <conditions>
+        <condition operation="equal" column="module_category_srl" var="module_category_srl" />
+        <condition operation="equal" column="module" var="module" pipe="and" />
+    </conditions>
     <navigation>
         <index var="sort_index" default="mid" order="asc" />
     </navigation>

modules/page/tpl/index.html

@@ -17,7 +17,7 @@
             <form action="./" method="get" onsubmit="return doChangeCategory(this);">
                 <input type="hidden" name="module" value="{$module}" />
                 <input type="hidden" name="act" value="{$act}" />
-                <select name="category">
+                <select name="module_category_srl">
                     <option value="">{$lang->module_category}</option>
                     <!--@foreach($module_category as $key => $val)-->
                     <option value="{$key}" <!--@if($module_category_srl==$key)-->selected="true"<!--@end-->>{$val->title}</option>
@@ -32,7 +32,7 @@
         <th scope="col">{$lang->browser_title}</th>
         <th scope="col">{$lang->is_default}</th>
         <th scope="col">{$lang->regdate}</th>
-        <th scope="col">{$lang->cmd_move}</th>
+        <th scope="col">{$lang->cmd_view}</th>
         <th scope="col">{$lang->cmd_delete}</th>
     </tr>
 </thead>
@@ -48,11 +48,11 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><a href="{getUrl('act','dispPageAdminInfo','module_srl',$val->module_srl)}">{$val->mid}</a></td>
+        <td><a href="{getUrl('act','dispPageAdminInfo','module_srl',$val->module_srl)}" class="blue">{$val->mid}</a></td>
         <td>{$val->browser_title}</td>
         <td class="tahoma">{$val->is_default}</td>
         <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="tahoma blue"><a href="./?mid={$val->mid}" target="_blank">{$lang->cmd_move}</a></td>
+        <td class="tahoma blue"><a href="./?mid={$val->mid}" target="_blank">{$lang->cmd_view}</a></td>
         <td class="tahoma red"><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispPageAdminDelete','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@end--></td>
     </tr>
     <!--@end-->

modules/page/tpl/js/page_admin.js

@@ -41,7 +41,7 @@ function completeDeletePage(ret_obj) {
 
 /* 카테고리 이동 */
 function doChangeCategory(fo_obj) {
-    var module_category_srl = fo_obj.category.options[fo_obj.category.selectedIndex].value;
+    var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value;
     if(module_category_srl==-1) {
         location.href = current_url.setQuery('act','dispModuleAdminCategory');
         return false;