merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,15 +1,3 @@
jQuery(document).ready(function($){
$('.uploaded_image').css('cursor', 'pointer');
$('.uploaded_image_path').hide();
$('.uploaded_image').bind('click', function(e){
var path = $(this).siblings('.uploaded_image_path').html();
var html = '<div class="selected_image_path">' + path + '</div>';
$('.selected_image_path').remove();
$('.uploaded_image_list').after(html);
});
});
function doPreviewLayoutCode()
{
var $form = jQuery('#fo_layout'), $act = $form.find('input[name=act]');
@ -21,4 +9,4 @@ function doPreviewLayoutCode()
$form.removeAttr('target');
$act.val(og_act);
}
}

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><span class="btn"><input type="button" value="'+addLang+'" onclick="addLayoutCopyInputbox()" /></span></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

@ -0,0 +1,13 @@
function initHtmlCSSView()
{
var $ = jQuery;
$('.uploaded_image').css('cursor', 'pointer');
$('.uploaded_image_path').hide();
$('.uploaded_image').bind('click', function(e){
var path = $(this).find('.uploaded_image_path').html();
var html = '<div class="x_well selected_image_path">' + path + '</div>';
$('.selected_image_path').remove();
$('.uploaded_image_list').after(html);
});
}