diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
index 3e3b1e5a..73796598 100644
--- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
@@ -32,7 +32,7 @@
">
">
-">
+
">
diff --git a/src/main/webapp/resources/js/fims/bootstrap-datepicker-support.js b/src/main/webapp/resources/js/fims/bootstrap-datepicker-support.js
deleted file mode 100644
index 92d28c73..00000000
--- a/src/main/webapp/resources/js/fims/bootstrap-datepicker-support.js
+++ /dev/null
@@ -1,107 +0,0 @@
-$.fn.datepicker.makeTemplate = function(){
- this.DPGlobal.template = ''+
- '
'+
- '
'+
- this.DPGlobal.headTemplate+
- ''+
- this.DPGlobal.footTemplate+
- '
'+
- '
'+
- '
'+
- '
'+
- this.DPGlobal.headTemplate+
- this.DPGlobal.contTemplate+
- this.DPGlobal.footTemplate+
- '
'+
- '
'+
- '
'+
- '
'+
- this.DPGlobal.headTemplate+
- this.DPGlobal.contTemplate+
- this.DPGlobal.footTemplate+
- '
'+
- '
'+
- '
'+
- '
'+
- this.DPGlobal.headTemplate+
- this.DPGlobal.contTemplate+
- this.DPGlobal.footTemplate+
- '
'+
- '
'+
- '
'+
- '
'+
- this.DPGlobal.headTemplate+
- this.DPGlobal.contTemplate+
- this.DPGlobal.footTemplate+
- '
'+
- '
'+
- '
'+
- '| '+
- ''+
- ''+
- ' | '+
- '
'+
- '';
- this.makeTemplate();
-
-}
-
-//z-index 변경
-$.fn.datepicker.prototype.constructor.Constructor.prototype.originalPlace =
-$.fn.datepicker.prototype.constructor.Constructor.prototype.place;
-$.fn.datepicker.prototype.constructor.Constructor.prototype.place = function(){
-
- var r = this.originalPlace();
- var styleAttr = r.picker.attr('style');
- var ziStart = styleAttr.substring(styleAttr.indexOf("z-index"));
- var semicolonIdx = ziStart.indexOf(";");
- if(semicolonIdx != -1){
- ziString = ziStart.substring(0,semicolonIdx);
- } else {
- ziString = ziStart;
- }
-
- if(ziString.indexOf("!important") == -1){
- var ziValue = ziString.substring(9);
- var replaceStr = "z-index: " + ziValue + ' !important';
- r.picker.attr('style', styleAttr.replace(ziString, replaceStr));
- }
-
- return r;
-};
-
-$.fn.datepicker.addKo();
\ No newline at end of file
diff --git a/src/main/webapp/resources/sneat/libs/bootstrap-datepicker/bootstrap-datepicker.js b/src/main/webapp/resources/sneat/libs/bootstrap-datepicker/bootstrap-datepicker.js
index 1899fa2c..a4b408c2 100644
--- a/src/main/webapp/resources/sneat/libs/bootstrap-datepicker/bootstrap-datepicker.js
+++ b/src/main/webapp/resources/sneat/libs/bootstrap-datepicker/bootstrap-datepicker.js
@@ -770,6 +770,23 @@
zIndex: zIndex
});
}
+
+ //
+ var styleAttr = this.picker.attr('style');
+ var ziStart = styleAttr.substring(styleAttr.indexOf("z-index"));
+ var semicolonIdx = ziStart.indexOf(";");
+ if(semicolonIdx != -1){
+ ziString = ziStart.substring(0,semicolonIdx);
+ } else {
+ ziString = ziStart;
+ }
+
+ if(ziString.indexOf("!important") == -1){
+ var ziValue = ziString.substring(9);
+ var replaceStr = "z-index: " + ziValue + ' !important';
+ this.picker.attr('style', styleAttr.replace(ziString, replaceStr));
+ }
+
return this;
},
@@ -992,9 +1009,9 @@
startMonth = this.o.startDate !== -Infinity ? this.o.startDate.getUTCMonth() : -Infinity,
endYear = this.o.endDate !== Infinity ? this.o.endDate.getUTCFullYear() : Infinity,
endMonth = this.o.endDate !== Infinity ? this.o.endDate.getUTCMonth() : Infinity,
- todaytxt = dates[this.o.language].today || dates['en'].today || '',
- cleartxt = dates[this.o.language].clear || dates['en'].clear || '',
- titleFormat = dates[this.o.language].titleFormat || dates['en'].titleFormat,
+ todaytxt = dates[this.o.language].today || dates['ko'].today || '',
+ cleartxt = dates[this.o.language].clear || dates['ko'].clear || '',
+ titleFormat = dates[this.o.language].titleFormat || dates['ko'].titleFormat,
todayDate = UTCToday(),
titleBtnVisible = (this.o.todayBtn === true || this.o.todayBtn === 'linked') && todayDate >= this.o.startDate && todayDate <= this.o.endDate && !this.weekOfDateIsDisabled(todayDate),
tooltip,
@@ -1084,7 +1101,7 @@
}
this.picker.find('.datepicker-days tbody').html(html.join(''));
- var monthsTitle = dates[this.o.language].monthsTitle || dates['en'].monthsTitle || 'Months';
+ var monthsTitle = dates[this.o.language].monthsTitle || dates['ko'].monthsTitle || 'Months';
var months = this.picker.find('.datepicker-months')
.find('.datepicker-switch')
.text(this.o.maxViewMode < 2 ? monthsTitle : year)
@@ -1704,43 +1721,44 @@
$.fn.datepicker = datepickerPlugin;
var defaults = $.fn.datepicker.defaults = {
+ language: 'ko',
+ rtl: false,
+ autoclose: true,
+ format: 'yyyy-mm-dd',
+ clearBtn: true,
+ todayBtn: 'linked',
+ keyboardNavigation: false,
+ minViewMode: 0,
+ maxViewMode: 2,
+ weekStart: 0,
+ todayHighlight: true,
+ disableTouchKeyboard: true,
+ enableOnReadonly: false,
+ immediateUpdates: true,
+ zIndexOffset: 1,
+
assumeNearbyYear: false,
- autoclose: false,
beforeShowDay: $.noop,
beforeShowMonth: $.noop,
beforeShowYear: $.noop,
beforeShowDecade: $.noop,
beforeShowCentury: $.noop,
calendarWeeks: false,
- clearBtn: false,
toggleActive: false,
daysOfWeekDisabled: [],
daysOfWeekHighlighted: [],
datesDisabled: [],
endDate: Infinity,
forceParse: true,
- format: 'mm/dd/yyyy',
keepEmptyValues: false,
- keyboardNavigation: true,
- language: 'en',
- minViewMode: 0,
- maxViewMode: 4,
multidate: false,
multidateSeparator: ',',
orientation: "auto",
- rtl: false,
startDate: -Infinity,
startView: 0,
- todayBtn: false,
- todayHighlight: false,
updateViewDate: true,
- weekStart: 0,
- disableTouchKeyboard: false,
- enableOnReadonly: true,
showOnFocus: true,
- zIndexOffset: 10,
container: 'body',
- immediateUpdates: false,
title: '',
templates: {
leftArrow: '«',
@@ -1755,15 +1773,15 @@
];
$.fn.datepicker.Constructor = Datepicker;
var dates = $.fn.datepicker.dates = {
- en: {
- days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
- daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
- daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
- months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
- monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
- today: "Today",
- clear: "Clear",
- titleFormat: "MM yyyy"
+ ko: {
+ days: ["일","월","화","수","목","금","토"],
+ daysShort: ["일","월","화","수","목","금","토"],
+ daysMin: ["일","월","화","수","목","금","토"],
+ months: ["1월","2월","3월","4월","5월","6월", "7월","8월","9월","10월","11월","12월"],
+ monthsShort: ["1월","2월","3월","4월","5월","6월", "7월","8월","9월","10월","11월","12월"],
+ today: "오늘",
+ clear: "지우기",
+ titleFormat: "yyyy년 MM"
}
};
@@ -1979,10 +1997,10 @@
contTemplate: ' |
',
footTemplate: ''+
''+
- ' | '+
- '
'+
- ''+
- ' | '+
+ ''+
+ ''+
+ ''+
+ ' | '+
'
'+
''
};