diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js index d38c6a2d..b6d8272b 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js @@ -168,23 +168,12 @@ function getAffairEditModal(affairKey){ success: function(html){ $("#affairEditModalContent").empty().append(html) $("#affairEditModal").modal('show'); - $("#reportDt, #autoDelete").datepicker({ + $("#reportDt").datepicker({ format: "yyyy-mm-dd", language: "ko", autoclose: true }); - $("#content").summernote({ - lang:'ko-KR', - height: 270, - disableDragAndDrop: true, - toolbar: [ - ['style', ['style']], - ['font', ['bold', 'underline', 'clear']], - ['color', ['color']], - ['para', ['ul', 'ol', 'paragraph']], - ['table', ['table']] - ] - }); + setEditor('editor', '470'); setUploadDiv(); }, error:function(){ @@ -205,6 +194,7 @@ function saveAffair(affairStatus){ $(".text-decoration-line-through").each(function (idx, el){ formData.append('fileSeq', $(el).attr("data-fileseq")); }) + formData.append('content', CrossEditor.GetBodyValue()); $.ajax({ type : 'POST', data : formData, diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html index c4b8bf8d..853c48e8 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html @@ -20,19 +20,25 @@
+ +
+ +
+ +
+ +
- -
- -
- -
- +
+ +
+ +
@@ -73,15 +79,10 @@
- +
- -
-
-
- -
- +
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index 606f7080..5f70681e 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -238,7 +238,6 @@
-
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index b0e3c395..da8efcb0 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -5,239 +5,214 @@