Merge branch 'develop' into pr/1851

This commit is contained in:
Kijin Sung 2022-02-07 21:31:45 +09:00
commit 4eced6daf0
71 changed files with 1045 additions and 508 deletions

View file

@ -45,11 +45,11 @@ class boardView extends board
$count_category = count(DocumentModel::getCategoryList($this->module_info->module_srl));
if($count_category)
{
if($this->module_info->hide_category)
if(isset($this->module_info->hide_category))
{
$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';
}
else if($this->module_info->use_category)
elseif(isset($this->module_info->use_category))
{
$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';
}
@ -655,7 +655,7 @@ class boardView extends board
// List of columns that should always be selected
$defaultColumnList = array(
'document_srl', 'module_srl', 'category_srl', 'lang_code', 'is_notice',
'title', 'title_bold', 'title_color', 'member_srl', 'nick_name', 'extra_vars',
'title', 'title_bold', 'title_color', 'member_srl', 'nick_name', 'tags', 'extra_vars',
'comment_count', 'trackback_count', 'uploaded_count', 'status', 'regdate', 'last_update',
);

View file

@ -1,9 +1,15 @@
<load target="css/mboard.css" />
<div class="bd">
<!--@if(isset($module_info->mobile_header_text) && $module_info->mobile_header_text)-->
<div class="bd_header_text">{$module_info->mobile_header_text}</div>
<!--@endif-->
<!--@if($oDocument->isExists())-->
<include target="read.html" />
<!--@else-->
<include target="_list.html" />
<!--@end-->
<!--@if(isset($module_info->mobile_footer_text) && $module_info->mobile_footer_text)-->
<div class="bd_footer_text">{$module_info->mobile_footer_text}</div>
<!--@endif-->
</div>

View file

@ -2,6 +2,9 @@
<load target="css/mboard.css" />
<div class="bd">
<!--@if(isset($module_info->mobile_header_text) && $module_info->mobile_header_text)-->
<div class="bd_header_text">{$module_info->mobile_header_text}</div>
<!--@endif-->
<div class="hx h2">
<h2><a href="{getUrl('','vid',$vid,'mid',$mid)}">{$module_info->browser_title}</a></h2>
</div>
@ -86,5 +89,8 @@
<div class="bna">
<button type="submit" class="bn dark">{$lang->cmd_registration}</button>
</div>
</form>
</form>
<!--@if(isset($module_info->mobile_footer_text) && $module_info->mobile_footer_text)-->
<div class="bd_footer_text">{$module_info->mobile_footer_text}</div>
<!--@endif-->
</div>

View file

@ -1,9 +1,15 @@
<load target="css/mboard.css" />
<div class="bd">
<!--@if(isset($module_info->mobile_header_text) && $module_info->mobile_header_text)-->
<div class="bd_header_text">{$module_info->mobile_header_text}</div>
<!--@endif-->
<!--@if($oDocument->isExists())-->
<!--#include("read.html")-->
<include target="read.html" />
<!--@else-->
<!--#include("_list.html")-->
<include target="_list.html" />
<!--@end-->
<!--@if(isset($module_info->mobile_footer_text) && $module_info->mobile_footer_text)-->
<div class="bd_footer_text">{$module_info->mobile_footer_text}</div>
<!--@endif-->
</div>

View file

@ -2,7 +2,10 @@
<load target="css/mboard.css" />
<div class="bd">
<h2 class="h2"><a href="{getUrl('','vid',$vid,'mid',$mid)}">{$module_info->browser_title}</a> &rsaquo; {$lang->cmd_write}</h2>
<!--@if(isset($module_info->mobile_header_text) && $module_info->mobile_header_text)-->
<div class="bd_header_text">{$module_info->mobile_header_text}</div>
<!--@endif-->
<h2 class="h2"><a href="{getUrl('','vid',$vid,'mid',$mid)}">{$module_info->browser_title}</a> &rsaquo; {$lang->cmd_write}</h2>
<form action="./" method="POST" onsubmit="return procFilter(this, insert)">
<input type="hidden" name="mid" value="{$mid}" />
<input type="hidden" name="document_srl" value="{$document_srl}" />
@ -81,4 +84,7 @@
<button type="submit" class="bn">{$lang->cmd_registration}</button>
</div>
</form>
<!--@if(isset($module_info->mobile_footer_text) && $module_info->mobile_footer_text)-->
<div class="bd_footer_text">{$module_info->mobile_footer_text}</div>
<!--@endif-->
</div>

View file

@ -78,6 +78,9 @@
<input cond="$module_info->secret=='Y'" type="checkbox" name="is_secret" value="Y" id="is_secret" class="iCheck" />
<label cond="$module_info->secret=='Y'" for="is_secret">{$lang->secret}</label>
</div>
<div class="write_captcha" cond="isset($captcha) && $captcha && $captcha->isTargetAction('comment')">
{$captcha}
</div>
<div class="btnArea">
<button type="submit" class="btn">{$lang->cmd_comment_registration}</button>
</div>

View file

@ -32,6 +32,9 @@
<input cond="$module_info->secret=='Y'" type="checkbox" name="is_secret" value="Y" id="is_secret" checked="checked"|cond="$oComment->get('is_secret')=='Y'" class="iCheck" />
<label cond="$module_info->secret=='Y'" for="is_secret">{$lang->secret}</label>
</div>
<div class="write_captcha" cond="isset($captcha) && $captcha && $captcha->isTargetAction('comment')">
{$captcha}
</div>
<div class="btnArea">
<button type="submit" class="btn">{$lang->cmd_comment_registration}</button>
</div>

View file

@ -73,6 +73,9 @@
<input type="text" name="tags" id="tags" value="{htmlspecialchars($oDocument->get('tags'))}" class="iText" style="width:300px" title="Tag" />
</span>
</div>
<div class="write_captcha" cond="isset($captcha) && $captcha && $captcha->isTargetAction('document')">
{$captcha}
</div>
<div class="btnArea">
<input type="submit" value="{$lang->cmd_registration}" class="btn" />
<block cond="!$oDocument->isExists() || $oDocument->get('status') == 'TEMP'">

View file

@ -86,6 +86,9 @@
<input cond="$module_info->secret=='Y'" type="checkbox" name="is_secret" value="Y" id="is_secret" class="iCheck" />
<label cond="$module_info->secret=='Y'" for="is_secret">{$lang->secret}</label>
</div>
<div class="write_captcha" cond="isset($captcha) && $captcha && $captcha->isTargetAction('comment')">
{$captcha}
</div>
<div style="float:right">
<button type="submit" class="btn_insert"><i class="xi-message"></i> {$lang->cmd_comment_registration}</button>
</div>

View file

@ -32,7 +32,7 @@
<input cond="$module_info->secret=='Y'" type="checkbox" name="is_secret" value="Y" id="is_secret" checked="checked"|cond="$oComment->get('is_secret')=='Y'" class="iCheck" />
<label cond="$module_info->secret=='Y'" for="is_secret">{$lang->secret}</label>
</div>
<div class="write_captcha" cond="$captcha">
<div class="write_captcha" cond="isset($captcha) && $captcha && $captcha->isTargetAction('comment')">
{$captcha}
</div>
<div style="float:right">

View file

@ -76,7 +76,7 @@
<input type="text" name="reason_update" id="reason_update" value="" class="iText" style="width:300px" title="reason update" />
</span>
</div>
<div class="write_captcha" cond="isset($captcha) && $captcha">
<div class="write_captcha" cond="isset($captcha) && $captcha && $captcha->isTargetAction('document')">
{$captcha}
</div>
<div style="float:right">