Merge branch 'master' into 5419_전화번호거짓표시50건이상
@6460d95b8c55915cfcd1c4e5b65bb767d5786fd4
--- src/main/resources/egovframework/egovProps/globals_dev.properties
+++ src/main/resources/egovframework/egovProps/globals_dev.properties
... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 |
|
| 29 | 29 |
# mysql |
| 30 | 30 |
Globals.DriverClassName=com.mysql.jdbc.Driver |
| 31 |
-Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon_advc |
|
| 31 |
+Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc |
|
| 32 | 32 |
#Globals.Url=jdbc:mysql://139.150.73.12:3306/mjon |
| 33 | 33 |
Globals.UserName= mjonUr |
| 34 | 34 |
Globals.Password= mjon!@#$ |
--- src/main/resources/egovframework/egovProps/globals_local.properties
+++ src/main/resources/egovframework/egovProps/globals_local.properties
... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 |
|
| 29 | 29 |
# mysql |
| 30 | 30 |
Globals.DriverClassName=com.mysql.jdbc.Driver |
| 31 |
-Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon_advc |
|
| 31 |
+Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc |
|
| 32 | 32 |
#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon |
| 33 | 33 |
Globals.UserName= mjonUr |
| 34 | 34 |
Globals.Password= mjon!@#$ |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPhoneAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPhoneAjax.jsp
... | ... | @@ -4,127 +4,167 @@ |
| 4 | 4 |
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> |
| 5 | 5 |
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> |
| 6 | 6 |
<% pageContext.setAttribute("newLineChar", "\n"); %>
|
| 7 |
- |
|
| 8 | 7 |
<div class="phone"> |
| 9 |
- <!-- 탭스타일 --> |
|
| 10 |
- <div class="list_tab_wrap2 type5 kakao_rev_tab"> |
|
| 11 |
- <ul class="tabType3" id="tabType" name="tabType"> |
|
| 12 |
- <li class="tab active"><button type="button" onclick="phoneTab(this,'1');" title="선택됨">카카오톡</button></li> |
|
| 13 |
- <c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
|
| 14 |
- <li class="tab"><button type="button" onclick="phoneTab(this,'2');">대체문자</button></li> |
|
| 15 |
- </c:if> |
|
| 16 |
- </ul> |
|
| 17 |
- </div> |
|
| 18 |
- <!--// 탭스타일 --> |
|
| 8 |
+ <!-- 탭스타일 --> |
|
| 9 |
+ <div class="list_tab_wrap2 type5 kakao_rev_tab"> |
|
| 10 |
+ <ul class="tabType3" id="tabType" name="tabType"> |
|
| 11 |
+ <li class="tab active"><button type="button" onclick="phoneTab(this,'1');" title="선택됨">카카오톡</button></li> |
|
| 12 |
+ <c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
|
| 13 |
+ <li class="tab"><button type="button" onclick="phoneTab(this,'2');">대체문자</button></li> |
|
| 14 |
+ </c:if> |
|
| 15 |
+ </ul> |
|
| 16 |
+ </div> |
|
| 17 |
+ <!--// 탭스타일 --> |
|
| 19 | 18 |
|
| 20 |
- <!-- 카카오 알림톡 미리보기 --> |
|
| 21 |
-<!-- <div class="tab_phone current" id="tab_phone_1"> --> |
|
| 22 |
-<!-- <div class="phone_kakako friendtalk"> --> |
|
| 23 |
- <div class="tab_phone current kakao_wrap" id="tab_phone_1"> |
|
| 24 |
- <div class="phone_kakako friendtalk"> |
|
| 25 |
- <div class="phoneIn"> |
|
| 26 |
- <p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""><c:out value="${searchVO.yellowId}"/></p>
|
|
| 27 |
- <!-- 텍스트 미리보기 --> |
|
| 28 |
- <div class="text_preview"> |
|
| 29 |
- <%--< div class="allimtalk_title"> |
|
| 30 |
- <img src="/publish/images/content/icon_allimtalk.png" alt=""> |
|
| 31 |
- <c:choose> |
|
| 32 |
- <c:when test="${msgType eq '8'}">알림톡 도착</c:when>
|
|
| 33 |
- <c:when test="${msgType eq '9'}">친구톡 도착</c:when>
|
|
| 34 |
- </c:choose> |
|
| 35 |
- </div> --%> |
|
| 36 |
- <c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
|
| 37 |
- <p class="friend_talk_title"><span>(광고)</span></p> |
|
| 38 |
- </c:if> |
|
| 39 |
- <div class="allimtalk_content"> |
|
| 40 |
- <c:choose> |
|
| 41 |
- <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}">
|
|
| 42 |
- <p class="emphasis_side_text"><c:out value="${kakaoTemplateInfo.templateSubtitle}"/></p>
|
|
| 43 |
- <p class="emphasis_title_text"><c:out value="${kakaoTemplateInfo.templateTitle}"/></p>
|
|
| 44 |
- </c:when> |
|
| 45 |
- <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'IMAGE'}">
|
|
| 46 |
- <div class="kakao_image"> |
|
| 47 |
- <img src="<c:url value='${kakaoTemplateInfo.templateImageUrl}'/>" alt="">
|
|
| 48 |
- </div> |
|
| 49 |
- </c:when> |
|
| 50 |
- </c:choose> |
|
| 51 |
- |
|
| 52 |
- <p class="template_text"> |
|
| 53 |
- <c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
|
|
| 54 |
- </p> |
|
| 55 |
- |
|
| 56 |
- <c:choose> |
|
| 57 |
- <c:when test="${kakaoTemplateInfo.templateMessageType eq 'EX'}">
|
|
| 58 |
- <p class="side_info_text"><c:out value="${kakaoTemplateInfo.templateExtra}"/></p>
|
|
| 59 |
- </c:when> |
|
| 60 |
- <c:when test="${kakaoTemplateInfo.templateMessageType eq 'AD'}">
|
|
| 61 |
- <p class="channel_info_text"><c:out value="${kakaoTemplateInfo.templateAd}"/></p>
|
|
| 62 |
- </c:when> |
|
| 63 |
- </c:choose> |
|
| 64 |
- |
|
| 65 |
- <c:forEach var="templatInfoButtonList" items="${kakaoTemplateInfo.buttonList}" varStatus="status">
|
|
| 66 |
- <c:choose> |
|
| 67 |
- <c:when test="${templatInfoButtonList.name eq '채널 추가'}">
|
|
| 68 |
- <button type="button" class="btn_kakao_channel"><img src="/publish/images/content/icon_kakao_channel_plus.png" alt=""> 채널추가</button> |
|
| 69 |
- </c:when> |
|
| 70 |
- <c:otherwise> |
|
| 71 |
- <button type="button" class="btn_kakao_type"><c:out value="${templatInfoButtonList.name}"/></button>
|
|
| 72 |
- </c:otherwise> |
|
| 73 |
- </c:choose> |
|
| 74 |
- </c:forEach> |
|
| 75 |
- </div> |
|
| 76 |
- |
|
| 77 |
- <c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
|
| 78 |
- <p class="kakao_block_text">수신거부 : 홈 > 채널차단</p> |
|
| 79 |
- </c:if> |
|
| 80 |
- |
|
| 81 |
- </div> |
|
| 82 |
- </div> |
|
| 83 |
- <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> |
|
| 84 |
- </div> |
|
| 85 |
- </div> |
|
| 86 |
- <!--// 카카오 알림톡 미리보기 --> |
|
| 19 |
+ <!-- 카카오 미리보기 --> |
|
| 20 |
+<!-- <div class="tab_phone current" id="tab_phone_1"> --> |
|
| 21 |
+<!-- <div class="phone_kakako friendtalk"> --> |
|
| 22 |
+ <div class="tab_phone current kakao_wrap" id="tab_phone_1"> |
|
| 23 |
+ <!-- 알림톡 미리보기 --> |
|
| 24 |
+ <c:if test="${msgType eq '8'}">
|
|
| 25 |
+ <div class="phone_kakako"> |
|
| 26 |
+ <div class="phoneIn"> |
|
| 27 |
+ <p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""></p> |
|
| 28 |
+ <!-- 텍스트 미리보기 --> |
|
| 29 |
+ <div class="text_preview"> |
|
| 30 |
+ <div class="allimtalk_title"> |
|
| 31 |
+ <img src="/publish/images/content/icon_allimtalk.png" alt=""> |
|
| 32 |
+ 알림톡 도착 |
|
| 33 |
+ </div> |
|
| 34 |
+ <div class="allimtalk_content"> |
|
| 35 |
+ <c:choose> |
|
| 36 |
+ <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}">
|
|
| 37 |
+ <p class="emphasis_side_text"><c:out value="${kakaoTemplateInfo.templateSubtitle}"/></p>
|
|
| 38 |
+ <p class="emphasis_title_text"><c:out value="${kakaoTemplateInfo.templateTitle}"/></p>
|
|
| 39 |
+ </c:when> |
|
| 40 |
+ <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'IMAGE'}">
|
|
| 41 |
+ <div class="kakao_image"> |
|
| 42 |
+ <img src="<c:url value='${kakaoTemplateInfo.templateImageUrl}'/>" alt="">
|
|
| 43 |
+ </div> |
|
| 44 |
+ </c:when> |
|
| 45 |
+ </c:choose> |
|
| 46 |
+ |
|
| 47 |
+ <p class="template_text"> |
|
| 48 |
+ <c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
|
|
| 49 |
+ </p> |
|
| 50 |
+ |
|
| 51 |
+ <c:choose> |
|
| 52 |
+ <c:when test="${kakaoTemplateInfo.templateMessageType eq 'EX'}">
|
|
| 53 |
+ <p class="side_info_text"><c:out value="${kakaoTemplateInfo.templateExtra}"/></p>
|
|
| 54 |
+ </c:when> |
|
| 55 |
+ <c:when test="${kakaoTemplateInfo.templateMessageType eq 'AD'}">
|
|
| 56 |
+ <p class="channel_info_text"><c:out value="${kakaoTemplateInfo.templateAd}"/></p>
|
|
| 57 |
+ </c:when> |
|
| 58 |
+ </c:choose> |
|
| 59 |
+ |
|
| 60 |
+ <c:forEach var="templatInfoButtonList" items="${kakaoTemplateInfo.buttonList}" varStatus="status">
|
|
| 61 |
+ <c:choose> |
|
| 62 |
+ <c:when test="${templatInfoButtonList.name eq '채널 추가'}">
|
|
| 63 |
+ <button type="button" class="btn_kakao_channel"><img src="/publish/images/content/icon_kakao_channel_plus.png" alt=""> 채널추가</button> |
|
| 64 |
+ </c:when> |
|
| 65 |
+ <c:otherwise> |
|
| 66 |
+ <button type="button" class="btn_kakao_type"><c:out value="${templatInfoButtonList.name}"/></button>
|
|
| 67 |
+ </c:otherwise> |
|
| 68 |
+ </c:choose> |
|
| 69 |
+ </c:forEach> |
|
| 70 |
+ </div> |
|
| 71 |
+ |
|
| 72 |
+ </div> |
|
| 73 |
+ </div> |
|
| 74 |
+ <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> |
|
| 75 |
+ </div> |
|
| 76 |
+ </c:if> |
|
| 77 |
+ |
|
| 78 |
+ <!-- 친구톡 미리보기 --> |
|
| 79 |
+ <c:if test="${msgType eq '9'}">
|
|
| 80 |
+ <div class="phone_kakako friendtalk"> |
|
| 81 |
+ <div class="phoneIn"> |
|
| 82 |
+ <p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""><c:out value="${searchVO.yellowId}"/></p>
|
|
| 83 |
+ <!-- 텍스트 미리보기 --> |
|
| 84 |
+ <div class="text_preview"> |
|
| 85 |
+ <c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
|
| 86 |
+ <p class="friend_talk_title"><span>(광고)</span></p> |
|
| 87 |
+ </c:if> |
|
| 88 |
+ <div class="allimtalk_content"> |
|
| 89 |
+ <c:choose> |
|
| 90 |
+ <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}">
|
|
| 91 |
+ <p class="emphasis_side_text"><c:out value="${kakaoTemplateInfo.templateSubtitle}"/></p>
|
|
| 92 |
+ <p class="emphasis_title_text"><c:out value="${kakaoTemplateInfo.templateTitle}"/></p>
|
|
| 93 |
+ </c:when> |
|
| 94 |
+ <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'IMAGE'}">
|
|
| 95 |
+ <div class="kakao_image"> |
|
| 96 |
+ <img src="<c:url value='${kakaoTemplateInfo.templateImageUrl}'/>" alt="">
|
|
| 97 |
+ </div> |
|
| 98 |
+ </c:when> |
|
| 99 |
+ </c:choose> |
|
| 100 |
+ |
|
| 101 |
+ <p class="template_text"> |
|
| 102 |
+ <c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
|
|
| 103 |
+ </p> |
|
| 104 |
+ |
|
| 105 |
+ <c:choose> |
|
| 106 |
+ <c:when test="${kakaoTemplateInfo.templateMessageType eq 'EX'}">
|
|
| 107 |
+ <p class="side_info_text"><c:out value="${kakaoTemplateInfo.templateExtra}"/></p>
|
|
| 108 |
+ </c:when> |
|
| 109 |
+ <c:when test="${kakaoTemplateInfo.templateMessageType eq 'AD'}">
|
|
| 110 |
+ <p class="channel_info_text"><c:out value="${kakaoTemplateInfo.templateAd}"/></p>
|
|
| 111 |
+ </c:when> |
|
| 112 |
+ </c:choose> |
|
| 113 |
+ |
|
| 114 |
+ <c:forEach var="templatInfoButtonList" items="${kakaoTemplateInfo.buttonList}" varStatus="status">
|
|
| 115 |
+ <c:choose> |
|
| 116 |
+ <c:when test="${templatInfoButtonList.name eq '채널 추가'}">
|
|
| 117 |
+ <button type="button" class="btn_kakao_channel"><img src="/publish/images/content/icon_kakao_channel_plus.png" alt=""> 채널추가</button> |
|
| 118 |
+ </c:when> |
|
| 119 |
+ <c:otherwise> |
|
| 120 |
+ <button type="button" class="btn_kakao_type"><c:out value="${templatInfoButtonList.name}"/></button>
|
|
| 121 |
+ </c:otherwise> |
|
| 122 |
+ </c:choose> |
|
| 123 |
+ </c:forEach> |
|
| 124 |
+ </div> |
|
| 125 |
+ |
|
| 126 |
+ <c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
|
| 127 |
+ <p class="kakao_block_text">수신거부 : 홈 > 채널차단</p> |
|
| 128 |
+ </c:if> |
|
| 129 |
+ |
|
| 130 |
+ </div> |
|
| 131 |
+ </div> |
|
| 132 |
+ <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> |
|
| 133 |
+ </div> |
|
| 134 |
+ </c:if> |
|
| 135 |
+ |
|
| 136 |
+ </div> |
|
| 137 |
+ <!--// 카카오 미리보기 --> |
|
| 87 | 138 |
|
| 88 | 139 |
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
| 89 |
- <!-- 문자 미리보기 --> |
|
| 90 |
- <div class="tab_phone" id="tab_phone_2" style="display: none;position:relative;"> |
|
| 91 |
-<!-- <div class="tab_phone" id="tab_phone_2" > --> |
|
| 92 |
-<!-- <div class="tab_phone" id="tab_phone_2" style="display:none" > --> |
|
| 93 |
- <div class="phoneIn"> |
|
| 94 |
- <div> |
|
| 95 |
- <p class="prev_p"><img src="/publish/images/search.png"> 문자내용</p> |
|
| 96 |
- <div class="text_length2 clearfix"> |
|
| 97 |
- <c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
|
| 98 |
- <c:choose> |
|
| 99 |
- <c:when test="${resultMsgDetail.bizKakaoResendType eq 'SMS'}">
|
|
| 100 |
- <span class="msg_com msg_short">단문</span> |
|
| 101 |
- </c:when> |
|
| 102 |
- <c:otherwise> |
|
| 103 |
- <span class="msg_com msg_long">장문</span> |
|
| 104 |
- </c:otherwise> |
|
| 105 |
- </c:choose> |
|
| 106 |
-<%-- <c:choose> |
|
| 107 |
- <c:when test="${resultMsgDetail.bizKakaoResendTypeCnt > 1}">
|
|
| 108 |
- <span class="msg_com msg_short">단문</span> |
|
| 109 |
- <span class="msg_com msg_long">장문</span> |
|
| 110 |
- </c:when> |
|
| 111 |
- <c:when test="${resultMsgDetail.bizKakaoResendTypeCnt < 2
|
|
| 112 |
- && resultMsgDetail.bizKakaoResendType eq 'SMS'}"> |
|
| 113 |
- <span class="msg_com msg_short">단문</span> |
|
| 114 |
- </c:when> |
|
| 115 |
- <c:otherwise> |
|
| 116 |
- <span class="msg_com msg_long">장문</span> |
|
| 117 |
- </c:otherwise> |
|
| 118 |
- </c:choose> --%> |
|
| 119 |
- </c:if> |
|
| 120 |
- <!-- <div> |
|
| 121 |
- <span>글자크기</span> |
|
| 122 |
- <button type="button" onclick="changeFontSize('plus');"><img src="/publish/images/content/font_plus.png"></button>
|
|
| 123 |
- <button type="button" onclick="changeFontSize('minus');"><img src="/publish/images/content/font_minus.png"></button>
|
|
| 124 |
- </div> --> |
|
| 140 |
+ <!-- 문자 미리보기 --> |
|
| 141 |
+ <div class="tab_phone" id="tab_phone_2" style="display: none;position:relative;"> |
|
| 142 |
+<!-- <div class="tab_phone" id="tab_phone_2" > --> |
|
| 143 |
+<!-- <div class="tab_phone" id="tab_phone_2" style="display:none" > --> |
|
| 144 |
+ <div class="phoneIn"> |
|
| 145 |
+ <div> |
|
| 146 |
+ <p class="prev_p"><img src="/publish/images/search.png"> 문자내용</p> |
|
| 147 |
+ <div class="text_length2 clearfix"> |
|
| 148 |
+ <c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
|
| 149 |
+ <c:choose> |
|
| 150 |
+ <c:when test="${not empty fileInfos}">
|
|
| 151 |
+ <span class="msg_com msg_photo">그림</span> |
|
| 152 |
+ </c:when> |
|
| 153 |
+ <c:otherwise> |
|
| 154 |
+ <c:choose> |
|
| 155 |
+ <c:when test="${resultMsgDetail.bizKakaoResendType eq 'SMS'}">
|
|
| 156 |
+ <span class="msg_com msg_short">단문</span> |
|
| 157 |
+ </c:when> |
|
| 158 |
+ <c:otherwise> |
|
| 159 |
+ <span class="msg_com msg_long">장문</span> |
|
| 160 |
+ </c:otherwise> |
|
| 161 |
+ </c:choose> |
|
| 162 |
+ </c:otherwise> |
|
| 163 |
+ </c:choose> |
|
| 164 |
+ </c:if> |
|
| 125 | 165 |
</div> |
| 126 |
- <div class="text_preview"> |
|
| 127 |
- <c:if test="${not empty fileInfos}">
|
|
| 166 |
+ <div class="text_preview"> |
|
| 167 |
+ <c:if test="${not empty fileInfos}">
|
|
| 128 | 168 |
<div class="preiew_img"> |
| 129 | 169 |
<c:forEach var="fileInfo" items="${fileInfos}">
|
| 130 | 170 |
<div class="img_box"> |
... | ... | @@ -133,23 +173,22 @@ |
| 133 | 173 |
</c:forEach> |
| 134 | 174 |
</div> |
| 135 | 175 |
</c:if> |
| 136 |
- <div class="preview_auto"> |
|
| 137 |
- |
|
| 176 |
+ <div class="preview_auto"> |
|
| 138 | 177 |
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
| 139 | 178 |
<p class="ad_tit">(광고)</p> |
| 140 | 179 |
</c:if> |
| 141 |
- <p class="realtime">${fn:replace(resultMsgDetail.bizKakaoResendOrgnlTxt, newLineChar, "<br/>")}</p>
|
|
| 142 |
- |
|
| 180 |
+ <p class="realtime">${fn:replace(resultMsgDetail.bizKakaoResendOrgnlTxt, newLineChar, "<br/>")}</p>
|
|
| 181 |
+ |
|
| 143 | 182 |
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
| 144 | 183 |
<p class="deny_receipt">무료거부 0808800858</p> |
| 145 | 184 |
</c:if> |
| 146 |
- </div> |
|
| 147 |
- </div> |
|
| 148 |
- </div> |
|
| 149 |
- </div> |
|
| 150 |
- <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> |
|
| 151 |
- </div> |
|
| 152 |
- </c:if> |
|
| 153 |
- <!--// 문자 미리보기 --> |
|
| 185 |
+ </div> |
|
| 186 |
+ </div> |
|
| 187 |
+ </div> |
|
| 188 |
+ </div> |
|
| 189 |
+ <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> |
|
| 190 |
+ </div> |
|
| 191 |
+ </c:if> |
|
| 192 |
+ <!--// 문자 미리보기 --> |
|
| 154 | 193 |
</div> |
| 155 | 194 |
(No newline at end of file) |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
... | ... | @@ -6,133 +6,174 @@ |
| 6 | 6 |
<% pageContext.setAttribute("newLineChar", "\n"); %>
|
| 7 | 7 |
|
| 8 | 8 |
<div class="phone"> |
| 9 |
- <!-- 탭스타일 --> |
|
| 10 |
- <div class="list_tab_wrap2 type5 kakao_rev_tab"> |
|
| 11 |
- <ul class="tabType3" id="tabType" name="tabType"> |
|
| 12 |
- <li class="tab active"><button type="button" onclick="phoneTab(this,'1');" title="선택됨">카카오톡</button></li> |
|
| 13 |
- <c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
|
| 14 |
- <li class="tab"><button type="button" onclick="phoneTab(this,'2');">대체문자</button></li> |
|
| 15 |
- </c:if> |
|
| 16 |
- </ul> |
|
| 17 |
- </div> |
|
| 18 |
- <!--// 탭스타일 --> |
|
| 9 |
+ <!-- 탭스타일 --> |
|
| 10 |
+ <div class="list_tab_wrap2 type5 kakao_rev_tab"> |
|
| 11 |
+ <ul class="tabType3" id="tabType" name="tabType"> |
|
| 12 |
+ <li class="tab active"><button type="button" onclick="phoneTab(this,'1');" title="선택됨">카카오톡</button></li> |
|
| 13 |
+ <c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
|
| 14 |
+ <li class="tab"><button type="button" onclick="phoneTab(this,'2');">대체문자</button></li> |
|
| 15 |
+ </c:if> |
|
| 16 |
+ </ul> |
|
| 17 |
+ </div> |
|
| 18 |
+ <!--// 탭스타일 --> |
|
| 19 | 19 |
|
| 20 |
- <!-- 카카오 알림톡 미리보기 --> |
|
| 21 |
- <div class="tab_phone current kakao_wrap" id="tab_phone_1"> |
|
| 22 |
- <div class="phone_kakako friendtalk"> |
|
| 23 |
- <div class="phoneIn"> |
|
| 24 |
- <div class="rev_pop_middle clearfix"> |
|
| 25 |
- <fmt:parseDate value="${resultMsgDetail.reqDate}" var="parsedDate" pattern="yyyy-MM-dd HH:mm:ss.S"/>
|
|
| 26 |
- <span>발송일시 : <fmt:formatDate value="${parsedDate}" pattern="yyyy-MM-dd HH:mm:ss"/></span>
|
|
| 27 |
- <span class="msg_com msg_allimtalk"> |
|
| 28 |
- <c:choose> |
|
| 29 |
- <c:when test="${msgType eq '8'}">알림톡</c:when>
|
|
| 30 |
- <c:when test="${msgType eq '9'}">친구톡</c:when>
|
|
| 31 |
- </c:choose> |
|
| 32 |
- </span> |
|
| 20 |
+ <div class="tab_phone current kakao_wrap" id="tab_phone_1"> |
|
| 21 |
+ <!-- 카카오 알림톡 미리보기 --> |
|
| 22 |
+ <c:if test="${msgType eq '8'}">
|
|
| 23 |
+ <div class="phone_kakako"> |
|
| 24 |
+ <div class="phoneIn"> |
|
| 25 |
+ <div class="rev_pop_middle clearfix"> |
|
| 26 |
+ <fmt:parseDate value="${resultMsgDetail.reqDate}" var="parsedDate" pattern="yyyy-MM-dd HH:mm:ss.S"/>
|
|
| 27 |
+ <span>발송일시 : <fmt:formatDate value="${parsedDate}" pattern="yyyy-MM-dd HH:mm:ss"/></span>
|
|
| 28 |
+ <span class="msg_com msg_allimtalk"> |
|
| 29 |
+ 알림톡 |
|
| 30 |
+ </span> |
|
| 31 |
+ </div> |
|
| 32 |
+ <!-- 텍스트 미리보기 --> |
|
| 33 |
+ <div class="rev_pop_txt"> |
|
| 34 |
+ <div class="text_preview"> |
|
| 35 |
+ <div class="allimtalk_title"> |
|
| 36 |
+ <img src="/publish/images/content/icon_allimtalk.png" alt=""> |
|
| 37 |
+ 알림톡 도착 |
|
| 38 |
+ </div> |
|
| 39 |
+ <div class="allimtalk_content"> |
|
| 40 |
+ <c:choose> |
|
| 41 |
+ <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}">
|
|
| 42 |
+ <p class="emphasis_side_text"><c:out value="${kakaoTemplateInfo.templateSubtitle}"/></p>
|
|
| 43 |
+ <p class="emphasis_title_text"><c:out value="${kakaoTemplateInfo.templateTitle}"/></p>
|
|
| 44 |
+ </c:when> |
|
| 45 |
+ <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'IMAGE'}">
|
|
| 46 |
+ <div class="kakao_image"> |
|
| 47 |
+ <img src="<c:url value='${kakaoTemplateInfo.templateImageUrl}'/>" alt="">
|
|
| 48 |
+ </div> |
|
| 49 |
+ </c:when> |
|
| 50 |
+ </c:choose> |
|
| 51 |
+ <p class="template_text"> |
|
| 52 |
+ <c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
|
|
| 53 |
+ </p> |
|
| 54 |
+ |
|
| 55 |
+ <c:choose> |
|
| 56 |
+ <c:when test="${kakaoTemplateInfo.templateMessageType eq 'EX'}">
|
|
| 57 |
+ <p class="side_info_text"><c:out value="${kakaoTemplateInfo.templateExtra}"/></p>
|
|
| 58 |
+ </c:when> |
|
| 59 |
+ <c:when test="${kakaoTemplateInfo.templateMessageType eq 'AD'}">
|
|
| 60 |
+ <p class="channel_info_text"><c:out value="${kakaoTemplateInfo.templateAd}"/></p>
|
|
| 61 |
+ </c:when> |
|
| 62 |
+ </c:choose> |
|
| 63 |
+ |
|
| 64 |
+ <c:forEach var="templatInfoButtonList" items="${kakaoTemplateInfo.buttonList}" varStatus="status">
|
|
| 65 |
+ <c:choose> |
|
| 66 |
+ <c:when test="${templatInfoButtonList.name eq '채널 추가'}">
|
|
| 67 |
+ <button type="button" class="btn_kakao_channel"><img src="/publish/images/content/icon_kakao_channel_plus.png" alt=""> 채널추가</button> |
|
| 68 |
+ </c:when> |
|
| 69 |
+ <c:otherwise> |
|
| 70 |
+ <button type="button" class="btn_kakao_type"><c:out value="${templatInfoButtonList.name}"/></button>
|
|
| 71 |
+ </c:otherwise> |
|
| 72 |
+ </c:choose> |
|
| 73 |
+ </c:forEach> |
|
| 74 |
+ </div> |
|
| 75 |
+ </div> |
|
| 76 |
+ </div> |
|
| 33 | 77 |
</div> |
| 34 |
- <!-- 텍스트 미리보기 --> |
|
| 35 |
- <div class="rev_pop_txt"> |
|
| 36 |
- <div class="text_preview"> |
|
| 37 |
- <div class="allimtalk_title"> |
|
| 38 |
- <img src="/publish/images/content/icon_allimtalk.png" alt=""> |
|
| 39 |
- <c:choose> |
|
| 40 |
- <c:when test="${msgType eq '8'}">알림톡 도착</c:when>
|
|
| 41 |
- <c:when test="${msgType eq '9'}">친구톡 도착</c:when>
|
|
| 42 |
- </c:choose> |
|
| 43 |
- </div> |
|
| 44 |
- <div class="allimtalk_content"> |
|
| 45 |
- <c:choose> |
|
| 46 |
- <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}">
|
|
| 47 |
- <p class="emphasis_side_text"><c:out value="${kakaoTemplateInfo.templateSubtitle}"/></p>
|
|
| 48 |
- <p class="emphasis_title_text"><c:out value="${kakaoTemplateInfo.templateTitle}"/></p>
|
|
| 49 |
- </c:when> |
|
| 50 |
- <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'IMAGE'}">
|
|
| 51 |
- <div class="kakao_image"> |
|
| 52 |
- <img src="<c:url value='${kakaoTemplateInfo.templateImageUrl}'/>" alt="">
|
|
| 53 |
- </div> |
|
| 54 |
- </c:when> |
|
| 55 |
- </c:choose> |
|
| 56 |
- <c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
|
| 57 |
- <p class="friend_talk_title"><span>(광고)</span></p> |
|
| 58 |
- </c:if> |
|
| 59 |
- <p class="template_text"> |
|
| 60 |
- <c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
|
|
| 61 |
- </p> |
|
| 78 |
+ <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> |
|
| 79 |
+ </div> |
|
| 80 |
+ </c:if> |
|
| 81 |
+ |
|
| 82 |
+ <c:if test="${msgType eq '9'}">
|
|
| 83 |
+ <!-- 카카오 친구톡 미리보기 --> |
|
| 84 |
+ <div class="phone_kakako friendtalk"> |
|
| 85 |
+ <div class="phoneIn"> |
|
| 86 |
+ <div class="rev_pop_middle clearfix"> |
|
| 87 |
+ <fmt:parseDate value="${resultMsgDetail.reqDate}" var="parsedDate" pattern="yyyy-MM-dd HH:mm:ss.S"/>
|
|
| 88 |
+ <span>발송일시 : <fmt:formatDate value="${parsedDate}" pattern="yyyy-MM-dd HH:mm:ss"/></span>
|
|
| 89 |
+ <span class="msg_com msg_allimtalk"> |
|
| 90 |
+ 친구톡 |
|
| 91 |
+ </span> |
|
| 92 |
+ </div> |
|
| 93 |
+ <!-- 텍스트 미리보기 --> |
|
| 94 |
+ <div class="rev_pop_txt"> |
|
| 95 |
+ <div class="text_preview"> |
|
| 96 |
+ <c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
|
| 97 |
+ <p class="friend_talk_title"><span>(광고)</span></p> |
|
| 98 |
+ </c:if> |
|
| 99 |
+ <div class="allimtalk_content"> |
|
| 100 |
+ <c:choose> |
|
| 101 |
+ <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}">
|
|
| 102 |
+ <p class="emphasis_side_text"><c:out value="${kakaoTemplateInfo.templateSubtitle}"/></p>
|
|
| 103 |
+ <p class="emphasis_title_text"><c:out value="${kakaoTemplateInfo.templateTitle}"/></p>
|
|
| 104 |
+ </c:when> |
|
| 105 |
+ <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'IMAGE'}">
|
|
| 106 |
+ <div class="kakao_image"> |
|
| 107 |
+ <img src="<c:url value='${kakaoTemplateInfo.templateImageUrl}'/>" alt="">
|
|
| 108 |
+ </div> |
|
| 109 |
+ </c:when> |
|
| 110 |
+ </c:choose> |
|
| 62 | 111 |
|
| 63 |
- <c:choose> |
|
| 64 |
- <c:when test="${kakaoTemplateInfo.templateMessageType eq 'EX'}">
|
|
| 65 |
- <p class="side_info_text"><c:out value="${kakaoTemplateInfo.templateExtra}"/></p>
|
|
| 66 |
- </c:when> |
|
| 67 |
- <c:when test="${kakaoTemplateInfo.templateMessageType eq 'AD'}">
|
|
| 68 |
- <p class="channel_info_text"><c:out value="${kakaoTemplateInfo.templateAd}"/></p>
|
|
| 69 |
- </c:when> |
|
| 70 |
- </c:choose> |
|
| 71 |
- |
|
| 72 |
- <c:forEach var="templatInfoButtonList" items="${kakaoTemplateInfo.buttonList}" varStatus="status">
|
|
| 73 |
- <c:choose> |
|
| 74 |
- <c:when test="${templatInfoButtonList.name eq '채널 추가'}">
|
|
| 75 |
- <button type="button" class="btn_kakao_channel"><img src="/publish/images/content/icon_kakao_channel_plus.png" alt=""> 채널추가</button> |
|
| 76 |
- </c:when> |
|
| 77 |
- <c:otherwise> |
|
| 78 |
- <button type="button" class="btn_kakao_type"><c:out value="${templatInfoButtonList.name}"/></button>
|
|
| 79 |
- </c:otherwise> |
|
| 80 |
- </c:choose> |
|
| 81 |
- </c:forEach> |
|
| 82 |
- </div> |
|
| 83 |
- |
|
| 84 |
- <c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
|
| 85 |
- <p class="kakao_block_text">수신거부 : 홈 > 채널차단</p> |
|
| 86 |
- </c:if> |
|
| 87 |
- |
|
| 88 |
- </div> |
|
| 89 |
- </div> |
|
| 90 |
- </div> |
|
| 91 |
- <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> |
|
| 92 |
- </div> |
|
| 93 |
- </div> |
|
| 94 |
- <!--// 카카오 알림톡 미리보기 --> |
|
| 112 |
+ <p class="template_text"> |
|
| 113 |
+ <c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
|
|
| 114 |
+ </p> |
|
| 115 |
+ |
|
| 116 |
+ <c:choose> |
|
| 117 |
+ <c:when test="${kakaoTemplateInfo.templateMessageType eq 'EX'}">
|
|
| 118 |
+ <p class="side_info_text"><c:out value="${kakaoTemplateInfo.templateExtra}"/></p>
|
|
| 119 |
+ </c:when> |
|
| 120 |
+ <c:when test="${kakaoTemplateInfo.templateMessageType eq 'AD'}">
|
|
| 121 |
+ <p class="channel_info_text"><c:out value="${kakaoTemplateInfo.templateAd}"/></p>
|
|
| 122 |
+ </c:when> |
|
| 123 |
+ </c:choose> |
|
| 124 |
+ |
|
| 125 |
+ <c:forEach var="templatInfoButtonList" items="${kakaoTemplateInfo.buttonList}" varStatus="status">
|
|
| 126 |
+ <c:choose> |
|
| 127 |
+ <c:when test="${templatInfoButtonList.name eq '채널 추가'}">
|
|
| 128 |
+ <button type="button" class="btn_kakao_channel"><img src="/publish/images/content/icon_kakao_channel_plus.png" alt=""> 채널추가</button> |
|
| 129 |
+ </c:when> |
|
| 130 |
+ <c:otherwise> |
|
| 131 |
+ <button type="button" class="btn_kakao_type"><c:out value="${templatInfoButtonList.name}"/></button>
|
|
| 132 |
+ </c:otherwise> |
|
| 133 |
+ </c:choose> |
|
| 134 |
+ </c:forEach> |
|
| 135 |
+ </div> |
|
| 136 |
+ |
|
| 137 |
+ <c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
|
| 138 |
+ <p class="kakao_block_text">수신거부 : 홈 > 채널차단</p> |
|
| 139 |
+ </c:if> |
|
| 140 |
+ |
|
| 141 |
+ </div> |
|
| 142 |
+ </div> |
|
| 143 |
+ </div> |
|
| 144 |
+ <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> |
|
| 145 |
+ </div> |
|
| 146 |
+ </c:if> |
|
| 147 |
+ </div> |
|
| 148 |
+ |
|
| 95 | 149 |
|
| 96 | 150 |
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
| 97 |
- <!-- 문자 미리보기 --> |
|
| 98 |
- <div class="tab_phone" id="tab_phone_2" style="display: none;position:relative;"> |
|
| 99 |
-<!-- <div class="tab_phone" id="tab_phone_2" > --> |
|
| 100 |
-<!-- <div class="tab_phone" id="tab_phone_2" style="display:none" > --> |
|
| 101 |
- <div class="phoneIn"> |
|
| 102 |
- <div> |
|
| 103 |
- <div class="text_length2 clearfix"> |
|
| 104 |
- <span>발송일시 : <fmt:formatDate value="${parsedDate}" pattern="yyyy-MM-dd HH:mm:ss"/></span>
|
|
| 105 |
- <c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
|
| 106 |
- <c:choose> |
|
| 107 |
- <c:when test="${resultMsgDetail.bizKakaoResendType eq 'SMS'}">
|
|
| 108 |
- <span class="msg_com msg_short" style="float:right;">단문</span> |
|
| 109 |
- </c:when> |
|
| 110 |
- <c:otherwise> |
|
| 111 |
- <span class="msg_com msg_long" style="float:right;">장문</span> |
|
| 112 |
- </c:otherwise> |
|
| 113 |
- </c:choose> |
|
| 114 |
-<%-- <c:choose> |
|
| 115 |
- <c:when test="${resultMsgDetail.bizKakaoResendTypeCnt > 1}">
|
|
| 116 |
- <span class="msg_com msg_short" style="float:right;">단문</span> |
|
| 117 |
- <span class="msg_com msg_long" style="float:right;">장문</span> |
|
| 118 |
- </c:when> |
|
| 119 |
- <c:when test="${resultMsgDetail.bizKakaoResendTypeCnt < 2
|
|
| 120 |
- && resultMsgDetail.bizKakaoResendType eq 'SMS'}"> |
|
| 121 |
- <span class="msg_com msg_short" style="float:right;">단문</span> |
|
| 122 |
- </c:when> |
|
| 123 |
- <c:otherwise> |
|
| 124 |
- <span class="msg_com msg_long" style="float:right;">장문</span> |
|
| 125 |
- </c:otherwise> |
|
| 126 |
- </c:choose> --%> |
|
| 127 |
- </c:if> |
|
| 128 |
- <!-- <div> |
|
| 129 |
- <span>글자크기</span> |
|
| 130 |
- <button type="button" onclick="changeFontSize('plus');"><img src="/publish/images/content/font_plus.png"></button>
|
|
| 131 |
- <button type="button" onclick="changeFontSize('minus');"><img src="/publish/images/content/font_minus.png"></button>
|
|
| 132 |
- </div> --> |
|
| 151 |
+ <!-- 문자 미리보기 --> |
|
| 152 |
+ <div class="tab_phone" id="tab_phone_2" style="display: none;position:relative;"> |
|
| 153 |
+<!-- <div class="tab_phone" id="tab_phone_2" > --> |
|
| 154 |
+<!-- <div class="tab_phone" id="tab_phone_2" style="display:none" > --> |
|
| 155 |
+ <div class="phoneIn"> |
|
| 156 |
+ <div> |
|
| 157 |
+ <div class="rev_pop_middle clearfix"> |
|
| 158 |
+ <span>발송일시 : <fmt:formatDate value="${parsedDate}" pattern="yyyy-MM-dd HH:mm:ss"/></span>
|
|
| 159 |
+ <c:choose> |
|
| 160 |
+ <c:when test="${not empty fileInfos}">
|
|
| 161 |
+ <span class="msg_com msg_photo" style="float:right;">그림</span> |
|
| 162 |
+ </c:when> |
|
| 163 |
+ <c:otherwise> |
|
| 164 |
+ <c:choose> |
|
| 165 |
+ <c:when test="${resultMsgDetail.bizKakaoResendType eq 'SMS'}">
|
|
| 166 |
+ <span class="msg_com msg_short" style="float:right;">단문</span> |
|
| 167 |
+ </c:when> |
|
| 168 |
+ <c:otherwise> |
|
| 169 |
+ <span class="msg_com msg_long" style="float:right;">장문</span> |
|
| 170 |
+ </c:otherwise> |
|
| 171 |
+ </c:choose> |
|
| 172 |
+ </c:otherwise> |
|
| 173 |
+ </c:choose> |
|
| 133 | 174 |
</div> |
| 134 |
- <div class="text_preview"> |
|
| 135 |
- <c:if test="${not empty fileInfos}">
|
|
| 175 |
+ <div class="text_preview"> |
|
| 176 |
+ <c:if test="${not empty fileInfos}">
|
|
| 136 | 177 |
<div class="preiew_img"> |
| 137 | 178 |
<c:forEach var="fileInfo" items="${fileInfos}">
|
| 138 | 179 |
<div class="img_box"> |
... | ... | @@ -141,23 +182,22 @@ |
| 141 | 182 |
</c:forEach> |
| 142 | 183 |
</div> |
| 143 | 184 |
</c:if> |
| 144 |
- <div class="preview_auto"> |
|
| 145 |
- |
|
| 185 |
+ <div class="rev_pop_txt"> |
|
| 146 | 186 |
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
| 147 | 187 |
<p class="ad_tit">(광고)</p> |
| 148 | 188 |
</c:if> |
| 149 |
- <p class="realtime">${fn:replace(resultMsgDetail.bizKakaoResendOrgnlTxt, newLineChar, "<br/>")}</p>
|
|
| 150 |
- |
|
| 189 |
+ <p class="realtime">${fn:replace(resultMsgDetail.smsTxt, newLineChar, "<br/>")}</p>
|
|
| 190 |
+ |
|
| 151 | 191 |
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
| 152 | 192 |
<p class="deny_receipt">무료거부 0808800858</p> |
| 153 | 193 |
</c:if> |
| 154 |
- </div> |
|
| 155 |
- </div> |
|
| 156 |
- </div> |
|
| 157 |
- </div> |
|
| 158 |
- <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> |
|
| 159 |
- </div> |
|
| 160 |
- </c:if> |
|
| 161 |
- <!--// 문자 미리보기 --> |
|
| 194 |
+ </div> |
|
| 195 |
+ </div> |
|
| 196 |
+ </div> |
|
| 197 |
+ </div> |
|
| 198 |
+ <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> |
|
| 199 |
+ </div> |
|
| 200 |
+ </c:if> |
|
| 201 |
+ <!--// 문자 미리보기 --> |
|
| 162 | 202 |
</div> |
| 163 | 203 |
(No newline at end of file) |
--- src/main/webapp/publish/css/popupLayer.css
+++ src/main/webapp/publish/css/popupLayer.css
... | ... | @@ -512,8 +512,7 @@ |
| 512 | 512 |
/* 예약관리 */ |
| 513 | 513 |
/* 예약관리 - 문자내용 */ |
| 514 | 514 |
.rev_pop_in input[type="text"] {background-color: #f2f2f2; width: 100%; height: 50px; border-radius: 5px;}
|
| 515 |
-.rev_pop_in input[type="text"]::placeholder {font-size: 17px; color: #222; font-weight: 400
|
|
| 516 |
-;} |
|
| 515 |
+.rev_pop_in input[type="text"]::placeholder {font-size: 17px; color: #222; font-weight: 400;}
|
|
| 517 | 516 |
.rev_pop_in input[type="text"]-ms-input-placeholder {font-size: 17px; color: #222; font-weight: 400;}
|
| 518 | 517 |
.rev_pop_middle {margin:0 0 10px;}
|
| 519 | 518 |
.rev_pop_middle span:first-child {float: left; font-size: 16px; font-weight: 300; padding-top: 5px;}
|
... | ... | @@ -1077,6 +1076,7 @@ |
| 1077 | 1076 |
.kakao_rev_popup .kakao_wrap .allimtalk_title::after{position: absolute; content: " "; width: 42px; height: 42px; background: url(/publish/images/content/icon_kakao01.png) no-repeat; right: -20px; top: -10px;}
|
| 1078 | 1077 |
.kakao_rev_popup .kakao_wrap .allimtalk_title img{margin: 0 8px 0 0; vertical-align: bottom;}
|
| 1079 | 1078 |
.kakao_rev_popup .kakao_wrap .allimtalk_content{width: calc(100% - 60px);background-color: #fff; border-radius: 0 0 5px 5px; padding: 0 0 10px 0; margin: 0 0 20px 0;}
|
| 1079 |
+.kakao_rev_popup .kakao_wrap .friendtalk .allimtalk_content{margin:0;}
|
|
| 1080 | 1080 |
.kakao_rev_popup .kakao_wrap .allimtalk_content .kakao_image img{width: 100%;}
|
| 1081 | 1081 |
.kakao_rev_popup .kakao_wrap .allimtalk_content p{width: calc(100% - 20px); white-space: normal; word-break: break-all; line-height: 1.4; padding: 0 10px; margin: 0 auto;}
|
| 1082 | 1082 |
.kakao_rev_popup .kakao_wrap .allimtalk_content .template_text,.kakao_rev_popup .kakao_wrap .allimtalk_content .emphasis_title_text{font-size: 16px; font-weight: 500; color: #222;}
|
... | ... | @@ -1091,6 +1091,15 @@ |
| 1091 | 1091 |
.kakao_rev_popup .kakao_wrap .allimtalk_content .template_text+.btn_kakao_type{margin-top: 8px;}
|
| 1092 | 1092 |
.kakao_rev_popup .kakao_wrap .allimtalk_content .btn_kakao_channel{width: calc(100% - 20px); height: 40px; font-size: 15px; border-radius: 5px; background-color: #ffea00;}
|
| 1093 | 1093 |
.kakao_rev_popup .kakao_wrap .allimtalk_content .btn_kakao_type{width: calc(100% - 20px); height: 40px; font-size: 15px; border-radius: 5px; background-color: #ededed;}
|
| 1094 |
+.kakao_rev_popup .tab_phone .addText{margin:8px 0 0 0;color:#002c9a;font-size:14px;}
|
|
| 1095 |
+ |
|
| 1096 |
+/* 카카오톡 발송결과, 예약관리 문자내용 보기 - 친구톡 */ |
|
| 1097 |
+.kakao_rev_popup .kakao_wrap .friendtalk .allimtalk_content{border-radius:5px;}
|
|
| 1098 |
+.kakao_rev_popup .kakao_wrap .friendtalk .kakao_image{border-radius:5px 5px 0 0;overflow:hidden;}
|
|
| 1099 |
+.kakao_rev_popup .kakao_wrap .friendtalk .rev_pop_txt{padding:20px;}
|
|
| 1100 |
+.kakao_rev_popup .kakao_wrap .friendtalk .rev_pop_txt p {margin:0 0 10px 0;font-size: 15px;color:#777;}
|
|
| 1101 |
+.kakao_rev_popup .kakao_wrap .friendtalk .rev_pop_txt .template_text{padding:10px 10px 0 10px;}
|
|
| 1102 |
+.kakao_rev_popup .kakao_wrap .friendtalk .rev_pop_txt p.kakao_block_text{width:calc(100% - 60px);text-align:right;font-size:13px;color:#555;font-weight:300;margin:10px 0 0 0;}
|
|
| 1094 | 1103 |
|
| 1095 | 1104 |
/* 카카오테스트발송 팝업 */ |
| 1096 | 1105 |
.test_sendpop.kakao_rev_popup .kakao_wrap .phone .phoneIn{height: 620px; background-image: url(/publish/images/content/kakaoBg.png);padding: 28px 19px 0 19px;}
|
--- src/main/webapp/publish/payment1.html
+++ src/main/webapp/publish/payment1.html
... | ... | @@ -469,6 +469,38 @@ |
| 469 | 469 |
</tbody> |
| 470 | 470 |
</table> |
| 471 | 471 |
<span class="reqTxt4">* 텍스트 용량(Byte)에 대한 안내 : 한글2Byte, 영문·숫자 1Byte를 차지.</span> |
| 472 |
+ |
|
| 473 |
+ <p class="tType1_title"><img src="/publish/images/content/icon_fee2.png" alt="알림톡 아이콘 이미지"> 친구톡</p> |
|
| 474 |
+ <table class="tType2"> |
|
| 475 |
+ <colgroup> |
|
| 476 |
+ <col style="width: 20%;"> |
|
| 477 |
+ <col style="width: 60%;"> |
|
| 478 |
+ <col style="width: 20%;"> |
|
| 479 |
+ </colgroup> |
|
| 480 |
+ <thead> |
|
| 481 |
+ <tr> |
|
| 482 |
+ <th>구분</th> |
|
| 483 |
+ <th>특징</th> |
|
| 484 |
+ <th>가격</th> |
|
| 485 |
+ </tr> |
|
| 486 |
+ </thead> |
|
| 487 |
+ <tbody> |
|
| 488 |
+ <tr> |
|
| 489 |
+ <th>친구톡(텍스트)</th> |
|
| 490 |
+ <td rowspan="3">카카오톡을 통해 채널 친구 대상으로 발송이 가능한 광고성 메시지<br />(1,000자 이하의 텍스트 및 이미지 발송 가능)</td> |
|
| 491 |
+ <td><span>13.8</span>원</td> |
|
| 492 |
+ </tr> |
|
| 493 |
+ <tr> |
|
| 494 |
+ <th>친구톡(이미지)</th> |
|
| 495 |
+ <td><span>19.9</span>원</td> |
|
| 496 |
+ </tr> |
|
| 497 |
+ <tr> |
|
| 498 |
+ <th>친구톡(와이드 이미지)</th> |
|
| 499 |
+ <td><span>22.9</span>원</td> |
|
| 500 |
+ </tr> |
|
| 501 |
+ </tbody> |
|
| 502 |
+ </table> |
|
| 503 |
+ <!-- <span class="reqTxt4">* 텍스트 용량(Byte)에 대한 안내 : 한글2Byte, 영문·숫자 1Byte를 차지.</span> --> |
|
| 472 | 504 |
|
| 473 | 505 |
<p class="tType1_title"><img src="/publish/images/content/icon_fee_fax.png" alt="팩스 아이콘 이미지"> 팩스</p> |
| 474 | 506 |
<table class="tType2"> |
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?