Merge pull request #6 from xpressengine/develop

Update-1
This commit is contained in:
YJSoft 2015-07-06 15:45:53 +09:00
commit 19df2de94c
86 changed files with 2192 additions and 5309 deletions

View file

@ -15,16 +15,15 @@ before_script:
- npm install -g grunt-cli
- npm install
- if [ $(phpenv version-name) != "5.3" ]; then composer install; fi
- if [ $(phpenv version-name) != "5.3" ]; then mysql -e 'create database xe_test;';
fi
- if [ $(phpenv version-name) != "5.3" ]; then mysql -e 'create database xe_test;'; fi
- if [ $(phpenv version-name) != "5.3" ]; then echo "USE mysql;\nUPDATE user SET password=PASSWORD('travis')
WHERE user='travis';\nFLUSH PRIVILEGES;\n" | mysql -u root; fi
- if [ $(phpenv version-name) != "5.3" ]; then php -S localhost:8000 & fi
script:
- grunt lint
- grunt minify
- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run -d --env travis;
fi
- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept build; fi
- if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run -d --fail-fast --env travis; fi
notifications:
slack:
secure: 0HhwktIb65zfge56E4yMfYj0Xj4GeYIaxvh/Obb13BK1/C8RdWBy6u213N5MQ2UHsxYk8wXXzynaCh4psegi2iPy9dbKmkdAdEQMzYoKE2xYVSqZveeVQm0sqFVXAlzggpgs/j5vtvKYjRkQKtTrz0C+p0uJ0bkLcyWGezWTpGc=

View file

@ -115,8 +115,6 @@ module.exports = function(grunt) {
'layouts/xedition/js/jquery.easing.min.js': ['layouts/xedition/js/jquery.easing.js'],
'layouts/xedition/js/layout.min.js': ['layouts/xedition/js/layout.js'],
'layouts/xedition/js/welcome.min.js': ['layouts/xedition/js/welcome.js'],
'layouts/xedition/js/gnb.pc.min.js': ['layouts/xedition/js/gnb.pc.js'],
'layouts/xedition/js/gnb.mobile.min.js': ['layouts/xedition/js/gnb.mobile.js'],
}
},
},
@ -150,12 +148,12 @@ module.exports = function(grunt) {
},
'layout': {
files: {
'layouts/xedition/css/camera.min.css': ['layouts/xedition/css/camera.css'],
'layouts/xedition/css/layout.min.css': ['layouts/xedition/css/layout.css'],
'layouts/xedition/css/webfont.min.css': ['layouts/xedition/css/webfont.css'],
'layouts/xedition/css/welcome.min.css': ['layouts/xedition/css/welcome.css'],
'layouts/xedition/css/widget.login.min.css': ['layouts/xedition/css/widget.login.css'],
'layouts/xedition/css/xeicon.min.css': ['layouts/xedition/css/xeicon.css'],
'layouts/xedition/css/swiper.min.css': ['layouts/xedition/css/swiper.css'],
}
},
},

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1 +1 @@
!function(a){var b="(https?|ftp|news|telnet|irc|mms)://",c="(?:[\\w\\-]+\\.)+(?:[a-z]+)",d="(?:1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9]?[0-9])",e="(?:"+d+"\\.){3}"+d,f="(?::([0-9]+))?",g="(?:/~[\\w-]+)?",h='((?:/[\\w!"$-/:-@]+)*)',i="(?:#([\\w!-@]+))?",j=new RegExp("("+b+"("+c+"|"+e+"|localhost)"+f+g+h+i+")","ig"),k=xe.createPlugin("OEmbed",{targets:[],init:function(){this.targets=[],this.enableAutoLink=!1,this.castedOembedA=!1,this.embedSetting=[]},API_ONREADY:function(){var b=this;this.extractTargets(a(".xe_content")),this.oApp.getPlugin("autolink").length&&(this.enableAutoLink=!0),b.cast("OEMBEDA"),this.enableAutoLink||a(this.targets).each(function(){b.cast("OEMBED",[this])})},API_BEFORE_AUTOLINK:function(a,b){var c=this;c.cast("OEMBEDA")},API_AFTER_AUTOLINK:function(a,b){this.oembed(b[0])},API_OEMBED:function(b,c){if(!this.enableAutoLink){var d=c[0];if(!a(d).parent().length||"a"==a(d).parent().get(0).nodeName.toLowerCase())return void this.oembed(a(d));var e=d.nodeValue,f=a("<span>");e=e.replace(/</g,"&lt;").replace(/>/g,"&gt;"),e=e.replace(j,'<a href="$1" target="_blank">$1</a>'),a(d).before(f),a(d).replaceWith(e),c[0]=f.next("a"),f.remove(),this.oembed(c[0])}},API_OEMBEDA:function(b,c){if(!this.castedOembedA){var d=this;this.castedOembedA=!0,a(".read_body a").not("_oembed").each(function(){d.oembed(a(this))})}},oembed:function(b){var c=this;this.embedSetting.maxWidth||(this.embedSetting.maxWidth=a(".xe_content").width()),b&&(b&&3==b.nodeType&&(b=a(b)),b.oembed(null,c.embedSetting).addClass("_oembed"))},extractTargets:function(b){var c=this,d=a(".xe_content",b);return d.length?void this.extractTargets(d):void a(b).contents().each(function(){var b=this.nodeName.toLowerCase();if(-1==a.inArray(b,["a","pre","xml","textarea","input","select","option","code","script","style","iframe","button","img","embed","object","ins"]))if(j.exec(""),3==this.nodeType){var d=this.nodeValue;if(d.length<5)return;if(!/(http|https|ftp|news|telnet|irc|mms):\/\//i.test(d))return;c.targets.push(this)}else c.extractTargets(this)})}});xe.registerPlugin(new k)}(jQuery);
!function(a){var b="(https?|ftp|news|telnet|irc|mms)://",c="(?:[\\w\\-]+\\.)+(?:[a-z]+)",d="(?:1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9]?[0-9])",e="(?:"+d+"\\.){3}"+d,f="(?::([0-9]+))?",g="(?:/~[\\w-]+)?",h='((?:/[\\w!"$-/:-@]+)*)',i="(?:#([\\w!-@]+))?",j=new RegExp("("+b+"("+c+"|"+e+"|localhost)"+f+g+h+i+")","ig"),k=xe.createPlugin("OEmbed",{targets:[],init:function(){this.targets=[],this.enableAutoLink=!1,this.castedOembedA=!1,this.embedSetting=[]},API_ONREADY:function(){var b=this;this.extractTargets(a(".xe_content")),this.oApp.getPlugin("autolink").length&&(this.enableAutoLink=!0),b.cast("OEMBEDA"),this.enableAutoLink||a(this.targets).each(function(){b.cast("OEMBED",[this])})},API_BEFORE_AUTOLINK:function(){var a=this;a.cast("OEMBEDA")},API_AFTER_AUTOLINK:function(a,b){this.oembed(b[0])},API_OEMBED:function(b,c){if(!this.enableAutoLink){var d=c[0];if(!a(d).parent().length||"a"==a(d).parent().get(0).nodeName.toLowerCase())return void this.oembed(a(d));var e=d.nodeValue,f=a("<span>");e=e.replace(/</g,"&lt;").replace(/>/g,"&gt;"),e=e.replace(j,'<a href="$1" target="_blank">$1</a>'),a(d).before(f),a(d).replaceWith(e),c[0]=f.next("a"),f.remove(),this.oembed(c[0])}},API_OEMBEDA:function(){if(!this.castedOembedA){var b=this;this.castedOembedA=!0,a(".read_body a").not("_oembed").each(function(){b.oembed(a(this))})}},oembed:function(b){var c=this;this.embedSetting.maxWidth||(this.embedSetting.maxWidth=a(".xe_content").width()),b&&(b&&3==b.nodeType&&(b=a(b)),b.oembed(null,c.embedSetting).addClass("_oembed"))},extractTargets:function(b){var c=this,d=a(".xe_content",b);return d.length?void this.extractTargets(d):void a(b).contents().each(function(){var b=this.nodeName.toLowerCase();if(-1==a.inArray(b,["a","pre","xml","textarea","input","select","option","code","script","style","iframe","button","img","embed","object","ins"]))if(j.exec(""),3==this.nodeType){var d=this.nodeValue;if(d.length<5)return;if(!/(http|https|ftp|news|telnet|irc|mms):\/\//i.test(d))return;c.targets.push(this)}else c.extractTargets(this)})}});xe.registerPlugin(new k)}(jQuery);

View file

@ -1 +1 @@
!function(a){function b(){var b,c,e,f,g,h=a(document.body);return d?(b=a("#xe_gallery_controls"),c=a("#xe_gallery_holder"),e=a("#xe_gallery_closebtn"),f=a("#xe_gallery_prevbtn"),g=a("#xe_gallery_nextbtn")):(d=a("<div>").attr("id","xe_gallery_screen").css({position:"fixed",display:"none",backgroundColor:"black",zIndex:500,opacity:.7}),b=a("<div>").attr("id","xe_gallery_controls").css({position:"fixed",display:"none",overflow:"hidden",zIndex:510}),f=a('<button type="button" id="xe_gallery_prevbtn" />').css({left:"10px",backgroundPosition:"0 -64px"}).click(function(){d.xePrev()}).appendTo(b),e=a('<button type="button" id="xe_gallery_closebtn" />').css({top:"10px",backgroundPosition:"0 0"}).click(function(){d.xeHide()}).appendTo(b),g=a('<button type="button" id="xe_gallery_nextbtn" />').attr("id","xe_gallery_nextbtn").css({right:"10px",backgroundPosition:"0 -128px"}).click(function(){d.xeNext()}).appendTo(b),b.find(">button").css({position:"absolute",width:"64px",height:"64px",zIndex:530,cursor:"pointer",border:0,margin:0,padding:0,backgroundColor:"transparent",backgroundImage:"url("+request_uri+"addons/resize_image/btn.png)",backgroundRepeat:"no-repeat",opacity:".5",filter:"alpha(opacity=50)"}).mouseover(function(){a(this).css({opacity:"1",filter:"alpha(opacity=100)"})}).mouseout(function(){a(this).css({opacity:".5",filter:"alpha(opacity=50)"})}).focus(function(){a(this).trigger("mouseover")}).blur(function(){a(this).trigger("mouseout")}),c=a(new Image),c.attr("id","xe_gallery_holder").css({border:"5px solid white",zindex:520,maxWidth:"none",borderRadius:"5px",boxShadow:"0 0 10px #000"}).appendTo(b).draggable(),h.append(d).append(b),c.live("load",function(){var b=a(window).width(),d=a(window).height();c.css({left:b/2-c.width()/2+"px",top:d/2-c.height()/2+"px"})}),d.xeShow=function(){var b=(a(window).width(),a(window).height());a("#xe_gallery_controls,#xe_gallery_screen").show().css({top:0,right:0,bottom:0,left:0}),a("#xe_gallery_prevbtn,#xe_gallery_nextbtn").css("top",Math.round(b/2-32)+"px"),this.xeMove(0)},d.xeHide=function(a){d.hide(),b.hide()},d.xePrev=function(){this.xeMove(-1)},d.xeNext=function(){this.xeMove(1)},d.xeMove=function(b){var d=a(window).width(),h=a(window).height();this.index+=b,f.css("visibility",this.index>0?"visible":"hidden"),g.css("visibility",this.index<this.list.size()-1?"visible":"hidden");var i=this.list.eq(this.index).attr("rawsrc");i||(i=this.list.eq(this.index).attr("src")),c.attr("src",i).removeAttr("width").removeAttr("height"),c.width()>0&&c.css({left:d/2-c.width()/2+"px",top:h/2-c.height()/2+"px"}),e.css({left:d/2-32+"px",top:"10px"}).focus()},a(document).keydown(function(a){return 27==a.which?(d.xeHide(),!1):!0})),d}function c(c){var d=a(this).closest(".xe_content"),e=d.find("img[rel=xe_gallery]"),f=a.inArray(a(this).get(0),e.get()),g=b();g.list=e,g.index=f,g.xeShow()}var d=null;a(window).load(function(){function b(a,c){if(c||(c=0),!(c>=10)){var d=this,e={width:d.width(),height:d.height()};if(!e.width||!e.height)return void setTimeout(function(){b.call(d,a,++c)},200);if(!(e.width<=a)){var f=a/e.width;d.removeAttr("width").removeAttr("height").css({width:a,height:parseInt(e.height*f,10)})}}}var d=/(?:(modules|addons|classes|common|layouts|libs|widgets|widgetstyles)\/)/i,e=/(?:common\/tpl\/images\/blank\.gif$)/i,f=a('<div style="height:1px;overflow:hidden;opacity:0;display:block;clear:both"></div>');a(".xe_content").each(function(){var g=f.appendTo(this).width();f.remove(),g&&(a("img",this).each(function(){var c=a(this),f=c.attr("src");(!d.test(f)||e.test(f))&&(c.attr("rel","xe_gallery"),b.call(c,g))}),a("img[rel=xe_gallery]",this).live("mouseover",function(){var b=a(this);b.parent("a").length||b.attr("onclick")||b.css("cursor","pointer").click(c)}))})})}(jQuery);
!function(a){function b(){var b,c,e,f,g,h=a(document.body);return d?(b=a("#xe_gallery_controls"),c=a("#xe_gallery_holder"),e=a("#xe_gallery_closebtn"),f=a("#xe_gallery_prevbtn"),g=a("#xe_gallery_nextbtn")):(d=a("<div>").attr("id","xe_gallery_screen").css({position:"fixed",display:"none",backgroundColor:"black",zIndex:500,opacity:.7}),b=a("<div>").attr("id","xe_gallery_controls").css({position:"fixed",display:"none",overflow:"hidden",zIndex:510}),f=a('<button type="button" id="xe_gallery_prevbtn" />').css({left:"10px",backgroundPosition:"0 -64px"}).click(function(){d.xePrev()}).appendTo(b),e=a('<button type="button" id="xe_gallery_closebtn" />').css({top:"10px",backgroundPosition:"0 0"}).click(function(){d.xeHide()}).appendTo(b),g=a('<button type="button" id="xe_gallery_nextbtn" />').attr("id","xe_gallery_nextbtn").css({right:"10px",backgroundPosition:"0 -128px"}).click(function(){d.xeNext()}).appendTo(b),b.find(">button").css({position:"absolute",width:"64px",height:"64px",zIndex:530,cursor:"pointer",border:0,margin:0,padding:0,backgroundColor:"transparent",backgroundImage:"url("+request_uri+"addons/resize_image/btn.png)",backgroundRepeat:"no-repeat",opacity:".5",filter:"alpha(opacity=50)"}).mouseover(function(){a(this).css({opacity:"1",filter:"alpha(opacity=100)"})}).mouseout(function(){a(this).css({opacity:".5",filter:"alpha(opacity=50)"})}).focus(function(){a(this).trigger("mouseover")}).blur(function(){a(this).trigger("mouseout")}),c=a(new Image),c.attr("id","xe_gallery_holder").css({border:"5px solid white",zindex:520,maxWidth:"none",borderRadius:"5px",boxShadow:"0 0 10px #000"}).appendTo(b).draggable(),h.append(d).append(b),c.live("load",function(){var b=a(window).width(),d=a(window).height();c.css({left:b/2-c.width()/2+"px",top:d/2-c.height()/2+"px"})}),d.xeShow=function(){var b=(a(window).width(),a(window).height());a("#xe_gallery_controls,#xe_gallery_screen").show().css({top:0,right:0,bottom:0,left:0}),a("#xe_gallery_prevbtn,#xe_gallery_nextbtn").css("top",Math.round(b/2-32)+"px"),this.xeMove(0)},d.xeHide=function(){d.hide(),b.hide()},d.xePrev=function(){this.xeMove(-1)},d.xeNext=function(){this.xeMove(1)},d.xeMove=function(b){var d=a(window).width(),h=a(window).height();this.index+=b,f.css("visibility",this.index>0?"visible":"hidden"),g.css("visibility",this.index<this.list.size()-1?"visible":"hidden");var i=this.list.eq(this.index).attr("rawsrc");i||(i=this.list.eq(this.index).attr("src")),c.attr("src",i).removeAttr("width").removeAttr("height"),c.width()>0&&c.css({left:d/2-c.width()/2+"px",top:h/2-c.height()/2+"px"}),e.css({left:d/2-32+"px",top:"10px"}).focus()},a(document).keydown(function(a){return 27==a.which?(d.xeHide(),!1):!0})),d}function c(){var c=a(this).closest(".xe_content"),d=c.find("img[rel=xe_gallery]"),e=a.inArray(a(this).get(0),d.get()),f=b();f.list=d,f.index=e,f.xeShow()}var d=null;a(window).load(function(){function b(a,c){if(c||(c=0),!(c>=10)){var d=this,e={width:d.width(),height:d.height()};if(!e.width||!e.height)return void setTimeout(function(){b.call(d,a,++c)},200);if(!(e.width<=a)){var f=a/e.width;d.removeAttr("width").removeAttr("height").css({width:a,height:parseInt(e.height*f,10)})}}}var d=/(?:(modules|addons|classes|common|layouts|libs|widgets|widgetstyles)\/)/i,e=/(?:common\/tpl\/images\/blank\.gif$)/i,f=a('<div style="height:1px;overflow:hidden;opacity:0;display:block;clear:both"></div>');a(".xe_content").each(function(){var g=f.appendTo(this).width();f.remove(),g&&(a("img",this).each(function(){var c=a(this),f=c.attr("src");(!d.test(f)||e.test(f))&&(c.attr("rel","xe_gallery"),b.call(c,g))}),a("img[rel=xe_gallery]",this).live("mouseover",function(){var b=a(this);b.parent("a").length||b.attr("onclick")||b.css("cursor","pointer").click(c)}))})})}(jQuery);

View file

@ -294,8 +294,7 @@ class DB
unset($oDB);
require_once($class_file);
$tmp_fn = create_function('', "return new {$class_name}();");
$oDB = $tmp_fn();
$oDB = new $class_name();
if(!$oDB)
{

View file

@ -527,7 +527,6 @@ class FileHandler
{
$oRequest = new HTTP_Request(__PROXY_SERVER__);
$oRequest->setMethod('POST');
$oRequest->_timeout = $timeout;
$oRequest->addPostData('arg', serialize(array('Destination' => $url, 'method' => $method, 'body' => $body, 'content_type' => $content_type, "headers" => $headers, "post_data" => $post_data)));
}
else
@ -571,7 +570,15 @@ class FileHandler
if($body)
$oRequest->setBody($body);
}
$oRequest->setConfig('timeout', $timeout);
if(method_exists($oRequest, 'setConfig'))
{
$oRequest->setConfig('timeout', $timeout);
}
elseif(property_exists($oRequest, '_timeout'))
{
$oRequest->_timeout = $timeout;
}
$oResponse = $oRequest->sendRequest();

File diff suppressed because one or more lines are too long

View file

@ -7,25 +7,28 @@
.xefu-container {
margin: 10px 0;
border: 1px solid #B6B6B6;
border: 1px solid #d7d8d8;
border-radius: 3px;
}
/* dropzone */
.xefu-dropzone {
border: 1px solid #EEE;
text-align: center;
background-color: #EBEBEB;
padding: 12px;
border: 1px solid #fafafa;
background-color: #f7f7f7;
border-radius: 3px;
box-sizing: border-box;
-moz-box-sizing: border-box;
}
.xefu-dropzone.in {
.in .xefu-dropzone {
background-color: #E9F3EF;
}
.xefu-dropzone.hover {
.hover .xefu-dropzone {
border: 1px dotted #9ad18f;
border-radius: 5px;
}
.xefu-dropzone.fade {
.fade .xefu-dropzone {
-webkit-transition: all 0.3s ease-out;
-moz-transition: all 0.3s ease-out;
-ms-transition: all 0.3s ease-out;
@ -141,13 +144,9 @@
height: 24px !important;
overflow: visible;
border: 1px solid #bbbbbb;
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
border-bottom-color: #a2a2a2;
border-radius: 2px;
text-decoration: none !important;
text-align: center;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
vertical-align: top;
line-height: 24px !important;
font-family: inherit;
@ -199,3 +198,33 @@ button.xefu-btn {
cursor: pointer;
background: none;
}
p.xefu-dropzone-message {
display: inline-block;
margin: 0;
margin-left: 5px;
line-height: 24px;
vertical-align: middle;
}
.xefu-dropzone:hover p.xefu-dropzone-message,
.in .xefu-dropzone p.xefu-dropzone-message,
.hover .xefu-dropzone p.xefu-dropzone-message,
.fade .xefu-dropzone p.xefu-dropzone-message {
display: none;
}
.upload_info {
display: none;
margin: 0;
margin-left: 5px;
line-height: 24px;
vertical-align: middle;
}
.xefu-dropzone:hover .upload_info,
.in .xefu-dropzone .upload_info,
.hover .xefu-dropzone .upload_info,
.fade .xefu-dropzone .upload_info {
display: inline-block;
margin: 0;
margin-left: 5px;
}

View file

@ -41,32 +41,41 @@
];
var XeUploader = xe.createApp('XeUploader', {
files: {},
selected_files: {},
settings: {},
last_selected_file: null,
editor_sequence: null,
init : function() {
},
deactivate: function() {
console.log(this);
},
createInstance: function(containerEl, opt) {
var self = this;
var $container = this.$container = containerEl;
var $container = containerEl;
var data = $container.data();
this.editor_sequence = data.editorSequence;
$.extend(data, {
files: {},
selected_files: {},
settings: {},
last_selected_file: null,
});
var settings = {
url: request_uri.setQuery('module', 'file').setQuery('act', 'procFileUpload'),
formData: {"editor_sequence": data.editorSequence, "upload_target_srl" : data.uploadTargetSrl, "mid" : window.current_mid},
url: request_uri
.setQuery('module', 'file')
.setQuery('act', 'procFileUpload')
.setQuery('mid', window.current_mid),
formData: {
"editor_sequence": data.editorSequence,
"upload_target_srl" : data.uploadTargetSrl,
"mid" : window.current_mid,
"act": 'procFileUpload'
},
dropZone: $container,
add: function(e, data) {
add: function(e, d) {
var dfd = jQuery.Deferred();
$.each(data.files, function(index, file) {
if(self.settings.maxFileSize <= file.size) {
$.each(d.files, function(index, file) {
if(data.settings.maxFileSize <= file.size) {
dfd.reject();
alert(window.xe.msg_exceeds_limit_size);
return false;
@ -75,7 +84,7 @@
});
dfd.done(function(){
data.submit();
d.submit();
});
},
done: function(e, res) {
@ -93,77 +102,87 @@
}
},
stop: function() {
self.loadFilelist();
self.loadFilelist($container);
},
start: function() {
self.settings.progressbarGraph.width(0);
self.settings.progressStatus.show();
self.settings.progressbar.show();
data.settings.progressbarGraph.width(0);
data.settings.progressStatus.show();
data.settings.progressbar.show();
},
progressall: function (e, data) {
var progress = parseInt(data.loaded / data.total * 100, 10);
self.settings.progressbarGraph.width(progress+'%');
self.settings.progressPercent.text(progress+'%');
progressall: function (e, d) {
var progress = parseInt(d.loaded / d.total * 100, 10);
data.settings.progressbarGraph.width(progress+'%');
data.settings.progressPercent.text(progress+'%');
if(progress >= 100) {
self.settings.progressbar.delay(3000).slideUp();
self.settings.progressStatus.delay(3000).slideUp();
data.settings.progressbar.delay(3000).slideUp();
data.settings.progressStatus.delay(3000).slideUp();
}
}
};
this.settings = $.extend({} , default_settings, settings, opt || {});
data.settings = $.extend({} , default_settings, settings, opt || {});
$container.data(data);
$.each(_elements, function(idx, val) {
if(typeof self.settings[val] === 'string') self.settings[val] = $container.find(self.settings[val]);
if(typeof data.settings[val] === 'string') data.settings[val] = $container.find(data.settings[val]);
});
var INS = $container.fileupload(this.settings)
.prop('disabled', !$.support.fileInput)
.parent()
.addClass($.support.fileInput ? undefined : 'disabled');
var INS = $container.fileupload(data.settings)
.prop('disabled', !$.support.fileInput)
.parent()
.addClass($.support.fileInput ? undefined : 'disabled');
$container.data('xefu-instance', this);
// 파일 목록 불러오기
this.loadFilelist();
this.loadFilelist($container);
// 본문 삽입
this.settings.actSelectedInsertContent.on('click', function() {
self.insertToContent();
data.settings.actSelectedInsertContent.on('click', function() {
self.insertToContent($container);
});
// 파일 삭제
this.settings.actSelectedDeleteFile.on('click', function() {
self.deleteFile();
data.settings.actSelectedDeleteFile.on('click', function() {
self.deleteFile($container);
});
// finderSelect
var fileselect = this.settings.fileList.finderSelect({children:"li"});
this.settings.fileList.on("mousedown", 'img', function(e){ e.preventDefault(); });
var fileselect = data.settings.fileList.finderSelect({children:"li", enableDesktopCtrlDefault:true});
console.log(data.settings.fileList);
data.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.fileList.find('input:checked');
self.selected_files = selected;
var selected = data.settings.fileList.find('input:checked');
data.selected_files = selected;
});
fileselect.finderSelect('addHook','unHighlight:after', function(el) {
el.find('input').prop('checked', false);
var selected = self.settings.fileList.find('input:checked');
self.selected_files = selected;
var selected = data.settings.fileList.find('input:checked');
data.selected_files = selected;
});
fileselect.on("click", ":checkbox", function(e){
e.preventDefault();
});
$(document).bind('dragover', function (e) {
var timeout = window.dropZoneTimeout,
dropZone = self.settings.dropZone;
dropZone = data.settings.dropZone;
if (!timeout) {
dropZone.addClass('in');
} else {
clearTimeout(timeout);
}
var found = false,
node = e.target;
do {
if (node === dropZone[0]) {
found = true;
@ -171,16 +190,20 @@
}
node = node.parentNode;
} while (node != null);
if (found) {
dropZone.addClass('hover');
} else {
dropZone.removeClass('hover');
}
window.dropZoneTimeout = setTimeout(function () {
window.dropZoneTimeout = null;
dropZone.removeClass('in hover');
}, 100);
});
$container.data(data);
},
done: function() {
// this.loadFilelist();
@ -192,13 +215,14 @@
unselectImageFiles: function() {},
unselectNonImageFiles: function() {},
insertToContent: function() {
insertToContent: function($container) {
var self = this;
var temp_code = '';
var data = $container.data();
$.each(this.selected_files, function(idx, file) {
$.each(data.selected_files, function(idx, file) {
var file_srl = $(file).data().fileSrl;
var fileinfo = self.files[file_srl];
var fileinfo = data.files[file_srl];
if(!fileinfo) return;
@ -211,18 +235,19 @@
});
_getCkeInstance(this.editor_sequence).insertHtml(temp_code, "unfiltered_html");
_getCkeInstance(data.editorSequence).insertHtml(temp_code, "unfiltered_html");
},
/**
* 지정된 하나의 파일 또는 다중 선택된 파일 삭제
*/
deleteFile: function(file_srl) {
deleteFile: function($container, file_srl) {
var self = this;
var file_srls = [];
var data = $container.data();
if(!file_srl)
{
$.each(self.selected_files, function(idx, file) {
$.each(data.selected_files, function(idx, file) {
if(!file) return;
var file_srl = $(file).data().fileSrl;
@ -237,38 +262,38 @@
file_srls = file_srls.join(',');
exec_json('file.procFileDelete', {'file_srls': file_srls, 'editor_sequence': this.editor_sequence}, function() {
exec_json('file.procFileDelete', {'file_srls': file_srls, 'editor_sequence': data.editorSequence}, function() {
file_srls = file_srls.split(',');
$.each(file_srls, function(idx, srl){
self.settings.fileList.find('ul').find('li[data-file-srl=' + srl + ']').remove();
data.settings.fileList.find('ul').find('li[data-file-srl=' + srl + ']').remove();
});
self.loadFilelist();
self.loadFilelist($container);
});
},
},
/**
* 파일 목록 갱신
*/
loadFilelist: function() {
loadFilelist: function($container) {
var self = this;
var data = this.$container.data();
var data = $container.data();
var obj = {};
obj.mid = window.current_mid;
obj.editor_sequence = self.$container.data('editor-sequence');
obj.editor_sequence = data.editorSequence;
$.exec_json('file.getFileList', obj, function(res){
data.uploadTargetSrl = res.upload_target_srl;
editorRelKeys[self.$container.data('editor-sequence')].primary.value = res.upload_target_srl;
editorRelKeys[data.editorSequence].primary.value = res.upload_target_srl;
data.uploadTargetSrl = res.uploadTargetSrl;
// @TODO 정리
$('.allowed_filetypes').text(res.allowed_filetypes);
$('.allowed_filesize').text(res.allowed_filesize);
$('.allowed_attach_size').text(res.allowed_attach_size);
$('.attached_size').text(res.attached_size);
$('.file_count').text(res.files.length);
$container.find('.allowed_filetypes').text(res.allowed_filetypes);
$container.find('.allowed_filesize').text(res.allowed_filesize);
$container.find('.allowed_attach_size').text(res.allowed_attach_size);
$container.find('.attached_size').text(res.attached_size);
$container.find('.file_count').text(res.files.length);
var tmpl_fileitem = self.settings.tmplXeUploaderFileitem;
var tmpl_fileitem_image = self.settings.tmplXeUploaderFileitemImage;
var tmpl_fileitem = data.settings.tmplXeUploaderFileitem;
var tmpl_fileitem_image = data.settings.tmplXeUploaderFileitemImage;
var template_fileimte = Handlebars.compile(tmpl_fileitem);
var template_fileimte_image = Handlebars.compile(tmpl_fileitem_image);
var result_image = [];
@ -276,16 +301,17 @@
// 첨부된 파일이 없으면 감춤
if(!res.files.length) {
self.settings.fileList.hide();
self.settings.controll.hide();
data.settings.fileList.hide();
data.settings.controll.hide();
return;
}
// 이미지와 그외 파일 분리
$.each(res.files, function (index, file) {
if(self.files[file.file_srl]) return;
if(data.files[file.file_srl]) return;
self.files[file.file_srl] = file;
data.files[file.file_srl] = file;
$container.data(data);
if(/\.(jpe?g|png|gif)$/i.test(file.source_filename)) {
result_image.push(template_fileimte_image(file));
@ -297,12 +323,12 @@
});
// 파일 목록
self.settings.filelistImages.append(result_image.join(''));
self.settings.filelist.append(result.join(''));
data.settings.filelistImages.append(result_image.join(''));
data.settings.filelist.append(result.join(''));
// 컨트롤, 리스트 표시
self.settings.controll.show()
self.settings.fileList.show();
data.settings.controll.show()
data.settings.fileList.show();
});
}
});
@ -319,16 +345,7 @@
return u;
};
xe.unregisterApp();
// Shortcut function in XE
// xe.createXeUploader = function(browseButton, opts) {
// var u = new XeUploader(browseButton, opts);
// if(u) xe.registerApp(u);
// return u;
// };
})(jQuery);

2
common/js/x.min.js vendored

File diff suppressed because one or more lines are too long

4
common/js/xe.min.js vendored

File diff suppressed because one or more lines are too long

View file

@ -6,7 +6,7 @@
$js_files=Context::getJsFile();
}
<!DOCTYPE html>
<html lang="{$lang_type}">
<html lang="{str_replace('jp','ja',$lang_type)}">
<head>
<!-- META -->
<meta charset="utf-8">

View file

@ -5,7 +5,7 @@
$js_files=Context::getJsFile();
}
<!DOCTYPE html>
<html lang="{$lang_type}" class="xe-mobilelayout">
<html lang="{str_replace('jp','ja',$lang_type)}" class="xe-mobilelayout">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />

View file

@ -72,12 +72,12 @@ else
/**
* Location site
*/
define('_XE_LOCATION_SITE_', 'http://www.xpressengine.org/');
define('_XE_LOCATION_SITE_', 'http://www.xpressengine.com/');
/**
* Download server
*/
define('_XE_DOWNLOAD_SERVER_', 'http://en.download.xpressengine.org/');
define('_XE_DOWNLOAD_SERVER_', 'http://download.xpressengine.com/');
}
/*
@ -282,151 +282,147 @@ if(version_compare(PHP_VERSION, '5.3.0') >= 0)
date_default_timezone_set(@date_default_timezone_get());
}
if(!defined('__XE_LOADED_CLASS__'))
// Require a function-defined-file for simple use
require(_XE_PATH_ . 'config/func.inc.php');
if(__DEBUG__) {
define('__StartTime__', getMicroTime());
}
if(__DEBUG__) {
$GLOBALS['__elapsed_class_load__'] = 0;
}
$GLOBALS['__xe_autoload_file_map'] = array_change_key_case(array(
'CacheBase' => 'classes/cache/CacheHandler.class.php',
'CacheHandler' => 'classes/cache/CacheHandler.class.php',
'Context' => 'classes/context/Context.class.php',
'DB' => 'classes/db/DB.class.php',
'Query' => 'classes/db/queryparts/Query.class.php',
'Subquery' => 'classes/db/queryparts/Subquery.class.php',
'Condition' => 'classes/db/queryparts/condition/Condition.class.php',
'ConditionGroup' => 'classes/db/queryparts/condition/ConditionGroup.class.php',
'ConditionSubquery' => 'classes/db/queryparts/condition/ConditionSubquery.class.php',
'ConditionWithArgument' => 'classes/db/queryparts/condition/ConditionWithArgument.class.php',
'ConditionWithoutArgument' => 'classes/db/queryparts/condition/ConditionWithoutArgument.class.php',
'ClickCountExpression' => 'classes/db/queryparts/expression/ClickCountExpression.class.php',
'documentItem' => 'modules/document/document.item.php',
'DeleteExpression' => 'classes/db/queryparts/expression/DeleteExpression.class.php',
'Expression' => 'classes/db/queryparts/expression/Expression.class.php',
'InsertExpression' => 'classes/db/queryparts/expression/InsertExpression.class.php',
'SelectExpression' => 'classes/db/queryparts/expression/SelectExpression.class.php',
'StarExpression' => 'classes/db/queryparts/expression/StarExpression.class.php',
'UpdateExpression' => 'classes/db/queryparts/expression/UpdateExpression.class.php',
'UpdateExpressionWithoutArgument' => 'classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php',
'Limit' => 'classes/db/queryparts/limit/Limit.class.php',
'OrderByColumn' => 'classes/db/queryparts/order/OrderByColumn.class.php',
'CubridTableWithHint' => 'classes/db/queryparts/table/CubridTableWithHint.class.php',
'IndexHint' => 'classes/db/queryparts/table/IndexHint.class.php',
'JoinTable' => 'classes/db/queryparts/table/JoinTable.class.php',
'MssqlTableWithHint' => 'classes/db/queryparts/table/MssqlTableWithHint.class.php',
'MysqlTableWithHint' => 'classes/db/queryparts/table/MysqlTableWithHint.class.php',
'Table' => 'classes/db/queryparts/table/Table.class.php',
'DisplayHandler' => 'classes/display/DisplayHandler.class.php',
'HTMLDisplayHandler' => 'classes/display/HTMLDisplayHandler.php',
'JSCallbackDisplayHandler' => 'classes/display/JSCallbackDisplayHandler.php',
'JSONDisplayHandler' => 'classes/display/JSONDisplayHandler.php',
'VirtualXMLDisplayHandler' => 'classes/display/VirtualXMLDisplayHandler.php',
'XMLDisplayHandler' => 'classes/display/XMLDisplayHandler.php',
'EditorHandler' => 'classes/editor/EditorHandler.class.php',
'ExtraVar' => 'classes/extravar/Extravar.class.php',
'ExtraItem' => 'classes/extravar/Extravar.class.php',
'FileHandler' => 'classes/file/FileHandler.class.php',
'FileObject' => 'classes/file/FileObject.class.php',
'FrontEndFileHandler' => 'classes/frontendfile/FrontEndFileHandler.class.php',
'Handler' => 'classes/handler/Handler.class.php',
'XEHttpRequest' => 'classes/httprequest/XEHttpRequest.class.php',
'Mail' => 'classes/mail/Mail.class.php',
'Mobile' => 'classes/mobile/Mobile.class.php',
'ModuleHandler' => 'classes/module/ModuleHandler.class.php',
'ModuleObject' => 'classes/module/ModuleObject.class.php',
'Object' => 'classes/object/Object.class.php',
'PageHandler' => 'classes/page/PageHandler.class.php',
'EmbedFilter' => 'classes/security/EmbedFilter.class.php',
'IpFilter' => 'classes/security/IpFilter.class.php',
'Password' => 'classes/security/Password.class.php',
'Purifier' => 'classes/security/Purifier.class.php',
'Security' => 'classes/security/Security.class.php',
'UploadFileFilter' => 'classes/security/UploadFileFilter.class.php',
'TemplateHandler' => 'classes/template/TemplateHandler.class.php',
'Validator' => 'classes/validator/Validator.class.php',
'WidgetHandler' => 'classes/widget/WidgetHandler.class.php',
'GeneralXmlParser' => 'classes/widget/GeneralXmlParser.class.php',
'Xml_Node_' => 'classes/xml/XmlParser.class.php',
'XmlGenerator' => 'classes/xml/XmlGenerator.class.php',
'XmlJsFilter' => 'classes/xml/XmlJsFilter.class.php',
'XmlLangParser' => 'classes/xml/XmlLangParser.class.php',
'XmlParser' => 'classes/xml/XmlParser.class.php',
'XmlQueryParser' => 'classes/xml/XmlQueryParser.class.php',
'DBParser' => 'classes/xml/xmlquery/DBParser.class.php',
'QueryParser' => 'classes/xml/xmlquery/QueryParser.class.php',
'Argument' => 'classes/xml/xmlquery/argument/Argument.class.php',
'ConditionArgument' => 'classes/xml/xmlquery/argument/ConditionArgument.class.php',
'SortArgument' => 'classes/xml/xmlquery/argument/SortArgument.class.php',
'DefaultValue' => 'classes/xml/xmlquery/queryargument/DefaultValue.class.php',
'QueryArgument' => 'classes/xml/xmlquery/queryargument/QueryArgument.class.php',
'SortQueryArgument' => 'classes/xml/xmlquery/queryargument/SortQueryArgument.class.php',
'QueryArgumentValidator' => 'classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php',
'ColumnTag' => 'classes/xml/xmlquery/tags/column/ColumnTag.class.php',
'InsertColumnTag' => 'classes/xml/xmlquery/tags/column/InsertColumnTag.class.php',
'InsertColumnTagWithoutArgument' => 'classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php',
'InsertColumnsTag' => 'classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php',
'SelectColumnTag' => 'classes/xml/xmlquery/tags/column/SelectColumnTag.class.php',
'SelectColumnsTag' => 'classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php',
'UpdateColumnTag' => 'classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php',
'UpdateColumnsTag' => 'classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php',
'ConditionGroupTag' => 'classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php',
'ConditionTag' => 'classes/xml/xmlquery/tags/condition/ConditionTag.class.php',
'ConditionsTag' => 'classes/xml/xmlquery/tags/condition/ConditionsTag.class.php',
'JoinConditionsTag' => 'classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php',
'GroupsTag' => 'classes/xml/xmlquery/tags/group/GroupsTag.class.php',
'IndexTag' => 'classes/xml/xmlquery/tags/navigation/IndexTag.class.php',
'LimitTag' => 'classes/xml/xmlquery/tags/navigation/LimitTag.class.php',
'NavigationTag' => 'classes/xml/xmlquery/tags/navigation/NavigationTag.class.php',
'QueryTag' => 'classes/xml/xmlquery/tags/query/QueryTag.class.php',
'HintTableTag' => 'classes/xml/xmlquery/tags/table/HintTableTag.class.php',
'TableTag' => 'classes/xml/xmlquery/tags/table/TableTag.class.php',
'TablesTag' => 'classes/xml/xmlquery/tags/table/TablesTag.class.php',
), CASE_LOWER);
function __xe_autoload($class_name)
{
// Require a function-defined-file for simple use
require(_XE_PATH_ . 'config/func.inc.php');
if(__DEBUG__) {
define('__StartTime__', getMicroTime());
$time_at = getMicroTime();
}
if(__DEBUG__) {
$GLOBALS['__elapsed_class_load__'] = 0;
}
$GLOBALS['__xe_autoload_file_map'] = array_change_key_case(array(
'CacheBase' => 'classes/cache/CacheHandler.class.php',
'CacheHandler' => 'classes/cache/CacheHandler.class.php',
'Context' => 'classes/context/Context.class.php',
'DB' => 'classes/db/DB.class.php',
'Query' => 'classes/db/queryparts/Query.class.php',
'Subquery' => 'classes/db/queryparts/Subquery.class.php',
'Condition' => 'classes/db/queryparts/condition/Condition.class.php',
'ConditionGroup' => 'classes/db/queryparts/condition/ConditionGroup.class.php',
'ConditionSubquery' => 'classes/db/queryparts/condition/ConditionSubquery.class.php',
'ConditionWithArgument' => 'classes/db/queryparts/condition/ConditionWithArgument.class.php',
'ConditionWithoutArgument' => 'classes/db/queryparts/condition/ConditionWithoutArgument.class.php',
'ClickCountExpression' => 'classes/db/queryparts/expression/ClickCountExpression.class.php',
'DeleteExpression' => 'classes/db/queryparts/expression/DeleteExpression.class.php',
'Expression' => 'classes/db/queryparts/expression/Expression.class.php',
'InsertExpression' => 'classes/db/queryparts/expression/InsertExpression.class.php',
'SelectExpression' => 'classes/db/queryparts/expression/SelectExpression.class.php',
'StarExpression' => 'classes/db/queryparts/expression/StarExpression.class.php',
'UpdateExpression' => 'classes/db/queryparts/expression/UpdateExpression.class.php',
'UpdateExpressionWithoutArgument' => 'classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php',
'Limit' => 'classes/db/queryparts/limit/Limit.class.php',
'OrderByColumn' => 'classes/db/queryparts/order/OrderByColumn.class.php',
'CubridTableWithHint' => 'classes/db/queryparts/table/CubridTableWithHint.class.php',
'IndexHint' => 'classes/db/queryparts/table/IndexHint.class.php',
'JoinTable' => 'classes/db/queryparts/table/JoinTable.class.php',
'MssqlTableWithHint' => 'classes/db/queryparts/table/MssqlTableWithHint.class.php',
'MysqlTableWithHint' => 'classes/db/queryparts/table/MysqlTableWithHint.class.php',
'Table' => 'classes/db/queryparts/table/Table.class.php',
'DisplayHandler' => 'classes/display/DisplayHandler.class.php',
'HTMLDisplayHandler' => 'classes/display/HTMLDisplayHandler.php',
'JSCallbackDisplayHandler' => 'classes/display/JSCallbackDisplayHandler.php',
'JSONDisplayHandler' => 'classes/display/JSONDisplayHandler.php',
'VirtualXMLDisplayHandler' => 'classes/display/VirtualXMLDisplayHandler.php',
'XMLDisplayHandler' => 'classes/display/XMLDisplayHandler.php',
'EditorHandler' => 'classes/editor/EditorHandler.class.php',
'ExtraVar' => 'classes/extravar/Extravar.class.php',
'ExtraItem' => 'classes/extravar/Extravar.class.php',
'FileHandler' => 'classes/file/FileHandler.class.php',
'FileObject' => 'classes/file/FileObject.class.php',
'FrontEndFileHandler' => 'classes/frontendfile/FrontEndFileHandler.class.php',
'Handler' => 'classes/handler/Handler.class.php',
'XEHttpRequest' => 'classes/httprequest/XEHttpRequest.class.php',
'Mail' => 'classes/mail/Mail.class.php',
'Mobile' => 'classes/mobile/Mobile.class.php',
'ModuleHandler' => 'classes/module/ModuleHandler.class.php',
'ModuleObject' => 'classes/module/ModuleObject.class.php',
'Object' => 'classes/object/Object.class.php',
'PageHandler' => 'classes/page/PageHandler.class.php',
'EmbedFilter' => 'classes/security/EmbedFilter.class.php',
'IpFilter' => 'classes/security/IpFilter.class.php',
'Password' => 'classes/security/Password.class.php',
'Purifier' => 'classes/security/Purifier.class.php',
'Security' => 'classes/security/Security.class.php',
'UploadFileFilter' => 'classes/security/UploadFileFilter.class.php',
'TemplateHandler' => 'classes/template/TemplateHandler.class.php',
'Validator' => 'classes/validator/Validator.class.php',
'WidgetHandler' => 'classes/widget/WidgetHandler.class.php',
'GeneralXmlParser' => 'classes/widget/GeneralXmlParser.class.php',
'Xml_Node_' => 'classes/xml/XmlParser.class.php',
'XmlGenerator' => 'classes/xml/XmlGenerator.class.php',
'XmlJsFilter' => 'classes/xml/XmlJsFilter.class.php',
'XmlLangParser' => 'classes/xml/XmlLangParser.class.php',
'XmlParser' => 'classes/xml/XmlParser.class.php',
'XmlQueryParser' => 'classes/xml/XmlQueryParser.class.php',
'DBParser' => 'classes/xml/xmlquery/DBParser.class.php',
'QueryParser' => 'classes/xml/xmlquery/QueryParser.class.php',
'Argument' => 'classes/xml/xmlquery/argument/Argument.class.php',
'ConditionArgument' => 'classes/xml/xmlquery/argument/ConditionArgument.class.php',
'SortArgument' => 'classes/xml/xmlquery/argument/SortArgument.class.php',
'DefaultValue' => 'classes/xml/xmlquery/queryargument/DefaultValue.class.php',
'QueryArgument' => 'classes/xml/xmlquery/queryargument/QueryArgument.class.php',
'SortQueryArgument' => 'classes/xml/xmlquery/queryargument/SortQueryArgument.class.php',
'QueryArgumentValidator' => 'classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php',
'ColumnTag' => 'classes/xml/xmlquery/tags/column/ColumnTag.class.php',
'InsertColumnTag' => 'classes/xml/xmlquery/tags/column/InsertColumnTag.class.php',
'InsertColumnTagWithoutArgument' => 'classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php',
'InsertColumnsTag' => 'classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php',
'SelectColumnTag' => 'classes/xml/xmlquery/tags/column/SelectColumnTag.class.php',
'SelectColumnsTag' => 'classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php',
'UpdateColumnTag' => 'classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php',
'UpdateColumnsTag' => 'classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php',
'ConditionGroupTag' => 'classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php',
'ConditionTag' => 'classes/xml/xmlquery/tags/condition/ConditionTag.class.php',
'ConditionsTag' => 'classes/xml/xmlquery/tags/condition/ConditionsTag.class.php',
'JoinConditionsTag' => 'classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php',
'GroupsTag' => 'classes/xml/xmlquery/tags/group/GroupsTag.class.php',
'IndexTag' => 'classes/xml/xmlquery/tags/navigation/IndexTag.class.php',
'LimitTag' => 'classes/xml/xmlquery/tags/navigation/LimitTag.class.php',
'NavigationTag' => 'classes/xml/xmlquery/tags/navigation/NavigationTag.class.php',
'QueryTag' => 'classes/xml/xmlquery/tags/query/QueryTag.class.php',
'HintTableTag' => 'classes/xml/xmlquery/tags/table/HintTableTag.class.php',
'TableTag' => 'classes/xml/xmlquery/tags/table/TableTag.class.php',
'TablesTag' => 'classes/xml/xmlquery/tags/table/TablesTag.class.php',
), CASE_LOWER);
function __xe_autoload($class_name)
if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
{
if(__DEBUG__) {
$time_at = getMicroTime();
}
require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
}
elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
{
$candidate_filename = array();
$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
$candidate_filename[] = 'php';
if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
$candidate_filename = implode('.', $candidate_filename);
if(file_exists(_XE_PATH_ . $candidate_filename))
{
require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
}
elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
{
$candidate_filename = array();
$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
$candidate_filename[] = 'php';
$candidate_filename = implode('.', $candidate_filename);
if(file_exists(_XE_PATH_ . $candidate_filename))
{
require _XE_PATH_ . $candidate_filename;
}
}
if(__DEBUG__) {
$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $time_at;
require _XE_PATH_ . $candidate_filename;
}
}
spl_autoload_register('__xe_autoload');
if(file_exists(_XE_PATH_ . '/vendor/autoload.php')) {
require _XE_PATH_ . '/vendor/autoload.php';
if(__DEBUG__) {
$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $time_at;
}
}
spl_autoload_register('__xe_autoload');
if(file_exists(_XE_PATH_ . '/vendor/autoload.php')) {
require _XE_PATH_ . '/vendor/autoload.php';
}
/* End of file config.inc.php */
/* Location: ./config/config.inc.php */

View file

@ -724,22 +724,19 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = TRUE)
$month = (int) substr($str, 4, 2);
$day = (int) substr($str, 6, 2);
// leading zero?
$lz = create_function('$n', 'return ($n>9?"":"0").$n;');
$trans = array(
'Y' => $year,
'y' => $lz($year % 100),
'm' => $lz($month),
'y' => sprintf('%02d', $year % 100),
'm' => sprintf('%02d', $month),
'n' => $month,
'd' => $lz($day),
'd' => sprintf('%02d', $day),
'j' => $day,
'G' => $hour,
'H' => $lz($hour),
'H' => sprintf('%02d', $hour),
'g' => $hour % 12,
'h' => $lz($hour % 12),
'i' => $lz($min),
's' => $lz($sec),
'h' => sprintf('%02d', $hour % 12),
'i' => sprintf('%02d', $min),
's' => sprintf('%02d', $sec),
'M' => getMonthName($month),
'F' => getMonthName($month, FALSE)
);
@ -1549,11 +1546,11 @@ function requirePear()
{
if(version_compare(PHP_VERSION, "5.3.0") < 0)
{
set_include_path(_XE_PATH_ . "libs/PEAR");
set_include_path(_XE_PATH_ . "libs/PEAR" . PATH_SEPARATOR . get_include_path());
}
else
{
set_include_path(_XE_PATH_ . "libs/PEAR.1.9.5");
set_include_path(_XE_PATH_ . "libs/PEAR.1.9.5" . PATH_SEPARATOR . get_include_path());
}
}

File diff suppressed because it is too large Load diff

1
layouts/xedition/css/camera.min.css vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -17,297 +17,196 @@ a:hover,a:active,a:focus{text-decoration:none}
.skip>a{display:block;overflow:hidden;height:0;line-height:28px;text-align:center}
.skip>a:focus{height:auto}
@media all and (max-width:479px) {
a.btn_top { display:none; }
/* Layout */
.container{width:100%;background-color:#fff}
.header{position:relative;z-index:2;width:100%;height:auto;margin:0 auto;zoom:1}
/* Layout */
.container{min-width:1240px;background-color:#fff}
.header{position:relative;z-index:2;width:1200px;height:100%;margin:0 auto;zoom:1}
.header>.side{float:right;z-index:2;margin:39px 0 0 22px;line-height:20px}
.visual{overflow:hidden;position:relative;z-index:1;width:100%}
.body{position:relative;padding:30px 0}
.body .content{}
.body.fixed-width {width:1200px;margin:0 auto}
.header > h1 { margin:0; padding:0 15px; line-height:50px; display:block; }
.header > h1 img { max-height:15px; }
.header.sub_type3 { position:absolute; }
/* Login */
.header>.side { display:none; }
/* Search */
.search_wrap{display:none;}
/* GNB */
.gnb{ display:; }
.gnb .menu_btn { height:22px; width:44px; position:absolute; top:14px; right:3px; display:inline-block; }
.gnb .menu_btn .menu_bar { width:20px; height:14px;position:relative; top:4px; left:12px; }
.gnb .menu_btn .menu_bar div { height:0; border-top:2px solid #383431; position:absolute; }
.header.sub_type3 .gnb .menu_btn .menu_bar div { border-top:2px solid #fff; }
.gnb .menu_btn .menu_bar div.btn1 { width:20px; top:0; }
.gnb .menu_btn .menu_bar div.btn2 { width:20px; top:6px; transition:all 0.1s }
.gnb .menu_btn .menu_bar div.btn3 { width:20px; bottom:0; }
.gnb .menu_btn.opened .menu_bar div.btn1 { top:6px; width:20px; -webkit-transform:rotate(45deg); -o-transform:rotate(45deg); transform:rotate(45deg); }
.gnb .menu_btn.opened .menu_bar div.btn2 { top:6px; display:none; }
.gnb .menu_btn.opened .menu_bar div.btn3 { top:6px; width:20px; -webkit-transform:rotate(-45deg); -o-transform:rotate(-45deg); transform:rotate(-45deg); }
.gnb > ul { display:none; padding:0 14px 14px 14px; max-height:240px; overflow-x: scroll; border-bottom:1px solid #eaeaea; background:#fff; -webkit-overflow-scrolling:touch; }
.gnb > ul > li { }
.gnb > ul > li > a { color:#555; font-weight:bold; }
.gnb a { font-size:14px; display:block; padding:10px 0; border-top:1px solid #eee; }
.gnb > ul > li:first-child > a { border-top:0; }
.gnb > ul > li > ul > li > a { color:#555; }
.gnb > ul > li > ul > li > ul > li > a { color:#999; }
.body { }
.body .lnb { display:none; }
.body .content { overflow:hidden; }
.visual.sub{position:relative;padding:15px 14px 30px 14px;background-color:#f6f6f6;line-height:30px}
.visual.sub .sub_title{position:relative;z-index:2;width:;margin:0 auto}
.visual.sub .sub_title h1{position:relative;font-weight:700;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;font-size:17px;color:#444}
.visual.sub .sub_title h1:after{position:absolute;top:115%;left:0;width:22px;height:2px;background-color:#444;content:''}
.visual.sub .bg_img{display:none;position:absolute;top:0;left:0;z-index:0;width:100%;height:100%;background-position:50% 50%;background-repeat:no-repeat;background-size:cover}
.visual.sub.sub_type2{padding:70px 0}
.visual.sub.sub_type2 .bg_img{display:block}
.visual.sub.sub_type2 .sub_title h1{color:#fff;font-weight:400;font-size:23px;letter-spacing:1px}
.visual.sub.sub_type2 .sub_title h1:after,
.visual.sub.sub_type3 .sub_title h1:after{background:none}
.visual.sub.sub_type3{padding:100px 0 90px;line-height:40px;text-align:center}
.visual.sub.sub_type3 .bg_img{display:block;background-attachment:fixed;background-size:auto auto}
.visual.sub.sub_type3 .sub_title h1{font-size:39px;font-weight:400;color:#fff;letter-spacing:2px}
.swiper-container { height:270px; font-family: Raleway,'나눔바른고딕',NanumBarunGothic,ng,'돋움',Dotum,AppleGothic,Helvetica,serif; }
.swiper-container > div > div { display: table; height:270px; color:#fff; }
.swiper-container > div > div > div { display: table-cell; vertical-align: middle; }
.swiper-container > div > div > div > div { padding:0 14px; }
.swiper-container h1 { font-weight:600; margin:0 0 10px 0; font-size:30px; line-height:40px; text-decoration: none; }
.swiper-container p { font-size: 15px; line-height: 18px; }
.footer { border-top:1px solid #e4e4e4; border-bottom:3px solid #cda25a; background-color:#f1f1f1; }
.footer a:hover,.footer a:focus{text-decoration:none}
.footer .f_info_area{ padding:0; }
.footer .f_info2{ display:none; }
.footer .f_logo { padding:8px 15px; }
.footer .f_logo img { max-height:30px; }
.footer .sub_desc { display:none; }
.footer .f_cr_area { padding:0;background-color:#555; color:#fff; }
.footer .f_cr_area p { margin:0; padding:8px 14px; }
.footer .f_cr_area a { color:#fff; }
.footer .f_cr_area .mobile-footer-member { padding:0; margin:0; border-top:1px solid #444; list-style:none; overflow:hidden; }
.footer .f_cr_area .mobile-footer-member li { float:left; width:33.3%; border-left:1px solid #444; box-sizing:border-box; }
.footer .f_cr_area .mobile-footer-member li:first-child { border-left:0; }
.footer .f_cr_area .mobile-footer-member li a { display:block; line-height:32px; text-align:center; }
/* button */
.btn_item{display:inline-block;margin:35px 0;padding:0 27px;height:50px;font-family: "Open Sans";background-color:#555;font-size:14px;line-height:50px;letter-spacing:1px;color:#FFF;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
.btn_item:hover,
.btn_item:active
.btn_item:focus{background-color:#CBA061;color:#fff}
.btn_item + .btn_item {margin-left: 10px; }
}
.header:after,.body:after{display:block;clear:both;content:''}
.content{zoom:1}
.content:after{display:block;clear:both;content:''}
.content>:first-child{margin-top:0}
.content img{max-width:100%;height:auto}
@media all and (min-width: 480px){
/* Layout */
.container{min-width:1240px;background-color:#fff}
.header{position:relative;z-index:2;width:1240px;height:100%;margin:0 auto;zoom:1}
.header>.side{float:right;z-index:2;margin:39px 0 0 22px;line-height:20px}
.visual{overflow:hidden;position:relative;z-index:1;width:100%}
.body{position:relative;padding:30px 0}
.body .content{}
.body.fixed-width {width:1200px;margin:0 auto}
.header:after,.body:after{display:block;clear:both;content:''}
.content{zoom:1}
.content:after{display:block;clear:both;content:''}
.content>:first-child{margin-top:0}
.content img{max-width:100%;height:auto}
/* Header */
.header>h1{float:left;padding:20px 0 20px 0;margin-right:32px;line-height:60px;}
.header>h1 img{vertical-align:middle; max-height:40px; padding-left:20px; }
/* Fixed Header */
.container.fixed_header{padding-top:100px}
.fixed_header .header_wrap{position:absolute;top:0;left:0;width:100%;z-index:1000}
.fixed_header .header_wrap.shrink{position:fixed;top:0;width:100%;z-index:1000;border-bottom:1px solid #e1e1e1;background-color:#fff;-webkit-animation:ani-header 0.5s forwards;animation:ani-header 0.5s forwards}
.fixed_header .header_wrap.shrink .header>h1{padding:0}
.fixed_header .header_wrap.shrink .gnb>ul>li>a{line-height:60px}
.fixed_header .header_wrap.shrink .header>.side{margin:19px 0 0 22px}
.fixed_header .header_wrap.shrink .search_area{padding:0 20px}
/* Footer */
.footer{border-top:1px solid #e4e4e4;border-bottom:3px solid #cda25a;background-color:#f1f1f1;font-family:'Open Sans','나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif}
.footer a:hover,.footer a:focus{text-decoration:none}
.footer .f_info_area{overflow:hidden;width:1200px;margin:0 auto;padding:48px 0 40px}
.footer .f_cr_area{padding:19px;background-color:#555}
.footer .copyright{width:1200px;margin:0 auto;font-size:13px;color:#f1f1f1;line-height:16px}
.footer .copyright a{color:#f1f1f1}
.footer .copyright a:hover,
.footer .copyright a:focus,
.footer .copyright a:active{color:#cda25a}
.footer .copyright span{display:inline-block;margin-left:60px}
.footer .sub_desc{margin-bottom:16px;font-size:13px;color:#888;line-height:22px}
.footer .f_info{float:left;width:240px;margin-right:65px}
.footer .f_logo{overflow:hidden;max-width:100%;margin-bottom:16px;font-size:24px;color:#555}
.footer .f_logo.log_txt a{font-size:24px;font-weight:bold;color:#555}
.footer .f_logo img{max-width:240px}
.footer .f_info2{overflow:hidden;margin-top:7px}
.footer .site_map > ul{display:inline-block;overflow:hidden;background:url(../img/bg_sitemap.png) repeat-y}
.footer .site_map > ul li{float:left;width:282px;margin:0 0 0 24px}
.footer .site_map > ul li:first-child,.footer .site_map > ul li.clear{clear:both;margin-left:0}
.footer .site_map > ul li a{display:inline-block;margin:0 0 20px;padding:0 23px;font-size:15px;font-weight:bold;color:#555}
.footer .site_map > ul ul{overflow:hidden;margin:0 0 10px}
.footer .site_map > ul ul li{margin-left:0}
.footer .site_map > ul ul a{margin:0 0 13px;font-size:13px;font-weight:normal;color:#888;line-height:18px}
.footer .site_map > ul ul a:hover,
.footer .site_map > ul ul a:focus,
.footer .site_map > ul ul a:active{color:#555}
.footer .f_cr_area .mobile-footer-member { display:none; }
/* button */
.btn_item{display:inline-block;margin:35px 0;padding:0 27px;height:50px;font-family: "Open Sans";background-color:#555;font-size:14px;line-height:50px;letter-spacing:1px;color:#FFF;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
.btn_item:hover,
.btn_item:active
.btn_item:focus{background-color:#CBA061;color:#fff}
.btn_item + .btn_item {margin-left: 10px; }
/* Login */
.header>.side { padding:0 20px 0 0; }
.header>.side>ul>li{float:left;position:relative}
.header>.side>ul:after{display:block;clear:both;content:''}
.header>.side>ul>li>a{display:block;width:22px;height:22px;margin-left:12px;font-size:22px;line-height:22px;color:#888;text-align:center}
.header>.side>ul>li>a:hover,.header>.side>ul>li>a:focus,.header>.side>ul>li>a:active,.header>.side>ul>li.on>a{color:#444}
.header>.side>ul .ly{position:relative;position:absolute;top:100%;right:0;margin-top:13px;background-color:#f9f9f9}
.header>.side>ul .ly.ly_login{overflow:hidden;margin-top:0;background:url('../img/blank.gif') 0 0 repeat;height:0}
.header>.side>ul .ly.ly_login ul{position:relative;margin-top:18px;padding:8px 0;background-color:#333;z-index:3}
.header>.side>ul .on .ly.ly_login{height:auto}
.header>.side>ul .ly a{display:block;min-width:120px;height:40px;padding:0 20px;line-height:40px;font-size:13px;color:#9d9d9d}
.header>.side>ul .ly a:hover{color:#cda25a;text-decoration:none}
.header>.side>ul>li .login_after{overflow:hidden;width:40px;height:40px;margin-top:-9px;border-radius:100%}
.header>.side>ul>li .login_after img{width:40px;height:40px}
.header>.side>ul>li .login_after ~ .ly_login .edge{right:11px}
/* Magazine Header Type */
.custom_area{display:none}
.magazine .header{text-align:center}
.magazine .header>h1{float:none;display:inline-block;margin:0;padding:80px 0 20px;vertical-align:top}
.magazine .header>.side{float:none;position:absolute;top:0;right:0;margin:30px 0 0}
.magazine .gnb{float:none;max-width:100%;margin-bottom:40px}
.magazine .gnb>ul{display:inline-block;vertical-align:top}
.magazine .gnb>ul>li>a{position:relative;line-height:60px}
.magazine .gnb>ul>li>a:after{position:absolute;top:50%;left:-1px;width:1px;height:16px;margin-top:-8px;background-color:#888;content:''}
.magazine .gnb>ul>li:first-child>a:after{background:none}
.magazine .gnb>ul .depth2:after{background:none}
.magazine .gnb>ul .depth2,.magazine .gnb>ul .depth3{background-color:#f7f7f7}
.magazine .gnb>ul .depth2 a,.magazine .header>.side>ul .ly a{color:#999}
.magazine .header>.side>ul .ly a:hover{color:red}
.magazine .gnb>ul>li>a:hover,.magazine .gnb>ul>li>a:focus,.magazine .gnb>ul>li>a:focus,.magazine .gnb>ul>li.on>a,.magazine .header>.side>ul>li.on>a,.magazine .header>.side>ul .ly a:hover{color:#cda25a}
.magazine .header>.side>ul .ly.ly_login ul{background-color:#f7f7f7;text-align:left}
.magazine .edge{border-color:transparent transparent #f7f7f7}
.magazine .header>.side>ul>li>a:hover,
.magazine .header>.side>ul>li>a:focus,
.magazine .header>.side>ul>li>a:active{color:#cda25a}
.magazine .custom_area{display:block;position:absolute;top:30px;left:0}
.magazine .custom_area li{float:left;margin-right:30px}
.magazine .custom_area a{font-size:13px;line-height:15px;color:#999}
.magazine .custom_area a:hover,.magazine .custom_area a:hover,.magazine .custom_area a:hover{color:#cda25a}
.magazine .search_area{padding:10px 20px}
/* Onepage Header Type */
.onepage .header_wrap{position:absolute;top:0;left:0;width:100%;z-index:1000}
.onepage .gnb>ul{background:url(../img/blank.gif) 0 0 repeat}
.onepage .gnb>ul>li>a{line-height:60px;color:#f6f6f6}
.onepage .gnb>ul>li>a:hover,.onepage .gnb>ul>li>a:focus,.onepage .gnb>ul>li>a:focus,.onepage .gnb>ul>li.on>a{color:#fff}
.onepage .shrink .gnb>ul>li>a{color:#888}
.onepage .shrink .gnb>ul>li>a:hover,.onepage .shrink .gnb>ul>li>a:focus,.onepage .shrink .gnb>ul>li>a:focus,.onepage .shrink .gnb>ul>li.on>a{color:#444}
.onepage .header>.side>ul>li>a{color:#f6f6f6}
.onepage .header>.side>ul>li>a:hover, .onepage .header>.side>ul>li>a:focus,.onepage .header>.side>ul>li>a:active,.onepage .header>.side>ul>li.on>a{color:#fff}
.onepage .search_area .btn_close{color:#f6f6f6}
.onepage .shrink .search_area .btn_close{color:#888}
.onepage .gnb>ul .depth2:after{background:none}
.onepage .gnb{margin-top:20px}
.onepage .header>h1{padding:20px 0 0 0}
.onepage .search_area input[type=text]{color:#f6f6f6}
.onepage .shrink .search_area input[type=text]{color:#888}
.onepage .visual.sub.sub_type3 {margin-top:-100px;}
/* Search */
.search_wrap{position:relative;width:1200px;margin:0 auto}
.search_area{display:none;position:absolute;top:0;left:0;width:1160px;padding:20px;z-index:3;z-index:3}
.search_area input{font-size:13px;vertical-align:top}
.search_area input[type=text]{position:relative;width:100%;height:40px;padding:10px 0;border:0;background-color:transparent;font-size:40px;color:#444;-webkit-appearance:none;}
.search_area input[type=text]:focus{outline:0}
.search_area input[type=text]::-ms-clear{display:none}
.search_area .btn_close{position:absolute;top:50%;right:0;width:20px;height:20px;margin-top:-10px;font-size:22px;color:#888;text-align:center;line-height:20px}
/* GNB */
.gnb{float:right;position:relative;z-index:1;max-width:742px;height:100%;font-size:13px}
.gnb a{text-decoration:none;white-space:nowrap}
.gnb>ul>li{float:left;position:relative;text-align:left}
.gnb>ul:after{display:block;clear:both;content:''}
.gnb>ul>li>a{display:block;position:relative;padding:0 20px;line-height:100px;font-size:15px;font-weight:700;color:#888}
.gnb>ul>li>a:hover,.gnb>ul>li>a:focus,.gnb>ul>li>a:focus,.gnb>ul>li.on>a{color:#444}
.gnb>ul .depth2{display:none;position:absolute;top:100%;left:0;z-index:2;padding:8px 0;background-color:#333}
.gnb>ul .depth2>li{position:relative}
.gnb>ul .depth2:after{position:absolute;top:-3px;left:0;width:100%;height:3px;background-color:#cda25a;content:''}
.gnb>ul .depth2 a{display:block;position:relative;min-width:170px;height:40px;padding:0 30px 0 20px;line-height:40px;font-size:13px;color:#9d9d9d}
.gnb>ul .depth2 a:hover,.gnb>ul .depth2 a:active,.gnb>ul .depth2 a:focus,.gnb>ul .depth2>li.on>a{color:#cda25a}
.gnb>ul .depth3{display:none;position:absolute;top:-8px;left:100%;z-index:2;padding:8px 0;background-color:#333}
.gnb>ul .depth2>li.more>a:after{position:absolute;right:20px;content:'>'}
.onepage .shrink .header > .side > ul > li > a {color: #444; }
.onepage .shrink .gnb {margin-top: 0; }
.magazine .shrink .gnb {margin-bottom: 10px; }
.magazine .shrink h1 {margin-top: 10px; }
.magazine .header_wrap.shrink .gnb > ul > li > a {line-height: 40px; }
.gnb #mobile_menu_btn { display:none; }
/* VISUAL */
.visual.sub{position:relative;padding:35px 0;background-color:#f6f6f6;line-height:30px}
.visual.sub .sub_title{position:relative;z-index:2;width:1200px;margin:0 auto}
.visual.sub .sub_title h1{position:relative;font-weight:700;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;font-size:17px;color:#444}
.visual.sub .sub_title h1:after{position:absolute;top:115%;left:0;width:22px;height:2px;background-color:#444;content:''}
.visual.sub .bg_img{display:none;position:absolute;top:0;left:0;z-index:0;width:100%;height:100%;background-position:50% 50%;background-repeat:no-repeat;background-size:cover}
.visual.sub.sub_type2{padding:70px 0}
.visual.sub.sub_type2 .bg_img{display:block}
.visual.sub.sub_type2 .sub_title h1{color:#fff;font-weight:400;font-size:23px;letter-spacing:1px}
.visual.sub.sub_type2 .sub_title h1:after,
.visual.sub.sub_type3 .sub_title h1:after{background:none}
.visual.sub.sub_type3{padding:250px 0 210px;line-height:40px;text-align:center}
.visual.sub.sub_type3 .bg_img{display:block;background-attachment:fixed;background-size:auto auto}
.visual.sub.sub_type3 .sub_title h1{font-size:39px;font-weight:400;color:#fff;letter-spacing:2px}
.swiper-container { height:600px; font-family: Raleway,'나눔바른고딕',NanumBarunGothic,ng,'돋움',Dotum,AppleGothic,Helvetica,serif; }
.swiper-container > div > div { display: table; height:600px; color:#fff; }
.swiper-container > div > div > div { display: table-cell; vertical-align: middle; }
.swiper-container > div > div > div > div { width:1200px; margin:0 auto; }
.swiper-container h1 { font-weight:700; margin:0 0 19px 0; font-size:60px; line-height:70px; text-decoration: none; }
.swiper-container p { font-size: 20px; line-height: 22px; }
/* LNB */
.body.fixed-width .lnb>ul{position:relative;z-index:1;margin:0;padding:40px 0 0}
.body.fixed-width .lnb>ul>li{margin-bottom:40px}
.body.fixed-width .lnb>ul>li>a,.body.fixed-width .lnb>ul>li>span{display:block;line-height:21px;margin-bottom:14px;font-size:15px;color:#444}
.body.fixed-width .lnb ul ul li.on a{color:#cda25a}
.body.fixed-width .lnb ul ul a{display:block;padding:10px 0;font-size:14px;line-height:20px;color:#888;text-decoration:none}
.body.fixed-width .lnb ul ul a:hover,
.body.fixed-width .lnb ul ul a:focus,
.body.fixed-width .lnb ul ul a:active{color:#cda25a}
.body.fixed-width .lnb img{vertical-align:top}
.body.fixed-width.left .lnb,
.body.fixed-width.right .lnb{float:left;width:260px;padding:0 0 16px}
.body.fixed-width.left .content,
.body.fixed-width.right .content{float:right;width:900px;min-height:400px;padding:40px 0 100px}
.body.fixed-width.right .lnb{float:right}
.body.fixed-width.right .content{float:left}
.body.fixed-width.none .lnb{display:none}
.body.fixed-width.none .content{float:none;width:1200px}
/* Scroll to top link */
.btn_top{display:none;position:fixed;right:0;bottom:57px;z-index:1000;width:48px;height:48px;background-color:#555;font-size:24px;color:#fff;text-align:center;opacity:0.8;filter:alpha(opacity=80)}
.btn_top:hover{background-color:#cda25a;color:#fff;text-decoration:none;opacity:1;filter:alpha(opacity=100)}
.btn_top i{line-height:48px}
/* Header */
.header>h1{float:left;padding:20px 0;margin-right:32px;line-height:60px;}
.header>h1 img{vertical-align:middle; max-height:40px; }
}
/* Fixed Header */
.container.fixed_header{padding-top:100px}
.fixed_header .header_wrap{position:absolute;top:0;left:0;width:100%;z-index:1000}
.fixed_header .header_wrap.shrink{position:fixed;top:0;width:100%;z-index:1000;border-bottom:1px solid #e1e1e1;background-color:#fff;-webkit-animation:ani-header 0.5s forwards;animation:ani-header 0.5s forwards}
.fixed_header .header_wrap.shrink .header>h1{padding:0}
.fixed_header .header_wrap.shrink .gnb>ul>li>a{line-height:60px}
.fixed_header .header_wrap.shrink .header>.side{margin:19px 0 0 22px}
.fixed_header .header_wrap.shrink .search_area{padding:0 20px}
/* Footer */
.footer{border-top:1px solid #e4e4e4;border-bottom:3px solid #cda25a;background-color:#f1f1f1;font-family:'Open Sans','나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif}
.footer a:hover,.footer a:focus{text-decoration:none}
.footer .f_info_area{overflow:hidden;width:1200px;margin:0 auto;padding:48px 0 40px}
.footer .f_cr_area{padding:19px;background-color:#555}
.footer .copyright{width:1200px;margin:0 auto;font-size:13px;color:#f1f1f1;line-height:16px}
.footer .copyright a{color:#f1f1f1}
.footer .copyright a:hover,
.footer .copyright a:focus,
.footer .copyright a:active{color:#cda25a}
.footer .copyright span{display:inline-block;margin-left:60px}
.footer .sub_desc{margin-bottom:16px;font-size:13px;color:#888;line-height:22px}
.footer .f_info{float:left;width:240px;margin-right:65px}
.footer .f_logo{overflow:hidden;max-width:100%;margin-bottom:16px;font-size:24px;color:#555}
.footer .f_logo.log_txt a{font-size:24px;font-weight:bold;color:#555}
.footer .f_logo img{max-width:240px}
.footer .f_info2{overflow:hidden;margin-top:7px}
.footer .site_map > ul{display:inline-block;overflow:hidden;background:url(../img/bg_sitemap.png) repeat-y}
.footer .site_map > ul li{float:left;width:282px;margin:0 0 0 24px}
.footer .site_map > ul li:first-child,.footer .site_map > ul li.clear{clear:both;margin-left:0}
.footer .site_map > ul li a{display:inline-block;margin:0 0 20px;padding:0 23px;font-size:15px;font-weight:bold;color:#555}
.footer .site_map > ul ul{overflow:hidden;margin:0 0 10px}
.footer .site_map > ul ul li{margin-left:0}
.footer .site_map > ul ul a{margin:0 0 13px;font-size:13px;font-weight:normal;color:#888;line-height:18px}
.footer .site_map > ul ul a:hover,
.footer .site_map > ul ul a:focus,
.footer .site_map > ul ul a:active{color:#555}
/* button */
.btn_item{display:inline-block;margin:35px 0;padding:0 27px;height:50px;font-family: "Open Sans";background-color:#555;font-size:14px;line-height:50px;letter-spacing:1px;color:#FFF;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
.btn_item:hover,
.btn_item:active
.btn_item:focus{background-color:#CBA061;color:#fff}
.btn_item + .btn_item {margin-left: 10px; }
/* Login */
.header>.side>ul>li{float:left;position:relative}
.header>.side>ul:after{display:block;clear:both;content:''}
.header>.side>ul>li>a{display:block;width:22px;height:22px;margin-left:12px;font-size:22px;line-height:22px;color:#888;text-align:center}
.header>.side>ul>li>a:hover,.header>.side>ul>li>a:focus,.header>.side>ul>li>a:active,.header>.side>ul>li.on>a{color:#444}
.header>.side>ul .ly{position:relative;position:absolute;top:100%;right:0;margin-top:13px;background-color:#f9f9f9}
.header>.side>ul .ly.ly_login{overflow:hidden;margin-top:0;background:url('../img/blank.gif') 0 0 repeat;height:0}
.header>.side>ul .ly.ly_login ul{position:relative;margin-top:18px;padding:8px 0;background-color:#333;z-index:3}
.header>.side>ul .on .ly.ly_login{height:auto}
.header>.side>ul .ly a{display:block;min-width:120px;height:40px;padding:0 20px;line-height:40px;font-size:13px;color:#9d9d9d}
.header>.side>ul .ly a:hover{color:#cda25a;text-decoration:none}
.header>.side>ul>li .login_after{overflow:hidden;width:40px;height:40px;margin-top:-9px;border-radius:100%}
.header>.side>ul>li .login_after img{width:40px;height:40px}
.header>.side>ul>li .login_after ~ .ly_login .edge{right:11px}
/* Magazine Header Type */
.custom_area{display:none}
.magazine .header{text-align:center}
.magazine .header>h1{float:none;display:inline-block;margin:0;padding:80px 0 20px;vertical-align:top}
.magazine .header>.side{float:none;position:absolute;top:0;right:0;margin:30px 0 0}
.magazine .gnb{float:none;max-width:100%;margin-bottom:40px}
.magazine .gnb>ul{display:inline-block;vertical-align:top}
.magazine .gnb>ul>li>a{position:relative;line-height:60px}
.magazine .gnb>ul>li>a:after{position:absolute;top:50%;left:-1px;width:1px;height:16px;margin-top:-8px;background-color:#888;content:''}
.magazine .gnb>ul>li:first-child>a:after{background:none}
.magazine .gnb>ul .depth2:after{background:none}
.magazine .gnb>ul .depth2,.magazine .gnb>ul .depth3{background-color:#f7f7f7}
.magazine .gnb>ul .depth2 a,.magazine .header>.side>ul .ly a{color:#999}
.magazine .header>.side>ul .ly a:hover{color:red}
.magazine .gnb>ul>li>a:hover,.magazine .gnb>ul>li>a:focus,.magazine .gnb>ul>li>a:focus,.magazine .gnb>ul>li.on>a,.magazine .header>.side>ul>li.on>a,.magazine .header>.side>ul .ly a:hover{color:#cda25a}
.magazine .header>.side>ul .ly.ly_login ul{background-color:#f7f7f7;text-align:left}
.magazine .edge{border-color:transparent transparent #f7f7f7}
.magazine .header>.side>ul>li>a:hover,
.magazine .header>.side>ul>li>a:focus,
.magazine .header>.side>ul>li>a:active{color:#cda25a}
.magazine .custom_area{display:block;position:absolute;top:30px;left:0}
.magazine .custom_area li{float:left;margin-right:30px}
.magazine .custom_area a{font-size:13px;line-height:15px;color:#999}
.magazine .custom_area a:hover,.magazine .custom_area a:hover,.magazine .custom_area a:hover{color:#cda25a}
.magazine .search_area{padding:10px 20px}
/* Onepage Header Type */
.onepage .header_wrap{position:absolute;top:0;left:0;width:100%;z-index:1000}
.onepage .gnb>ul{background:url(../img/blank.gif) 0 0 repeat}
.onepage .gnb>ul>li>a{line-height:60px;color:#f6f6f6}
.onepage .gnb>ul>li>a:hover,.onepage .gnb>ul>li>a:focus,.onepage .gnb>ul>li>a:focus,.onepage .gnb>ul>li.on>a{color:#fff}
.onepage .shrink .gnb>ul>li>a{color:#888}
.onepage .shrink .gnb>ul>li>a:hover,.onepage .shrink .gnb>ul>li>a:focus,.onepage .shrink .gnb>ul>li>a:focus,.onepage .shrink .gnb>ul>li.on>a{color:#444}
.onepage .header>.side>ul>li>a{color:#f6f6f6}
.onepage .header>.side>ul>li>a:hover, .onepage .header>.side>ul>li>a:focus,.onepage .header>.side>ul>li>a:active,.onepage .header>.side>ul>li.on>a{color:#fff}
.onepage .search_area .btn_close{color:#f6f6f6}
.onepage .shrink .search_area .btn_close{color:#888}
.onepage .gnb>ul .depth2:after{background:none}
.onepage .gnb{margin-top:20px}
.onepage .header>h1{padding:20px 0 0}
.onepage .search_area input[type=text]{color:#f6f6f6}
.onepage .shrink .search_area input[type=text]{color:#888}
.onepage .visual.sub.sub_type3 {margin-top:-100px;}
/* Search */
.search_wrap{position:relative;width:1200px;margin:0 auto}
.search_area{display:none;position:absolute;top:0;left:0;width:1160px;padding:20px;z-index:3;z-index:3}
.search_area input{font-size:13px;vertical-align:top}
.search_area input[type=text]{position:relative;width:100%;height:40px;padding:10px 0;border:0;background-color:transparent;font-size:40px;color:#444;-webkit-appearance:none;}
.search_area input[type=text]:focus{outline:0}
.search_area input[type=text]::-ms-clear{display:none}
.search_area .btn_close{position:absolute;top:50%;right:0;width:20px;height:20px;margin-top:-10px;font-size:22px;color:#888;text-align:center;line-height:20px}
/* GNB */
.gnb{float:right;position:relative;z-index:1;max-width:742px;height:100%;font-size:13px}
.gnb a{text-decoration:none;white-space:nowrap}
.gnb>ul>li{float:left;position:relative;text-align:left}
.gnb>ul:after{display:block;clear:both;content:''}
.gnb>ul>li>a{display:block;position:relative;padding:0 20px;line-height:100px;font-size:15px;font-weight:700;color:#888}
.gnb>ul>li>a:hover,.gnb>ul>li>a:focus,.gnb>ul>li>a:focus,.gnb>ul>li.on>a{color:#444}
.gnb>ul .depth2{display:none;position:absolute;top:100%;left:0;z-index:2;padding:8px 0;background-color:#333}
.gnb>ul .depth2>li{position:relative}
.gnb>ul .depth2:after{position:absolute;top:-3px;left:0;width:100%;height:3px;background-color:#cda25a;content:''}
.gnb>ul .depth2 a{display:block;position:relative;min-width:170px;height:40px;padding:0 30px 0 20px;line-height:40px;font-size:13px;color:#9d9d9d}
.gnb>ul .depth2 a:hover,.gnb>ul .depth2 a:active,.gnb>ul .depth2 a:focus,.gnb>ul .depth2>li.on>a{color:#cda25a}
.gnb>ul .depth3{display:none;position:absolute;top:-8px;left:100%;z-index:2;padding:8px 0;background-color:#333}
.gnb>ul .depth2>li.more>a:after{position:absolute;right:20px;content:'>'}
.onepage .shrink .header > .side > ul > li > a {color: #444; }
.onepage .shrink .gnb {margin-top: 0; }
.magazine .shrink .gnb {margin-bottom: 10px; }
.magazine .shrink h1 {margin-top: 10px; }
.magazine .header_wrap.shrink .gnb > ul > li > a {line-height: 40px; }
/* VISUAL */
.visual.sub{position:relative;padding:35px 0;background-color:#f6f6f6;line-height:30px}
.visual.sub .sub_title{position:relative;z-index:2;width:1200px;margin:0 auto}
.visual.sub .sub_title h1{position:relative;font-weight:700;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;font-size:17px;color:#444}
.visual.sub .sub_title h1:after{position:absolute;top:115%;left:0;width:22px;height:2px;background-color:#444;content:''}
.visual.sub .bg_img{display:none;position:absolute;top:0;left:0;z-index:0;width:100%;height:100%;background-position:50% 50%;background-repeat:no-repeat;background-size:cover}
.visual.sub.sub_type2{padding:70px 0}
.visual.sub.sub_type2 .bg_img{display:block}
.visual.sub.sub_type2 .sub_title h1{color:#fff;font-weight:400;font-size:23px;letter-spacing:1px}
.visual.sub.sub_type2 .sub_title h1:after,
.visual.sub.sub_type3 .sub_title h1:after{background:none}
.visual.sub.sub_type3{padding:250px 0 210px;line-height:40px;text-align:center}
.visual.sub.sub_type3 .bg_img{display:block;background-attachment:fixed;background-size:auto auto}
.visual.sub.sub_type3 .sub_title h1{font-size:39px;font-weight:400;color:#fff;letter-spacing:2px}
/* LNB */
.body.fixed-width .lnb>ul{position:relative;z-index:1;margin:0;padding:40px 0 0}
.body.fixed-width .lnb>ul>li{margin-bottom:40px}
.body.fixed-width .lnb>ul>li>a,.body.fixed-width .lnb>ul>li>span{display:block;line-height:21px;margin-bottom:14px;font-size:15px;color:#444}
.body.fixed-width .lnb ul ul li.on a{color:#cda25a}
.body.fixed-width .lnb ul ul a{display:block;padding:10px 0;font-size:14px;line-height:20px;color:#888;text-decoration:none}
.body.fixed-width .lnb ul ul a:hover,
.body.fixed-width .lnb ul ul a:focus,
.body.fixed-width .lnb ul ul a:active{color:#cda25a}
.body.fixed-width .lnb img{vertical-align:top}
.body.fixed-width.left .lnb,
.body.fixed-width.right .lnb{float:left;width:260px;padding:0 0 16px}
.body.fixed-width.left .content,
.body.fixed-width.right .content{float:right;width:900px;min-height:400px;padding:40px 0 100px}
.body.fixed-width.right .lnb{float:right}
.body.fixed-width.right .content{float:left}
.body.fixed-width.none .lnb{display:none}
.body.fixed-width.none .content{float:none;width:1200px}
/* Scroll to top link */
.btn_top{display:none;position:fixed;right:0;bottom:57px;z-index:1000;width:48px;height:48px;background-color:#555;font-size:24px;color:#fff;text-align:center;opacity:0.8;filter:alpha(opacity=80)}
.btn_top:hover{background-color:#cda25a;color:#fff;text-decoration:none;opacity:1;filter:alpha(opacity=100)}
.btn_top i{line-height:48px}
/* header animation */
@-webkit-keyframes ani-header {

File diff suppressed because one or more lines are too long

View file

@ -1,444 +0,0 @@
/**
* Swiper 3.0.8
* Most modern mobile touch slider and framework with hardware accelerated transitions
*
* http://www.idangero.us/swiper/
*
* Copyright 2015, Vladimir Kharlampidi
* The iDangero.us
* http://www.idangero.us/
*
* Licensed under MIT
*
* Released on: June 14, 2015
*/
.swiper-container {
margin: 0 auto;
position: relative;
overflow: hidden;
/* Fix of Webkit flickering */
z-index: 1;
}
.swiper-container-no-flexbox .swiper-slide {
float: left;
}
.swiper-container-vertical > .swiper-wrapper {
-webkit-box-orient: vertical;
-moz-box-orient: vertical;
-ms-flex-direction: column;
-webkit-flex-direction: column;
flex-direction: column;
}
.swiper-wrapper {
position: relative;
width: 100%;
height: 100%;
z-index: 1;
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
-webkit-transform-style: preserve-3d;
-moz-transform-style: preserve-3d;
-ms-transform-style: preserve-3d;
transform-style: preserve-3d;
-webkit-transition-property: -webkit-transform;
-moz-transition-property: -moz-transform;
-o-transition-property: -o-transform;
-ms-transition-property: -ms-transform;
transition-property: transform;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
.swiper-container-android .swiper-slide,
.swiper-wrapper {
-webkit-transform: translate3d(0px, 0, 0);
-moz-transform: translate3d(0px, 0, 0);
-o-transform: translate(0px, 0px);
-ms-transform: translate3d(0px, 0, 0);
transform: translate3d(0px, 0, 0);
}
.swiper-container-multirow > .swiper-wrapper {
-webkit-box-lines: multiple;
-moz-box-lines: multiple;
-ms-flex-wrap: wrap;
-webkit-flex-wrap: wrap;
flex-wrap: wrap;
}
.swiper-container-free-mode > .swiper-wrapper {
-webkit-transition-timing-function: ease-out;
-moz-transition-timing-function: ease-out;
-ms-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out;
transition-timing-function: ease-out;
margin: 0 auto;
}
.swiper-slide {
-webkit-transform-style: preserve-3d;
-moz-transform-style: preserve-3d;
-ms-transform-style: preserve-3d;
transform-style: preserve-3d;
-webkit-flex-shrink: 0;
-ms-flex: 0 0 auto;
flex-shrink: 0;
width: 100%;
height: 100%;
position: relative;
background-size:cover;
background-position: center center;
}
/* a11y */
.swiper-container .swiper-notification {
position: absolute;
left: 0;
top: 0;
pointer-events: none;
opacity: 0;
z-index: -1000;
}
/* IE10 Windows Phone 8 Fixes */
.swiper-wp8-horizontal {
-ms-touch-action: pan-y;
touch-action: pan-y;
}
.swiper-wp8-vertical {
-ms-touch-action: pan-x;
touch-action: pan-x;
}
/* Arrows */
.swiper-button-prev,
.swiper-button-next {
position: absolute;
top: 50%;
width: 27px;
height: 44px;
margin-top: -22px;
z-index: 10;
cursor: pointer;
-moz-background-size: 27px 44px;
-webkit-background-size: 27px 44px;
background-size: 27px 44px;
background-position: center;
background-repeat: no-repeat;
}
.swiper-button-prev.swiper-button-disabled,
.swiper-button-next.swiper-button-disabled {
opacity: 0.35;
cursor: auto;
pointer-events: none;
}
.swiper-button-prev,
.swiper-container-rtl .swiper-button-next {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");
left: 10px;
right: auto;
}
.swiper-button-prev.swiper-button-black,
.swiper-container-rtl .swiper-button-next.swiper-button-black {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E");
}
.swiper-button-prev.swiper-button-white,
.swiper-container-rtl .swiper-button-next.swiper-button-white {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E");
}
.swiper-button-next,
.swiper-container-rtl .swiper-button-prev {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");
right: 10px;
left: auto;
}
.swiper-button-next.swiper-button-black,
.swiper-container-rtl .swiper-button-prev.swiper-button-black {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E");
}
.swiper-button-next.swiper-button-white,
.swiper-container-rtl .swiper-button-prev.swiper-button-white {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E");
}
/* Pagination Styles */
.swiper-pagination {
position: absolute;
text-align: center;
-webkit-transition: 300ms;
-moz-transition: 300ms;
-o-transition: 300ms;
transition: 300ms;
-webkit-transform: translate3d(0, 0, 0);
-ms-transform: translate3d(0, 0, 0);
-o-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
z-index: 10;
}
.swiper-pagination.swiper-pagination-hidden {
opacity: 0;
}
.swiper-pagination-bullet {
width: 8px;
height: 8px;
display: inline-block;
border-radius: 100%;
background: #fff;
opacity: 0.4;
}
.swiper-pagination-clickable .swiper-pagination-bullet {
cursor: pointer;
}
.swiper-pagination-white .swiper-pagination-bullet {
background: #fff;
}
.swiper-pagination-bullet-active {
opacity: 1;
background: #fff;
}
.swiper-pagination-white .swiper-pagination-bullet-active {
background: #fff;
}
.swiper-pagination-black .swiper-pagination-bullet-active {
background: #000;
}
.swiper-container-vertical > .swiper-pagination {
right: 10px;
top: 50%;
-webkit-transform: translate3d(0px, -50%, 0);
-moz-transform: translate3d(0px, -50%, 0);
-o-transform: translate(0px, -50%);
-ms-transform: translate3d(0px, -50%, 0);
transform: translate3d(0px, -50%, 0);
}
.swiper-container-vertical > .swiper-pagination .swiper-pagination-bullet {
margin: 5px 0;
display: block;
}
.swiper-container-horizontal > .swiper-pagination {
bottom: 10px;
left: 0;
width: 100%;
}
.swiper-container-horizontal > .swiper-pagination .swiper-pagination-bullet {
margin: 0 5px;
}
/* 3D Container */
.swiper-container-3d {
-webkit-perspective: 1200px;
-moz-perspective: 1200px;
-o-perspective: 1200px;
perspective: 1200px;
}
.swiper-container-3d .swiper-wrapper,
.swiper-container-3d .swiper-slide,
.swiper-container-3d .swiper-slide-shadow-left,
.swiper-container-3d .swiper-slide-shadow-right,
.swiper-container-3d .swiper-slide-shadow-top,
.swiper-container-3d .swiper-slide-shadow-bottom,
.swiper-container-3d .swiper-cube-shadow {
-webkit-transform-style: preserve-3d;
-moz-transform-style: preserve-3d;
-ms-transform-style: preserve-3d;
transform-style: preserve-3d;
}
.swiper-container-3d .swiper-slide-shadow-left,
.swiper-container-3d .swiper-slide-shadow-right,
.swiper-container-3d .swiper-slide-shadow-top,
.swiper-container-3d .swiper-slide-shadow-bottom {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
pointer-events: none;
z-index: 10;
}
.swiper-container-3d .swiper-slide-shadow-left {
background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
/* Safari 4+, Chrome */
background-image: -webkit-linear-gradient(right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Chrome 10+, Safari 5.1+, iOS 5+ */
background-image: -moz-linear-gradient(right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Firefox 3.6-15 */
background-image: -o-linear-gradient(right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Opera 11.10-12.00 */
background-image: linear-gradient(to left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Firefox 16+, IE10, Opera 12.50+ */
}
.swiper-container-3d .swiper-slide-shadow-right {
background-image: -webkit-gradient(linear, right top, left top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
/* Safari 4+, Chrome */
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Chrome 10+, Safari 5.1+, iOS 5+ */
background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Firefox 3.6-15 */
background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Opera 11.10-12.00 */
background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Firefox 16+, IE10, Opera 12.50+ */
}
.swiper-container-3d .swiper-slide-shadow-top {
background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
/* Safari 4+, Chrome */
background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Chrome 10+, Safari 5.1+, iOS 5+ */
background-image: -moz-linear-gradient(bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Firefox 3.6-15 */
background-image: -o-linear-gradient(bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Opera 11.10-12.00 */
background-image: linear-gradient(to top, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Firefox 16+, IE10, Opera 12.50+ */
}
.swiper-container-3d .swiper-slide-shadow-bottom {
background-image: -webkit-gradient(linear, left bottom, left top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
/* Safari 4+, Chrome */
background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Chrome 10+, Safari 5.1+, iOS 5+ */
background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Firefox 3.6-15 */
background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Opera 11.10-12.00 */
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
/* Firefox 16+, IE10, Opera 12.50+ */
}
/* Coverflow */
.swiper-container-coverflow .swiper-wrapper {
/* Windows 8 IE 10 fix */
-ms-perspective: 1200px;
}
/* Fade */
.swiper-container-fade.swiper-container-free-mode .swiper-slide {
-webkit-transition-timing-function: ease-out;
-moz-transition-timing-function: ease-out;
-ms-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out;
transition-timing-function: ease-out;
}
.swiper-container-fade .swiper-slide {
pointer-events: none;
}
.swiper-container-fade .swiper-slide .swiper-slide {
pointer-events: none;
}
.swiper-container-fade .swiper-slide-active,
.swiper-container-fade .swiper-slide-active .swiper-slide-active {
pointer-events: auto;
}
/* Cube */
.swiper-container-cube {
overflow: visible;
}
.swiper-container-cube .swiper-slide {
pointer-events: none;
visibility: hidden;
-webkit-transform-origin: 0 0;
-moz-transform-origin: 0 0;
-ms-transform-origin: 0 0;
transform-origin: 0 0;
-webkit-backface-visibility: hidden;
-moz-backface-visibility: hidden;
-ms-backface-visibility: hidden;
backface-visibility: hidden;
width: 100%;
height: 100%;
}
.swiper-container-cube.swiper-container-rtl .swiper-slide {
-webkit-transform-origin: 100% 0;
-moz-transform-origin: 100% 0;
-ms-transform-origin: 100% 0;
transform-origin: 100% 0;
}
.swiper-container-cube .swiper-slide-active,
.swiper-container-cube .swiper-slide-next,
.swiper-container-cube .swiper-slide-prev,
.swiper-container-cube .swiper-slide-next + .swiper-slide {
pointer-events: auto;
visibility: visible;
}
.swiper-container-cube .swiper-cube-shadow {
position: absolute;
left: 0;
bottom: 0px;
width: 100%;
height: 100%;
background: #000;
opacity: 0.6;
-webkit-filter: blur(50px);
filter: blur(50px);
}
.swiper-container-cube.swiper-container-vertical .swiper-cube-shadow {
z-index: 0;
}
/* Scrollbar */
.swiper-scrollbar {
border-radius: 10px;
position: relative;
-ms-touch-action: none;
background: rgba(0, 0, 0, 0.1);
}
.swiper-container-horizontal > .swiper-scrollbar {
position: absolute;
left: 1%;
bottom: 3px;
z-index: 50;
height: 5px;
width: 98%;
}
.swiper-container-vertical > .swiper-scrollbar {
position: absolute;
right: 3px;
top: 1%;
z-index: 50;
width: 5px;
height: 98%;
}
.swiper-scrollbar-drag {
height: 100%;
width: 100%;
position: relative;
background: rgba(0, 0, 0, 0.5);
border-radius: 10px;
left: 0;
top: 0;
}
.swiper-scrollbar-cursor-drag {
cursor: move;
}
/* Preloader */
.swiper-lazy-preloader {
width: 42px;
height: 42px;
position: absolute;
left: 50%;
top: 50%;
margin-left: -21px;
margin-top: -21px;
z-index: 10;
-webkit-transform-origin: 50%;
-moz-transform-origin: 50%;
transform-origin: 50%;
-webkit-animation: swiper-preloader-spin 1s steps(12, end) infinite;
-moz-animation: swiper-preloader-spin 1s steps(12, end) infinite;
animation: swiper-preloader-spin 1s steps(12, end) infinite;
}
.swiper-lazy-preloader:after {
display: block;
content: "";
width: 100%;
height: 100%;
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
background-position: 50%;
-webkit-background-size: 100%;
background-size: 100%;
background-repeat: no-repeat;
}
.swiper-lazy-preloader-white:after {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%23fff'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
}
@-webkit-keyframes swiper-preloader-spin {
100% {
-webkit-transform: rotate(360deg);
}
}
@keyframes swiper-preloader-spin {
100% {
transform: rotate(360deg);
}
}

File diff suppressed because one or more lines are too long

0
layouts/xedition/css/webfont.css Normal file → Executable file
View file

View file

@ -5,7 +5,6 @@
.welcomeXE section{width:1200px;margin:0 auto}
.welcomeXE .tit{padding-bottom:32px;font-size:40px;color:#333;font-weight:700;letter-spacing:1px;line-height:50px}
.welcomeXE .noti{display:block;padding:28px 0 0;margin:0 0 12px;font-size:14px;font-weight:bold;color:#cda25a;letter-spacing:1px;line-height:20px}
.welcomeXE .intro{width:408px;height:600px;padding-right:792px;background:url(../img/intro.png) 100% 100% no-repeat}
.welcomeXE .intro .cont{padding-bottom:37px;font-size:15px;font-weight:400;color:#888;line-height:27px}
.welcomeXE .intro .btn_start{display:inline-block;margin:50px 0;padding:0 27px;height:40px;border:2px solid #cda25a;background-color:#fff;font-size:13px;line-height:40px;letter-spacing:1px;color:#cda25a;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
@ -13,15 +12,11 @@
.welcomeXE .intro .btn_start:active
.welcomeXE .intro .btn_start:focus{background-color:#cda25a;color:#fff}
.bg-holder {
background-image: url('../img/bg_stat.jpg');
}
/* section.xeicon */
.welcomeXE .xeicon{overflow:hidden;position:static;width:100%;margin:0;height:100%;}
.welcomeXE .xeicon{overflow:hidden;position:static;width:100%;margin:0;height:500px;background-image:url(../img/bg_stat.jpg);background-position:50% 0;background-attachment:fixed;background-repeat:no-repeat}
.welcomeXE .xeicon h1 {margin-top: 170px; font-size: 40px; color: #f6f6f6; text-align: center; letter-spacing: 3px; font-weight: 400; line-height: 1.2em; text-transform: uppercase; }
.welcomeXE .xeicon h1 a {color: #FFF; }
.welcomeXE .xeicon .button-area {text-align: center; margin-bottom:140px; }
.welcomeXE .xeicon .button-area {text-align: center; }
.welcomeXE .xeicon .button-area .btn_item {font-size: 14px; letter-spacing: 2px;}
/* section.guide */
@ -48,30 +43,26 @@
.welcomeXE .features .cont{font-size:15px;line-height:27px;color:#ddd}
.welcomeXE .features ul{overflow:hidden;margin-top:38px;padding:0 20px}
.welcomeXE .features li{float:left;width:25%;height:480px}
.welcomeXE .features li .fe_box{height:478px;margin:0 10px;padding:0 20px;border:1px solid #333;background-color:#f6f6f6;text-align:center;-webkit-transition: all .2s ease-out;-moz-transition: all .2s ease-out;-o-transition: all .2s ease-out;transition: all .2s ease-out}
.welcomeXE .features .fe_box .ico{display:inline-block;width:70px;height:70px;margin:162px 0 27px;background-color:#cda25a;background:url(../img/sp_feature.png) 0 0 no-repeat;text-align:center;font-size:60px;line-height:70px}
.welcomeXE .features .fe_box h2{font-size:21px;color:#555;font-weight:normal}
.welcomeXE .features .fe_box p{margin-bottom:80px;font-size:15px;line-height:24px;color:#f6f6f6}
.welcomeXE .features .fe_box a{display:inline-block;height:40px;padding:0 40px;border:2px solid #f6f6f6;font-family:'Open Sans',sans-serif;font-size:13px;letter-spacing:1px;color:#f6f6f6;line-height:40px;font-weight:600;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
.welcomeXE .features .fe_box a:hover{background-color:#f6f6f6;border-color:#f6f6f6;color:#cda25a}
.welcomeXE .features .fe_top{position:relative;top:0;-webkit-transition: all .2s ease-out;-moz-transition: all .2s ease-out;-o-transition: all .2s ease-out;transition: all .2s ease-out}
.welcomeXE .features .fe_bottom{position:relative;top:192px;-webkit-transition: all .3s ease-out;-moz-transition: all .3s ease-out;-o-transition: all .3s ease-out;transition: all .3s ease-out}
.welcomeXE .features .fe_box.on{background-color:#cda25a}
.welcomeXE .features .fe_box.on .fe_top{top:-104px}
.welcomeXE .features .fe_box.on .fe_bottom{top:-67px}
.welcomeXE .features .fe_box.on h2{color:#f6f6f6}
.welcomeXE .features .fe_box.on .ico{background-color:#f6f6f6;background:url(../img/sp_feature.png) 0 -70px no-repeat}
.welcomeXE .features .fe_box .ico2{background-position:-70px 0}
.welcomeXE .features .fe_box .ico3{background-position:-140px 0}
.welcomeXE .features .fe_box .ico4{background-position:-210px 0}
.welcomeXE .features .fe_box.on .ico2{background-position:-70px -70px}
.welcomeXE .features .fe_box.on .ico3{background-position:-140px -70px}
.welcomeXE .features .fe_box.on .ico4{background-position:-210px -70px}
@media all and (min-width:480px) {
.welcomeXE .features li .fe_box{height:478px;margin:0 10px;padding:0 20px;border:1px solid #333;background-color:#f6f6f6;text-align:center;-webkit-transition: all .2s ease-out;-moz-transition: all .2s ease-out;-o-transition: all .2s ease-out;transition: all .2s ease-out}
.welcomeXE .features .fe_box .ico{display:inline-block;width:70px;height:70px;margin:162px 0 27px;background-color:#cda25a;background:url(../img/sp_feature.png) 0 0 no-repeat;text-align:center;font-size:60px;line-height:70px}
.welcomeXE .features .fe_box h2{font-size:21px;color:#555;font-weight:normal}
.welcomeXE .features .fe_box p{margin-bottom:80px;font-size:15px;line-height:24px;color:#f6f6f6}
.welcomeXE .features .fe_box a{display:inline-block;height:40px;padding:0 40px;border:2px solid #f6f6f6;font-family:'Open Sans',sans-serif;font-size:13px;letter-spacing:1px;color:#f6f6f6;line-height:40px;font-weight:600;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
.welcomeXE .features .fe_box a:hover{background-color:#f6f6f6;border-color:#f6f6f6;color:#cda25a}
.welcomeXE .features .fe_top{position:relative;top:0;-webkit-transition: all .2s ease-out;-moz-transition: all .2s ease-out;-o-transition: all .2s ease-out;transition: all .2s ease-out}
.welcomeXE .features .fe_bottom{position:relative;top:192px;-webkit-transition: all .3s ease-out;-moz-transition: all .3s ease-out;-o-transition: all .3s ease-out;transition: all .3s ease-out}
.welcomeXE .features .fe_box.on{background-color:#cda25a}
.welcomeXE .features .fe_box.on .fe_top{top:-104px}
.welcomeXE .features .fe_box.on .fe_bottom{top:-67px}
.welcomeXE .features .fe_box.on h2{color:#f6f6f6}
.welcomeXE .features .fe_box.on .ico{background-color:#f6f6f6;background:url(../img/sp_feature.png) 0 -70px no-repeat}
.welcomeXE .features .fe_box .ico2{background-position:-70px 0}
.welcomeXE .features .fe_box .ico3{background-position:-140px 0}
.welcomeXE .features .fe_box .ico4{background-position:-210px 0}
.welcomeXE .features .fe_box.on .ico2{background-position:-70px -70px}
.welcomeXE .features .fe_box.on .ico3{background-position:-140px -70px}
.welcomeXE .features .fe_box.on .ico4{background-position:-210px -70px}
}
/*section.connect*/
.welcomeXE .connect{height:344px;padding-top:80px}
@ -85,46 +76,3 @@
.welcomeXE .connect .ico i{line-height:78px}
.welcomeXE .connect h2{margin-bottom:16px;font-size:15px;font-weight:600;letter-spacing:1px;line-height:18px;color:#333}
.welcomeXE .connect p{font-size:13px;color:#888;line-height:21px}
@media all and (max-width:479px) {
.welcomeXE { padding-top: 0 }
.welcomeXE section{width:100%; box-sizing:border-box; overflow:hidden;}
.welcomeXE .tit{padding-bottom:16px;font-size:30px;color:#333;font-weight:700;letter-spacing:1px;line-height:40px}
.welcomeXE .intro{width:100%; box-sizing:border-box; padding:0 14px; height:auto; background:#fff; }
.welcomeXE .intro .cont{padding-bottom:17px;}
.welcomeXE .intro .btn_start { margin:20px 0 50px 0; }
.welcomeXE .xeicon { height:auto; }
.welcomeXE .xeicon h1 { margin-top:70px; }
.welcomeXE .xeicon .button-area { margin-bottom:50px; }
.welcomeXE .xeicon .button-area .btn_item {font-size: 14px; letter-spacing: 2px;margin:20px 0;}
.welcomeXE .xeicon{background-position:0 0;background-attachment: inherit;}
.welcomeXE .guide{ padding:0 14px; height:auto;padding-top:40px}
.welcomeXE .guide li { width:auto; margin:0 0 20px 0; }
.welcomeXE .features { padding:40px 14px 0 14px; height:auto; }
.welcomeXE .features .noti,
.welcomeXE .features .tit,
.welcomeXE .features .cont{width:100%;margin-left:auto;margin-right:auto}
.welcomeXE .features ul { padding:0; }
.welcomeXE .features li{clear:both;width:100%;height:auto;margin:0 0 20px 0;}
.welcomeXE .features li .fe_box { margin:0;padding:20px;border:1px solid #333;background-color:#cda25a; position:relative; }
.welcomeXE .features .fe_box .ico{display:inline-block;width:70px;position:absolute;top:20px;left:20px;height:70px;margin:0;background-color:#f6f6f6;background:url(../img/sp_feature.png) 0 -70px no-repeat;text-align:center;font-size:20px;line-height:70px}
.welcomeXE .features .fe_box h2{font-size:21px;color:#f6f6f6;font-weight:normal; padding-left:80px}
.welcomeXE .features .fe_box a{display:inline-block;height:30px;padding:0 20px;border:2px solid #f6f6f6;font-family:'Open Sans',sans-serif;font-size:13px;letter-spacing:1px;color:#f6f6f6;line-height:30px;font-weight:600;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out;float:right;}
.welcomeXE .features .fe_bottom { padding-left:80px; overflow:hidden; }
.welcomeXE .features .fe_box p{margin-bottom:40px;margin-top:10px;font-size:13px;line-height:20px;color:#f6f6f6}
.welcomeXE .features .fe_box .ico2{background-position:-70px -70px}
.welcomeXE .features .fe_box .ico3{background-position:-140px -70px}
.welcomeXE .features .fe_box .ico4{background-position:-210px -70px}
.welcomeXE .connect{height:auto;padding:80px 14px 0 14px;}
.welcomeXE .connect ul { padding-top:0; }
.welcomeXE .connect li { margin-left:0; width:auto; min-height:78px; margin-bottom:20px; }
}

File diff suppressed because one or more lines are too long

View file

@ -52,21 +52,3 @@
.XEicon .contribution .btn_github:hover,
.XEicon .contribution .btn_github:active
.XEicon .contribution .btn_github:focus{background-color:#cda25a;color:#fff}
@media all and (max-width:479px) {
.XEicon .fixedwidth {width:auto;}
.XEicon .main_title h1 { margin-bottom: 28px; font-size: 21px; }
.XEicon .main_title p { padding:0 14px; text-align:left; }
.XEicon .tit h1 {font-size:20px; text-align:center; letter-spacing:2px;}
.XEicon .tit h1:after { left:50%; margin-left:-10px; }
.XEicon .feature { height:auto; padding-top:90px; }
.XEicon .feature ul{padding:50px 14px 0 14px;}
.XEicon .feature li { clear:both; width:auto; padding:0 0 0 70px; }
.XEicon .get_started { height:auto; padding:80px 14px 20px 14px; }
.XEicon .get_started li { float:none; width:auto; margin-right:0; margin-bottom:15px; }
.XEicon .contribution .cont { padding:0 14px; text-align:left; }
}

View file

@ -1 +1 @@
@charset "utf-8";.body.sub{width:100%!important;margin:0}.body.sub.full_width .content{width:100%!important;padding-bottom:0!important}.XEicon{padding-top:60px}.XEicon .fixedwidth{width:1200px;margin:0 auto}.XEicon .tit{position:relative}.XEicon .tit h1{font-size:29px;text-align:center;letter-spacing:2px}.XEicon .tit h1:after{position:absolute;top:115%;left:49%;width:20px;height:3px;background-color:#cda25a;content:""}.XEicon p a{color:#444}.XEicon p a:active,.XEicon p a:focus,.XEicon p a:hover{color:#cda25a;border-bottom:1px solid #cda25a}.XEicon .main_title h1{margin-bottom:47px;font-size:34px;font-weight:600;color:#cda25a;text-align:center;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;text-transform:uppercase;letter-spacing:1px}.XEicon .main_title p{font-size:15px;line-height:28px;color:#444;text-align:center}.XEicon .feature{height:518px;padding-top:120px}.XEicon .feature ul{padding-top:80px}.XEicon .feature li{position:relative;float:left;width:314px;min-height:140px;padding:0 16px 0 70px;margin:0 0 30px}.XEicon .feature h2{padding:7px 24px 13px 0;font-size:17px;font-weight:600;line-height:23px;color:#333}.XEicon .feature p{padding:0 24px 0 0;font-size:14px;line-height:26px;color:#888}.XEicon .feature .ico{position:absolute;top:0;left:0;width:48px;height:48px;font-size:22px;text-align:center;line-height:50px;color:#555}.XEicon .get_started{height:550px;padding-top:80px;background:#f6f6f6;box-sizing:border-box}.XEicon .get_started .cont{font-size:15px;margin-top:75px;color:#888}.XEicon .get_started ul{margin-top:34px}.XEicon .get_started li{position:relative;float:left;width:286px;height:212px;margin-right:15px;border:1px solid #e8e8e8;background:#fff;text-align:center}.XEicon .get_started li:last-child{margin-right:0}.XEicon .get_started li h2{padding:33px 0 19px;font-size:17px;font-weight:600}.XEicon .get_started li p{padding:0 37px;font-size:14px;line-height:26px;color:#888}.XEicon .get_started li>a{position:absolute;display:block;bottom:0;width:100%;height:50px;background:#888;border-top:1px solid #e1e1e1;line-height:50px;font-size:14px;font-weight:600;text-transform:uppercase;color:#fff;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-ms-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.XEicon .get_started li>a:active,.XEicon .get_started li>a:focus,.XEicon .get_started li>a:hover{background-color:#cda25a;color:#fff}.XEicon .get_started li>a .xeicon{display:none;margin-right:6px;font-size:140%;vertical-align:middle}.XEicon .get_started li>a:hover .xeicon{display:inline-block;margin-top:-4px}.XEicon .contribution{height:442px;padding-top:93px;box-sizing:border-box;text-align:center}.XEicon .contribution .cont{font-size:15px;line-height:26px;text-align:center;margin-top:58px;color:#888}.XEicon .contribution .btn_github{display:inline-block;margin:50px 0;padding:0 40px;height:52px;border:2px solid #cda25a;background-color:#fff;font-size:15px;line-height:52px;font-weight:600;letter-spacing:1px;color:#cda25a;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-ms-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.XEicon .contribution .btn_github:active .XEicon .contribution .btn_github:focus,.XEicon .contribution .btn_github:hover{background-color:#cda25a;color:#fff}@media all and (max-width:479px){.XEicon .fixedwidth{width:auto}.XEicon .main_title h1{margin-bottom:28px;font-size:21px}.XEicon .main_title p{padding:0 14px;text-align:left}.XEicon .tit h1{font-size:20px;text-align:center;letter-spacing:2px}.XEicon .tit h1:after{left:50%;margin-left:-10px}.XEicon .feature{height:auto;padding-top:90px}.XEicon .feature ul{padding:50px 14px 0}.XEicon .feature li{clear:both;width:auto;padding:0 0 0 70px}.XEicon .get_started{height:auto;padding:80px 14px 20px}.XEicon .get_started li{float:none;width:auto;margin-right:0;margin-bottom:15px}.XEicon .contribution .cont{padding:0 14px;text-align:left}}
@charset "utf-8";.body.sub{width:100%!important;margin:0}.body.sub.full_width .content{width:100%!important;padding-bottom:0!important}.XEicon{padding-top:60px}.XEicon .fixedwidth{width:1200px;margin:0 auto}.XEicon .tit{position:relative}.XEicon .tit h1{font-size:29px;text-align:center;letter-spacing:2px}.XEicon .tit h1:after{position:absolute;top:115%;left:49%;width:20px;height:3px;background-color:#cda25a;content:""}.XEicon p a{color:#444}.XEicon p a:active,.XEicon p a:focus,.XEicon p a:hover{color:#cda25a;border-bottom:1px solid #cda25a}.XEicon .main_title h1{margin-bottom:47px;font-size:34px;font-weight:600;color:#cda25a;text-align:center;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;text-transform:uppercase;letter-spacing:1px}.XEicon .main_title p{font-size:15px;line-height:28px;color:#444;text-align:center}.XEicon .feature{height:518px;padding-top:120px}.XEicon .feature ul{padding-top:80px}.XEicon .feature li{position:relative;float:left;width:314px;min-height:140px;padding:0 16px 0 70px;margin:0 0 30px}.XEicon .feature h2{padding:7px 24px 13px 0;font-size:17px;font-weight:600;line-height:23px;color:#333}.XEicon .feature p{padding:0 24px 0 0;font-size:14px;line-height:26px;color:#888}.XEicon .feature .ico{position:absolute;top:0;left:0;width:48px;height:48px;font-size:22px;text-align:center;line-height:50px;color:#555}.XEicon .get_started{height:550px;padding-top:80px;background:#f6f6f6;box-sizing:border-box}.XEicon .get_started .cont{font-size:15px;margin-top:75px;color:#888}.XEicon .get_started ul{margin-top:34px}.XEicon .get_started li{position:relative;float:left;width:286px;height:212px;margin-right:15px;border:1px solid #e8e8e8;background:#fff;text-align:center}.XEicon .get_started li:last-child{margin-right:0}.XEicon .get_started li h2{padding:33px 0 19px;font-size:17px;font-weight:600}.XEicon .get_started li p{padding:0 37px;font-size:14px;line-height:26px;color:#888}.XEicon .get_started li>a{position:absolute;display:block;bottom:0;width:100%;height:50px;background:#888;border-top:1px solid #e1e1e1;line-height:50px;font-size:14px;font-weight:600;text-transform:uppercase;color:#fff;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-ms-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.XEicon .get_started li>a:active,.XEicon .get_started li>a:focus,.XEicon .get_started li>a:hover{background-color:#cda25a;color:#fff}.XEicon .get_started li>a .xeicon{display:none;margin-right:6px;font-size:140%;vertical-align:middle}.XEicon .get_started li>a:hover .xeicon{display:inline-block;margin-top:-4px}.XEicon .contribution{height:442px;padding-top:93px;box-sizing:border-box;text-align:center}.XEicon .contribution .cont{font-size:15px;line-height:26px;text-align:center;margin-top:58px;color:#888}.XEicon .contribution .btn_github{display:inline-block;margin:50px 0;padding:0 40px;height:52px;border:2px solid #cda25a;background-color:#fff;font-size:15px;line-height:52px;font-weight:600;letter-spacing:1px;color:#cda25a;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-ms-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.XEicon .contribution .btn_github:active .XEicon .contribution .btn_github:focus,.XEicon .contribution .btn_github:hover{background-color:#cda25a;color:#fff}

View file

@ -1,30 +1,30 @@
<div style="background-image:url('{$layout_info->path}img/slider_img.jpg');" class="swiper-slide">
<div>
<div>
<div data-src="{$layout_info->path}img/slider_img.jpg">
<div class="camera_caption fadeIn">
<div class="camera_caption_wrap">
<h1>SHARING, PUBLISHING.<br />&amp; PLEASURE.</h1>
<p>지식을 나누고 컨텐츠를 출판하며 즐거움을 함께합니다.</p>
</div>
</div>
</div>
<div style="background-image:url('{$layout_info->path}img/slider_img2.jpg');" class="swiper-slide">
<div>
<div>
<div data-src="{$layout_info->path}img/slider_img2.jpg">
<div class="camera_caption fadeIn">
<div class="camera_caption_wrap">
<h1>MAKING<br />WEB CULTURES</h1>
<p>올바른 웹 문화를 지향합니다.</p>
</div>
</div>
</div>
<div style="background-image:url('{$layout_info->path}img/slider_img3.jpg');" class="swiper-slide">
<div>
<div>
<div data-src="{$layout_info->path}img/slider_img3.jpg">
<div class="camera_caption fadeIn">
<div class="camera_caption_wrap">
<h1>EVOLUTION &amp; INNOVATION<br />TOGETHER</h1>
<p>함께 진화하고 혁신을 추구합니다.</p>
</div>
</div>
</div>
<div style="background-image:url('{$layout_info->path}img/slider_img4.jpg');" class="swiper-slide">
<div>
<div>
<div data-src="{$layout_info->path}img/slider_img4.jpg">
<div class="camera_caption fadeIn">
<div class="camera_caption_wrap">
<h1>CREATE A GOOD DESIGN WITH<br />THE POSSIILITY OF TECHNOLOGY</h1>
<p>기술의 가능성을 발굴하고 좋은 디자인을 만들어 갑니다.</p>
</div>

View file

@ -1,6 +1,6 @@
<!-- WelcomeXE -->
<div class="welcomeXE">
<section class="xeicon bg-holder" data-width="1200" data-height="500">
<section class="xeicon">
<h1>Beautiful iconpack<br>XEIcon</h1>
<div class="button-area">
<a class="btn_item" target="_blank" href="http://xpressengine.github.io/XEIcon">HOMEPAGE</a>

5
layouts/xedition/js/camera.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -1,14 +0,0 @@
(function($) {
$(function(){
var $gnb = $('.gnb');
$("#mobile_menu_btn").on('click', function(){
var isOpened = $(this);
if(isOpened.hasClass('opened')){
$("#gnb").find(">ul").slideUp(200);
}else{
$("#gnb").find(">ul:not(:animated)").slideDown(200);
}
isOpened.toggleClass('opened');
});
});
})(jQuery);

View file

@ -1 +0,0 @@
!function(a){a(function(){a(".gnb");a("#mobile_menu_btn").on("click",function(){var b=a(this);b.hasClass("opened")?a("#gnb").find(">ul").slideUp(200):a("#gnb").find(">ul:not(:animated)").slideDown(200),b.toggleClass("opened")})})}(jQuery);

View file

@ -1,36 +0,0 @@
(function($){
$(function(){
var $shrinkHeaderHeight = 300;
var $fixedHeader = $('.fixed_header .header_wrap');
var $gnb = $('.gnb');
var $hoverEl = $('.hover');
var $searchEl = $('.click > a');
var $searchForm = $('.search_area');
// Gnb
$gnb.find('>ul>li>a')
.mouseover(function(){
$gnb.find('>ul>li>ul:visible').hide().parent('li').removeClass('on');
$(this).next('ul:hidden').stop().fadeIn(200).parent('li').addClass('on')
})
.focus(function(){
$(this).mouseover();
})
.end()
.mouseleave(function(){
$gnb.find('>ul>li>ul').hide().parent().removeClass('on')
});
$gnb.find('>ul>li>ul>li>a')
.mouseover(function(){
$gnb.find('>ul>li>ul>li>ul:visible').hide().parent('li').removeClass('on');
$(this).next('ul:hidden').stop().fadeIn(200).parent('li').addClass('on')
})
.focus(function(){
$(this).mouseover();
})
.end()
.mouseleave(function(){
$gnb.find('>ul>li>ul>li>ul').hide().parent().removeClass('on')
});
});
})(jQuery);

View file

@ -1 +0,0 @@
!function(a){a(function(){var b=(a(".fixed_header .header_wrap"),a(".gnb"));a(".hover"),a(".click > a"),a(".search_area");b.find(">ul>li>a").mouseover(function(){b.find(">ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){b.find(">ul>li>ul").hide().parent().removeClass("on")}),b.find(">ul>li>ul>li>a").mouseover(function(){b.find(">ul>li>ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){b.find(">ul>li>ul>li>ul").hide().parent().removeClass("on")})})}(jQuery);

View file

@ -0,0 +1,205 @@
/*
* jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
*
* Uses the built in easing capabilities added In jQuery 1.1
* to offer multiple easing options
*
* TERMS OF USE - jQuery Easing
*
* Open source under the BSD License.
*
* Copyright © 2008 George McGinley Smith
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* Neither the name of the author nor the names of contributors may be used to endorse
* or promote products derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
// t: current time, b: begInnIng value, c: change In value, d: duration
jQuery.easing['jswing'] = jQuery.easing['swing'];
jQuery.extend( jQuery.easing,
{
def: 'easeOutQuad',
swing: function (x, t, b, c, d) {
//alert(jQuery.easing.default);
return jQuery.easing[jQuery.easing.def](x, t, b, c, d);
},
easeInQuad: function (x, t, b, c, d) {
return c*(t/=d)*t + b;
},
easeOutQuad: function (x, t, b, c, d) {
return -c *(t/=d)*(t-2) + b;
},
easeInOutQuad: function (x, t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t + b;
return -c/2 * ((--t)*(t-2) - 1) + b;
},
easeInCubic: function (x, t, b, c, d) {
return c*(t/=d)*t*t + b;
},
easeOutCubic: function (x, t, b, c, d) {
return c*((t=t/d-1)*t*t + 1) + b;
},
easeInOutCubic: function (x, t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t*t + b;
return c/2*((t-=2)*t*t + 2) + b;
},
easeInQuart: function (x, t, b, c, d) {
return c*(t/=d)*t*t*t + b;
},
easeOutQuart: function (x, t, b, c, d) {
return -c * ((t=t/d-1)*t*t*t - 1) + b;
},
easeInOutQuart: function (x, t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
return -c/2 * ((t-=2)*t*t*t - 2) + b;
},
easeInQuint: function (x, t, b, c, d) {
return c*(t/=d)*t*t*t*t + b;
},
easeOutQuint: function (x, t, b, c, d) {
return c*((t=t/d-1)*t*t*t*t + 1) + b;
},
easeInOutQuint: function (x, t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
return c/2*((t-=2)*t*t*t*t + 2) + b;
},
easeInSine: function (x, t, b, c, d) {
return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
},
easeOutSine: function (x, t, b, c, d) {
return c * Math.sin(t/d * (Math.PI/2)) + b;
},
easeInOutSine: function (x, t, b, c, d) {
return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
},
easeInExpo: function (x, t, b, c, d) {
return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
},
easeOutExpo: function (x, t, b, c, d) {
return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
},
easeInOutExpo: function (x, t, b, c, d) {
if (t==0) return b;
if (t==d) return b+c;
if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
},
easeInCirc: function (x, t, b, c, d) {
return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
},
easeOutCirc: function (x, t, b, c, d) {
return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
},
easeInOutCirc: function (x, t, b, c, d) {
if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
},
easeInElastic: function (x, t, b, c, d) {
var s=1.70158;var p=0;var a=c;
if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3;
if (a < Math.abs(c)) { a=c; var s=p/4; }
else var s = p/(2*Math.PI) * Math.asin (c/a);
return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
},
easeOutElastic: function (x, t, b, c, d) {
var s=1.70158;var p=0;var a=c;
if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3;
if (a < Math.abs(c)) { a=c; var s=p/4; }
else var s = p/(2*Math.PI) * Math.asin (c/a);
return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
},
easeInOutElastic: function (x, t, b, c, d) {
var s=1.70158;var p=0;var a=c;
if (t==0) return b; if ((t/=d/2)==2) return b+c; if (!p) p=d*(.3*1.5);
if (a < Math.abs(c)) { a=c; var s=p/4; }
else var s = p/(2*Math.PI) * Math.asin (c/a);
if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
},
easeInBack: function (x, t, b, c, d, s) {
if (s == undefined) s = 1.70158;
return c*(t/=d)*t*((s+1)*t - s) + b;
},
easeOutBack: function (x, t, b, c, d, s) {
if (s == undefined) s = 1.70158;
return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
},
easeInOutBack: function (x, t, b, c, d, s) {
if (s == undefined) s = 1.70158;
if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
},
easeInBounce: function (x, t, b, c, d) {
return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b;
},
easeOutBounce: function (x, t, b, c, d) {
if ((t/=d) < (1/2.75)) {
return c*(7.5625*t*t) + b;
} else if (t < (2/2.75)) {
return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
} else if (t < (2.5/2.75)) {
return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
} else {
return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
}
},
easeInOutBounce: function (x, t, b, c, d) {
if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
}
});
/*
*
* TERMS OF USE - EASING EQUATIONS
*
* Open source under the BSD License.
*
* Copyright © 2001 Robert Penner
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* Neither the name of the author nor the names of contributors may be used to endorse
* or promote products derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/

View file

@ -0,0 +1 @@
jQuery.easing.jswing=jQuery.easing.swing,jQuery.extend(jQuery.easing,{def:"easeOutQuad",swing:function(a,b,c,d,e){return jQuery.easing[jQuery.easing.def](a,b,c,d,e)},easeInQuad:function(a,b,c,d,e){return d*(b/=e)*b+c},easeOutQuad:function(a,b,c,d,e){return-d*(b/=e)*(b-2)+c},easeInOutQuad:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b+c:-d/2*(--b*(b-2)-1)+c},easeInCubic:function(a,b,c,d,e){return d*(b/=e)*b*b+c},easeOutCubic:function(a,b,c,d,e){return d*((b=b/e-1)*b*b+1)+c},easeInOutCubic:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b+c:d/2*((b-=2)*b*b+2)+c},easeInQuart:function(a,b,c,d,e){return d*(b/=e)*b*b*b+c},easeOutQuart:function(a,b,c,d,e){return-d*((b=b/e-1)*b*b*b-1)+c},easeInOutQuart:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b*b+c:-d/2*((b-=2)*b*b*b-2)+c},easeInQuint:function(a,b,c,d,e){return d*(b/=e)*b*b*b*b+c},easeOutQuint:function(a,b,c,d,e){return d*((b=b/e-1)*b*b*b*b+1)+c},easeInOutQuint:function(a,b,c,d,e){return(b/=e/2)<1?d/2*b*b*b*b*b+c:d/2*((b-=2)*b*b*b*b+2)+c},easeInSine:function(a,b,c,d,e){return-d*Math.cos(b/e*(Math.PI/2))+d+c},easeOutSine:function(a,b,c,d,e){return d*Math.sin(b/e*(Math.PI/2))+c},easeInOutSine:function(a,b,c,d,e){return-d/2*(Math.cos(Math.PI*b/e)-1)+c},easeInExpo:function(a,b,c,d,e){return 0==b?c:d*Math.pow(2,10*(b/e-1))+c},easeOutExpo:function(a,b,c,d,e){return b==e?c+d:d*(-Math.pow(2,-10*b/e)+1)+c},easeInOutExpo:function(a,b,c,d,e){return 0==b?c:b==e?c+d:(b/=e/2)<1?d/2*Math.pow(2,10*(b-1))+c:d/2*(-Math.pow(2,-10*--b)+2)+c},easeInCirc:function(a,b,c,d,e){return-d*(Math.sqrt(1-(b/=e)*b)-1)+c},easeOutCirc:function(a,b,c,d,e){return d*Math.sqrt(1-(b=b/e-1)*b)+c},easeInOutCirc:function(a,b,c,d,e){return(b/=e/2)<1?-d/2*(Math.sqrt(1-b*b)-1)+c:d/2*(Math.sqrt(1-(b-=2)*b)+1)+c},easeInElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(0==b)return c;if(1==(b/=e))return c+d;if(g||(g=.3*e),h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(b-=1))*Math.sin(2*(b*e-f)*Math.PI/g))+c},easeOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(0==b)return c;if(1==(b/=e))return c+d;if(g||(g=.3*e),h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*b)*Math.sin(2*(b*e-f)*Math.PI/g)+d+c},easeInOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(0==b)return c;if(2==(b/=e/2))return c+d;if(g||(g=.3*e*1.5),h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return 1>b?-.5*h*Math.pow(2,10*(b-=1))*Math.sin(2*(b*e-f)*Math.PI/g)+c:h*Math.pow(2,-10*(b-=1))*Math.sin(2*(b*e-f)*Math.PI/g)*.5+d+c},easeInBack:function(a,b,c,d,e,f){return void 0==f&&(f=1.70158),d*(b/=e)*b*((f+1)*b-f)+c},easeOutBack:function(a,b,c,d,e,f){return void 0==f&&(f=1.70158),d*((b=b/e-1)*b*((f+1)*b+f)+1)+c},easeInOutBack:function(a,b,c,d,e,f){return void 0==f&&(f=1.70158),(b/=e/2)<1?d/2*b*b*(((f*=1.525)+1)*b-f)+c:d/2*((b-=2)*b*(((f*=1.525)+1)*b+f)+2)+c},easeInBounce:function(a,b,c,d,e){return d-jQuery.easing.easeOutBounce(a,e-b,0,d,e)+c},easeOutBounce:function(a,b,c,d,e){return(b/=e)<1/2.75?7.5625*d*b*b+c:2/2.75>b?d*(7.5625*(b-=1.5/2.75)*b+.75)+c:2.5/2.75>b?d*(7.5625*(b-=2.25/2.75)*b+.9375)+c:d*(7.5625*(b-=2.625/2.75)*b+.984375)+c},easeInOutBounce:function(a,b,c,d,e){return e/2>b?.5*jQuery.easing.easeInBounce(a,2*b,0,d,e)+c:.5*jQuery.easing.easeOutBounce(a,2*b-e,0,d,e)+.5*d+c}});

View file

@ -1,126 +0,0 @@
/*
* Parallax-Scroll - v0.2.0
* jQuery plugin for background-attachment: scroll with friction, similar to the parallax scrolling effect on Spotify.
* http://parallax-scroll.aenism.com
*
* Made by Aen Tan
* Under MIT License
*/
;(function (root, factory) {
if (typeof define === "function" && define.amd) {
// AMD. Register as an anonymous module.
define(["jquery"], factory);
} else {
// Browser globals
factory(root.jQuery);
}
}(this, function ($) {
"use strict";
var ParallaxScroll,
defaults = {
friction: 0.5,
direction: "vertical"
},
$win = $(window),
lastTickTime = 0;
window.requestAnimationFrame = function (callback) {
var currTime = new Date().getTime();
var timeToCall = Math.max(0, 5 - (currTime - lastTickTime));
var id = window.setTimeout(function () {
callback(currTime + timeToCall);
}, timeToCall);
lastTickTime = currTime + timeToCall;
return id;
};
ParallaxScroll = function (background, options) {
return {
init: function () {
this.$background = $(background);
this.settings = $.extend({}, defaults, options);
this._initStyles();
this._bindEvents();
},
_initStyles: function () {
this.$background.css({
"background-attachment": "scroll"
});
},
_visibleInViewport: function () {
var vpHeight = $win.height();
var rec = this.$background.get(0).getBoundingClientRect();
return (rec.top < vpHeight && rec.bottom > 0) || (rec.bottom <= vpHeight && rec.top > vpHeight);
},
_bindEvents: function () {
var self = this;
$win.on("load scroll resize", function () {
self._requestTick();
});
},
_requestTick: function () {
var self = this;
if (!this.ticking) {
this.ticking = true;
requestAnimationFrame(function () {
self._updateBgPos();
});
}
},
_updateBgPos: function () {
if (this._visibleInViewport()) {
var winW = $win.width();
var winH = $win.height();
var imgW = this.$background.data("width");
var imgH = this.$background.data("height");
var imgA = imgW / imgH;
var bgW = this.$background.width();
var bgH = this.$background.height();
var bgA = bgW / bgH;
var revA = bgA < imgA;
var bgScale = bgW / imgW;
var bgScaledH = imgH * bgScale;
var bgScaledW = imgW * bgScale;
var bgOffsetTop = this.$background.offset().top;
var winScrollTop = $win.scrollTop();
var bgScrollTop = winScrollTop - bgOffsetTop;
var xDistToMove = winH + bgScaledH;
var yDistToMove = winW + bgScaledW;
var xf1 = bgScrollTop * (winH / xDistToMove);
var xf2 = bgScrollTop / winH;
var yf1 = bgScrollTop * (winW / yDistToMove);
var yf2 = bgScrollTop / winW;
var centerOffsetY = (winH - bgH) / 2;
centerOffsetY = revA ? centerOffsetY * xf2 : centerOffsetY;
var centerOffsetX = (winW - bgW) / 2;
centerOffsetX = revA ? centerOffsetX : centerOffsetX * yf2;
var bgFriction = revA? this.settings.friction * (bgA * 2) : this.settings.friction * bgA;
var bgSize;
var bgPos;
if (this.settings.direction === "horizontal") {
bgSize = revA ? winW + "px auto" : "auto " + winH + "px";
bgPos = (centerOffsetX - (yf1 * bgFriction)) + "px 50%";
} else {
bgSize = revA ? "auto " + winH + "px" : winW + "px auto";
bgPos = "50% " + ((xf1 * bgFriction) - centerOffsetY) + "px";
}
this.$background.css({
"background-size": bgSize,
"background-position": bgPos
});
}
this.ticking = false;
}
};
};
ParallaxScroll.defaults = defaults;
$.fn.parallaxScroll = function (options) {
return this.each(function () {
new ParallaxScroll(this, options).init();
});
};
return ParallaxScroll;
}));

View file

@ -1,9 +0,0 @@
/*
* Parallax-Scroll - v0.2.0
* jQuery plugin for background-attachment: scroll with friction, similar to the parallax scrolling effect on Spotify.
* http://parallax-scroll.aenism.com
*
* Made by Aen Tan
* Under MIT License
*/
!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],b):b(a.jQuery)}(this,function(a){"use strict";var b,c={friction:.5,direction:"vertical"},d=a(window),e=0;return window.requestAnimationFrame=function(a){var b=(new Date).getTime(),c=Math.max(0,5-(b-e)),d=window.setTimeout(function(){a(b+c)},c);return e=b+c,d},b=function(b,e){return{init:function(){this.$background=a(b),this.settings=a.extend({},c,e),this._initStyles(),this._bindEvents()},_initStyles:function(){this.$background.css({"background-attachment":"scroll"})},_visibleInViewport:function(){var a=d.height(),b=this.$background.get(0).getBoundingClientRect();return b.top<a&&b.bottom>0||b.bottom<=a&&b.top>a},_bindEvents:function(){var a=this;d.on("load scroll resize",function(){a._requestTick()})},_requestTick:function(){var a=this;this.ticking||(this.ticking=!0,requestAnimationFrame(function(){a._updateBgPos()}))},_updateBgPos:function(){if(this._visibleInViewport()){var a=d.width(),b=d.height(),c=this.$background.data("width"),e=this.$background.data("height"),f=c/e,g=this.$background.width(),h=this.$background.height(),i=g/h,j=f>i,k=g/c,l=e*k,m=c*k,n=this.$background.offset().top,o=d.scrollTop(),p=o-n,q=b+l,r=a+m,s=p*(b/q),t=p/b,u=p*(a/r),v=p/a,w=(b-h)/2;w=j?w*t:w;var x=(a-g)/2;x=j?x:x*v;var y,z,A=j?2*this.settings.friction*i:this.settings.friction*i;"horizontal"===this.settings.direction?(y=j?a+"px auto":"auto "+b+"px",z=x-u*A+"px 50%"):(y=j?"auto "+b+"px":a+"px auto",z="50% "+(s*A-w)+"px"),this.$background.css({"background-size":y,"background-position":z})}this.ticking=!1}}},b.defaults=c,a.fn.parallaxScroll=function(a){return this.each(function(){new b(this,a).init()})},b});

View file

@ -1,4 +1,4 @@
(function($){
(function($){
"use strict";
$(function(){
var $shrinkHeaderHeight = 300;
@ -38,7 +38,45 @@
});
$(window).triggerHandler('scroll');
}
// Search
// Gnb
$gnb.find('>ul>li>a')
.mouseover(function(){
$gnb.find('>ul>li>ul:visible').hide().parent('li').removeClass('on');
$(this).next('ul:hidden').stop().fadeIn(200).parent('li').addClass('on')
})
.focus(function(){
$(this).mouseover();
})
.end()
.mouseleave(function(){
$gnb.find('>ul>li>ul').hide().parent().removeClass('on')
});
$gnb.find('>ul>li>ul>li>a')
.mouseover(function(){
$gnb.find('>ul>li>ul>li>ul:visible').hide().parent('li').removeClass('on');
$(this).next('ul:hidden').stop().fadeIn(200).parent('li').addClass('on')
})
.focus(function(){
$(this).mouseover();
})
.end()
.mouseleave(function(){
$gnb.find('>ul>li>ul>li>ul').hide().parent().removeClass('on')
});
// login popup
$hoverEl.on('mouseenter mouseleave focusin focusout',function(e){
e.preventDefault();
if(e.type == 'mouseenter' || e.type == 'focusin'){
$(this).addClass('on');
} else {
$(this).removeClass('on');
}
});
// Search
$searchEl.click(function(){
if($searchForm.is(':hidden')){
$searchForm.fadeIn().find('input').focus();
@ -152,10 +190,3 @@
}
})(jQuery);
(function($){
$(function(){
$('.bg-holder').parallaxScroll({
friction: 0.5
});
});
})(jQuery);

View file

@ -1 +1 @@
!function(a){"use strict";a(function(){var b=300,c=a(".fixed_header .header_wrap"),d=(a(".gnb"),a(".hover"),a(".click > a")),e=a(".search_area");if(c.length){var f=(c.height(),!1),g=c.find(".header h1 img"),h=g.data("logo"),i=g.attr("src");a(window).scroll(function(){var d=a(this).scrollTop();d>=b?f||(c.addClass("shrink"),h&&g.attr("src",h),f=!0):f&&(c.removeClass("shrink"),h&&g.attr("src",i),f=!1)}),a(window).triggerHandler("scroll")}d.click(function(){return e.is(":hidden")&&(e.fadeIn().find("input").focus(),a(".magazine").length>0?(a(".custom_area").css("opacity",0),a(".side").css("opacity",0)):a(".header").css("opacity",0)),!1}),a(".btn_close").click(function(){var b=a(this);return b.parent().fadeOut().find("input").val(""),a(".magazine").length>0?(a(".custom_area").css("opacity",1),a(".side").css("opacity",1)):a(".header").css("opacity",1),d.focus(),!1}),a.isFunction(a.fn.camera)&&a(".camera_wrap").length&&a(".camera_wrap").camera({height:"600px",pagination:!0,thumbnails:!1,playPause:!1,loader:"none",fx:"simpleFade",time:3e3});var j=function(){var b=a(".btn_top"),c=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;a(window).scroll(function(){a(this).scrollTop()>150&&c>1e3?b.fadeIn(100):b.fadeOut(100)}),b.click(function(){return a("html, body").animate({scrollTop:0},400),!1})};j(),a(".sub_type3 .bg_img").parallax("50%",.4)})}(jQuery),function(a){"use strict";var b=a(window),c=b.height();b.resize(function(){c=b.height()}),a.fn.parallax=function(d,e,f){function g(){var f=b.scrollTop();j.each(function(){var b=a(this),g=b.offset().top,k=h(b);f>g+k||g>f+c||j.css("backgroundPosition",d+" "+Math.round((i-f)*e)+"px")})}var h,i,j=a(this);j.each(function(){i=j.offset().top}),h=f?function(a){return a.outerHeight(!0)}:function(a){return a.height()},(arguments.length<1||null===d)&&(d="50%"),(arguments.length<2||null===e)&&(e=.1),(arguments.length<3||null===f)&&(f=!0),b.bind("scroll",g).resize(g),g()}}(jQuery),function(a){a(function(){a(".bg-holder").parallaxScroll({friction:.5})})}(jQuery);
!function(a){"use strict";a(function(){var b=300,c=a(".fixed_header .header_wrap"),d=a(".gnb"),e=a(".hover"),f=a(".click > a"),g=a(".search_area");if(c.length){var h=(c.height(),!1),i=c.find(".header h1 img"),j=i.data("logo"),k=i.attr("src");a(window).scroll(function(){var d=a(this).scrollTop();d>=b?h||(c.addClass("shrink"),j&&i.attr("src",j),h=!0):h&&(c.removeClass("shrink"),j&&i.attr("src",k),h=!1)}),a(window).triggerHandler("scroll")}d.find(">ul>li>a").mouseover(function(){d.find(">ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){d.find(">ul>li>ul").hide().parent().removeClass("on")}),d.find(">ul>li>ul>li>a").mouseover(function(){d.find(">ul>li>ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){d.find(">ul>li>ul>li>ul").hide().parent().removeClass("on")}),e.on("mouseenter mouseleave focusin focusout",function(b){b.preventDefault(),"mouseenter"==b.type||"focusin"==b.type?a(this).addClass("on"):a(this).removeClass("on")}),f.click(function(){return g.is(":hidden")&&(g.fadeIn().find("input").focus(),a(".magazine").length>0?(a(".custom_area").css("opacity",0),a(".side").css("opacity",0)):a(".header").css("opacity",0)),!1}),a(".btn_close").click(function(){var b=a(this);return b.parent().fadeOut().find("input").val(""),a(".magazine").length>0?(a(".custom_area").css("opacity",1),a(".side").css("opacity",1)):a(".header").css("opacity",1),f.focus(),!1}),a.isFunction(a.fn.camera)&&a(".camera_wrap").length&&a(".camera_wrap").camera({height:"600px",pagination:!0,thumbnails:!1,playPause:!1,loader:"none",fx:"simpleFade",time:3e3});var l=function(){var b=a(".btn_top"),c=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;a(window).scroll(function(){a(this).scrollTop()>150&&c>1e3?b.fadeIn(100):b.fadeOut(100)}),b.click(function(){return a("html, body").animate({scrollTop:0},400),!1})};l(),a(".sub_type3 .bg_img").parallax("50%",.4)})}(jQuery),function(a){"use strict";var b=a(window),c=b.height();b.resize(function(){c=b.height()}),a.fn.parallax=function(d,e,f){function g(){var f=b.scrollTop();j.each(function(){var b=a(this),g=b.offset().top,k=h(b);f>g+k||g>f+c||j.css("backgroundPosition",d+" "+Math.round((i-f)*e)+"px")})}var h,i,j=a(this);j.each(function(){i=j.offset().top}),h=f?function(a){return a.outerHeight(!0)}:function(a){return a.height()},(arguments.length<1||null===d)&&(d="50%"),(arguments.length<2||null===e)&&(e=.1),(arguments.length<3||null===f)&&(f=!0),b.bind("scroll",g).resize(g),g()}}(jQuery);

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

View file

@ -1,7 +1,7 @@
(function($){
"user strict";
$(function(){
//$('.xeicon').parallax('50%', 0.4);
$('.xeicon').parallax('50%', 0.4);
$('.fe_box').on('mouseenter mouseleave',function(e){
$this = $(this);

View file

@ -1 +1 @@
!function(a){"user strict";a(function(){a(".fe_box").on("mouseenter mouseleave",function(b){$this=a(this),"mouseenter"==b.type?$this.addClass("on"):$this.removeClass("on")})})}(jQuery),function(a){"user strict";var b=a(window),c=b.height();b.resize(function(){c=b.height()}),a.fn.parallax=function(d,e,f){function g(){var f=b.scrollTop();j.each(function(){var b=a(this),g=b.offset().top,k=h(b);f>g+k||g>f+c||j.css("backgroundPosition",d+" "+Math.round((i-f)*e)+"px")})}var h,i,j=a(this);j.each(function(){i=j.hasClass("xeicon")?j.offset().top+600:j.offset().top}),h=f?function(a){return a.outerHeight(!0)}:function(a){return a.height()},(arguments.length<1||null===d)&&(d="50%"),(arguments.length<2||null===e)&&(e=.1),(arguments.length<3||null===f)&&(f=!0),b.bind("scroll",g).resize(g),g()}}(jQuery);
!function(a){"user strict";a(function(){a(".xeicon").parallax("50%",.4),a(".fe_box").on("mouseenter mouseleave",function(b){$this=a(this),"mouseenter"==b.type?$this.addClass("on"):$this.removeClass("on")})})}(jQuery),function(a){"user strict";var b=a(window),c=b.height();b.resize(function(){c=b.height()}),a.fn.parallax=function(d,e,f){function g(){var f=b.scrollTop();j.each(function(){var b=a(this),g=b.offset().top,k=h(b);f>g+k||g>f+c||j.css("backgroundPosition",d+" "+Math.round((i-f)*e)+"px")})}var h,i,j=a(this);j.each(function(){i=j.hasClass("xeicon")?j.offset().top+600:j.offset().top}),h=f?function(a){return a.outerHeight(!0)}:function(a){return a.height()},(arguments.length<1||null===d)&&(d="50%"),(arguments.length<2||null===e)&&(e=.1),(arguments.length<3||null===f)&&(f=!0),b.bind("scroll",g).resize(g),g()}}(jQuery);

View file

@ -1,5 +1,5 @@
<!--// META -->
{Context::addHtmlHeader('<meta name="viewport" content="width=device-width, user-scalable=no">')}
{Context::addHtmlHeader('<meta name="viewport" content="width=1240">')}
<!--// LANG -->
<load target="./lang" />
@ -145,21 +145,17 @@
<!--// CSS -->
<load target="./css/layout.css" />
<load target="./css/swiper.css" />
<load target="./css/camera.css" />
<load target="./css/welcome.css" />
<load target="./css/webfont.css" />
<load target="./css/xeicon.css" cond="$mid === 'xeicon'" />
<load target="../../common/xeicon/xeicon.min.css" />
<!--// JS -->
<!--Slider 구버젼. - 카메라 슬라이더-->
<load cond="$_enable_slide" target="./js/swiper.min.js" />
<load target="./js/jquery.easing.js" />
<load cond="$_enable_slide" target="./js/camera.min.js" />
<load target="./js/layout.js" />
<load target="./js/gnb.pc.js" cond="!Mobile::isMobileCheckByAgent()" />
<load target="./js/gnb.mobile.js" cond="Mobile::isMobileCheckByAgent()" />
<load cond="$layout_info->use_demo ==='Y' && !Mobile::isMobileCheckByAgent()" target="./js/welcome.js" />
<load cond="$layout_info->use_demo ==='Y'" target="./js/welcome.js" />
<load target="./js/SmoothScroll.min.js" />
<load target="./js/jquery.parallax-scroll.min.js" />
<!--// BODY -->
@ -182,7 +178,7 @@
</div>
</div>
<header class="header {$_visual_class}">
<header class="header">
<!--// LOGO -->
<h1 class="logo-item">
{@ $_logo_img = $layout_info->logo_img}
@ -265,13 +261,6 @@
<!-- GNB -->
<nav cond="$GNB->list" class="gnb" id="gnb">
<div id="mobile_menu_btn" class="menu_btn">
<div class="menu_bar">
<div class="btn1"></div>
<div class="btn2"></div>
<div class="btn3"></div>
</div>
</div>
<ul>
<li loop="$GNB->list => $key1, $val1">
<a href="{$val1['href']}" target="_blank"|cond="$val1['open_window'] == 'Y'">{$val1['link']}</a>
@ -305,54 +294,52 @@
<h1>{$sub_header_title}</h1>
</div>
</div>
<!-- Swiper -->
<div cond="$layout_info->layout_type === 'main' && $_enable_slide" class="visual swiper-container">
<!-- 슬라이드 -->
<div class="swiper-wrapper">
<!--@if($_sample_slide)-->
<include target="./demo/slide.html" />
<!--@else-->
<div cond="$layout_info->slide_img1" style="background-image:url('{$layout_info->slide_img1}');">
<div cond="$layout_info->slide_text1">
<div>
{$layout_info->slide_text1}
<div cond="$layout_info->layout_type === 'main' && $_enable_slide" class="visual">
<!-- 슬라이드 -->
<div class="camera_wrap">
<!--@if($_sample_slide)-->
<include target="./demo/slide.html" />
<!--@else-->
<div cond="$layout_info->slide_img1" data-src="{$layout_info->slide_img1}">
<div cond="$layout_info->slide_text1" class="camera_caption fadeIn">
<div class="camera_caption_wrap">
{$layout_info->slide_text1}
</div>
</div>
</div>
</div>
<div cond="$layout_info->slide_img2" style="background-image:url('{$layout_info->slide_img2}');">
<div cond="$layout_info->slide_text2">
<div>
{$layout_info->slide_text2}
<div cond="$layout_info->slide_img2" data-src="{$layout_info->slide_img2}">
<div cond="$layout_info->slide_text2" class="camera_caption fadeIn">
<div class="camera_caption_wrap">
{$layout_info->slide_text2}
</div>
</div>
</div>
</div>
<div cond="$layout_info->slide_img3" style="background-image:url('{$layout_info->slide_img3}');">
<div cond="$layout_info->slide_text3">
<div>
{$layout_info->slide_text3}
<div cond="$layout_info->slide_img3" data-src="{$layout_info->slide_img3}">
<div cond="$layout_info->slide_text3" class="camera_caption fadeIn">
<div class="camera_caption_wrap">
{$layout_info->slide_text3}
</div>
</div>
</div>
</div>
<div cond="$layout_info->slide_img4" style="background-image:url('{$layout_info->slide_img4}');">
<div cond="$layout_info->slide_text4">
<div>
{$layout_info->slide_text4}
<div cond="$layout_info->slide_img4" data-src="{$layout_info->slide_img4}">
<div cond="$layout_info->slide_text4" class="camera_caption fadeIn">
<div class="camera_caption_wrap">
{$layout_info->slide_text4}
</div>
</div>
</div>
</div>
<div cond="$layout_info->slide_img5" style="background-image:url('{$layout_info->slide_img5}');">
<div cond="$layout_info->slide_text5">
<div>
{$layout_info->slide_text5}
<div cond="$layout_info->slide_img5" data-src="{$layout_info->slide_img5}">
<div cond="$layout_info->slide_text5" class="camera_caption fadeIn">
<div class="camera_caption_wrap">
{$layout_info->slide_text5}
</div>
</div>
</div>
<!--@end-->
</div>
<!--@end-->
</div>
<!-- END:슬라이드 -->
<!-- Add Pagination -->
<div class="swiper-pagination"></div>
</div>
<!-- END:슬라이드 -->
</div>
<!-- /VISUAL -->
<!-- BODY -->
@ -425,16 +412,6 @@
<include target="./demo/copyright.html" />
<!--@end-->
</p>
<ul class="mobile-footer-member">
<!--@if(!$is_logged)-->
<li><a href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a></li>
<li><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
<!--@else-->
<li><a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
<li><a href="{getUrl('act','dispMemberInfo')}">{$lang->cmd_view_member_info}</a></li>
<!--@end-->
<li><a href="{getUrl('act','dispModuleChangeLang','oldact',$act)}">LANG</a></li>
</ul>
</div>
</footer>
</div>
@ -527,12 +504,4 @@
});
</script>
</section>
<!-- /Login widget -->
<script>
var swiper = new Swiper('.swiper-container', {
effect: 'fade',
loop: true,
pagination: '.swiper-pagination',
paginationClickable: true
});
</script>
<!-- /Login widget -->

File diff suppressed because one or more lines are too long

View file

@ -1 +1 @@
function setStartModule(){var a=jQuery(".moduleIdList option:selected").text(),b=jQuery(".moduleIdList").val();jQuery("#_target_module").val(a),jQuery("#index_module_srl").val(b),jQuery(".moduleList,.moduleIdList, .site_keyword_search, #sitefind_addBtn").css("display","none")}function viewSiteSearch(){jQuery(".site_keyword_search").css("display","")}function getFTPList(a){var b=jQuery("#ftp_form").get(0);"undefined"!=typeof a?b.ftp_root_path.value=a:!b.ftp_root_path.value&&"undefined"!=typeof b.sftp&&b.sftp.checked?b.ftp_root_path.value=xe_root:b.ftp_root_path.value="/";var c=[];c.ftp_user=jQuery("#ftp_user").val(),c.ftp_password=jQuery("#ftp_password").val(),c.ftp_host=jQuery("#ftp_host").val(),c.ftp_port=jQuery("#ftp_port").val(),c.ftp_root_path=jQuery("#ftp_root_path").val(),c.sftp=jQuery("input[name=sftp]:checked").val(),exec_xml("admin","getAdminFTPList",c,completeGetFtpInfo,["list","error","message"],c,b)}function removeFTPInfo(){var a={};exec_xml("install","procInstallAdminRemoveFTPInfo",a,filterAlertMessage,["error","message"],a)}function completeGetFtpInfo(a){if(0!==a.error)return alert(a.error),void alert(a.message);var b=jQuery("#ftpSuggestion").empty(),c="";jQuery.isArray(a.list.item)||(a.list.item=[a.list.item]),pwd=jQuery("#ftp_form").get(0).ftp_root_path.value,"/"!=pwd&&(arr=pwd.split("/"),arr.pop(),arr.pop(),arr.push(""),target=arr.join("/"),c=c+"<li><button type='button' onclick=\"getFTPList('"+target+"')\">../</button></li>");for(var d=0;d<a.list.item.length;d++){var e=a.list.item[d];"../"!=e&&"./"!=e&&(c=c+"<li><button type='button' onclick=\"getFTPList('"+pwd+e+"')\">"+e+"</button></li>")}c="<ul>"+c+"</ul>",b.append(jQuery(c))}function deleteIcon(a){var b=[];b.iconname=a,exec_xml("admin","procAdminRemoveIcons",b,iconDeleteMessage,["error","message"],b),icon=a}function iconDeleteMessage(a){alert(a.message),"0"==a.error&&("favicon.ico"==icon?jQuery(".faviconPreview img").attr("src","modules/admin/tpl/img/faviconSample.png"):"mobicon.png"==icon&&jQuery(".mobiconPreview img").attr("src","modules/admin/tpl/img/mobiconSample.png"))}function doRecompileCacheFile(){if(confirm(xe.lang.confirm_run)){var a=[];exec_xml("admin","procAdminRecompileCacheFile",a,completeCacheMessage)}}function completeCacheMessage(a){alert(a.message)}function doResetAdminMenu(){if(confirm(xe.lang.confirm_reset_admin_menu)){var a=[];a.menu_srl=admin_menu_srl,exec_xml("admin","procAdminMenuReset",a,completeResetAdminMenu)}}function completeResetAdminMenu(a){document.location.reload()}jQuery(function(a){a(".tgContent ul").bind("click",function(){a("#sitefind_addBtn").css("display","")})});var icon=null;
function setStartModule(){var a=jQuery(".moduleIdList option:selected").text(),b=jQuery(".moduleIdList").val();jQuery("#_target_module").val(a),jQuery("#index_module_srl").val(b),jQuery(".moduleList,.moduleIdList, .site_keyword_search, #sitefind_addBtn").css("display","none")}function viewSiteSearch(){jQuery(".site_keyword_search").css("display","")}function getFTPList(a){var b=jQuery("#ftp_form").get(0);b.ftp_root_path.value="undefined"!=typeof a?a:!b.ftp_root_path.value&&"undefined"!=typeof b.sftp&&b.sftp.checked?xe_root:"/";var c=[];c.ftp_user=jQuery("#ftp_user").val(),c.ftp_password=jQuery("#ftp_password").val(),c.ftp_host=jQuery("#ftp_host").val(),c.ftp_port=jQuery("#ftp_port").val(),c.ftp_root_path=jQuery("#ftp_root_path").val(),c.sftp=jQuery("input[name=sftp]:checked").val(),exec_xml("admin","getAdminFTPList",c,completeGetFtpInfo,["list","error","message"],c,b)}function removeFTPInfo(){var a={};exec_xml("install","procInstallAdminRemoveFTPInfo",a,filterAlertMessage,["error","message"],a)}function completeGetFtpInfo(a){if(0!==a.error)return alert(a.error),void alert(a.message);var b=jQuery("#ftpSuggestion").empty(),c="";jQuery.isArray(a.list.item)||(a.list.item=[a.list.item]),pwd=jQuery("#ftp_form").get(0).ftp_root_path.value,"/"!=pwd&&(arr=pwd.split("/"),arr.pop(),arr.pop(),arr.push(""),target=arr.join("/"),c=c+"<li><button type='button' onclick=\"getFTPList('"+target+"')\">../</button></li>");for(var d=0;d<a.list.item.length;d++){var e=a.list.item[d];"../"!=e&&"./"!=e&&(c=c+"<li><button type='button' onclick=\"getFTPList('"+pwd+e+"')\">"+e+"</button></li>")}c="<ul>"+c+"</ul>",b.append(jQuery(c))}function deleteIcon(a){var b=[];b.iconname=a,exec_xml("admin","procAdminRemoveIcons",b,iconDeleteMessage,["error","message"],b),icon=a}function iconDeleteMessage(a){alert(a.message),"0"==a.error&&("favicon.ico"==icon?jQuery(".faviconPreview img").attr("src","modules/admin/tpl/img/faviconSample.png"):"mobicon.png"==icon&&jQuery(".mobiconPreview img").attr("src","modules/admin/tpl/img/mobiconSample.png"))}function doRecompileCacheFile(){if(confirm(xe.lang.confirm_run)){var a=[];exec_xml("admin","procAdminRecompileCacheFile",a,completeCacheMessage)}}function completeCacheMessage(a){alert(a.message)}function doResetAdminMenu(){if(confirm(xe.lang.confirm_reset_admin_menu)){var a=[];a.menu_srl=admin_menu_srl,exec_xml("admin","procAdminMenuReset",a,completeResetAdminMenu)}}function completeResetAdminMenu(){document.location.reload()}jQuery(function(a){a(".tgContent ul").bind("click",function(){a("#sitefind_addBtn").css("display","")})});var icon=null;

View file

@ -1 +1 @@
jQuery(function(a){function b(b){var c;if(moduleList=b.menuList,moduleList){var d=a("#menuNameList");for(var e in moduleList){var f=moduleList[e];c=a('<optgroup label="'+e+'" />').appendTo(d);for(var g in f)c.append('<option value="'+e+":"+g+'">'+f[g].title+"</option>")}}}var c,d,e=a("#editForm"),f=a("#listForm");a("a._add").click(function(){if(d=a(this).parent().prevAll("._item_key").val(),e.find("input[name=parent_srl]").val(d),!c){var f=[],g=["menuList"];exec_xml("menu","procMenuAdminAllActList",f,b,g)}}),a("a._parent_delete").click(function(){var b=a(this).parent().prevAll("._parent_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()}),a("a._child_delete").click(function(){var b=a(this).closest("li").find("._item_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()})}),jQuery(function(a){function b(a,b){for(var c=0,d=0;a&&a!=b;)c+=a.offsetTop,d+=a.offsetLeft,a=a.offsetParent;return{top:c,left:d}}a("form.adminMap").delegate("li:not(.placeholder)","dropped.st",function(){var b,c,d=a(this);b=d.find(">input._parent_key"),c=!!d.parent("ul").parent("li").length,c?b.val(d.parent("ul").parent("li").find(">input._item_key").val()):b.val("0")});var c=!1,d=a('<li class="placeholder">');a("form.adminMap>ul").delegate("li:not(.placeholder,.parent)",{"mousedown.st":function(e){var f,g,h,i,j,k,l,m,n,o;if(!a(e.target).is("a,input,label,textarea")&&1==e.which){for(c=!0,f=a(this),j=f.height(),i=f.width(),g=f.parentsUntil(".adminMap").filter("ul"),h=g.eq(-1),l={x:e.pageX,y:e.pageY},k=b(this,h.get(0)),$clone=f.clone(!0).attr("target",!0),n=g.length-1;n;n--)$clone=$clone.wrap("<li><ul /></li>").parent().parent();return m=[],h.find("li").each(function(c){if(f[0]===this||f.has(this).length)return!0;var d=b(this,h.get(0));m.push({top:d.top,bottom:d.top+32,$item:a(this)})}),$clone.find(".side,input").remove().end().addClass("draggable").css({position:"absolute",opacity:.6,width:i,height:j,left:k.left,top:k.top,zIndex:100}).appendTo(h.eq(0)),d.css({position:"absolute",opacity:.6,width:i,height:"10px",left:k.left,top:k.top,zIndex:99}).appendTo(h.eq(0)),f.css("opacity",.6),a(document).unbind("mousemove.st mouseup.st").bind("mousemove.st",function(a){var b,c,e,f,g;for(o=null,b={x:l.x-a.pageX,y:l.y-a.pageY},c=k.top-b.y,e=0,f=m.length;f>e;e++)g=m[e],g.top>c||g.bottom<c||(o={element:g.$item},g.$item.hasClass("parent")?(o.state="prepend",d.css("top",g.bottom-5)):g.top>c-12?(o.state="before",d.css("top",g.top-5)):(o.state="after",d.css("top",g.bottom-5)));$clone.css({top:c})}).bind("mouseup.st",function(b){var e,g;c=!1,a(document).unbind("mousemove.st mouseup.st"),f.css("opacity",""),$clone.remove(),d.remove(),g=a("<li />").height(f.height()),o&&(e=a(o.element),f.before(g),"prepend"==o.state?(e.find(">ul").length||e.find(">.side").after("<ul>"),e.find(">ul").prepend(f.hide())):e[o.state](f.hide()),f.slideDown(100,function(){f.removeClass("active")}),g.slideUp(100,function(){var a=g.parent();g.remove(),a.children("li").length||a.remove()}),f.trigger("dropped.st"))}),!1}},"mouseover.st":function(){return c||a(this).addClass("active"),!1},"mouseout.st":function(){return c||a(this).removeClass("active"),!1}}).find("li li").prepend('<button type="button" class="moveTo">Move to</button>').end().end(),a('<div id="dropzone-marker" />').css({display:"none",position:"absolute",backgroundColor:"#000",opacity:.7}).appendTo("body")});
jQuery(function(a){function b(b){var c;if(moduleList=b.menuList){var d=a("#menuNameList");for(var e in moduleList){var f=moduleList[e];c=a('<optgroup label="'+e+'" />').appendTo(d);for(var g in f)c.append('<option value="'+e+":"+g+'">'+f[g].title+"</option>")}}}var c,d,e=a("#editForm"),f=a("#listForm");a("a._add").click(function(){if(d=a(this).parent().prevAll("._item_key").val(),e.find("input[name=parent_srl]").val(d),!c){var f=[],g=["menuList"];exec_xml("menu","procMenuAdminAllActList",f,b,g)}}),a("a._parent_delete").click(function(){var b=a(this).parent().prevAll("._parent_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()}),a("a._child_delete").click(function(){var b=a(this).closest("li").find("._item_key").val();f.find("input[name=menu_item_srl]").val(b),f.submit()})}),jQuery(function(a){function b(a,b){for(var c=0,d=0;a&&a!=b;)c+=a.offsetTop,d+=a.offsetLeft,a=a.offsetParent;return{top:c,left:d}}a("form.adminMap").delegate("li:not(.placeholder)","dropped.st",function(){var b,c,d=a(this);b=d.find(">input._parent_key"),c=!!d.parent("ul").parent("li").length,b.val(c?d.parent("ul").parent("li").find(">input._item_key").val():"0")});var c=!1,d=a('<li class="placeholder">');a("form.adminMap>ul").delegate("li:not(.placeholder,.parent)",{"mousedown.st":function(e){var f,g,h,i,j,k,l,m,n,o;if(!a(e.target).is("a,input,label,textarea")&&1==e.which){for(c=!0,f=a(this),j=f.height(),i=f.width(),g=f.parentsUntil(".adminMap").filter("ul"),h=g.eq(-1),l={x:e.pageX,y:e.pageY},k=b(this,h.get(0)),$clone=f.clone(!0).attr("target",!0),n=g.length-1;n;n--)$clone=$clone.wrap("<li><ul /></li>").parent().parent();return m=[],h.find("li").each(function(){if(f[0]===this||f.has(this).length)return!0;var c=b(this,h.get(0));m.push({top:c.top,bottom:c.top+32,$item:a(this)})}),$clone.find(".side,input").remove().end().addClass("draggable").css({position:"absolute",opacity:.6,width:i,height:j,left:k.left,top:k.top,zIndex:100}).appendTo(h.eq(0)),d.css({position:"absolute",opacity:.6,width:i,height:"10px",left:k.left,top:k.top,zIndex:99}).appendTo(h.eq(0)),f.css("opacity",.6),a(document).unbind("mousemove.st mouseup.st").bind("mousemove.st",function(a){var b,c,e,f,g;for(o=null,b={x:l.x-a.pageX,y:l.y-a.pageY},c=k.top-b.y,e=0,f=m.length;f>e;e++)g=m[e],g.top>c||g.bottom<c||(o={element:g.$item},g.$item.hasClass("parent")?(o.state="prepend",d.css("top",g.bottom-5)):g.top>c-12?(o.state="before",d.css("top",g.top-5)):(o.state="after",d.css("top",g.bottom-5)));$clone.css({top:c})}).bind("mouseup.st",function(){var b,e;c=!1,a(document).unbind("mousemove.st mouseup.st"),f.css("opacity",""),$clone.remove(),d.remove(),e=a("<li />").height(f.height()),o&&(b=a(o.element),f.before(e),"prepend"==o.state?(b.find(">ul").length||b.find(">.side").after("<ul>"),b.find(">ul").prepend(f.hide())):b[o.state](f.hide()),f.slideDown(100,function(){f.removeClass("active")}),e.slideUp(100,function(){var a=e.parent();e.remove(),a.children("li").length||a.remove()}),f.trigger("dropped.st"))}),!1}},"mouseover.st":function(){return c||a(this).addClass("active"),!1},"mouseout.st":function(){return c||a(this).removeClass("active"),!1}}).find("li li").prepend('<button type="button" class="moveTo">Move to</button>').end().end(),a('<div id="dropzone-marker" />').css({display:"none",position:"absolute",backgroundColor:"#000",opacity:.7}).appendTo("body")});

View file

@ -1 +1 @@
function completeInsertBoard(a){var b=(a.error,a.message),c=a.page,d=a.module_srl;alert(b);var e=current_url.setQuery("act","dispBoardAdminBoardInfo");d&&(e=e.setQuery("module_srl",d)),c&&e.setQuery("page",c),location.href=e}function completeDeleteBoard(a){var b=(a.error,a.message),c=a.page;alert(b);var d=current_url.setQuery("act","dispBoardAdminContent").setQuery("module_srl","");c&&(d=d.setQuery("page",c)),location.href=d}function doUpdateCategory(a,b,c){if("undefined"==typeof c||confirm(c)){var d=xGetElementById("fo_category_info");d.category_srl.value=a,d.mode.value=b,procFilter(d,update_category)}}function completeUpdateCategory(a){var b=(a.error,a.message),c=a.module_srl,d=a.page;alert(b);var e=current_url.setQuery("module_srl",c).setQuery("act","dispBoardAdminCategoryInfo");d&&e.setQuery("page",d),location.href=e}function doCartSetup(a){var b=[];jQuery("#fo_list input[name=cart]:checked").each(function(){b[b.length]=jQuery(this).val()}),b.length<1||(a+="&module_srls="+b.join(","),popopen(a,"modulesSetup"))}function doInsertItem(){var a=xGetElementById("targetItem"),b=xGetElementById("displayItem");if(a&&b){for(var c=a.options[a.selectedIndex].text,d=a.options[a.selectedIndex].value,e=0;e<b.options.length;e++)if(b.options[e].value==d)return;var f=new Option(c,d,!0,!0);b.options[b.options.length]=f}}function doDeleteItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;0>b||a.options.length<2||(a.remove(b),a.selectedIndex=b-1)}function doMoveUpItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(1>b)&&b){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b-1].text,a.options[b].value=a.options[b-1].value,a.options[b-1].text=c,a.options[b-1].value=d,a.selectedIndex=b-1}}function doMoveDownItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(b>=a.options.length-1)){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b+1].text,a.options[b].value=a.options[b+1].value,a.options[b+1].text=c,a.options[b+1].value=d,a.selectedIndex=b+1}}function doSaveListConfig(a){if(a){for(var b=xGetElementById("displayItem"),c=(b.selectedIndex,[]),d=0;d<b.options.length;d++)c[c.length]=b.options[d].value;if(!(c.length<1)){var e={};e.module_srl=a,e.list=c.join(",");new Array("error","message");exec_json("board.procBoardAdminInsertListConfig",e,function(){location.reload()})}}}
function completeInsertBoard(a){var b=(a.error,a.message),c=a.page,d=a.module_srl;alert(b);var e=current_url.setQuery("act","dispBoardAdminBoardInfo");d&&(e=e.setQuery("module_srl",d)),c&&e.setQuery("page",c),location.href=e}function completeDeleteBoard(a){var b=(a.error,a.message),c=a.page;alert(b);var d=current_url.setQuery("act","dispBoardAdminContent").setQuery("module_srl","");c&&(d=d.setQuery("page",c)),location.href=d}function doUpdateCategory(a,b,c){if("undefined"==typeof c||confirm(c)){var d=xGetElementById("fo_category_info");d.category_srl.value=a,d.mode.value=b,procFilter(d,update_category)}}function completeUpdateCategory(a){var b=(a.error,a.message),c=a.module_srl,d=a.page;alert(b);var e=current_url.setQuery("module_srl",c).setQuery("act","dispBoardAdminCategoryInfo");d&&e.setQuery("page",d),location.href=e}function doCartSetup(a){var b=[];jQuery("#fo_list input[name=cart]:checked").each(function(){b[b.length]=jQuery(this).val()}),b.length<1||(a+="&module_srls="+b.join(","),popopen(a,"modulesSetup"))}function doInsertItem(){var a=xGetElementById("targetItem"),b=xGetElementById("displayItem");if(a&&b){for(var c=a.options[a.selectedIndex].text,d=a.options[a.selectedIndex].value,e=0;e<b.options.length;e++)if(b.options[e].value==d)return;var f=new Option(c,d,!0,!0);b.options[b.options.length]=f}}function doDeleteItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;0>b||a.options.length<2||(a.remove(b),a.selectedIndex=b-1)}function doMoveUpItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(1>b)&&b){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b-1].text,a.options[b].value=a.options[b-1].value,a.options[b-1].text=c,a.options[b-1].value=d,a.selectedIndex=b-1}}function doMoveDownItem(){var a=xGetElementById("displayItem"),b=a.selectedIndex;if(!(b>=a.options.length-1)){var c=a.options[b].text,d=a.options[b].value;a.options[b].text=a.options[b+1].text,a.options[b].value=a.options[b+1].value,a.options[b+1].text=c,a.options[b+1].value=d,a.selectedIndex=b+1}}function doSaveListConfig(a){if(a){for(var b=xGetElementById("displayItem"),c=(b.selectedIndex,[]),d=0;d<b.options.length;d++)c[c.length]=b.options[d].value;if(!(c.length<1)){var e={};e.module_srl=a,e.list=c.join(",");{new Array("error","message")}exec_json("board.procBoardAdminInsertListConfig",e,function(){location.reload()})}}}

View file

@ -637,10 +637,16 @@ class commentController extends comment
* Fix the comment
* @param object $obj
* @param bool $is_admin
* @param bool $manual_updated
* @return object
*/
function updateComment($obj, $is_admin = FALSE)
function updateComment($obj, $is_admin = FALSE, $manual_updated = FALSE)
{
if(!$manual_updated && !checkCSRF())
{
return new Object(-1, 'msg_invalid_request');
}
if(!is_object($obj))
{
$obj = new stdClass();

View file

@ -868,7 +868,7 @@ class documentController extends document
$output = executeQuery('document.updateReadedCount', $args);
// Call a trigger when the read count is updated (after)
$outptrigger_outputut = ModuleHandler::triggerCall('document.updateReadedCount', 'after', $oDocument);
$trigger_output = ModuleHandler::triggerCall('document.updateReadedCount', 'after', $oDocument);
if(!$trigger_output->toBool())
{
$oDB->rollback();

View file

@ -1 +1 @@
!function(a){var b=xe.createApp("Gallery",{_imgs:{},_styles:{},init:function(){this._imgs={}},API_ADD_IMAGE:function(a,b){var c=b[0],d=b[1],e="@"+c;/^files/.test(d)&&(d=request_uri+d),is_def(this._imgs[e])||(this._imgs[e]=[]),this._imgs[e].push({path:d,loaded:!1})},API_ONREADY:function(b,c){var d,e,f,g,h=this._imgs;for(f in h)if(h.hasOwnProperty(f))for(d=0,e=h[f].length;e>d;d++)g=h[f][d],g.$obj=a("<img />").attr("src",g.path),g.$obj.load({img:g},function(a){var b=a.data.img;b.loaded=!0,b.$obj.unbind("load")})},API_GET_IMAGES:function(a,b){var c=b[0];return this._imgs["@"+c]||[]},API_SET_STYLE:function(a,b){var c=b[0],d=b[1];this._styles["@"+c]=d},API_ONLOAD:function(){var a,b;for(a in this._imgs)this._imgs.hasOwnProperty(a)&&(b=this._styles[a]||"list",this.cast("SHOW_"+b.toUpperCase(),[a.substr(1)]))}});xe.registerApp(new b)}(jQuery);
!function(a){var b=xe.createApp("Gallery",{_imgs:{},_styles:{},init:function(){this._imgs={}},API_ADD_IMAGE:function(a,b){var c=b[0],d=b[1],e="@"+c;/^files/.test(d)&&(d=request_uri+d),is_def(this._imgs[e])||(this._imgs[e]=[]),this._imgs[e].push({path:d,loaded:!1})},API_ONREADY:function(){var b,c,d,e,f=this._imgs;for(d in f)if(f.hasOwnProperty(d))for(b=0,c=f[d].length;c>b;b++)e=f[d][b],e.$obj=a("<img />").attr("src",e.path),e.$obj.load({img:e},function(a){var b=a.data.img;b.loaded=!0,b.$obj.unbind("load")})},API_GET_IMAGES:function(a,b){var c=b[0];return this._imgs["@"+c]||[]},API_SET_STYLE:function(a,b){var c=b[0],d=b[1];this._styles["@"+c]=d},API_ONLOAD:function(){var a,b;for(a in this._imgs)this._imgs.hasOwnProperty(a)&&(b=this._styles[a]||"list",this.cast("SHOW_"+b.toUpperCase(),[a.substr(1)]))}});xe.registerApp(new b)}(jQuery);

View file

@ -1 +1 @@
function getSlideShow(){var a,b,c,d,e,f,g,h,i="";if("undefined"!=typeof opener){a=opener.editorPrevNode,b=jQuery(a),b.is("img")&&(selected_node=a,c=b.width(),d=b.attr("gallery_style"),e=b.attr("gallery_align")||"center",f=b.attr("border_color"),g=b.attr("bg_color"),h=b.attr("border_thickness")||1,get_by_id("width").value=c,get_by_id("gallery_style").selectedIndex="list"==d?1:0,get_by_id("gallery_align").selectedIndex="left"==e?1:"right"==e?2:0,get_by_id("border_thickness").value=h,get_by_id("border_color_input").value=f,get_by_id("bg_color_input").value=g,i=b.attr("images_list"));var j=get_by_id("fo"),k=j.editor_sequence.value,l=get_by_id("image_list");jQuery.exec_json("file.getFileList",{editor_sequence:k},function(a){jQuery.each(a.files,function(a,b){var c=b.file_srl;if(c){var d=b.source_filename;if(/\.(jpe?g|png|gif)$/i.test(d)){var e=!1;-1!=i.indexOf(d)&&(e=!0);var f=new Option(b.source_filename,c,!1,e);l.options.add(f),files[b.file_srl]=b}}})})}}function insertSlideShow(){if("undefined"!=typeof opener){for(var a=new Array,b=get_by_id("image_list"),c=0;c<b.length;c++){var d=b.options[c];if(d.selected){var e=d.value,f=files[e],g=f.download_url.replace(request_uri,"");a[a.length]=g}}if(!a.length)return void window.close();for(var h=get_by_id("width").value,i=get_by_id("gallery_style").options[get_by_id("gallery_style").selectedIndex].value,j=get_by_id("gallery_align").options[get_by_id("gallery_align").selectedIndex].value,k=get_by_id("border_thickness").value,l=get_by_id("border_color_input").value,m=get_by_id("bg_color_input").value,n="",c=0;c<a.length;c++)n+=a[c].trim()+" ";if(selected_node)selected_node.setAttribute("width",h),selected_node.setAttribute("gallery_style",i),selected_node.setAttribute("align",j),selected_node.setAttribute("gallery_align",j),selected_node.setAttribute("border_thickness",k),selected_node.setAttribute("border_color",l),selected_node.setAttribute("bg_color",m),selected_node.setAttribute("images_list",n),selected_node.style.width=h+"px";else{var o='<img src="../../../../common/img/blank.gif" editor_component="image_gallery" width="'+h+'" gallery_style="'+i+'" align="'+j+'" gallery_align="'+j+'" border_thickness="'+k+'" border_color="'+l+'" bg_color="'+m+'" style="width:'+h+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;" images_list="'+n+'" />';opener.editorFocus(opener.editorPrevSrl);var p=opener.editorGetIFrame(opener.editorPrevSrl);opener.editorReplaceHTML(p,o)}opener.editorFocus(opener.editorPrevSrl),window.close()}}function select_color(a,b){get_by_id(a+"_preview_color").style.backgroundColor="#"+b,get_by_id(a+"_color_input").value=b}var selected_node=null,files=[];jQuery(function(a){getSlideShow()});
function getSlideShow(){var a,b,c,d,e,f,g,h,i="";if("undefined"!=typeof opener){a=opener.editorPrevNode,b=jQuery(a),b.is("img")&&(selected_node=a,c=b.width(),d=b.attr("gallery_style"),e=b.attr("gallery_align")||"center",f=b.attr("border_color"),g=b.attr("bg_color"),h=b.attr("border_thickness")||1,get_by_id("width").value=c,get_by_id("gallery_style").selectedIndex="list"==d?1:0,get_by_id("gallery_align").selectedIndex="left"==e?1:"right"==e?2:0,get_by_id("border_thickness").value=h,get_by_id("border_color_input").value=f,get_by_id("bg_color_input").value=g,i=b.attr("images_list"));var j=get_by_id("fo"),k=j.editor_sequence.value,l=get_by_id("image_list");jQuery.exec_json("file.getFileList",{editor_sequence:k},function(a){jQuery.each(a.files,function(a,b){var c=b.file_srl;if(c){var d=b.source_filename;if(/\.(jpe?g|png|gif)$/i.test(d)){var e=!1;-1!=i.indexOf(d)&&(e=!0);var f=new Option(b.source_filename,c,!1,e);l.options.add(f),files[b.file_srl]=b}}})})}}function insertSlideShow(){if("undefined"!=typeof opener){for(var a=new Array,b=get_by_id("image_list"),c=0;c<b.length;c++){var d=b.options[c];if(d.selected){var e=d.value,f=files[e],g=f.download_url.replace(request_uri,"");a[a.length]=g}}if(!a.length)return void window.close();for(var h=get_by_id("width").value,i=get_by_id("gallery_style").options[get_by_id("gallery_style").selectedIndex].value,j=get_by_id("gallery_align").options[get_by_id("gallery_align").selectedIndex].value,k=get_by_id("border_thickness").value,l=get_by_id("border_color_input").value,m=get_by_id("bg_color_input").value,n="",c=0;c<a.length;c++)n+=a[c].trim()+" ";if(selected_node)selected_node.setAttribute("width",h),selected_node.setAttribute("gallery_style",i),selected_node.setAttribute("align",j),selected_node.setAttribute("gallery_align",j),selected_node.setAttribute("border_thickness",k),selected_node.setAttribute("border_color",l),selected_node.setAttribute("bg_color",m),selected_node.setAttribute("images_list",n),selected_node.style.width=h+"px";else{var o='<img src="../../../../common/img/blank.gif" editor_component="image_gallery" width="'+h+'" gallery_style="'+i+'" align="'+j+'" gallery_align="'+j+'" border_thickness="'+k+'" border_color="'+l+'" bg_color="'+m+'" style="width:'+h+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;" images_list="'+n+'" />';opener.editorFocus(opener.editorPrevSrl);var p=opener.editorGetIFrame(opener.editorPrevSrl);opener.editorReplaceHTML(p,o)}opener.editorFocus(opener.editorPrevSrl),window.close()}}function select_color(a,b){get_by_id(a+"_preview_color").style.backgroundColor="#"+b,get_by_id(a+"_color_input").value=b}var selected_node=null,files=[];jQuery(function(){getSlideShow()});

View file

@ -550,8 +550,7 @@ class editorModel extends editor
if(!file_exists($class_file)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
// Create an object after loading the class file
require_once($class_file);
$tmp_fn = create_function('$seq,$path', "return new {$component}(\$seq,\$path);");
$oComponent = $tmp_fn($editor_sequence, $class_path);
$oComponent = new $component($editor_sequence, $class_path);
if(!$oComponent) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
// Add configuration information
$component_info = $this->getComponent($component, $site_srl);

View file

@ -1,6 +0,0 @@
.cke_button__xe_component_label {
display: inline !important;
}
.cke_button__xe_component_icon {
display: none !important;
}

View file

@ -9,7 +9,7 @@
{@ $css_content = null }
<!--@if($content_font || $content_font_size)-->
{@ $css_content = '.xe_content.editable p { margin: 0;'. chr(125); }
<!--@if($content_style === 'ckeditor_light')-->{@ $css_content = '.xe_content.editable p { margin: 0;'. chr(125); }<!--@endif-->
{@ $css_content .= ' .xe_content.editable { '}
<block cond="$content_font">
@ -40,7 +40,8 @@
skin: '{$colorset}',
contentsCss: '{$content_style_path}/editor.css',
xe_editor_sequence: {$editor_sequence},
toolbarCanCollapse: true
toolbarCanCollapse: true,
language: "{str_replace('jp','ja',$lang_type)}"
},
loadXeComponent: true,
enableToolbar: true,
@ -69,6 +70,10 @@
<!--@if($module_type === 'comment')-->
settings.ckeconfig.toolbarStartupExpanded = false;
<!--@endif-->
<!--@if(!$html_mode)-->
settings.ckeconfig.removeButtons = 'Save,Preview,Print,Cut,Copy,Paste,Source';
<!--@endif-->
<!--@if($css_content)-->CKEDITOR.addCss('{$css_content}');<!--@end-->

View file

@ -1,34 +1,32 @@
<!--%load_js_plugin("jquery.fileupload")-->
<!--%load_js_plugin("jquery.finderSelect")-->
<!--%load_js_plugin("handlebars")-->
<load target="./lang" />
<div cond="$allow_fileupload" id="xefu-container-{$editor_sequence}" class="xefu-container xe-clearfix" data-editor-sequence="{$editor_sequence}">
<!--// dropzone -->
<div class="xefu-dropzone">
<p class="xefu-dropzone-message">여기에 파일을 끌어 놓거나 파일 첨부를 클릭하세요</p>
<span class="xefu-btn fileinput-button xefu-act-selectfile">
<span><i class="xi-icon xi-file-add"></i> {$lang->edit->upload_file}</span>
<input id="xe-fileupload" type="file" class="fileupload-processing " value="{$lang->edit->upload_file}" name="Filedata" data-auto-upload="true" data-editor-sequence="{$editor_sequence}" multiple />
</span>
<div>
<span class="xefu-btn fileinput-button xefu-act-selectfile">
<span>{$lang->edit->upload_file}</span>
<input id="xe-fileupload" type="file" class="fileupload-processing " value="{$lang->edit->upload_file}" name="Filedata" data-auto-upload="true" data-editor-sequence="{$editor_sequence}" multiple />
</span>
</div>
<p class="xefu-dropzone-message">{$lang->ckeditor_about_file_drop_area}</p>
<p>파일 크기 제한 : <span class="allowed_filesize">0MB</span> <span>(허용 확장자 : <span class="allowed_filetypes">*.*</span>)</span></p>
<p class="upload_info">{$lang->allowed_filesize} : <span class="allowed_filesize">0MB</span> <span>({$lang->allowed_filetypes} : <span class="allowed_filetypes">*.*</span>)</span></p>
<p class="xefu-progress-status" style="display: none;">파일 업로드 중... (<span class="xefu-progress-percent">0%</span>)</p>
<p class="xefu-progress-status" style="display: none;">{$lang->ckeditor_file_uploading} (<span class="xefu-progress-percent">0%</span>)</p>
<div class="xefu-progressbar" style="display: none;"><div></div></div>
</div>
<!--// END:dropzone -->
<div class="xefu-controll xe-clearfix">
<div style="float: left;">
<span class="file_count">0</span>개 첨부 됨 (<span class="attached_size"></span> / <span class="allowed_attach_size"></span>)
{$lang->ckeditor_file_count} (<span class="attached_size"></span> / <span class="allowed_attach_size"></span>)
</div>
<div style="float: right">
<input type="button" class="xefu-btn xefu-act-link-selected" style=" vertical-align: middle; vertical-align: middle;" value="본문삽입">
<input type="button" class="xefu-btn xefu-act-delete-selected" style=" vertical-align: middle; vertical-align: middle;" value="선택삭제">
<input type="button" class="xefu-btn xefu-act-link-selected" style=" vertical-align: middle; vertical-align: middle;" value="{$lang->edit->link_file}">
<input type="button" class="xefu-btn xefu-act-delete-selected" style=" vertical-align: middle; vertical-align: middle;" value="{$lang->edit->delete_selected}">
</div>
</div>

View file

@ -0,0 +1,33 @@
<?xml version='1.0' encoding='UTF-8'?>
<lang>
<item name="ckeditor_about_file_drop_area">
<value xml:lang="ko"><![CDATA[여기에 파일을 끌어 놓거나 아래 파일 첨부 버튼을 클릭하세요.]]></value>
<value xml:lang="en"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
<value xml:lang="jp"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
<value xml:lang="zh-CN"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
<value xml:lang="zh-TW"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
<value xml:lang="ru"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
<value xml:lang="tr"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
<value xml:lang="vi"><![CDATA[Drag and drop your files here, or Click attach files button below.]]></value>
</item>
<item name="ckeditor_file_uploading">
<value xml:lang="ko"><![CDATA[파일 업로드 중...]]></value>
<value xml:lang="en"><![CDATA[Uploading...]]></value>
<value xml:lang="jp"><![CDATA[Uploading...]]></value>
<value xml:lang="zh-CN"><![CDATA[Uploading...]]></value>
<value xml:lang="zh-TW"><![CDATA[Uploading...]]></value>
<value xml:lang="ru"><![CDATA[Uploading...]]></value>
<value xml:lang="tr"><![CDATA[Uploading...]]></value>
<value xml:lang="vi"><![CDATA[Uploading...]]></value>
</item>
<item name="ckeditor_file_count">
<value xml:lang="ko"><![CDATA[<span class="file_count">0</span>개 첨부 됨]]></value>
<value xml:lang="en"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
<value xml:lang="jp"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
<value xml:lang="zh-CN"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
<value xml:lang="zh-TW"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
<value xml:lang="ru"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
<value xml:lang="tr"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
<value xml:lang="vi"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
</item>
</lang>

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,19 @@
@charset "utf-8";
/* NAVER (developers@xpressengine.com) */
.xe_content.editable {color:#000;font-size:14px;font-family:sans-serif;line-height:1.6;word-break:break-all;word-wrap:break-word}
.xe_content.editable img{border:0;max-width:100%;}
.xe_content.editable blockquote.q1,
.xe_content.editable blockquote.q2,
.xe_content.editable blockquote.q3,
.xe_content.editable blockquote.q4,
.xe_content.editable blockquote.q5,
.xe_content.editable blockquote.q6,
.xe_content.editable blockquote.q7{padding:10px;margin:0 15px}
.xe_content.editable blockquote.q1{padding:0 10px;border-left:2px solid #ccc}
.xe_content.editable blockquote.q2{padding:0 10px;background:url(./img/bg_qmark.gif) no-repeat left top}
.xe_content.editable blockquote.q3{border:1px solid #d9d9d9}
.xe_content.editable blockquote.q4{border:1px solid #d9d9d9;background:#fbfbfb}
.xe_content.editable blockquote.q5{border:2px solid #707070}
.xe_content.editable blockquote.q6{border:1px dashed #707070}
.xe_content.editable blockquote.q7{border:1px dashed #707070;background:#fbfbfb}
.xe_content.editable table .xe_selected_cell{background-color:#d6e9ff}

View file

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<link rel="stylesheet" href="editor.css" />
<title>XpressEngine</title>
</head>
<body class="xe_content editable">
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 B

View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<skin version="0.2">
<title xml:lang="ko">XE CKEditor 권장 서식</title>
<version>1.8</version>
<date>2014-02-27</date>
<author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
<name xml:lang="ko">NAVER</name>
</author>
</skin>

View file

@ -0,0 +1,17 @@
@charset "utf-8";
/* NAVER (developers@xpressengine.com) */
.xe_content {color:#000;font-size:14px;font-family:sans-serif;line-height:1.6}
.xe_content blockquote.q1,
.xe_content blockquote.q2,
.xe_content blockquote.q3,
.xe_content blockquote.q4,
.xe_content blockquote.q5,
.xe_content blockquote.q6,
.xe_content blockquote.q7{padding:10px;margin:0 15px}
.xe_content blockquote.q1{padding:0 10px;border-left:2px solid #ccc}
.xe_content blockquote.q2{padding:0 10px;background:url(./img/bg_qmark.gif) no-repeat left top}
.xe_content blockquote.q3{border:1px solid #d9d9d9}
.xe_content blockquote.q4{border:1px solid #d9d9d9;background:#fbfbfb}
.xe_content blockquote.q5{border:2px solid #707070}
.xe_content blockquote.q6{border:1px dashed #707070}
.xe_content blockquote.q7{border:1px dashed #707070;background:#fbfbfb}

View file

@ -0,0 +1 @@
style.css

View file

@ -1 +1 @@
!function(a){"use strict";function b(b){return a.grep(b,function(c,d){return c.length&&a.inArray(c,b)===d})}var c={bodyClass:"xe_content editable",toolbarCanCollapse:!0,toolbarGroups:[{name:"clipboard",groups:["undo","clipboard"]},{name:"editing",groups:["find","selection"]},{name:"links"},{name:"insert"},{name:"tools"},{name:"document",groups:["mode"]},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},"/",{name:"styles"},{name:"colors"},{name:"xecomponent"},{name:"others"}],allowedContent:!0,removePlugins:"stylescombo,language,bidi,flash,pagebreak",removeButtons:"Save,Preview,Print,Cut,Copy,Paste",uiColor:"#EFF0F0"},d=xe.createApp("XeCkEditor",{ckeconfig:{},editor_sequence:null,init:function(){var a=this;CKEDITOR.on("instanceCreated",function(b){a.cast("CKEDITOR_CREATED")}),CKEDITOR.on("ready",function(b){a.cast("CKEDITOR_READY")}),CKEDITOR.on("instanceReady",function(b){a.cast("CKEDITOR_INSTANCE_READY")}),CKEDITOR.on("instanceLoaded",function(b){a.cast("CKEDITOR_LOADED")})},editorInit:function(d,e){var f=this,g=d,h=g.closest("form"),i=h.find(e.content_field),j=g.data();g.data().editorSequence;this.ckeconfig=a.extend({},c,e.ckeconfig||{}),this.editor_sequence=j.editorSequence,h.attr("editor_sequence",j.editorSequence),CKEDITOR.env.mobile&&(CKEDITOR.env.isCompatible=!0);var k=CKEDITOR.appendTo(g[0],{},i.val());k.on("customConfigLoaded",function(d){if(k.config=a.extend({},d.editor.config,f.ckeconfig),a.isFunction(CKEDITOR.editorConfig)){var g={};CKEDITOR.editorConfig(g),a.each(g,function(a,b){k.config[a]=b})}var h=d.editor.config.bodyClass.split(" ");if(h.push(c.bodyClass),h=b(h),k.config.bodyClass=h.join(" "),e.loadXeComponent){var i=d.editor.config.extraPlugins.split(",");i.push("xe_component"),i=b(i),k.config.extraPlugins=i.join(",")}e.enableToolbar||(k.config.toolbar=[])}),g.data("cke_instance",k),window.editorRelKeys[j.editorSequence]={},window.editorRelKeys[j.editorSequence].primary=h.find("[name="+j.editorPrimaryKeyName+"]")[0],window.editorRelKeys[j.editorSequence].content=h.find("[name="+j.editorContentKeyName+"]")[0],window.editorRelKeys[j.editorSequence].func=function(a){return f.getContent.call(f,a)},window.editorRelKeys[j.editorSequence].pasteHTML=function(a){k.insertHtml(a,"html")}},getContent:function(a){var b=this,c=_getCkeInstance(a).getData();return b.cast("GET_CONTENT",[c]),c},getInstance:function(a){return CKEDITOR.instances[a]},API_EDITOR_CREATED:function(){}});a.fn.XeCkEditor=function(a){var b=new d(this.eq(0),a);return b&&(xe.registerApp(b),b.editorInit(this.eq(0),a)),b},window.xe.XeCkEditor=function(){var a=new d;return a}}(jQuery);
!function(a){"use strict";function b(b){return a.grep(b,function(c,d){return c.length&&a.inArray(c,b)===d})}var c={bodyClass:"xe_content editable",toolbarCanCollapse:!0,toolbarGroups:[{name:"clipboard",groups:["undo","clipboard"]},{name:"editing",groups:["find","selection"]},{name:"links"},{name:"insert"},{name:"tools"},{name:"document",groups:["mode"]},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},"/",{name:"styles"},{name:"colors"},{name:"xecomponent"},{name:"others"}],allowedContent:!0,removePlugins:"stylescombo,language,bidi,flash,pagebreak",removeButtons:"Save,Preview,Print,Cut,Copy,Paste",uiColor:"#EFF0F0"},d=xe.createApp("XeCkEditor",{ckeconfig:{},editor_sequence:null,init:function(){var a=this;CKEDITOR.on("instanceCreated",function(){a.cast("CKEDITOR_CREATED")}),CKEDITOR.on("ready",function(){a.cast("CKEDITOR_READY")}),CKEDITOR.on("instanceReady",function(){a.cast("CKEDITOR_INSTANCE_READY")}),CKEDITOR.on("instanceLoaded",function(){a.cast("CKEDITOR_LOADED")})},editorInit:function(d,e){{var f=this,g=d,h=g.closest("form"),i=h.find(e.content_field),j=g.data();g.data().editorSequence}this.ckeconfig=a.extend({},c,e.ckeconfig||{}),this.editor_sequence=j.editorSequence,h.attr("editor_sequence",j.editorSequence),CKEDITOR.env.mobile&&(CKEDITOR.env.isCompatible=!0);var k=CKEDITOR.appendTo(g[0],{},i.val());k.on("customConfigLoaded",function(d){if(k.config=a.extend({},d.editor.config,f.ckeconfig),a.isFunction(CKEDITOR.editorConfig)){var g={};CKEDITOR.editorConfig(g),a.each(g,function(a,b){k.config[a]=b})}var h=d.editor.config.bodyClass.split(" ");if(h.push(c.bodyClass),h=b(h),k.config.bodyClass=h.join(" "),e.loadXeComponent){var i=d.editor.config.extraPlugins.split(",");i.push("xe_component"),i=b(i),k.config.extraPlugins=i.join(",")}e.enableToolbar||(k.config.toolbar=[])}),g.data("cke_instance",k),window.editorRelKeys[j.editorSequence]={},window.editorRelKeys[j.editorSequence].primary=h.find("[name="+j.editorPrimaryKeyName+"]")[0],window.editorRelKeys[j.editorSequence].content=h.find("[name="+j.editorContentKeyName+"]")[0],window.editorRelKeys[j.editorSequence].func=function(a){return f.getContent.call(f,a)},window.editorRelKeys[j.editorSequence].pasteHTML=function(a){k.insertHtml(a,"html")}},getContent:function(a){var b=this,c=_getCkeInstance(a).getData();return b.cast("GET_CONTENT",[c]),c},getInstance:function(a){return CKEDITOR.instances[a]},API_EDITOR_CREATED:function(){}});a.fn.XeCkEditor=function(a){var b=new d(this.eq(0),a);return b&&(xe.registerApp(b),b.editorInit(this.eq(0),a)),b},window.xe.XeCkEditor=function(){var a=new d;return a}}(jQuery);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1 +1 @@
function doSync(a){return exec_xml("importer","procImporterAdminSync",[],function(a){alert(a.message),location.href=location.href}),!1}function doPreProcessing(a,b){function c(a){var c,d,e,g,i,j,k;if(h=!0,-1==a.status)return alert(a.message);for(c=get_by_id("fo_process"),d=c.elements,e=0,g=f.length;g>e;e++)i=f[e],d[i]?d[i].value=a[i]:0;if(k=get_by_id(b))for(j=["target_module","guestbook_target_module","user_id","unit_count"],e=0,g=j.length;g>e;e++)i=j[e],k.elements[i]&&(c.elements[i].value=k.elements[i].value);jQuery("#preProgressMsg").hide(),jQuery("#progressMsg").show(),doImport(b)}var d,e,f,g,h=!1,i=jQuery;return d=a.elements.xml_file.value,e=a.elements.type.value,d?(g=i("#process"),i("body").children(".x_modal-backdrop").length||i("body").append('<div class="x_modal-backdrop" />'),i('a[href="#process"].modalAnchor').trigger("open.mw"),exec_xml("importer","procImporterAdminPreProcessing",{type:e,xml_file:d},c,f=["error","message","type","total","cur","key","status"]),!1):!1}function doImport(a){function b(b,c){function d(){alert(b.message),jQuery('a[href="#process"].modalAnchor').unbind("before-close.mw").trigger("close.mw").find("#progressBar").width(1).end().find("#progressPercent").html("0%").end();try{f.reset(),get_by_id(a).reset()}catch(c){}jQuery("span.btn > input[type=submit]").attr("disabled","disabled")}var i,j,k,l;for(i=0,j=e.length;j>i;i++)k=e[i],g[k]?g[k].value=b[k]:0;b.total=parseInt(b.total,10)||0,b.cur=parseInt(b.cur,10)||0,percent=parseInt(b.cur/b.total*100),jQuery("#totalCount").text(b.total),jQuery("#completeCount").text(b.cur),jQuery("#progressBar").width(percent+"%"),jQuery("#progressPercent").html(percent+"%"),b.total>b.cur?doImport(a):(l=get_by_id(a),null!=l&&l.isSync.checked?exec_xml("importer","procImporterAdminSync",h,function(a){!a||a.error&&"0"!=a.error||d()},e=["error","message"]):d())}var c,d,e,f=get_by_id("fo_process"),g=f.elements,h={};for(c=0,d=g.length;d>c;c++)h[g[c].name]=g[c].value;return show_waiting_message=!1,exec_xml("importer","procImporterAdminImport",h,b,e=["error","message","type","total","cur","key"]),show_waiting_message=!0,!1}function displayProgress(a,b){var c,d;c=Math.max(a?Math.round(b/a*100):100,1),d=jQuery("#status"),d.find("div.progress1").length||d.html('<div class="progressBox"><div class="progress1"></div><div class="progress2"></div></div>'),d.find("div.progress1").html(c+"&nbsp;").css("width",c+"%").end().find("div.progress2").text(b+"/"+a)}jQuery(function(a){a(".checkxml").find("input:text").change(function(){a(this).closest(".checkxml").find(".x_help-inline").hide()}).end().find("button").click(function(){function b(a){var b,e;return e=g.find(">.xml"),b=g.find(">.ttxml"),$message.text(a.result_message),a.error||"true"!=a.exists?($message.attr("class","x_help-inline").fadeIn(300),b=b.filter(":visible"),b.eq(-1).slideUp(100,function(){b=b.slice(0,-1).eq(-1).slideUp(100,arguments.callee)}),g.find(":submit").attr("disabled","disabled"),c()):($message.attr("class","x_help-inline").fadeIn(300),g.find(":submit").removeAttr("disabled"),h=g.find(".syncmember:hidden"),f.prop("disabled",!1).removeClass("loading"),d.prop("disabled",!1),void("XML"==a.type?e.not(":visible").add(h).slideDown(300):"TTXML"==a.type&&(b.not(":visible").add(h).slideDown(300),g.find("input[name=type]").val("ttxml"))))}function c(){return f.prop("disabled",!1).removeClass("loading"),d.prop("disabled",!1),g.find(".syncmember:visible").slideUp(100),!1}var d,e,f,g,h;d=a(this).prop("disabled",!0),g=d.closest("form"),e=d.closest(".checkxml"),f=e.find("input").prop("disabled",!0).addClass("loading"),$message=e.find(".x_help-inline").hide(),show_waiting_message=!1,a.exec_json("importer.procImporterAdminCheckXmlFile",{filename:a.trim(f.val())},b)}).end().find(".x_help-inline").hide().end().closest("form").find(">.ttxml").hide().end().end().closest("form").find(":submit").attr("disabled","disabled"),a(".syncmember").hide()});
function doSync(){return exec_xml("importer","procImporterAdminSync",[],function(a){alert(a.message),location.href=location.href}),!1}function doPreProcessing(a,b){function c(a){var c,d,e,g,i,j,k;if(h=!0,-1==a.status)return alert(a.message);for(c=get_by_id("fo_process"),d=c.elements,e=0,g=f.length;g>e;e++)i=f[e],d[i]?d[i].value=a[i]:0;if(k=get_by_id(b))for(j=["target_module","guestbook_target_module","user_id","unit_count"],e=0,g=j.length;g>e;e++)i=j[e],k.elements[i]&&(c.elements[i].value=k.elements[i].value);jQuery("#preProgressMsg").hide(),jQuery("#progressMsg").show(),doImport(b)}var d,e,f,g,h=!1,i=jQuery;return d=a.elements.xml_file.value,e=a.elements.type.value,d?(g=i("#process"),i("body").children(".x_modal-backdrop").length||i("body").append('<div class="x_modal-backdrop" />'),i('a[href="#process"].modalAnchor').trigger("open.mw"),exec_xml("importer","procImporterAdminPreProcessing",{type:e,xml_file:d},c,f=["error","message","type","total","cur","key","status"]),!1):!1}function doImport(a){function b(b){function c(){alert(b.message),jQuery('a[href="#process"].modalAnchor').unbind("before-close.mw").trigger("close.mw").find("#progressBar").width(1).end().find("#progressPercent").html("0%").end();try{f.reset(),get_by_id(a).reset()}catch(c){}jQuery("span.btn > input[type=submit]").attr("disabled","disabled")}var d,i,j,k;for(d=0,i=e.length;i>d;d++)j=e[d],g[j]?g[j].value=b[j]:0;b.total=parseInt(b.total,10)||0,b.cur=parseInt(b.cur,10)||0,percent=parseInt(b.cur/b.total*100),jQuery("#totalCount").text(b.total),jQuery("#completeCount").text(b.cur),jQuery("#progressBar").width(percent+"%"),jQuery("#progressPercent").html(percent+"%"),b.total>b.cur?doImport(a):(k=get_by_id(a),null!=k&&k.isSync.checked?exec_xml("importer","procImporterAdminSync",h,function(a){!a||a.error&&"0"!=a.error||c()},e=["error","message"]):c())}var c,d,e,f=get_by_id("fo_process"),g=f.elements,h={};for(c=0,d=g.length;d>c;c++)h[g[c].name]=g[c].value;return show_waiting_message=!1,exec_xml("importer","procImporterAdminImport",h,b,e=["error","message","type","total","cur","key"]),show_waiting_message=!0,!1}function displayProgress(a,b){var c,d;c=Math.max(a?Math.round(b/a*100):100,1),d=jQuery("#status"),d.find("div.progress1").length||d.html('<div class="progressBox"><div class="progress1"></div><div class="progress2"></div></div>'),d.find("div.progress1").html(c+"&nbsp;").css("width",c+"%").end().find("div.progress2").text(b+"/"+a)}jQuery(function(a){a(".checkxml").find("input:text").change(function(){a(this).closest(".checkxml").find(".x_help-inline").hide()}).end().find("button").click(function(){function b(a){var b,e;return e=g.find(">.xml"),b=g.find(">.ttxml"),$message.text(a.result_message),a.error||"true"!=a.exists?($message.attr("class","x_help-inline").fadeIn(300),b=b.filter(":visible"),b.eq(-1).slideUp(100,function(){b=b.slice(0,-1).eq(-1).slideUp(100,arguments.callee)}),g.find(":submit").attr("disabled","disabled"),c()):($message.attr("class","x_help-inline").fadeIn(300),g.find(":submit").removeAttr("disabled"),h=g.find(".syncmember:hidden"),f.prop("disabled",!1).removeClass("loading"),d.prop("disabled",!1),void("XML"==a.type?e.not(":visible").add(h).slideDown(300):"TTXML"==a.type&&(b.not(":visible").add(h).slideDown(300),g.find("input[name=type]").val("ttxml"))))}function c(){return f.prop("disabled",!1).removeClass("loading"),d.prop("disabled",!1),g.find(".syncmember:visible").slideUp(100),!1}var d,e,f,g,h;d=a(this).prop("disabled",!0),g=d.closest("form"),e=d.closest(".checkxml"),f=e.find("input").prop("disabled",!0).addClass("loading"),$message=e.find(".x_help-inline").hide(),show_waiting_message=!1,a.exec_json("importer.procImporterAdminCheckXmlFile",{filename:a.trim(f.val())},b)}).end().find(".x_help-inline").hide().end().closest("form").find(">.ttxml").hide().end().end().closest("form").find(":submit").attr("disabled","disabled"),a(".syncmember").hide()});

View file

@ -321,13 +321,12 @@ class memberController extends member
$args->extra_vars = serialize($extra_vars);
// remove whitespace
$checkInfos = array('user_id', 'nick_name', 'email_address');
$replaceStr = array("\r\n", "\r", "\n", " ", "\t", "\xC2\xAD");
$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
foreach($checkInfos as $val)
{
if(isset($args->{$val}))
{
$args->{$val} = str_replace($replaceStr, '', $args->{$val});
$args->{$val} = preg_replace('/[\pZ\pC]+/', '', $args->{$val});
}
}
$output = $this->insertMember($args);
@ -534,13 +533,12 @@ class memberController extends member
$args->extra_vars = serialize($extra_vars);
// remove whitespace
$checkInfos = array('user_id', 'nick_name', 'email_address');
$replaceStr = array("\r\n", "\r", "\n", " ", "\t", "\xC2\xAD");
$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
foreach($checkInfos as $val)
{
if(isset($args->{$val}))
{
$args->{$val} = str_replace($replaceStr, '', $args->{$val});
$args->{$val} = preg_replace('/[\pZ\pC]+/', '', $args->{$val});
}
}
@ -1989,16 +1987,22 @@ class memberController extends member
}
list($args->email_id, $args->email_host) = explode('@', $args->email_address);
// Website, blog, checks the address
// Sanitize user ID, username, nickname, homepage, blog
$args->user_id = htmlspecialchars($args->user_id, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
$args->user_name = htmlspecialchars($args->user_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog;
// Create a model object
$oMemberModel = getModel('member');
// ID check is prohibited
// Check password strength
if($args->password && !$password_is_hashed)
{
// check password strength
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
{
$message = Context::getLang('about_password_strength');
@ -2006,29 +2010,46 @@ class memberController extends member
}
$args->password = $oMemberModel->hashPassword($args->password);
}
elseif(!$args->password) unset($args->password);
if($oMemberModel->isDeniedID($args->user_id)) return new Object(-1,'denied_user_id');
// ID, nickname, email address of the redundancy check
$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
if($member_srl) return new Object(-1,'msg_exists_user_id');
elseif(!$args->password)
{
unset($args->password);
}
// nickname check is prohibited
// Check if ID is prohibited
if($oMemberModel->isDeniedID($args->user_id))
{
return new Object(-1,'denied_user_id');
}
// Check if ID is duplicate
$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
if($member_srl)
{
return new Object(-1,'msg_exists_user_id');
}
// Check if nickname is prohibited
if($oMemberModel->isDeniedNickName($args->nick_name))
{
return new Object(-1,'denied_nick_name');
}
$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
if($member_srl) return new Object(-1,'msg_exists_nick_name');
// Check if nickname is duplicate
$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
if($member_srl)
{
return new Object(-1,'msg_exists_nick_name');
}
// Check if email address is duplicate
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
if($member_srl) return new Object(-1,'msg_exists_email_address');
if($member_srl)
{
return new Object(-1,'msg_exists_email_address');
}
// Insert data into the DB
$args->list_order = -1 * $args->member_srl;
$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
if(!$args->user_id) $args->user_id = 't'.$args->member_srl;
if(!$args->user_name) $args->user_name = $args->member_srl;
@ -2150,12 +2171,22 @@ class memberController extends member
}
}
// Sanitize user ID, username, nickname, homepage, blog
$args->user_id = htmlspecialchars($args->user_id, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
$args->user_name = htmlspecialchars($args->user_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
if($args->homepage && !preg_match("/^[a-z]+:\/\//is",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
if($args->blog && !preg_match("/^[a-z]+:\/\//is",$args->blog)) $args->blog = 'http://'.$args->blog;
// check member identifier form
$config = $oMemberModel->getMemberConfig();
$output = executeQuery('member.getMemberInfoByMemberSrl', $args);
$orgMemberInfo = $output->data;
// Check if email address or user ID is duplicate
if($config->identifier == 'email_address')
{
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
@ -2171,36 +2202,52 @@ class memberController extends member
$args->user_id = $orgMemberInfo->user_id;
}
// Check if ID is prohibited
if($args->user_id && $oMemberModel->isDeniedID($args->user_id))
{
return new Object(-1,'denied_user_id');
}
// Check if ID is duplicate
$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
if($member_srl && $orgMemberInfo->user_id != $args->user_id)
{
return new Object(-1,'msg_exists_user_id');
}
// Check if nickname is prohibited
if($args->nick_name && $oMemberModel->isDeniedNickName($args->nick_name))
{
return new Object(-1, 'denied_nick_name');
}
// Check if nickname is duplicate
$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
if($member_srl && $orgMemberInfo->nick_name != $args->nick_name) return new Object(-1,'msg_exists_nick_name');
if($member_srl && $orgMemberInfo->nick_name != $args->nick_name)
{
return new Object(-1,'msg_exists_nick_name');
}
list($args->email_id, $args->email_host) = explode('@', $args->email_address);
// Website, blog, checks the address
if($args->homepage && !preg_match("/^[a-z]+:\/\//is",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
if($args->blog && !preg_match("/^[a-z]+:\/\//is",$args->blog)) $args->blog = 'http://'.$args->blog;
$oDB = &DB::getInstance();
$oDB->begin();
// DB in the update
// Check password strength
if($args->password)
{
// check password strength
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
{
$message = Context::getLang('about_password_strength');
return new Object(-1, $message[$config->password_strength]);
}
$args->password = $oMemberModel->hashPassword($args->password);
}
else $args->password = $orgMemberInfo->password;
else
{
$args->password = $orgMemberInfo->password;
}
if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;

View file

@ -1002,4 +1002,7 @@ Menu không phải là người quản lý, nhiệm vụ của nó chỉ là li
<value xml:lang="ko"><![CDATA[스킨 없음]]></value>
<value xml:lang="jp"><![CDATA[スキン無し]]></value>
</item>
<item name="menu_desc">
<value xml:lang="ko"><![CDATA[메뉴 설명]]></value>
</item>
</lang>

View file

@ -418,7 +418,7 @@ class menuAdminController extends menu
// recreate menu cache file
$this->makeXmlFile($request->menu_srl);
if(!$isProc)
{
return $this->get('menu_item_srl');
@ -504,6 +504,9 @@ class menuAdminController extends menu
$args->is_shortcut = $request->is_shortcut;
$args->url = '#';
}
if($request->menu_desc) $args->desc = $request->menu_desc;
else $args->desc = '';
$args->menu_item_srl = getNextSequence();
$args->listorder = -1*$args->menu_item_srl;
@ -536,6 +539,9 @@ class menuAdminController extends menu
if($request->menu_name_key) $args->name = $request->menu_name_key;
else $args->name = $request->menu_name;
if($request->menu_desc) $args->desc = $request->menu_desc;
else $args->desc = '';
if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
{
@ -719,6 +725,9 @@ class menuAdminController extends menu
{
$args->name = $request->menu_name;
}
if($request->menu_desc) $args->desc = $request->menu_desc;
else $args->desc = '';
if(count($args->group_srls) == 0)
{
@ -1880,6 +1889,7 @@ class menuAdminController extends menu
$name_str = sprintf('$_names = array(%s); print $_names[$lang_type];', $name_arr_str);
$url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
$desc = str_replace(array('&','"',"'"),array('&amp;','&quot;','\\\''),$node->desc);
if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
{
$href = "getSiteUrl('$domain', '','mid','$node->url')";
@ -1915,7 +1925,7 @@ class menuAdminController extends menu
if($group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls == -1?1:0);
else $group_check_code = "true";
$attribute = sprintf(
'node_srl="%s" parent_srl="%s" menu_name_key=\'%s\' text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?%s:"")?>" is_shortcut="%s" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
'node_srl="%s" parent_srl="%s" menu_name_key=\'%s\' text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?%s:"")?>" is_shortcut="%s" desc="%s" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
$menu_item_srl,
$node->parent_srl,
addslashes($node->name),
@ -1926,6 +1936,7 @@ class menuAdminController extends menu
$group_check_code,
$href,
$is_shortcut,
$desc,
$open_window,
$expand,
$normal_btn,
@ -1981,6 +1992,7 @@ class menuAdminController extends menu
// List variables
$href = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->href);
$url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
$desc = str_replace(array('&','"',"'"),array('&amp;','&quot;','\\\''),$node->desc);
if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
{
$href = "getSiteUrl('$domain', '','mid','$node->url')";
@ -2030,7 +2042,7 @@ class menuAdminController extends menu
}
// Create properties (check if it belongs to the menu node by url_list. It looks a trick but fast and powerful)
$attribute = sprintf(
'"node_srl"=>"%s","parent_srl"=>"%s","menu_name_key"=>\'%s\',"isShow"=>(%s?true:false),"text"=>(%s?$_menu_names[%d][$lang_type]:""),"href"=>(%s?%s:""),"url"=>(%s?"%s":""),"is_shortcut"=>"%s","open_window"=>"%s","normal_btn"=>"%s","hover_btn"=>"%s","active_btn"=>"%s","selected"=>(array(%s)&&in_array(Context::get("mid"),array(%s))?1:0),"expand"=>"%s", "list"=>array(%s), "link"=>(%s? ( array(%s)&&in_array(Context::get("mid"),array(%s)) ?%s:%s):""),',
'"node_srl"=>"%s","parent_srl"=>"%s","menu_name_key"=>\'%s\',"isShow"=>(%s?true:false),"text"=>(%s?$_menu_names[%d][$lang_type]:""),"href"=>(%s?%s:""),"url"=>(%s?"%s":""),"is_shortcut"=>"%s","desc"=>\'%s\',"open_window"=>"%s","normal_btn"=>"%s","hover_btn"=>"%s","active_btn"=>"%s","selected"=>(array(%s)&&in_array(Context::get("mid"),array(%s))?1:0),"expand"=>"%s", "list"=>array(%s), "link"=>(%s? ( array(%s)&&in_array(Context::get("mid"),array(%s)) ?%s:%s):""),',
$node->menu_item_srl,
$node->parent_srl,
addslashes($node->name),
@ -2042,6 +2054,7 @@ class menuAdminController extends menu
$group_check_code,
$url,
$is_shortcut,
$desc,
$open_window,
$normal_btn,
$hover_btn,

View file

@ -79,6 +79,7 @@ class menuAdminView extends menu
$menuItems = new stdClass();
$menuItems->menuSrl = $value->menu_srl;
$menuItems->title = $value->title;
$menuItems->desc = $value->desc;
$menuItems->menuItems = $menu;
$menuList[] = $menuItems;
}
@ -194,4 +195,4 @@ class menuAdminView extends menu
}
}
/* End of file menu.admin.view.php */
/* Location: ./modules/menu/menu.admin.view.php */
/* Location: ./modules/menu/menu.admin.view.php */

View file

@ -47,6 +47,11 @@ class menu extends ModuleObject
$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
if($temp_menus->toBool() && count($temp_menus->data)) return true;
// 2015. 06. 15 add column desc
if(!$oDB->isColumnExists('menu_item', 'desc'))
{
return true;
}
return false;
}
@ -68,6 +73,12 @@ class menu extends ModuleObject
{
$oDB->addIndex('menu', 'idx_title', array('title'));
}
// 2015. 06. 15 add column desc
if(!$oDB->isColumnExists('menu_item', 'desc'))
{
$oDB->addColumn('menu_item', 'desc','varchar',250,"",true);
}
// 1.7(maserati) shortcut column add and mirgration
if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
@ -227,4 +238,4 @@ class menu extends ModuleObject
}
}
/* End of file menu.class.php */
/* Location: ./modules/menu/menu.class.php */
/* Location: ./modules/menu/menu.class.php */

View file

@ -7,6 +7,7 @@
<column name="parent_srl" var="parent_srl" filter="number" default="0" />
<column name="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
<column name="name" var="name" notnull="notnull" />
<column name="desc" var="desc" />
<column name="url" var="url" />
<column name="is_shortcut" var="is_shortcut" notnull="notnull" default="N" />
<column name="open_window" var="open_window" />
@ -18,4 +19,4 @@
<column name="listorder" var="listorder" notnull="notnull" />
<column name="regdate" var="regdate" default="curdate()" />
</columns>
</query>
</query>

View file

@ -6,6 +6,7 @@
<column name="menu_srl" var="menu_srl" />
<column name="parent_srl" var="parent_srl" />
<column name="name" var="name" notnull="notnull" />
<column name="desc" var="desc" />
<column name="url" var="url" />
<column name="is_shortcut" var="is_shortcut" />
<column name="open_window" var="open_window" />
@ -18,4 +19,4 @@
<conditions>
<condition operation="equal" column="menu_item_srl" var="menu_item_srl" filter="number" notnull="notnull" />
</conditions>
</query>
</query>

View file

@ -3,6 +3,7 @@
<column name="parent_srl" type="number" size="12" notnull="notnull" default="0" />
<column name="menu_srl" type="number" size="12" notnull="notnull" index="idx_menu_srl" />
<column name="name" type="text" />
<column name="desc" type="varchar" size="250" />
<column name="url" type="varchar" size="250" />
<column name="is_shortcut" type="char" size="1" default="N" />
<column name="open_window" type="char" size="1" default="N" />
@ -13,4 +14,4 @@
<column name="group_srls" type="text" />
<column name="listorder" type="number" size="11" default="0" index="idx_listorder" />
<column name="regdate" type="date" index="idx_regdate" />
</table>
</table>

View file

@ -166,6 +166,12 @@
<input id="menuName2" class="_menuName lang_code" type="text" required>
</div>
</li>
<li>
<div class="multilingual x_input-append">
<label for="lang_menuDesc2">{$lang->menu_desc}</label>
<input id="menuDesc2" class="_menuDesc lang_code" type="text" required>
</div>
</li>
<li class="typePage">
<label for="mid1">{$lang->menu_id} <a href="#help_menuId" class="x_icon-question-sign" data-admin-toggle="#mid1_help">{$lang->help}</a></label>
<div id="mid1_help" class="x_alert x_alert-info" style="display:none;width:169px">
@ -223,6 +229,12 @@
<input id="menuName" class="_menuName lang_code" type="text" required>
</div>
</li>
<li>
<div class="multilingual x_input-append">
<label for="lang_menuDesc">{$lang->menu_desc}</label>
<input id="menuDesc" class="_menuDesc lang_code" type="text" required>
</div>
</li>
<li style="padding:6px 0 0 0">
<label><input type="checkbox" class="_newWindow" title="{$lang->menu_open_window}"> {$lang->menu_open_window}</label>
</li>
@ -1847,6 +1859,7 @@ jQuery(function($){
});
$('#add_menu ._save').bind("click", function(){
var sMenuName = $('#add_menu ._menuName').val();
var sMenuDesc = $('#add_menu ._menuDesc').val();
var sUrl = $('#add_menu ._mid').val();
var sTargetKey = "module_id";
@ -1895,21 +1908,14 @@ jQuery(function($){
params['act'] = "procMenuAdminInsertItem";
params['menu_name_key'] = "";
params['menu_name'] = sMenuName;
params['menu_desc'] = sMenuDesc;
params['module_type'] = sSelectedModuleName;
params['menu_open_window'] = "N";
params['menu_expand'] = "N";
params['is_shortcut'] = isShortCut;
params['parent_srl'] = sSelectedMenuSrl;
params[sTargetKey] = sUrl;
/*
Array
(
[error] => "0"
[message] => "등록했습니다."
[menu_item_srl] => "2"
)
*/
$.exec_json("menu.procMenuAdminInsertItem", params, function(htData){
// select the newly created menu
//$._xeAdminVar.sSelectOnload = htData.menu_item_srl;
@ -1937,6 +1943,7 @@ jQuery(function($){
//$(this).find('#menuName').val(htInfo.sText);
$(this).find('#menuName').val(htInfo.sMenuNameKey);
$(this).find('#menuDesc').val(htInfo.desc);
//menu_name_key
$(this).find('#mid2').val(htInfo.url);
@ -1952,9 +1959,9 @@ jQuery(function($){
showMenuSelector($(this).find('._menuSelector_menuTreeContainer'), htInfo.url);
}else{
// URL shortcut
var htInfo_url = htInfo.url;
htInfo_url = htInfo_url.replace(/&amp;/g, '&');
htInfo.url = htInfo_url;
var htInfo_url = htInfo.url;
htInfo_url = htInfo_url.replace(/&amp;/g, '&');
htInfo.url = htInfo_url;
$(this).find('a[href="#fix_linkUrl"]').click();
$(this).find('._url_link').val($('<div />').text(htInfo.url).text());
@ -1990,6 +1997,7 @@ jQuery(function($){
var htInfo = htNodeInfo[$._xeAdminVar.sSelectedMenuSrl];
var sMenuName = $('#default ._menuName').val();
var sMenuDesc = $('#default ._menuDesc').val();
var sMID;
var sNewWindow = $('#default ._newWindow').attr("checked")?"Y":"N";
@ -2015,6 +2023,7 @@ jQuery(function($){
}
params['menu_item_srl'] = sSelectedMenuSrl;
params['menu_name'] = sMenuName;
params['menu_desc'] = sMenuDesc;
params['menu_open_window'] = sNewWindow;
params['menu_expand'] = sLeaveUnfolded;
params['browser_title'] = sBrowserTitle;

View file

@ -76,7 +76,7 @@ class pollModel extends poll
$poll->poll_srl = $poll_srl;
// Only ongoing poll results
if($poll->stop_date > date("Ymd"))
if($poll->stop_date >= date("Ymd"))
{
if($this->isPolled($poll_srl)) $tpl_file = "result";
else $tpl_file = "form";

View file

@ -1 +1 @@
function doDisplaySkinColorset(a,b){var c=a.options[a.selectedIndex].value,d=new Array;d.skin=c,d.colorset=b;var e=new Array("error","message","colorset_list");exec_xml("poll","getPollGetColorsetList",d,completeGetSkinColorset,e,d)}function completeGetSkinColorset(a,b,c,d){for(var e=get_by_id("fo_poll").poll_colorset,f=e.options.length,g=c.colorset,h=0;f>h;h++)e.remove(0);for(var i=a.colorset_list.split("\n"),j=0,h=0;h<i.length;h++){var k=i[h].split("|@|");g&&g==k[0]&&(j=h);var l=new Option(k[1],k[0],!1,!1);e.options.add(l)}e.selectedIndex=j}function doMovePoll(a,b){var c=new Array;c.poll_srl=a,c.upload_target_srl=b;var d=new Array("error","message","document_srl","comment_srl");exec_xml("poll","getPollAdminTarget",c,completeMovePoll,d)}function completeMovePoll(a,b){var c=a.document_srl,d=a.comment_srl,e=request_uri.setQuery("document_srl",c);d&&(e=e+"#comment_"+d),winopen(e,"pollTarget")}function checkSearch(a){return""==a.search_target.value?(alert(xe.lang.msg_empty_search_target),!1):""==a.search_keyword.value?(alert(xe.lang.msg_empty_search_keyword),!1):void 0}jQuery(function(a){a("#pollList").submit(function(b){var c=a("#pollList tbody :checked").length;if(0==c)return b.stopPropagation(),alert(xe.lang.msg_select_poll),!1;var d=xe.lang.confirm_poll_delete.replace("%s",c);return confirm(d)?void 0:(b.stopPropagation(),!1)})});
function doDisplaySkinColorset(a,b){var c=a.options[a.selectedIndex].value,d=new Array;d.skin=c,d.colorset=b;var e=new Array("error","message","colorset_list");exec_xml("poll","getPollGetColorsetList",d,completeGetSkinColorset,e,d)}function completeGetSkinColorset(a,b,c){for(var d=get_by_id("fo_poll").poll_colorset,e=d.options.length,f=c.colorset,g=0;e>g;g++)d.remove(0);for(var h=a.colorset_list.split("\n"),i=0,g=0;g<h.length;g++){var j=h[g].split("|@|");f&&f==j[0]&&(i=g);var k=new Option(j[1],j[0],!1,!1);d.options.add(k)}d.selectedIndex=i}function doMovePoll(a,b){var c=new Array;c.poll_srl=a,c.upload_target_srl=b;var d=new Array("error","message","document_srl","comment_srl");exec_xml("poll","getPollAdminTarget",c,completeMovePoll,d)}function completeMovePoll(a){var b=a.document_srl,c=a.comment_srl,d=request_uri.setQuery("document_srl",b);c&&(d=d+"#comment_"+c),winopen(d,"pollTarget")}function checkSearch(a){return""==a.search_target.value?(alert(xe.lang.msg_empty_search_target),!1):""==a.search_keyword.value?(alert(xe.lang.msg_empty_search_keyword),!1):void 0}jQuery(function(a){a("#pollList").submit(function(b){var c=a("#pollList tbody :checked").length;if(0==c)return b.stopPropagation(),alert(xe.lang.msg_select_poll),!1;var d=xe.lang.confirm_poll_delete.replace("%s",c);return confirm(d)?void 0:(b.stopPropagation(),!1)})});

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long