Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib

src/main/java/nlib/user/web/UserInfoController.java

@@ -110,16 +110,6 @@ public class UserInfoController extends NlibCommonController {
 	@Value("#{properties['mypage.uri']}")
 	private String myPageUri;
 	
-	/**
-	 * 내 정보 조회
-	 * @exception Exception
-	 */
-	@Secured("ROLE_USER")
-	@RequestMapping(value="/userInfo/getMyInfo.do")
-	public String getMyInfo(HttpServletResponse response,HttpServletRequest request) throws Exception{
-		return "nlib/userInfo/getMyInfo";
-	}
-	
 	/**
 	 * 내 정보 수정 페이지
 	 * @exception Exception

src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp

@@ -36,6 +36,7 @@
 var BTN_APP_PREFIX = "대출신청/예약"; 
 
 $( document ).ready(function() {
+	fn_setPageTitle("${pageTitle}");
 	
     $("[id^=chk_item_]").prop("disabled", true);
     $("[id^=chk_all_]").prop("disabled", true);

src/main/webapp/WEB-INF/jsp/nlib/cmm/listNotifications.jsp

@@ -36,7 +36,7 @@
 <script>
  
 $( document ).ready(function() {
-     
+	fn_setPageTitle("${pageTitle}");
      // 메시지 표출 
      if(!fn_isEmpty('${message}')) {
          alert("${message}");

src/main/webapp/WEB-INF/jsp/nlib/code/listCodes.jsp

@@ -41,7 +41,7 @@
 <script>
 
 $( document ).ready(function() {
-
+	fn_setPageTitle("${pageTitle}");
     
 }); // document ready
 

src/main/webapp/WEB-INF/jsp/nlib/code/listCodesPopup.jsp

@@ -42,7 +42,7 @@
 
 $( document ).ready(function() {
 
-    
+	fn_setPageTitle("${pageTitle}");
 }); // document ready
 
 function popSubmit() {

src/main/webapp/WEB-INF/jsp/nlib/login/activateDormantAcc.jsp

@@ -31,6 +31,14 @@
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
 <c:set var="pageTitle">휴면계정 해제</c:set>
 
+<script>
+<!--
+$( document ).ready(function() {
+    fn_setPageTitle("${pageTitle}");
+});
+//-->
+</script>
+
     <!-- 휴면계정 섹션 -->
     <div class="location join succ dormant">
         <h2 class="blind">휴면계정 섹션영역</h2>

src/main/webapp/WEB-INF/jsp/nlib/login/activateDormantAccForm.jsp

@@ -31,6 +31,14 @@
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
 <c:set var="pageTitle">휴면계정 안내</c:set>
 
+<script>
+<!--
+$( document ).ready(function() {
+    fn_setPageTitle("${pageTitle}");
+});
+//-->
+</script>
+
     <!-- 휴면계정 섹션 -->
     <div class="location join succ dormant">
         <h2 class="blind">휴면계정 섹션영역</h2>

src/main/webapp/WEB-INF/jsp/nlib/login/loginForm.jsp

@@ -29,9 +29,11 @@
 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
-
+<c:set var="pageTitle">로그인</c:set>
-
   <script>
+	  $( document ).ready(function() {
+		    fn_setPageTitle("${pageTitle}");
+		});
       function fn_signUp(){
           location.href="${pageContext.request.contextPath}/login/memberSnsForm.do";
       }

src/main/webapp/WEB-INF/jsp/nlib/login/loginFormPopup.jsp

@@ -32,6 +32,10 @@
 <c:set var="pageTitle">통합 로그인</c:set>
 
   <script>
+  $( document ).ready(function() {
+	    fn_setPageTitle("${pageTitle}");
+	});
+  
       function fn_signUp(){
           location.href="${pageContext.request.contextPath}/login/memberSnsForm.do";
           

src/main/webapp/WEB-INF/jsp/nlib/login/loginMessage.jsp

@@ -27,8 +27,14 @@
 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-
+<c:set var="pageTitle">안내</c:set>
-
+<script>
+<!--
+$( document ).ready(function() {
+    fn_setPageTitle("${pageTitle}");
+});
+//-->
+</script>
  
     <!-- 안내 섹션 -->
     <section class="join succ dormant">

src/main/webapp/WEB-INF/jsp/nlib/login/loginPreSet.jsp

@@ -33,6 +33,7 @@
 
 <script>
 $(document).ready(function() {
+	fn_setPageTitle("${pageTitle}");
 	$("#frmLoginProc").submit();
 })
 </script>

src/main/webapp/WEB-INF/jsp/nlib/login/loginPreSetPopup.jsp

@@ -28,9 +28,11 @@
 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
-
+<c:set var="pageTitle">처리중입니다</c:set>
 <script>
 $(document).ready(function() {
+    fn_setPageTitle("${pageTitle}");
+	    
 	$("#snsLogin").contents().find('body').append('<form id="frmLoginPop" name="frmLoginPop" action="${url}" method="POST">' + 
 			'url : ${url}<br/>' + 
 			'councilJsessionId : <input type="text" name="councilJsessionId" id="councilJsessionId" value="${councilJsessionId }" /><br/>' + 
@@ -48,9 +50,6 @@ $(document).ready(function() {
 			'</form>');
 });
 </script>
-
-<c:set var="pageTitle">처리중입니다</c:set>
-
         <div class="row Title">
             <p>지방문화원 소장자료관</p>
             <h3>통합 로그인</h3>

src/main/webapp/WEB-INF/jsp/nlib/login/memberSnsForm.jsp

@@ -27,20 +27,24 @@
 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<c:set var="pageTitle">회원가입</c:set>
 <script>
+<!--
 $( document ).ready(function() {
-    fn_setPageTitle("회원가입");
+    fn_setPageTitle("${pageTitle}");
 });
+//-->
+</script>
 </script>
     <!-- 회원가입 섹션 -->
     <section class="location join">
-        <h2 class="blind">회원가입 섹션영역</h2>
+        <h2 class="blind">${pageTitle} 섹션영역</h2>
         <div class="inner">
             <div class="row-top">
                 <div class="location-box">
                     <ul class="loc">
                         <li>HOME</li>
-                        <li class="on">회원가입</li>
+                        <li class="on">${pageTitle}</li>
                     </ul>
                     <ul class="tit">
                         <li><span>회원</span>가입</li>

src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp

@@ -35,9 +35,18 @@
     SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
     SimpleDateFormat sf2 = new SimpleDateFormat("a hh:mm:ss");
 %>
+<c:set var="pageTitle">계정연결완료</c:set>
+<script>
+<!--
+$( document ).ready(function() {
+    fn_setPageTitle("${pageTitle}");
+});
+//-->
+</script>
+
 <!-- 계정연결완료 섹션 -->
     <div class="location join succ connect">
-        <h2 class="blind">계정연결완료 섹션영역</h2>
+        <h2 class="blind">${pageTitle} 섹션영역</h2>
         <div class="inner">
             <div class="row-top icon">
                 <div class="icon"><img src="/images/icon/icon-connect.png" alt="자물쇠 아이콘"></div>

src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp

@@ -30,9 +30,10 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+<c:set var="pageTitle">회원가입</c:set>
 <script>
 $(document).ready(function() {
-    fn_setPageTitle("회원가입");
+    fn_setPageTitle("${pageTitle}");
 });
 
 function signUp(){
@@ -554,13 +555,13 @@ function fn_cancel(){
 </script>
 <!-- 회원가입 섹션 -->
     <div class="location join">
-        <h2 class="blind">회원가입 섹션영역</h2>
+        <h2 class="blind">${pageTitle} 섹션영역</h2>
         <div class="inner">
             <div class="row-top">
                 <div class="location-box">
                     <ul class="loc">
                         <li>HOME</li>
-                        <li class="on">회원가입</li>
+                        <li class="on">${pageTitle}</li>
                     </ul>
                     <ul class="tit">
                         <li><span>회원</span>가입</li>

src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoResult.jsp

@@ -24,15 +24,17 @@
  %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
-<html>
+    <c:set var="pageTitle">회원가입완료</c:set>
-<head>
+	<script>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<!--
-<title>Insert title here</title>
+	$( document ).ready(function() {
-</head>
+	    fn_setPageTitle("${pageTitle}");
-<body>
+	});
+	//-->
+	</script>
     <!-- 회원가입완료 섹션 -->
     <div class="location join succ">
-        <h2 class="blind">회원가입완료 섹션영역</h2>
+        <h2 class="blind">${pageTitle} 섹션영역</h2>
         <div class="inner">
             <div class="row-top icon">
                 <div class="icon"><img src="/images/icon/icon-join-suc.png" alt="화살표 아이콘"></div>
@@ -61,5 +63,3 @@
     </div>
 
 
-</body>
-</html>

src/main/webapp/WEB-INF/jsp/nlib/member/selectMemberJoiningInfo.jsp

@@ -30,14 +30,10 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<c:set var="pageTitle">회원가입</c:set>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
 <script>
 $( document ).ready(function() {
-    fn_setPageTitle("회원가입");
+    fn_setPageTitle("${pageTitle}");
 });
 
 function snsCertForm(){
@@ -60,8 +56,6 @@ function cancle(){
 	location.href="${pageContext.request.contextPath}/login/memberSnsForm.do";
 }
 </script>
-</head>
-<body>
 <!-- 회원가입 섹션 -->
     <section class="location join">
         <h2 class="blind">회원가입 섹션영역</h2>
@@ -126,5 +120,3 @@ function cancle(){
             </div>
         </div>
     </section>
-</body>
-</html>

src/main/webapp/WEB-INF/jsp/nlib/member/snsCertForm.jsp

@@ -49,24 +49,28 @@
  *
  */
  %>
- 
+ <%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<html>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
-<head>
 <script type="text/javascript" src="https://static.nid.naver.com/js/naverLogin_implicit-1.0.2.js" charset="utf-8"></script>
 <script src = "//developers.kakao.com/sdk/js/kakao.min.js"></script>
 <script src="https://apis.google.com/js/api:client.js"></script>
-  <script type="text/javascript" src="http://code.jquery.com/jquery-1.11.3.min.js"></script>
+<c:set var="pageTitle">회원가입</c:set>
-</head>
+<script>
-<body>
+<!--
+$( document ).ready(function() {
+    fn_setPageTitle("${pageTitle}");
+});
+//-->
+</script>
 SNS 인증
 <br>
 	<div id="naver_id_login" style="text-align:center"><a href="${naverUrl}" ><img width="223" src="${pageContext.request.contextPath}/images/nlib/sns/naver_login_btn.png"/></a></div>
 	<div id="googleLogin" style="text-align:center"><a href="${googleUrl}"  ><img width="223" src="${pageContext.request.contextPath}/images/nlib/sns/google_login_btn.png"/></a></div>
 	<div id="kakao_id_login" style="text-align: center"> <a href="${kakaoUrl}" > <img width="223" src="${pageContext.request.contextPath}/images/nlib/sns/kakao_login_btn.png" /></a> </div>
 <br>
-</body>
-</html>

src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp

@@ -32,11 +32,12 @@
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
 
+<c:set var="pageTitle">방문열람신청</c:set>
 <script>
 var BTN_APP_PREFIX = "대출신청/예약"; 
 
 $( document ).ready(function() {
-    
+	fn_setPageTitle("${pageTitle}");
     $("[id^=chk_item_]").prop("disabled", true);
     $("[id^=chk_all_]").prop("disabled", true);
     

src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp

@@ -32,10 +32,11 @@
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
 
+<c:set var="pageTitle">방문열람신청</c:set>
 <script>
 
 $( document ).ready(function() {
-    
+	fn_setPageTitle("${pageTitle}");
     if("${message}" != "") alert("${message}");
     
 }); // document ready

src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp

@@ -37,6 +37,7 @@
 <script>
  
  $( document ).ready(function() {
+	 fn_setPageTitle("${pageTitle}");
 	 
      // 메시지 표출 
      if(!fn_isEmpty('${message}')) {

src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp

@@ -31,11 +31,12 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
-
+<c:set var="pageTitle">대출신청/예약</c:set>
 <script>
 var BTN_APP_PREFIX = "대출신청/예약"; 
 
 $( document ).ready(function() {
+	fn_setPageTitle("${pageTitle}");
 	
     $("[id^=chk_item_]").prop("disabled", true);
     $("[id^=chk_all_]").prop("disabled", true);

src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp

@@ -31,12 +31,13 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
+<c:set var="pageTitle">대출신청/예약</c:set>
     
 <script>
 var BTN_APP_PREFIX = "대출신청/예약"; 
 
 $( document ).ready(function() {
-    
+	fn_setPageTitle("${pageTitle}");
     $("[id^=chk_item_]").prop("disabled", true);
     $("[id^=chk_all_]").prop("disabled", true);
     

src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp

@@ -41,6 +41,7 @@
 <script>
  
  $( document ).ready(function() {
+	 fn_setPageTitle("${pageTitle}");
 	 
      // 메시지 표출 
      if(!fn_isEmpty('${message}')) {

src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyInfo.jsp

@@ -1,40 +0,0 @@
-<%
-/**
- * <pre>
- * @Class Name : getMyInfo.jsp
- * 
- * @Description : 내 정보 조회
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- * </pre>
- *
- * @ ------------    --------    ---------------------------
- * @ 수정일                     수정자             수정내용
- * @ ------------    --------    ---------------------------
- * @ 2021. 7. 12.    JSYOO       최초 생성
- *
- * 
- * @author 이씨플라자 * DIGITALSHIP JSYOO
- * @since 2021. 7. 12.
- * @version 1.0
- *
- */
- %>
-<%@ page language="java" contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Insert title here</title>
-</head>
-<body>
-<a href="#" onclick="javascript:location.href='${pageContext.request.contextPath}/userInfo/pwCertMyInfo.do';">내 정보 수정</a>
-</body>
-</html>