jhleem / egov star

임종호 임종호 2022-02-18 @98

관리자 tiles 형식 변경, 웹로그 디자인 변경
Index: base3.10/src/main/java/egovframework/com/sec/ram/web/EgovAuthorManageController.java =================================================================== --- base3.10/src/main/java/egovframework/com/sec/ram/web/EgovAuthorManageController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/sec/ram/web/EgovAuthorManageController.java (revision 98) @@ -67,7 +67,7 @@ @RequestMapping("/sec/ram/EgovAuthorListView.do") public String selectAuthorListView() throws Exception { - return ".adminLayout/권한관리/com/sec/ram/EgovAuthorManage"; + return ".adminLayout/com/sec/ram/EgovAuthorManage"; } /** @@ -103,7 +103,7 @@ paginationInfo.setTotalRecordCount(totCnt); model.addAttribute("paginationInfo", paginationInfo); - return ".adminLayout/권한관리/com/sec/ram/EgovAuthorManage"; + return ".adminLayout/com/sec/ram/EgovAuthorManage"; } /** @@ -121,7 +121,7 @@ authorManageVO.setAuthorCode(authorCode); model.addAttribute("authorManage", egovAuthorManageService.selectAuthor(authorManageVO)); - return ".adminLayout/권한관리/com/sec/ram/EgovAuthorUpdate"; + return ".adminLayout/com/sec/ram/EgovAuthorUpdate"; } /** @@ -132,7 +132,7 @@ @RequestMapping("/sec/ram/EgovAuthorInsertView.do") public String insertAuthorView(@ModelAttribute("authorManage") AuthorManage authorManage) throws Exception { - return ".adminLayout/권한관리/com/sec/ram/EgovAuthorInsert"; + return ".adminLayout/com/sec/ram/EgovAuthorInsert"; } /** @@ -150,7 +150,7 @@ beanValidator.validate(authorManage, bindingResult); //validation 수행 if (bindingResult.hasErrors()) { - return ".adminLayout/권한관리/com/sec/ram/EgovAuthorInsert"; + return ".adminLayout/com/sec/ram/EgovAuthorInsert"; } if (authorManage.getAuthorCode() != null) { AuthorManageVO authorManageVO = new AuthorManageVO(); @@ -159,7 +159,7 @@ if (vo != null) { model.addAttribute("message", egovMessageSource.getMessage("comCopSecRam.authorRoleList.validate.codeCheck")); - return ".adminLayout/권한관리/com/sec/ram/EgovAuthorInsert"; + return ".adminLayout/com/sec/ram/EgovAuthorInsert"; } } egovAuthorManageService.insertAuthor(authorManage); @@ -181,7 +181,7 @@ beanValidator.validate(authorManage, bindingResult); //validation 수행 if (bindingResult.hasErrors()) { - return ".adminLayout/권한관리/com/sec/ram/EgovAuthorUpdate"; + return ".adminLayout/com/sec/ram/EgovAuthorUpdate"; } else { egovAuthorManageService.updateAuthor(authorManage); return "redirect:/sec/ram/EgovAuthorList.do?" + authorManage.searchParam(2); @@ -230,6 +230,6 @@ @RequestMapping("/sec/ram/accessDenied.do") public String accessDenied() throws Exception { - return ".adminLayout/권한관리/com/sec/accessDenied"; + return ".adminLayout/com/sec/accessDenied"; } } Index: base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovArticleManageController.java =================================================================== --- base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovArticleManageController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovArticleManageController.java (revision 98) @@ -163,7 +163,7 @@ model.addAttribute("boardMasterVO", master); model.addAttribute("paginationInfo", paginationInfo); model.addAttribute("noticeList", noticeList); - return ".adminLayout/게시물목록/com/cop/bbs/EgovArticleManageList"; + return ".adminLayout/com/cop/bbs/EgovArticleManageList"; } @@ -219,7 +219,7 @@ // masterVo.setBbsForm(CommonUtil.convertEditorCn(masterVo.getBbsForm(), request)); model.addAttribute("boardMasterVO", masterVo); - return ".adminLayout/게시글상세/com/cop/bbs/EgovArticleManageDetail"; + return ".adminLayout/com/cop/bbs/EgovArticleManageDetail"; } /** @@ -258,7 +258,7 @@ model.addAttribute("articleVO", boardVO); model.addAttribute("boardMasterVO", bdMstr); - return ".adminLayout/게시글등록/com/cop/bbs/EgovArticleManageRegist"; + return ".adminLayout/com/cop/bbs/EgovArticleManageRegist"; } /** @@ -294,7 +294,7 @@ master = egovBBSMasterService.selectBBSMasterInf(master); model.addAttribute("boardMasterVO", master); - return ".adminLayout/게시글등록/com/cop/bbs/EgovArticleRegist"; + return ".adminLayout/com/cop/bbs/EgovArticleRegist"; } if (isAuthenticated) { @@ -381,7 +381,7 @@ model.addAttribute("articleVO", articleVO); - return ".adminLayout/게시글답글/com/cop/bbs/EgovArticleManageReply"; + return ".adminLayout/com/cop/bbs/EgovArticleManageReply"; } /** @@ -419,7 +419,7 @@ model.addAttribute("boardMasterVO", master); ////----------------------------- - return ".adminLayout/게시글답글/com/cop/bbs/EgovArticleReply"; + return ".adminLayout/com/cop/bbs/EgovArticleReply"; } if (isAuthenticated) { @@ -486,7 +486,7 @@ if(bdvo.getNtcrId().equals("anonymous")){ model.addAttribute("result", bdvo); model.addAttribute("boardMasterVO", bmvo); - return ".adminLayout/게시글상세/com/cop/bbs/EgovArticleDetail"; + return ".adminLayout/com/cop/bbs/EgovArticleDetail"; } // 에디터 내용 이미지, 파일다운로드 대응(contextpath) @@ -495,7 +495,7 @@ model.addAttribute("articleVO", bdvo); model.addAttribute("boardMasterVO", bmvo); - return ".adminLayout/게시글수정/com/cop/bbs/EgovArticleManageUpdt"; + return ".adminLayout/com/cop/bbs/EgovArticleManageUpdt"; } @@ -552,7 +552,7 @@ model.addAttribute("articleVO", bdvo); model.addAttribute("boardMasterVO", bmvo); - return ".adminLayout/게시글수정/com/cop/bbs/EgovArticleManageUpdt"; + return ".adminLayout/com/cop/bbs/EgovArticleManageUpdt"; } if (isAuthenticated) { @@ -606,7 +606,7 @@ if(bdvo.getNtcrId().equals("anonymous")){ model.addAttribute("result", bdvo); model.addAttribute("boardMasterVO", bdMstr); - return ".adminLayout/게시물상세/com/cop/bbs/EgovArticleDetail"; + return ".adminLayout/com/cop/bbs/EgovArticleDetail"; } if (isAuthenticated) { Index: base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovBBSMasterController.java =================================================================== --- base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovBBSMasterController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovBBSMasterController.java (revision 98) @@ -123,7 +123,7 @@ model.addAttribute("useComment", "true"); } - return ".adminLayout/게시판관리등록/com/cop/bbs/EgovBBSMasterRegist"; + return ".adminLayout/com/cop/bbs/EgovBBSMasterRegist"; } /** @@ -202,7 +202,7 @@ model.addAttribute("resultCnt", map.get("resultCnt")); model.addAttribute("paginationInfo", paginationInfo); - return ".adminLayout/게시판관리목록/com/cop/bbs/EgovBBSMasterList"; + return ".adminLayout/com/cop/bbs/EgovBBSMasterList"; } /** @@ -235,7 +235,7 @@ model.addAttribute("useComment", "true"); } - return ".adminLayout/게시판관리상세화면/com/cop/bbs/EgovBBSMasterDetail"; + return ".adminLayout/com/cop/bbs/EgovBBSMasterDetail"; } /** @@ -279,7 +279,7 @@ model.addAttribute("useComment", "true"); } - return ".adminLayout/게시판관리수정화면/com/cop/bbs/EgovBBSMasterUpdt"; + return ".adminLayout/com/cop/bbs/EgovBBSMasterUpdt"; } @@ -309,7 +309,7 @@ List<?> codeResult = cmmUseService.selectCmmCodeDetail(comVo); model.addAttribute("bbsTyCode", codeResult); - return ".adminLayout/게시판관리수정화면/com/cop/bbs/EgovBBSMasterUpdt"; + return ".adminLayout/com/cop/bbs/EgovBBSMasterUpdt"; } boardMaster.setLastUpdusrId(user == null ? "" : EgovStringUtil.isNullToString(user.getUniqId())); Index: base3.10/src/main/java/egovframework/com/uss/ion/bnr/web/EgovBannerController.java =================================================================== --- base3.10/src/main/java/egovframework/com/uss/ion/bnr/web/EgovBannerController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/uss/ion/bnr/web/EgovBannerController.java (revision 98) @@ -108,7 +108,7 @@ paginationInfo.setTotalRecordCount(totCnt); model.addAttribute("paginationInfo", paginationInfo); - return ".adminLayout/배너관리/com/uss/ion/bnr/EgovBannerList"; + return ".adminLayout/com/uss/ion/bnr/EgovBannerList"; } /** @@ -124,7 +124,7 @@ bannerVO.setBannerId(bannerId); model.addAttribute("banner", egovBannerService.selectBanner(bannerVO)); - return ".adminLayout/배너관리/com/uss/ion/bnr/EgovBannerUpdt"; + return ".adminLayout/com/uss/ion/bnr/EgovBannerUpdt"; } /** @@ -137,7 +137,7 @@ ModelMap model) throws Exception { model.addAttribute("banner", bannerVO); - return ".adminLayout/배너관리/com/uss/ion/bnr/EgovBannerRegist"; + return ".adminLayout/com/uss/ion/bnr/EgovBannerRegist"; } /** @@ -158,7 +158,7 @@ if (bindingResult.hasErrors()) { model.addAttribute("bannerVO", bannerVO); - return ".adminLayout/배너관리/com/uss/ion/bnr/EgovBannerRegist"; + return ".adminLayout/com/uss/ion/bnr/EgovBannerRegist"; } else { String bannerImage = ""; @@ -192,7 +192,7 @@ if (bindingResult.hasErrors()) { model.addAttribute("bannerVO", banner); - return ".adminLayout/배너관리/com/uss/ion/bnr/EgovBannerUpdt"; + return ".adminLayout/com/uss/ion/bnr/EgovBannerUpdt"; } else { String bannerImage = ""; @@ -291,6 +291,6 @@ model.addAttribute("bannerList", bannerVO.getBannerList()); - return ".adminLayout/배너관리/com/uss/ion/bnr/EgovBannerMainList"; + return ".adminLayout/com/uss/ion/bnr/EgovBannerMainList"; } } Index: base3.10/src/main/java/egovframework/com/uss/umt/web/EgovDeptManageController.java =================================================================== --- base3.10/src/main/java/egovframework/com/uss/umt/web/EgovDeptManageController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/uss/umt/web/EgovDeptManageController.java (revision 98) @@ -90,7 +90,7 @@ paginationInfo.setTotalRecordCount(totCnt); model.addAttribute("paginationInfo", paginationInfo); // model.addAttribute("message", egovMessageSource.getMessage("success.common.select")); - return ".adminLayout/부서관리목록/com/uss/umt/EgovDeptManageList"; + return ".adminLayout/com/uss/umt/EgovDeptManageList"; } /** @@ -106,7 +106,7 @@ model.addAttribute("deptManage", egovDeptManageService.selectDeptManage(deptManageVO)); // model.addAttribute("message", egovMessageSource.getMessage("success.common.select")); - return ".adminLayout/부서관리수정/com/uss/umt/EgovDeptManageUpdt"; + return ".adminLayout/com/uss/umt/EgovDeptManageUpdt"; } /** @@ -118,7 +118,7 @@ public String insertViewDeptManage(@ModelAttribute("deptManageVO") DeptManageVO deptManageVO, ModelMap model) throws Exception { model.addAttribute("deptManage", deptManageVO); - return ".adminLayout/부서관리등록/com/uss/umt/EgovDeptManageInsert"; + return ".adminLayout/com/uss/umt/EgovDeptManageInsert"; } /** @@ -134,7 +134,7 @@ deptManageVO.setOrgnztId(egovDeptManageIdGnrService.getNextStringId()); if (bindingResult.hasErrors()) { - return ".adminLayout/부서관리등록/com/uss/umt/EgovDeptManageInsert"; + return ".adminLayout/com/uss/umt/EgovDeptManageInsert"; } else { egovDeptManageService.insertDeptManage(deptManageVO); model.addAttribute("message", egovMessageSource.getMessage("success.common.insert")); @@ -152,7 +152,7 @@ beanValidator.validate(deptManageVO, bindingResult); //validation 수행 if (bindingResult.hasErrors()) { - return ".adminLayout/부서관리수정/com/uss/umt/EgovDeptManageUpdt?" + deptManageVO.searchParam(2); + return ".adminLayout/com/uss/umt/EgovDeptManageUpdt?" + deptManageVO.searchParam(2); } else { egovDeptManageService.updateDeptManage(deptManageVO); model.addAttribute("message", egovMessageSource.getMessage("success.common.insert")); Index: base3.10/src/main/java/egovframework/com/uss/umt/web/EgovMberManageController.java =================================================================== --- base3.10/src/main/java/egovframework/com/uss/umt/web/EgovMberManageController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/uss/umt/web/EgovMberManageController.java (revision 98) @@ -116,7 +116,7 @@ List<?> mberSttus_result = cmmUseService.selectCmmCodeDetail(vo); model.addAttribute("entrprsMberSttus_result", mberSttus_result);//기업회원상태코드목록 - return ".adminLayout/일반회원관리목록/com/uss/umt/EgovMberManage"; + return ".adminLayout/com/uss/umt/EgovMberManage"; } /** @@ -157,7 +157,7 @@ model.addAttribute("mberSttus_result", mberSttus_result); //사용자상태코드목록 model.addAttribute("groupId_result", groupId_result); //그룹정보 목록 - return ".adminLayout/일반회원관리등록/com/uss/umt/EgovMberInsert"; + return ".adminLayout/com/uss/umt/EgovMberInsert"; } /** @@ -200,7 +200,7 @@ model.addAttribute("mberSttus_result", mberSttus_result); //사용자상태코드목록 model.addAttribute("groupId_result", groupId_result); //그룹정보 목록 - return ".adminLayout/일반회원관리등록/com/uss/umt/EgovMberInsert"; + return ".adminLayout/com/uss/umt/EgovMberInsert"; } else { if ("".equals(mberManageVO.getGroupId())) {//KISA 보안약점 조치 (2018-10-29, 윤창원) mberManageVO.setGroupId(null); @@ -256,7 +256,7 @@ model.addAttribute("mberManageVO", mberManageVO); model.addAttribute("userSearchVO", userSearchVO); - return ".adminLayout/일반회원관리수정/com/uss/umt/EgovMberSelectUpdt"; + return ".adminLayout/com/uss/umt/EgovMberSelectUpdt"; } /** @@ -495,7 +495,7 @@ model.addAttribute("userSearchVO", userSearchVO); model.addAttribute("resultMsg", resultMsg); - return ".adminLayout/일반회원관리비밀번호/com/uss/umt/EgovMberPasswordUpdt"; + return ".adminLayout/com/uss/umt/EgovMberPasswordUpdt"; } /** @@ -523,7 +523,7 @@ model.addAttribute("userSearchVO", userSearchVO); model.addAttribute("mberManageVO", mberManageVO); - return ".adminLayout/일반회원관리비밀번호/com/uss/umt/EgovMberPasswordUpdt"; + return ".adminLayout/com/uss/umt/EgovMberPasswordUpdt"; } /** Index: base3.10/src/main/java/egovframework/com/uss/umt/web/EgovUserManageController.java =================================================================== --- base3.10/src/main/java/egovframework/com/uss/umt/web/EgovUserManageController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/uss/umt/web/EgovUserManageController.java (revision 98) @@ -123,7 +123,7 @@ List<?> emplyrSttusCode_result = cmmUseService.selectCmmCodeDetail(vo); model.addAttribute("emplyrSttusCode_result", emplyrSttusCode_result);//사용자상태코드목록 - return ".adminLayout/업무사용자관리목록/com/uss/umt/EgovUserManage"; + return ".adminLayout/com/uss/umt/EgovUserManage"; } /** @@ -177,7 +177,7 @@ model.addAttribute("orgnztId_result", orgnztId_result); //조직정보 목록 model.addAttribute("groupId_result", groupId_result); //그룹정보 목록 - return ".adminLayout/업무사용자관리등록/com/uss/umt/EgovUserInsert"; + return ".adminLayout/com/uss/umt/EgovUserInsert"; } /** @@ -199,7 +199,7 @@ beanValidator.validate(userManageVO, bindingResult); if (bindingResult.hasErrors()) { - return ".adminLayout/업무사용자관리등록/com/uss/umt/EgovUserInsert"; + return ".adminLayout/com/uss/umt/EgovUserInsert"; } else { if ("".equals(userManageVO.getOrgnztId())) {//KISA 보안약점 조치 (2018-10-29, 윤창원) userManageVO.setOrgnztId(null); @@ -285,7 +285,7 @@ model.addAttribute("userSearchVO", userSearchVO); model.addAttribute("userManageVO", userManageVO); - return ".adminLayout/업무사용자관리수정/com/uss/umt/EgovUserSelectUpdt"; + return ".adminLayout/com/uss/umt/EgovUserSelectUpdt"; } /** @@ -523,7 +523,7 @@ model.addAttribute("userSearchVO", userSearchVO); model.addAttribute("resultMsg", resultMsg); - return ".adminLayout/업무사용자관리비밀번호변경/com/uss/umt/EgovUserPasswordUpdt"; + return ".adminLayout/com/uss/umt/EgovUserPasswordUpdt"; } /** @@ -550,7 +550,7 @@ model.addAttribute("userManageVO", userManageVO); model.addAttribute("userSearchVO", userSearchVO); - return ".adminLayout/업무사용자관리비밀번호변경/com/uss/umt/EgovUserPasswordUpdt"; + return ".adminLayout/com/uss/umt/EgovUserPasswordUpdt"; } /** Index: base3.10/src/main/java/egovframework/com/uss/umt/web/EgovEntrprsManageController.java =================================================================== --- base3.10/src/main/java/egovframework/com/uss/umt/web/EgovEntrprsManageController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/uss/umt/web/EgovEntrprsManageController.java (revision 98) @@ -158,7 +158,7 @@ // model.addAttribute("entrprsSeCode_result", entrprsSeCode_result); //기업구분코드 목록 // model.addAttribute("indutyCode_result", indutyCode_result); //업종코드목록 - return ".adminLayout/기업관리등록/com/uss/umt/EgovEntrprsMberInsert"; + return ".adminLayout/com/uss/umt/EgovEntrprsMberInsert"; } /** @@ -180,7 +180,7 @@ beanValidator.validate(entrprsManageVO, bindingResult); if (bindingResult.hasErrors()) { - return ".adminLayout/기업관리등록/com/uss/umt/EgovEntrprsMberInsert"; + return ".adminLayout/com/uss/umt/EgovEntrprsMberInsert"; } else { if ((entrprsManageVO == null ? "" : EgovStringUtil.isNullToString(entrprsManageVO.getGroupId())).equals("")) { entrprsManageVO.setGroupId(null); @@ -242,7 +242,7 @@ // model.addAttribute("entrprsSeCode_result", entrprsSeCode_result); //기업구분코드 목록 // model.addAttribute("indutyCode_result", indutyCode_result); //업종코드목록 - return ".adminLayout/기업관리수정/com/uss/umt/EgovEntrprsMberSelectUpdt"; + return ".adminLayout/com/uss/umt/EgovEntrprsMberSelectUpdt"; } /** @@ -366,7 +366,7 @@ // List<?> entrprsMberSttus_result = cmmUseService.selectCmmCodeDetail(vo); // model.addAttribute("entrprsMberSttus_result", entrprsMberSttus_result);//기업회원상태코드목록 - return ".adminLayout/기업회원관리/com/uss/umt/EgovEntrprsMberManage"; + return ".adminLayout/com/uss/umt/EgovEntrprsMberManage"; } /** @@ -509,7 +509,7 @@ model.addAttribute("userSearchVO", userSearchVO); model.addAttribute("resultMsg", resultMsg); - return ".adminLayout/기업회원비밀번호변경/com/uss/umt/EgovEntrprsPasswordUpdt"; + return ".adminLayout/com/uss/umt/EgovEntrprsPasswordUpdt"; } /** @@ -536,7 +536,7 @@ model.addAttribute("userSearchVO", userSearchVO); model.addAttribute("entrprsManageVO", entrprsManageVO); - return ".adminLayout/기업회원비밀번호변경/com/uss/umt/EgovEntrprsPasswordUpdt"; + return ".adminLayout/com/uss/umt/EgovEntrprsPasswordUpdt"; } /** Index: base3.10/src/main/java/egovframework/com/site/web/SystemManageController.java =================================================================== --- base3.10/src/main/java/egovframework/com/site/web/SystemManageController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/site/web/SystemManageController.java (revision 98) @@ -43,7 +43,7 @@ systemVO.setSysId(1); SystemVO sysVO = systemManageService.selectSystemInfo(systemVO); model.addAttribute("sysVO", sysVO); - return ".adminLayout/시스템관리/com/site/SystemManage"; + return ".adminLayout/com/site/SystemManage"; } /** Index: base3.10/src/main/java/egovframework/com/sym/log/wlg/web/EgovWebLogController.java =================================================================== --- base3.10/src/main/java/egovframework/com/sym/log/wlg/web/EgovWebLogController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/sym/log/wlg/web/EgovWebLogController.java (revision 98) @@ -77,7 +77,7 @@ paginationInfo.setTotalRecordCount(totCnt); model.addAttribute("paginationInfo", paginationInfo); - return "egovframework/com/sym/log/wlg/EgovWebLogList"; + return ".adminLayout/com/sym/log/wlg/EgovWebLogList"; } /** Index: base3.10/src/main/java/egovframework/com/sym/log/wlg/service/WebLog.java =================================================================== --- base3.10/src/main/java/egovframework/com/sym/log/wlg/service/WebLog.java (revision 97) +++ base3.10/src/main/java/egovframework/com/sym/log/wlg/service/WebLog.java (revision 98) @@ -2,6 +2,8 @@ import java.io.Serializable; +import egovframework.com.cmm.CustomDefaultVO; + /** * @Class Name : WebLog.java * @Description : 웹 로그 관리를 위한 VO 클래스 @@ -18,7 +20,7 @@ * @see * */ -public class WebLog implements Serializable { +public class WebLog extends CustomDefaultVO implements Serializable { private static final long serialVersionUID = -7768865822788140496L; @@ -53,26 +55,6 @@ private String rqesterIp = ""; /** - * 검색시작일 - */ - private String searchBgnDe = ""; - - /** - * 검색조건 - */ - private String searchCnd = ""; - - /** - * 검색종료일 - */ - private String searchEndDe = ""; - - /** - * 검색단어 - */ - private String searchWrd = ""; - - /** * 정렬순서(DESC,ASC) */ private String sortOrdr = ""; @@ -80,50 +62,6 @@ /** 검색사용여부 */ private String searchUseYn = ""; - /** 현재페이지 */ - private int pageIndex = 1; - - /** 페이지갯수 */ - private int pageUnit = 10; - - /** 페이지사이즈 */ - private int pageSize = 10; - - /** firstIndex */ - private int firstIndex = 1; - - /** lastIndex */ - private int lastIndex = 1; - - /** recordCountPerPage */ - private int recordCountPerPage = 10; - - /** rowNo */ - private int rowNo = 0; - - /** - * 검색시작일_화면용 - */ - private String searchBgnDeView = "";//2011.09.14 - - /** - * 검색종료일_화면용 - */ - private String searchEndDeView = "";//2011.09.14 - - public String getSearchEndDeView() { - return searchEndDeView; - } - public void setSearchEndDeView(String searchEndDeView) { - this.searchEndDeView = searchEndDeView; - } - public String getSearchBgnDeView() { - return searchBgnDeView; - } - public void setSearchBgnDeView(String searchBgnDeView) { - this.searchBgnDeView = searchBgnDeView; - } - public String getRequstId() { return requstId; } @@ -172,38 +110,6 @@ this.rqesterIp = rqesterIp; } - public String getSearchBgnDe() { - return searchBgnDe; - } - - public void setSearchBgnDe(String searchBgnDe) { - this.searchBgnDe = searchBgnDe; - } - - public String getSearchCnd() { - return searchCnd; - } - - public void setSearchCnd(String searchCnd) { - this.searchCnd = searchCnd; - } - - public String getSearchEndDe() { - return searchEndDe; - } - - public void setSearchEndDe(String searchEndDe) { - this.searchEndDe = searchEndDe; - } - - public String getSearchWrd() { - return searchWrd; - } - - public void setSearchWrd(String searchWrd) { - this.searchWrd = searchWrd; - } - public String getSortOrdr() { return sortOrdr; } @@ -219,62 +125,4 @@ public void setSearchUseYn(String searchUseYn) { this.searchUseYn = searchUseYn; } - - public int getPageIndex() { - return pageIndex; - } - - public void setPageIndex(int pageIndex) { - this.pageIndex = pageIndex; - } - - public int getPageUnit() { - return pageUnit; - } - - public void setPageUnit(int pageUnit) { - this.pageUnit = pageUnit; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getFirstIndex() { - return firstIndex; - } - - public void setFirstIndex(int firstIndex) { - this.firstIndex = firstIndex; - } - - public int getLastIndex() { - return lastIndex; - } - - public void setLastIndex(int lastIndex) { - this.lastIndex = lastIndex; - } - - public int getRecordCountPerPage() { - return recordCountPerPage; - } - - public void setRecordCountPerPage(int recordCountPerPage) { - this.recordCountPerPage = recordCountPerPage; - } - - public int getRowNo() { - return rowNo; - } - - public void setRowNo(int rowNo) { - this.rowNo = rowNo; - } - - } Index: base3.10/src/main/java/egovframework/com/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java =================================================================== --- base3.10/src/main/java/egovframework/com/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java (revision 98) @@ -99,7 +99,7 @@ paginationInfo.setTotalRecordCount(totCnt); model.addAttribute("paginationInfo", paginationInfo); - return ".adminLayout/공통코드/com/sym/ccm/cca/EgovCcmCmmnCodeList"; + return ".adminLayout/com/sym/ccm/cca/EgovCcmCmmnCodeList"; } /** @@ -118,7 +118,7 @@ model.addAttribute("result", vo); - return ".adminLayout/공통코드/com/sym/ccm/cca/EgovCcmCmmnCodeDetail"; + return ".adminLayout/com/sym/ccm/cca/EgovCcmCmmnCodeDetail"; } /** @@ -138,7 +138,7 @@ model.addAttribute("clCodeList", CmmnCodeList); - return ".adminLayout/공통코드/com/sym/ccm/cca/EgovCcmCmmnCodeRegist"; + return ".adminLayout/com/sym/ccm/cca/EgovCcmCmmnCodeRegist"; } /** @@ -166,7 +166,7 @@ List<?> CmmnCodeList = cmmnClCodeManageService.selectCmmnClCodeList(searchVO); model.addAttribute("clCodeList", CmmnCodeList); - return ".adminLayout/공통코드/com/sym/ccm/cca/EgovCcmCmmnCodeRegist"; + return ".adminLayout/com/sym/ccm/cca/EgovCcmCmmnCodeRegist"; } if(cmmnCode.getCodeId() != null){ @@ -178,7 +178,7 @@ List<?> CmmnCodeList = cmmnClCodeManageService.selectCmmnClCodeList(searchVO); model.addAttribute("clCodeList", CmmnCodeList); - return ".adminLayout/공통코드/com/sym/ccm/cca/EgovCcmCmmnCodeRegist"; + return ".adminLayout/com/sym/ccm/cca/EgovCcmCmmnCodeRegist"; } } @@ -225,7 +225,7 @@ model.addAttribute("cmmnCodeVO", result); - return ".adminLayout/공통코드/com/sym/ccm/cca/EgovCcmCmmnCodeUpdt"; + return ".adminLayout/com/sym/ccm/cca/EgovCcmCmmnCodeUpdt"; } /** @@ -249,7 +249,7 @@ CmmnCode result = cmmnCodeManageService.selectCmmnCodeDetail(cmmnCode); model.addAttribute("cmmnCodeVO", result); - return ".adminLayout/공통코드/com/sym/ccm/cca/EgovCcmCmmnCodeUpdt"; + return ".adminLayout/com/sym/ccm/cca/EgovCcmCmmnCodeUpdt"; } cmmnCodeVO.setLastUpdusrId((user == null || user.getUniqId() == null) ? "" : user.getUniqId()); Index: base3.10/src/main/java/egovframework/com/sym/ccm/ccc/web/EgovCcmCmmnClCodeManageController.java =================================================================== --- base3.10/src/main/java/egovframework/com/sym/ccm/ccc/web/EgovCcmCmmnClCodeManageController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/sym/ccm/ccc/web/EgovCcmCmmnClCodeManageController.java (revision 98) @@ -93,7 +93,7 @@ paginationInfo.setTotalRecordCount(totCnt); model.addAttribute("paginationInfo", paginationInfo); - return ".adminLayout/공통분류코드/com/sym/ccm/ccc/EgovCcmCmmnClCodeList"; + return ".adminLayout/com/sym/ccm/ccc/EgovCcmCmmnClCodeList"; } /** @@ -113,7 +113,7 @@ model.addAttribute("result", vo); - return ".adminLayout/공통분류코드/com/sym/ccm/ccc/EgovCcmCmmnClCodeDetail"; + return ".adminLayout/com/sym/ccm/ccc/EgovCcmCmmnClCodeDetail"; } /** @@ -128,7 +128,7 @@ public String insertCmmnClCodeView(@ModelAttribute("searchVO")CmmnClCodeVO cmmnClCodeVO, ModelMap model) throws Exception { model.addAttribute("cmmnClCodeVO", new CmmnClCodeVO()); - return ".adminLayout/공통분류코드/com/sym/ccm/ccc/EgovCcmCmmnClCodeRegist"; + return ".adminLayout/com/sym/ccm/ccc/EgovCcmCmmnClCodeRegist"; } /** @@ -151,14 +151,14 @@ beanValidator.validate(cmmnClCodeVO, bindingResult); if (bindingResult.hasErrors()) { - return ".adminLayout/공통분류코드/com/sym/ccm/ccc/EgovCcmCmmnClCodeRegist"; + return ".adminLayout/com/sym/ccm/ccc/EgovCcmCmmnClCodeRegist"; } if(cmmnClCodeVO.getClCode() != null){ CmmnClCode vo = cmmnClCodeManageService.selectCmmnClCodeDetail(cmmnClCodeVO); if(vo != null){ model.addAttribute("message", egovMessageSource.getMessage("comSymCcmCcc.validate.codeCheck")); - return ".adminLayout/공통분류코드/com/sym/ccm/ccc/EgovCcmCmmnClCodeRegist"; + return ".adminLayout/com/sym/ccm/ccc/EgovCcmCmmnClCodeRegist"; } } @@ -205,7 +205,7 @@ model.addAttribute("cmmnClCodeVO", result); - return ".adminLayout/공통분류코드/com/sym/ccm/ccc/EgovCcmCmmnClCodeUpdt"; + return ".adminLayout/com/sym/ccm/ccc/EgovCcmCmmnClCodeUpdt"; } /** @@ -229,7 +229,7 @@ CmmnClCode result = cmmnClCodeManageService.selectCmmnClCodeDetail(cmmnClCode); model.addAttribute("cmmnClCodeVO", result); - return ".adminLayout/공통분류코드/com/sym/ccm/ccc/EgovCcmCmmnClCodeUpdt"; + return ".adminLayout/com/sym/ccm/ccc/EgovCcmCmmnClCodeUpdt"; } cmmnClCodeVO.setLastUpdusrId((user == null || user.getUniqId() == null) ? "" : user.getUniqId()); Index: base3.10/src/main/java/egovframework/com/sym/ccm/cde/web/EgovCcmCmmnDetailCodeManageController.java =================================================================== --- base3.10/src/main/java/egovframework/com/sym/ccm/cde/web/EgovCcmCmmnDetailCodeManageController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/sym/ccm/cde/web/EgovCcmCmmnDetailCodeManageController.java (revision 98) @@ -109,7 +109,7 @@ paginationInfo.setTotalRecordCount(totCnt); model.addAttribute("paginationInfo", paginationInfo); - return ".adminLayout/공통상세코드/com/sym/ccm/cde/EgovCcmCmmnDetailCodeList"; + return ".adminLayout/com/sym/ccm/cde/EgovCcmCmmnDetailCodeList"; } /** @@ -127,7 +127,7 @@ CmmnDetailCode vo = cmmnDetailCodeManageService.selectCmmnDetailCodeDetail(cmmnDetailCodeVO); model.addAttribute("result", vo); - return ".adminLayout/공통상세코드/com/sym/ccm/cde/EgovCcmCmmnDetailCodeDetail"; + return ".adminLayout/com/sym/ccm/cde/EgovCcmCmmnDetailCodeDetail"; } /** @@ -185,7 +185,7 @@ } - return ".adminLayout/공통상세코드/com/sym/ccm/cde/EgovCcmCmmnDetailCodeRegist"; + return ".adminLayout/com/sym/ccm/cde/EgovCcmCmmnDetailCodeRegist"; } /** @@ -222,7 +222,7 @@ List<?> CmmnCodeList = cmmnCodeManageService.selectCmmnCodeList(searchCodeVO); model.addAttribute("codeList", CmmnCodeList); - return ".adminLayout/공통상세코드/com/sym/ccm/cde/EgovCcmCmmnDetailCodeRegist"; + return ".adminLayout/com/sym/ccm/cde/EgovCcmCmmnDetailCodeRegist"; } if(cmmnDetailCodeVO.getCodeId() != null){ @@ -242,7 +242,7 @@ List<?> CmmnCodeList = cmmnCodeManageService.selectCmmnCodeList(searchCodeVO); model.addAttribute("codeList", CmmnCodeList); - return ".adminLayout/공통상세코드/com/sym/ccm/cde/EgovCcmCmmnDetailCodeRegist"; + return ".adminLayout/com/sym/ccm/cde/EgovCcmCmmnDetailCodeRegist"; } } @@ -268,7 +268,7 @@ CmmnDetailCode result = cmmnDetailCodeManageService.selectCmmnDetailCodeDetail(cmmnDetailCodeVO); model.addAttribute("cmmnDetailCodeVO", result); - return ".adminLayout/공통상세코드/com/sym/ccm/cde/EgovCcmCmmnDetailCodeUpdt"; + return ".adminLayout/com/sym/ccm/cde/EgovCcmCmmnDetailCodeUpdt"; } /** Index: base3.10/src/main/java/egovframework/com/menu/program/web/ProgramController.java =================================================================== --- base3.10/src/main/java/egovframework/com/menu/program/web/ProgramController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/menu/program/web/ProgramController.java (revision 98) @@ -130,7 +130,7 @@ model.addAttribute("menuInfoVO", menuInfoVO); - return ".adminLayout/프로그램리스트관리/com/menu/program/EgovProgrmList"; + return ".adminLayout/com/menu/program/EgovProgrmList"; } /** Index: base3.10/src/main/java/egovframework/com/menu/autho/web/AuthoController.java =================================================================== --- base3.10/src/main/java/egovframework/com/menu/autho/web/AuthoController.java (revision 97) +++ base3.10/src/main/java/egovframework/com/menu/autho/web/AuthoController.java (revision 98) @@ -125,7 +125,7 @@ paginationInfo.setTotalRecordCount(totCnt); model.addAttribute("paginationInfo", paginationInfo); model.addAttribute("resultMsg", resultMsg); - return ".adminLayout/메뉴권한관리/com/menu/autho/EgovMenuCreatManage"; + return ".adminLayout/com/menu/autho/EgovMenuCreatManage"; } /** @@ -159,7 +159,7 @@ List<?> list_menumanage = authoService.selectMenuCreatManagList(vo); model.addAttribute("authoList", list_menumanage); - return ".adminLayout/메뉴권한관리/com/menu/autho/EgovMenuAutoCreat"; + return ".adminLayout/com/menu/autho/EgovMenuAutoCreat"; } /** @@ -243,7 +243,7 @@ model.addAttribute("resultVO", authoInfoVO); - return ".adminLayout/메뉴권한관리/com/menu/autho/EgovMenuUserCreat"; + return ".adminLayout/com/menu/autho/EgovMenuUserCreat"; } /** Index: base3.10/src/main/resources/egovframework/mapper/com/sym/log/wlg/EgovWebLog_SQL_postgres.xml =================================================================== --- base3.10/src/main/resources/egovframework/mapper/com/sym/log/wlg/EgovWebLog_SQL_postgres.xml (revision 97) +++ base3.10/src/main/resources/egovframework/mapper/com/sym/log/wlg/EgovWebLog_SQL_postgres.xml (revision 98) @@ -71,12 +71,14 @@ 1 = 1 ]]> - <if test="searchWrd != null and searchWrd != ''"> <![CDATA[ AND - a.URL LIKE CONCAT ('%', #{searchWrd},'%') ]]> + <if test="searchCondition != null and searchCondition != ''"> <![CDATA[ AND + a.URL LIKE CONCAT ('%', #{searchKeyword},'%') ]]> + </if> + <if test="searchBgnPnttm != null and searchBgnPnttm != ''"> + AND a.OCCRRNC_DE <![CDATA[>=]]> #{searchBgnPnttm}::date </if> - <if test="searchBgnDe != null and searchBgnDe != ''"> <![CDATA[ AND - a.OCCRRNC_DE BETWEEN TO_TIMESTAMP(CONCAT(#{searchBgnDe},' 00:00:00'), 'YYYY-mm-dd HH24:MI:SS') - AND TO_TIMESTAMP(CONCAT(#{searchEndDe},' 23:59:59'), 'YYYY-mm-dd HH24:MI:SS') ]]> + <if test="searchEndPnttm != null and searchEndPnttm != ''"> + AND a.OCCRRNC_DE <![CDATA[<]]> #{searchEndPnttm}::date + cast('1 day' as interval) </if> <![CDATA[ ORDER BY a.OCCRRNC_DE DESC ]]> LIMIT #{recordCountPerPage} OFFSET #{firstIndex} @@ -94,13 +96,14 @@ WHERE 1 = 1 ]]> - <if test="searchWrd != null and searchWrd != ''"> <![CDATA[ AND - - a.URL LIKE CONCAT ('%', #{searchWrd},'%') ]]> + <if test="searchCondition != null and searchCondition != ''"> <![CDATA[ AND + a.URL LIKE CONCAT ('%', #{searchKeyword},'%') ]]> </if> - <if test="searchBgnDe != null and searchBgnDe != ''"> <![CDATA[ AND - a.OCCRRNC_DE BETWEEN TO_TIMESTAMP(CONCAT(#{searchBgnDe},' 00:00:00'), 'YYYY-mm-dd HH24:MI:SS') - AND TO_TIMESTAMP(CONCAT(#{searchEndDe},' 23:59:59'), 'YYYY-mm-dd HH24:MI:SS') ]]> + <if test="searchBgnPnttm != null and searchBgnPnttm != ''"> + AND a.OCCRRNC_DE <![CDATA[>=]]> #{searchBgnPnttm}::date + </if> + <if test="searchEndPnttm != null and searchEndPnttm != ''"> + AND a.OCCRRNC_DE <![CDATA[<]]> #{searchEndPnttm}::date + cast('1 day' as interval) </if> </select> Index: base3.10/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-interceptor.xml =================================================================== --- base3.10/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-interceptor.xml (revision 97) +++ base3.10/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-interceptor.xml (revision 98) @@ -34,8 +34,6 @@ <mvc:exclude-mapping path="/editor/fileListView.do" /> <mvc:exclude-mapping path="/cop/cmt/*/selectArticleCommentList.do" /> <mvc:exclude-mapping path="/menu/program/ProgrmListTreeSelect.do" /> - <!-- RSS 피드 --> - <mvc:exclude-mapping path="/rss.do" /> <bean class="egovframework.com.cmm.interceptor.AuthenticInterceptor" /> </mvc:interceptor> </mvc:interceptors> Index: base3.10/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml =================================================================== --- base3.10/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml (revision 97) +++ base3.10/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml (revision 98) @@ -42,12 +42,20 @@ <property name="patternList"> <list> <value>/editor/**</value> + <value>/imageview.do</value> + <value>/download.do</value> + <value>/streaming.do</value> + <value>/multiDownload.do</value> + <value>/multiImageview.do</value> + <value>/imagePrint/*.do</value> <value>/**/*Json.do</value> <value>/cop/cmt/*/selectArticleCommentList.do</value> <value>/menu/program/ProgrmListTreeSelect.do</value> <value>/uat/uia/actionLogin.do</value> <value>/uat/uia/actionLogout.do</value> <value>/validator.do</value> + <value>/sym/log/wlg/SelectWebLogList.do</value> + <value>/sym/log/wlg/SelectWebLogDetail.do</value> </list> </property> </bean> Index: base3.10/src/main/webapp/WEB-INF/tiles/tiles-config.xml =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/tiles-config.xml (revision 97) +++ base3.10/src/main/webapp/WEB-INF/tiles/tiles-config.xml (revision 98) @@ -64,20 +64,17 @@ </definition> <!-- 관리자 레이아웃 --> - <definition name=".adminLayout/*/*/*/*" extends=".adminLayout"> - <put-attribute name="title" value="{1}"/> - <put-attribute name="body" value="/WEB-INF/jsp/egovframework/{2}/{3}/{4}.jsp"/> + <definition name=".adminLayout/*/*/*" extends=".adminLayout"> + <put-attribute name="body" value="/WEB-INF/jsp/egovframework/{1}/{2}/{3}.jsp"/> </definition> <!-- 관리자 레이아웃 --> - <definition name=".adminLayout/*/*/*/*/*" extends=".adminLayout"> - <put-attribute name="title" value="{1}"/> - <put-attribute name="body" value="/WEB-INF/jsp/egovframework/{2}/{3}/{4}/{5}.jsp"/> + <definition name=".adminLayout/*/*/*/*" extends=".adminLayout"> + <put-attribute name="body" value="/WEB-INF/jsp/egovframework/{1}/{2}/{3}/{4}.jsp"/> </definition> <!-- 관리자 레이아웃 --> - <definition name=".adminLayout/*/*/*/*/*/*" extends=".adminLayout"> - <put-attribute name="title" value="{1}"/> - <put-attribute name="body" value="/WEB-INF/jsp/egovframework/{2}/{3}/{4}/{5}/{6}.jsp"/> + <definition name=".adminLayout/*/*/*/*/*" extends=".adminLayout"> + <put-attribute name="body" value="/WEB-INF/jsp/egovframework/{1}/{2}/{3}/{4}/{5}.jsp"/> </definition> </tiles-definitions> \ No newline at end of file Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/sym/log/wlg/EgovWebLogList.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/sym/log/wlg/EgovWebLogList.jsp (revision 97) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/sym/log/wlg/EgovWebLogList.jsp (revision 98) @@ -23,58 +23,19 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <c:set var="pageTitle"><spring:message code="comSymLogWlg.webLog.title"/></c:set> -<!DOCTYPE html> -<html> -<head> -<title>${pageTitle} <spring:message code="title.list" /></title> -<meta http-equiv="content-type" content="text/html; charset=utf-8"> -<link type="text/css" rel="stylesheet" href="<c:url value='/css/egovframework/com/com.css' />"> -<link type="text/css" rel="stylesheet" href="<c:url value='/css/egovframework/com/cmm/jqueryui.css' />"> -<script src="<c:url value='/js/egovframework/com/cmm/jquery.js' />"></script> -<script src="<c:url value='/js/egovframework/com/cmm/jqueryui.js' />"></script> <script type="text/javascript"> /********************************************************* * 초기화 ******************************************************** */ +$(function() { + fn_egov_init(); +}) function fn_egov_init(){ // 첫 입력란에 포커스.. - document.WebLogForm.searchWrd.focus(); -} -/* ******************************************************** - * 달력 - ******************************************************** */ -function fn_egov_init_date(){ + document.WebLogForm.searchKeyword.focus(); - $("#searchBgnDe").datepicker( - {dateFormat:'yy-mm-dd' - , showOn: 'button' - , buttonImage: '<c:url value='/images/egovframework/com/cmm/icon/bu_icon_carlendar.gif'/>' - , buttonImageOnly: true - - , showMonthAfterYear: true - , showOtherMonths: true - , selectOtherMonths: true - - , changeMonth: true // 월선택 select box 표시 (기본은 false) - , changeYear: true // 년선택 selectbox 표시 (기본은 false) - , showButtonPanel: true // 하단 today, done 버튼기능 추가 표시 (기본은 false) - }); - - - $("#searchEndDe").datepicker( - {dateFormat:'yy-mm-dd' - , showOn: 'button' - , buttonImage: '<c:url value='/images/egovframework/com/cmm/icon/bu_icon_carlendar.gif'/>' - , buttonImageOnly: true - - , showMonthAfterYear: true - , showOtherMonths: true - , selectOtherMonths: true - - , changeMonth: true // 월선택 select box 표시 (기본은 false) - , changeYear: true // 년선택 selectbox 표시 (기본은 false) - , showButtonPanel: true // 하단 today, done 버튼기능 추가 표시 (기본은 false) - }); + // 달력 초기화 + initDatePickerMulti('.bgnde', '.endde', '.date_picker'); } /********************************************************* * 페이징 처리 함수 @@ -91,7 +52,7 @@ var vFrom = document.WebLogForm; if(vFrom.searchEndDe.value != ""){ - if(vFrom.searchBgnDe.value > vFrom.searchEndDe.value){ + if(vFrom.searchBgnPnttm.value > vFrom.searchEndPnttm.value){ alert("<spring:message code="comSymLogWlg.validate.dateCheck" />"); //검색조건의 시작일자가 종료일자보다 늦습니다. 검색조건 날짜를 확인하세요! return; } @@ -108,7 +69,7 @@ ******************************************************** */ function fn_egov_detail_webLog(requstId) { var width = 850; - var height = 330; + var height = 400; var top = 0; var left = 0; var url = "<c:url value='/sym/log/wlg/SelectWebLogDetail.do' />?requstId="+requstId; @@ -116,92 +77,95 @@ var openWindows = window.open(url,name, "width="+width+",height="+height+",top="+top+",left="+left+",toolbar=no,status=no,location=no,scrollbars=yes,menubar=no,resizable=yes"); } </script> -<style> -.board_list tbody td img{align: middle;} -</style> -</head> - -<body onload="fn_egov_init(); fn_egov_init_date();" > <!-- javascript warning tag --> <noscript class="noScriptTitle"><spring:message code="common.noScriptTitle.msg" /></noscript> <form name="WebLogForm" action="<c:url value='/sym/log/wlg/SelectWebLogList.do'/>" method="post" onSubmit="fn_egov_search_webLog(); return false;"> -<div class="board"> - <h1>${pageTitle} <spring:message code="title.list" /></h1> <!-- 검색영역 --> - <!-- 발생일자 선택 --> - <div class="search_box" title="<spring:message code="common.searchCondition.msg" />"> - <ul> - <li> - <spring:message code="comSymLogWlg.webLog.occrrncDe" />&nbsp;:&nbsp;<!-- 발생일자 --> - <input type="text" name="searchBgnDe" id="searchBgnDe" size="15" maxlength="10" value="${searchVO.searchBgnDe}" title="<spring:message code="comSymLogWlg.seachWrd.searchBgnDe" />" > ~ <!-- 검색시작일 --> - <input type="text" name="searchEndDe" id="searchEndDe" size="15" maxlength="10" value="${searchVO.searchEndDe}" title="<spring:message code="comSymLogWlg.seachWrd.searchEndDe" />" >&nbsp;&nbsp;&nbsp;<!-- 검색종료일 --> - </li> - <li><div style="line-height:6px;">&nbsp;&nbsp;&nbsp;&nbsp;</div><div><spring:message code="comSymLogWlg.webLog.url" /> : </div></li><!-- URL--> + <div class="board_header"> + <h3>${pageTitle} <spring:message code="title.list" /></h3><!-- 웹로그 목록 --> + <!-- 검색구역 --> + <div class="search_box" title="<spring:message code="common.searchCondition.msg" />"> + <div class="date_picker mr10 fl"> + <div class="date_pick"> + <input type="text" class="inputText width100 bgnde" id="searchBgnPnttm" name="searchBgnPnttm" value="${searchVO.searchBgnPnttm}" readonly title="시작날짜를 선택하세요" placeholder="시작날짜" autocomplete="off" inputmode="text"> + <label for="searchBgnPnttm"><em class="blind">달력아이콘</em></label> + </div> + <em class="gap">~</em> + <div class="date_pick"> + <input type="text" class="inputText width100 endde" id="searchEndPnttm" name="searchEndPnttm" value="${searchVO.searchEndPnttm}" readonly title="종료날짜를 선택하세요" placeholder="종료날짜" autocomplete="off" inputmode="text"> + <label for="searchEndPnttm"><em class="blind">달력아이콘</em></label> + </div> + </div> + + <select class="select fl" name="searchCondition" title="<spring:message code="title.searchCondition" /> <spring:message code="input.cSelect" />"> + <option value="0" <c:if test="${searchVO.searchCondition == '0'}">selected="selected"</c:if> ><spring:message code="comCopBbs.boardMasterVO.list.bbsNm" /></option><!-- 게시판명 --> + <option value="1" <c:if test="${searchVO.searchCondition == '1'}">selected="selected"</c:if> ><spring:message code="comCopBbs.boardMasterVO.list.bbsIntrcn" /></option><!-- 게시판 소개내용 --> + </select> <!-- 검색키워드 및 조회버튼 --> - <li> - <input class="s_input" name="searchWrd" type="text" size="15" title="<spring:message code="title.search" /> <spring:message code="input.input" />" value='<c:out value="${searchVO.searchWrd}"/>' maxlength="15" > - <input type="submit" class="s_btn" value="<spring:message code="button.inquire" />" title="<spring:message code="title.inquire" /> <spring:message code="input.button" />" /> - </li> - </ul> - </div> + <input class="inputText" name="searchKeyword" type="text" size="35" title="<spring:message code="title.search" /> <spring:message code="input.input" />" value='${searchVO.searchKeyword}' maxlength="155" placeholder="검색어를 입력하세요"> + <button class="btn_board"><spring:message code="button.inquire" /></button> + </div> + </div> <!-- 목록영역 --> - <table class="board_list" summary="<spring:message code="common.summary.list" arguments="${pageTitle}" />"> - <caption>${pageTitle}<spring:message code="title.list" /></caption> - <colgroup> - <col style="width: 5%;"> - <col style="width: ;"> - <col style="width: ;"> - <col style="width: ;"> - <col style="width: 10%;"> - <col style="width: 15%;"> - <col style="width: 10%;"> - </colgroup> - <thead> - <tr> - <th><spring:message code="table.num" /></th><!-- 번호 --> - <th><spring:message code="comSymLogWlg.webLog.requestId" /></th><!-- 요청ID --> - <th><spring:message code="comSymLogWlg.webLog.occrrncDe" /></th><!-- 발생일자 --> - <th><spring:message code="comSymLogWlg.webLog.url" /></th><!-- URL --> - <th><spring:message code="comSymLogWlg.webLog.requester" /></th><!-- 요청자 --> - <th><spring:message code="comSymLogWlg.webLog.requesterIp" /></th><!-- 요청자IP --> - <th><spring:message code="comSymLogWlg.webLog.detail" /></th><!-- 상세보기 --> - </tr> - </thead> - <tbody class="ov"> - <c:if test="${fn:length(resultList) == 0}"> - <tr> - <td colspan="7"><spring:message code="common.nodata.msg" /></td> - </tr> - </c:if> - <c:forEach items="${resultList}" var="result" varStatus="status"> - <tr> - <td><c:out value="${(searchVO.pageIndex-1) * searchVO.pageSize + status.count}"/></td> - <td><c:out value='${result.requstId}'/></td> - <td><c:out value='${fn:substring(result.occrrncDe,0,19)}'/></td> - <td><c:out value='${result.url}'/></td> - <td><c:out value='${result.rqsterNm}'/></td> - <td><c:out value='${result.rqesterIp}'/></td> - <td> - <img src="<c:url value='/images/egovframework/com/cmm/btn/btn_search.gif'/>" class="cursor" onclick="fn_egov_detail_webLog('<c:out value="${result.requstId}"/>'); return false;" alt="<spring:message code="title.detail" />" title="<spring:message code="title.detail" />"> - </td> - </tr> - </c:forEach> - </tbody> - </table> + <div class="board_body"> + <div class="board_infomation"> + <p>총 : <span>${paginationInfo.totalRecordCount}</span>건, 쪽번호 : <span>${paginationInfo.currentPageNo }</span> / <span>${paginationInfo.totalPageCount }</span></p> + </div> + <table class="table_list" summary="<spring:message code="common.summary.list" arguments="${pageTitle}" />"> + <caption>${pageTitle}<spring:message code="title.list" /></caption> + <colgroup> + <col style="width: 5%;"> + <col style="width: 200px;"> + <col style="width: 200px;"> + <col style="width: ;"> + <col style="width: 10%;"> + <col style="width: 15%;"> + <col style="width: 10%;"> + </colgroup> + <thead> + <tr> + <th><spring:message code="table.num" /></th><!-- 번호 --> + <th><spring:message code="comSymLogWlg.webLog.requestId" /></th><!-- 요청ID --> + <th><spring:message code="comSymLogWlg.webLog.occrrncDe" /></th><!-- 발생일자 --> + <th><spring:message code="comSymLogWlg.webLog.url" /></th><!-- URL --> + <th><spring:message code="comSymLogWlg.webLog.requester" /></th><!-- 요청자 --> + <th><spring:message code="comSymLogWlg.webLog.requesterIp" /></th><!-- 요청자IP --> + <th><spring:message code="comSymLogWlg.webLog.detail" /></th><!-- 상세보기 --> + </tr> + </thead> + <tbody> + <c:if test="${fn:length(resultList) == 0}"> + <tr> + <td colspan="7"><spring:message code="common.nodata.msg" /></td> + </tr> + </c:if> + <c:forEach items="${resultList}" var="result" varStatus="status"> + <tr> + <td><c:out value="${(searchVO.pageIndex-1) * searchVO.pageSize + status.count}"/></td> + <td><c:out value='${result.requstId}'/></td> + <td><c:out value='${fn:substring(result.occrrncDe,0,19)}'/></td> + <td class="alignL"><c:out value='${result.url}'/></td> + <td><c:out value='${result.rqsterNm}'/></td> + <td><c:out value='${result.rqesterIp}'/></td> + <td> + <img src="<c:url value='/images/egovframework/com/cmm/btn/btn_search.gif'/>" style="cursor: pointer;" onclick="fn_egov_detail_webLog('<c:out value="${result.requstId}"/>'); return false;" alt="<spring:message code="title.detail" />" title="<spring:message code="title.detail" />"> + </td> + </tr> + </c:forEach> + </tbody> + </table> + </div> <!-- paging navigation --> - <div class="pagination"> - <ul> - <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_egov_select_linkPage"/> - </ul> + <div class="board_footer"> + <!-- paging navigation --> + <div class="page" role="group" aria-label="..."> + <ul> + <ui:pagination paginationInfo="${paginationInfo}" type="admin" jsFunction="fn_egov_select_linkPage" /> + </ul> + </div> </div> - -</div> - -<input name="pageIndex" type="hidden" value="<c:out value='${searchVO.pageIndex}'/>"> + <input name="pageIndex" type="hidden" value="<c:out value='${searchVO.pageIndex}'/>"> </form> - -</body> -</html> \ No newline at end of file Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/sym/log/wlg/EgovWebLogDetail.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/sym/log/wlg/EgovWebLogDetail.jsp (revision 97) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/sym/log/wlg/EgovWebLogDetail.jsp (revision 98) @@ -28,59 +28,68 @@ <head> <title>${pageTitle} <spring:message code="title.detail" /></title> <meta http-equiv="content-type" content="text/html; charset=utf-8"> -<link type="text/css" rel="stylesheet" href="<c:url value='/css/egovframework/com/com.css' />"> -<link type="text/css" rel="stylesheet" href="<c:url value='/css/egovframework/com/popup_com.css' />"> +<link rel="stylesheet" type="text/css" href="<c:url value='/resource/font-awesome/css/font-awesome.css'/>"> +<link rel="stylesheet" type="text/css" href="<c:url value='/css/admin/style.css'/>" /> +<link rel="stylesheet" type="text/css" href="<c:url value='/css/admin/board.css'/>" /> +<link rel="stylesheet" type="text/css" href="<c:url value='/css/admin/admin.css'/>" /> +<link rel="stylesheet" type="text/css" href="<c:url value='/css/admin/popup.css'/>" /> <script type="text/javascript"> </script> </head> <body> -<div class="popup"> +<div class="popup_contents"> <!-- 타이틀 --> - <h1>${pageTitle} <spring:message code="title.detail" /></h1> - + <div class="popup_header"> + <h3 class="fl popup_title"> + ${pageTitle } + </h3> + </div> <!-- 상세조회 --> - <table class="popwTable"> - <caption>${pageTitle} <spring:message code="title.detail" /></caption> - <colgroup> - <col style="width: 20%;"> - <col style="width: ;"> - </colgroup> - <tbody> - <!-- 요청ID --> - <tr> - <th><spring:message code="comSymLogWlg.webLog.requestId" /></th> - <td class="left"><c:out value="${result.requstId}"/></td> - </tr> - <!-- 발생일자 --> - <tr> - <th><spring:message code="comSymLogWlg.webLog.occrrncDe" /></th> - <td class="left"><c:out value="${fn:substring(result.occrrncDe,0,19)}"/></td> - </tr> - <!-- URL --> - <tr> - <th><spring:message code="comSymLogWlg.webLog.url" /></th> - <td class="left"><c:out value="${result.url}"/></td> - </tr> - <!-- 요청자 --> - <tr> - <th><spring:message code="comSymLogWlg.webLog.requester" /></th> - <td class="left"><c:out value="${result.rqsterNm}"/></td> - </tr> - <!-- 요청자IP --> - <tr> - <th><spring:message code="comSymLogWlg.webLog.requesterIp" /></th> - <td class="left"><c:out value="${result.rqesterIp}"/></td> - </tr> - - </tbody> - </table> - <!-- 닫기 버튼 --> - <div class="btn"> - <button class="btn_style3" onclick="window.close()" title="<spring:message code="button.close" />"><spring:message code="button.close" /></button><!-- 닫기 --> - <div style="clear:both;"></div> + <div class="popup_body"> + <table class="table_write"> + <caption>${pageTitle} <spring:message code="title.detail" /></caption> + <colgroup> + <col style="width: 20%;"> + <col style="width: ;"> + </colgroup> + <tbody> + <!-- 요청ID --> + <tr> + <th scope="row"><spring:message code="comSymLogWlg.webLog.requestId" /></th> + <td><c:out value="${result.requstId}"/></td> + </tr> + <!-- 발생일자 --> + <tr> + <th scope="row"><spring:message code="comSymLogWlg.webLog.occrrncDe" /></th> + <td><c:out value="${fn:substring(result.occrrncDe,0,19)}"/></td> + </tr> + <!-- URL --> + <tr> + <th scope="row"><spring:message code="comSymLogWlg.webLog.url" /></th> + <td><c:out value="${result.url}"/></td> + </tr> + <!-- 요청자 --> + <tr> + <th scope="row"><spring:message code="comSymLogWlg.webLog.requester" /></th> + <td><c:out value="${result.rqsterNm}"/></td> + </tr> + <!-- 요청자IP --> + <tr> + <th scope="row"><spring:message code="comSymLogWlg.webLog.requesterIp" /></th> + <td><c:out value="${result.rqesterIp}"/></td> + </tr> + </tbody> + </table> </div> - + <!-- 하단 버튼 start --> + <div class="popup_footer"> + <div class="bottom_wrap fr"> + <button type="button" class="btn_s" onclick="window.close()" style="margin-left: 3px;"> + <spring:message code="button.close" /> + </button> + </div> + </div> </div> </body> </html>
Add a comment
List