이지우 - 사용내역 내 알림톡 상세 팝업 수정
@47b8d7668a360ed695274d004c289651b21ce5c4
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
... | ... | @@ -21,53 +21,64 @@ |
| 21 | 21 |
<div class="tab_phone current kakao_wrap" id="tab_phone_1"> |
| 22 | 22 |
<div class="phone_kakako"> |
| 23 | 23 |
<div class="phoneIn"> |
| 24 |
- <p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""><c:out value="${resultMsgDetail.yellowId}"/></p>
|
|
| 25 | 24 |
<!-- 텍스트 미리보기 --> |
| 26 |
- <div class="text_preview"> |
|
| 27 |
- <div class="allimtalk_title"> |
|
| 28 |
- <img src="/publish/images/content/icon_allimtalk.png" alt=""> |
|
| 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 | 29 |
<c:choose> |
| 30 |
- <c:when test="${msgType eq '8'}">알림톡 도착</c:when>
|
|
| 31 |
- <c:when test="${msgType eq '9'}">친구톡 도착</c:when>
|
|
| 30 |
+ <c:when test="${msgType eq '8'}">알림톡</c:when>
|
|
| 31 |
+ <c:when test="${msgType eq '9'}">친구톡</c:when>
|
|
| 32 | 32 |
</c:choose> |
| 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> |
|
| 33 |
+ </span> |
|
| 34 |
+ </div> |
|
| 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 |
+ |
|
| 57 |
+ <p class="template_text"> |
|
| 58 |
+ <c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
|
|
| 59 |
+ </p> |
|
| 60 |
+ |
|
| 61 |
+ <c:choose> |
|
| 62 |
+ <c:when test="${kakaoTemplateInfo.templateMessageType eq 'EX'}">
|
|
| 63 |
+ <p class="side_info_text"><c:out value="${kakaoTemplateInfo.templateExtra}"/></p>
|
|
| 64 |
+ </c:when> |
|
| 65 |
+ <c:when test="${kakaoTemplateInfo.templateMessageType eq 'AD'}">
|
|
| 66 |
+ <p class="channel_info_text"><c:out value="${kakaoTemplateInfo.templateAd}"/></p>
|
|
| 67 |
+ </c:when> |
|
| 68 |
+ </c:choose> |
|
| 69 |
+ |
|
| 70 |
+ <c:forEach var="templatInfoButtonList" items="${kakaoTemplateInfo.buttonList}" varStatus="status">
|
|
| 71 |
+ <c:choose> |
|
| 72 |
+ <c:when test="${templatInfoButtonList.name eq '채널 추가'}">
|
|
| 73 |
+ <button type="button" class="btn_kakao_channel"><img src="/publish/images/content/icon_kakao_channel_plus.png" alt=""> 채널추가</button> |
|
| 74 |
+ </c:when> |
|
| 75 |
+ <c:otherwise> |
|
| 76 |
+ <button type="button" class="btn_kakao_type"><c:out value="${templatInfoButtonList.name}"/></button>
|
|
| 77 |
+ </c:otherwise> |
|
| 78 |
+ </c:choose> |
|
| 79 |
+ </c:forEach> |
|
| 80 |
+ </div> |
|
| 81 |
+ </div> |
|
| 71 | 82 |
</div> |
| 72 | 83 |
</div> |
| 73 | 84 |
<p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> |
... | ... | @@ -81,33 +92,35 @@ |
| 81 | 92 |
<div class="tab_phone" id="tab_phone_2" style="display:none" > |
| 82 | 93 |
<div class="phoneIn"> |
| 83 | 94 |
<div> |
| 84 |
- <p class="prev_p"><img src="/publish/images/search.png"> 문자내용</p> |
|
| 85 | 95 |
<div class="text_length2 clearfix"> |
| 96 |
+ <span>발송일시 : <fmt:formatDate value="${parsedDate}" pattern="yyyy-MM-dd HH:mm:ss"/></span>
|
|
| 86 | 97 |
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
| 87 | 98 |
<c:choose> |
| 88 | 99 |
<c:when test="${resultMsgDetail.bizKakaoResendTypeCnt > 1}">
|
| 89 |
- <span class="msg_com msg_short">단문</span> |
|
| 90 |
- <span class="msg_com msg_long">장문</span> |
|
| 100 |
+ <span class="msg_com msg_short" style="float:right;">단문</span> |
|
| 101 |
+ <span class="msg_com msg_long" style="float:right;">장문</span> |
|
| 91 | 102 |
</c:when> |
| 92 | 103 |
<c:when test="${resultMsgDetail.bizKakaoResendTypeCnt < 2
|
| 93 | 104 |
&& resultMsgDetail.bizKakaoResendType eq 'SMS'}"> |
| 94 |
- <span class="msg_com msg_short">단문</span> |
|
| 105 |
+ <span class="msg_com msg_short" style="float:right;">단문</span> |
|
| 95 | 106 |
</c:when> |
| 96 | 107 |
<c:otherwise> |
| 97 |
- <span class="msg_com msg_long">장문</span> |
|
| 108 |
+ <span class="msg_com msg_long" style="float:right;">장문</span> |
|
| 98 | 109 |
</c:otherwise> |
| 99 | 110 |
</c:choose> |
| 100 | 111 |
</c:if> |
| 101 |
- <div> |
|
| 112 |
+ <!-- <div> |
|
| 102 | 113 |
<span>글자크기</span> |
| 103 | 114 |
<button type="button" onclick="changeFontSize('plus');"><img src="/publish/images/content/font_plus.png"></button>
|
| 104 | 115 |
<button type="button" onclick="changeFontSize('minus');"><img src="/publish/images/content/font_minus.png"></button>
|
| 105 |
- </div> |
|
| 116 |
+ </div -->> |
|
| 106 | 117 |
</div> |
| 107 |
- <div class="text_preview"> |
|
| 108 |
- <div class="preview_auto"> |
|
| 109 |
- <p class="realtime">${fn:replace(resultMsgDetail.bizKakaoResendOrgnlTxt, newLineChar, "<br/>")}</p>
|
|
| 110 |
- </div> |
|
| 118 |
+ <div class="rev_pop_txt"> |
|
| 119 |
+ <div class="text_preview"> |
|
| 120 |
+ <div class="preview_auto"> |
|
| 121 |
+ <p class="realtime">${fn:replace(resultMsgDetail.bizKakaoResendOrgnlTxt, newLineChar, "<br/>")}</p>
|
|
| 122 |
+ </div> |
|
| 123 |
+ </div> |
|
| 111 | 124 |
</div> |
| 112 | 125 |
</div> |
| 113 | 126 |
</div> |
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?