From 58b2cf18c25a82fcf1b6bfe222a48f2cd14739cf Mon Sep 17 00:00:00 2001 From: Alice Frumin Date: Wed, 18 Sep 2019 10:01:09 -0400 Subject: [PATCH] remove print icon --- CRM/Contribute/Form/ContributionBase.php | 3 --- CRM/Core/Invoke.php | 6 ------ CRM/Event/Form/Registration.php | 3 --- css/civicrm.css | 10 ---------- templates/CRM/common/CMSPrint.tpl | 16 ---------------- templates/CRM/common/joomla.tpl | 8 -------- 6 files changed, 46 deletions(-) diff --git a/CRM/Contribute/Form/ContributionBase.php b/CRM/Contribute/Form/ContributionBase.php index 0399436fd8..f51adb5fc6 100644 --- a/CRM/Contribute/Form/ContributionBase.php +++ b/CRM/Contribute/Form/ContributionBase.php @@ -286,9 +286,6 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form { // we do not want to display recently viewed items, so turn off $this->assign('displayRecent', FALSE); - // Contribution page values are cleared from session, so can't use normal Printer Friendly view. - // Use Browser Print instead. - $this->assign('browserPrint', TRUE); // action $this->_action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE, 'add'); diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php index 9f9a8b776b..bc9dad29b1 100644 --- a/CRM/Core/Invoke.php +++ b/CRM/Core/Invoke.php @@ -193,12 +193,6 @@ class CRM_Core_Invoke { $template->assign('formTpl', 'default'); if ($item) { - // CRM-7656 - make sure we send a clean sanitized path to create printer friendly url - $printerFriendly = CRM_Utils_System::makeURL( - 'snippet', FALSE, FALSE, - CRM_Utils_Array::value('path', $item) - ) . '2'; - $template->assign('printerFriendly', $printerFriendly); if (!array_key_exists('page_callback', $item)) { CRM_Core_Error::debug('Bad item', $item); diff --git a/CRM/Event/Form/Registration.php b/CRM/Event/Form/Registration.php index 2ac4111730..48fb9ed91c 100644 --- a/CRM/Event/Form/Registration.php +++ b/CRM/Event/Form/Registration.php @@ -394,9 +394,6 @@ class CRM_Event_Form_Registration extends CRM_Core_Form { // we do not want to display recently viewed items on Registration pages $this->assign('displayRecent', FALSE); - // Registration page values are cleared from session, so can't use normal Printer Friendly view. - // Use Browser Print instead. - $this->assign('browserPrint', TRUE); $isShowLocation = CRM_Utils_Array::value('is_show_location', $this->_values['event']); $this->assign('isShowLocation', $isShowLocation); diff --git a/css/civicrm.css b/css/civicrm.css index 44028787ed..83b5ca35f0 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -1812,16 +1812,6 @@ input.crm-form-entityref { /* Set/alter ICONS */ -#crm-container div#printer-friendly { - float: right; - position: relative; - margin: -2em 0.5em 0 0; -} -/* For Joomla, margin 0 works correctly */ -#crm-container table#crm-content div#printer-friendly { - margin: 0; -} - #crm-container .order-icon { height: 15px; width: 10px; diff --git a/templates/CRM/common/CMSPrint.tpl b/templates/CRM/common/CMSPrint.tpl index f091432f47..75df8102bf 100644 --- a/templates/CRM/common/CMSPrint.tpl +++ b/templates/CRM/common/CMSPrint.tpl @@ -40,22 +40,6 @@ {/if} -{if isset($browserPrint) and $browserPrint} -{* Javascript window.print link. Used for public pages where we can't do printer-friendly view. *} -
- - - -
-{else} -{* Printer friendly link/icon. *} -
- - - -
-{/if} - {if $pageTitle}

{if $isDeleted}{/if}{$pageTitle}{if $isDeleted}{/if}

diff --git a/templates/CRM/common/joomla.tpl b/templates/CRM/common/joomla.tpl index 71f11c2b84..7902146d48 100644 --- a/templates/CRM/common/joomla.tpl +++ b/templates/CRM/common/joomla.tpl @@ -49,14 +49,6 @@
{/if} -{if $browserPrint} -{* Javascript window.print link. Used for public pages where we can't do printer-friendly view. *} -
-{else} -{* Printer friendly link/icon. *} -
-{/if} - {if $pageTitle}

{if $isDeleted}{/if}{$pageTitle}{if $isDeleted}{/if}

-- 2.25.1