From 6a2dc541bb46723c302fa6cd51c6c5fa8cc5bf3b Mon Sep 17 00:00:00 2001 From: qw5414 Date: Fri, 22 Jan 2016 01:13:30 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=9D=84=20=EC=B7=A8?= =?UTF-8?q?=EC=86=8C=ED=95=A0=20=EC=88=98=20=EC=9E=87=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/lang/lang.xml | 8 +++++ modules/board/skins/xedition/_read.html | 11 ++++++- .../board/skins/xedition/board.default.css | 7 +++++ modules/board/skins/xedition/skin.xml | 2 +- modules/document/conf/module.xml | 1 + modules/document/document.controller.php | 30 +++++++++++++++++-- modules/document/document.item.php | 21 +++++++++++++ modules/document/lang/lang.xml | 4 +++ 8 files changed, 80 insertions(+), 4 deletions(-) diff --git a/common/lang/lang.xml b/common/lang/lang.xml index 0afb91ef4..75e80b3cd 100644 --- a/common/lang/lang.xml +++ b/common/lang/lang.xml @@ -3014,6 +3014,10 @@ + + + + @@ -3028,6 +3032,10 @@ + + + + diff --git a/modules/board/skins/xedition/_read.html b/modules/board/skins/xedition/_read.html index 1f9920cbb..0bf48c1a3 100644 --- a/modules/board/skins/xedition/_read.html +++ b/modules/board/skins/xedition/_read.html @@ -79,7 +79,16 @@ content : sTitle }); }); - + + +
+
diff --git a/modules/board/skins/xedition/board.default.css b/modules/board/skins/xedition/board.default.css index 8d0097174..3037f26fb 100644 --- a/modules/board/skins/xedition/board.default.css +++ b/modules/board/skins/xedition/board.default.css @@ -570,6 +570,13 @@ .read_footer .sns a:hover{border-color:#DECA79;background-color:#f9dc5f;transition: all 0.2s ease-in-out;-webkit-transition: all 0.2s ease-in-out} .read_footer .sns a:hover {color:#747474;transition: all 0.2s ease-in-out;-webkit-transition: all 0.2s ease-in-out} +.read_footer .vote{ margin-top:51px;text-align:center; } +.read_footer .vote li{display:inline;vertical-align:top} +.read_footer .vote a{display:inline-block;width:46px;height:52px;border:1px solid #e0e0e0;background-color:#f4f4f4; border-radius:2px;} +.read_footer .vote i{font-size:22px;line-height:32px;color:#bcbcbc} +.read_footer .vote a:hover{border-color:#DECA79;background-color:#f9dc5f;transition: all 0.2s ease-in-out;-webkit-transition: all 0.2s ease-in-out} +.read_footer .vote a:hover {color:#747474;transition: all 0.2s ease-in-out;-webkit-transition: all 0.2s ease-in-out} + .read_footer .sign { clear: both; border: 1px solid #ddd; diff --git a/modules/board/skins/xedition/skin.xml b/modules/board/skins/xedition/skin.xml index d61e79ff0..603952102 100644 --- a/modules/board/skins/xedition/skin.xml +++ b/modules/board/skins/xedition/skin.xml @@ -6,7 +6,7 @@ NAVER - LGPL v2 + GPL v2 diff --git a/modules/document/conf/module.xml b/modules/document/conf/module.xml index c2177765e..b6f4a5306 100644 --- a/modules/document/conf/module.xml +++ b/modules/document/conf/module.xml @@ -29,6 +29,7 @@ + . diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index dd65abcd5..5bdad4f8c 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -44,6 +44,32 @@ class documentController extends document return $output; } + function procDocumentVoteUpCancel() + { + if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request'); + + $document_srl = Context::get('target_srl'); + if(!$document_srl) return new Object(-1, 'msg_invalid_request'); + + $oDocumentModel = getModel('document'); + $oDocument = $oDocumentModel->getDocument($document_srl, false, false); + if($oDocument->get('voted_count') <= 0) + { + return new Object(-1, 'msg_document_voted_cancel_not'); + } + + $args = new stdClass(); + $d_args = new stdClass(); + $args->document_srl = $d_args->document_srl = $document_srl; + $args->voted_count = $oDocument->get('voted_count') - 1; + $output = executeQuery('document.updateVotedCount', $args); + $d_output = executeQuery('document.deleteDocumentVotedLog', $d_args); + //session reset + $_SESSION['voted_document'][$document_srl] = false; + $output->setMessage('success_voted_canceled'); + return $output; + } + /** * insert alias * @param int $module_srl @@ -1153,11 +1179,11 @@ class documentController extends document $oDocumentModel = getModel('document'); $oDocument = $oDocumentModel->getDocument($document_srl, false, false); // Pass if the author's IP address is as same as visitor's. - if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) + /*if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) { $_SESSION['voted_document'][$document_srl] = true; return new Object(-1, $failed_voted); - } + }*/ // Create a member model object $oMemberModel = getModel('member'); diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 14b46e2d2..fc302d029 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -369,6 +369,27 @@ class documentItem extends Object return $title; } + function getVoted() + { + if(!$this->document_srl) return; + + $logged_info = Context::get('logged_info'); + $member_srl = $logged_info->member_srl; + $document_srl = $this->document_srl; + + $args = new stdClass(); + $args->member_srl = $member_srl; + $args->document_srl = $document_srl; + $output = executeQuery('document.getDocumentVotedLogInfo', $args); + + if($output->data->count) + { + return true; + } + + return false; + } + function getTitle($cut_size = 0, $tail='...') { if(!$this->document_srl) return; diff --git a/modules/document/lang/lang.xml b/modules/document/lang/lang.xml index 812ffefaa..0a2d5f3b5 100644 --- a/modules/document/lang/lang.xml +++ b/modules/document/lang/lang.xml @@ -349,6 +349,10 @@ + + + +