merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -49,6 +49,20 @@ function deleteFile(layout_srl,filename){
});
}
function addLayoutCopyInputbox()
{
var html = '<tr>';
html += '<td><input type="text" name="title[]" size="50" /></td>';
html += '<td><span class="btn"><input type="button" value="'+addLang+'" onclick="addLayoutCopyInputbox()" /></span></td>';
html += '</tr>';
var it = jQuery('#inputTable');
it.append(html);
it.find('SPAN.btn').hide();
it.find('TR:last-child SPAN.btn').show();
}
(function($){
/* preview layout */
@ -78,4 +92,4 @@ validator.cast('ADD_CALLBACK', ['update_layout_code', function(form) {
return false;
}]);
})(jQuery);
})(jQuery);

View file

@ -0,0 +1,34 @@
function doSubmitConfig()
{
var $forms = jQuery('#layout_config').find('input[name][type="hidden"], input[name][type="text"], input[name][type="checkbox"]:checked, select[name], textarea[name], input[name][type="radio"]:checked');
var $configForm = jQuery('#config_form');
var $container = $configForm.children('div');
$container.empty();
$forms.each(function($)
{
var $this = jQuery(this);
if($this.parents('.imageUpload').length) return;
var $input = jQuery('<input>').attr('type', 'hidden').attr('name', $this.attr('name')).val($this.val());
$container.append($input);
});
$configForm.submit();
}
function afterUploadConfigImage(name, fileName, tmpFileName)
{
jQuery('#preview_' + name + ' img').attr('src', tmpFileName);
jQuery('#preview_' + name).show();
jQuery('#file_select' + name).val('');
jQuery('#file_' + name).val(fileName);
}
function deleteImage(name)
{
jQuery('#preview_' + name + ' img').removeAttr('src');
jQuery('#preview_' + name).hide();
jQuery('#file_' + name).val('');
}