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,2 +1,4 @@
@charset "utf-8";
@import url(../../../../../modules/admin/tpl/css/admin.css);
@import url(../../../../../common/css/bootstrap.min.css);

View file

@ -6,47 +6,55 @@
<load target="popup.min.css" />
<load target="popup.min.js" />
<!--@end-->
<h1 class="h1">{$component_info->title} ver. {$component_info->version}</h1>
<form action="./" method="get" onsubmit="return false" id="fo">
<div class="table">
<table width="100%" border="1" cellspacing="0">
<col width="150" />
<col />
<tr>
<th scope="row"><div>{$lang->multimedia_url}</div></th>
<td><input type="text" id="multimedia_url" value="{$manual_url}" /></td>
</tr>
<tr>
<th scope="row"><div>{$lang->multimedia_caption}</div></th>
<td><input type="text" id="multimedia_caption" value="" /></td>
</tr>
<tr>
<th scope="row"><div>{$lang->multimedia_width}</div></th>
<td><input type="text" size="3" id="multimedia_width" value="400" />px</td>
</tr>
<tr>
<th scope="row"><div>{$lang->multimedia_height}</div></th>
<td><input type="text" size="3" id="multimedia_height" value="400" />px</td>
</tr>
<tr>
<th scope="row"><div>{$lang->multimedia_auto_start}</div></th>
<td><input type="checkbox" id="multimedia_auto_start" value="Y" /></td>
</tr>
<tr>
<th scope="row"><div>{$lang->multimedia_wmode}</div></th>
<td>
<select id="multimedia_wmode">
<option value="window">{$lang->multimedia_wmode_window}</option>
<option value="opaque">{$lang->multimedia_wmode_opaque}</option>
<option value="transparent" selected="selected">{$lang->multimedia_wmode_transparent}</option>
</select>
<p>{$lang->about_ccl_allow_modification}</p>
</td>
</table>
</div>
<div class="btnArea">
<span class="btn"><button type="button">{$lang->cmd_insert}</button></span>
<span class="btn"><a href="./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}" target="_blank">{$lang->about_component}</a></span>
</div>
</form>
<section class="section">
<h1>{$component_info->title} ver. {$component_info->version}</h1>
<form action="./" method="get" onsubmit="return false" id="fo" class="x_form-horizontal">
<div class="x_control-group">
<label for="" class="x_control-label">{$lang->multimedia_url}</label>
<div class="x_controls">
<input type="text" id="multimedia_url" value="{$manual_url}" />
</div>
</div>
<div class="x_control-group">
<label for="" class="x_control-label">{$lang->multimedia_caption}</label>
<div class="x_controls">
<input type="text" id="multimedia_caption" value="" />
</div>
</div>
<div class="x_control-group">
<label for="" class="x_control-label">{$lang->multimedia_width}</label>
<div class="x_controls">
<input type="text" size="3" id="multimedia_width" value="400" /> px
</div>
</div>
<div class="x_control-group">
<label for="" class="x_control-label">{$lang->multimedia_height}</label>
<div class="x_controls">
<input type="text" size="3" id="multimedia_height" value="400" /> px
</div>
</div>
<div class="x_control-group">
<label for="" class="x_control-label">{$lang->multimedia_auto_start}</label>
<div class="x_controls">
<input type="checkbox" id="multimedia_auto_start" value="Y" />
</div>
</div>
<div class="x_control-group">
<label for="" class="x_control-label">{$lang->multimedia_wmode}</label>
<div class="x_controls">
<select id="multimedia_wmode">
<option value="window">{$lang->multimedia_wmode_window}</option>
<option value="opaque">{$lang->multimedia_wmode_opaque}</option>
<option value="transparent" selected="selected">{$lang->multimedia_wmode_transparent}</option>
</select>
<p>{$lang->about_ccl_allow_modification}</p>
</div>
</div>
<div class="x_clearfix btnArea">
<div class="x_pull-right">
<button type="button" id="btn_insert" class="x_btn x_btn-primary">{$lang->cmd_insert}</button>
<a class="x_btn" href="{getUrl('','module','editor','act','dispEditorComponentInfo','component_name',$component_info->component_name)}" target="_blank" onclick="window.open(this.href,'ComponentInfo','width=10,height=10');return false;">{$lang->about_component}</a>
</div>
</div>
</form>
</section>

View file

@ -11,11 +11,11 @@ jQuery(function($){
if(!$node.length) return;
attrs = {
url : $node.attr('multimedia_src'),
caption : $node.attr('alt'),
width : $node.width() - 4,
height : $node.height() - 4,
wmode : $node.attr('wmode')
url : $node.attr('multimedia_src') || null,
caption : $node.attr('alt') || null,
width : $node.width() || 400,
height : $node.height() || 400,
wmode : $node.attr('wmode') || null
};
$.each(attrs, function(key, val) {
@ -45,17 +45,30 @@ $('.btnArea button').click(function(){
return;
}
var html = '<img src="../../../../common/img/blank.gif" editor_component="multimedia_link" multimedia_src="" width="" height="" wmode="" style="display:block;width:'+attrs.width+'px;height:'+attrs.height+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center" auto_start="" alt="" />';
var $selected_node = $(opener.editorPrevNode);
if($selected_node.is('img') && $selected_node.attr('editor_component') == 'multimedia_link'){
$selected_node
.attr('multimedia_src', attrs.multimedia_src)
.attr('width', attrs.width)
.attr('height', attrs.height)
.attr('wmode', attrs.wmode)
.attr('auto_start', attrs.auto_start)
.attr('alt', attrs.alt)
.css('width', attrs.width + 'px')
.css('height', attrs.height + 'px')
}else{
var html = '<img src="../../../../common/img/blank.gif" editor_component="multimedia_link" multimedia_src="" width="" height="" wmode="" style="display:block;width:'+attrs.width+'px;height:'+attrs.height+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center" auto_start="" alt="" />';
html = html.replace(/(\w+)=""/g, function(m0,m1) {
return attrs[m1] ? (m1+'="'+attrs[m1]+'"') : '';
});
html = html.replace(/(\w+)=""/g, function(m0,m1) {
return attrs[m1] ? (m1+'="'+attrs[m1]+'"') : '';
});
opener.editorFocus(opener.editorPrevSrl);
opener.editorFocus(opener.editorPrevSrl);
var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
opener.editorReplaceHTML(iframe_obj, html);
opener.editorReplaceHTML(iframe_obj, html);
}
opener.editorFocus(opener.editorPrevSrl);
window.close();

View file

@ -2,4 +2,4 @@
* popup으로 열렸을 경우 부모창의 위지윅에디터에 select된 멀티미디어 컴포넌트 코드를 체크하여
* 있으면 가져와서 원하는 곳에 삽입
**/
@charset "utf-8";@import "../../../../../modules/admin/tpl/css/admin.css";
@charset "utf-8";@import "../../../../../modules/admin/tpl/css/admin.css";@import "../../../../../common/css/bootstrap.min.css";

View file

@ -2,4 +2,4 @@
* popup으로 열렸을 경우 부모창의 위지윅에디터에 select된 멀티미디어 컴포넌트 코드를 체크하여
* 있으면 가져와서 원하는 곳에 삽입
**/
jQuery(function($){(function(){if(!is_def(opener))return;var $node=$(opener.editorPrevNode).filter('img'),attrs;if(!$node.length)return;attrs={url:$node.attr('multimedia_src'),caption:$node.attr('alt'),width:$node.width()-4,height:$node.height()-4,wmode:$node.attr('wmode')};$.each(attrs,function(key,val){get_by_id('multimedia_'+key).value=val});get_by_id('multimedia_auto_start').checked=($node.attr('auto_start')=='true')})();$('.btnArea button').click(function(){if(!is_def(opener))return;var el_wmode=get_by_id('fo').elements['multimedia_wmode'],attrs={alt:encodeURIComponent(get_by_id('multimedia_caption').value),width:get_by_id('multimedia_width').value||400,height:get_by_id('multimedia_height').value||400,wmode:el_wmode.value||el_wmode.options[0].value,auto_start:get_by_id('multimedia_auto_start').checked?'true':'false',multimedia_src:get_by_id('multimedia_url').value.replace(request_uri,'')};if(!attrs.multimedia_src){window.close();return};var html='<img src="../../../../common/img/blank.gif" editor_component="multimedia_link" multimedia_src="" width="" height="" wmode="" style="display:block;width:'+attrs.width+'px;height:'+attrs.height+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center" auto_start="" alt="" />';html=html.replace(/(\w+)=""/g,function(m0,m1){return attrs[m1]?(m1+'="'+attrs[m1]+'"'):''});opener.editorFocus(opener.editorPrevSrl);var iframe_obj=opener.editorGetIFrame(opener.editorPrevSrl);opener.editorReplaceHTML(iframe_obj,html);opener.editorFocus(opener.editorPrevSrl);window.close()})})
jQuery(function($){(function(){if(!is_def(opener))return;var $node=$(opener.editorPrevNode).filter('img'),attrs;if(!$node.length)return;attrs={url:$node.attr('multimedia_src')||null,caption:$node.attr('alt')||null,width:$node.width()||400,height:$node.height()||400,wmode:$node.attr('wmode')||null};$.each(attrs,function(key,val){get_by_id('multimedia_'+key).value=val});get_by_id('multimedia_auto_start').checked=($node.attr('auto_start')=='true')})();$('.btnArea button').click(function(){if(!is_def(opener))return;var el_wmode=get_by_id('fo').elements['multimedia_wmode'],attrs={alt:encodeURIComponent(get_by_id('multimedia_caption').value),width:get_by_id('multimedia_width').value||400,height:get_by_id('multimedia_height').value||400,wmode:el_wmode.value||el_wmode.options[0].value,auto_start:get_by_id('multimedia_auto_start').checked?'true':'false',multimedia_src:get_by_id('multimedia_url').value.replace(request_uri,'')};if(!attrs.multimedia_src){window.close();return};var $selected_node=$(opener.editorPrevNode);if($selected_node.is('img')&&$selected_node.attr('editor_component')=='multimedia_link'){$selected_node.attr('multimedia_src',attrs.multimedia_src).attr('width',attrs.width).attr('height',attrs.height).attr('wmode',attrs.wmode).attr('auto_start',attrs.auto_start).attr('alt',attrs.alt).css('width',attrs.width+'px').css('height',attrs.height+'px')}else{var html='<img src="../../../../common/img/blank.gif" editor_component="multimedia_link" multimedia_src="" width="" height="" wmode="" style="display:block;width:'+attrs.width+'px;height:'+attrs.height+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center" auto_start="" alt="" />';html=html.replace(/(\w+)=""/g,function(m0,m1){return attrs[m1]?(m1+'="'+attrs[m1]+'"'):''});opener.editorFocus(opener.editorPrevSrl);var iframe_obj=opener.editorGetIFrame(opener.editorPrevSrl);opener.editorReplaceHTML(iframe_obj,html)};opener.editorFocus(opener.editorPrevSrl);window.close()})})