Close Connection when there is no connection value.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13161 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
misol 2013-09-25 15:29:32 +00:00
parent 034a5c0288
commit f70ce644ce
1410 changed files with 7188 additions and 53541 deletions

View file

@ -1,8 +1,8 @@
<load target="js/editor_module_config.js" usecdn="true" />
<div class="x_page-header">
<h1>{$lang->editor} <a class="x_icon-question-sign" href="./help/index.html#UMAN_advanced_editor" target="_blank">{$lang->help}</a></h1>
<h1>{$lang->editor} <a class="x_icon-question-sign" href="./admin/help/index.html#UMAN_advanced_editor" target="_blank">{$lang->help}</a></h1>
</div>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/editor/tpl/admin_index/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<!-- Editor Preview -->
@ -30,6 +30,7 @@
<form action="./" method="post" ruleset="generalConfig" class="x_form-horizontal">
<input type="hidden" name="module" value="editor" />
<input type="hidden" name="act" value="procEditorAdminGeneralConfig" />
<input type="hidden" name="xe_validator_id" value="modules/editor/tpl/admin_index/1" />
<div class="x_control-group">
<label for="change_lang_type" class="x_control-label">{$lang->guide_choose_main_editor}</label>
@ -50,7 +51,7 @@
<div class="x_control-group">
<label for="editor_height" class="x_control-label">{$lang->guide_set_height_main_editor}</label>
<div class="x_controls">
<input type="number" name="editor_height" id="editor_height" value="<!--@if($editor_config->editor_height)-->{$editor_config->editor_height}<!--@else-->{$editor_config_default['editor_height']}<!--@end-->" style="width:50px" /> px
<input type="number" name="editor_height" id="editor_height" value="{$editor_config->editor_height}"|cond="$editor_config->editor_height" value="{$editor_config_default['editor_height']}"|cond="!$editor_config->editor_height" /> px
</div>
</div>
<div class="x_control-group">
@ -73,7 +74,7 @@
<div class="x_control-group">
<label for="comment_editor_height" class="x_control-label">{$lang->guide_set_height_comment_editor}</label>
<div class="x_controls">
<input type="number" name="comment_editor_height"id="comment_editor_height" value="<!--@if($editor_config->comment_editor_height)-->{$editor_config->comment_editor_height}<!--@else-->{$editor_config_default['comment_editor_height']}<!--@end-->" style="width:50px" /> px
<input type="number" name="comment_editor_height"id="comment_editor_height" value="{$editor_config->comment_editor_height}"|cond="$editor_config->comment_editor_height" value="{$editor_config_default['comment_editor_height']}"|cond="!$editor_config->comment_editor_height" /> px
</div>
</div>
<div class="x_control-group">
@ -112,7 +113,7 @@
<div class="x_control-group">
<label class="x_control-label" for="fontSize">{$lang->guide_choose_font_size_body}</label>
<div class="x_controls">
<input type="number" id="fontSize" name="content_font_size" value="{$fontSize}" style="width:50px" /> px
<input type="number" id="fontSize" name="content_font_size" value="{$fontSize}" /> px
</div>
</div>
<div class="x_clearfix btnArea">
@ -128,6 +129,7 @@
<form action="./" method="post" ruleset="componentOrderAndUse">
<input type="hidden" name="module" value="editor" />
<input type="hidden" name="act" value="procEditorAdminCheckUseListOrder" />
<input type="hidden" name="xe_validator_id" value="modules/editor/tpl/admin_index/1" />
<table class="x_table x_table-striped x_table-hover sortable">
<caption><strong>{$lang->total_count}({$component_count})</strong></caption>
<thead>

View file

@ -52,10 +52,10 @@
<tr>
<th scope="row" style="text-align:right">{$lang->editor_height}</th>
<td>
<input type="number" min="0" name="editor_height" value="{$editor_config->editor_height}" style="width:50px" /> px
<input type="number" min="0" name="editor_height" value="{$editor_config->editor_height}" /> px
</td>
<td>
<input type="number" min="0" name="comment_editor_height" value="{$editor_config->comment_editor_height}" style="width:50px" /> px
<input type="number" min="0" name="comment_editor_height" value="{$editor_config->comment_editor_height}" /> px
</td>
</tr>
<tr>
@ -72,7 +72,7 @@
<tr>
<th scope="row" style="text-align:right">{$lang->enable_autosave}</th>
<td colspan="2">
<label for="enable_autosave">
<label for="enable_autosave" class="x_inline">
<input type="checkbox" value="Y" id="enable_autosave" name="enable_autosave" checked="checked"|cond="$editor_config->enable_autosave=='Y'" />
{$lang->about_enable_autosave}
</label>

View file

@ -21,7 +21,7 @@ var defaultHandlers;
function init(cfg, exe) {
var seq = cfg.editorSequence;
if(!is_def(seq)) return;
cfg = $.extend({
@ -437,7 +437,10 @@ function insertUploadedFile(editorSequence) {
// html 모드
if(editorMode[editorSequence]=='html'){
if(text.length>0) get_by_id('editor_textarea_'+editorSequence).value += text.join('');
if(text.length>0 && get_by_id('editor_textarea_'+editorSequence))
{
get_by_id('editor_textarea_'+editorSequence).value += text.join('');
}
// 위지윅 모드
}else{

View file

@ -4,7 +4,7 @@
<div class="x_page-header">
<h1>{$lang->editor}</h1>
</div>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/editor/tpl/setup_component/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<section class="section">
@ -13,6 +13,7 @@
<input type="hidden" name="module" value="editor" />
<input type="hidden" name="act" value="procEditorAdminSetupComponent" />
<input type="hidden" name="component_name" value="{$component_name}" />
<input type="hidden" name="xe_validator_id" value="modules/editor/tpl/setup_component/1" />
<div class="x_control-group">
<label class="x_control-label">{$lang->component_name}</label>
<div class="x_controls">{$component->title}({$component->component_name}) ver. {$component->version}</div>
@ -42,7 +43,8 @@
<label class="x_control-label">{$lang->grant}</label>
<div class="x_controls">
<label class="x_inline" loop="$group_list=>$key,$val">
<input type="checkbox" name="target_group" value="{$key}" <!--@if(in_array($key, $component->target_group))-->checked="checked"<!--@end--> id="group_{$key}"> {$val->title}</label>
<input type="checkbox" name="target_group[]" value="{$key}" <!--@if(in_array($key, $component->target_group))-->checked="checked"<!--@end--> id="group_{$key}"> {$val->title}
</label>
</div>
</div>
<div class="x_control-group" cond="$mid_list">