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

src/main/java/nlib/col/service/CollectionVO.java

@@ -284,6 +284,16 @@ public class CollectionVO extends PagingVO {
 		
 		return true;
 	}
+
+	/**
+	 * 현재 대출(신청 또는 예약) 가능여부 상태명을 리턴한다. 
+	 * @return
+	 */
+	public String getAbleReadNowNm() {
+		if(isAbleReadNow()) return "신청가능";
+		
+		return "신청불가";
+	}
 	
 	/**
 	 * 현재 대출(신청 또는 예약) 가능여부를 리턴한다. 
@@ -292,6 +302,17 @@ public class CollectionVO extends PagingVO {
 	public boolean isAbleRentNow() {
 		return isAbleRentAppNow() || isAbleRentResNow();
 	}
+
+	/**
+	 * 현재 대출(신청 또는 예약) 가능여부 상태명을 리턴한다. 
+	 * @return
+	 */
+	public String getAbleRentNowNm() {
+		if(isAbleRentAppNow()) return "신청가능";
+		else if(isAbleRentResNow()) return "예약가능";
+		
+		return "신청/예약불가";
+	}
 	
 	/**
 	 * 현재 대출 [신청] 가능여부를 리턴한다. 

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

@@ -377,7 +377,10 @@ public class MemberController extends NlibCommonController{
 	 */
 	@RequestMapping(value="/member/insertMemberInfo.do")
 	public String insertMemberInfo(NlibLoginVO vo,ModelMap model,HttpSession session,HttpServletRequest request) throws Exception{
+		String redirectUrl="";
 		
+		String url = request.getRequestURL().toString();
+		String councilHomeUrl=url.replaceAll(request.getRequestURI(), "") + request.getContextPath();
 		String jsessionId = session.getId();
 		OAuthUniversalUser oauthUser = SessionConfig.popNewMemberInfo(jsessionId);
 		if(oauthUser != null && oauthUser.getNlibVO() != null)
@@ -418,6 +421,10 @@ public class MemberController extends NlibCommonController{
 		
 		memberService.insertMemberSns(oauthUser);
 		
+		SessionConfig.setLoginInfo(jsessionId, oauthUser);
+		session.setAttribute("councilReturnUrl","/member/insertMemberInfoResult.do" );//로그인후 이동할페이지
+		redirectUrl = councilHomeUrl + NlibProperty.getString("nculture.login.post.login.redirect.uri");
+		
     	// 결과가 정상이면, 안내 메일 발송 
     	// > 템플릿파일에서 내용 mailing.sender.membership.signUpTemplate
     	// > 발송처리 요청 
@@ -435,7 +442,29 @@ public class MemberController extends NlibCommonController{
 		replaceContents.put("${time}", time);
 		emailUtil.sendEmail(vo.getEmail(),senderName +" 회원가입을 축하드립니다.",replaceContents,signUpTemplate);
         
-		model.addAttribute("result",vo);
+		return "redirect:" + redirectUrl;
+	}
+	
+	
+	/**
+	 * 회원가입 결과페이지
+	 * @param response
+	 * @param authentication
+	 * @param request
+	 * @param session
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/member/insertMemberInfoResult.do")
+	public String insertMemberInfoResult(HttpServletResponse response,Authentication authentication,HttpServletRequest request,HttpSession session, ModelMap model) throws Exception{
+		//사용자 정보를 가져온다.
+		NlibLoginVO loginVO = getNlibLoginVO(authentication);
+		if(loginVO == null) {
+			model.addAttribute("msg","잘못된 접근입니다. \n다시 로그인 하신 후, 이용해 주시기 바랍니다.");
+			model.addAttribute("url","${pageContext.request.contextPath}"+"/");
+			return "nlib/cmm/alert";
+		}
+		model.addAttribute("result",loginVO);
 		return "nlib/member/insertMemberInfoResult";
 	}
 	/**

src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp

@@ -152,7 +152,7 @@
                  li.append($('<span />').attr('class', 't-tit').html("<a href=\"javascript:void(0)\" onclick=\"fn_viewDetail('" + obj.articleId + "','" + obj.secretYn + "','" + obj.myQnaYn + "')\">" +
                          obj.title + 
                          (obj.secretYn == "Y" ? '<img src="/images/icon/icon-password.png" alt="자물쇠 아이콘">&nbsp;' : '') +
-                         (obj.attachYn == "Y" ? '<img src="/images/icon/icon-file.png" alt="파일 아이콘">' : '') + 
+                         (obj.attachYn == "Y" ? '<img src="/images/icon/icon-file.png" alt="파일">' : '') + 
                          "</a>"));
                  li.append($('<span />').attr('class', 't-writer').html(obj.regNm));
                  li.append($('<span />').attr('class', 't-date').html(obj.regDd));
@@ -227,7 +227,7 @@
                         <li><span>${pageTitle }</span></li>
                     </ul>
                 </div>
-                <div class="arr"><img src="/images/icon/icon-join-arr2.png" alt="화살표 아이콘"></div>
+                <div class="arr"><img src="/images/icon/icon-join-arr2.png" alt=""></div>
             </div>
             <div class="contents row-bottom">
                 <div class="list-box qna-box">
@@ -250,19 +250,18 @@
 	
 	                            <div class="right">
 	                                      <div class="list-select type">
-	                                          <label for="searchType">
+	                                          <label for="searchType" class="blind">검색조건
+	                                          </label>
 	                                           <select name="searchType" id="searchType">
 	                                              <option value="T" <c:if test='${searchArticle.searchType == "T" }'>selected</c:if> >제목</option>
 	                                              <option value="C" <c:if test='${searchArticle.searchType == "C" }'>selected</c:if> >내용</option>
 	                                           </select>
-	                                          </label>
+	                                          
 	                                      </div>
 	                                      <div class="list-input">
 	                                          <input type="text" id="searchKeyword" name="searchKeyword" placeholder="검색어를 입력하세요" title="검색어" value="${searchArticle.searchKeyword }" maxlength="20" >
-	                                          <label for="searchKeyword" style="display:none">검색어</label>
+	                                          <label for="searchKeyword" class="blind">검색어</label>
-	                                          <label for="btnSearch">
 	                                          <button name="btnSearch" id="btnSearch" type="button" title="검색">검색</button>
-	                                          </label>
 	                                      </div>
 	                                  </div>
 	                                   

src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp

@@ -97,7 +97,7 @@ function fn_downloadFile(attachFileId, fileSn) {
                         <li><span>${pageTitle }</span></li>
                     </ul>
                 </div>
-                <div class="arr"><img src="/images/icon/icon-join-arr2.png" alt="화살표 아이콘"></div>
+                <div class="arr"><img src="/images/icon/icon-join-arr2.png" alt=""></div>
             </div>
             <div class="contents row-bottom">
                 
@@ -129,7 +129,7 @@ function fn_downloadFile(attachFileId, fileSn) {
                                     %>
                                     <c:forEach var="attachFile" items="${article.attachFiles }">
                                         <div class="file-list">
-                                            <span><img src="/images/icon/icon-file.png" alt="파일 아이콘"></span>
+                                            <span><img src="/images/icon/icon-file.png" alt="파일"></span>
                                             <span><button type="button" onclick="fn_downloadFile('${attachFile.attachFileId}', ${attachFile.fileSn})">${attachFile.orignlFileNm}, ${attachFile.fileSize} byte(s)</button></span>
                                             <span><button type="button" onclick="fn_downloadFile('${attachFile.attachFileId}', ${attachFile.fileSn})">다운로드</button></span>
                                         </div>

src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfo.jsp

@@ -53,7 +53,7 @@ $( document ).ready(function() {
                         <li><span>찾아오시는</span>길</li>
                     </ul>
                 </div>
-                <div class="arr"><img src="/images/icon/icon-join-arr2.png" alt="화살표 아이콘"></div>
+                <div class="arr"><img src="/images/icon/icon-join-arr2.png" alt=""></div>
             </div>
             <div class="contents row-bottom">
                 <div class="map-box">
@@ -115,23 +115,23 @@ $( document ).ready(function() {
                             <!-- 지도 : 종료 -->
                         </div>
                         <div class="addr">
-                            <p><img src="/images/icon/icon-location-01.png" alt="지도 아이콘"></p>
+                            <p><img src="/images/icon/icon-location-01.png" alt=""></p>
                             <p>주소</p>
                             <p>(${zipCode }) ${address } ${addressDetail }</p>
                         </div>
                         <div class="time">
-                            <p><img src="/images/icon/icon-location-02.png" alt="달력 아이콘"></p>
+                            <p><img src="/images/icon/icon-location-02.png" alt=""></p>
                             <p>운영시간</p>
                             <p>월요일~금요일 / 오전 ${openTime } ~ 오후 ${closeTime }</p>
                             <p>매주 토요일, 일요일 휴관<br>${closingInfo }</p>
                         </div>
                         <div class="tel">
-                            <p><img src="/images/icon/icon-location-03.png" alt="전화 아이콘"></p>
+                            <p><img src="/images/icon/icon-location-03.png" alt=""></p>
                             <p>전화</p>
                             <p>${phoneNo }</p>
                         </div>
                         <div class="fax">
-                            <p><img src="/images/icon/icon-location-04.png" alt="팩스 아이콘"></p>
+                            <p><img src="/images/icon/icon-location-04.png" alt=""></p>
                             <p>팩스</p>
                             <p>${faxNo }</p>
                         </div>

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

@@ -22,8 +22,15 @@
  *
  */
  %>
-<%@ page language="java" contentType="text/html; charset=UTF-8"
+ <%@ page language="java" contentType="text/html; charset=UTF-8" %>
-    pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
+<%@ 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" %>
+<%@ 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>
 	<!--

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

@@ -244,7 +244,7 @@ function fn_search(bookLtRvStatusCd) {
 							                    value="${orgItem.mngOrgNm }" /></option>
 							            </c:forEach>
                                     </select>
-                                    <label for="mngOrgCd" style="display:none">문화원 선택</label>
+                                    <label for="mngOrgCd" class="blind">문화원 선택</label>
                                 </div>
                             </div>
                         </div>