Issue 2562 started.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11664 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-10-11 10:02:04 +00:00
parent 66cc29b8dd
commit 4a0218b83c
5 changed files with 1336 additions and 199 deletions

View file

@ -14,74 +14,30 @@
<input type="hidden" name="act" value="procInstallAdminConfig" />
<div class="x_control-group">
<label class="x_control-label" for="ftp_host">{$lang->start_module}</label>
<div class="x_controls modulefinder moduleSearch">
<input type="hidden" name="index_module_srl" id="index_module_srl" value="{$start_module->index_module_srl}" />
<input type="text" name="_target_module" id="_target_module" value="{$start_module->browser_title} ({$start_module->mid})" readonly />
<a href="#moduleSearchWindow" class="x_btn tgAnchor moduleSearch">{$lang->cmd_find}</a> {$lang->about_start_module}
<div id="moduleSearchWindow" class="moduleSearchWindow tgContent">
<div class="siteList sectionDiv">
<h2>{$lang->select_site}</h2>
<div class="siteListSearchBox">
<div class="siteListSearchBoxBorder">
<div class="searchImg icon-search"></div>
<input type="text" class="siteListSearchInput" name="site_filter">
</div>
</div>
<div class="siteListUL">
<ul>
</ul>
</div>
</div>
<div class="moduleTypeList sectionDiv">
<h2>{$lang->select_module_type}</h2>
<div>
<ul class="moduleTypeListUL">
</ul>
</div>
</div>
<div class="moduleInstanceList sectionDiv">
<h2>{$lang->select_module_instance}</h2>
<div>
<select class="moduleInstanceListSelect" size="8" multiple>
</select>
</div>
<button class="x_btn x_btn-mini moduleSearch_ok">{$lang->cmd_select}</button>
</div>
</div>
</div>
<div class="x_controls modulefinder moduleSearch" cond="0">
<input type="hidden" name="index_module_srl" id="index_module_srl" value="{$start_module->index_module_srl}" />
<label class="x_control-label" for="_target_module">{$lang->start_module}</label>
<div class="x_controls moduleSearch">
<input type="text" name="_target_module" id="_target_module" value="{$start_module->browser_title} ({$start_module->mid})" readonly />
<button type="button" href="#moduleSearchWindow" class="x_btn tgAnchor moduleSearch">{$lang->cmd_find}</button> {$lang->about_start_module}
<div id="moduleSearchWindow" class="moduleSearchWindow tgContent" style="display:none">
<div class="siteList sectionDiv">
<h2>{$lang->select_site}</h2>
<div class="siteListSearchBox">
<div class="siteListSearchBoxBorder">
<div class="searchImg icon-search"></div>
<input type="text" class="siteListSearchInput" name="site_filter">
</div>
</div>
<div class="siteListUL">
<ul>
</ul>
</div>
<input type="hidden" name="index_module_srl" id="index_module_srl" value="{$start_module->index_module_srl}" />
<a href="#msw" class="tgAnchor moduleTrigger x_btn">{$lang->cmd_find}</a> {$lang->about_start_module}
<div id="msw" class="tgContent moduleWindow x_well">
<div class="siteList x_control-group">
<label for="siteFinder">1. {$lang->select_site}</label>
<input type="search" class="siteFinder" id="siteFinder" name="site_filter" placeholder="URL">
<ul class="x_nav x_nav-tabs x_nav-stacked">
</ul>
</div>
<div class="moduleTypeList sectionDiv">
<h2>{$lang->select_module_type}</h2>
<div>
<ul class="moduleTypeListUL">
</ul>
</div>
<div class="moduleList x_control-group">
<label for>2. {$lang->select_module_type}</label>
<ul class="x_nav x_nav-tabs x_nav-stacked">
</ul>
</div>
<div class="moduleInstanceList sectionDiv">
<h2>{$lang->select_module_instance}</h2>
<div>
<select class="moduleInstanceListSelect" size="8">
</select>
</div>
<button class="btn btn_primary moduleSearch_ok">{$lang->cmd_select}</button>
<div class="instanceList x_control-group">
<label for="instanceList">3. {$lang->select_module_instance}</label>
<select size="8" id="instanceList" multiple>
</select>
</div>
<div class="x_pull-right">
<button type="button" class="moduleSearch_ok x_btn x_btn-inverse">{$lang->cmd_select}</button>
</div>
</div>
</div>

View file

@ -326,6 +326,15 @@ html[lang="mn"] .x .g11n.active>[disabled],
.x#g11n #lang_search .editMode .useit{display:none}
.x#g11n #lang_search .editMode .cancel,
.x#g11n #lang_search .editMode .save{display:inline-block}
/* Module Search */
.x .moduleWindow{position:absolute;z-index:100;padding:15px 20px;margin:4px 0 0 0}
.x .moduleWindow ul{margin-bottom:0}
.x .moduleWindow .siteList{margin-right:14px}
.x .moduleWindow .siteList>input[type="search"]{width:100%;padding-top:6px;padding-bottom:6px;border-radius:3px 3px 0 0}
.x .moduleWindow .siteList>ul{margin:-1px -14px 0 0}
.x .moduleWindow .siteList>ul>li{background:#fff}
.x .moduleWindow .siteList>ul>li:first-child>a{border-top-left-radius:0;border-top-right-radius:0}
.x .moduleWindow select{width:100%}
/* ---------- Deprecated UI supports - Please do not use this CSS styles below. It will be removed as soon as possible. ---------- */
/* ---------- Deprecated UI supports - Please do not use this CSS styles below. It will be removed as soon as possible. ---------- */
@ -512,26 +521,3 @@ html[lang="mn"] .x .g11n.active>[disabled],
.x #ftpSuggestion li button:active,
.x #ftpSuggestion li button:focus,
.x #ftpSuggestion li:hover{background:#eee}
/* Module Search */
.x .moduleSearchWindow{position:absolute;width:700px;z-index:100}
.x .moduleSearchWindow, .moduleSearchWindow div{margin:0;padding:0;color:#2d2c2d;font-size:12px}
.x .moduleSearchWindow h2{margin:0;padding:4px;height:24px;line-height:24px;background:#666;text-align:left;color:#fff;font-size:12px}
.x .moduleSearchWindow .sectionDiv{position:relative;margin:0px;background:#fff;border:1px solid}
.x .moduleSearchWindow .siteList{float:left;width:295px}
.x .moduleSearchWindow .highlight{background:yellow;color:red;font-style:italic}
.x .moduleSearchWindow .moduleTypeList{margin-left:5px;float:left;width:200px}
.x .moduleSearchWindow .moduleInstanceList{float:right;width:190px}
.x .moduleSearchWindow ul{margin:0;padding:0;border:0}
.x .moduleSearchWindow li{font-size:12px;border:0;border-bottom:1px solid #ccc;margin:0;padding: 4px 4px;font-family: ,NanumGothic,"맑은 고딕","Malgun Gothic",AppleGothic,,Dotum,,Gulim,sans-serif}
.x .moduleSearchWindow li:hover, .moduleSearchWindow li.on{background:#eee;cursor:pointer}
.x .moduleSearchWindow li div{margin:0;padding:0;display:inline-block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis}
.x .moduleSearchWindow .siteList li div{width:270px}
.x .moduleSearchWindow .siteListSearchBox{margin:0;padding:4px 0;height:24px;border-bottom:1px solid #888}
.x .moduleSearchWindow .siteListSearchBoxBorder{margin-left:3px;height: 22px;width: 287px;border: 1px solid #ccc}
.x .moduleSearchWindow input.siteListSearchInput{margin:0;padding:0;position:relative;float:right;width: 260px;margin-right:4px;border:0}
.x .moduleSearchWindow .siteListSearchBox .searchImg{position:relative;float:left;margin-top:4px;margin-left:4px}
.x .moduleSearchWindow .moduleTypeList li div{width:170px}
.x .moduleSearchWindow .moduleInstanceList li div{width:190px}
.x .moduleSearchWindow .moduleSearch_ok {float:right}
.x .moduleSearchWindow select.moduleInstanceListSelect {width:100%}

View file

@ -326,6 +326,15 @@ html[lang="mn"] .x .g11n.active>[disabled],
.x#g11n #lang_search .editMode .useit{display:none}
.x#g11n #lang_search .editMode .cancel,
.x#g11n #lang_search .editMode .save{display:inline-block}
/* Module Search */
.x .moduleWindow{position:absolute;z-index:100;padding:15px 20px;margin:4px 0 0 0}
.x .moduleWindow ul{margin-bottom:0}
.x .moduleWindow .siteList{margin-right:14px}
.x .moduleWindow .siteList>input[type="search"]{width:100%;padding-top:6px;padding-bottom:6px;border-radius:3px 3px 0 0}
.x .moduleWindow .siteList>ul{margin:-1px -14px 0 0}
.x .moduleWindow .siteList>ul>li{background:#fff}
.x .moduleWindow .siteList>ul>li:first-child>a{border-top-left-radius:0;border-top-right-radius:0}
.x .moduleWindow select{width:100%}
/* ---------- Deprecated UI supports - Please do not use this CSS styles below. It will be removed as soon as possible. ---------- */
/* ---------- Deprecated UI supports - Please do not use this CSS styles below. It will be removed as soon as possible. ---------- */
@ -512,26 +521,3 @@ html[lang="mn"] .x .g11n.active>[disabled],
.x #ftpSuggestion li button:active,
.x #ftpSuggestion li button:focus,
.x #ftpSuggestion li:hover{background:#eee}
/* Module Search */
.x .moduleSearchWindow{position:absolute;width:700px;z-index:100}
.x .moduleSearchWindow, .moduleSearchWindow div{margin:0;padding:0;color:#2d2c2d;font-size:12px}
.x .moduleSearchWindow h2{margin:0;padding:4px;height:24px;line-height:24px;background:#666;text-align:left;color:#fff;font-size:12px}
.x .moduleSearchWindow .sectionDiv{position:relative;margin:0px;background:#fff;border:1px solid}
.x .moduleSearchWindow .siteList{float:left;width:295px}
.x .moduleSearchWindow .highlight{background:yellow;color:red;font-style:italic}
.x .moduleSearchWindow .moduleTypeList{margin-left:5px;float:left;width:200px}
.x .moduleSearchWindow .moduleInstanceList{float:right;width:190px}
.x .moduleSearchWindow ul{margin:0;padding:0;border:0}
.x .moduleSearchWindow li{font-size:12px;border:0;border-bottom:1px solid #ccc;margin:0;padding: 4px 4px;font-family: ,NanumGothic,"맑은 고딕","Malgun Gothic",AppleGothic,,Dotum,,Gulim,sans-serif}
.x .moduleSearchWindow li:hover, .moduleSearchWindow li.on{background:#eee;cursor:pointer}
.x .moduleSearchWindow li div{margin:0;padding:0;display:inline-block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis}
.x .moduleSearchWindow .siteList li div{width:270px}
.x .moduleSearchWindow .siteListSearchBox{margin:0;padding:4px 0;height:24px;border-bottom:1px solid #888}
.x .moduleSearchWindow .siteListSearchBoxBorder{margin-left:3px;height: 22px;width: 287px;border: 1px solid #ccc}
.x .moduleSearchWindow input.siteListSearchInput{margin:0;padding:0;position:relative;float:right;width: 260px;margin-right:4px;border:0}
.x .moduleSearchWindow .siteListSearchBox .searchImg{position:relative;float:left;margin-top:4px;margin-left:4px}
.x .moduleSearchWindow .moduleTypeList li div{width:170px}
.x .moduleSearchWindow .moduleInstanceList li div{width:190px}
.x .moduleSearchWindow .moduleSearch_ok {float:right}
.x .moduleSearchWindow select.moduleInstanceListSelect {width:100%}

View file

@ -491,20 +491,15 @@ jQuery(function($){
_xeModuleSearch = function(){
var t = this;
var $t = $(this);
var $moduleSearchWindow = $t.find(".moduleSearchWindow");
var $siteListDiv = $moduleSearchWindow.find('.siteList');
var $moduleTypeListDiv = $moduleSearchWindow.find('.moduleTypeList');
var $moduleInstanceListDiv = $moduleSearchWindow.find('.moduleInstanceList');
var $siteList = $siteListDiv.find('UL');
var $moduleTypeList = $moduleTypeListDiv.find('UL');
var $moduleInstanceList = $moduleInstanceListDiv.find('SELECT');
var $siteListSearchInput = $moduleSearchWindow.find('INPUT.siteListSearchInput');
var $moduleWindow = $t.find(".moduleWindow");
var $siteListDiv = $moduleWindow.find('.siteList');
var $moduleListDiv = $moduleWindow.find('.moduleList');
var $instanceListDiv = $moduleWindow.find('.instanceList');
var $siteList = $siteListDiv.find('>ul');
var $moduleList = $moduleListDiv.find('>ul');
var $instanceList = $instanceListDiv.find('>select');
var $siteFinder = $moduleWindow.find('input.siteFinder');
var aSiteListData;
var MAX_LIST_HEIGHT = 280;
function setListSize($UL, nHeight){
@ -538,16 +533,15 @@ _xeModuleSearch = function(){
$li = $('<li />').appendTo($siteList);
$('<a>').attr('href', '#').html(
'<div>' + sDomain + '</div>' +
'<span class="x_icon-circle-arrow-right" style="display:inline-block;float:right;width:16px;height:16px;"></span>'
sDomain
).data('site_srl', list[i].site_srl).appendTo($li);
}
setListSize($siteList, MAX_LIST_HEIGHT - $siteListSearchInput.parent("DIV").height());
setListSize($siteList, MAX_LIST_HEIGHT - $siteFinder.parent("div").height());
}
$siteListSearchInput.keyup(function(){
setSiteList($siteListSearchInput.val());
$siteFinder.keyup(function(){
setSiteList($siteFinder.val());
});
if(typeof console == 'undefined'){
@ -557,7 +551,7 @@ _xeModuleSearch = function(){
$t
.not('.xe-module-search')
.addClass('xe-module-search')
.find('a.tgAnchor.moduleSearch')
.find('a.moduleTrigger')
.bind('before-open.tc', function(){
var $this;
@ -573,24 +567,24 @@ _xeModuleSearch = function(){
aSiteListData = list;
setSiteList($siteListSearchInput.val());
setSiteList($siteFinder.val());
$siteListSearchInput.focus();
$siteFinder.focus();
};
$siteList.empty();
$moduleInstanceList.empty();
$moduleTypeListDiv.hide();
$moduleInstanceListDiv.hide();
$instanceList.empty();
$moduleListDiv.hide();
$instanceListDiv.hide();
$.exec_json('admin.getSiteAllList', {domain:""}, on_complete);
})
.end()
.find('.tgContent .siteListUL')
.find('.tgContent .siteList>ul')
.delegate('a','click',function(oEvent){
var $this, $finder;
$this = $(this);
$finder = $this.closest('.modulefinder');
$finder = $this.closest('.moduleSearch');
function on_complete(data) {
@ -600,32 +594,28 @@ _xeModuleSearch = function(){
for(x in list) {
if(!list.hasOwnProperty(x)) continue;
$li = $('<li />').appendTo($moduleTypeList);
$li = $('<li />').appendTo($moduleList);
$('<a>').attr('href', '#').html(
'<div>'+list[x].title+'</div>' +
'<span class="x_icon-circle-arrow-right" style="display:inline-block;float:right;width:16px;height:16px;"></span>'
list[x].title
).data('moduleInstanceList', list[x].list).appendTo($li);
//$('<option />').attr('value', x).text(list[x].title).appendTo($mod_select);
}
$moduleSearchWindow.find('.moduleTypeList').show();
setListSize($moduleTypeList, MAX_LIST_HEIGHT);
$moduleWindow.find('.moduleList').show();
setListSize($moduleList, MAX_LIST_HEIGHT);
$siteList.find('li').removeClass('on');
$this.parent('li').addClass('on');
$siteList.find('li').removeClass('x_active');
$this.parent('li').addClass('x_active');
};
//$finder.find('a.tgAnchor.findsite').trigger('close.tc');
$moduleTypeList.empty();
$moduleInstanceListDiv.hide();
$moduleList.empty();
$instanceListDiv.hide();
$.exec_json('module.procModuleAdminGetList', {site_srl:$this.data('site_srl')}, on_complete);
oEvent.preventDefault();
})
.end()
//.find('.moduleList,.moduleIdList').hide().end()
.find('.moduleTypeListUL')
.find('.moduleList>ul')
.delegate('a', 'click', function(oEvent){
var $this, $mid_select, val, list;
@ -635,27 +625,27 @@ _xeModuleSearch = function(){
if(!list) return;
t.sSelectedModuleType = $this.text();
$moduleInstanceList.empty();
$instanceList.empty();
for(var x in list) {
if(!list.hasOwnProperty(x)) continue;
$li = $('<option />').html(list[x].browser_title).appendTo($moduleInstanceList).val(list[x].module_srl).data('mid', list[x].module_srl)
$li = $('<option />').html(list[x].browser_title).appendTo($instanceList).val(list[x].module_srl).data('mid', list[x].module_srl)
.data('module_srl', list[x].module_srl).data('layout_srl', list[x].layout_srl).data('browser_title', list[x].browser_title);
}
$moduleInstanceListDiv.show();
setListSize($moduleInstanceList, MAX_LIST_HEIGHT);
$instanceListDiv.show();
setListSize($instanceList, MAX_LIST_HEIGHT);
$moduleTypeList.find('li').removeClass('on');
$this.parent('li').addClass('on');
$moduleList.find('li').removeClass('x_active');
$this.parent('li').addClass('x_active');
oEvent.preventDefault();
})
.end()
.find('.moduleSearch_ok').click(function(oEvent){
var aSelected = [];
$t.find('.moduleInstanceListSelect option:selected').each(function(){
$t.find('select>option:selected').each(function(){
aSelected.push({
'type' : t.sSelectedModuleType,
'module_srl' : $(this).data('module_srl'),
@ -665,7 +655,7 @@ _xeModuleSearch = function(){
});
$t.trigger('moduleSelect', [aSelected]);
$('.tgAnchor.moduleSearch').trigger('close.tc');
$('a.moduleTrigger').trigger('close.tc');
oEvent.preventDefault();
});

File diff suppressed because it is too large Load diff