Merge pull request #268 from kijin/pr/debugger

편리한 디버그 기능 추가
This commit is contained in:
Kijin Sung 2016-02-16 14:33:44 +09:00
commit e1341584d3
42 changed files with 1693 additions and 730 deletions

View file

@ -17,7 +17,7 @@ class messageView extends message
/**
* @brief Display messages
*/
function dispMessage()
function dispMessage($detail = null)
{
// Get configurations (using module model object)
$oModuleModel = getModel('module');
@ -58,9 +58,10 @@ class messageView extends message
{
if(strncasecmp('https://', Context::getRequestUri(), 8) === 0) $ssl_mode = true;
}
Context::set('ssl_mode',$ssl_mode);
Context::set('ssl_mode', $ssl_mode);
Context::set('system_message', nl2br($this->getMessage()));
Context::set('system_message_detail', nl2br($detail));
$this->setTemplateFile('system_message');
}

View file

@ -8,7 +8,7 @@
<div id="access">
<div class="login-header">
<h1><i class="icon-user"></i> {$system_message}</h1>
<div class="message" cond="defined('_XE_SITELOCK_MESSAGE_')">{constant('_XE_SITELOCK_MESSAGE_')}</div>
<div class="message" cond="$system_message_detail">{$system_message_detail}</div>
</div>
<div class="login-body">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/message/skins/default/system_message/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">

View file

@ -5,7 +5,7 @@
<div id="access">
<div class="login-header">
<h1>{$system_message}</h1>
<div class="message" cond="defined('_XE_SITELOCK_MESSAGE_')">{constant('_XE_SITELOCK_MESSAGE_')}</div>
<div class="message" cond="$system_message_detail">{$system_message_detail}</div>
</div>
<div cond="!$is_logged">
<div class="login-body">
@ -21,13 +21,13 @@
<input type="text" name="user_id" id="uid" title="{$lang->user_id}" placeholder="{$lang->user_id}" required autofocus cond="$member_config->identifier != 'email_address'" />
<input type="email" name="user_id" id="uid" title="{$lang->email_address}" placeholder="{$lang->email_address}" required autofocus cond="$member_config->identifier == 'email_address'" />
<input type="password" name="password" id="upw" title="{$lang->password}" placeholder="{$lang->password}" required />
<label for="keepid" cond="!defined('_XE_SITELOCK_MESSAGE_')">
<label for="keepid" cond="!$system_message_detail">
<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()&gt;0?'addClass':'removeClass')]('open');" />
{$lang->keep_signed}
</label>
</div>
<p><button type="submit" class="button" href="#" onclick="$('#message_login_form').submit()">
<!--@if(defined('_XE_SITELOCK_MESSAGE_'))-->
<!--@if($system_message_detail)-->
{$lang->msg_administrator_login}
<!--@else-->
{$lang->cmd_login}
@ -35,7 +35,7 @@
</button></p>
</form>
</div>
<div class="login-footer" cond="!defined('_XE_SITELOCK_MESSAGE_')">
<div class="login-footer" cond="!$system_message_detail">
<a href="{getUrl('', 'act', 'dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a>
<span class="bar">|</span>
<a href="{getUrl('', 'act', 'dispMemberSignUpForm')}">{$lang->cmd_signup}</a>