Merge branch 'mobile_page' of https://github.com/sejin7940/xe-core into sejin7940-mobile_page

This commit is contained in:
akasima 2014-07-15 10:43:33 +09:00
commit c314a99f87
3 changed files with 57 additions and 21 deletions

View file

@ -11,8 +11,11 @@ class boardMobile extends boardView
$oSecurity->encodeHTML('document_srl', 'comment_srl', 'vid', 'mid', 'page', 'category', 'search_target', 'search_keyword', 'sort_index', 'order_type', 'trackback_srl');
if($this->module_info->list_count) $this->list_count = $this->module_info->list_count;
if($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;
if($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;
if($this->module_info->mobile_search_list_count) $this->list_count = $this->module_info->mobile_search_list_count;
if($this->module_info->page_count) $this->page_count = $this->module_info->page_count;
if($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;
$this->except_notice = $this->module_info->except_notice == 'N' ? false : true;
// $this->_getStatusNameListecret option backward compatibility

View file

@ -48,6 +48,27 @@
</select>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="list_count">{$lang->list_count}</label>
<div class="x_controls">
<input type="text" name="list_count" id="list_count" value="{$module_info->list_count?$module_info->list_count:20}" style="width:30px" />
<p class="x_help-inline">{$lang->about_list_count}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="search_list_count">{$lang->search_list_count}</label>
<div class="x_controls">
<input type="text" name="search_list_count" id="search_list_count" value="{$module_info->search_list_count?$module_info->search_list_count:20}" style="width:30px" />
<p class="x_help-inline">{$lang->about_search_list_count}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="page_count">{$lang->page_count}</label>
<div class="x_controls">
<input type="text" name="page_count" id="page_count" value="{$module_info->page_count?$module_info->page_count:10}" style="width:30px" />
<p class="x_help-inline">{$lang->about_page_count}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="lang_header_text">{$lang->header_text}</label>
<div class="x_controls">
@ -94,6 +115,27 @@
<p id="mobile_skin_help" class="x_help-block" hidden>{$lang->about_skin}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="mobile_list_count">{$lang->list_count}</label>
<div class="x_controls">
<input type="text" name="mobile_list_count" id="mobile_list_count" value="{$module_info->mobile_list_count?$module_info->mobile_list_count:20}" style="width:30px" />
<p class="x_help-inline">{$lang->about_list_count}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="mobile_search_list_count">{$lang->search_list_count}</label>
<div class="x_controls">
<input type="text" name="mobile_search_list_count" id="mobile_search_list_count" value="{$module_info->mobile_search_list_count?$module_info->mobile_search_list_count:20}" style="width:30px" />
<p class="x_help-inline">{$lang->about_search_list_count}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="mobile_page_count">{$lang->page_count}</label>
<div class="x_controls">
<input type="text" name="mobile_page_count" id="mobile_page_count" value="{$module_info->mobile_page_count?$module_info->mobile_page_count:5}" style="width:30px" />
<p class="x_help-inline">{$lang->about_mobile_page_count}</p>
</div>
</div>
</section>
<section class="section collapsed">
<h1>{$lang->subtitle_advanced}</h1>
@ -136,27 +178,6 @@
</select>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="list_count">{$lang->list_count}</label>
<div class="x_controls">
<input type="text" name="list_count" id="list_count" value="{$module_info->list_count?$module_info->list_count:20}" style="width:30px" />
<p class="x_help-inline">{$lang->about_list_count}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="search_list_count">{$lang->search_list_count}</label>
<div class="x_controls">
<input type="text" name="search_list_count" id="search_list_count" value="{$module_info->search_list_count?$module_info->search_list_count:20}" style="width:30px" />
<p class="x_help-inline">{$lang->about_search_list_count}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="page_count">{$lang->page_count}</label>
<div class="x_controls">
<input type="text" name="page_count" id="page_count" value="{$module_info->page_count?$module_info->page_count:10}" style="width:30px" />
<p class="x_help-inline">{$lang->about_page_count}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->except_notice}</label>
<div class="x_controls">