From 2edb8fd2b5c8d5a9f2e573256fe6e563b48b413b Mon Sep 17 00:00:00 2001 From: BJRambo Date: Thu, 27 Sep 2018 19:43:35 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=8C=EB=A6=BC=EC=9D=B4=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EC=B6=9C=EB=A0=A5=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 옵션 제공합니다. 기본값은 사용하지 않도록 되어있습니다. --- modules/ncenterlite/lang/en.php | 3 +++ modules/ncenterlite/lang/ko.php | 3 +++ modules/ncenterlite/m.skins/default/ncenterlite.html | 2 ++ modules/ncenterlite/ncenterlite.admin.controller.php | 1 + modules/ncenterlite/ncenterlite.controller.php | 8 +++++--- modules/ncenterlite/skins/default/ncenterlite.html | 2 ++ .../skins/default_bottom/ncenterlite.html | 2 ++ modules/ncenterlite/tpl/config.html | 12 ++++++++++++ 8 files changed, 30 insertions(+), 3 deletions(-) diff --git a/modules/ncenterlite/lang/en.php b/modules/ncenterlite/lang/en.php index 8d1cc10f8..3c511549e 100644 --- a/modules/ncenterlite/lang/en.php +++ b/modules/ncenterlite/lang/en.php @@ -50,6 +50,7 @@ $lang->ncenterlite_date['5'] = 'second'; $lang->ncenterlite_sir = ' '; $lang->ncenterlite_message = 'You have %s new notification.'; $lang->ncenterlite_messages = 'You have %s new notifications.'; +$lang->ncenterlite_not_have_message = 'You have read all the notifications.'; $lang->ncenterlite_thisistest = '[*] This is a test notice.'; $lang->ncenterlite_delete_all = 'delete all'; $lang->ncenterlite_more = 'More'; @@ -72,6 +73,8 @@ $lang->ncenterlite_display_pc = 'Only PC'; $lang->ncenterlite_display_mobile = 'Only Mobile'; $lang->ncenterlite_display_none = 'Not display.'; $lang->ncenterlite_display_about = 'You can hide notifications from Notification Center Lite if you are using a layout or widget that handles notifications for you.'; +$lang->ncenterlite_always_display = 'Always ncenterlite display'; +$lang->ncenterlite_always_display_about = 'This feature allows there to display the Notification Center even if there is no notification of the user.'; $lang->ncenterlite_mention_target = 'Mention target'; $lang->ncenterlite_mention_target_about = 'Mention target can be nicknames or IDs (@Nickname or @ID).'; $lang->ncenterlite_skin_settings = 'Skin settings'; diff --git a/modules/ncenterlite/lang/ko.php b/modules/ncenterlite/lang/ko.php index 7bf194d5d..5660a6116 100644 --- a/modules/ncenterlite/lang/ko.php +++ b/modules/ncenterlite/lang/ko.php @@ -60,6 +60,7 @@ $lang->ncenterlite_date['5'] = '초'; $lang->ncenterlite_sir = '님'; $lang->ncenterlite_message = '%s개의 알림이 있습니다.'; $lang->ncenterlite_messages = '%s개의 알림이 있습니다.'; +$lang->ncenterlite_not_have_message = '알림을 모두 읽으셨습니다.'; $lang->ncenterlite_thisistest = '[*] 시험용 알림입니다'; $lang->ncenterlite_delete_all = '모두 삭제'; $lang->ncenterlite_more = '더보기'; @@ -82,6 +83,8 @@ $lang->ncenterlite_display_pc = 'PC만 표시'; $lang->ncenterlite_display_mobile = '모바일만 표시'; $lang->ncenterlite_display_none = '표시하지 않음'; $lang->ncenterlite_display_about = '사용하는 레이아웃이나 위젯에 알림을 표시하는 기능이 있는 경우 중복을 막기 위해 알림센터의 알림을 숨길 수 있습니다.'; +$lang->ncenterlite_always_display = '알림센터 항상 표기'; +$lang->ncenterlite_always_display_about = '이 기능을 사용할 경우 유저들의 알림이 없을 경우에도 알림센터를 출력합니다.'; $lang->ncenterlite_mention_target = '멘션 타겟'; $lang->ncenterlite_mention_target_about = '멘션 알림을 @아이디 소유자에게 보낼지 @닉네임 소유자에게 보낼지 선택할 수 있습니다.'; $lang->ncenterlite_skin_settings = '스킨 설정'; diff --git a/modules/ncenterlite/m.skins/default/ncenterlite.html b/modules/ncenterlite/m.skins/default/ncenterlite.html index 07c776b5d..ec535c639 100644 --- a/modules/ncenterlite/m.skins/default/ncenterlite.html +++ b/modules/ncenterlite/m.skins/default/ncenterlite.html @@ -12,6 +12,8 @@ {sprintf($lang->ncenterlite_messages, $ncenterlite_page_navigation->total_count)} + + {$lang->ncenterlite_not_have_message} {sprintf($lang->ncenterlite_message, $ncenterlite_page_navigation->total_count)} diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index edf5b4d23..a768366ee 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -10,6 +10,7 @@ class ncenterliteAdminController extends ncenterlite $config_vars = array( 'use', 'display_use', + 'always_display', 'user_config_list', 'mention_names', 'mention_suffixes', diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php index 5acbe78a1..9597b36b5 100644 --- a/modules/ncenterlite/ncenterlite.controller.php +++ b/modules/ncenterlite/ncenterlite.controller.php @@ -795,10 +795,12 @@ class ncenterliteController extends ncenterlite $logged_info = Context::get('logged_info'); $_output = $oNcenterliteModel->getMyNotifyList($logged_info->member_srl); - // TODO : 메세지 없더라도 표시하도록 하는 옵션 추가 - if(!$_output->data) + if($config->always_display !== 'Y') { - return; + if(!$_output->data) + { + return; + } } $_latest_notify_id = array_slice($_output->data, 0, 1); diff --git a/modules/ncenterlite/skins/default/ncenterlite.html b/modules/ncenterlite/skins/default/ncenterlite.html index 39d6ebe10..9351c3b15 100644 --- a/modules/ncenterlite/skins/default/ncenterlite.html +++ b/modules/ncenterlite/skins/default/ncenterlite.html @@ -12,6 +12,8 @@ {sprintf($lang->ncenterlite_messages, $ncenterlite_page_navigation->total_count)} + + {$lang->ncenterlite_not_have_message} {sprintf($lang->ncenterlite_message, $ncenterlite_page_navigation->total_count)} diff --git a/modules/ncenterlite/skins/default_bottom/ncenterlite.html b/modules/ncenterlite/skins/default_bottom/ncenterlite.html index b4a5b5703..4a767dfe3 100644 --- a/modules/ncenterlite/skins/default_bottom/ncenterlite.html +++ b/modules/ncenterlite/skins/default_bottom/ncenterlite.html @@ -12,6 +12,8 @@ {sprintf($lang->ncenterlite_messages, $ncenterlite_page_navigation->total_count)} + + {$lang->ncenterlite_not_have_message} {sprintf($lang->ncenterlite_message, $ncenterlite_page_navigation->total_count)} diff --git a/modules/ncenterlite/tpl/config.html b/modules/ncenterlite/tpl/config.html index e5f06c1a9..1595f1d7c 100644 --- a/modules/ncenterlite/tpl/config.html +++ b/modules/ncenterlite/tpl/config.html @@ -68,6 +68,18 @@

{$lang->ncenterlite_display_about}

+
+ +
+ + +

{$lang->ncenterlite_always_display_about}

+
+