DBNT
/
GGWEB
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: DBNT:0b3f52f25fd7411c4afa80110c92d10fe2cc110d
Branches Tags
DBNT:master
..
compare: DBNT:7618895297e74a78360b53c5d22e9fb3330355d4
Branches Tags
DBNT:master

2 Commits
0b3f52f25f ... 7618895297

Author SHA1 Message Date
Hyung Geun 7618895297 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
 2022-03-02 14:59:02 +09:00
Hyung Geun 72f81d95ce 아이콘 변경 _220302 2022-03-02 14:37:58 +09:00
4 changed files with 9 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
src/main/webapp/WEB-INF/jsp/admin/request.jsp
View File

@ -46,7 +46,7 @@
<table class="list-table"> <table class="list-table">
<thead> <thead>
<tr><th colspan="6">지도사용 요청</th></tr> <tr><th colspan="6" >지도사용 요청</th></tr>
<tr> <tr>
<th>번호</th> <th>번호</th>
<th>작업명</th> <th>작업명</th>

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

@ -27,7 +27,7 @@
</div> </div>
<sec:authorize access="hasAnyRole('ROLE_ADMIN','ROLE_USER')"> <sec:authorize access="hasAnyRole('ROLE_ADMIN','ROLE_USER')">
<div class="header_info"> <div class="header_info">
<a id="logoutLink" href="#">로그아웃</a> <a id="logoutLink" href="#"><i class="bi bi-box-arrow-right"></i>로그아웃</a>
</div> </div>
</sec:authorize> </sec:authorize>
</header> </header>

12
src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp
View File

@ -12,9 +12,9 @@
<div class="header_menu"> <div class="header_menu">
<ul> <ul>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/request')?"thisOn":""}" onclick="location.href='/map/request'"> <li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/request')?"thisOn":""}" onclick="location.href='/map/request'">
<img src="/images/icon/icon_map_on.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li> <i class="bi bi-map fs-5" ></i> &nbsp;지도사용 요청</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/userInfo')?"thisOn":""}" onclick="location.href='/map/userInfo'"> <li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/userInfo')?"thisOn":""}" onclick="location.href='/map/userInfo'">
<img src="/images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원정보 수정</li> <i class="bi bi-person-circle"></i> &nbsp;회원정보 수정</li>
</ul> </ul>
</div> </div>
</nav> </nav>
@ -26,13 +26,13 @@
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/dashBoard')?"thisOn":""}" onclick="location.href='/admin/dashBoard'"> <li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/dashBoard')?"thisOn":""}" onclick="location.href='/admin/dashBoard'">
<i class="bi bi-grid fs-5"></i> &nbsp;대시보드</li> <i class="bi bi-grid fs-5"></i> &nbsp;대시보드</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/request')?"thisOn":""}" onclick="location.href='/admin/request'"> <li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/request')?"thisOn":""}" onclick="location.href='/admin/request'">
<img src="/images/icon/icon_map_on.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li> <i class="bi bi-map fs-5" ></i>&nbsp; 지도사용 요청</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/history')?"thisOn":""}" onclick="location.href='/admin/history'"> <li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/history')?"thisOn":""}" onclick="location.href='/admin/history'">
<img src="/images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력</li> <i class="bi bi-signpost-2 fs-5"></i></i>&nbsp; 지도사용 이력</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/fieldData')?"thisOn":""}" onclick="location.href='/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=1'"> <li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/fieldData')?"thisOn":""}" onclick="location.href='/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=1'">
<i class="bi bi-flag fs-5"></i> &nbsp;현장수집 데이터</li> <i class="bi bi-flag fs-5"></i>&nbsp; 현장수집 데이터</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/userInfo')?"thisOn":""}" onclick="location.href='/admin/userInfo?auth=99'"> <li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/userInfo')?"thisOn":""}" onclick="location.href='/admin/userInfo?auth=99'">
<img src="/images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리</li> <i class="bi bi-person-circle"></i>&nbsp;&nbsp; 회원 관리</li>
</ul> </ul>
</div> </div>
</nav> </nav>

2
src/main/webapp/css/style.css
View File

@ -66,7 +66,7 @@ a {
.header_info>a { .header_info>a {
color: #fff; color: #fff;
font-size: 14px; font-size: 17px;
} }
.section { .section {