Add option to view module config screen in admin layout

모듈 설정 화면을 관리자 레이아웃으로 보는 기능을 옵션으로 만들어 복원함
최근 수정된 관리자 레이아웃 디자인을 여기에도 적용

classes/module/ModuleObject.class.php

@@ -143,12 +143,16 @@ class ModuleObject extends BaseObject
 		// Set admin layout
 		if(preg_match('/^disp[A-Z][a-z0-9\_]+Admin/', $this->act))
 		{
-			/*
-			$this->setLayoutPath('modules/admin/tpl');
-			$this->setLayoutFile('layout');
-			*/
-			$oTemplate = TemplateHandler::getInstance();
-			$oTemplate->compile('modules/admin/tpl', '_admin_common.html');
+			if(config('view.manager_layout') === 'admin')
+			{
+				$this->setLayoutPath('modules/admin/tpl');
+				$this->setLayoutFile('layout');
+			}
+			else
+			{
+				$oTemplate = TemplateHandler::getInstance();
+				$oTemplate->compile('modules/admin/tpl', '_admin_common.html');
+			}
 		}
 		
 		// Execute init

common/defaults/config.php

@@ -69,6 +69,7 @@ return array(
 		'type' => 'mailfunction',
 	),
 	'view' => array(
+		'manager_layout' => 'module',
 		'minify_scripts' => 'common',
 		'concat_scripts' => 'none',
 		'server_push' => false,

modules/admin/admin.admin.controller.php

@@ -827,6 +827,7 @@ class adminAdminController extends admin
 		Rhymix\Framework\Config::set('use_rewrite', $vars->use_rewrite === 'Y');
 		Rhymix\Framework\Config::set('session.delay', $vars->delay_session === 'Y');
 		Rhymix\Framework\Config::set('session.use_db', $vars->use_db_session === 'Y');
+		Rhymix\Framework\Config::set('view.manager_layout', $vars->manager_layout ?: 'module');
 		Rhymix\Framework\Config::set('view.minify_scripts', $vars->minify_scripts ?: 'common');
 		Rhymix\Framework\Config::set('view.concat_scripts', $vars->concat_scripts ?: 'none');
 		Rhymix\Framework\Config::set('view.server_push', $vars->use_server_push === 'Y');

modules/admin/admin.admin.view.php

@@ -544,6 +544,7 @@ class adminAdminView extends admin
 		Context::set('use_ssl', Rhymix\Framework\Config::get('url.ssl'));
 		Context::set('delay_session', Rhymix\Framework\Config::get('session.delay'));
 		Context::set('use_db_session', Rhymix\Framework\Config::get('session.use_db'));
+		Context::set('manager_layout', Rhymix\Framework\Config::get('view.manager_layout'));
 		Context::set('minify_scripts', Rhymix\Framework\Config::get('view.minify_scripts'));
 		Context::set('concat_scripts', Rhymix\Framework\Config::get('view.concat_scripts'));
 		Context::set('use_server_push', Rhymix\Framework\Config::get('view.server_push'));

modules/admin/lang/en.php

@@ -144,6 +144,11 @@ $lang->msg_invalid_timezone = 'The selected time zone is not usable on this serv
 $lang->use_db_session = 'Store Session in DB';
 $lang->about_db_session = 'Store PHP sessions in the database. This setting must be turned on if you want to see current users or get detailed statistics.<br>Unnecessary use may decrease server performance.';
 $lang->qmail_compatibility = 'Enable Qmail';
+$lang->manager_layout = 'Module Setting Screen';
+$lang->cmd_manager_layout_module = 'Use module layout';
+$lang->cmd_manager_layout_admin = 'Use admin layout';
+$lang->view_in_manager_layout = 'View in admin screen';
+$lang->about_manager_layout = 'Force module setting screen to use the admin layout instead of the module\'s own layout.';
 $lang->minify_scripts = 'Minify scripts';
 $lang->cmd_minify_all = 'All files';
 $lang->cmd_minify_common = 'Common files only';

modules/admin/lang/ko.php

@@ -145,6 +145,11 @@ $lang->msg_invalid_timezone = '사용할 수 없는 표준 시간대입니다.';
 $lang->use_db_session = '인증 세션 DB 사용';
 $lang->about_db_session = '세션을 DB에 저장합니다. 현재 접속자를 파악하려면 이 기능을 켜야 합니다.<br>불필요하게 사용하면 서버 성능에 악영향을 줄 수 있으니 주의하십시오.';
 $lang->qmail_compatibility = '큐메일(Qmail) 사용';
+$lang->manager_layout = '모듈 설정 화면';
+$lang->cmd_manager_layout_module = '해당 모듈 레이아웃 사용';
+$lang->cmd_manager_layout_admin = '관리자 레이아웃 사용';
+$lang->view_in_manager_layout = '관리자 화면에서 보기';
+$lang->about_manager_layout = '배경이 어두운 레이아웃 등에서 모듈 설정 화면을 이용하기 어려울 경우 관리자 레이아웃을 강제 적용할 수 있습니다.';
 $lang->minify_scripts = '스크립트 자동 압축';
 $lang->cmd_minify_all = '모든 파일을 압축';
 $lang->cmd_minify_common = '공통 파일만 압축';

modules/admin/tpl/_header.html

@@ -14,8 +14,12 @@
 <p class="skipNav"><a href="#content">{$lang->skip_to_content}</a></p>
 	<header class="header">
 		<!--@if($module_manager)-->
-		<h1>module manager</h1>
-		<a href="{getUrl('module', 'admin', 'act', $act, 'module_srl', $module_info->module_srl, 'mid', '')}" cond="$this->user->isAdmin()">Admin Panel</a>
+		<h1>
+			<a class="default_header" href="javascript:void()"><i class="xi xi-cog"></i></a>
+		</h1>
+		<p class="site" cond="$this->user->isAdmin()">
+			<a href="{getUrl('module', 'admin', 'act', $act, 'module_srl', $module_info->module_srl, 'mid', '')}">{lang('admin.view_in_manager_layout')}</a>
+		</p>
 		<!--@else-->
 		<h1>
 			<a class="custom_header" href="{getUrl('','module','admin')}" cond="$gnb_title_info->adminLogo"><img src="{getUrl('')}{$gnb_title_info->adminLogo}" alt="{$gnb_title_info->adminTitle}" /> {$gnb_title_info->adminTitle}</a>

modules/admin/tpl/config_advanced.html

@@ -163,6 +163,15 @@
 				<p class="x_help-block">{$lang->about_cache_truncate_method}</p>
 			</div>
 		</div>
+		<div class="x_control-group">
+			<label class="x_control-label">{$lang->manager_layout}</label>
+			<div class="x_controls">
+				<label for="manager_layout_module" class="x_inline"><input type="radio" name="manager_layout" id="manager_layout_module" value="module" checked="checked"|cond="$manager_layout != 'admin'" /> {$lang->cmd_manager_layout_module}</label>
+				<label for="manager_layout_admin" class="x_inline"><input type="radio" name="manager_layout" id="manager_layout_admin" value="admin" checked="checked"|cond="$manager_layout == 'admin'" /> {$lang->cmd_manager_layout_admin}</label>
+				<br />
+				<p class="x_help-block">{$lang->about_manager_layout}</p>
+			</div>
+		</div>
 		<div class="x_control-group">
 			<label class="x_control-label">{$lang->minify_scripts}</label>
 			<div class="x_controls">