diff --git a/modules/point/lang/en.php b/modules/point/lang/en.php index 900a4a486..1eb034040 100644 --- a/modules/point/lang/en.php +++ b/modules/point/lang/en.php @@ -33,17 +33,23 @@ $lang->point_group_ratchet_yes = 'Maintain current group if point is reduced'; $lang->point_group_ratchet_no = 'Move to lower group if point is reduced'; $lang->about_point_link_group = 'If you specify level for a specific group, users are assigned into the group when they advance to the level by getting points.'; $lang->about_module_point = 'You can set point for each module, and modules which don\'t have any value will use the default point. All points will be restored on acting reverse.'; -$lang->point_signup = 'Sign up'; -$lang->point_insert_document = 'On Writing'; -$lang->point_delete_document = 'On Deleting'; -$lang->point_insert_comment = 'On Adding Comments'; -$lang->point_delete_comment = 'On Deleting Comments'; -$lang->point_upload_file = 'On Uploading'; -$lang->point_delete_file = 'On Deleting Files'; -$lang->point_download_file = 'On Downloading Files(Exclude images)'; -$lang->point_read_document = 'On Reading'; -$lang->point_voted = 'On Recommended'; -$lang->point_blamed = 'On Not Recommended'; +$lang->point_signup = 'Sign Up'; +$lang->point_insert_document = 'Writing a document'; +$lang->point_delete_document = 'Deleting a document'; +$lang->point_insert_comment = 'Writing a comment'; +$lang->point_delete_comment = 'Deleting a comment'; +$lang->point_upload_file = 'Uploading a file'; +$lang->point_delete_file = 'Deleting a file'; +$lang->point_download_file = 'Downloading a file (excluding images)'; +$lang->point_read_document = 'Reading another person\'s post'; +$lang->point_voter = 'Upvoting another person\'s document'; +$lang->point_blamer = 'Downvoting another person\'s document'; +$lang->point_voter_comment = 'Upvoting another person\'s comment'; +$lang->point_blamer_comment = 'Downvoting another person\'s comment'; +$lang->point_voted = 'One\'s document is upvoted'; +$lang->point_blamed = 'One\'s document is downvoted'; +$lang->point_voted_comment = 'One\'s comment is upvoted'; +$lang->point_blamed_comment = 'One\'s comment is downvoted'; $lang->cmd_point_config = 'Default Setting'; $lang->cmd_point_module_config = 'Module Setting'; $lang->cmd_point_act_config = 'Act Setting'; diff --git a/modules/point/lang/ko.php b/modules/point/lang/ko.php index 4b26c5b77..39cb7d12c 100644 --- a/modules/point/lang/ko.php +++ b/modules/point/lang/ko.php @@ -40,10 +40,18 @@ $lang->point_insert_comment = '댓글 작성'; $lang->point_delete_comment = '댓글 삭제'; $lang->point_upload_file = '파일 업로드'; $lang->point_delete_file = '파일 삭제'; -$lang->point_download_file = '파일 다운로드(이미지 제외)'; -$lang->point_read_document = '게시글 조회'; -$lang->point_voted = '추천 받음'; -$lang->point_blamed = '비추천 받음'; +$lang->point_download_file = '파일 다운로드 (이미지 제외)'; +$lang->point_read_document = '다른 사람의 글을 읽음'; +$lang->point_voter = '다른 사람의 글을 추천함'; +$lang->point_blamer = '다른 사람의 글을 비추천함'; +$lang->point_voter_comment = '다른 사람의 댓글을 추천함'; +$lang->point_blamer_comment = '다른 사람의 댓글을 비추천함'; +$lang->point_download_file_author = '내 파일이 다운로드됨 (이미지 제외)'; +$lang->point_read_document_author = '내 글이 읽힘'; +$lang->point_voted = '내 글이 추천받음'; +$lang->point_blamed = '내 글이 비추천받음'; +$lang->point_voted_comment = '내 댓글이 추천받음'; +$lang->point_blamed_comment = '내 댓글이 비추천받음'; $lang->cmd_point_config = '기본 설정'; $lang->cmd_point_module_config = '모듈별 설정'; $lang->cmd_point_act_config = '기능별 act 설정'; diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index d9979a4ba..accc94f9c 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -45,12 +45,18 @@ class pointAdminController extends point $config->signup_point = (int)$args->signup_point; $config->login_point = (int)$args->login_point; $config->insert_document = (int)$args->insert_document; - $config->read_document = (int)$args->read_document; $config->insert_comment = (int)$args->insert_comment; $config->upload_file = (int)$args->upload_file; $config->download_file = (int)$args->download_file; + $config->read_document = (int)$args->read_document; + $config->voter = (int)$args->voter; + $config->blamer = (int)$args->blamer; $config->voted = (int)$args->voted; $config->blamed = (int)$args->blamed; + $config->download_file_author = (int)$args->download_file_author; + $config->read_document_author = (int)$args->read_document_author; + $config->voter_comment = (int)$args->voter_comment; + $config->blamer_comment = (int)$args->blamer_comment; $config->voted_comment = (int)$args->voted_comment; $config->blamed_comment = (int)$args->blamed_comment; // The highest level @@ -134,7 +140,12 @@ class pointAdminController extends point { $args = Context::getRequestVars(); - $configTypeList = array('insert_document', 'insert_comment', 'upload_file', 'download_file', 'read_document', 'voted', 'blamed', 'voted_comment', 'blamed_comment'); + $configTypeList = array( + 'insert_document', 'insert_comment', 'upload_file', 'download_file', 'read_document', + 'voter', 'blamer', 'voter_comment', 'blamer_comment', + 'download_file_author', 'read_document_author', 'voted', 'blamed', 'voted_comment', 'blamed_comment', + ); + foreach($configTypeList AS $config) { if(is_array($args->{$config})) @@ -186,6 +197,12 @@ class pointAdminController extends point $config['upload_file'] = (int)Context::get('upload_file'); $config['download_file'] = (int)Context::get('download_file'); $config['read_document'] = (int)Context::get('read_document'); + $config['voter'] = (int)Context::get('voter'); + $config['blamer'] = (int)Context::get('blamer'); + $config['voter_comment'] = (int)Context::get('voter_comment'); + $config['blamer_comment'] = (int)Context::get('blamer_comment'); + $config['download_file_author'] = (int)Context::get('download_file_author'); + $config['read_document_author'] = (int)Context::get('read_document_author'); $config['voted'] = (int)Context::get('voted'); $config['blamed'] = (int)Context::get('blamed'); $config['voted_comment'] = (int)Context::get('voted_comment'); diff --git a/modules/point/tpl/config.html b/modules/point/tpl/config.html index 3c831e9d4..fa65d939f 100644 --- a/modules/point/tpl/config.html +++ b/modules/point/tpl/config.html @@ -53,6 +53,24 @@ :
+ : + +
+ : + +
+ : + +
+ : + +
+ : + +
+ : + +
:
@@ -60,10 +78,10 @@
: - +
: - +
diff --git a/modules/point/tpl/module_config.html b/modules/point/tpl/module_config.html index 2f67facf9..acb2d460a 100644 --- a/modules/point/tpl/module_config.html +++ b/modules/point/tpl/module_config.html @@ -16,24 +16,36 @@ {$lang->point_upload_file} {$lang->point_download_file} {$lang->point_read_document} + {$lang->point_voter} + {$lang->point_blamer} + {$lang->point_voter_comment} + {$lang->point_blamer_comment} + {$lang->point_download_file_author} + {$lang->point_read_document_author} {$lang->point_voted} {$lang->point_blamed} - {$lang->comment} {$lang->point_voted} - {$lang->comment} {$lang->point_blamed} + {$lang->point_voted_comment} + {$lang->point_blamed_comment} - {$val->browser_title}({$val->mid}) - {$config->point_name} - {$config->point_name} - {$config->point_name} - {$config->point_name} - {$config->point_name} - {$config->point_name} - {$config->point_name} - {$config->point_name} - {$config->point_name} + {$val->browser_title}
({$val->mid}) + + + + + + + + + + + + + + + diff --git a/modules/point/tpl/point_module_config.html b/modules/point/tpl/point_module_config.html index 0fda279e4..065ab98ce 100644 --- a/modules/point/tpl/point_module_config.html +++ b/modules/point/tpl/point_module_config.html @@ -38,6 +38,42 @@ {$module_config['point_name']}
+
+ +
+ {$module_config['point_name']} +
+
+
+ +
+ {$module_config['point_name']} +
+
+
+ +
+ {$module_config['point_name']} +
+
+
+ +
+ {$module_config['point_name']} +
+
+
+ +
+ {$module_config['point_name']} +
+
+
+ +
+ {$module_config['point_name']} +
+
@@ -51,13 +87,13 @@
- +
{$module_config['point_name']}
- +
{$module_config['point_name']}