Commit @48 - jhleem/egov

Files
Commit

임종호 2022-02-15 @48

Index: base3.10/src/main/java/egovframework/cross/web/ContentController.java =================================================================== --- base3.10/src/main/java/egovframework/cross/web/ContentController.java (nonexistent) +++ base3.10/src/main/java/egovframework/cross/web/ContentController.java (revision 48) @@ -0,0 +1,32 @@ +package egovframework.cross.web; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import egovframework.rte.fdl.cmmn.exception.EgovBizException; + +/** + * 컨텐츠 페이지 Controller + * @since 2022. 2. 15 + * @author 임종호 + * <PRE> + * ----------------------- + * 개정이력 + * 2022. 2. 15 임종호 : 최초작성 + * </PRE> + */ +@Controller +public class ContentController { + + /** + * about 페이지 + * @Author : 임종호 + * @Date : 2022. 2. 15 + * @Method Name : selectContentAbout + * @return : String + */ + @RequestMapping(value = "/content/about.do") + public String selectContentAbout() throws EgovBizException { + return ".defaultSubLayout/cross/content/about"; + } +} Property changes on: base3.10/src/main/java/egovframework/cross/web/ContentController.java ___________________________________________________________________ Added: svn:mime-type + text/plain Index: base3.10/src/main/java/egovframework/com/cmm/interceptor/AuthenticInterceptor.java =================================================================== --- base3.10/src/main/java/egovframework/com/cmm/interceptor/AuthenticInterceptor.java (revision 47) +++ base3.10/src/main/java/egovframework/com/cmm/interceptor/AuthenticInterceptor.java (revision 48) @@ -6,6 +6,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -127,6 +128,8 @@ } checkMenuVO.setProgrUrl(progrUrl); + // 기존 서브 메뉴 초기화 + initSessionSubMenu(request.getSession()); // 등록된 URL만 체크 MenuVO menuVO = menuService.selectMenuProgram(checkMenuVO); if( menuVO != null ) { @@ -151,9 +154,6 @@ AlertView view = new AlertView(); if (loginVO == null) { String returnUrl = contextPath + "/uat/uia/egovLoginUsr.do"; -// if ("A".equals(menuVO.getMenuGb())) { -// returnUrl = contextPath + "/admin/index.do"; -// } view.addStaticAttribute("message", "장기간(" + sessionTimeout + "분) 동안 미사용으로 로그아웃 되었습니다."); view.addStaticAttribute("returnUrl", returnUrl); } else { @@ -194,4 +194,23 @@ return true; } + /** + * 세션 서브메뉴 초기화 + * @Author : 임종호 + * @Date : 2022. 2. 15 + * @Method Name : initSessionMenu + * @return : void + */ + private void initSessionSubMenu(HttpSession session) { + session.setAttribute("prevPage", null); + + // 네비게이션 메뉴 정보 + session.setAttribute("menuNaviVO", null); + + // 같은 depth 메뉴 정보 + session.setAttribute("menuDepthVO", null); + + // 현재 메뉴 정보 + session.setAttribute("thisMenuInfo", null); + } } Index: base3.10/src/main/webapp/WEB-INF/tiles/tiles-config.xml =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/tiles-config.xml (revision 47) +++ base3.10/src/main/webapp/WEB-INF/tiles/tiles-config.xml (revision 48) @@ -50,6 +50,9 @@ </definition>  + <definition name=".defaultSubLayout/*/*/*" extends=".defaultSubLayout"> + <put-attribute name="body" value="/WEB-INF/jsp/egovframework/{1}/{2}/{3}.jsp"/> + </definition> <definition name=".defaultSubLayout/*/*/*/*" extends=".defaultSubLayout"> <put-attribute name="body" value="/WEB-INF/jsp/egovframework/{1}/{2}/{3}/{4}.jsp"/> </definition> Index: base3.10/src/main/webapp/WEB-INF/tiles/layouts/adminLayout.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/layouts/adminLayout.jsp (revision 47) +++ base3.10/src/main/webapp/WEB-INF/tiles/layouts/adminLayout.jsp (revision 48) @@ -6,9 +6,9 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko" lang="ko" id="fouc"> <head> <style> #fouc {opacity: 0;} </style> + <title><c:out value="${thisMenuInfo.progrUrlNm }" escapeXml="false"/> - ${systemVO.sysNm }</title> <meta http-equiv="X-UA-Compatible" content="IE=edge"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>관리자 / ${systemVO.sysNm }</title> <link rel="icon" href="<c:url value='/images/user/favicon.ico'/>" type="image/x-icon" /> <tiles:insertAttribute name="header" /> </head> Index: base3.10/src/main/webapp/WEB-INF/tiles/layouts/defaultSubLayout.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/layouts/defaultSubLayout.jsp (revision 47) +++ base3.10/src/main/webapp/WEB-INF/tiles/layouts/defaultSubLayout.jsp (revision 48) @@ -1,7 +1,6 @@ <%@ 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="tiles" uri="http://tiles.apache.org/tags-tiles"%> -<c:set value="${sessionScope.FUNCTION_AUTHO}" var="functionAutho" /> <c:set value="${sessionScope.systemVO}" var="systemVO" /> <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko" lang="ko" id="fouc"> @@ -10,16 +9,16 @@ var FUNCTION_AUTHO = "${functionAutho }"; </script> <title><c:out value="${thisMenuInfo.progrUrlNm }" escapeXml="false"/> - ${systemVO.sysNm }</title> - <meta http-equiv="X-UA-Compatible" content="IE=edge"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> + <title>${systemVO.sysNm }</title> <meta property="og:type" content="website"> - <meta property="og:title" content="${systemVO.sysNm }"> - <meta property="og:url" content="localhost:8080"> - <meta property="og:description" content="자동차 튜닝 관련 제품, 기술마켓, 비지니스지원, 일자리 정보제공"> - <meta property="og:image" content="/images/admin/logo.jpg"/> + <meta property="og:title" content="크로스로드"> + <meta property="og:url" content="http://crossroads.apctp.org/"> + <meta property="og:description" content="크로스로드 웹진"> + <meta property="og:image" content="/img/logo.jpg"> <meta name="viewport" content="width=device-width, user-scalable=no" /> - <link rel="shortcut icon" href="<c:url value='/images/admin/favicon.ico' />" type="image/x-icon"> - <link rel="icon" href="<c:url value='/images/admin/favicon.ico' />" type="image/x-icon"> + <link rel="icon" href="<c:url value='/images/user/favicon.ico'/>" type="image/x-icon" /> <tiles:insertAttribute name="header" /> </head> <body> Index: base3.10/src/main/webapp/WEB-INF/tiles/layouts/defaultLayout.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/layouts/defaultLayout.jsp (revision 47) +++ base3.10/src/main/webapp/WEB-INF/tiles/layouts/defaultLayout.jsp (revision 48) @@ -5,9 +5,9 @@ <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko" lang="ko" id="fouc"> <head> + <title>${systemVO.sysNm }</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> - <title>${systemVO.sysNm }</title> <meta property="og:type" content="website"> <meta property="og:title" content="크로스로드"> <meta property="og:url" content="http://crossroads.apctp.org/"> Index: base3.10/src/main/webapp/WEB-INF/tiles/template/defaultSubMenu.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/template/defaultSubMenu.jsp (revision 47) +++ base3.10/src/main/webapp/WEB-INF/tiles/template/defaultSubMenu.jsp (revision 48) @@ -10,9 +10,36 @@ <c:set value="${sessionScope.menuNaviVO}" var="menuNaviList" /> <c:set value="${sessionScope.menuDepthVO}" var="menuDepthList" /> <%pageContext.setAttribute("crlf", "\r\n"); %> -<%-- <c:set value="" var="selMenuNm"/> --%> -<%-- <c:set value="" var="selMenuDc"/> --%> -<div class="sub_title"> + + +<div class="sub_title visual_type bg_box"> + <div class="inner"> + <div class="sub_title_top"> + <div class="breadcrumb"> + <ul> + <li class="home"><a href="/" title="메인화면으로 이동" class="link">home</a></li> + <c:forEach var="menuNavi" items="${menuNaviList }" varStatus="i"> + <li class="next"><span class="icon-arrow-r"></span><em class="blind">다음</em></li> + <c:if test="${menuNaviList.size() > i.count }"> + <li><a href="<c:url value='${menuNavi.progrUrl }'/>" title="${menuNavi.menuNm }로 이동">${menuNavi.menuNm }</a></li> + </c:if> + <c:if test="${menuNaviList.size() == i.count }"> + <li class="btn_location"><strong><span class="blind">현재페이지</span>${menuNavi.menuNm }</strong></li> + </c:if> + </c:forEach> + </ul> + </div> + </div> + <div class="title"> + <h2><c:out value="${thisMenuInfo.progrUrlNm }" escapeXml="false"/></h2> + </div> + </div> + <img src="<c:url value="/images/user/main_bg.jpg" />" alt=""> +</div> + + + +<%-- <div class="sub_title"> <div class="inner"> <div class="sub_title_top"> <div class="breadcrumb"> @@ -25,8 +52,6 @@ <li class="next"><img src="<c:url value='/images/admin/arrow_right.svg'/>" alt="다음"></li> </c:if> <c:if test="${menuNaviList.size() == i.count }"> - <%-- <c:set value="${menuNavi.menuNm }" var="selMenuNm"/> --%> - <%-- <c:set value="${menuNavi.menuDc }" var="selMenuDc"/> --%> <li class="btn_location"> <a class="now" href="javascript:void(0);" title="<c:out value='${menuNavi.menuNm }'/>"><span class="blind">현재페이지</span><c:out value='${menuNavi.menuNm }'/></a> <ul class="location"> @@ -56,10 +81,7 @@ <div class="title"><h2><c:out value="${thisMenuInfo.progrUrlNm }" escapeXml="false"/></h2></div> </div> <div class="gnb_mobile"> - <div class="gnb_2depth_mobile overX"></div> - <div class="gnb_3depth_mobile overX"></div> + <div class="gnb_2depth_mobile overX"></div> + <div class="gnb_3depth_mobile overX"></div> </div> - <%-- <c:if test="${not empty thisMenuInfo.menuDc }"> - <p class="subtitle"><c:out value="${fn:replace(thisMenuInfo.menuDc, crlf, '<br/>') }" escapeXml="false"/></p> - </c:if> --%> -</div> \ No newline at end of file +</div> --%> \ No newline at end of file Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/cross/content/about.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/cross/content/about.jsp (nonexistent) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/cross/content/about.jsp (revision 48) @@ -0,0 +1,187 @@ +<%@ 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="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="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<% + /** + * @Class Name : about.jsp + * @Description : about + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------ ------ ----------------- + * @ 2022. 2. 15 임종호 최초 작성 + * + */ +%> +<div class="sub_container" id="contents"> + <div class="inner about_container"> + <div class="content_wrap"> + <div class="about_text"> + <div class="logo" data-aos="fade-up"><img src="<c:url value="/images/user/logo_v.svg"/>" alt="crossroards webzine"></div> + <div class="text"> + <p data-aos="fade-up" data-aos-delay="100">'과학과 미래 그리고 인류'를 목표로 한 <b>크로스로드</b>는 과학특집, 에세이, 칼럼, 소설, 아시아의 창 등 다양한 장르의 과학 글을 통해 미래의 과학적 비전을 보여주고자 아시아 태평양 이론물리센터 (Asia Pacific Center for Theoretical Physics)에서 창간한 과학 웹 저널입니다.</p> + <p data-aos="fade-up" data-aos-delay="200"><b>크로스로드</b>는 과학 지식을 단순히 소개하는 기존의 과학저널과는 달리 무엇보다 과학자들의 세계관과 비전이 담긴 글을 통해 과학자와 일반인들이 서로 논쟁하고, 토론하고, 웃고 즐길 수 있는 웹저널로, 앞으로는 아태지역의 모든 언어권을 기반으로 하고자 합니다.</p> + <p data-aos="fade-up" data-aos-delay="300"><b>크로스로드</b>는 과학자들의 주관적인 아이디어나 미래에 대한 비전이 들어 있는 글이나, 함께 즐길 수 있는 글, 혹은 영감과 상상력이 가득한 과학 소설이나 만화 등을 소개해 아시아태평양 나아가 전 세계 과학 커뮤니케이션의 중추적인 역할을 담당할 것입니다.</p> + <p data-aos="fade-up" data-aos-delay="400">다양한 '가능성'이 교차하며 그 가능성을 더욱 넓히는 <b>크로스로드</b>의 의미만큼 경계를 자유롭게 넘나들며 과학을 더욱더 대중화시키며 그 저변을 확대하고자 합니다.</p> + </div> + </div> + </div> + </div> + <div class="content_wrap history"> + <div class="trigger" id="trigger1"></div> + <h3>연혁</h3> + <ul> + <li class="history_li"> + <div class="dot"></div> + <div class="date">2020. 01. 01</div> + <p>4차 크로스로드 개편</p> + </li> + <li class="history_li"> + <div class="dot"></div> + <div class="date">2016. 04. 01</div> + <p>3차 크로스로드 개편</p> + </li> + <li class="history_li"> + <div class="dot"></div> + <div class="date">2008. 05. 20</div> + <p>2차 크로스로드 개편</p> + </li> + <li class="history_li"> + <div class="dot"></div> + <div class="date">2007. 09. 01</div> + <p>1차 크로스로드 개편</p> + </li> + <li class="history_li"> + <div class="dot"></div> + <div class="date">2005. 10. 01</div> + <p>아시아태평양 이론물리센터 과학 웹저널 [크로스로드] 창간</p> + </li> + </ul> + </div> + <div class="inner"> + <div class="content_wrap"> + <div class="trigger" id="trigger2"></div> + <div class="editor_info"> + <h3>편집인 구성</h3> + <ul> + <li class="editor_mem"> + <div class="editor_pic bg_box"><img src="<c:url value="/images/user/editor1.jpg" />" alt="방운규"></div> + <div class="editor_text"><strong>방운규</strong> + <p><em>Crossroards 발행인</em><em>아태이론물리센터 소장</em><em>POSTECH 물리학과 교수</em></p> + </div> + </li> + <li class="editor_mem"> + <div class="editor_pic bg_box"><img src="<c:url value="/images/user/editor2.jpg" />" alt="손승우"></div> + <div class="editor_text"><strong>손승우</strong> + <p><em>Crossroards 편집주간</em><em>APCTP 과학문화위원장</em><em>한양대학교 응용물리학과 교수</em></p> + </div> + </li> + <li class="editor_mem"> + <div class="editor_pic bg_box"><img src="<c:url value="/images/user/editor3.jpg" />" alt="이은희"></div> + <div class="editor_text"><strong>이은희</strong> + <p><em>Crossroards 편집위원</em><em>APCTP 과학문화위원</em><em>과학커뮤니케이션</em><em>과학책방 갈다 이사</em></p> + </div> + </li> + <li class="editor_mem"> + <div class="editor_pic bg_box"><img src="<c:url value="/images/user/editor4.jpg" />" alt="이정원"></div> + <div class="editor_text"><strong>이정원</strong> + <p><em>Crossroards 편집위원</em><em>APCTP 과학문화위원</em><em>한국전자통신연구원 선임연구원</em></p> + </div> + </li> + <li class="editor_mem"> + <div class="editor_pic bg_box"><img src="<c:url value="/images/user/editor5.jpg" />" alt="황정아"></div> + <div class="editor_text"><strong>황정아</strong> + <p><em>Crossroards 편집위원</em><em>APCTP 과학문화위원</em><em>한국천문연구원 책임연구원</em></p> + </div> + </li> + </ul> + </div> + </div> + </div> + <div class="content_wrap about_map"> + <div class="inner"> + <h3>찾아오시는 길</h3> + <script type="text/javascript" src="//dapi.kakao.com/v2/maps/sdk.js?appkey=5637af52c8a3217f225aa888acbe255a"></script> +  + <div class="office_box"> + <div class="office"> + <div class="office_map"> + <div id="mapP" class="map"><em class="blind">포항본부 : 경상북도 포항시 남구 청암로 67 포항공과대학교 무은재기념관 501호</em></div> + <script> + var container = document.getElementById('mapP'); + var options = { + center: new kakao.maps.LatLng(36.012122892308454, 129.3223617919051), + level: 3 + }; + var map = new kakao.maps.Map(container, options); + + </script> + </div> + <div class="office_text"> <strong>포항본부</strong> + <div class="address"> + <p>37673 경상북도 포항시 남구 청암로 67 포항공과대학교 무은재기념관 501호</p> + <dl> + <dt>Tel</dt> + <dd>054-279-8661~4</dd> + <dt>Fax</dt> + <dd>054-279-8679</dd> + </dl> + </div> + </div> + </div> + </div> +  +  + <div class="office_box"> + <div class="office"> + <div class="office_map"> + <div id="mapS" class="map"><em class="blind">서울분소 : 서울 강남구 테헤란로7길 22 과총회관 신관 11층</em></div> + <script> + var container = document.getElementById('mapS'); + var options = { + center: new kakao.maps.LatLng(33.450701, 126.570667), + level: 3 + }; + var map = new kakao.maps.Map(container, options); + </script> + </div> + <div class="office_text"> <strong>서울분소</strong> + <div class="address"> + <p>서울 강남구 테헤란로7길 22 과총회관 신관 11층</p> + </div> + </div> + </div> + </div> +  + + </div> + </div> +</div> +<script> +$(function() { + //toggle events + const masicCcroll = { + 'animation': function () { + const controller = new ScrollMagic.Controller(); + //about + const revealElements = $(".content_wrap ul li, .content_wrap h3, .office_box") + for (let i = 0; i < revealElements.length; i++) { + + const scene2 = new ScrollMagic.Scene({ + triggerElement: revealElements[i], + triggerHook: 0.7 + }) + .setClassToggle(revealElements[i], "visible") // add class toggle + .addTo(controller) + } + + } + } + + masicCcroll.animation() //scroll animation +}) +</script> \ No newline at end of file Property changes on: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/cross/content/about.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/menu/autho/EgovMenuCreatManage.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/menu/autho/EgovMenuCreatManage.jsp (revision 47) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/menu/autho/EgovMenuCreatManage.jsp (revision 48) @@ -69,11 +69,11 @@ </colgroup> <thead> <tr> - <th scope="col"><spring:message code="comSymMnuMpm.menuCreatManage.authCode" /></th> - <th scope="col"><spring:message code="comSymMnuMpm.menuCreatManage.authName" /></th> - <th scope="col"><spring:message code="comSymMnuMpm.menuCreatManage.authDesc" /></th> - <th scope="col"><spring:message code="comSymMnuMpm.menuCreatManage.creationStatus" /></th> - <th scope="col"><spring:message code="comSymMnuMpm.menuCreatManage.createMenu" /></th> + <th scope="col">권한코드</th> + <th scope="col">권한명</th> + <th scope="col">권한설명</th> + <th scope="col">메뉴생성여부</th> + <th scope="col">메뉴생성</th> </tr> </thead> <tbody class="ov">

Add a comment

List

Delete comment