Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

src/main/resources/static/js/counterIntelligence/ciWork.js

@@ -97,7 +97,8 @@ function saveCiWork(status){
           alert("저장되었습니다.");
           contentFade("out");
           $("#ciWorkEditModal").modal('hide');
-          getCiWorkViewModal(result);
+          //getCiWorkViewModal(result);
+          location.reload();
         },
         error : function(xhr, status) {
           alert("저장에 실패하였습니다.")

src/main/resources/static/js/equip/cellPhone.js

@@ -99,7 +99,8 @@ $(document).on('click', '#updateCellPhone', function (){
         success : function(result) {
           alert("수정되었습니다.");
           contentFade("out");
-          showModal(result);
+          //showModal(result);
+          location.reload();
         },
         error : function(xhr, status) {
           alert("수정에 실패하였습니다.")

src/main/resources/static/js/equip/equip.js

@@ -85,8 +85,8 @@ $(document).on('click', '#saveEquip', function (){
       contentType: false,
       success : function() {
         alert("저장되었습니다.");
-        location.reload();
         contentFade("out");
+        location.reload();
       },
       error : function(xhr, status) {
         alert("저장에 실패하였습니다.")
@@ -174,6 +174,7 @@ $(document).on('click', '#updateEquip', function (){
         alert("수정되었습니다.");
         showUpdateModal(data);
         contentFade("out");
+        location.reload();
       },
       error : function(xhr, status) {
         alert("수정에 실패하였습니다.")

src/main/resources/static/js/faStatistics/crackdownStatus.js

@@ -439,6 +439,7 @@ function saveCrackdownStatus(saveYn){
           alert("저장되었습니다.");
           contentFade("out");
           $("#crackdownStatusEditModal").modal('hide');
+          location.reload();
         },
         error : function(xhr, status) {
           alert("저장에 실패하였습니다.")

src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js

@@ -90,8 +90,9 @@ $(document).on('click', '.apprvBtn', function (){
       },
       success : function(result) {
         alert("저장되었습니다")
-        getPlanViewModal(result);
+       // getPlanViewModal(result);
         contentFade("out");
+        location.reload();
       },
       error : function(xhr, status) {
         alert("저장에 실패하였습니다.");
@@ -241,7 +242,8 @@ function savePlan(planState){
           alert("저장되었습니다.");
           contentFade("out");
           $("#planEditModal").modal('hide');
-          getPlanViewModal(result);
+          //getPlanViewModal(result);
+          location.reload();
         },
         error : function(xhr, status) {
           alert("저장에 실패하였습니다.")

src/main/resources/templates/fragments/footer.html

@@ -31,10 +31,10 @@
 
 <div class="d-flex flex-wrap py-2 mt-auto" id="footerRow" th:fragment="footerFragment">
   <div class="col-auto">
-    <img src="/img/ft_logo.png" alt="외사업무포털로고" class="h-75">
+    <img src="/img/ft_logo.png" alt="외사포털로고" class="h-75">
   </div>
   <div class="col-auto">
-    <p id="footerSiteName">외사업무포털</p>
+    <p id="footerSiteName">외사포털</p>
     <span id="footerSiteNameEng">FOREIGN AFFAIRS INTELLIGENCE MANAGEMENT SYSTEM</span>
   </div>
   <div class="col-auto ms-3 mt-1">

src/main/resources/templates/fragments/leftMenu.html

@@ -3,7 +3,7 @@
 <div class="pt-3" th:fragment="leftMenuFragment">
     <div class="ps-5">
         <a href="/" >
-            <img id="logoNew" th:src="@{/img/logoNew.png}" alt="logoNew" title="logoNew">
+            <img id="logoNew3" th:src="@{/img/logoNew3.png}" alt="logoNew3" title="logoNew3">
         </a>
     </div>
   <div class="flex-shrink-0 py-3 bg-transparent" id="leftMenu">

src/main/resources/templates/login/login.html

@@ -18,7 +18,7 @@
       <p th:if="${loginError}" class="error text-warning login-Fail">로그인에 실패하였습니다.</p>
       <!-- 로그인 시 아이디의 name 애트리뷰트 값은 username -->
       <!-- 파라미터명을 변경하고 싶을 경우 config class formlogin()에서 .usernameParameter("") 명시 -->
-      <h1>외사업무포털</h1>
+      <h1>외사포털</h1>
       <h2>FOREIGN AFFAIRS INTELLIGENCE MANAGEMENT SYSTEM</h2>
       <ul>
         <li>