From a47d0ffe279c08e76963e3cb74d84c391215b8b6 Mon Sep 17 00:00:00 2001 From: bnu Date: Mon, 16 Mar 2015 21:11:45 +0900 Subject: [PATCH] =?UTF-8?q?#1086=20css=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/jquery.fileupload/css/style.css | 98 +++++++++---------- .../js/plugins/jquery.fileupload/js/main.js | 53 +++++----- .../editor/skins/ckeditor/file_upload.html | 28 +++--- 3 files changed, 88 insertions(+), 91 deletions(-) diff --git a/common/js/plugins/jquery.fileupload/css/style.css b/common/js/plugins/jquery.fileupload/css/style.css index 66f3d1980..b6d67f52f 100755 --- a/common/js/plugins/jquery.fileupload/css/style.css +++ b/common/js/plugins/jquery.fileupload/css/style.css @@ -1,29 +1,31 @@ @charset "UTF-8"; -.xe-uploader-action-selectfile { +.xefu-act-selectfile { overflow: hidden !important; display: inline-block; vertical-align: middle; } -.xe-uploader-container { + +.xefu-container { margin: 10px 0; border: 1px solid #B6B6B6; } + /* dropzone */ -.xe-uploader-container .xe-uploader-dropzone { +.xefu-dropzone { border: 1px solid #EEE; text-align: center; background-color: #EBEBEB; box-sizing: border-box; -moz-box-sizing: border-box; } -.xe-uploader-container .xe-uploader-dropzone.in { +.xefu-dropzone.in { background-color: #E9F3EF; } -.xe-uploader-container .xe-uploader-dropzone.hover { +.xefu-dropzone.hover { border: 1px dotted #9ad18f; border-radius: 5px; } -.xe-uploader-container .xe-uploader-dropzone.fade { +.xefu-dropzone.fade { -webkit-transition: all 0.3s ease-out; -moz-transition: all 0.3s ease-out; -ms-transition: all 0.3s ease-out; @@ -31,19 +33,19 @@ transition: all 0.3s ease-out; opacity: 1; } -.xe-uploader-container .xe-uploader-dropzone p { +.xefu-dropzone p { margin: 12px 0; } /* END:dropzone */ -.xe-uploader-filelist-container { +.xefu-list { display: none; padding: 0 10px; } -/* images */ -.xe-uploader-filelist-container .xe-uploader-filelist-images { +/* filelist:images */ +.xefu-list-images { max-height: 160px; overflow-y: scroll; -webkit-overflow-scrolling: touch; @@ -51,13 +53,13 @@ padding: 5px 0; border-bottom: 1px solid #E6E6E6; } -.xe-uploader-filelist-container .xe-uploader-filelist-images ul, -.xe-uploader-filelist-container .xe-uploader-filelist-images li { +.xefu-list-images ul, +.xefu-list-images li { list-style: none; margin: 0; padding: 0; } -.xe-uploader-filelist-container .xe-uploader-filelist-images li { +.xefu-list-images li { position: relative; display: inline-block; margin: 3px; @@ -65,68 +67,64 @@ height: 60px; border: 3px solid #DDD; } - -.xe-uploader-filelist-container .xe-uploader-filelist-images li img { - width: 100%; - height: 100%; - -} -.selected { - border-color: #6CBD7E !important; -} -.xe-uploader-filelist-container .xe-uploader-filelist-images input, -.xe-uploader-filelist-container .xe-uploader-filelist-images button { +.xefu-list-images input, +.xefu-list-images button { position: absolute; top: 0; left: 0; } -.xe-uploader-filelist-container .xe-uploader-filelist-images button { - left: auto; - right: 0; -} -.xe-uploader-filelist-container .xe-uploader-filelist-images .xe-uploader-fileitem-filename, -.xe-uploader-filelist-container .xe-uploader-filelist-images .xe-uploader-fileitem-info-filesize { +.xefu-list-images .xefu-file-name, +.xefu-list-images .xefu-file-size { display: none; } +.xefu-list-images li img { + width: 100%; + height: 100%; +} + + +.selected { + border-color: #6CBD7E !important; +} /* END:images */ /* files */ -.xe-uploader-filelist-container .xe-uploader-filelist-files { +.xefu-list .xefu-list-files { margin: 5px 0; } -.xe-uploader-filelist-container .xe-uploader-filelist-files ul, -.xe-uploader-filelist-container .xe-uploader-filelist-files li { +.xefu-list-files ul, +.xefu-list-files li { list-style: none; margin: 0; padding: 0; } -.xe-uploader-filelist-container .xe-uploader-filelist-files li { +.xefu-list-files li { padding: 3px 0; } -.xe-uploader-filelist-container .xe-uploader-filelist-files li.selected { +.xefu-list-files li.selected { background-color: #E9F3EF; } -.xe-uploader-filelist-container .xe-uploader-filelist-files .xe-uploader-fileitem-info { +.xefu-list-files .xefu-file-info { float: right; } -.xe-uploader-filelist-container .xe-uploader-filelist-files .xe-uploader-fileitem-info span { +.xefu-list-files .xefu-file-info span { padding: 0 5px; } /* END:files */ -.xe-uploader-controll-container { +.xefu-controll { display: none; padding: 10px; } -.xe-uploader-progressbar { +.xefu-progressbar { border-bottom: 1px solid #6AB97D; } -.xe-uploader-progressbar div { +.xefu-progressbar div { height: 3px; background-color: #6AB97D; } @@ -135,7 +133,7 @@ -.xe-uploader-btn { +.xefu-btn { display: inline-block; *display: inline; margin: 0; @@ -169,21 +167,21 @@ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); filter: progid: DXImageTransform.Microsoft.gradient(enabled=false); } -input.xe-uploader-btn, -button.xe-uploader-btn { +input.xefu-btn, +button.xefu-btn { height: 26px !important; } -.xe-uploader-btn:hover, -.xe-uploader-btn:active, -.xe-uploader-btn[disabled] { +.xefu-btn:hover, +.xefu-btn:active, +.xefu-btn[disabled] { color: #333; background-color: #e6e6e6; *background-color: #d9d9d9; } -.xe-uploader-btn>a, -.xe-uploader-btn>button, -.xe-uploader-btn>input, -.xe-uploader-btn>span { +.xefu-btn>a, +.xefu-btn>button, +.xefu-btn>input, +.xefu-btn>span { display: inline-block; *zoom: 1; margin: 0 -12px !important; diff --git a/common/js/plugins/jquery.fileupload/js/main.js b/common/js/plugins/jquery.fileupload/js/main.js index 450e5c2de..19252eb37 100644 --- a/common/js/plugins/jquery.fileupload/js/main.js +++ b/common/js/plugins/jquery.fileupload/js/main.js @@ -6,32 +6,31 @@ dataType: 'json', replaceFileInput: false, - dropZone: '.xe-uploader-dropzone', - fileListContaner: '.xe-uploader-filelist-container', - controllContainer: '.xe-uploader-controll-container', - fileItem: 'li', - filelist: '.xe-uploader-filelist-files ul', - filelistImages: '.xe-uploader-filelist-images ul', + dropZone: '.xefu-dropzone', + fileList: '.xefu-list', + controll: '.xefu-controll', + filelist: '.xefu-list-files ul', + filelistImages: '.xefu-list-images ul', - progressbar: '.xe-uploader-progressbar', - progressbarGraph: '.xe-uploader-progressbar div', - progressStatus: '.xe-uploader-progress-status', - progressPercent: '.xe-uploader-progress-percent', + progressbar: '.xefu-progressbar', + progressbarGraph: '.xefu-progressbar div', + progressStatus: '.xefu-progress-status', + progressPercent: '.xefu-progress-percent', - actSelectedInsertContent : '.xe-uploader-act-link-selected', - actSelectedDeleteFile : '.xe-uploader-act-delete-selected', - actDeleteFile : '.xe-uploader-act-delete', + actSelectedInsertContent : '.xefu-act-link-selected', + actSelectedDeleteFile : '.xefu-act-delete-selected', + actDeleteFile : '.xefu-act-delete', - tmplXeUploaderFileitem : '
  • {{source_filename}}{{disp_file_size}} 선택
    • ', - tmplXeUploaderFileitemImage: '
  • {{source_filename}}{{disp_file_size}}
    • ' + tmplXeUploaderFileitem : '
  • {{source_filename}}{{disp_file_size}} 선택
    • ', + tmplXeUploaderFileitemImage: '
  • {{source_filename}}{{disp_file_size}}
    • ' }; var _elements = [ - 'fileListContaner', + 'fileList', 'actSelectedInsertContent', 'actSelectedDeleteFile', 'actDeleteFile', - 'controllContainer', + 'controll', 'dropZone', 'filelist', 'filelistImages', @@ -111,7 +110,7 @@ .parent() .addClass($.support.fileInput ? undefined : 'disabled'); - $container.data('xe-uploader-instance', this); + $container.data('xefu-instance', this); // 파일 목록 불러오기 this.loadFilelist(); @@ -127,16 +126,16 @@ }); // finderSelect - var fileselect = this.settings.fileListContaner.finderSelect({children:"li"}); - this.settings.fileListContaner.on("mousedown", 'img', function(e){ e.preventDefault(); }); + var fileselect = this.settings.fileList.finderSelect({children:"li"}); + this.settings.fileList.on("mousedown", 'img', function(e){ e.preventDefault(); }); fileselect.finderSelect('addHook','highlight:after', function(el) { el.find('input').prop('checked', true); - var selected = self.settings.fileListContaner.find('input:checked'); + var selected = self.settings.fileList.find('input:checked'); self.selected_files = selected; }); fileselect.finderSelect('addHook','unHighlight:after', function(el) { el.find('input').prop('checked', false); - var selected = self.settings.fileListContaner.find('input:checked'); + var selected = self.settings.fileList.find('input:checked'); self.selected_files = selected; }); fileselect.on("click", ":checkbox", function(e){ @@ -228,7 +227,7 @@ exec_json('file.procFileDelete', {'file_srls': file_srls, 'editor_sequence': this.editor_sequence}, function() { file_srls = file_srls.split(','); $.each(file_srls, function(idx, srl){ - self.settings.fileListContaner.find('ul').find('li[data-file-srl=' + srl + ']').remove(); + self.settings.fileList.find('ul').find('li[data-file-srl=' + srl + ']').remove(); }); self.loadFilelist(); }); @@ -261,8 +260,8 @@ // 첨부된 파일이 없으면 감춤 if(!res.files.length) { - self.settings.fileListContaner.hide(); - self.settings.controllContainer.hide(); + self.settings.fileList.hide(); + self.settings.controll.hide(); return; } @@ -286,8 +285,8 @@ self.settings.filelist.append(result.join('')); // 컨트롤, 리스트 표시 - self.settings.controllContainer.show() - self.settings.fileListContaner.show(); + self.settings.controll.show() + self.settings.fileList.show(); }); } }); diff --git a/modules/editor/skins/ckeditor/file_upload.html b/modules/editor/skins/ckeditor/file_upload.html index 9c9051190..e7aef9149 100644 --- a/modules/editor/skins/ckeditor/file_upload.html +++ b/modules/editor/skins/ckeditor/file_upload.html @@ -2,13 +2,13 @@ -
    +
    -
    -

    여기에 파일을 끌어 놓거나 파일 첨부를 클릭하세요

    +
    +

    여기에 파일을 끌어 놓거나 파일 첨부를 클릭하세요

    - + {$lang->edit->upload_file} @@ -16,29 +16,29 @@

    파일 크기 제한 : 0MB (허용 확장자 : *.*)

    - - + +
    -
    +
    - 0개 첨부 됨 (0Byte / 0MB) + 0개 첨부 됨 ( / )
    - - + +
    -
    -
    +
    +
    -
    +
    @@ -54,7 +54,7 @@ maxFileSize: {$file_config->allowed_filesize}, limitMultiFileUploadSize: {$file_config->allowed_filesize} }; - var uploader = $('#xe-uploader-container-{$editor_sequence}').xeUploader(setting); + var uploader = $('#xefu-container-{$editor_sequence}').xeUploader(setting); // console.log(uploader); });