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

Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib

Browse Source
This commit is contained in:
KNKIM 2021-12-01 17:39:18 +09:00
commit 7c7ea638db
4 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp
View File

@ -44,18 +44,30 @@ $(document).ready(function() {
$("[id^='emailSuc']").css("display","inline-block");
$("[id^='service-chk2-']").change(function(){
$(this).val();
if($("#service-chk2-1").prop("checked") && $("#service-chk2-2").prop("checked"))
{
$("#service-chk2").prop("checked",true);
}else{
$("#service-chk2").prop("checked",false);
}
});
<%
//새비밀번호,새비밀번호확인이 일치하는지 확인
%>
$("#newPassword,#newPasswordConfirm").on("propertychange change keyup paste", function() {
$("#passwdMatch").css("display","");
if($("#newPassword").val() == $("#newPasswordConfirm").val() && $("#newPassword").length > 0)
if($("#newPassword").val() == $("#newPasswordConfirm").val())
{
$("#passwdMatch").text("일치합니다.");
$("#passwdMatch").css("display","");
$("#passwdNotMatch").css("display","none");
}else{
$("#passwdMatch").text("일치하지 않습니다.");
$("#passwdMatch").css("display","none");
$("#passwdNotMatch").css("display","");
}
if($("#newPassword").val().length <= 0)
{
$("#passwdMatch").css("display","none");
$("#passwdNotMatch").css("display","none");
}
});
<%
@ -757,8 +769,9 @@ function snsUnlink(snsId){
<p><label for="newPassword" style="display:none;">새 비밀번호</label><input class="passwd" type="password" id="newPassword" name="newPassword" placeholder="새 비밀번호" required/></p>
<p><label for="newPasswordConfirm" style="display:none;">새 비밀번호 확인</label><input class="passwd" type="password" id="newPasswordConfirm" name="newPasswordConfirm" placeholder="새 비밀번호 확인" required/></p>
<p>
<span id="passwdMatch" class="suc" >일치합니다.</span>
<span id="passwdMatch-chk" class="chk-suc" ></span>
<span id="passwdMatch" class="suc" style="display:none;">일치합니다.</span>
<span id="passwdNotMatch" class="fail" style="display:none;">일치하지 않습니다.</span>
<span id="passwdMatch-chk" class="chk-suc" style="display:none;" ></span>
</p>
<p class="text">9자리 이상, 숫자/문자/특수문자를 혼합하여 입력</p>
</div>

5
src/main/webapp/css/default.css
View File

@ -1790,9 +1790,12 @@ transform: rotate(45deg);
.pop-change .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;}
.pop-change .Title h3 {font-size:24px;line-height:30px;margin-top:15px;color:#fff;font-weight: 300;}
.pop-change .Title p {font-size:16px;line-height:16px;color:#fff;}
.pop-change .inner .change p {margin-bottom:5px;}
.pop-change .inner .change p {margin-bottom:5px;position:relative;}
.pop-change .inner .change p input {border:1px solid #ddd;width:90%;padding:0px 5%;height:36px;line-height:36px;border-radius: 3px;}
.pop-change .inner .change p.text {font-size:12px;text-align: left;margin:10px 0px 30px;}
.pop-change .inner .change p #passwdMatch {width:auto;text-align:left;font-size:12px;display: inline-block;margin:0px 0px 0px 0px;vertical-align: middle;color:#3f8f4a;}
.pop-change .inner .change p #passwdMatch-chk {display: inline-block;width:15px;height:15px;position: absolute;top:2px;right:0px;background: url(/images/icon/icon-checked-tab.png) no-repeat center;background-size: 15px;z-index: 99;}
.pop-change .inner .change p #passwdMatch.fail {color:red;}
.pop-change .inner .btn {width:70%;padding:20px 15% 40px;line-height: normal}
.pop-change .inner .btn-box .btn {width:auto;padding:10px 25px;}
.pop-change .inner .btn-box .btn.btn-color {width:170px;}

13
src/main/webapp/js/default.js
View File

@ -19,7 +19,7 @@ $(document).ready(function(){
});
//접근성
$('.location-box .loc li').append('<span class="blind">다음</span>');
$('.location-box .loc li').append('<span class="ir">다음</span>');
$('.location-box .loc li.on *').remove('');
$('.location .inner .row-top .arr img').attr('alt','');
@ -198,16 +198,16 @@ $(document).ready(function(){
});
// 소장자료 디테일 목차정보
$('.down-btn').append('<span class="blind">펼치기</span>');
$('.down-btn').append('<span class="ir">펼치기</span>');
$('.down-btn').click(function(){
if($('.down-btn').hasClass('on') === false) {
$(this).addClass('on');
$('.h-down').css('height','auto');
$('.down-btn .blind').text('접기');
$('.down-btn .ir').text('접기');
} else {
$(this).removeClass('on');
$('.h-down').css('height','');
$('.down-btn .blind').text('펼치기');
$('.down-btn .ir').text('펼치기');
}
});
@ -557,7 +557,7 @@ $(document).ready(function() {
//하위 조건이 있을 경우만 버튼 생성
$(this)
.parent(".check")
.append('<button type="button" class="tab-name">' + tabLabel + "</button>");
.append('<button type="button" class="tab-name">' + tabLabel + "<span class='ir'>펼치기</span></button>");
}
$(this)
@ -569,11 +569,14 @@ $(document).ready(function() {
if (!$("body").hasClass("pop-filter")) {
if ($(this).parents(".depth-1").hasClass("on")) {
$(this).parents(".depth-1").removeClass("on");
$('.tab-name .ir').text('펼치기');
} else {
$(this).parents(".depth-1").addClass("on");
$('.tab-name .ir').text('접기');
}
} else {
$(this).parents(".depth-1").addClass("on");
$('.tab-name .ir').text('접기');
}
// 줄구분용 data 추가