Merge branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu into advc

src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp

@@ -253,6 +253,9 @@
 										</td>
 									</tr>
 								</c:forEach>
+								<c:if test="${empty tngrList}">
+									<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
+								</c:if>
 							</tbody>
 						</table>
 					</div>
@@ -335,6 +338,9 @@
 										</td>
 									</tr>
 								</c:forEach>
+								<c:if test="${empty adultList}">
+									<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
+								</c:if>
 							</tbody>
 						</table>
 					</div>
@@ -377,6 +383,9 @@
 										<td><ve:code codeId="VEA013" code="${list.aprvlCd}"/></td>
 									</tr>
 								</c:forEach>
+								<c:if test="${empty exprnList}">
+									<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
+								</c:if>
 							</tbody>
 						</table>
 					</div>
@@ -429,6 +438,9 @@
 										</td>
 									</tr>
 								</c:forEach>
+								<c:if test="${empty fndtnList}">
+									<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
+								</c:if>
 							</tbody>
 						</table>
 					</div>
@@ -482,6 +494,9 @@
 										</td>
 									</tr>
 								</c:forEach>
+								<c:if test="${empty qnaList}">
+									<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
+								</c:if>
 							</tbody>
 						</table>
 					</div>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp

@@ -282,6 +282,12 @@ $(document).ready(function(){
 	btnLast.attr('data-focus-next','sub36_pop02');
 	btnLast.attr('data-focus','sub36_pop02_close');
 	*/
+	// 레이어팝업 포커싱 이동 수정
+	$(".tooltip-close").click(function(){
+		var activeTarget = $('[data-tooltip-con="sub36_pop02"]');
+		activeTarget.hide();
+		$('[data-tooltip="sub36_pop02"]').focus();
+	});
 	
 })
 </script>
@@ -529,7 +535,7 @@ $(document).ready(function(){
 										
 										<button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button>
 										
-										<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">취소</button>
+										<button type="button" class="btnType02 tooltip-close" data-focus="sub36_pop02_close" data-focus-next="sub36_pop02">취소</button>
 									</div>
 									<div class="btn_right">
 									</div>
@@ -548,7 +554,7 @@ $(document).ready(function(){
 									</div>
 									<div class="btn_center">
 										
-										<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">닫기</button>
+										<button type="button" class="btnType02 tooltip-close" data-focus="sub36_pop02_close" data-focus-next="sub36_pop02">닫기</button>
 									</div>
 									<div class="btn_right">
 									</div>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp

@@ -238,7 +238,7 @@
 										
 										<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
 										<!-- 작성된 설문이 있다 -->
-											<button type="button" class="btnType02" data-tooltip="sub37_pop20" 
+											<button type="button" class="btnType02" data-tooltip="sub36_pop02" 
 											onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
 											,'${list.qustnrTmplatId}','${list.qestnrId10}',''
 											)" title="팝업 열림">설문완료</button>
@@ -251,7 +251,7 @@
 										
 										<c:when test="${empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0}">
 										<!-- 작성된 설문이 없다 -->
-											<button type="button" class="btnType01 sur_bt" data-tooltip="sub37_pop20" 
+											<button type="button" class="btnType01 sur_bt" data-tooltip="sub36_pop02" 
 											onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
 											,'${list.qustnrTmplatId}','${list.qestnrId10}',''
 											)" title="팝업 열림">설문등록</button>						

src/main/webapp/visitEdu/usr/publish/script/content.js

@@ -1302,7 +1302,10 @@ $(document).ready(function () {
 	// 알람 a 내용 없으면 포커싱 안가게.	
 	$(".login_info a").each(function(index,itm){
 		if($(itm).text()==""){
-			$(itm).attr("tabindex","-1");
+			//$(itm).attr("tabindex","-1");
+			$(itm).attr("title","알림없음");
+			$(itm).text("0");
+			$(itm).css("text-indent","-99999px");
 		}else{}
 	})