Merge branch 'master' into kakaoFT
@9e8b82736ffb65a86c5925f4ba502770a4abd3ce
--- src/main/webapp/WEB-INF/jsp/uss/ion/custom/MsgCustomInfo.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/ion/custom/MsgCustomInfo.jsp
... | ... | @@ -291,10 +291,10 @@ |
| 291 | 291 |
</th> |
| 292 | 292 |
<td> |
| 293 | 293 |
<input type="checkbox" checked="checked" disabled> <label for="">내보관함</label> |
| 294 |
- <input id="radio5" type="radio" name="customProvision" disabled="disabled" <c:if test="${mjonMsgCustomInfo.customProvision eq '1'}">checked="checked"</c:if>>
|
|
| 294 |
+ <input id="radio5" type="radio" name="customProvision" disabled="disabled" <c:if test="${mjonMsgCustomInfo.customProvision eq '01'}">checked="checked"</c:if>>
|
|
| 295 | 295 |
<label for="radio5">카카오톡</label> |
| 296 | 296 |
|
| 297 |
- <input id="radio6" type="radio" name="customProvision" disabled="disabled" <c:if test="${mjonMsgCustomInfo.customProvision eq '2'}">checked="checked"</c:if>>
|
|
| 297 |
+ <input id="radio6" type="radio" name="customProvision" disabled="disabled" <c:if test="${mjonMsgCustomInfo.customProvision eq '02'}">checked="checked"</c:if>>
|
|
| 298 | 298 |
<label for="radio6">이메일</label> |
| 299 | 299 |
</td> |
| 300 | 300 |
</tr> |
... | ... | @@ -474,4 +474,4 @@ |
| 474 | 474 |
</form> |
| 475 | 475 |
|
| 476 | 476 |
</body> |
| 477 |
-</html> |
|
| 477 |
+</html>(No newline at end of file) |
--- src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
... | ... | @@ -1603,7 +1603,7 @@ |
| 1603 | 1603 |
</div> |
| 1604 | 1604 |
|
| 1605 | 1605 |
|
| 1606 |
-<div class="main_cont5 keyword_wrap"> |
|
| 1606 |
+<!--<div class="main_cont5 keyword_wrap"> |
|
| 1607 | 1607 |
<div class="inner"> |
| 1608 | 1608 |
<p class="tit_text">이런 키워드는 어때요?</p> |
| 1609 | 1609 |
<ul class="link_box"> |
... | ... | @@ -1612,7 +1612,7 @@ |
| 1612 | 1612 |
</c:forEach> |
| 1613 | 1613 |
</ul> |
| 1614 | 1614 |
</div> |
| 1615 |
-</div> |
|
| 1615 |
+</div>--> |
|
| 1616 | 1616 |
|
| 1617 | 1617 |
|
| 1618 | 1618 |
<div class="main_cont4 adv_wrap"> |
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
... | ... | @@ -3140,7 +3140,7 @@ |
| 3140 | 3140 |
var preAdvDenyStr = '<p class="deny_receipt">후보자전화번호 ' + callFrom + '<br>불법수집정보 신고번호 118번<br>무료거부 0808800858</p>'; |
| 3141 | 3141 |
|
| 3142 | 3142 |
//광고 및 무료수신거부 텍스트 추가 |
| 3143 |
- if ($('input[name=send_adYn]:checked').val() == 'Y'){
|
|
| 3143 |
+ if ($("#send_adYnY").val() == 'Y'){
|
|
| 3144 | 3144 |
|
| 3145 | 3145 |
//문자내용 광고문자 삭제하기 |
| 3146 | 3146 |
$(".ad_txt").remove();
|
... | ... | @@ -3886,11 +3886,13 @@ |
| 3886 | 3886 |
</colgroup> |
| 3887 | 3887 |
<tbody> |
| 3888 | 3888 |
<tr> |
| 3889 |
- <th scope="row">문자분류</th> |
|
| 3890 |
- <td class="send_cf"> |
|
| 3889 |
+ <!-- <th scope="row">문자분류</th> |
|
| 3890 |
+ <td class="send_cf"> |
|
| 3891 | 3891 |
<input id="send_adYnY" type="radio" name="send_adYn" value="Y" checked="checked"> |
| 3892 | 3892 |
<label for="send_adYnY">선거</label> |
| 3893 |
- </td> |
|
| 3893 |
+ </td> --> |
|
| 3894 |
+ <input type="hidden" id="send_adYnY" name="send_adYn" value="Y"> |
|
| 3895 |
+ <td colspan="2" class="ele_te">※ 자동동보문자를 <span>한번에 20,000건 이상 보내실 경우에는 꼭 고객센터(010-8432-9333)</span>로 연락주시어 발송 요청 후 진행해 주시길 바랍니다.</td> |
|
| 3894 | 3896 |
</tr> |
| 3895 | 3897 |
<tr> |
| 3896 | 3898 |
<th scope="row">발신번호</th> |
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp
... | ... | @@ -869,7 +869,7 @@ |
| 869 | 869 |
} |
| 870 | 870 |
|
| 871 | 871 |
var loginVO = '${LoginVO}';
|
| 872 |
- var adverYn = $("input[name='send_adYn']:checked").val();
|
|
| 872 |
+ var adverYn = $("#send_adYnY").val();
|
|
| 873 | 873 |
var spamStatus = false; |
| 874 | 874 |
var exceptSpamYn = $("#exceptSpamYn").val(); //금지어 필터링 예외 여부 - N 일 경우만 스팸 검사를 진행
|
| 875 | 875 |
|
--- src/main/webapp/publish/css/content.css
+++ src/main/webapp/publish/css/content.css
... | ... | @@ -2004,8 +2004,9 @@ |
| 2004 | 2004 |
.api_guide_cont .api_admin .input_box input::placeholder {font-size:14px; color:#ababab;}
|
| 2005 | 2005 |
.api_guide_cont .api_admin .btnType.btnType2 {float:right; padding:0 20px 0 20px; font-size:16px; letter-spacing: -1px;}
|
| 2006 | 2006 |
|
| 2007 |
- |
|
| 2008 |
- |
|
| 2007 |
+/*선거 문자전송 > 문구추가*/ |
|
| 2008 |
+.tType1 tbody tr .ele_te{font-size: 14px; padding: 15px 0;}
|
|
| 2009 |
+.tType1 tbody tr .ele_te span{font-weight: 400;}
|
|
| 2009 | 2010 |
|
| 2010 | 2011 |
@keyframes rotate-loading {
|
| 2011 | 2012 |
0% {transform:rotate(0)}
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?