tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
myname 2024-01-19 16:27:47 +09:00
commit a6f6ee952d
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
View File

@ -56,6 +56,7 @@
.popup_cont .tb_type01.tb_write {margin:0 0 20px 0;} .popup_cont .tb_type01.tb_write {margin:0 0 20px 0;}
.popup_cont .popup_cont.upload_area {margin:-20px 0 0 0;} .popup_cont .popup_cont.upload_area {margin:-20px 0 0 0;}
.popup_cont .pop_btn_wrap.btn_layout01 {margin:-20px 0 0 0;} .popup_cont .pop_btn_wrap.btn_layout01 {margin:-20px 0 0 0;}
.popup_cont .pop_btn_wrap .qr_btn{margin: 40px 0 0 0;}
</style> </style>
<script type="text/javaScript" language="javascript"> <script type="text/javaScript" language="javascript">

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp
View File

@ -750,7 +750,7 @@
<div class="tb_type02 tb_type02_write"> <div class="tb_type02 tb_type02_write">
<table class="addClassRow" rowLimit="1" > <table class="addClassRow" rowLimit="1" >
<colgroup> <colgroup>
<col style="width: 13%;"> <col style="width: 14%;">
<col style="width: 25%;"> <col style="width: 25%;">
<col style="width: auto;"> <col style="width: auto;">
<col style="width: 15%;"> <col style="width: 15%;">

6
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp
View File

@ -272,7 +272,7 @@ $(document).ready(function(){
<div class="popup_cont"> <div class="popup_cont">
<div class="cont_body"> <div class="cont_body">
<div class="pop_tb_type02"> <div class="pop_tb_type02 qr_wrap">
<!-- <!--
<table> <table>
<caption>교육일, 차시, 구분, 대상, 배정강사, 인원, 설문완료 여부 등의 정보제공</caption> <caption>교육일, 차시, 구분, 대상, 배정강사, 인원, 설문완료 여부 등의 정보제공</caption>
@ -474,7 +474,7 @@ $(document).ready(function(){
}); });
</script> </script>
<div id="qrcode"></div> <div id="qrcode" class="qr_img"></div>
<br/> <br/>
@ -485,7 +485,7 @@ $(document).ready(function(){
<div class="pop_btn_wrap btn_layout01"> <div class="pop_btn_wrap btn_layout01">
<div class="btn_left"> <div class="btn_left">
</div> </div>
<div class="btn_center"> <div class="btn_center qr_btn">
<!-- <button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button> --> <!-- <button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button> -->
<button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button> <button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button>

6
src/main/webapp/visitEdu/usr/publish/css/content.css
View File

@ -778,7 +778,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa
.mypage_wrap .mypage .wrap{height: 178px; border-radius: 10px; background-color: #eaedf1;} .mypage_wrap .mypage .wrap{height: 178px; border-radius: 10px; background-color: #eaedf1;}
.mypage_wrap .mypage .wrap .title{border-radius: 10px 10px 0 0; background-color: #3a72db; text-align: center; font-size: 20px; color: #fff; font-weight: 500; line-height: 53px;} .mypage_wrap .mypage .wrap .title{border-radius: 10px 10px 0 0; background-color: #3a72db; text-align: center; font-size: 20px; color: #fff; font-weight: 500; line-height: 53px;}
.mypage_wrap .mypage .wrap .title p img{margin: 0 0 4px 0;} .mypage_wrap .mypage .wrap .title p img{margin: 0 0 4px 0;}
.mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 68px); height: calc(100% - 116px); padding: 7px 7px 10px 7px; margin: 23px auto 0 auto; border-radius: 10px; background-color: #fff; font-size: 18px; font-weight: 400; color: #666; text-align: center; line-height: 1.4;} .mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 68px); height: calc(100% - 116px); padding: 7px 7px 10px 17px; margin: 23px auto 0 auto; border-radius: 10px; background-color: #fff; font-size: 18px; font-weight: 400; color: #666; text-align: center; line-height: 1.4;}
.mypage_wrap .mypage .wrap .inner_text a i{display: inline-block; width: 4px; height: 4px; background-color: #3a72db; margin: 0 5px 4px 0; border-radius: 100%;} .mypage_wrap .mypage .wrap .inner_text a i{display: inline-block; width: 4px; height: 4px; background-color: #3a72db; margin: 0 5px 4px 0; border-radius: 100%;}
.mypage_wrap .mypage .wrap .inner_text a p span{margin: 0 0 0 20px; font-size: 22px; font-weight: 500; color: #222;} .mypage_wrap .mypage .wrap .inner_text a p span{margin: 0 0 0 20px; font-size: 22px; font-weight: 500; color: #222;}
.mypage_wrap .mypage .wrap .inner_text a:hover *{color: #e95504;} .mypage_wrap .mypage .wrap .inner_text a:hover *{color: #e95504;}
@ -876,7 +876,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa
/*마이페이지 추가*/ /*마이페이지 추가*/
.mypage_wrap .mypage{margin: 0 0 20px 0;} .mypage_wrap .mypage{margin: 0 0 20px 0;}
.mypage_wrap .mypage li{width: calc((100% - 45px)/2); margin: 0 0 40px 0;} .mypage_wrap .mypage li{width: calc((100% - 45px)/2); margin: 0 0 40px 0;}
.mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 67px); height: calc(100% - 116px); padding: 7px 7px 11px 7px; margin: 21px auto 0 auto;} .mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 67px); height: calc(100% - 116px); padding: 7px 7px 11px 17px; margin: 21px auto 0 auto;}
/*.mypage_wrap .mypage_table .right{margin: 0 40px 0 0;}*/ /*.mypage_wrap .mypage_table .right{margin: 0 40px 0 0;}*/
.tb_tit01{display: block;} .tb_tit01{display: block;}
@ -1137,7 +1137,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa
/*마이페이지 추가*/ /*마이페이지 추가*/
/*.mypage_wrap .mypage{margin: 0 0 -40px 0;}*/ /*.mypage_wrap .mypage{margin: 0 0 -40px 0;}*/
.mypage_wrap .mypage li{width: calc((100% - 26px)/2); margin: 0 0 25px 0;} .mypage_wrap .mypage li{width: calc((100% - 26px)/2); margin: 0 0 25px 0;}
.mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 63px); height: calc(100% - 113px); padding: 9px 7px 8px 7px; margin: 21px auto 0 auto;} .mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 63px); height: calc(100% - 113px); padding: 9px 7px 8px 17px; margin: 21px auto 0 auto;}
.time_layer.on{position:fixed; width:100%; top:calc(100% - 143px); left:0; border:0;} .time_layer.on{position:fixed; width:100%; top:calc(100% - 143px); left:0; border:0;}
} }

5
src/main/webapp/visitEdu/usr/publish/css/popup.css
View File

@ -130,6 +130,11 @@
/*성인 > 완료상세 > 교육완료 내용 > 강사 참석 확인서 업로드 팝업 > 확인, 취소 버튼 여백 수정*/ /*성인 > 완료상세 > 교육완료 내용 > 강사 참석 확인서 업로드 팝업 > 확인, 취소 버튼 여백 수정*/
.upload_pop .upload_btn{margin: 20px 0 0 0;} .upload_pop .upload_btn{margin: 20px 0 0 0;}
/*청소년, 성인 > 완료상세 > 설문QR 레이어팝업 > QR코드 가운데 정렬 수정 + 스크롤 없앰*/
.popup_cont .cont_body .qr_wrap{margin-bottom: 0px; overflow-y: hidden;}
.popup_cont .cont_body .qr_wrap .qr_img img{margin: 0 auto; /*display: block;*/}
@media all and (max-width: 767px){ @media all and (max-width: 767px){
.popup_cont {padding: 10px;} .popup_cont {padding: 10px;}
.popup_wrap.popType02 {width: 360px;} .popup_wrap.popType02 {width: 360px;}