From 4040af778af1d8dfdd9602e7fe0e1f8b065f7a04 Mon Sep 17 00:00:00 2001
From: Bradley Taylor <hello@brad-taylor.co.uk>
Date: Sat, 9 Apr 2022 09:41:01 +0100
Subject: [PATCH] Fix incorrect use of icon argument for crmButton function

---
 templates/CRM/Admin/Page/Navigation.tpl         | 2 +-
 templates/CRM/Badge/Page/Layout.tpl             | 2 +-
 templates/CRM/Batch/Form/Search.tpl             | 2 +-
 templates/CRM/Campaign/Form/Search/Campaign.tpl | 4 ++--
 templates/CRM/Campaign/Page/SurveyType.tpl      | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/CRM/Admin/Page/Navigation.tpl b/templates/CRM/Admin/Page/Navigation.tpl
index b101137c5b..70250afec5 100644
--- a/templates/CRM/Admin/Page/Navigation.tpl
+++ b/templates/CRM/Admin/Page/Navigation.tpl
@@ -20,7 +20,7 @@
 
   <div class="crm-block crm-content-block">
     <div id="new-menu-item">
-      {crmButton p="civicrm/admin/menu" q="action=add&reset=1" id="newMenuItem" icon="crm-i fa-plus-circle" style="margin-left: 6px;"}{ts}Add Menu Item{/ts}{/crmButton}
+      {crmButton p="civicrm/admin/menu" q="action=add&reset=1" id="newMenuItem" icon="plus-circle" style="margin-left: 6px;"}{ts}Add Menu Item{/ts}{/crmButton}
     </div>
     <div class="spacer"></div>
     <div style="padding-left: 48px;"><img src="{$config->resourceBase}i/logo_sm.png" /></div>
diff --git a/templates/CRM/Badge/Page/Layout.tpl b/templates/CRM/Badge/Page/Layout.tpl
index 88bca86ec1..c444e5cac7 100644
--- a/templates/CRM/Badge/Page/Layout.tpl
+++ b/templates/CRM/Badge/Page/Layout.tpl
@@ -48,7 +48,7 @@
 
       {if $action ne 1 and $action ne 2}
         <div class="action-link">
-          {crmButton q="action=add&reset=1" id="newbadge-layout" icon="crm-i fa-plus-circle"}{ts}New Badge Layout{/ts}{/crmButton}
+          {crmButton q="action=add&reset=1" id="newbadge-layout" icon="plus-circle"}{ts}New Badge Layout{/ts}{/crmButton}
         </div>
       {/if}
     </div>
diff --git a/templates/CRM/Batch/Form/Search.tpl b/templates/CRM/Batch/Form/Search.tpl
index ab14b30804..dd1379ebdd 100644
--- a/templates/CRM/Batch/Form/Search.tpl
+++ b/templates/CRM/Batch/Form/Search.tpl
@@ -22,7 +22,7 @@
   </table>
 </div>
 <div class="action-link">
-  {crmButton accesskey="N" p="civicrm/batch/add" q="reset=1&action=add" id="newBatch" icon="crm-i fa-plus-circle"}{ts}New Data Entry Batch{/ts}{/crmButton}<br/>
+  {crmButton accesskey="N" p="civicrm/batch/add" q="reset=1&action=add" id="newBatch" icon="plus-circle"}{ts}New Data Entry Batch{/ts}{/crmButton}<br/>
 </div>
 <table class="crm-batch-selector">
   <thead>
diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl
index d20a0580bd..3379eb3234 100644
--- a/templates/CRM/Campaign/Form/Search/Campaign.tpl
+++ b/templates/CRM/Campaign/Form/Search/Campaign.tpl
@@ -15,7 +15,7 @@
     {ts}None found.{/ts}
   </div>
   <div class="action-link">
-    {crmButton p="civicrm/campaign/add" q="reset=1" icon="crm-i fa-plus-circle" h=0}{ts}Add Campaign{/ts}{/crmButton}
+    {crmButton p="civicrm/campaign/add" q="reset=1" icon="plus-circle" h=0}{ts}Add Campaign{/ts}{/crmButton}
   </div>
 {elseif $buildSelector}
 
@@ -52,7 +52,7 @@
   </table>
 {else}
   <div class="action-link">
-    {crmButton p="civicrm/campaign/add" q="reset=1" icon="crm-i fa-plus-circle" h=0}{ts}Add Campaign{/ts}{/crmButton}
+    {crmButton p="civicrm/campaign/add" q="reset=1" icon="plus-circle" h=0}{ts}Add Campaign{/ts}{/crmButton}
   </div>
 {* build search form here *}
 
diff --git a/templates/CRM/Campaign/Page/SurveyType.tpl b/templates/CRM/Campaign/Page/SurveyType.tpl
index f446f1d576..1a1f1616ed 100644
--- a/templates/CRM/Campaign/Page/SurveyType.tpl
+++ b/templates/CRM/Campaign/Page/SurveyType.tpl
@@ -4,7 +4,7 @@
 {else}
 {if $rows}
 <div class="action-link">
-  {crmButton p=$addSurveyType.0 q=$addSurveyType.1 icon="crm-i fa-plus-circle"}{ts 1=$GName}Add %1{/ts}{/crmButton}
+  {crmButton p=$addSurveyType.0 q=$addSurveyType.1 icon="plus-circle"}{ts 1=$GName}Add %1{/ts}{/crmButton}
 </div>
 
 <div id={$gName}>
@@ -41,7 +41,7 @@
         </table>
         {/strip}
         <div class="action-link">
-          {crmButton p=$addSurveyType.0 q=$addSurveyType.1 icon="crm-i fa-plus-circle"}{ts 1=$GName}Add %1{/ts}{/crmButton}
+          {crmButton p=$addSurveyType.0 q=$addSurveyType.1 icon="plus-circle"}{ts 1=$GName}Add %1{/ts}{/crmButton}
         </div>
 
 </div>
-- 
2.25.1