From fc164be7b33d7ea5124aac30422364daf76fa53f Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 25 Mar 2014 12:37:35 -0400 Subject: [PATCH] More cleanup of mailing previews --- CRM/Mailing/BAO/Mailing.php | 19 +++---------------- CRM/Mailing/Page/View.php | 8 +++++--- templates/CRM/Mailing/Page/Tab.tpl | 22 ---------------------- 3 files changed, 8 insertions(+), 41 deletions(-) diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 50303221ee..c7c18d4cac 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -2564,27 +2564,14 @@ SELECT $mailing.id as mailing_id } } - $text = CRM_Utils_Request::retrieve('text', 'Boolean', $form); - if ($text) { - CRM_Core_Page_AJAX::returnJsonResponse("
{$textHeader}
{$report['mailing']['body_text']}
{$textFooter}
"); - } - - if (!$isSMS) { - $html = CRM_Utils_Request::retrieve('html', 'Boolean', $form); - if ($html) { - $output = $htmlHeader . $report['mailing']['body_html'] . $htmlFooter ; - CRM_Core_Page_AJAX::returnJsonResponse(str_replace("\n", '
', $output)); - } - } - if (!empty($report['mailing']['body_text'])) { - $url = CRM_Utils_System::url('civicrm/mailing/report', 'reset=1&text=1&mid=' . $form->_mailing_id); + $url = CRM_Utils_System::url('civicrm/mailing/view', 'reset=1&text=1&id=' . $form->_mailing_id); $form->assign('textViewURL', $url); } if (!$isSMS) { if (!empty($report['mailing']['body_html'])) { - $url = CRM_Utils_System::url('civicrm/mailing/report', 'reset=1&html=1&mid=' . $form->_mailing_id); + $url = CRM_Utils_System::url('civicrm/mailing/view', 'reset=1&id=' . $form->_mailing_id); $form->assign('htmlViewURL', $url); } } @@ -2772,7 +2759,7 @@ AND m.id = %1 'url' => 'civicrm/mailing/view', 'qs' => "reset=1&id=%%mid%%", 'title' => ts('View Mailing'), - 'class' => 'crm-mailing-view', + 'class' => 'crm-popup', ), CRM_Core_Action::BROWSE => array( 'name' => ts('Mailing Report'), diff --git a/CRM/Mailing/Page/View.php b/CRM/Mailing/Page/View.php index 7d9129798d..e2dde85bd8 100644 --- a/CRM/Mailing/Page/View.php +++ b/CRM/Mailing/Page/View.php @@ -128,7 +128,6 @@ class CRM_Mailing_Page_View extends CRM_Core_Page { $contactId = $this->_contactID; } else { - $details = array('test'); //get tokens that are not contact specific resolved $params = array('contact_id' => 0); $details = CRM_Utils_Token::getAnonymousTokenDetails($params, @@ -148,8 +147,7 @@ class CRM_Mailing_Page_View extends CRM_Core_Page { ); $title = NULL; - if (isset($this->_mailing->body_html)) { - + if (isset($this->_mailing->body_html) && empty($_GET['text'])) { $header = 'Content-Type: text/html; charset=utf-8'; $content = $mime->getHTMLBody(); if (strpos($content, '') === FALSE && strpos($content, '') === FALSE) { @@ -160,7 +158,11 @@ class CRM_Mailing_Page_View extends CRM_Core_Page { $header = 'Content-Type: text/plain; charset=utf-8'; $content = $mime->getTXTBody(); } + CRM_Utils_System::setTitle($this->_mailing->subject); + if (CRM_Utils_Array::value('snippet', $_GET) === 'json') { + CRM_Core_Page_AJAX::returnJsonResponse($content); + } if ($print) { header($header); print $title; diff --git a/templates/CRM/Mailing/Page/Tab.tpl b/templates/CRM/Mailing/Page/Tab.tpl index c9e7022b35..f86f6ddf41 100644 --- a/templates/CRM/Mailing/Page/Tab.tpl +++ b/templates/CRM/Mailing/Page/Tab.tpl @@ -83,31 +83,9 @@ "sNext": {/literal}"{ts escape='js'}Next{/ts}"{literal}, "sLast": {/literal}"{ts escape='js'}Last{/ts}"{literal} } - }, - "fnDrawCallback": function () { - addMailingViewDialog() } }); } - - function addMailingViewDialog() { - $('a.crm-mailing-view').click(function() { - var o = $('<div class="crm-container crm-mailing-view-dialog"></div>'); - o.block({theme: true}); - o.load($(this).attr('href'), function() { - o.unblock(); - }); - - CRM.confirm({ - title: ts('Email Message'), - message: o, - width : 680, - height: 560 - }); - return false; - }); - } - }); </script> {/literal} -- 2.25.1