css 및 js 호출순서 조정기능 추가

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

modules/point/conf/info.xml

@@ -44,7 +44,7 @@
     </description>
     <version>0.1</version>
     <date>2007-07-26</date>
-    <category>accessory</category>
+    <category>member</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>

modules/point/conf/module.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispPointAdminConfig" type="view" admin_index="true" standalone="true" />
         <action name="dispPointAdminModuleConfig" type="view" standalone="true" />

modules/point/lang/ko.lang.php

@@ -5,11 +5,11 @@
      * @brief  포인트 (point) 모듈의 기본 언어팩
      **/
 
-    $lang->point = "포인트"; 
-    $lang->level = "레벨"; 
+    $lang->point = '포인트'; 
+    $lang->level = '레벨'; 
 
-    $lang->about_point_module = "포인트 모듈은 글작성/댓글작성/업로드/다운로드등의 행동을 할때 포인트를 부여할 수 있습니다.<br />단 포인트 모듈에서는 설정만 할 뿐이고 포인트 애드온을 활성화 시켜야 포인트가 누적이 됩니다";
-    $lang->about_act_config = "게시판,블로그등의 모듈마다 글작성/삭제/댓글작성/삭제등의 action이 있습니다.<br />게시판/블로그외의 모듈에 포인트 기능 연동을 하고 싶을때는 각 기능에 맞는 act값을 추가해주시면 됩니다.<br />연결은 ,(콤마)로 해주시면 됩니다.";
+    $lang->about_point_module = '포인트 모듈은 글작성/댓글작성/업로드/다운로드등의 행동을 할때 포인트를 부여할 수 있습니다.<br />단 포인트 모듈에서는 설정만 할 뿐이고 포인트 애드온을 활성화 시켜야 포인트가 누적이 됩니다';
+    $lang->about_act_config = '게시판,블로그등의 모듈마다 글작성/삭제/댓글작성/삭제등의 action이 있습니다.<br />게시판/블로그외의 모듈에 포인트 기능 연동을 하고 싶을때는 각 기능에 맞는 act값을 추가해주시면 됩니다.<br />연결은 ,(콤마)로 해주시면 됩니다.';
 
     $lang->max_level = '최고 레벨';
     $lang->about_max_level = '최고레벨을 지정하실 수 있습니다. 레벨 아이콘을 염두에 두셔야 하고 최고 레벨은 1000이 한계입니다';

modules/point/lang/zh-CN.lang.php

@@ -51,8 +51,7 @@
     $lang->point_voted = '推荐';
     $lang->point_blamed = '反对';
 
-
-    $lang->cmd_point_config = '基本设置';
+    $lang->cmd_point_config = '常规选项';
     $lang->cmd_point_module_config = '对象模块设置';
     $lang->cmd_point_act_config = '功能act设置';
     $lang->cmd_point_member_list = '会员积分目录';

modules/point/point.class.php

@@ -13,10 +13,6 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('point', 'view', 'dispPointAdminConfig');
-            $oModuleController->insertActionForward('point', 'view', 'dispPointAdminModuleConfig');
-            $oModuleController->insertActionForward('point', 'view', 'dispPointAdminActConfig');
-            $oModuleController->insertActionForward('point', 'view', 'dispPointAdminPointList');
 
             // 포인트 정보를 기록할 디렉토리 생성
             FileHandler::makeDir('./files/member_extra_info/point');
@@ -187,39 +183,5 @@
             $oPointAdminController->cacheActList();
 
         }
-
-        /**
-         * @brief 권한 체크를 실행하는 method
-         * 모듈 객체가 생성된 경우는 직접 권한을 체크하지만 기능성 모듈등 스스로 객체를 생성하지 않는 모듈들의 경우에는
-         * ModuleObject에서 직접 method를 호출하여 권한을 확인함
-         *
-         * isAdminGrant는 관리권한 이양시에만 사용되도록 하고 기본은 false로 return 되도록 하여 잘못된 권한 취약점이 생기지 않도록 주의하여야 함
-         **/
-        function isAdmin() {
-            // 로그인이 되어 있지 않으면 무조건 return false
-            $is_logged = Context::get('is_logged');
-            if(!$is_logged) return false;
-
-            // 사용자 아이디를 구함
-            $logged_info = Context::get('logged_info');
-
-            // 모듈 요청에 사용된 변수들을 가져옴
-            $args = Context::getRequestVars();
-
-            // act의 값에 따라서 관리 권한 체크
-            switch($args->act) {
-                case 'procPointAdminInsertPointModuleConfig' :
-                        if(!$args->target_module_srl) return false;
-
-                        $oModuleModel = &getModel('module');
-                        $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->target_module_srl);
-                        if(!$module_info) return false;
-
-                        if($oModuleModel->isModuleAdmin($module_info, $logged_info)) return true; 
-                    break;
-            }
-
-            return false;
-        }
     }
 ?>

modules/point/tpl/config.html

@@ -5,66 +5,74 @@
 
 <div class="adminLeftContent">
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->cmd_setup}</caption>
-    <tr class="row2">
-        <th scope="col"><div>{$lang->max_level}</div></th>
-        <td colspan="3">
+    <h4 class="xeAdmin">{$lang->max_level}</h4>
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <td colspan="2">
             <input type="text" class="inputTypeText w80" value="{$config->max_level}" name="max_level" />
             <p>{$lang->about_max_level}</p>
         </td>
     </tr>
+    </table>
+
+    <h4 class="xeAdmin">{$lang->point_name}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <th scope="col"><div>{$lang->point_name}</div></th>
-        <td colspan="3">
+        <td colspan="2">
             <input type="text" class="inputTypeText w80" value="{$config->point_name}" name="point_name" />
             <p>{$lang->about_point_name}</p>
         </td>
     </tr>
+    </table>
+
+    <h4 class="xeAdmin">{$lang->is_default}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
-        <th scope="col" rowspan="9"><div>{$lang->is_default}</div></th>
-        <th colspan="2"><div>{$lang->point_signup}</div></th>
+        <td><div>{$lang->point_signup}</div></td>
         <td>
             <input type="text" class="inputTypeText w80" value="{$config->signup_point}" name="signup_point" /> {$config->point_name}
             <p>{$lang->about_point_signup}</p>
         </td>
     </tr>
     <tr>
-        <th colspan="2"><div>{$lang->cmd_login}</div></th>
+        <td><div>{$lang->cmd_login}</div></td>
         <td><input type="text" class="inputTypeText w80" value="{$config->login_point}" name="login_point" /> {$config->point_name}</td>
     </tr>
     <tr class="row2">
-        <th colspan="2"><div>{$lang->point_insert_document}</div></th>
+        <td><div>{$lang->point_insert_document}</div></td>
         <td><input type="text" name="insert_document" value="{$config->insert_document}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr>
-        <th colspan="2"><div>{$lang->point_insert_comment}</div></th>
+        <td><div>{$lang->point_insert_comment}</div></td>
         <td><input type="text" name="insert_comment" value="{$config->insert_comment}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr class="row2">
-        <th colspan="2"><div>{$lang->point_upload_file}</div></th>
+        <td><div>{$lang->point_upload_file}</div></td>
         <td><input type="text" name="upload_file" value="{$config->upload_file}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr>
-        <th colspan="2"><div>{$lang->point_download_file}</div></th>
+        <td><div>{$lang->point_download_file}</div></td>
         <td><input type="text" name="download_file" value="{$config->download_file}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr class="row2">
-        <th colspan="2"><div>{$lang->point_read_document}</div></th>
+        <td><div>{$lang->point_read_document}</div></td>
         <td><input type="text" name="read_document" value="{$config->read_document}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr>
-        <th colspan="2"><div>{$lang->point_voted}</div></th>
+        <td><div>{$lang->point_voted}</div></td>
         <td><input type="text" name="voted" value="{$config->voted}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr class="row2">
-        <th colspan="2"><div>{$lang->point_blamed}</div></th>
+        <td><div>{$lang->point_blamed}</div></td>
         <td><input type="text" name="blamed" value="{$config->blamed}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
+    </table>
+
+    <h4 class="xeAdmin">{$lang->level_icon}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <th scope="col"><div>{$lang->level_icon}</div></th>
-        <td colspan="3">
-            <select name="level_icon">
+        <td colspan="2">
+            <select name="level_icon" class="fullWidth">
             <!--@foreach($level_icon_list as $key => $val)-->
                 <option value="{$val}" <!--@if($config->level_icon == $val)-->selected="selected"<!--@end-->>{$val}</option>
             <!--@end-->
@@ -72,22 +80,28 @@
             <p>{$lang->about_level_icon}</p>
         </td>
     </tr>
-    <tr class="row2">
-        <th scope="col"><div>{$lang->disable_download}</div></th>
-        <td colspan="3">
+    </table>
+
+    <h4 class="xeAdmin">{$lang->disable_download}</h4>
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <td colspan="2">
             <input type="checkbox" name="disable_download" value="Y" <!--@if($config->disable_download=='Y')-->checked="checked"<!--@end--> />
             <p>{$lang->about_disable_download}</p>
         </td>
     </tr>
+    </table>
+
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <td colspan="4" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->point_link_group}</caption>
+    <h4 class="xeAdmin">{$lang->point_link_group}</h4>
+    <table cellspacing="0" class="rowTable">
     <thead>
     <tr>
         <th class="half_wide"><div>{$lang->group}<div></th>
@@ -105,34 +119,26 @@
         <td colspan="3"><p>{$lang->about_point_link_group}</p></td>
     </tr>
     <tr>
-        <td colspan="3" class="right">
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="3" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
+        </th>
     </tr>
     </tbody>
     </table>
-
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->cmd_point_recal}</caption>
-    <tr>
-        <td>
-            <p>{$lang->about_cmd_point_recal}</p>
-            <p id="pointReCal"></p>
-            <span class="button"><input type="button" value="{$lang->cmd_point_recal}" onclick="doPointRecal(); return false;"/></span>
-        </td>
-    </tr>
-    </table>
 </div>
 
 <div class="adminRightExtra">
-    <table cellspacing="0" class="adminTable">
+    <h4 class="xeAdmin">{$lang->level_point_calc}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <th scope="col"><div>{$lang->level_point_calc}</div></th>
-        <td colspan="3"><input name="expression" value="{$config->expression}" size="4"/> <input type="button" onclick="exp_calc(this.form)" value="{$lang->cmd_exp_calc}" /> <input type="button" onclick="exp_calc(this.form, true)" value="{$lang->cmd_exp_reset}" /><p>{$lang->expression}</p>
+        <td><input name="expression" value="{$config->expression}" size="4" class="inputTypeText w100"/> <input type="button" onclick="exp_calc(this.form)" value="{$lang->cmd_exp_calc}" /> <input type="button" onclick="exp_calc(this.form, true)" value="{$lang->cmd_exp_reset}" /><p>{$lang->expression}</p>
         </td>
     </tr>
+    </table>
+
+    <h4 class="xeAdmin">{$lang->level_point}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <th scope="col" rowspan="{$config->max_level}"><div>{$lang->level_point}</div></th>
         <td>1</td>
         <td><img src="{getUrl()}/modules/point/icons/{$config->level_icon}/1.gif" alt="" /></td>
         <td><input type="text" name="level_step_1" value="{$config->level_step[1]}" class="inputTypeText w80" /> {$config->point_name}</td>
@@ -145,8 +151,23 @@
     </tr>
     <!--@end-->
     <tr>
-        <td colspan="4" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        <th colspan="4" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
+        </th>
+    </tr>
+    </table>
+
+    <h4 class="xeAdmin">{$lang->cmd_point_recal}</h4>
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <td>
+            <p>{$lang->about_cmd_point_recal}</p>
+            <p id="pointReCal"></p>
+        </td>
+    </tr>
+    <tr>
+        <th class="button">
+            <span class="button black strong"><input type="button" value="{$lang->cmd_point_recal}" onclick="doPointRecal(); return false;"/></span>
         </td>
     </tr>
     </table>

modules/point/tpl/header.html

@@ -1,5 +1,5 @@
 <!--%import("js/point_admin.js")-->
-<h3>{$lang->point} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->point} <span class="gray">{$lang->cmd_management}</span></h3>
 <!--@if($act=="dispPointAdminModuleConfig")-->
 <div class="infoText">{$lang->about_module_point}</div>
 <!--@else-->

modules/point/tpl/member_list.html

@@ -1,11 +1,8 @@
 <!--%import("filter/update_point.xml")-->
 <!--#include("header.html")-->
 
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <em>{number_format($page)}/{number_format($total_page)}</em>
-</div>
-
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="crossTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
@@ -77,7 +74,7 @@
             <!--@end-->
         </select>
         <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button"><input type="submit" value="{$lang->cmd_search}" /></span>
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_search}" /></span>
         <a href="#" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
     </fieldset>
 </form>

modules/point/tpl/module_config.html

@@ -3,14 +3,7 @@
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_module_config);" id="fo_point">
 
-    <table cellspacing="0" class="adminTable">
-    <col width="14%" />
-    <col width="14%" />
-    <col width="14%" />
-    <col width="14%" />
-    <col width="14%" />
-    <col width="14%" />
-    <col width="14%" />
+    <table cellspacing="0" class="crossTable">
     <thead>
         <tr>
             <th><div>{$lang->point_insert_document}</div></th>
@@ -40,9 +33,9 @@
     <!--@end-->
     <!--@end-->
     <tr>
-        <td colspan="7" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="7" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </tbody>
     </table>

modules/point/tpl/point_module_config.html

@@ -3,8 +3,8 @@
 <form action="./" method="get" onsubmit="return procFilter(this, insert_point_module_config);" id="fo_point">
 <input type="hidden" name="target_module_srl" value="{$module_config['module_srl']?$module_config['module_srl']:$module_srls}" />
 
-<table cellspacing="0" class="adminTable">
-<caption>{$lang->point}</caption>
+<h4 class="xeAdmin">{$lang->point}</h4>
+<table cellspacing="0" class="rowTable">
 <tr>
     <th><div>{$lang->point_insert_document}</div></th>
     <td class="wide"><input type="text" name="insert_document" value="{$module_config['insert_document']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
@@ -26,7 +26,7 @@
     <td><input type="text" name="read_document" value="{$module_config['read_document']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
 </tr>
 <tr>
-    <td colspan="2" class="right"><span class="button"><input type="submit" value="{$lang->cmd_save}" /></span></td>
+    <th colspan="2" class="button"><span class="button strong black"><input type="submit" value="{$lang->cmd_save}" /></span></th>
 </tr>
 </table>