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

Context 변수 html_footer 충돌 문제 수정

Browse source 
관리자 페이지에서는 photoswipe 꺼두기
시스템 설정의 redirect_url 조정
This commit is contained in:
conory 2016-05-04 20:18:46 +09:00
parent f0fc9dce29
commit cfa151b8c2
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
addons/photoswipe/photoswipe.addon.php
View file

@ -11,7 +11,7 @@ if(!defined('RX_VERSION'))
* @author MinSoo Kim <misol.kr@gmail.com> * @author MinSoo Kim <misol.kr@gmail.com>
* @brief Add-on to highlight an activated image. * @brief Add-on to highlight an activated image.
*/ */
if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML" && !isCrawler()) if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML" && Context::get('module') != 'admin' && !isCrawler())
{ {
Context::loadFile(array('./addons/photoswipe/PhotoSwipe/photoswipe.css', '', '', null), true); Context::loadFile(array('./addons/photoswipe/PhotoSwipe/photoswipe.css', '', '', null), true);
Context::loadFile(array('./addons/photoswipe/PhotoSwipe/default-skin/default-skin.css', '', '', null), true); Context::loadFile(array('./addons/photoswipe/PhotoSwipe/default-skin/default-skin.css', '', '', null), true);

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

@ -550,7 +550,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::save(); Rhymix\Framework\Config::save();
$this->setMessage('success_updated'); $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(); Rhymix\Framework\Config::save();
$this->setMessage('success_updated'); $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'));
} }
/** /**
@ -705,7 +705,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::save(); Rhymix\Framework\Config::save();
$this->setMessage('success_updated'); $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'));
} }
/** /**
@ -763,7 +763,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::save(); Rhymix\Framework\Config::save();
$this->setMessage('success_updated'); $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'));
} }
/** /**
@ -802,7 +802,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::save(); Rhymix\Framework\Config::save();
$this->setMessage('success_updated'); $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'));
} }
/** /**
@ -874,7 +874,7 @@ class adminAdminController extends admin
Rhymix\Framework\Config::save(); Rhymix\Framework\Config::save();
$this->setMessage('success_updated'); $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'); $oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('module'); $config = $oModuleModel->getModuleConfig('module');
Context::set('site_title', escape($config->siteTitle)); Context::set('site_title', escape($config->siteTitle));
Context::set('html_footer', escape($config->htmlFooter)); Context::set('all_html_footer', escape($config->htmlFooter));
// Index module // Index module
$columnList = array('modules.mid', 'modules.browser_title', 'sites.index_module_srl'); $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"> <div class="x_control-group">
<label class="x_control-label" for="html_footer">{$lang->input_footer_script}</label> <label class="x_control-label" for="html_footer">{$lang->input_footer_script}</label>
<div class="x_controls" style="margin-right:14px"> <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> </div>
<div class="x_control-group"> <div class="x_control-group">