somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of

Browse Source 
http://docs.nculture.org:30000/nculture/iams.nlib

Conflicts:
	src/main/webapp/WEB-INF/tiles/inc/header.jsp
	src/main/webapp/WEB-INF/tiles/tiles-layout.jsp
This commit is contained in:
KNKIM 2021-10-19 16:18:15 +09:00
commit dd7ad03042
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/webapp/WEB-INF/tiles/inc/header.jsp
View File

@ -13,12 +13,12 @@ String councilNm = (String)session.getAttribute("councilNm");
<h2 class="blind">헤더영역</h2>
<div class="inner">
<sec:authorize access="isAuthenticated()">
<h1><a href="javascript:void(0)" onclick="javascript:location.href='<%=session.getAttribute("councilHomeUrl") %>';"><img src="/images/img/img-logo.png"><span>소장자료관 (<%=session.getAttribute("councilHomeUrl") %>)</span></a></h1>
</sec:authorize>
<sec:authorize access="not isAuthenticated()">
<sec:authorize access="isAuthenticated()">
<h1><a href="javascript:void(0)" onclick="javascript:location.href='<%=session.getAttribute("councilHomeUrl") %>';"><img src="/images/img/img-logo.png"><span>${councilNm} 소장자료관 (<%=session.getAttribute("councilHomeUrl") %>)</span></a></h1>
</sec:authorize>
<sec:authorize access="not isAuthenticated()">
<h1><a href="javascript:void(0)" onclick="javascript:location.href='${pageContext.request.contextPath}/';"><img src="/images/img/img-logo.png"><span>${councilNm} 소장자료관</span></a></h1>
</sec:authorize>
</sec:authorize>
<div class="search-wrap">
<h2 class="blind">검색</h2>
@ -66,3 +66,5 @@ String councilNm = (String)session.getAttribute("councilNm");
</ul>
</div>
</div>

2
src/main/webapp/WEB-INF/tiles/tiles-layout.jsp
View File

@ -30,12 +30,10 @@
<title>소장자료관</title>
<script type="text/javascript">
// 제목 설정
function fn_setPageTitle(title) {
document.title = "소장자료관 - " + title;
}
</script>
</head>