Index: base3.10/src/main/webapp/WEB-INF/tiles/template/adminMenu.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/template/adminMenu.jsp (revision 49) +++ base3.10/src/main/webapp/WEB-INF/tiles/template/adminMenu.jsp (revision 50) @@ -80,7 +80,7 @@ </c:when> <c:otherwise> <li class="icon_home"><a href="<c:url value="/admin/index.do"/>">home</a></li> - <li class="icon_login"><a href="<c:url value="/EpLogin.do"/>">login</a></li> + <li class="icon_login"><a href="<c:url value="/uat/uia/egovLoginUsr.do"/>">login</a></li> </c:otherwise> </c:choose> </ul> Index: base3.10/src/main/webapp/WEB-INF/tiles/template/defaultTopMenu.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/template/defaultTopMenu.jsp (revision 49) +++ base3.10/src/main/webapp/WEB-INF/tiles/template/defaultTopMenu.jsp (revision 50) @@ -4,6 +4,7 @@ <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <header class="header"> <div class="skip"> <a href="#contents" onclick="$('#contents').attr('tabindex', '-1').focus(); return false;">본문 바로가기</a> <a href="#gnb_wrap" onclick="$('#gnb_wrap').attr('tabindex', '-1').focus(); return false;">메뉴바로가기</a> </div> <div class="inner"> @@ -12,7 +13,7 @@ <ul class="header_left" id="gnb_wrap"> <li><a href="/" title="home">home</a></li> <li><a href="https://www.apctp.org/" target="_blank" title="apctp [새창열림]">apctp</a></li> - <li><a href="/content/common/about.html" title="about crossroards">about crossroards</a></li> + <li><a href="<c:url value='/content/about.do'/>" title="about crossroards">about crossroards</a></li> </ul> <ul class="header_right"> <c:choose> @@ -22,7 +23,10 @@ <a href="javascsript:void(0)"><spring:message code="comCmm.top.leftSessionTime"/> - <span id="leftTimeInfo">00:00:00</span><!-- 세션만료 남은시간 --></a> <a href="javascript:void(0);" id="addSessionTerm"><spring:message code="comCmm.top.incSessionTime"/><!-- 시간연장 --></a> </li> - <li><a href="<c:url value='/admin/index.do'/>" target="_blank" title="관리자 페이지 [새창열림]">admin</a></li> + <li><a href="<c:url value="/uat/uia/actionLogout.do"/>" title="로그아웃">logout</a></li> + <c:if test="${fn:contains(loginVO.authorCode, 'ROLE_ADMIN') }"> + <li><a href="<c:url value='/admin/index.do'/>" target="_blank" title="관리자 페이지 [새창열림]">admin</a></li> + </c:if> </c:when> <c:otherwise> <li><a href="<c:url value='/uat/uia/egovLoginUsr.do'/>" title="archive">login</a></li> @@ -30,7 +34,6 @@ </c:choose> <li><a href="/content/common/archive.html" title="archive">archive</a></li> <li><a href="/cop/bbs/000000000040/selectArticleList.do" title="공지사항">notice</a></li> -<!-- <li><a href="javasctipt:void(0)" aria-haspopup="dialog" data-popup="login">admin</a></li> --> </ul> </div> <div class="header_bottom"> <a href="/content/common/magazine_list.html" class="info" title="2022년1월 통권 196호">2022년1월 통권 196호</a> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uat/uia/EgovLoginUsr.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uat/uia/EgovLoginUsr.jsp (revision 49) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uat/uia/EgovLoginUsr.jsp (revision 50) @@ -65,6 +65,9 @@ } else if (document.loginForm.password.value =="") { alert("<spring:message code="comUatUia.validate.passCheck" />"); <%-- 비밀번호를 입력하세요 --%> } else { + // 아이디 저장 + saveid(document.loginForm); + document.loginForm.action="<c:url value='/uat/uia/actionLogin.do'/>"; //document.loginForm.j_username.value = document.loginForm.userSe.value + document.loginForm.username.value; //document.loginForm.action="<c:url value='/j_spring_security_check'/>"; @@ -109,11 +112,6 @@ } } -function goGpkiIssu() { - document.defaultForm.action="<c:url value='/uat/uia/egovGpkiIssu.do'/>"; - document.defaultForm.submit(); -} - function setCookie (name, value, expires) { document.cookie = name + "=" + escape (value) + "; path=/; expires=" + expires.toGMTString(); } @@ -150,69 +148,17 @@ } function fnInit() { - /* if (document.getElementById('loginForm').message.value != null) { - var message = document.getElementById('loginForm').message.value; - } */ - /* if ("<c:out value='${message}'/>" != "") { - alert("<c:out value='${message}'/>"); - } */ - - /* ************************* - document.loginForm.rdoSlctUsr[0].checked = false; - document.loginForm.rdoSlctUsr[1].checked = false; - document.loginForm.rdoSlctUsr[2].checked = true; - document.loginForm.userSe.value = "USR"; - document.loginForm.id.value="TEST1"; - document.loginForm.password.value="rhdxhd12"; - **************************** */ - //getid(document.loginForm); // 포커스 //document.loginForm.rdoSlctUsr.focus(); getid(document.loginForm); - fnLoginTypeSelect("typeGnr"); - <c:if test="${not empty fn:trim(loginMessage) && loginMessage ne ''}"> alert("loginMessage:<c:out value='${loginMessage}'/>"); </c:if> - - // reload "_top" frame page - if (parent.frames["_top"] == undefined) - console.log("'_top' frame is not exist!"); - parent.frames["_top"].location.reload(); } -function fnLoginTypeSelect(objName){ - - document.getElementById("typeGnr").className = ""; - document.getElementById("typeEnt").className = ""; - document.getElementById("typeUsr").className = ""; - - document.getElementById(objName).className = "on"; - - if(objName == "typeGnr"){ //일반회원 - document.loginForm.userSe.value = "GNR"; - }else if(objName == "typeEnt"){ //기업회원 - document.loginForm.userSe.value = "ENT"; - }else if(objName == "typeUsr"){ //업무사용자 - document.loginForm.userSe.value = "USR"; - } - -} - -function fnShowLogin(stat) { - if (stat < 1) { //일반로그인 - $(".login_input").eq(0).show(); - $(".login_input").eq(1).hide(); - } else { //공인인증서 로그인 - $(".login_input").eq(0).hide(); - $(".login_type").hide(); - $(".login_input").eq(1).show(); - } -} - </script> </head> <body onLoad="fnInit();"> @@ -228,13 +174,6 @@ <fieldset> <img src="<c:url value='/images/egovframework/com/uat/uia/login_tit.png'/>" style="margin:30px 0 0px 60px" alt="login title image" title="login title image"> - <div class="login_type"> - <ul id="ulLoginType"> - <li><a href="javascript:fnLoginTypeSelect('typeGnr');" id="typeGnr" title=""><spring:message code="comUatUia.loginForm.GNR"/></a></li> <!-- 일반 --> - <li><a href="javascript:fnLoginTypeSelect('typeEnt');" id="typeEnt" title=""><spring:message code="comUatUia.loginForm.ENT"/></a></li> <!-- 기업 --> - <li><a href="javascript:fnLoginTypeSelect('typeUsr');" id="typeUsr" title=""><spring:message code="comUatUia.loginForm.USR"/></a></li> <!-- 업무 --> - </ul> - </div> <div class="login_input"> <ul> @@ -253,7 +192,7 @@ <!-- 아이디 저장 --> <c:set var="title"><spring:message code="comUatUia.loginForm.idSave"/></c:set> <li class="chk"> - <input type="checkbox" name="checkId" class="check2" onclick="javascript:saveid(document.loginForm);" id="checkId">${title} + <input type="checkbox" name="checkId" class="check2" id="checkId">${title} </li> <li> <input type="button" class="btn_login" value="<spring:message code="comUatUia.loginForm.login"/>" onclick="actionLogin()"> <!-- 로그인 --> @@ -263,39 +202,11 @@ <li><a href="#" onclick="goRegiUsr(); return false;"><spring:message code="comUatUia.loginForm.regist"/></a></li> <!-- 회원가입 --> </ul> </li> - <li> - <ul class="btn_idpw" > - <li><a href="#" onclick="fnShowLogin(1);"><spring:message code="comUatUia.loginForm.login.gpki"/></a></li><!-- 인증서로그인 --> - <li><a href="<c:url value='/uat/uia/egovGpkiIssu.do'/>"><spring:message code="comUatUia.loginForm.gpki.info"/></a></li><!-- 인증서안내 --> - </ul> - </li> - - </ul> - </div> - - <div class="login_input" style="display: none"> - <ul> - <li> - <label for="password"><spring:message code="comUatUia.loginForm.pw"/></label><!-- 비밀번호 --> - <input type="password" name="pwd" id="" maxlength="20" title="${title} ${inputTxt}" placeholder="<spring:message code="comUatUia.loginForm.pw"/>"><!-- 비밀번호 --> - </li> - <li> - <input type="button" class="btn_login" value="<spring:message code="comUatUia.loginForm.login.gpki"/>" onclick="actionLogin()"><!-- 인증서로그인 --> - </li> - <li> - <ul class="btn_idpw" > - <li><a href="#" onclick="fnShowLogin(0);"><spring:message code="comUatUia.loginForm.login.normal"/></a></li><!-- 일반로그인 --> - </ul> - <ul class="btn_idpw" > - <li>※ <spring:message code="comUatUia.loginForm.gpki.descrption"/></li> - </ul> - </li> </ul> - </div> </fieldset> - <input name="userSe" type="hidden" value="GNR"/> + <input name="userSe" type="hidden" value="USR"/> <input name="j_username" type="hidden"/> </form> </div>