diff --git a/src/main/java/nlib/info/web/InformController.java b/src/main/java/nlib/info/web/InformController.java index 7dec6798..8c7b433b 100644 --- a/src/main/java/nlib/info/web/InformController.java +++ b/src/main/java/nlib/info/web/InformController.java @@ -196,5 +196,36 @@ public class InformController extends NlibCommonController { return "nlib/inform/selectNCultureLocationInfo"; } + /** + * 찾아오는길 조회한다. + * + * @param req + * @param authentication + * @param model + * @return + */ + @RequestMapping("/inform/selectNCultureLocationInfoPopup.do") + public String selectNCultureLocationInfoPopup(HttpServletRequest req, Authentication authentication, ModelMap model) { + log.debug("selectNCultureLocationInfo : init"); + + //------------------------------- + // REQ VO 구성 + //------------------------------- + DataApiReqVO reqVO = new DataApiReqVO(); + reqVO.setAuthKey(createAuthKey(req, authentication)); + + // 요청 + DataApiResVO resVO = informService.selectNCultureLocationInfo(reqVO); + + // 반환 정보 + model.addAttribute("informContent", resVO.getInfoItem("informContent")); + model.addAttribute("zipcode", resVO.getInfoItem("zipcode")); + model.addAttribute("addr1", resVO.getInfoItem("addr1")); + model.addAttribute("addr2", resVO.getInfoItem("addr2")); + model.addAttribute("tel", resVO.getInfoItem("tel")); + model.addAttribute("fax", resVO.getInfoItem("fax")); + + return "nlib/inform/selectNCultureLocationInfoPopup"; + } } \ No newline at end of file diff --git a/src/main/java/nlib/restful/service/XmlConverter.java b/src/main/java/nlib/restful/service/XmlConverter.java index 541169ef..66580e5c 100644 --- a/src/main/java/nlib/restful/service/XmlConverter.java +++ b/src/main/java/nlib/restful/service/XmlConverter.java @@ -36,7 +36,7 @@ public class XmlConverter { XMLEventReader eventReader = inputFactory.createXMLEventReader(bIn); resMap = getElementValue("result", eventReader, null); - log.debug("Converting XML to HashMap : Done >> " + resMap); + //log.debug("Converting XML to HashMap : Done >> " + resMap); } catch (XMLStreamException e) { e.printStackTrace(); } catch (Exception e) { diff --git a/src/main/java/nlib/restful/service/impl/DataApiTempXml.java b/src/main/java/nlib/restful/service/impl/DataApiTempXml.java index 7d13a327..7c085675 100644 --- a/src/main/java/nlib/restful/service/impl/DataApiTempXml.java +++ b/src/main/java/nlib/restful/service/impl/DataApiTempXml.java @@ -209,7 +209,7 @@ public class DataApiTempXml implements DataApiInterface { } - log.info("RESUTN XML STR : " + returnXmlStr); + //log.info("RESUTN XML STR : " + returnXmlStr); return returnXmlStr; } diff --git a/src/main/webapp/WEB-INF/jsp/nlib/board/listQnAs.jsp b/src/main/webapp/WEB-INF/jsp/nlib/board/listQnAs.jsp index 4e7666c3..8cfd0939 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/board/listQnAs.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/board/listQnAs.jsp @@ -45,7 +45,7 @@ + + 
+ diff --git a/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfoPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfoPopup.jsp new file mode 100644 index 00000000..a6edb46b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfoPopup.jsp @@ -0,0 +1,69 @@ +<% +/** + * 
+ * @Class Name : selectNCultureLocationInfo.jsp
+ * 
+ * @Description : 찾아오시는길 조회 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ * + * @ ------------ -------- --------------------------- + * @ 수정일 수정자 수정내용 + * @ ------------ -------- --------------------------- + * @ 2021. 7. 27. KNKIM 최초 생성 + * + * + * @author 이씨플라자 * DIGITALSHIP KNKIM + * @since 2021. 7. 27. + * @version 1.0 + * + */ + %> +<%@ page language="java" contentType="text/html; charset=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" %> + +찾아오시는길 + + + + +${pageTitle} + + + +

${pageTitle }

+ +주소 : ${zipcode } ${addr1 } ${addr2 }
+전화번호 : ${tel }
+팩스번호 : ${fax }
+ + 
+ + +
+
+ +
+
+ + + + + + diff --git a/src/main/webapp/WEB-INF/tiles/inc-popup/footer.jsp b/src/main/webapp/WEB-INF/tiles/inc-popup/footer-popup.jsp similarity index 74% rename from src/main/webapp/WEB-INF/tiles/inc-popup/footer.jsp rename to src/main/webapp/WEB-INF/tiles/inc-popup/footer-popup.jsp index 89385f4b..e6f16e97 100644 --- a/src/main/webapp/WEB-INF/tiles/inc-popup/footer.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc-popup/footer-popup.jsp @@ -2,5 +2,4 @@ <%@ 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"%> -한국문화원연합회    COPYRIGHT The Federation of Korea Culture Center. ALL RIGHT RESERVED. +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tiles/inc-popup/header.jsp b/src/main/webapp/WEB-INF/tiles/inc-popup/header-popup.jsp similarity index 94% rename from src/main/webapp/WEB-INF/tiles/inc-popup/header.jsp rename to src/main/webapp/WEB-INF/tiles/inc-popup/header-popup.jsp index b03abb85..750b1514 100644 --- a/src/main/webapp/WEB-INF/tiles/inc-popup/header.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc-popup/header-popup.jsp @@ -3,6 +3,4 @@ <%@ 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="sec" uri="http://www.springframework.org/security/tags"%> - -Header : +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tiles/inc-popup/menu.jsp b/src/main/webapp/WEB-INF/tiles/inc-popup/menu-popup.jsp similarity index 70% rename from src/main/webapp/WEB-INF/tiles/inc-popup/menu.jsp rename to src/main/webapp/WEB-INF/tiles/inc-popup/menu-popup.jsp index 46c1f057..e5307408 100644 --- a/src/main/webapp/WEB-INF/tiles/inc-popup/menu.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc-popup/menu-popup.jsp @@ -1,4 +1,4 @@ <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -닫기 +닫기 diff --git a/src/main/webapp/WEB-INF/tiles/inc/header.jsp b/src/main/webapp/WEB-INF/tiles/inc/header.jsp index 2a90c7f9..971c8964 100644 --- a/src/main/webapp/WEB-INF/tiles/inc/header.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc/header.jsp @@ -33,7 +33,9 @@ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tiles/tiles-layout-popup.jsp b/src/main/webapp/WEB-INF/tiles/tiles-layout-popup.jsp index c2483531..6ca59653 100644 --- a/src/main/webapp/WEB-INF/tiles/tiles-layout-popup.jsp +++ b/src/main/webapp/WEB-INF/tiles/tiles-layout-popup.jsp @@ -9,14 +9,14 @@ -온라인 자료대출관리 (N-LIB) +${pageTitle}
- - -
- +
+ +
+
diff --git a/src/main/webapp/WEB-INF/tiles/tiles-layout.xml b/src/main/webapp/WEB-INF/tiles/tiles-layout.xml index 58e6df8f..ae5c2e82 100644 --- a/src/main/webapp/WEB-INF/tiles/tiles-layout.xml +++ b/src/main/webapp/WEB-INF/tiles/tiles-layout.xml @@ -10,12 +10,23 @@ + - - - + + + + + + + + + + + + + @@ -31,10 +42,5 @@ - - - - - - + diff --git a/src/main/webapp/css/nlib.css b/src/main/webapp/css/nlib.css index f69812f9..409fc080 100644 --- a/src/main/webapp/css/nlib.css +++ b/src/main/webapp/css/nlib.css @@ -157,3 +157,48 @@ button { .table_content table, th, td { border: 1px solid #444444; } + + +.floatRight{ + float: right; + color: white; +} + + +#header-popup { + width: 100%; + height: 0px; +} + +#menu-popup { + width: 100%; + height: 60px; /* Footer height */ + position: fixed; + top:0px; + font-weight:bold; + background: #278100; + padding: 20px; + z-index: 10000; + font: 16px "Noto Sans KR", sans-serif; +} + +#content-wrap-popup { + position: relative; + display: block; + padding: 20px; + top:60px; + padding-bottom: 100px; +} + + +#content-wrap-popup h1 { + position: fixed; + top:5px; + z-index: 10001; + color: white; +} + +#footer-popup { + width: 100%; + height: 0px; +} diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index 87a70c36..7e417c0c 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -41,3 +41,8 @@ function fn_getIntValue(name, defaultValue) { } } + +function openPopup(url, popName, width, height) { + var options = "top=10, left=10, width=" + (width?width:600) + ", height=" + (height?height:600) + ", status=no, menubar=no, toolbar=yes, resizable=no"; + window.open(url, popName, options); +}