Merge branch '5401_배포전테스트'
This commit is contained in:
JIWOO
commit
7af9d5db72
@ -1128,6 +1128,6 @@ public class KakaoSentController {
|
||||
e.printStackTrace();
|
||||
// TODO: handle exception
|
||||
}
|
||||
return "web/kakao/sent/KakaoSentDetailPopAjax";
|
||||
return "web/kakao/sent/KakaoSentDetailPhoneAjax";
|
||||
}
|
||||
}
|
||||
|
||||
@ -3645,8 +3645,6 @@
|
||||
AND A.MSG_GROUP_ID = B.MSG_GROUP_ID
|
||||
AND A.USER_ID = #userId#
|
||||
AND B.USER_ID = #userId#
|
||||
AND B.DEL_FLAG = 'N'
|
||||
AND IFNULL(B.DEL_FLAG,'N') = 'N'
|
||||
AND B.RESERVE_C_YN = 'N'
|
||||
|
||||
<isNotEmpty property="startDate">
|
||||
|
||||
@ -0,0 +1,155 @@
|
||||
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
|
||||
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
|
||||
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
|
||||
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
|
||||
<% pageContext.setAttribute("newLineChar", "\n"); %>
|
||||
|
||||
<div class="phone">
|
||||
<!-- 탭스타일 -->
|
||||
<div class="list_tab_wrap2 type5 kakao_rev_tab">
|
||||
<ul class="tabType3" id="tabType" name="tabType">
|
||||
<li class="tab active"><button type="button" onclick="phoneTab(this,'1');" title="선택됨">카카오톡</button></li>
|
||||
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
||||
<li class="tab"><button type="button" onclick="phoneTab(this,'2');">대체문자</button></li>
|
||||
</c:if>
|
||||
</ul>
|
||||
</div>
|
||||
<!--// 탭스타일 -->
|
||||
|
||||
<!-- 카카오 알림톡 미리보기 -->
|
||||
<!-- <div class="tab_phone current" id="tab_phone_1"> -->
|
||||
<!-- <div class="phone_kakako friendtalk"> -->
|
||||
<div class="tab_phone current kakao_wrap" id="tab_phone_1">
|
||||
<div class="phone_kakako friendtalk">
|
||||
<div class="phoneIn">
|
||||
<p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""><c:out value="${searchVO.yellowId}"/></p>
|
||||
<!-- 텍스트 미리보기 -->
|
||||
<div class="text_preview">
|
||||
<%--< div class="allimtalk_title">
|
||||
<img src="/publish/images/content/icon_allimtalk.png" alt="">
|
||||
<c:choose>
|
||||
<c:when test="${msgType eq '8'}">알림톡 도착</c:when>
|
||||
<c:when test="${msgType eq '9'}">친구톡 도착</c:when>
|
||||
</c:choose>
|
||||
</div> --%>
|
||||
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
||||
<p class="friend_talk_title"><span>(광고)</span></p>
|
||||
</c:if>
|
||||
<div class="allimtalk_content">
|
||||
<c:choose>
|
||||
<c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}">
|
||||
<p class="emphasis_side_text"><c:out value="${kakaoTemplateInfo.templateSubtitle}"/></p>
|
||||
<p class="emphasis_title_text"><c:out value="${kakaoTemplateInfo.templateTitle}"/></p>
|
||||
</c:when>
|
||||
<c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'IMAGE'}">
|
||||
<div class="kakao_image">
|
||||
<img src="<c:url value='${kakaoTemplateInfo.templateImageUrl}'/>" alt="">
|
||||
</div>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
|
||||
<p class="template_text">
|
||||
<c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
|
||||
</p>
|
||||
|
||||
<c:choose>
|
||||
<c:when test="${kakaoTemplateInfo.templateMessageType eq 'EX'}">
|
||||
<p class="side_info_text"><c:out value="${kakaoTemplateInfo.templateExtra}"/></p>
|
||||
</c:when>
|
||||
<c:when test="${kakaoTemplateInfo.templateMessageType eq 'AD'}">
|
||||
<p class="channel_info_text"><c:out value="${kakaoTemplateInfo.templateAd}"/></p>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
|
||||
<c:forEach var="templatInfoButtonList" items="${kakaoTemplateInfo.buttonList}" varStatus="status">
|
||||
<c:choose>
|
||||
<c:when test="${templatInfoButtonList.name eq '채널 추가'}">
|
||||
<button type="button" class="btn_kakao_channel"><img src="/publish/images/content/icon_kakao_channel_plus.png" alt=""> 채널추가</button>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<button type="button" class="btn_kakao_type"><c:out value="${templatInfoButtonList.name}"/></button>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:forEach>
|
||||
</div>
|
||||
|
||||
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
||||
<p class="kakao_block_text">수신거부 : 홈 > 채널차단</p>
|
||||
</c:if>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p>
|
||||
</div>
|
||||
</div>
|
||||
<!--// 카카오 알림톡 미리보기 -->
|
||||
|
||||
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
||||
<!-- 문자 미리보기 -->
|
||||
<div class="tab_phone" id="tab_phone_2" style="display: none;position:relative;">
|
||||
<!-- <div class="tab_phone" id="tab_phone_2" > -->
|
||||
<!-- <div class="tab_phone" id="tab_phone_2" style="display:none" > -->
|
||||
<div class="phoneIn">
|
||||
<div>
|
||||
<p class="prev_p"><img src="/publish/images/search.png"> 문자내용</p>
|
||||
<div class="text_length2 clearfix">
|
||||
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
||||
<c:choose>
|
||||
<c:when test="${resultMsgDetail.bizKakaoResendType eq 'SMS'}">
|
||||
<span class="msg_com msg_short">단문</span>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<span class="msg_com msg_long">장문</span>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<%-- <c:choose>
|
||||
<c:when test="${resultMsgDetail.bizKakaoResendTypeCnt > 1}">
|
||||
<span class="msg_com msg_short">단문</span>
|
||||
<span class="msg_com msg_long">장문</span>
|
||||
</c:when>
|
||||
<c:when test="${resultMsgDetail.bizKakaoResendTypeCnt < 2
|
||||
&& resultMsgDetail.bizKakaoResendType eq 'SMS'}">
|
||||
<span class="msg_com msg_short">단문</span>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<span class="msg_com msg_long">장문</span>
|
||||
</c:otherwise>
|
||||
</c:choose> --%>
|
||||
</c:if>
|
||||
<!-- <div>
|
||||
<span>글자크기</span>
|
||||
<button type="button" onclick="changeFontSize('plus');"><img src="/publish/images/content/font_plus.png"></button>
|
||||
<button type="button" onclick="changeFontSize('minus');"><img src="/publish/images/content/font_minus.png"></button>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="text_preview">
|
||||
<c:if test="${not empty fileInfos}">
|
||||
<div class="preiew_img">
|
||||
<c:forEach var="fileInfo" items="${fileInfos}">
|
||||
<div class="img_box">
|
||||
<img src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${fileInfo.atchFileId}"/>&fileSn=<c:out value="${fileInfo.fileSn}"/>" alt="발송된 그림문자 미리보기" style="width: 100%">
|
||||
</div>
|
||||
</c:forEach>
|
||||
</div>
|
||||
</c:if>
|
||||
<div class="preview_auto">
|
||||
|
||||
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
||||
<p class="ad_tit">(광고)</p>
|
||||
</c:if>
|
||||
<p class="realtime">${fn:replace(resultMsgDetail.bizKakaoResendOrgnlTxt, newLineChar, "<br/>")}</p>
|
||||
|
||||
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
||||
<p class="deny_receipt">무료거부 0808800858</p>
|
||||
</c:if>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p>
|
||||
</div>
|
||||
</c:if>
|
||||
<!--// 문자 미리보기 -->
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user