fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-01 16:22:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/loadfile-improvements

Browse source
This commit is contained in:
Kijin Sung 2016-05-05 15:42:08 +09:00
commit d5caa823a2
8 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/admin/admin.admin.controller.php
View file

@ -550,7 +550,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::save();
$this->setMessage('success_updated');
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral'));
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigGeneral'));
}
/**
@ -617,7 +617,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::save();
$this->setMessage('success_updated');
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'act', 'dispAdminConfigSecurity'));
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigSecurity'));
}
/**
@ -706,7 +706,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::save();
$this->setMessage('success_updated');
$this->setRedirectUrl(Context::get('success_return_url') ?: $default_url . 'index.php?act=dispAdminConfigAdvanced');
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigAdvanced'));
}
/**
@ -764,7 +764,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::save();
$this->setMessage('success_updated');
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'act', 'dispAdminConfigDebug'));
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigDebug'));
}
/**
@ -803,7 +803,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::save();
$this->setMessage('success_updated');
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'act', 'dispAdminConfigSitelock'));
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigSitelock'));
}
/**
@ -875,7 +875,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::save();
$this->setMessage('success_updated');
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'act', 'dispAdminConfigFtp'));
$this->setRedirectUrl(Context::get('success_return_url') ?: getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp'));
}
/**

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

@ -417,7 +417,7 @@ class adminAdminView extends admin
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('module');
Context::set('site_title', escape($config->siteTitle));
Context::set('html_footer', escape($config->htmlFooter));
Context::set('all_html_footer', escape($config->htmlFooter));
// Index module
$columnList = array('modules.mid', 'modules.browser_title', 'sites.index_module_srl');

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

@ -25,7 +25,7 @@
<div class="x_control-group">
<label class="x_control-label" for="html_footer">{$lang->input_footer_script}</label>
<div class="x_controls" style="margin-right:14px">
<textarea name="html_footer" id="html_footer" rows="6" style="width:100%" placeholder="{$lang->detail_input_footer_script}" title="{$lang->detail_input_footer_script}">{$html_footer}</textarea>
<textarea name="html_footer" id="html_footer" rows="6" style="width:100%" placeholder="{$lang->detail_input_footer_script}" title="{$lang->detail_input_footer_script}">{$all_html_footer}</textarea>
</div>
</div>
<div class="x_control-group">

16
modules/editor/skins/ckeditor/editor.html
View file

@ -46,9 +46,23 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
$(function(){
<!--@if(!FileHandler::exists('common/js/plugins/ckeditor/ckeditor/config.js'))-->CKEDITOR.config.customConfig = '';<!--@endif-->
// Import CSS content from PHP.
var css_content = {json_encode($css_content)};
// Get default font name and list of other supported fonts.
var default_font_name = {json_encode($content_font ? trim(array_first(explode(',', $content_font)), '\'" ') : null)};
var default_font_fullname = {json_encode($content_font ?: null)};
if (default_font_fullname === null && window.getComputedStyle) {
var test_content = $('<div class="xe_content"></div>').hide().appendTo($(document.body));
var test_styles = window.getComputedStyle(test_content[0], null);
if (test_styles && test_styles.getPropertyValue) {
default_font_fullname = test_styles.getPropertyValue("font-family");
if (default_font_fullname) {
default_font_name = $.trim(default_font_fullname.split(',')[0].replace(/['"]/g, ''));
css_content = ".xe_content.editable { font-family:" + default_font_fullname + "; } " + css_content;
}
}
}
var font_list = [];
<block loop="$lang->edit->fontlist => $fontname">font_list.push({json_encode($fontname)});</block>
if (default_font_fullname !== null && !$.inArray(default_font_fullname, font_list)) {
@ -115,7 +129,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
settings.ckeconfig.removeButtons = 'Save,Preview,Print,Cut,Copy,Paste,Source';
<!--@endif-->
<!--@if($css_content)-->CKEDITOR.addCss('{$css_content}');<!--@end-->
CKEDITOR.addCss(css_content);
var ckeApp = $('#ckeditor_instance_{$editor_sequence}').XeCkEditor(settings);

6
modules/ncenterlite/ncenterlite.admin.controller.php
View file

@ -41,11 +41,15 @@ class ncenterliteAdminController extends ncenterlite
{
$config->use = array();
}
}
if ($obj->disp_act == 'dispNcenterliteAdminAdvancedconfig')
{
if (!$config->mention_suffixes)
{
$config->mention_suffixes = array();
}
if (!is_array($config->mention_suffixes))
else if (!is_array($config->mention_suffixes))
{
$config->mention_suffixes = array_map('trim', explode(',', $config->mention_suffixes));
}

2
modules/trash/trash.admin.view.php
View file

@ -78,7 +78,6 @@ class trashAdminView extends trash
}
// Trash View - sejin7940
function dispTrashAdminView()
{
@ -103,6 +102,7 @@ class trashAdminView extends trash
Context::set('module_info', $module_info);
if($originObject) {
$args_extra = new stdClass;
$args_extra->module_srl = $originObject->module_srl;
$args_extra->document_srl = $originObject->document_srl;
$output_extra = executeQueryArray('trash.getDocumentExtraVars', $args_extra);