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 remote-tracking branch develop

Browse source
This commit is contained in:
Kijin Sung 2022-06-28 00:28:28 +09:00
commit a7ca384a05
9 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/admin/admin.admin.view.php
View file

@ -435,13 +435,13 @@ class adminAdminView extends admin
// Load member config.
$member_config = getModel('module')->getModuleConfig('member');
Context::set('member_config', $member_config);
Context::set('webmaster_name', $member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster');
Context::set('webmaster_email', $member_config->webmaster_email);
Context::set('webmaster_name', !empty($member_config->webmaster_name) ? $member_config->webmaster_name : 'webmaster');
Context::set('webmaster_email', $member_config->webmaster_email ?? '');
// Load module config.
$module_config = getModel('module')->getModuleConfig('module');
Context::set('module_config', $module_config);
// Load mail drivers.
$mail_drivers = Rhymix\Framework\Mail::getSupportedDrivers();
uasort($mail_drivers, function($a, $b) {
@ -647,8 +647,8 @@ class adminAdminView extends admin
// Meta keywords and description
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('module');
Context::set('site_meta_keywords', escape($config->meta_keywords));
Context::set('site_meta_description', escape($config->meta_description));
Context::set('site_meta_keywords', escape($config->meta_keywords ?? ''));
Context::set('site_meta_description', escape($config->meta_description ?? ''));
// Titles
Context::set('seo_main_title', escape(Rhymix\Framework\Config::get('seo.main_title') ?: '$SITE_TITLE - $SITE_SUBTITLE'));

6
modules/admin/tpl/config_advanced.html
View file

@ -2,7 +2,7 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_advanced/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="!empty($XE_VALIDATOR_MESSAGE) && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_advanced/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -157,8 +157,8 @@
<label for="object_cache_port" class="x_inline">{$lang->cache_port}: <input type="number" name="object_cache_port" id="object_cache_port" size="5" style="min-width:70px" value="{$object_cache_port}" /></label>
</div>
<div id="object_cache_redis_config" style="display:none">
<label for="object_cache_user" class="x_inline">{$lang->cache_user}: <input type="text" name="object_cache_user" id="object_cache_user" value="{$object_cache_user}" /></label>
<label for="object_cache_pass" class="x_inline">{$lang->cache_pass}: <input type="password" name="object_cache_pass" id="object_cache_pass" value="{$object_cache_pass}" autocomplete="new-password" /></label>
<label for="object_cache_user" class="x_inline">{$lang->cache_user}: <input type="text" name="object_cache_user" id="object_cache_user" value="{$object_cache_user ?? ''}" /></label>
<label for="object_cache_pass" class="x_inline">{$lang->cache_pass}: <input type="password" name="object_cache_pass" id="object_cache_pass" value="{$object_cache_pass ?? ''}" autocomplete="new-password" /></label>
<label for="object_cache_dbnum" class="x_inline">{$lang->cache_dbnum}: <input type="number" name="object_cache_dbnum" id="object_cache_dbnum" size="3" style="min-width:70px" value="{$object_cache_dbnum}" /></label>
</div>
</div>

2
modules/admin/tpl/config_debug.html
View file

@ -2,7 +2,7 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_debug/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="!empty($XE_VALIDATOR_MESSAGE) && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_debug/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">

2
modules/admin/tpl/config_domains.html
View file

@ -2,7 +2,7 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_domains/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="!empty($XE_VALIDATOR_MESSAGE) && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_domains/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">

8
modules/admin/tpl/config_notification.html
View file

@ -3,7 +3,7 @@
<include target="config_header.html" />
<load target="js/notification_config.js" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_notification/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="!empty($XE_VALIDATOR_MESSAGE) && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_notification/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
@ -24,7 +24,7 @@
<div class="x_control-group">
<label class="x_control-label" for="mail_default_name">{$lang->cmd_admin_default_from_name}</label>
<div class="x_controls">
<input type="text" name="mail_default_name" id="mail_default_name" value="{escape($member_config->webmaster_name) ?: $module_config->siteTitle}" />
<input type="text" name="mail_default_name" id="mail_default_name" value="{escape($webmaster_name)}" />
<br />
<p class="x_help-block" style="margin-top:10px">{$lang->cmd_admin_default_from_name_help}</p>
</div>
@ -33,7 +33,7 @@
<div class="x_control-group">
<label class="x_control-label" for="mail_default_from">{$lang->cmd_admin_default_from_email}</label>
<div class="x_controls">
<input type="text" name="mail_default_from" id="mail_default_from" value="{escape($member_config->webmaster_email)}" />
<input type="text" name="mail_default_from" id="mail_default_from" value="{escape($webmaster_email)}" />
&nbsp;
<label for="mail_force_default_sender" class="x_inline">
<input type="checkbox" name="mail_force_default_sender" id="mail_force_default_sender" value="Y" checked="checked"|cond="toBool($advanced_mailer_config->force_sender)" />
@ -47,7 +47,7 @@
<div class="x_control-group">
<label class="x_control-label" for="mail_default_reply_to">{$lang->cmd_admin_default_reply_to}</label>
<div class="x_controls">
<input type="text" name="mail_default_reply_to" id="mail_default_reply_to" value="{escape($advanced_mailer_config->reply_to ?: config('mail.default_reply_to'))}" />
<input type="text" name="mail_default_reply_to" id="mail_default_reply_to" value="{escape($advanced_mailer_config->reply_to ?? config('mail.default_reply_to'))}" />
<br />
<p class="x_help-block" style="margin-top:10px">{$lang->cmd_admin_default_reply_to_help}</p>
</div>

2
modules/admin/tpl/config_security.html
View file

@ -2,7 +2,7 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_security/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="!empty($XE_VALIDATOR_MESSAGE) && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_security/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">

2
modules/admin/tpl/config_seo.html
View file

@ -2,7 +2,7 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_seo/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="!empty($XE_VALIDATOR_MESSAGE) && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_seo/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">

2
modules/admin/tpl/config_sitelock.html
View file

@ -2,7 +2,7 @@
<include target="config_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_sitelock/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="!empty($XE_VALIDATOR_MESSAGE) && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_sitelock/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">

17
modules/module/tpl/multilingual_v17.html
View file

@ -3,19 +3,20 @@
$a = array($lang_type=>$lang_supported[$lang_type]);
unset($lang_supported[$lang_type]);
$lang_supported = array_merge($a, $lang_supported);
$is_empty_use_in_page = empty($use_in_page)
}
<div class="x_modal"|cond="!$use_in_page" id="g11n" hidden|cond="!$use_in_page">
<div class="x_modal-header" cond="!$use_in_page">
<div class="x_modal"|cond="$is_empty_use_in_page" id="g11n" hidden|cond="$is_empty_use_in_page">
<div class="x_modal-header" cond="$is_empty_use_in_page">
<h1>{$lang->cmd_multilingual}</h1>
</div>
<div class="x_modal-body"|cond="!$use_in_page">
<div class="x_modal-body"|cond="$is_empty_use_in_page">
<div class="x_tabbable">
<ul class="x_nav x_nav-tabs">
<li class="x_active"|cond="!$use_in_page"><a href="#lang_create">{$lang->cmd_insert}</a></li>
<li class="x_active"|cond="$use_in_page"><a href="#lang_search">{$lang->cmd_search}</a></li>
<li class="x_active"|cond="$is_empty_use_in_page"><a href="#lang_create">{$lang->cmd_insert}</a></li>
<li class="x_active"|cond="!$is_empty_use_in_page"><a href="#lang_search">{$lang->cmd_search}</a></li>
</ul>
<div class="x_tab-content">
<form action="" class="x_tab-pane <!--@if(!$use_in_page)-->x_active<!--@end--> item" id="lang_create">
<form action="" class="x_tab-pane <!--@if($is_empty_use_in_page)-->x_active<!--@end--> item" id="lang_create">
<fieldset class="editMode">
<textarea loop="$lang_supported => $code, $name" class="{$code}" rows="1" cols="12" title="{$name}" style="margin-right:5px"></textarea>
<div class="x_clearfix btnArea">
@ -24,12 +25,12 @@
</div>
</fieldset>
</form>
<div class="x_tab-pane <!--@if($use_in_page)-->x_active<!--@end-->" id="lang_search">
<div class="x_tab-pane <!--@if(!$is_empty_use_in_page)-->x_active<!--@end-->" id="lang_search">
</div>
</div>
</div>
</div>
<div cond="!$use_in_page" class="x_modal-footer">
<div cond="$is_empty_use_in_page" class="x_modal-footer">
<button type="button" class="x_btn x_pull-left" data-hide="#g11n">{$lang->cmd_close}</button>
<p class="x_pull-right">
{@