fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 10:11:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:Lastorder-DC/rhymix into develop

Browse source
This commit is contained in:
Hatsan 2024-06-23 10:33:14 +00:00
commit 4b4734c8d1
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/editor/skins/ckeditor/css/ckeditor.scss
View file

@ -104,6 +104,7 @@ body.cke_editable {
@include light-dark($colorset);
}
textarea.cke_source.cke_editable {
box-sizing: border-box;
padding: 10px;
}
body.color_scheme_dark.cke_auto_dark_mode .cke_wysiwyg_div {

2
modules/ncenterlite/ncenterlite.view.php
View file

@ -20,7 +20,7 @@ class NcenterliteView extends Ncenterlite
}
$oNcenterliteModel = ncenterliteModel::getInstance();
$output = $oNcenterliteModel->getMyNotifyList($this->user->member_srl, 1, null, true);
$output = $oNcenterliteModel->getMyNotifyList($this->user->member_srl, 1, (Context::get('readed') != 'Y' ? 'N' : 'Y'), true);
Context::set('total_count', $output->page_navigation->total_count);
Context::set('total_page', $output->page_navigation->total_page);

8
modules/ncenterlite/skins/default_bottom/NotifyList.html
View file

@ -1,4 +1,12 @@
<include target="../../../member/skins/default/common_header.html" />
<ul class="nav nav-tabs">
<li class="active"|cond="!$readed || $readed == 'N'">
<a href="{getUrl('readed', '')}">안읽은 알림</a>
</li>
<li class="active"|cond="$readed == 'Y'">
<a href="{getUrl('readed', 'Y')}">전체 알림</a>
</li>
</ul>
<table class="table table-striped table-hover" style="margin-top:20px;">
<thead class="bg_f_f9">
<tr>