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,15 +1,23 @@
<script>
var newTitle = '{$lang->new_title}';
var layoutTitle = '{$layout->layout_title}';
var addLang = '{$lang->cmd_insert}';
</script>
<load target="js/layout_admin.js" usecdn="true" />
<form action="./" method="post" id="__layout_copy">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/layout/tpl/copy_layout/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="./" method="post">
<div class="x_modal-header">
<h1>{$lang->cmd_layout_copy}</h1>
</div>
<div class="x_modal-body x_form-horizontal">
<div class="x_modal-body x_form-horizontal" id="inputDiv">
<input type="hidden" name="layout" value="{$layout->layout}" />
<input type="hidden" name="act" value="procLayoutAdminCopyLayout" />
<input type="hidden" name="layout_srl" value="{$layout->layout_srl}" />
<input type="hidden" name="xe_validator_id" value="modules/layout/tpl/copy_layout/1" />
<div class="x_control-group">
<div class="x_control-label">{$lang->layout_name}</div>
<div class="x_controls">{$layout->title}</div>
@ -29,7 +37,7 @@ var addLang = '{$lang->cmd_insert}';
</div>
</div>
<div class="x_modal-footer">
<button type="button" class="x_btn x_pull-left" data-hide="#__layout_copy">{$lang->cmd_close}</button>
<button type="button" class="x_btn x_pull-left" onclick="window.close();">{$lang->cmd_close}</button>
<input type="submit" value="{$lang->cmd_save}" class="x_btn x_btn-primary x_pull-right" />
</div>
</form>

View file

@ -4,7 +4,7 @@
<div class="x_page-header">
<h1>
{$lang->installed_layout} <a class="x_icon-question-sign" href="./help/index.html#UMAN_advanced_installed_layout" target="_blank">{$lang->help}</a>
{$lang->installed_layout} <a class="x_icon-question-sign" href="./admin/help/index.html#UMAN_advanced_installed_layout" target="_blank">{$lang->help}</a>
<span cond="$layout_info" class="path" title="{$layout_info->layout}">&gt; {$layout_info->title} v{$layout_info->version}</span>
<span cond="$selected_layout" class="path" title="{$selected_layout->layout}">&gt; {$selected_layout->title} v{$selected_layout->version}</span>
<span cond="$selected_layout" class="path">&gt; {$selected_layout->layout_title}</span>
@ -52,6 +52,16 @@
</div>
</section>
<div cond="$XE_VALIDATOR_MESSAGE" class="x_alert x_alert-{$XE_VALIDATOR_MESSAGE_TYPE}">
{@
$validator_ids = array(
'modules/layout/tpl/layout_all_instance_list/1' => 1,
'modules/autoinstall/tpl/uninstall/1' => 1,
'modules/layouts/tpl/layout_edit/1' => 1,
'modules/layout/tpl/lyaout_info_view/1' => 1,
'modules/layout/tpl/layout_instance_list/1' => 1,
'modules/layout/tpl/layout_instance_list/2' => 1
);
}
<div cond="$XE_VALIDATOR_MESSAGE && isset($validator_ids[$XE_VALIDATOR_ID])" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>

View file

@ -1,23 +0,0 @@
<block cond="$use_multilang">
<div id="langEdit" class="langEdit tgContent">
<ul class="langList"></ul>
<div class="langInput form">
<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
<ul>
{@
/* move current language to the top */
$a = array($lang_type=>$lang_supported[$lang_type]);
unset($lang_supported[$lang_type]);
$lang_supported = array_merge($a, $lang_supported);
}
<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <input type="text" value="" id="{$code}_var1" /></li>
</ul>
<div class="action">
<div class="btnArea">
<input class="btn" type="submit" value="{$lang->use}|{$lang->use_after_save}" />
</div>
<p><a href="{getUrl('act','dispModuleAdminLangcode')}">{$lang->multilingual_manager}</a></p>
</div>
</div>
</div>
</block>

View file

@ -1,27 +0,0 @@
<block cond="$use_multilang_textarea">
<style>
#langEditTextarea textarea { width: 258px; }
</style>
<div id="langEditTextarea" class="langEdit tgContent">
<ul class="langList"></ul>
<div class="langInput form">
<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
<ul>
{@
/* move current language to the top */
$a = array($lang_type=>$lang_supported[$lang_type]);
unset($lang_supported[$lang_type]);
$lang_supported = array_merge($a, $lang_supported);
}
<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <textarea id="{$code}_var1" rows="8" cols="42"></textarea></li>
</ul>
<div class="action">
<div class="btnArea">
<input class="btn" type="submit" value="{$lang->use}|{$lang->use_after_save}" />
</div>
<p><a href="{getUrl('act','dispModuleAdminLangcode')}">{$lang->multilingual_manager}</a></p>
</div>
</div>
</div>
</block>

View file

@ -1,5 +1,6 @@
<include target="header.html" />
<include target="sub_tab.html" />
<table class="x_table x_table-striped x_table-hover dsTg">
<caption>
<div class="x_pull-right x_btn-group">

View file

@ -51,16 +51,21 @@ function deleteFile(layout_srl,filename){
function addLayoutCopyInputbox()
{
var html = '<tr>';
html += '<td><input type="text" name="title[]" size="50" /></td>';
html += '<td><input class="btn" type="button" value="'+addLang+'" onclick="addLayoutCopyInputbox()" /></td>';
html += '</tr>';
var html = '<div class="x_control-group">';
html += '<label class="x_control-label" for="">'+newTitle+'</label>';
html += '<div class="x_controls">';
html += '<span class="x_input-append">';
html += '<input type="text" name="title[]" required placeholder="'+layoutTitle+'" />';
html += '<input type="button" value="'+addLang+'" onclick="addLayoutCopyInputbox()" class="x_btn" />';
html += '</span>';
html += '</div>';
html += '</div>';
var it = jQuery('#inputTable');
var it = jQuery('#inputDiv');
it.append(html);
it.find('SPAN.btn').hide();
it.find('TR:last-child SPAN.btn').show();
it.find('input.x_btn').hide();
it.find('>div:last-child').find('input.x_btn').show();
}
(function($){

View file

@ -36,6 +36,7 @@
<input type="hidden" name="act" value="procLayoutAdminDelete" />
<input type="hidden" name="layout_srl" value="{$item->layout_srl}" />
<input class="x_btn x_btn-link" type="submit" value="{$lang->cmd_delete}" />
<input type="hidden" name="xe_validator_id" value="modules/layout/tpl/layout_all_instance_list/1" />
</form>
</td>
</tr>

View file

@ -1,7 +1,6 @@
<include target="header.html" />
<load target="js/adminEdit.js" usecdn="true" />
<p>{nl2br($lang->about_layout_code)}</p>
<section class="section">
<h1>{$lang->layout_image_repository}</h1>
<p>{nl2br($lang->about_layout_image_repository)}</p>
@ -30,12 +29,17 @@
</li>
</ul>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/layout/tpl/layout_edit/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="imageUpload" action="./" method="post" enctype="multipart/form-data">
<input type="hidden" name="module" value="layout" />
<input type="hidden" name="act" value="procLayoutAdminUserImageUpload" />
<input type="hidden" name="layout_srl" value="{$layout_srl}" />
<input type="hidden" name="xe_validator_id" value="modules/layout/tpl/layout_edit/1" />
<p>
<input type="file" class="overlap" name="user_layout_image" value="" title="{$lang->uploaded_file}" />
<input type="file" name="user_layout_image" value="" title="{$lang->uploaded_file}" />
<span class="x_help-inline">{$lang->msg_layout_image_target}</span>
</p>
<div class="x_clearfix btnArea">
@ -60,6 +64,7 @@
<input type="hidden" name="module" value="layout" />
<input type="hidden" name="layout_srl" value="{$layout_srl}" />
<input type="hidden" name="act" value="procLayoutAdminCodeUpdate" />
<input type="hidden" name="xe_validator_id" value="modules/layouts/tpl/layout_edit/1" />
<section class="section">
<h1>HTML</h1>

View file

@ -1,3 +1,4 @@
<section class="section">
<h1>{$lang->layout_image_repository}</h1>
<p>{nl2br($lang->about_layout_image_repository)}</p>
@ -30,12 +31,8 @@
<input type="hidden" name="module" value="layout" />
<input type="hidden" name="act" value="procLayoutAdminUserImageUpload" />
<input type="hidden" name="layout_srl" value="{$layout_srl}" />
<p>
<span class="x_btn fileBtn0">
{$lang->uploaded_file} <input style="background: none" type="file" name="user_layout_image" value="" title="{$lang->uploaded_file}" />
</span>
<div><span class="x_help-inline">{$lang->msg_layout_image_target}</span></div>
</p>
<input type="file" name="user_layout_image" value="" title="{$lang->uploaded_file}" />
<p>{$lang->msg_layout_image_target}</p>
<div class="x_clearfix btnArea">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_upload}</button>
@ -100,3 +97,4 @@
</span>
</div>
</form>

View file

@ -5,6 +5,7 @@
<input type="hidden" name="layout_srl" value="{$layout_srl}" />
<input type="hidden" name="layout" value="{$selected_layout->layout}" />
<input type="hidden" name="_layout_type" value="{$selected_layout->layout_type}" />
<input type="hidden" name="xe_validator_id" value="modules/layout/tpl/lyaout_info_view/1" />
<!--// For submit config. Do not delete this division. -->
<div></div>
</form>
@ -12,19 +13,19 @@
<section id="layout_config" class="x_form-horizontal">
<div cond="$selected_layout->path" class="x_control-group">
<label class="x_control-label">{$lang->path}</label>
<div class="x_controls">
<div class="x_controls" style="padding-top:5px">
{$selected_layout->path}
</div>
</div>
<div cond="$selected_layout->description" class="x_control-group">
<label class="x_control-label">{$lang->description}</label>
<div class="x_controls">
<div class="x_controls" style="padding-top:5px">
{$selected_layout->description}
</div>
</div>
<div cond="$selected_layout->author" class="x_control-group">
<label class="x_control-label">{$lang->author}</label>
<div class="x_controls">
<div class="x_controls" style="padding-top:5px">
<block loop="$selected_layout->author=>$author_info">
<!--@if($author_info->homepage)-->
<a href="{$author_info->homepage}" target="_blank">{$author_info->name}</a>
@ -73,7 +74,7 @@
{@$cnt ++}
</block>
<div class="x_control-group">
<label class="x_control-label" for="{$name}">{$var->title}</label>
<label class="x_control-label" for="{$name}"|cond="$var->type!='text'&&$var->type!='textarea'" for="lang_{$name}"|cond="$var->type=='text'||$var->type=='textarea'">{$var->title}</label>
<div class="x_controls">
<div cond="$var->type == 'text'">
<input type="text" name="{$name}" id="{$name}" class="lang_code" value="<!--@if(strpos($var->value, "$user_lang->") !== false)-->{htmlspecialchars($var->value)}<!--@else-->{$var->value}<!--@end-->" />
@ -160,6 +161,10 @@
</section>
<div class="x_clearfix btnArea">
<span class="etc">
<a cond="$layout" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminInstanceList', 'layout', $selected_layout->layout)}">{$lang->cmd_list}</a>
<a cond="!$layout" class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminAllInstanceList')}">{$lang->cmd_list}</a>
</span>
<span class="x_btn-group x_pull-right">
<input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" onclick="doSubmitConfig()"/>
</span>

View file

@ -35,6 +35,7 @@ xe.lang.confirm_delete = '{$lang->confirm_delete}';
<input type="hidden" name="act" value="procLayoutAdminDelete" />
<input type="hidden" name="layout_srl" value="{$layout->layout_srl}" />
<input class="x_btn x_btn-link" type="submit" value="{$lang->cmd_delete}" />
<input type="hidden" name="xe_validator_id" value="modules/layout/tpl/layout_instance_list/1" />
</form>
</td>
</tr>
@ -47,12 +48,13 @@ xe.lang.confirm_delete = '{$lang->confirm_delete}';
</div>
<section id="insertLayout" class="x_modal">
<form ruleset="insertLayout" action="./" class="x_form-horizontal">
<form action="./" method="post" ruleset="insertLayout" class="x_form-horizontal">
<input type="hidden" name="module" value="layout" />
<input type="hidden" name="act" value="procLayoutAdminInsert" />
<input type="hidden" name="layout" value="{$layout_info->layout}" />
<input type="hidden" name="_layout_type" value="{$type}" />
<input type="hidden" name="success_return_url" value="{getUrl('act', 'dispLayoutAdminInstanceList')}" />
<input type="hidden" name="xe_validator_id" value="modules/layout/tpl/layout_instance_list/2" />
<div class="x_modal-header">
<h1>{$lang->cmd_insert}</h1>
</div>