fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 17:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Add initial support for all-boards notice

Browse source
This commit is contained in:
Kijin Sung 2020-10-02 01:36:40 +09:00
parent d1edc53b4e
commit 2b77b42480
7 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/lang/en.php
View file

@ -76,6 +76,8 @@ $lang->favorite = 'Favorite';
$lang->menu = 'Menu';
$lang->no = 'No.';
$lang->notice = 'Notice';
$lang->notice_all = 'Notice All';
$lang->not_notice = 'Normal';
$lang->secret = 'Secret';
$lang->category_srl = 'Category';
$lang->category = 'Category';

2
common/lang/ko.php
View file

@ -78,6 +78,8 @@ $lang->favorite = '즐겨찾기';
$lang->menu = '메뉴';
$lang->no = '번호';
$lang->notice = '공지';
$lang->notice_all = '전체공지';
$lang->not_notice = '일반';
$lang->secret = '비밀';
$lang->category_srl = '분류';
$lang->category = '분류';

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

@ -109,6 +109,8 @@ class boardView extends board
**/
Context::addJsFilter($this->module_path.'tpl/filter', 'input_password.xml');
Context::addJsFile($this->module_path.'tpl/js/board.js');
Context::loadLang('./modules/document/lang');
Context::loadLang('./modules/comment/lang');
// remove [document_srl]_cpage from get_vars
$args = Context::getRequestVars();

6
modules/board/skins/xedition/board.default.css
View file

@ -285,13 +285,17 @@
vertical-align: middle;
}
.write_header select {
border: 1px solid #DBDBDB;
height: 29px;
width: 140px;
padding: 0;
}
.write_header select[name=is_notice] {
width: 76px;
}
.write_header .iText {
width: 360px;
margin: 0 10px 0 0;
margin: 0;
background: #fff;
}
.write_editor .xd {

9
modules/board/skins/xedition/write_form.html
View file

@ -12,8 +12,13 @@
</select>
<input cond="$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" value="{escape($oDocument->getTitleText(), false)}" />
<input cond="!$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" />
<input cond="$grant->manager" type="checkbox" name="is_notice" value="Y" class="iCheck" checked="checked"|cond="$oDocument->isNotice()" id="is_notice" />
<label cond="$grant->manager" for="is_notice">{$lang->notice}</label>
<!--@if($grant->manager)-->
<select name="is_notice">
<option value="N" selected="selected"|cond="$oDocument->get('is_notice') === 'N'">{$lang->not_notice}</option>
<option value="Y" selected="selected"|cond="$oDocument->get('is_notice') === 'Y'">{$lang->notice}</option>
<option value="A" selected="selected"|cond="$oDocument->get('is_notice') === 'A'">{$lang->notice_all}</option>
</select>
<!--@endif-->
</div>
<div class="exForm" cond="count($extra_keys)">
<table cond="count($extra_keys)" border="1" cellspacing="0" summary="Extra Form">

2
modules/document/document.item.php
View file

@ -332,7 +332,7 @@ class documentItem extends BaseObject
function isNotice()
{
return (bool) ($this->get('is_notice') == 'Y');
return (bool) ($this->get('is_notice') !== 'N');
}
function useNotify()

9
modules/document/queries/getNoticeList.xml
View file

@ -6,9 +6,12 @@
<column name="*" />
</columns>
<conditions>
<condition operation="in" column="module_srl" var="module_srl" filter="number" />
<condition operation="equal" column="is_notice" default="Y" pipe="and" />
<condition operation="equal" column="category_srl" var="category_srl" pipe="and" />
<group>
<condition operation="in" column="module_srl" var="module_srl" filter="number" />
<condition operation="equal" column="category_srl" var="category_srl" pipe="and" />
<condition operation="equal" column="is_notice" default="Y" pipe="and" />
</group>
<condition operation="equal" column="is_notice" default="A" pipe="or" />
</conditions>
<navigation>
<index var="sort_index" default="list_order" order="asc" />