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

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

@@ -152,7 +152,7 @@ public class UserInfoController extends NlibCommonController {
 			model.addAttribute("snsList",snsList);
 			return "nlib/userInfo/putMyInfo";
 		}else {
-			model.addAttribute("msg","비밀번호가 일치하지않습니다.");
+			model.addAttribute("msg","비밀번호가 일치하지 않습니다.");
 			model.addAttribute("url","/userInfo/pwCertMyInfo.do");
 			return "nlib/cmm/alert";
 		} 

src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp

@@ -62,12 +62,20 @@
     }
  function chkCount()
  {
+	 var count = 0;
 	 $("input:checkbox[name = 'interestChk']").each(function() {
 		if($(this).prop("checked") == false)
 		{
 			$("#allChk").prop("checked", false);
+			count +=1;
 		}
 	 });
+	 
+	 if(count == 0)
+	 {
+		 $("#allChk").prop("checked", true);
+	 }
+	 
 	 $("#appCntMo").text($("input:checkbox[name=interestChk]:checked").length);
  }
  function deleteInterests(type,masterId){

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

@@ -102,7 +102,7 @@ function fn_cancle()
 }
 </script>
     <div class="pop-find">
-	    <form id="initPw" name="initPw" method="post">
+	    <form id="initPw" name="initPw" method="post" onsubmit="return false;">
 	    <input type="hidden" id="mbInfoId" name="mbInfoId" value="${loginVO.mbInfoId }">
 	    <input type="hidden" id="nameTemp" name="nameTemp" value="${loginVO.nameTemp }">
 	    <input type="hidden" id="emailTemp" name="emailTemp" value="${loginVO.emailTemp }">

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

@@ -42,6 +42,9 @@ function birthSelectbox(){
     var year = now.getFullYear();
     var mon = now.getMonth() + 1 > 9 ? "" + (now.getMonth() + 1) : "0" + (now.getMonth() + 1);
     var day = now.getDate() > 9 ? "" + now.getDate() : "0" + now.getDate();
+    $("#birth_yy").append('<option value="">(선택)</option>');
+    $("#birth_mm").append('<option value="">(선택)</option>');
+    $("#birth_dd").append('<option value="">(선택)</option>');
     // 년도
     for (var i = 1900; i <= year; i++) {
         $("#birth_yy").append('<option value="' + i + '">' + i + "</option>");

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

@@ -385,7 +385,7 @@ function certEmailCheck(){
               $("[id^='emailVrfctNo']").css("display","none");
           }else
           {
-              alert("인증번호가 일치하지않습니다.");
+              alert("인증번호가 일치하지 않습니다.");
           }
         }
       ,error : function(){
@@ -466,7 +466,7 @@ function certMobileCheck(){
                 $("[id^='mobileSuc']").css("display","inline-block");
                 $("[id^='mobileVrfctNo']").css("display","none");
             }else{
-                alert("인증번호가 일치하지않습니다.");
+                alert("인증번호가 일치하지 않습니다.");
             }
         },error : function(){
         }

src/main/webapp/js/default.js

@@ -75,30 +75,6 @@ $(document).ready(function(){
 		$(".pop-login-password").fadeOut();
 	});
 	
-	// 회원가입 셀렉트박스
-    function birthdaySelectBox() {          
-        var now = new Date();
-        var year = now.getFullYear();
-        var mon = (now.getMonth() + 1) > 9 ? ''+(now.getMonth() + 1) : '0'+(now.getMonth() + 1); 
-        var day = (now.getDate()) > 9 ? ''+(now.getDate()) : '0'+(now.getDate());           
-        // 년도           
-        for(var i = 1900 ; i <= year ; i++) {
-            $('#birth_yy').append('<option value="' + i + '">' + i + '년</option>');    
-        }
-
-        // 월별         
-        for(var i=1; i <= 12; i++) {
-            var mm = i > 9 ? i : "0"+i ;            
-            $('#birth_mm').append('<option value="' + mm + '">' + mm + '월</option>');    
-        }
-
-        // 일별
-        for(var i=1; i <= 31; i++) {
-            var dd = i > 9 ? i : "0"+i ;            
-            $('#birth_dd').append('<option value="' + dd + '">' + dd+ '일</option>');    
-        }
-    };
-        
  // 스크롤 탑 버튼
     $(window).scroll(function () {
         var $window = $(window);