issue 279 : When importer admin page is loaded, 'show sync member' option is not displayed.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9632 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-10-13 03:53:01 +00:00
parent 20110e7027
commit e6a7e15991
2 changed files with 19 additions and 14 deletions

View file

@ -62,7 +62,7 @@
<p class="q">{$lang->about_ttxml_user_id}</p> <p class="q">{$lang->about_ttxml_user_id}</p>
<p class="a"><input type="text" name="user_id" value="{$logged_info->user_id}" /></p> <p class="a"><input type="text" name="user_id" value="{$logged_info->user_id}" /></p>
</li> </li>
<li> <li class="syncmember">
<p class="q">{$lang->import_step_desc[3]}</p> <p class="q">{$lang->import_step_desc[3]}</p>
<p class="a"><input type="checkbox" name="isSync" value="Y" /> {$lang->type_syncmember}</p> <p class="a"><input type="checkbox" name="isSync" value="Y" /> {$lang->type_syncmember}</p>
</li> </li>
@ -85,7 +85,7 @@
<em class="desc success">{$lang->msg_exist_xml_file}</em> <em class="desc success">{$lang->msg_exist_xml_file}</em>
</p> </p>
</li> </li>
<li> <li class="syncmember">
<p class="q">{$lang->import_step_desc[3]}</p> <p class="q">{$lang->import_step_desc[3]}</p>
<p class="a"><input type="checkbox" name="isSync" value="Y" /> {$lang->type_syncmember}</p> <p class="a"><input type="checkbox" name="isSync" value="Y" /> {$lang->type_syncmember}</p>
</li> </li>

View file

@ -16,7 +16,7 @@ $('.checkxml')
.end() .end()
.find('button') .find('button')
.click(function(){ .click(function(){
var $this, $container, $input, $messages, $loading, $form, count; var $this, $container, $input, $messages, $loading, $form, $syncmember, count;
$this = $(this).prop('disabled', true); $this = $(this).prop('disabled', true);
$form = $this.closest('form'); $form = $this.closest('form');
@ -46,17 +46,12 @@ $('.checkxml')
$messages.filter('.success').fadeIn(300); $messages.filter('.success').fadeIn(300);
$form.find(':submit').removeAttr('disabled'); $form.find(':submit').removeAttr('disabled');
$syncmember = $form.find('.syncmember:hidden');
if(data.type == 'XML') { if(data.type == 'XML') {
$ttxml = $ttxml.filter(':visible:not(.xml)'); $xml.not(':visible').add($syncmember).slideDown(300);
$ttxml.eq(-1).slideUp(100, function(){
$ttxml = $ttxml.slice(0,-1).eq(-1).slideUp(100,arguments.callee);
});
if(!$xml.is(':visible')) $xml.slideDown(300);
} else if(data.type == 'TTXML') { } else if(data.type == 'TTXML') {
$ttxml = $ttxml.not(':visible'); $ttxml.not(':visible').add($syncmember).slideDown(300);
$ttxml.eq(0).slideDown(100, function(){
$ttxml = $ttxml.slice(1).eq(0).slideDown(100,arguments.callee);
});
$form.find('input[name=type]').val('ttxml'); $form.find('input[name=type]').val('ttxml');
} }
}; };
@ -64,6 +59,7 @@ $('.checkxml')
function restore() { function restore() {
$input.prop('disabled', false).removeClass('loading'); $input.prop('disabled', false).removeClass('loading');
$this.prop('disabled', false); $this.prop('disabled', false);
$form.find('.syncmember:visible').slideUp(100);
return false; return false;
}; };
@ -75,6 +71,9 @@ $('.checkxml')
.closest('ul').find('>li.ttxml').hide().end().end() .closest('ul').find('>li.ttxml').hide().end().end()
.closest('form').find(':submit').attr('disabled','disabled'); .closest('form').find(':submit').attr('disabled','disabled');
// hide 'sync member' block
$('.syncmember').hide();
}); });
/** /**
@ -184,12 +183,18 @@ function doImport(formId) {
function resultAlertMessage() function resultAlertMessage()
{ {
alert(ret.message); alert(ret.message);
jQuery('a[href="#process"].modalAnchor').unbind('before-close.mw').trigger('close.mw'); jQuery('a[href="#process"].modalAnchor')
.unbind('before-close.mw')
.trigger('close.mw')
.find('#progressBar').width(1).end()
.find('#progressPercent').html('0%').end();
try { try {
form.reset(); form.reset();
get_by_id(formId).reset(); get_by_id(formId).reset();
} catch(e){}; } catch(e){ };
jQuery('span.btn > input[type=submit]').attr('disabled','disabled');
} }
fo_import = get_by_id(formId); fo_import = get_by_id(formId);