diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index b43798cb3..b86e41391 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -28,9 +28,9 @@ class HTMLDisplayHandler { $output = $oTemplate->compile($template_path, $tpl_file); - // add #xeAdmin div for adminitration pages + // add .admin div for adminitration pages if(Context::getResponseMethod() == 'HTML') { - if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')>0) $output = '
'.$output.'
'; + if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')>0) $output = '
'.$output.'
'; if(Context::get('layout') != 'none') { if(__DEBUG__==3) $start = getMicroTime(); diff --git a/common/css/xe.css b/common/css/xe.css index 676f5ef29..b953c457a 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -9,89 +9,89 @@ #popup_menu_area a:avtive, #popup_menu_area a:focus{text-decoration:underline} /* Legacy Code (It will be deprecated as soon as possible) */ -#xeAdmin h3.xeAdmin, -#xeAdmin h4.xeAdmin{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1} -#xeAdmin h3.xeAdmin{border-bottom-width:4px;font-size:24px} -#xeAdmin h4.xeAdmin{border-bottom-width:3px;font-size:20px} -#xeAdmin h5.xeAdmin{border-bottom-width:2px;font-size:16px} -#xeAdmin h6.xeAdmin{border-bottom-width:1px;font-size:12px} -#xeAdmin .adminSearch{margin:1em 0} -#xeAdmin .adminSearch fieldset{border:1px solid #ccc} -#xeAdmin .localNavigation{padding:0;list-style:none} -#xeAdmin .localNavigation li{display:inline} -#xeAdmin .localNavigation li.on a{font-weight:bold;color:#333;text-decoration:none} -#xeAdmin .localNavigation li:before{content:"| "} -#xeAdmin .localNavigation li:first-child:before{content:""} -#xeAdmin .summary{margin:1em 0} -#xeAdmin .rowTable, -#xeAdmin .colTable, -#xeAdmin .crossTable{margin:1em 0;border:0;border-collapse:collapse;border-top:2px solid #ccc;width:100%} -#xeAdmin .rowTable caption, -#xeAdmin .colTable caption, -#xeAdmin .crossTable caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0} -#xeAdmin .rowTable caption:after, -#xeAdmin .colTable caption:after, -#xeAdmin .crossTable caption:after{content:"";display:block;clear:both} -#xeAdmin .rowTable caption a, -#xeAdmin .colTable caption a, -#xeAdmin .crossTable caption a{font-weight:normal} -#xeAdmin .rowTable caption em, -#xeAdmin .colTable caption em, -#xeAdmin .crossTable caption em{float:right;font-style:normal;font-weight:normal;color:#e00;margin-left:1em} -#xeAdmin .rowTable caption strong, -#xeAdmin .colTable caption strong, -#xeAdmin .crossTable caption strong{color:#e00} -#xeAdmin .rowTable caption .side, -#xeAdmin .colTable caption .side, -#xeAdmin .crossTable caption .side{float:right;font-weight:normal;margin-left:1em} -#xeAdmin .rowTable th,.rowTable td, -#xeAdmin .colTable th,.rowTable td, -#xeAdmin .crossTable th,.rowTable td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap} -#xeAdmin .rowTable th, -#xeAdmin .colTable th, -#xeAdmin .crossTable th{background:#f8f8f8} -#xeAdmin .rowTable thead th, -#xeAdmin .colTable thead th, -#xeAdmin .crossTable thead th{border-bottom:1px solid #999} -#xeAdmin .rowTable tfoot td, -#xeAdmin .colTable tfoot td, -#xeAdmin .crossTable tfoot td{font-weight:bold;background:#f8f8f8} -#xeAdmin .rowTable.even tbody tr:nth-of-type(even) td, -#xeAdmin .colTable.even tbody tr:nth-of-type(even) td, -#xeAdmin .crossTable.even tbody tr:nth-of-type(even) td{background-color:#fafafa} -#xeAdmin .rowTable td>input[type=text], -#xeAdmin .colTable td>input[type=text], -#xeAdmin .crossTable td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle} -#xeAdmin .rowTable img, -#xeAdmin .colTable img, -#xeAdmin .crossTable img{vertical-align:middle} -#xeAdmin .rowTable .title, -#xeAdmin .colTable .title, -#xeAdmin .crossTable .title, -#xeAdmin .rowTable .text, -#xeAdmin .colTable .text, -#xeAdmin .crossTable .text{white-space:normal} -#xeAdmin .rowTable input[type=text], -#xeAdmin .colTable input[type=text], -#xeAdmin .crossTable input[type=text], -#xeAdmin .rowTable input[type=password], -#xeAdmin .colTable input[type=password], -#xeAdmin .crossTable input[type=password], -#xeAdmin .rowTable input[type=file], -#xeAdmin .colTable input[type=file], -#xeAdmin .crossTable input[type=file], -#xeAdmin .rowTable textarea, -#xeAdmin .colTable textarea, -#xeAdmin .crossTable textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent} -#xeAdmin .rowTable input[type=text], -#xeAdmin .colTable input[type=text], -#xeAdmin .crossTable input[type=text], -#xeAdmin .rowTable input[type=password], -#xeAdmin .colTable input[type=password], -#xeAdmin .crossTable input[type=password], -#xeAdmin .rowTable input[type=file], -#xeAdmin .colTable input[type=file], -#xeAdmin .crossTable input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px} -#xeAdmin .clear:after{content:"";display:block;clear:both} -#xeAdmin .fl{float:left} -#xeAdmin .fr{float:right} +.admin h3.xeAdmin, +.admin h4.xeAdmin{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1} +.admin h3.xeAdmin{border-bottom-width:4px;font-size:24px} +.admin h4.xeAdmin{border-bottom-width:3px;font-size:20px} +.admin h5.xeAdmin{border-bottom-width:2px;font-size:16px} +.admin h6.xeAdmin{border-bottom-width:1px;font-size:12px} +.admin .adminSearch{margin:1em 0} +.admin .adminSearch fieldset{border:1px solid #ccc} +.admin .localNavigation{padding:0;list-style:none} +.admin .localNavigation li{display:inline} +.admin .localNavigation li.on a{font-weight:bold;color:#333;text-decoration:none} +.admin .localNavigation li:before{content:"| "} +.admin .localNavigation li:first-child:before{content:""} +.admin .summary{margin:1em 0} +.admin .rowTable, +.admin .colTable, +.admin .crossTable{margin:1em 0;border:0;border-collapse:collapse;border-top:2px solid #ccc;width:100%} +.admin .rowTable caption, +.admin .colTable caption, +.admin .crossTable caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0} +.admin .rowTable caption:after, +.admin .colTable caption:after, +.admin .crossTable caption:after{content:"";display:block;clear:both} +.admin .rowTable caption a, +.admin .colTable caption a, +.admin .crossTable caption a{font-weight:normal} +.admin .rowTable caption em, +.admin .colTable caption em, +.admin .crossTable caption em{float:right;font-style:normal;font-weight:normal;color:#e00;margin-left:1em} +.admin .rowTable caption strong, +.admin .colTable caption strong, +.admin .crossTable caption strong{color:#e00} +.admin .rowTable caption .side, +.admin .colTable caption .side, +.admin .crossTable caption .side{float:right;font-weight:normal;margin-left:1em} +.admin .rowTable th,.rowTable td, +.admin .colTable th,.rowTable td, +.admin .crossTable th,.rowTable td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap} +.admin .rowTable th, +.admin .colTable th, +.admin .crossTable th{background:#f8f8f8} +.admin .rowTable thead th, +.admin .colTable thead th, +.admin .crossTable thead th{border-bottom:1px solid #999} +.admin .rowTable tfoot td, +.admin .colTable tfoot td, +.admin .crossTable tfoot td{font-weight:bold;background:#f8f8f8} +.admin .rowTable.even tbody tr:nth-of-type(even) td, +.admin .colTable.even tbody tr:nth-of-type(even) td, +.admin .crossTable.even tbody tr:nth-of-type(even) td{background-color:#fafafa} +.admin .rowTable td>input[type=text], +.admin .colTable td>input[type=text], +.admin .crossTable td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle} +.admin .rowTable img, +.admin .colTable img, +.admin .crossTable img{vertical-align:middle} +.admin .rowTable .title, +.admin .colTable .title, +.admin .crossTable .title, +.admin .rowTable .text, +.admin .colTable .text, +.admin .crossTable .text{white-space:normal} +.admin .rowTable input[type=text], +.admin .colTable input[type=text], +.admin .crossTable input[type=text], +.admin .rowTable input[type=password], +.admin .colTable input[type=password], +.admin .crossTable input[type=password], +.admin .rowTable input[type=file], +.admin .colTable input[type=file], +.admin .crossTable input[type=file], +.admin .rowTable textarea, +.admin .colTable textarea, +.admin .crossTable textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent} +.admin .rowTable input[type=text], +.admin .colTable input[type=text], +.admin .crossTable input[type=text], +.admin .rowTable input[type=password], +.admin .colTable input[type=password], +.admin .crossTable input[type=password], +.admin .rowTable input[type=file], +.admin .colTable input[type=file], +.admin .crossTable input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px} +.admin .clear:after{content:"";display:block;clear:both} +.admin .fl{float:left} +.admin .fr{float:right} diff --git a/common/css/xe.min.css b/common/css/xe.min.css index 676f5ef29..b953c457a 100644 --- a/common/css/xe.min.css +++ b/common/css/xe.min.css @@ -9,89 +9,89 @@ #popup_menu_area a:avtive, #popup_menu_area a:focus{text-decoration:underline} /* Legacy Code (It will be deprecated as soon as possible) */ -#xeAdmin h3.xeAdmin, -#xeAdmin h4.xeAdmin{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1} -#xeAdmin h3.xeAdmin{border-bottom-width:4px;font-size:24px} -#xeAdmin h4.xeAdmin{border-bottom-width:3px;font-size:20px} -#xeAdmin h5.xeAdmin{border-bottom-width:2px;font-size:16px} -#xeAdmin h6.xeAdmin{border-bottom-width:1px;font-size:12px} -#xeAdmin .adminSearch{margin:1em 0} -#xeAdmin .adminSearch fieldset{border:1px solid #ccc} -#xeAdmin .localNavigation{padding:0;list-style:none} -#xeAdmin .localNavigation li{display:inline} -#xeAdmin .localNavigation li.on a{font-weight:bold;color:#333;text-decoration:none} -#xeAdmin .localNavigation li:before{content:"| "} -#xeAdmin .localNavigation li:first-child:before{content:""} -#xeAdmin .summary{margin:1em 0} -#xeAdmin .rowTable, -#xeAdmin .colTable, -#xeAdmin .crossTable{margin:1em 0;border:0;border-collapse:collapse;border-top:2px solid #ccc;width:100%} -#xeAdmin .rowTable caption, -#xeAdmin .colTable caption, -#xeAdmin .crossTable caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0} -#xeAdmin .rowTable caption:after, -#xeAdmin .colTable caption:after, -#xeAdmin .crossTable caption:after{content:"";display:block;clear:both} -#xeAdmin .rowTable caption a, -#xeAdmin .colTable caption a, -#xeAdmin .crossTable caption a{font-weight:normal} -#xeAdmin .rowTable caption em, -#xeAdmin .colTable caption em, -#xeAdmin .crossTable caption em{float:right;font-style:normal;font-weight:normal;color:#e00;margin-left:1em} -#xeAdmin .rowTable caption strong, -#xeAdmin .colTable caption strong, -#xeAdmin .crossTable caption strong{color:#e00} -#xeAdmin .rowTable caption .side, -#xeAdmin .colTable caption .side, -#xeAdmin .crossTable caption .side{float:right;font-weight:normal;margin-left:1em} -#xeAdmin .rowTable th,.rowTable td, -#xeAdmin .colTable th,.rowTable td, -#xeAdmin .crossTable th,.rowTable td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap} -#xeAdmin .rowTable th, -#xeAdmin .colTable th, -#xeAdmin .crossTable th{background:#f8f8f8} -#xeAdmin .rowTable thead th, -#xeAdmin .colTable thead th, -#xeAdmin .crossTable thead th{border-bottom:1px solid #999} -#xeAdmin .rowTable tfoot td, -#xeAdmin .colTable tfoot td, -#xeAdmin .crossTable tfoot td{font-weight:bold;background:#f8f8f8} -#xeAdmin .rowTable.even tbody tr:nth-of-type(even) td, -#xeAdmin .colTable.even tbody tr:nth-of-type(even) td, -#xeAdmin .crossTable.even tbody tr:nth-of-type(even) td{background-color:#fafafa} -#xeAdmin .rowTable td>input[type=text], -#xeAdmin .colTable td>input[type=text], -#xeAdmin .crossTable td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle} -#xeAdmin .rowTable img, -#xeAdmin .colTable img, -#xeAdmin .crossTable img{vertical-align:middle} -#xeAdmin .rowTable .title, -#xeAdmin .colTable .title, -#xeAdmin .crossTable .title, -#xeAdmin .rowTable .text, -#xeAdmin .colTable .text, -#xeAdmin .crossTable .text{white-space:normal} -#xeAdmin .rowTable input[type=text], -#xeAdmin .colTable input[type=text], -#xeAdmin .crossTable input[type=text], -#xeAdmin .rowTable input[type=password], -#xeAdmin .colTable input[type=password], -#xeAdmin .crossTable input[type=password], -#xeAdmin .rowTable input[type=file], -#xeAdmin .colTable input[type=file], -#xeAdmin .crossTable input[type=file], -#xeAdmin .rowTable textarea, -#xeAdmin .colTable textarea, -#xeAdmin .crossTable textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent} -#xeAdmin .rowTable input[type=text], -#xeAdmin .colTable input[type=text], -#xeAdmin .crossTable input[type=text], -#xeAdmin .rowTable input[type=password], -#xeAdmin .colTable input[type=password], -#xeAdmin .crossTable input[type=password], -#xeAdmin .rowTable input[type=file], -#xeAdmin .colTable input[type=file], -#xeAdmin .crossTable input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px} -#xeAdmin .clear:after{content:"";display:block;clear:both} -#xeAdmin .fl{float:left} -#xeAdmin .fr{float:right} +.admin h3.xeAdmin, +.admin h4.xeAdmin{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1} +.admin h3.xeAdmin{border-bottom-width:4px;font-size:24px} +.admin h4.xeAdmin{border-bottom-width:3px;font-size:20px} +.admin h5.xeAdmin{border-bottom-width:2px;font-size:16px} +.admin h6.xeAdmin{border-bottom-width:1px;font-size:12px} +.admin .adminSearch{margin:1em 0} +.admin .adminSearch fieldset{border:1px solid #ccc} +.admin .localNavigation{padding:0;list-style:none} +.admin .localNavigation li{display:inline} +.admin .localNavigation li.on a{font-weight:bold;color:#333;text-decoration:none} +.admin .localNavigation li:before{content:"| "} +.admin .localNavigation li:first-child:before{content:""} +.admin .summary{margin:1em 0} +.admin .rowTable, +.admin .colTable, +.admin .crossTable{margin:1em 0;border:0;border-collapse:collapse;border-top:2px solid #ccc;width:100%} +.admin .rowTable caption, +.admin .colTable caption, +.admin .crossTable caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0} +.admin .rowTable caption:after, +.admin .colTable caption:after, +.admin .crossTable caption:after{content:"";display:block;clear:both} +.admin .rowTable caption a, +.admin .colTable caption a, +.admin .crossTable caption a{font-weight:normal} +.admin .rowTable caption em, +.admin .colTable caption em, +.admin .crossTable caption em{float:right;font-style:normal;font-weight:normal;color:#e00;margin-left:1em} +.admin .rowTable caption strong, +.admin .colTable caption strong, +.admin .crossTable caption strong{color:#e00} +.admin .rowTable caption .side, +.admin .colTable caption .side, +.admin .crossTable caption .side{float:right;font-weight:normal;margin-left:1em} +.admin .rowTable th,.rowTable td, +.admin .colTable th,.rowTable td, +.admin .crossTable th,.rowTable td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap} +.admin .rowTable th, +.admin .colTable th, +.admin .crossTable th{background:#f8f8f8} +.admin .rowTable thead th, +.admin .colTable thead th, +.admin .crossTable thead th{border-bottom:1px solid #999} +.admin .rowTable tfoot td, +.admin .colTable tfoot td, +.admin .crossTable tfoot td{font-weight:bold;background:#f8f8f8} +.admin .rowTable.even tbody tr:nth-of-type(even) td, +.admin .colTable.even tbody tr:nth-of-type(even) td, +.admin .crossTable.even tbody tr:nth-of-type(even) td{background-color:#fafafa} +.admin .rowTable td>input[type=text], +.admin .colTable td>input[type=text], +.admin .crossTable td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle} +.admin .rowTable img, +.admin .colTable img, +.admin .crossTable img{vertical-align:middle} +.admin .rowTable .title, +.admin .colTable .title, +.admin .crossTable .title, +.admin .rowTable .text, +.admin .colTable .text, +.admin .crossTable .text{white-space:normal} +.admin .rowTable input[type=text], +.admin .colTable input[type=text], +.admin .crossTable input[type=text], +.admin .rowTable input[type=password], +.admin .colTable input[type=password], +.admin .crossTable input[type=password], +.admin .rowTable input[type=file], +.admin .colTable input[type=file], +.admin .crossTable input[type=file], +.admin .rowTable textarea, +.admin .colTable textarea, +.admin .crossTable textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent} +.admin .rowTable input[type=text], +.admin .colTable input[type=text], +.admin .crossTable input[type=text], +.admin .rowTable input[type=password], +.admin .colTable input[type=password], +.admin .crossTable input[type=password], +.admin .rowTable input[type=file], +.admin .colTable input[type=file], +.admin .crossTable input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px} +.admin .clear:after{content:"";display:block;clear:both} +.admin .fl{float:left} +.admin .fr{float:right} diff --git a/common/js/xe.js b/common/js/xe.js index db747e223..a65666390 100644 --- a/common/js/xe.js +++ b/common/js/xe.js @@ -1580,7 +1580,7 @@ $.exec_xml = window.exec_xml = function(module, act, params, callback_func, resp } // ajax 통신중 대기 메세지 출력 (show_waiting_message값을 false로 세팅시 보이지 않음) - var waiting_obj = $('#waitingforserverresponse'); + var waiting_obj = $('.wfsr'); if(show_waiting_message && waiting_obj.length) { var d = $(document); waiting_obj.html(waiting_message).css({ @@ -1633,7 +1633,7 @@ $.exec_json = function(action,data,func){ if(action.length == 2){ if(show_waiting_message) { - $("#waitingforserverresponse").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible'); + $(".wfsr").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible'); } $.extend(data,{module:action[0],act:action[1]}); @@ -1645,7 +1645,7 @@ $.exec_json = function(action,data,func){ ,contentType:"application/json" ,data:$.param(data) ,success : function(data){ - $("#waitingforserverresponse").css('visibility','hidden'); + $(".wfsr").css('visibility','hidden'); if(data.error > 0) alert(data.message); if($.isFunction(func)) func(data); } @@ -1661,7 +1661,7 @@ $.fn.exec_html = function(action,data,type,func,args){ action = action.split("."); if(action.length == 2){ if(show_waiting_message) { - $("#waitingforserverresponse").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible'); + $(".wfsr").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible'); } $.extend(data,{module:action[0],act:action[1]}); @@ -1671,7 +1671,7 @@ $.fn.exec_html = function(action,data,type,func,args){ ,url:request_uri ,data:$.param(data) ,success : function(html){ - $("#waitingforserverresponse").css('visibility','hidden'); + $(".wfsr").css('visibility','hidden'); self[type](html); if($.isFunction(func)) func(args); } diff --git a/common/js/xe.min.js b/common/js/xe.min.js index 04a98bb94..6848c9c3b 100644 --- a/common/js/xe.min.js +++ b/common/js/xe.min.js @@ -57,9 +57,9 @@ a.each(d,function(b,c){a('').attr("name",b).attr("value",c) if(typeof d=="undefined"){h.error=-1;h.message="Unexpected error occured.";try{if(typeof(e=b.childNodes[0].firstChild.data)!="undefined")h.message+="\r\n"+e}catch(q){}return h}a.each(j,function(a,b){n[b]=!0});n.redirect_url=!0;n.act=!0;a.each(d,function(a,b){n[a]&&(h[a]=b)});if(h.error!=0){if(a.isFunction(a.exec_xml.onerror))return a.exec_xml.onerror(c,g,h,k,j,l,m);alert(h.message||"error!");return null}if(h.redirect_url)return location.href=h.redirect_url.replace(/&/g,"&"),null;a.isFunction(k)&& k(h,j,l,m)}var n=request_uri+"index.php";e||(e={});a.isArray(e)&&(e=d(e));e.module=c;e.act=g;typeof xeVid!="undefined"&&(e.vid=xeVid);typeof j=="undefined"||j.length<1?j=["error","message"]:j.push("error","message");if(a.isArray(ssl_actions)&&e.act&&a.inArray(e.act,ssl_actions)>=0){var n=window.https_port||443,q=a("").attr("href",default_url||request_uri)[0],w="https://"+q.hostname.replace(/:\d+$/,"");n!=443&&(w+=":"+n);q.pathname[0]!="/"&&(w+="/");w+=q.pathname;n=w.replace(/\/$/,"")+"/index.php"}q= a("").attr("href",location.href)[0];w=a("").attr("href",n)[0];if(q.protocol!=w.protocol||q.port!=w.port)return b(n,e);var t=[],p=0;t[p++]='';t[p++]="";t[p++]="";a.each(e,function(a,b){t[p++]="<"+a+">"});t[p++]="";t[p++]="";var r=null;r&&r.readyState!=0&&r.abort();try{a.ajax({url:n,type:"POST",dataType:"xml",data:t.join("\n"),contentType:"text/plain",beforeSend:function(a){r=a},success:h, -error:function(a,b){o.css("visibility","hidden");var c="";if(b=="parsererror"){c="The result is not valid XML :\n-------------------------------------\n";if(a.responseText=="")return;c+=a.responseText.replace(/<[^>]+>/g,"")}else c=b;alert(c)}})}catch(s){alert(s);return}var o=a("#waitingforserverresponse");show_waiting_message&&o.length&&(e=a(document),o.html(waiting_message).css({top:e.scrollTop()+20+"px",left:e.scrollLeft()+20+"px",visibility:"visible"}))};a.exec_json=function(b,d,e){typeof d=="undefined"&& -(d={});b=b.split(".");b.length==2&&(show_waiting_message&&a("#waitingforserverresponse").html(waiting_message).css("top",a(document).scrollTop()+20).css("left",a(document).scrollLeft()+20).css("visibility","visible"),a.extend(d,{module:b[0],act:b[1]}),typeof xeVid!="undefined"&&a.extend(d,{vid:xeVid}),a.ajax({type:"POST",dataType:"json",url:request_uri,contentType:"application/json",data:a.param(d),success:function(b){a("#waitingforserverresponse").css("visibility","hidden");b.error>0&&alert(b.message); -a.isFunction(e)&&e(b)}}))};a.fn.exec_html=function(b,d,e,k,j){typeof d=="undefined"&&(d={});a.inArray(e,["html","append","prepend"])||(e="html");var l=a(this),b=b.split(".");b.length==2&&(show_waiting_message&&a("#waitingforserverresponse").html(waiting_message).css("top",a(document).scrollTop()+20).css("left",a(document).scrollLeft()+20).css("visibility","visible"),a.extend(d,{module:b[0],act:b[1]}),a.ajax({type:"POST",dataType:"html",url:request_uri,data:a.param(d),success:function(b){a("#waitingforserverresponse").css("visibility", +error:function(a,b){o.css("visibility","hidden");var c="";if(b=="parsererror"){c="The result is not valid XML :\n-------------------------------------\n";if(a.responseText=="")return;c+=a.responseText.replace(/<[^>]+>/g,"")}else c=b;alert(c)}})}catch(s){alert(s);return}var o=a(".wfsr");show_waiting_message&&o.length&&(e=a(document),o.html(waiting_message).css({top:e.scrollTop()+20+"px",left:e.scrollLeft()+20+"px",visibility:"visible"}))};a.exec_json=function(b,d,e){typeof d=="undefined"&& +(d={});b=b.split(".");b.length==2&&(show_waiting_message&&a(".wfsr").html(waiting_message).css("top",a(document).scrollTop()+20).css("left",a(document).scrollLeft()+20).css("visibility","visible"),a.extend(d,{module:b[0],act:b[1]}),typeof xeVid!="undefined"&&a.extend(d,{vid:xeVid}),a.ajax({type:"POST",dataType:"json",url:request_uri,contentType:"application/json",data:a.param(d),success:function(b){a(".wfsr").css("visibility","hidden");b.error>0&&alert(b.message); +a.isFunction(e)&&e(b)}}))};a.fn.exec_html=function(b,d,e,k,j){typeof d=="undefined"&&(d={});a.inArray(e,["html","append","prepend"])||(e="html");var l=a(this),b=b.split(".");b.length==2&&(show_waiting_message&&a(".wfsr").html(waiting_message).css("top",a(document).scrollTop()+20).css("left",a(document).scrollLeft()+20).css("visibility","visible"),a.extend(d,{module:b[0],act:b[1]}),a.ajax({type:"POST",dataType:"html",url:request_uri,data:a.param(d),success:function(b){a(".wfsr").css("visibility", "hidden");l[e](b);a.isFunction(k)&&k(j)}}))}})(jQuery); (function(a){function b(a){var b=[];return a.is(":radio")?a.filter(":checked").val():a.is(":checkbox")?(a.filter(":checked").each(function(){b.push(this.value)}),b.join("|@|")):a.val()}var d=[],c=[],g=[],e=[],k={},j=new (xe.createApp("Validator",{init:function(){var a=/^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/;this.cast("ADD_RULE",["email",a]);this.cast("ADD_RULE",["email_address",a]);a=/^[a-z]+[\w-]*[a-z0-9_]+$/i;this.cast("ADD_RULE",["userid",a]);this.cast("ADD_RULE",["user_id",a]);a=/^(https?|ftp|mms):\/\/[0-9a-z-]+(\.[_0-9a-z-\/\~]+)+(:[0-9]{2,4})*$/; this.cast("ADD_RULE",["url",a]);this.cast("ADD_RULE",["homepage",a]);this.cast("ADD_RULE",["korean",/^[\uac00-\ud7a3]*$/]);this.cast("ADD_RULE",["korean_number",/^[\uac00-\ud7a30-9]*$/]);this.cast("ADD_RULE",["alpha",/^[a-z]*$/i]);this.cast("ADD_RULE",["alpha_number",/^[a-z][a-z0-9_]*$/i]);this.cast("ADD_RULE",["number",/^[0-9]*$/])},run:function(a){var b="";if(a._filter)b=a._filter.value;a=this.cast("VALIDATE",[a,b]);typeof a=="undefined"&&(a=!1);return a},API_ONREADY:function(){var b=this;a("form").each(function(){if(this.onsubmit)this["xe:onsubmit"]= diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js index 8f9b60be4..9d2819621 100644 --- a/common/js/xml_handler.js +++ b/common/js/xml_handler.js @@ -308,7 +308,7 @@ $.exec_xml = window.exec_xml = function(module, act, params, callback_func, resp } // ajax 통신중 대기 메세지 출력 (show_waiting_message값을 false로 세팅시 보이지 않음) - var waiting_obj = $('#waitingforserverresponse'); + var waiting_obj = $('.wfsr'); if(show_waiting_message && waiting_obj.length) { var d = $(document); waiting_obj.html(waiting_message).css({ @@ -361,7 +361,7 @@ $.exec_json = function(action,data,func){ if(action.length == 2){ if(show_waiting_message) { - $("#waitingforserverresponse").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible'); + $(".wfsr").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible'); } $.extend(data,{module:action[0],act:action[1]}); @@ -373,7 +373,7 @@ $.exec_json = function(action,data,func){ ,contentType:"application/json" ,data:$.param(data) ,success : function(data){ - $("#waitingforserverresponse").css('visibility','hidden'); + $(".wfsr").css('visibility','hidden'); if(data.error > 0) alert(data.message); if($.isFunction(func)) func(data); } @@ -389,7 +389,7 @@ $.fn.exec_html = function(action,data,type,func,args){ action = action.split("."); if(action.length == 2){ if(show_waiting_message) { - $("#waitingforserverresponse").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible'); + $(".wfsr").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible'); } $.extend(data,{module:action[0],act:action[1]}); @@ -399,7 +399,7 @@ $.fn.exec_html = function(action,data,type,func,args){ ,url:request_uri ,data:$.param(data) ,success : function(html){ - $("#waitingforserverresponse").css('visibility','hidden'); + $(".wfsr").css('visibility','hidden'); self[type](html); if($.isFunction(func)) func(args); } diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 3c54c3fa1..f1344f06f 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -82,9 +82,7 @@ {$content} {Context::getHtmlFooter()} - -
- +
{@ $js_body_files = Context::getJsFile('body') } diff --git a/common/tpl/popup_layout.html b/common/tpl/popup_layout.html index 9131fc9fb..00b7f4057 100644 --- a/common/tpl/popup_layout.html +++ b/common/tpl/popup_layout.html @@ -1,5 +1,4 @@ -