Index: arms/html/pdServiceVersion/content-container.html
===================================================================
diff -u -raec408f6b141ab406619f8f5d5c491004311ff3f -r95dce22fd00e7c61051cdbfbeaf7cf9b14e355f1
--- arms/html/pdServiceVersion/content-container.html (.../content-container.html) (revision aec408f6b141ab406619f8f5d5c491004311ff3f)
+++ arms/html/pdServiceVersion/content-container.html (.../content-container.html) (revision 95dce22fd00e7c61051cdbfbeaf7cf9b14e355f1)
@@ -28,8 +28,8 @@
Index: reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss
===================================================================
diff -u -r107d90e81aa4b29d5804d0e8619b53f56f6f2dc7 -r95dce22fd00e7c61051cdbfbeaf7cf9b14e355f1
--- reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 107d90e81aa4b29d5804d0e8619b53f56f6f2dc7)
+++ reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 95dce22fd00e7c61051cdbfbeaf7cf9b14e355f1)
@@ -18,10 +18,69 @@
/* 맨위로 아이콘 */
rightBottomTopForwardIcon();
- ajax_setup();
+ var urlParams = new URL(location.href).searchParams;
+ if(ajax_setup()){
+ var page = urlParams.get('page');
+
+ if(includeLayout(page)) {
+
+ $.getScript('js/' + page + ".js", function(){
+ if ($.isFunction(execArmsDocReady)) {
+ execArmsDocReady();
+ }
+ });
+
+ }
+
+ }
+
+
+ var onlyContents = urlParams.get('withoutLayer');
+ if(isEmpty(onlyContents)){
+ $("body").removeAttr('class');
+ }else{
+ $("body").addClass('sidebar-hidden');
+ $("header.page-header").hide();
+ }
+
});
+// include 레이아웃 html 파일을 로드하는 함수
+function includeLayout(page) {
+ var includeArea = $("[data-include]");
+ var self, url;
+ $.each(includeArea, function () {
+
+ self = $(this);
+ url = self.data("include");
+ console.log(url);
+
+ if( url.indexOf( "content-header" ) !== -1 ){
+
+ url = "html/" + page + "/content-header.html";
+ self.load(url, function () {
+ self.removeAttr("data-include");
+ });
+
+ }else if( url.indexOf( "content-container" ) !== -1 ){
+
+ url = "html/" + page + "/content-container.html";
+ self.load(url, function () {
+ self.removeAttr("data-include");
+ });
+
+ }else{
+ self.load(url, function () {
+ self.removeAttr("data-include");
+ });
+ }
+
+ });
+
+ return true;
+}
+
////////////////////////////////////////////////////////////////////////////////////////
//인증관련 공통 변수
////////////////////////////////////////////////////////////////////////////////////////
@@ -654,7 +713,7 @@
},
destroy: true,
processing: true,
- responsive: false,
+ responsive: true,
columns: columnList,
rowsGroup: rowsGroupList,
columnDefs: columnDefList,
@@ -718,25 +777,30 @@
////////////////////////////////////////////////////////////////////////////////////////
function ajax_setup() {
- $.ajaxSetup({
- statusCode: {
- 401: function (n) {
+ $(document)
+ .ajaxStart(function () {
+ $('.loader').removeClass('hide');
+ })
+ .ajaxSend(function (event, jqXHR, ajaxOptions) {})
+ .ajaxSuccess(function (event, jqXHR, ajaxOptions, data) {})
+ .ajaxError(function (event, jqXHR, ajaxSettings, thrownError) {
+ if ( jqXHR.status== 401 ) {
jError("클라이언트가 인증되지 않았거나, 유효한 인증 정보가 부족하여 요청이 거부되었습니다.");
location.href = "/sso/login";
- },
- 403: function (n) {
+ }
+ else if ( jqXHR.status== 403 ) {
jError("서버가 해당 요청을 이해했지만, 권한이 없어 요청이 거부되었습니다.");
- console.log("403 return");
- },
- },
- beforeSend:function(xhr){
- $('.loader').removeClass('hide');
- },
- complete:function(xhr,status){
+ }
+
+ })
+ .ajaxComplete(function (event, jqXHR, ajaxOptions) {})
+ .ajaxStop(function () {
$('.loader').addClass('hide');
- },
- });
+ });
+
+ return true;
+
}
////////////////////////////////////////////////////////////////////////////////////////
Index: arms/js/pdServiceVersion.js
===================================================================
diff -u -r24595c7532dd73e095d0c109f5155a97824126ab -r95dce22fd00e7c61051cdbfbeaf7cf9b14e355f1
--- arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 24595c7532dd73e095d0c109f5155a97824126ab)
+++ arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 95dce22fd00e7c61051cdbfbeaf7cf9b14e355f1)
@@ -32,7 +32,7 @@
makeDatePicker($("#btn-end-calendar-popup"));
// --- 데이터 테이블 설정 --- //
- dataTableLoad()
+ dataTableLoad();
}
@@ -313,18 +313,6 @@
$("#btn-enabled-date").val(json[0].c_start_date);
$("#btn-end-date").val(json[0].c_end_date);
CKEDITOR.instances.extendModalEditor.setData(json[0].c_contents);
-
-
-
-
-
-
- //데이터 로드를 사용자에게 알리기
- Messenger().post({
- message: 'Version Data 조회를 완료하였습니다.',
- type: 'success',
- showCloseButton: true
- });
});
}
Index: arms/template.html
===================================================================
diff -u -re6b39d82f0184b779d12c5fd3dac3c12f311b71f -r95dce22fd00e7c61051cdbfbeaf7cf9b14e355f1
--- arms/template.html (.../template.html) (revision e6b39d82f0184b779d12c5fd3dac3c12f311b71f)
+++ arms/template.html (.../template.html) (revision 95dce22fd00e7c61051cdbfbeaf7cf9b14e355f1)
@@ -350,65 +350,5 @@
-