Merge branch 'master' into kakaoFT

src/main/webapp/WEB-INF/jsp/uss/ion/custom/MsgCustomInfo.jsp

@@ -291,10 +291,10 @@
 						</th>
 						<td>
 							<input type="checkbox" checked="checked" disabled> <label for="">내보관함</label>
-							<input id="radio5" type="radio" name="customProvision" disabled="disabled" <c:if test="${mjonMsgCustomInfo.customProvision eq '1'}">checked="checked"</c:if>>
+							<input id="radio5" type="radio" name="customProvision" disabled="disabled" <c:if test="${mjonMsgCustomInfo.customProvision eq '01'}">checked="checked"</c:if>>
 							<label for="radio5">카카오톡</label>
 							
-							<input id="radio6" type="radio" name="customProvision" disabled="disabled" <c:if test="${mjonMsgCustomInfo.customProvision eq '2'}">checked="checked"</c:if>>
+							<input id="radio6" type="radio" name="customProvision" disabled="disabled" <c:if test="${mjonMsgCustomInfo.customProvision eq '02'}">checked="checked"</c:if>>
 							<label for="radio6">이메일</label>
 						</td>
 					</tr>
@@ -474,4 +474,4 @@
 </form>
 
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp

@@ -1603,7 +1603,7 @@ function fn_click_banner_add_stat(bannerMenuCode){
 </div>
 
  
-<div class="main_cont5 keyword_wrap">
+<!--<div class="main_cont5 keyword_wrap">
 	<div class="inner">
 		<p class="tit_text">이런 키워드는 어때요?</p>
 		<ul class="link_box">
@@ -1612,7 +1612,7 @@ function fn_click_banner_add_stat(bannerMenuCode){
        	</c:forEach>
 		</ul>
 	</div>
-</div>
+</div>-->
 
  
     <div class="main_cont4 adv_wrap">

src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp

@@ -3140,7 +3140,7 @@ function advMsgInsert(){
 	var preAdvDenyStr = '<p class="deny_receipt">후보자전화번호 ' + callFrom + '<br>불법수집정보 신고번호 118번<br>무료거부 0808800858</p>';
 	
 	//광고 및 무료수신거부 텍스트 추가
-	if ($('input[name=send_adYn]:checked').val() == 'Y'){
+	if ($("#send_adYnY").val() == 'Y'){
 
 		//문자내용 광고문자 삭제하기
 		$(".ad_txt").remove();
@@ -3886,11 +3886,13 @@ function getMjMsgSentListAll(pageNo) {
 	                </colgroup>
 	                <tbody>
 	                    <tr>
-	                        <th scope="row">문자분류</th>
+							<!-- <th scope="row">문자분류</th>
-	                        <td class="send_cf">
+							<td class="send_cf">
 	                            <input id="send_adYnY" type="radio" name="send_adYn" value="Y" checked="checked">
 	                            <label for="send_adYnY">선거</label>
-	                        </td>
+	                        </td> -->
+	                        <input type="hidden" id="send_adYnY" name="send_adYn" value="Y">
+	                        <td colspan="2" class="ele_te">※ 자동동보문자를 <span>한번에 20,000건 이상 보내실 경우에는 꼭 고객센터(010-8432-9333)</span>로 연락주시어 발송 요청 후 진행해 주시길 바랍니다.</td>
 	                    </tr>
 	                    <tr>
                             <th scope="row">발신번호</th>

src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp

@@ -869,7 +869,7 @@ function fn_sendMsgData(){
 	}	
 	
 	var loginVO = '${LoginVO}';
-	var adverYn = $("input[name='send_adYn']:checked").val();
+	var adverYn = $("#send_adYnY").val();
 	var spamStatus = false;
 	var exceptSpamYn = $("#exceptSpamYn").val(); //금지어 필터링 예외 여부 - N 일 경우만 스팸 검사를 진행
 	

src/main/webapp/publish/css/content.css

@@ -2004,8 +2004,9 @@ button.check_validity:hover  {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
 .api_guide_cont .api_admin .input_box input::placeholder {font-size:14px; color:#ababab;}
 .api_guide_cont .api_admin .btnType.btnType2 {float:right; padding:0 20px 0 20px; font-size:16px; letter-spacing: -1px;}
 
-
+/*선거 문자전송 > 문구추가*/
-
+.tType1 tbody tr .ele_te{font-size: 14px; padding: 15px 0;}
+.tType1 tbody tr .ele_te span{font-weight: 400;}
 
 @keyframes rotate-loading {
 	0% {transform:rotate(0)}