Merge #1624 커버 이미지 선택 기능의 다국어 지원을 위한 PR by misol

* pr/1624:
  Revert "선택적 SSL 환경서 관리자 에디터 파일 첨부가 안되는 문제."
  커버 이미지 선택, 다국어 지원
  선택적 SSL 환경서 관리자 에디터 파일 첨부가 안되는 문제.
This commit is contained in:
Kijin Sung 2015-10-08 15:03:20 +09:00
commit 64d24594a2
4 changed files with 35 additions and 8 deletions

View file

@ -22,8 +22,8 @@
actDeleteFile : '.xefu-act-delete',
actSetCover : '.xefu-act-set-cover',
tmplXeUploaderFileitem : '<li class="xefu-file xe-clearfix" data-file-srl="{{file_srl}}"><span class="xefu-file-name">{{source_filename}}</span><span class="xefu-file-info"><span>{{disp_file_size}}</span><span><input type="checkbox" data-file-srl="{{file_srl}}"> 선택</span></span></li>',
tmplXeUploaderFileitemImage: '<li class="xefu-file xefu-file-image {{#if cover_image}}xefu-is-cover-image{{/if}}" data-file-srl="{{file_srl}}"><strong class="xefu-file-name">{{source_filename}}</strong><span class="xefu-file-info"><span class="xefu-file-size">{{disp_file_size}}</span><span><img src="{{download_url}}" alt=""></span><span><input type="checkbox" data-file-srl="{{file_srl}}"></span><button class="xefu-act-set-cover" data-file-srl="{{file_srl}}" title="커버이미지로 선택"><i class="xi-check-circle"></i></button></span></li>'
tmplXeUploaderFileitem : '<li class="xefu-file xe-clearfix" data-file-srl="{{file_srl}}"><span class="xefu-file-name">{{source_filename}}</span><span class="xefu-file-info"><span>{{disp_file_size}}</span><span><input type="checkbox" data-file-srl="{{file_srl}}"> Select</span></span></li>',
tmplXeUploaderFileitemImage: '<li class="xefu-file xefu-file-image {{#if cover_image}}xefu-is-cover-image{{/if}}" data-file-srl="{{file_srl}}"><strong class="xefu-file-name">{{source_filename}}</strong><span class="xefu-file-info"><span class="xefu-file-size">{{disp_file_size}}</span><span><img src="{{download_url}}" alt=""></span><span><input type="checkbox" data-file-srl="{{file_srl}}"></span><button class="xefu-act-set-cover" data-file-srl="{{file_srl}}" title="Be a cover image"><i class="xi-check-circle"></i></button></span></li>'
};
var _elements = [

File diff suppressed because one or more lines are too long

View file

@ -419,6 +419,18 @@
<value xml:lang="tr"><![CDATA[Etkin]]></value>
<value xml:lang="vi"><![CDATA[Hoạt động]]></value>
</item>
<item name="cmd_select_cover">
<value xml:lang="ko"><![CDATA[커버이미지로 선택]]></value>
<value xml:lang="en"><![CDATA[Be a cover image]]></value>
<value xml:lang="jp"><![CDATA[Be a cover image]]></value>
<value xml:lang="zh-CN"><![CDATA[Be a cover image]]></value>
<value xml:lang="zh-TW"><![CDATA[Be a cover image]]></value>
<value xml:lang="fr"><![CDATA[Be a cover image]]></value>
<value xml:lang="ru"><![CDATA[Be a cover image]]></value>
<value xml:lang="es"><![CDATA[Be a cover image]]></value>
<value xml:lang="tr"><![CDATA[Be a cover image]]></value>
<value xml:lang="vi"><![CDATA[Be a cover image]]></value>
</item>
<item name="editor_skin">
<value xml:lang="ko"><![CDATA[에디터 스킨]]></value>
<value xml:lang="en"><![CDATA[Editor Skin]]></value>

View file

@ -48,17 +48,32 @@
jQuery(function($){
// uploader
<!--@if($allow_fileupload)-->
var setting = {
maxFileSize: {$file_config->allowed_filesize},
limitMultiFileUploadSize: {$file_config->allowed_filesize}
};
var uploader = $('#xefu-container-{$editor_sequence}').xeUploader(setting);
window.xe.msg_exceeds_limit_size = '{$lang->msg_exceeds_limit_size}';
window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
window.xe.msg_file_cart_is_null = '{$lang->msg_file_cart_is_null}';
window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
window.xe.msg_not_allowed_filetype = '{$lang->msg_not_allowed_filetype}';
window.xe.msg_file_upload_error = '{$lang->msg_file_upload_error}';
window.xe.cmd_select = '{$lang->cmd_select}';
window.xe.cmd_select_cover = '{$lang->cmd_select_cover}';
var setting = {
maxFileSize: {$file_config->allowed_filesize},
limitMultiFileUploadSize: {$file_config->allowed_filesize},
tmplXeUploaderFileitem : '<li class="xefu-file xe-clearfix" data-file-srl="{{file_srl}}"><span class="xefu-file-name">{{source_filename}}</span><span class="xefu-file-info"><span>{{disp_file_size}}</span><span><input type="checkbox" data-file-srl="{{file_srl}}"> Select</span></span></li>',
tmplXeUploaderFileitemImage: '<li class="xefu-file xefu-file-image {{#if cover_image}}xefu-is-cover-image{{/if}}" data-file-srl="{{file_srl}}"><strong class="xefu-file-name">{{source_filename}}</strong><span class="xefu-file-info"><span class="xefu-file-size">{{disp_file_size}}</span><span><img src="{{download_url}}" alt=""></span><span><input type="checkbox" data-file-srl="{{file_srl}}"></span><button class="xefu-act-set-cover" data-file-srl="{{file_srl}}" title="Be a cover image"><i class="xi-check-circle"></i></button></span></li>'
};
if(typeof window.xe.cmd_select != "undefined" && window.xe.cmd_select !== "")
{
setting.tmplXeUploaderFileitem = setting.tmplXeUploaderFileitem.replace("Select", window.xe.cmd_select);
}
if(typeof window.xe.cmd_select_cover != "undefined" && window.xe.cmd_select_cover !== "")
{
setting.tmplXeUploaderFileitemImage = setting.tmplXeUploaderFileitemImage.replace("Be a cover image", window.xe.cmd_select_cover);
}
var uploader = $('#xefu-container-{$editor_sequence}').xeUploader(setting);
<!--@endif-->
});
</script>