CRM-16415 smarty crmButton uses and many instances of close

----------------------------------------
* CRM-16415: Implement Font Awesome icon font
  https://issues.civicrm.org/jira/browse/CRM-16415

diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php
index 98fc261d03b9cfa8a88eef379c1cec9a2b632549..57275373a04cadac6f1b86123ce11b12d77683f5 100644 (file)
--- a/CRM/Core/Form/Renderer.php
+++ b/CRM/Core/Form/Renderer.php
@@ -323,7 +323,7 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
     // Initially hide if not needed
     // Note: visibility:hidden prevents layout jumping around unlike display:none
     $display = $field->getValue() !== NULL ? '' : ' style="visibility:hidden;"';
-    $el['html'] .= ' <a href="#" class="crm-hover-button crm-clear-link"' . $display . ' title="' . ts('Clear') . '"><span class="icon ui-icon-close"></span></a>';
+    $el['html'] .= ' <a href="#" class="crm-hover-button crm-clear-link"' . $display . ' title="' . ts('Clear') . '"><i class="crm-i fa-times"></i></a>';
   }
 
 }

diff --git a/CRM/Core/Smarty/plugins/block.crmButton.php b/CRM/Core/Smarty/plugins/block.crmButton.php
index a53156a25a309068e4025ce2f8368401bc3035ce..fa98b5e41f118a75b060e6339d103cb8df29eddf 100644 (file)
--- a/CRM/Core/Smarty/plugins/block.crmButton.php
+++ b/CRM/Core/Smarty/plugins/block.crmButton.php
@@ -58,5 +58,5 @@ function smarty_block_crmButton($params, $text, &$smarty) {
   // All other params are treated as html attributes
   CRM_Utils_Array::remove($params, 'icon', 'p', 'q', 'a', 'f', 'h', 'fb', 'fe');
   $attributes = CRM_Utils_String::htmlAttributes($params);
-  return "<a $attributes><span><span class='icon ui-icon-$icon'></span> $text</span></a>";
+  return "<a $attributes><span><span class='crm-i fa-$icon'></span> $text</span></a>";
 }

diff --git a/bower.json b/bower.json
index 5d0e6e166d13e5fa11feb209f35bb632571e567a..11b68796101141ad8b735b9ed520f9223781e75c 100644 (file)
--- a/bower.json
+++ b/bower.json
@@ -23,7 +23,7 @@
     "jquery-validation": "~1.13",
     "datatables": "~1.10",
     "ckeditor": "~4.5",
-    "font-awesome": "~4.3",
+    "font-awesome": "~4.4",
     "angular-sanitize": "~1.3.15"
   },
   "resolutions": {

diff --git a/templates/CRM/ACL/Page/ACL.tpl b/templates/CRM/ACL/Page/ACL.tpl
index 9957bd29bbf4ec4135ec0fca4a21556f7ee0688d..830d88a1045bc4e619e3fb24db9c8704493e524f 100644 (file)
--- a/templates/CRM/ACL/Page/ACL.tpl
+++ b/templates/CRM/ACL/Page/ACL.tpl
@@ -67,7 +67,7 @@
 
         {if $action ne 1 and $action ne 2}
           <div class="action-link">
-            {crmButton q="action=add&reset=1" id="newACL"  icon="circle-plus"}{ts}Add ACL{/ts}{/crmButton}
+            {crmButton q="action=add&reset=1" id="newACL"  icon="plus-circle"}{ts}Add ACL{/ts}{/crmButton}
           </div>
         {/if}
       </div>

diff --git a/templates/CRM/ACL/Page/EntityRole.tpl b/templates/CRM/ACL/Page/EntityRole.tpl
index 2d4226fec2f19d8abcc8f2b8ee401ed4bc88a9b8..14e3318504f5fb171f76ffaabe1694e9ee3c9682 100644 (file)
--- a/templates/CRM/ACL/Page/EntityRole.tpl
+++ b/templates/CRM/ACL/Page/EntityRole.tpl
@@ -60,7 +60,7 @@
 
         {if $action ne 1 and $action ne 2}
       <div class="crm-submit-buttons">
-            {crmButton q="action=add&reset=1" id="newACL"  icon="circle-plus"}{ts}Add Role Assignment{/ts}{/crmButton}
+            {crmButton q="action=add&reset=1" id="newACL"  icon="plus-circle"}{ts}Add Role Assignment{/ts}{/crmButton}
         </div>
         {/if}
 </div>

diff --git a/templates/CRM/Admin/Page/ContactType.tpl b/templates/CRM/Admin/Page/ContactType.tpl
index 58fee6df208bc692e0466dcd045b57e31c3d11bf..0b58e0ce8fa90bbd0765978e53b427fd7f44f9a0 100644 (file)
--- a/templates/CRM/Admin/Page/ContactType.tpl
+++ b/templates/CRM/Admin/Page/ContactType.tpl
@@ -63,7 +63,7 @@
     </div>
   {/if}
   <div class="action-link">
-    {crmButton q="action=add&reset=1" icon="circle-plus"}{ts}Add Contact Type{/ts}{/crmButton}
-    {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+    {crmButton q="action=add&reset=1" icon="plus-circle"}{ts}Add Contact Type{/ts}{/crmButton}
+    {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
   </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/EventTemplate.tpl b/templates/CRM/Admin/Page/EventTemplate.tpl
index 3a20e1da7ec311a63edca61647f52791e98cf3f0..482912eee44c24b6d047ffa08ac89684a2c3a739 100644 (file)
--- a/templates/CRM/Admin/Page/EventTemplate.tpl
+++ b/templates/CRM/Admin/Page/EventTemplate.tpl
@@ -30,7 +30,7 @@
 <div class="crm-content-block">
 {if $action ne 1 and $action ne 2}
       <div class="action-link">
-        {crmButton p="civicrm/event/add" q="action=add&is_template=1&reset=1" id="newEventTemplate"  icon="circle-plus"}{ts}Add Event Template{/ts}{/crmButton}
+        {crmButton p="civicrm/event/add" q="action=add&is_template=1&reset=1" id="newEventTemplate"  icon="plus-circle"}{ts}Add Event Template{/ts}{/crmButton}
         <div class="clear"></div>
       </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/Job.tpl b/templates/CRM/Admin/Page/Job.tpl
index 06bc3374b0f56f4b623d28c6c661dcf816b6742a..527005ef212451393e22bbd4d3cffe223f604a25 100644 (file)
--- a/templates/CRM/Admin/Page/Job.tpl
+++ b/templates/CRM/Admin/Page/Job.tpl
@@ -36,8 +36,8 @@
 
       {if $action ne 1 and $action ne 2}
         <div class="action-link">
-          {crmButton q="action=add&reset=1" id="newJob"  icon="circle-plus"}{ts}Add New Scheduled Job{/ts}{/crmButton}
-          {crmButton p='civicrm/admin/joblog' q="reset=1" id="jobLog"  icon="zoomin"}{ts}View Log (all jobs){/ts}{/crmButton}
+          {crmButton q="action=add&reset=1" id="newJob"  icon="plus-circle"}{ts}Add New Scheduled Job{/ts}{/crmButton}
+          {crmButton p='civicrm/admin/joblog' q="reset=1" id="jobLog" icon="list-alt"}{ts}View Log (all jobs){/ts}{/crmButton}
         </div>
       {/if}
 

diff --git a/templates/CRM/Admin/Page/LocationType.tpl b/templates/CRM/Admin/Page/LocationType.tpl
index fb3934095fb56ee54df0e70890f3bee6e8f885bd..d199af306f28b38c1b98f8b6f7f7ad8211fa03fd 100644 (file)
--- a/templates/CRM/Admin/Page/LocationType.tpl
+++ b/templates/CRM/Admin/Page/LocationType.tpl
@@ -69,7 +69,7 @@
     </div>
   {/if}
   <div class="action-link">
-    {crmButton q="action=add&reset=1" id="newLocationType" icon="circle-plus"}{ts}Add Option{/ts}{/crmButton}
-    {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+    {crmButton q="action=add&reset=1" id="newLocationType" icon="plus-circle"}{ts}Add Option{/ts}{/crmButton}
+    {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
   </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/MailSettings.tpl b/templates/CRM/Admin/Page/MailSettings.tpl
index 77d7181a756c6feaca16ad0dd8c56183752ac5fc..5d2e49410902f568b0593d1254c0bbe3f73c7012 100644 (file)
--- a/templates/CRM/Admin/Page/MailSettings.tpl
+++ b/templates/CRM/Admin/Page/MailSettings.tpl
@@ -75,7 +75,7 @@
     </div>
 {/if}
   <div class="action-link">
-    {crmButton q="action=add&reset=1" id="newMailSettings"  icon="circle-plus"}{ts}Add Mail Account{/ts}{/crmButton}
-    {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+    {crmButton q="action=add&reset=1" id="newMailSettings"  icon="plus-circle"}{ts}Add Mail Account{/ts}{/crmButton}
+    {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
   </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl
index eb47f5051f8e9517a1bf6c807612f1dbc1ba0e2e..b5e14ff390e74243e753694ac0ebd1410e13bf24 100644 (file)
--- a/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -142,7 +142,7 @@
 
             {if $action ne 1 and $action ne 2 and $type eq 'userTemplates'}
               <div class="action-link">
-                {crmButton p='civicrm/admin/messageTemplates/add' q="action=add&reset=1" id="newMessageTemplates"  icon="circle-plus"}{ts}Add Message Template{/ts}{/crmButton}
+                {crmButton p='civicrm/admin/messageTemplates/add' q="action=add&reset=1" id="newMessageTemplates"  icon="plus-circle"}{ts}Add Message Template{/ts}{/crmButton}
               </div>
               <div class="spacer"></div>
             {/if}

diff --git a/templates/CRM/Admin/Page/OptionGroup.tpl b/templates/CRM/Admin/Page/OptionGroup.tpl
index 6e520f889686d7e74c9edfcb7cbe416a69e4fad2..9b2f03e019325a59ba5a882c73d001bfc1e01283 100644 (file)
--- a/templates/CRM/Admin/Page/OptionGroup.tpl
+++ b/templates/CRM/Admin/Page/OptionGroup.tpl
@@ -57,8 +57,8 @@
 
     {if $action ne 1 and $action ne 2}
       <div class="action-link">
-          {crmButton q="action=add&reset=1" id="newOptionGroup"  icon="circle-plus"}{ts}Add Option Group{/ts}{/crmButton}
-          {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+          {crmButton q="action=add&reset=1" id="newOptionGroup"  icon="plus-circle"}{ts}Add Option Group{/ts}{/crmButton}
+          {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
         </div>
     {/if}
 </div>

diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl
index 4b0d4db38e873c96ee24a69b74e7cb2af4f162e8..104760f65ed7b2c331f27b1e5cc9bca9aaed2055 100644 (file)
--- a/templates/CRM/Admin/Page/Options.tpl
+++ b/templates/CRM/Admin/Page/Options.tpl
@@ -72,7 +72,7 @@
 {if $rows}
 {if $isLocked ne 1}
     <div class="action-link">
-        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="circle-plus"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
+        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
     </div>
 {/if}
 <div id={$gName}>
@@ -158,9 +158,9 @@
 {/if}
     <div class="action-link">
       {if $isLocked ne 1}
-        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="circle-plus"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
+        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
       {/if}
-      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
     </div>
 </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/ParticipantStatusType.tpl b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
index d07c78ec682e71a2c0c9ac6ee6139d7b18657064..b5d7cb2971d31f40879db8d43967455a7f9a9df3 100644 (file)
--- a/templates/CRM/Admin/Page/ParticipantStatusType.tpl
+++ b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
@@ -62,8 +62,8 @@
 
   {if $action ne 1 and $action ne 2}
     <div class="action-link">
-      {crmButton q="action=add&reset=1" icon="circle-plus"}{ts}Add Participant Status{/ts}{/crmButton}
-      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+      {crmButton q="action=add&reset=1" icon="plus-circle"}{ts}Add Participant Status{/ts}{/crmButton}
+      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
     </div>
   {/if}
 </div>

diff --git a/templates/CRM/Admin/Page/PaymentProcessor.tpl b/templates/CRM/Admin/Page/PaymentProcessor.tpl
index c6e06dfa8427dc4ea3f98d3acd15d95be4b2671a..873f0754f3c42a746141ec7a155fb60b8fb76c2b 100644 (file)
--- a/templates/CRM/Admin/Page/PaymentProcessor.tpl
+++ b/templates/CRM/Admin/Page/PaymentProcessor.tpl
@@ -62,7 +62,7 @@
 
         {if $action ne 1 and $action ne 2}
         <div class="action-link">
-          {crmButton q="action=add&reset=1&pp=$defaultPaymentProcessorType" id="newPaymentProcessor"  icon="circle-plus"}{ts}Add Payment Processor{/ts}{/crmButton}
+          {crmButton q="action=add&reset=1&pp=$defaultPaymentProcessorType" id="newPaymentProcessor"  icon="plus-circle"}{ts}Add Payment Processor{/ts}{/crmButton}
         </div>
         {/if}
 </div>
@@ -72,7 +72,7 @@
         {ts}There are no Payment Processors entered.{/ts}
      </div>
      <div class="action-link">
-       {crmButton p='civicrm/admin/paymentProcessor' q="action=add&reset=1&pp=$defaultPaymentProcessorType" id="newPaymentProcessor"  icon="circle-plus"}{ts}Add Payment Processor{/ts}{/crmButton}
+       {crmButton p='civicrm/admin/paymentProcessor' q="action=add&reset=1&pp=$defaultPaymentProcessorType" id="newPaymentProcessor"  icon="plus-circle"}{ts}Add Payment Processor{/ts}{/crmButton}
      </div>
 {/if}
 {/if}

diff --git a/templates/CRM/Admin/Page/PaymentProcessorType.tpl b/templates/CRM/Admin/Page/PaymentProcessorType.tpl
index 8464941f31706cfd67ab167e179dbd2033cdf71c..e09bd7c10dfa2943836e4766e23c4bcbc4bc8dfa 100644 (file)
--- a/templates/CRM/Admin/Page/PaymentProcessorType.tpl
+++ b/templates/CRM/Admin/Page/PaymentProcessorType.tpl
@@ -62,7 +62,7 @@
         {if $action ne 1 and $action ne 2}
         <div class="action-link">
           <a href="{crmURL q="action=add&reset=1"}" id="newPaymentProcessor">&raquo; {ts}New Payment Processor{/ts}</a>
-          {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+          {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
         </div>
         {/if}
     </div>

diff --git a/templates/CRM/Admin/Page/PdfFormats.tpl b/templates/CRM/Admin/Page/PdfFormats.tpl
index c480089c0386e417540dbabfc17f90ea963cf7ee..c7853be3f2ba81f578654c7acae7441071255cdc 100644 (file)
--- a/templates/CRM/Admin/Page/PdfFormats.tpl
+++ b/templates/CRM/Admin/Page/PdfFormats.tpl
@@ -65,7 +65,7 @@
 {/if}
     <div class="spacer"></div>
     <div class="action-link">
-      {crmButton q="action=add&reset=1" id="newPdfFormat"  icon="circle-plus"}{ts}Add PDF Page Format{/ts}{/crmButton}
-      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+      {crmButton q="action=add&reset=1" id="newPdfFormat"  icon="plus-circle"}{ts}Add PDF Page Format{/ts}{/crmButton}
+      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
     </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/Persistent.tpl b/templates/CRM/Admin/Page/Persistent.tpl
index bac43642be59ddfea8d51af3e51d6b4590a1c098..499fdd4bf7e4bb7c879a9b119f21e0ddf607a4a2 100644 (file)
--- a/templates/CRM/Admin/Page/Persistent.tpl
+++ b/templates/CRM/Admin/Page/Persistent.tpl
@@ -2,7 +2,7 @@
 {if $type eq 'configTemplates'}
     <table class="report-layout">
       <div class="action-link">
-        {crmButton p='civicrm/admin/tplstrings/add' q='reset=1&action=add' icon="circle-plus"}{ts}Add New String{/ts}{/crmButton}
+        {crmButton p='civicrm/admin/tplstrings/add' q='reset=1&action=add' icon="plus-circle"}{ts}Add New String{/ts}{/crmButton}
       </div>
       {if !empty( $template_row) }
       <tr>
@@ -33,7 +33,7 @@
       </head>
       <br/>
       <div class="action-link">
-         {crmButton p='civicrm/admin/tplstrings/add' q='reset=1&action=add&config=1' icon="circle-plus"}{ts}Add New Config{/ts}{/crmButton}
+         {crmButton p='civicrm/admin/tplstrings/add' q='reset=1&action=add&config=1' icon="plus-circle"}{ts}Add New Config{/ts}{/crmButton}
       </div>
       <br/>
       {if !empty( $template_row) }

diff --git a/templates/CRM/Admin/Page/RelationshipType.tpl b/templates/CRM/Admin/Page/RelationshipType.tpl
index 98d89f03d835b2b65de58b5dd74adad4686355f0..edde7f1074dceb6c5536e0d920c057024d809e2a 100644 (file)
--- a/templates/CRM/Admin/Page/RelationshipType.tpl
+++ b/templates/CRM/Admin/Page/RelationshipType.tpl
@@ -36,7 +36,7 @@
 {if $rows}
 {if !($action eq 1 and $action eq 2)}
     <div class="action-link">
-      {crmButton q="action=add&reset=1" class="newRelationshipType" icon="circle-plus"}{ts}Add Relationship Type{/ts}{/crmButton}
+      {crmButton q="action=add&reset=1" class="newRelationshipType" icon="plus-circle"}{ts}Add Relationship Type{/ts}{/crmButton}
     </div>
 {/if}
 
@@ -82,7 +82,7 @@
     </div>
 {/if}
   <div class="action-link">
-    {crmButton q="action=add&reset=1" class="newRelationshipType" icon="circle-plus"}{ts}Add Relationship Type{/ts}{/crmButton}
-    {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+    {crmButton q="action=add&reset=1" class="newRelationshipType" icon="plus-circle"}{ts}Add Relationship Type{/ts}{/crmButton}
+    {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
   </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/ScheduleReminders.tpl b/templates/CRM/Admin/Page/ScheduleReminders.tpl
index d568af75d77995f6f9cdc5898ddfc0ca4b8edf58..cca81aa1758dd02eddccc040962d0188b2fea241 100644 (file)
--- a/templates/CRM/Admin/Page/ScheduleReminders.tpl
+++ b/templates/CRM/Admin/Page/ScheduleReminders.tpl
@@ -55,7 +55,7 @@
     {else}
       {assign var='urlParams' value="action=add&reset=1"}
     {/if}
-    {crmButton p=$link q=$urlParams id="newScheduleReminder"  icon="circle-plus"}{ts}Add Reminder{/ts}{/crmButton}
+    {crmButton p=$link q=$urlParams id="newScheduleReminder"  icon="plus-circle"}{ts}Add Reminder{/ts}{/crmButton}
   </div>
 {/if}
 {/if}

diff --git a/templates/CRM/Admin/Page/Tag.tpl b/templates/CRM/Admin/Page/Tag.tpl
index 30c4df44632d768c655a6fe7cbe85a260be2f073..3eace2e7638cdd5a07d55db2c2f66d3674020bab 100644 (file)
--- a/templates/CRM/Admin/Page/Tag.tpl
+++ b/templates/CRM/Admin/Page/Tag.tpl
@@ -38,9 +38,9 @@
         {if !($action eq 1 and $action eq 2)}
             <div class="crm-submit-buttons">
               <div class="action-link">
-                    {crmButton q="action=add&reset=1" id="newTag"  icon="circle-plus"}{ts}Add Tag{/ts}{/crmButton}
+                    {crmButton q="action=add&reset=1" id="newTag"  icon="plus-circle"}{ts}Add Tag{/ts}{/crmButton}
                     {if $adminTagSet}
-                        {crmButton q="action=add&reset=1&tagset=1" id="newTagSet"  icon="circle-plus"}{ts}Add Tag Set{/ts}{/crmButton}
+                        {crmButton q="action=add&reset=1&tagset=1" id="newTagSet"  icon="plus-circle"}{ts}Add Tag Set{/ts}{/crmButton}
                     {/if}
                 </div>
             </div>
@@ -81,9 +81,9 @@
         {if !($action eq 1 and $action eq 2)}
             <div class="crm-submit-buttons">
                 <div class="action-link">
-                    {crmButton q="action=add&reset=1" id="newTag"  icon="circle-plus"}{ts}Add Tag{/ts}{/crmButton}
+                    {crmButton q="action=add&reset=1" id="newTag"  icon="plus-circle"}{ts}Add Tag{/ts}{/crmButton}
                     {if $adminTagSet}
-                        {crmButton q="action=add&reset=1&tagset=1" id="newTagSet"  icon="circle-plus"}{ts}Add Tag Set{/ts}{/crmButton}
+                        {crmButton q="action=add&reset=1&tagset=1" id="newTagSet"  icon="plus-circle"}{ts}Add Tag Set{/ts}{/crmButton}
                     {/if}
                 </div>
             </div>

diff --git a/templates/CRM/Campaign/Form/Search/Petition.tpl b/templates/CRM/Campaign/Form/Search/Petition.tpl
index e5f0522472a03731b1011086ad8e8f277f0990cc..64ba5a5e62dd50627362ad13c67f5a6ca876ad3f 100755 (executable)
--- a/templates/CRM/Campaign/Form/Search/Petition.tpl
+++ b/templates/CRM/Campaign/Form/Search/Petition.tpl
@@ -31,7 +31,7 @@
     </div>
 
     <div class="action-link">
-         {crmButton p='civicrm/petition/add' q='reset=1' h=0  icon="circle-plus"}{ts}Add Petition{/ts}{/crmButton}
+         {crmButton p='civicrm/petition/add' q='reset=1' h=0  icon="plus-circle"}{ts}Add Petition{/ts}{/crmButton}
     </div>
 
 {elseif $buildSelector}
@@ -72,7 +72,7 @@
 {else}
 
    <div class="action-link">
-      {crmButton p='civicrm/petition/add' q='reset=1' h=0  icon="circle-plus"}{ts}Add Petition{/ts}{/crmButton}
+      {crmButton p='civicrm/petition/add' q='reset=1' h=0  icon="plus-circle"}{ts}Add Petition{/ts}{/crmButton}
    </div>
 
     {* build search form here *}

diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl
index e7b699babdc516027d7ff0c8d75f8321930dfe22..4352178dacf4806f1c7819da49b638bc73df4f61 100755 (executable)
--- a/templates/CRM/Campaign/Form/Search/Survey.tpl
+++ b/templates/CRM/Campaign/Form/Search/Survey.tpl
@@ -31,7 +31,7 @@
     </div>
 
     <div class="action-link">
-         {crmButton p='civicrm/survey/add' q='reset=1' h=0  icon="circle-plus"}{ts}Add Survey{/ts}{/crmButton}
+         {crmButton p='civicrm/survey/add' q='reset=1' h=0  icon="plus-circle"}{ts}Add Survey{/ts}{/crmButton}
     </div>
 
 {elseif $buildSelector}
@@ -76,7 +76,7 @@
 {else}
 
    <div class="action-link">
-      {crmButton p='civicrm/survey/add' q='reset=1' h=0  icon="circle-plus"}{ts}Add Survey{/ts}{/crmButton}
+      {crmButton p='civicrm/survey/add' q='reset=1' h=0  icon="plus-circle"}{ts}Add Survey{/ts}{/crmButton}
    </div>
 
     {* build search form here *}

diff --git a/templates/CRM/Case/Form/ActivityView.tpl b/templates/CRM/Case/Form/ActivityView.tpl
index a891fc997e26fd84814f1a69bfcdabc1f6157932..b9d24da200c452471b5b877d3e1c0ee8491c7da9 100644 (file)
--- a/templates/CRM/Case/Form/ActivityView.tpl
+++ b/templates/CRM/Case/Form/ActivityView.tpl
@@ -78,6 +78,6 @@
     {/if}
   {/if}
   <div class="crm-submit-buttons">
-    {crmButton p='civicrm/case' q="reset=1" class='cancel' icon='close'}{ts}Done{/ts}{/crmButton}
+    {crmButton p='civicrm/case' q="reset=1" class='cancel' icon='times'}{ts}Done{/ts}{/crmButton}
   </div>
 </div>

diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl
index a3eee282f5987a2b16b7b124bda522a389b9e6d3..a28925c0ad9a8ea92dc6b0c1cce279e8712aa0d0 100644 (file)
--- a/templates/CRM/Case/Form/CaseView.tpl
+++ b/templates/CRM/Case/Form/CaseView.tpl
@@ -32,7 +32,7 @@
     {include file="CRM/Case/Form/ViewRelatedCases.tpl"}
   {* Main case view *}
   {else}
-  
+
   <h3>{ts}Summary{/ts}</h3>
   <table class="report crm-entity case-summary" data-entity="case" data-id="{$caseID}" data-cid="{$contactID}">
     {if $multiClient}
@@ -119,7 +119,7 @@
         {if $hasAccessToAllCases}
           <a class="crm-hover-button action-item no-popup" href="{crmURL p='civicrm/case/report/print' q="all=1&redact=0&cid=$contactID&caseID=$caseId&asn=standard_timeline"}"><span class="icon ui-icon-print"></span> {ts}Print Report{/ts}</a>
         {/if}
-  
+
         {if $mergeCases}
           <a href="#mergeCasesDialog" class="action-item no-popup crm-hover-button case-miniform"><span class="icon ui-icon-copy"></span>{ts}Merge Case{/ts}</a>
           {$form._qf_CaseView_next_merge_case.html}
@@ -127,7 +127,7 @@
             {$form.merge_case_id.html}
           </span>
         {/if}
-  
+
         {if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))}
           <a class="action-item crm-hover-button medium-popup" href="{crmURL p='civicrm/contact/view/case/editClient' h=1 q="reset=1&action=update&id=$caseID&cid=$contactID"}"><span class="icon ui-icon-person"></span> {ts}Assign to Another Client{/ts}</a>
         {/if}
@@ -143,7 +143,7 @@
       {ts}Roles{/ts}
     </div><!-- /.crm-accordion-header -->
     <div class="crm-accordion-body">
-  
+
       {if $hasAccessToAllCases}
         <div class="crm-submit-buttons">
           <a class="button case-miniform" href="#addCaseRoleDialog" data-key="{crmKey name='civicrm/ajax/relation'}" rel="#caseRoles-selector-{$caseID}"><div class="icon ui-icon-circle-plus"></div>{ts}Add new role{/ts}</a>
@@ -155,12 +155,12 @@
           <div><input name="add_role_contact_id" placeholder="{ts}- first select relationship type -{/ts}" class="huge" /></div>
         </div>
       {/if}
-  
+
       <div id="editCaseRoleDialog" class="hiddenElement">
         <div><label for="edit_role_contact_id">{ts}Change To{/ts}:</label></div>
         <div><input name="edit_role_contact_id" placeholder="{ts}- select contact -{/ts}" class="huge" /></div>
       </div>
-  
+
       <table id="caseRoles-selector-{$caseID}"  class="report-layout crm-ajax-table" data-page-length="10">
         <thead>
           <tr>
@@ -186,11 +186,11 @@
           })(CRM.$);
         </script>
       {/literal}
-  
+
       <div id="deleteCaseRoleDialog" class="hiddenElement">
         {ts}Are you sure you want to end this relationship?{/ts}
       </div>
-  
+
    </div><!-- /.crm-accordion-body -->
   </div><!-- /.crm-accordion-wrapper -->
 
@@ -201,7 +201,7 @@
     </div><!-- /.crm-accordion-header -->
     <div class="crm-accordion-body">
       <div class="crm-submit-buttons">
-        {crmButton p='civicrm/contact/view/rel' q="action=add&reset=1&cid=`$contactId`&caseID=`$caseID`" icon="circle-plus"}{ts}Add client relationship{/ts}{/crmButton}
+        {crmButton p='civicrm/contact/view/rel' q="action=add&reset=1&cid=`$contactId`&caseID=`$caseID`" icon="plus-circle"}{ts}Add client relationship{/ts}{/crmButton}
       </div>
       <table id="clientRelationships-selector-{$caseID}"  class="report-layout crm-ajax-table" data-page-length="10">
         <thead>
@@ -320,4 +320,3 @@
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 {/if} {* view related cases if end *}
 </div>
-

diff --git a/templates/CRM/Contact/Page/DedupeException.tpl b/templates/CRM/Contact/Page/DedupeException.tpl
index e1252025bac84b715fa8d65ce5338ca47ff905bd..d346dd108976f6e94d490314cbc7b4a0caa0456a 100644 (file)
--- a/templates/CRM/Contact/Page/DedupeException.tpl
+++ b/templates/CRM/Contact/Page/DedupeException.tpl
@@ -44,7 +44,7 @@
 </table>
 <div class="clear"><br /></div>
 <div class="action-link">
-  {crmButton p="civicrm/contact/deduperules" q="reset=1" icon="close"}{ts}Done{/ts}{/crmButton}
+  {crmButton p="civicrm/contact/deduperules" q="reset=1" icon="times"}{ts}Done{/ts}{/crmButton}
 </div>
 
 {* process the dupe contacts *}

diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl b/templates/CRM/Contact/Page/DedupeFind.tpl
index 9ed0b08e32a22625347bee34f72adf40b0e876bd..18a05eb01cec72329b51ec1754d951d64cef4d72 100644 (file)
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -72,18 +72,18 @@
   </div><!-- /.crm-accordion-wrapper -->
   <div>
     Show / Hide columns:
-    <input type='checkbox' id ='steet-address' class='toggle-vis' data-column-main="7" data-column-dupe="8" >  
+    <input type='checkbox' id ='steet-address' class='toggle-vis' data-column-main="7" data-column-dupe="8" >
         <label for="steet-address">{ts}Street Address{/ts}&nbsp;</label>
-    <input type='checkbox' id ='post-code' class='toggle-vis' data-column-main="9" data-column-dupe="10" >  
+    <input type='checkbox' id ='post-code' class='toggle-vis' data-column-main="9" data-column-dupe="10" >
         <label for="post-code">{ts}Post Code{/ts}&nbsp;</label>
-    <input type='checkbox' id ='conflicts' class='toggle-vis' data-column-main="11"  >  
+    <input type='checkbox' id ='conflicts' class='toggle-vis' data-column-main="11"  >
         <label for="conflicts">{ts}Conflicts{/ts}&nbsp; </label>
-    <input type='checkbox' id ='threshold' class='toggle-vis' data-column-main="12"  >  
+    <input type='checkbox' id ='threshold' class='toggle-vis' data-column-main="12"  >
         <label for="threshold">{ts}Threshold{/ts}&nbsp;</label>
   </div><br/>
   <span id="dupePairs_length_selection">
     <input type='checkbox' id ='crm-dedupe-display-selection' name="display-selection">
-    <label for="display-selection">{ts}Within Selections{/ts}&nbsp;</label>  
+    <label for="display-selection">{ts}Within Selections{/ts}&nbsp;</label>
   </span>
 
   <table id="dupePairs"
@@ -96,7 +96,7 @@
     data-order='[]',
     data-column-defs='{literal}[{"targets": [0,1,3,13], "orderable":false}, {"targets": [7,8,9,10,11,12], "visible":false}]{/literal}'>
     <thead>
-      <tr class="columnheader"> 
+      <tr class="columnheader">
         <th data-data="is_selected_input" class="crm-dedupe-selection"><input type="checkbox" value="0" name="pnid_all" class="crm-dedupe-select-all"></th>
         <th data-data="src_image"    class="crm-empty">&nbsp;</th>
         <th data-data="src"          class="crm-contact">{ts}Contact{/ts} 1</th>
@@ -135,7 +135,7 @@
 </div>
 
 {if $context eq 'search'}
-   {crmButton href=$backURL icon="close"}{ts}Done{/ts}{/crmButton}
+   {crmButton href=$backURL icon="times"}{ts}Done{/ts}{/crmButton}
 {elseif $context eq 'conflicts'}
    {if call_user_func(array('CRM_Core_Permission','check'), 'force merge duplicate contacts')}
      {if $gid}
@@ -234,7 +234,7 @@
         }
         CRM.$('table#dupePairs').DataTable().ajax.url(reloadUrl).draw();
       });
-    
+
       $('#dupePairs_length_selection').appendTo('#dupePairs_length');
 
       // apply selected class on click of a row
@@ -283,7 +283,7 @@
       $('input.toggle-vis').on('click', function (e) {
         var column = table.column( $(this).attr('data-column-main') );
         column.visible( ! column.visible() );
-  
+
         // nowrap to conflicts column is applied only during initial rendering
         // for show / hide clicks we need to set it explicitly
         var col = CRM.$('table#dupePairs thead th.crm-contact-conflicts').index() + 1;
@@ -296,14 +296,14 @@
           column.visible( ! column.visible() );
         }
       });
-      
+
       // keep the conflicts checkbox checked when context is "conflicts"
       if(context == 'conflicts') {
-        $('#conflicts').attr('checked', true);  
+        $('#conflicts').attr('checked', true);
         var column = table.column( $('#conflicts').attr('data-column-main') );
         column.visible( ! column.visible() );
       }
-  
+
       // on click of flip link of a row
       $('#dupePairs tbody').on('click', 'tr .crm-dedupe-flip', function(e) {
         e.stopPropagation();
@@ -324,7 +324,7 @@
           $('input.crm-dedupe-select', $elTr).prop('checked', $elTr.hasClass('crm-row-selected'));
         });
       });
-  
+
       $(".crm-dedupe-flip-selections").on('click', function(e) {
         var ids = [];
         $('.crm-row-selected').each(function() {
@@ -365,14 +365,14 @@
       });
       var is_selected = CRM.$('.crm-dedupe-select-all').prop('checked') ? 1 : 0;
     }
-  
+
     var dataUrl = {/literal}"{crmURL p='civicrm/ajax/toggleDedupeSelect' h=0 q='snippet=4'}"{literal};
     var rgid = {/literal}"{$rgid}"{literal};
     var gid = {/literal}"{$gid}"{literal};
-  
+
     rgid = rgid.length > 0 ? rgid : 0;
     gid  = gid.length > 0 ? gid : 0;
-    
+
     CRM.$.post(dataUrl, {pnid: id, rgid: rgid, gid: gid, is_selected: is_selected}, function (data) {
       // nothing to do for now
     }, 'json');

diff --git a/templates/CRM/Contact/Page/DedupeRules.tpl b/templates/CRM/Contact/Page/DedupeRules.tpl
index 055d92f91cf6e260ce49b463ab48786e975b3357..db1c90ab841963f329158575ca03835ab3bca3ee 100644 (file)
--- a/templates/CRM/Contact/Page/DedupeRules.tpl
+++ b/templates/CRM/Contact/Page/DedupeRules.tpl
@@ -61,7 +61,7 @@
         {/strip}
        </div>
        <div style="float:right">
-            {crmButton q="action=add&contact_type=$contactType&reset=1" icon="circle-plus"}{ts 1=$contactType}Add Rule for %1s{/ts}{/crmButton}
+            {crmButton q="action=add&contact_type=$contactType&reset=1" icon="plus-circle"}{ts 1=$contactType}Add Rule for %1s{/ts}{/crmButton}
         </div>
       </div>
     {/foreach}

diff --git a/templates/CRM/Contact/Page/View/Email.tpl b/templates/CRM/Contact/Page/View/Email.tpl
index 7e8a9dc9ecb765e2ed90bae33fc3ef7e2697e6ff..e26eff9711d8eea215f66c13d041630d4760ab2a 100644 (file)
--- a/templates/CRM/Contact/Page/View/Email.tpl
+++ b/templates/CRM/Contact/Page/View/Email.tpl
@@ -32,7 +32,7 @@
 <dt>{ts}To{/ts}</dt><dd>{$toName|escape}</dd>
 <dt>{ts}Subject{/ts}</dt><dd>{$subject}</dd>
 <dt>{ts}Message{/ts}</dt><dd>{$message}</dd>
-<dt>&nbsp;</dt><dd>{crmButton class="cancel" icon="close" p='civicrm/contact/view' q="history=1&show=1&selectedChild=activity"}">{ts}Done{/ts}{/crmButton}</dd>
+<dt>&nbsp;</dt><dd>{crmButton class="cancel" icon="times" p='civicrm/contact/view' q="history=1&show=1&selectedChild=activity"}">{ts}Done{/ts}{/crmButton}</dd>
 </dl>
 </fieldset>
 </div>

diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl
index fda7ceb3de1d662628042fe4d6acb48978a2737c..a253b261ff4c90aafd33ac41e357ead248557cea 100644 (file)
--- a/templates/CRM/Contact/Page/View/Note.tpl
+++ b/templates/CRM/Contact/Page/View/Note.tpl
@@ -38,7 +38,7 @@
             {/if}
           </table>
           <div class="crm-submit-buttons">
-            {crmButton class="cancel" icon="close" p='civicrm/contact/view' q="selectedChild=note&reset=1&cid=`$contactId`"}{ts}Done{/ts}{/crmButton}
+            {crmButton class="cancel" icon="times" p='civicrm/contact/view' q="selectedChild=note&reset=1&cid=`$contactId`"}{ts}Done{/ts}{/crmButton}
           </div>
 
         {if $comments}

diff --git a/templates/CRM/Contact/Page/View/Relationship.tpl b/templates/CRM/Contact/Page/View/Relationship.tpl
index b8da0e402a8b5ef581e174bde359c914bada57a1..1b5fbe3f000acd9cba5afb025ec6d3893dc50bc0 100644 (file)
--- a/templates/CRM/Contact/Page/View/Relationship.tpl
+++ b/templates/CRM/Contact/Page/View/Relationship.tpl
@@ -30,7 +30,7 @@
   <div id="contact-summary-relationship-tab" class="view-content">
     {if $permission EQ 'edit'}
       <div class="action-link">
-        {crmButton accesskey="N"  p='civicrm/contact/view/rel' q="cid=`$contactId`&action=add&reset=1" icon="circle-plus"}{ts}Add Relationship{/ts}{/crmButton}
+        {crmButton accesskey="N"  p='civicrm/contact/view/rel' q="cid=`$contactId`&action=add&reset=1" icon="plus-circle"}{ts}Add Relationship{/ts}{/crmButton}
       </div>
     {/if}
 
@@ -63,4 +63,3 @@
   </script>
   {/literal}
 {/if} {* close of custom data else*}
-

diff --git a/templates/CRM/Contact/Page/View/SMS.tpl b/templates/CRM/Contact/Page/View/SMS.tpl
index 184549a1f049edbca4cb572dfb76cdfd991d54cc..f20cf770db20cf524c8640d6733895b8df7c6c61 100644 (file)
--- a/templates/CRM/Contact/Page/View/SMS.tpl
+++ b/templates/CRM/Contact/Page/View/SMS.tpl
@@ -33,7 +33,7 @@
 <dt>{ts}Message{/ts}</dt><dd>{$message}</dd>
 <dt>&nbsp;</dt>
   <dd class="crm-submit-buttons">
-   {crmButton class="cancel" icon="close" p='civicrm/contact/view/activity' q="history=1&show=1"}">{ts}Done{/ts}{/crmButton}
+   {crmButton class="cancel" icon="times" p='civicrm/contact/view/activity' q="history=1&show=1"}">{ts}Done{/ts}{/crmButton}
   </dd>
 </dl>
 </fieldset>

diff --git a/templates/CRM/Contribute/Page/ContributionType.tpl b/templates/CRM/Contribute/Page/ContributionType.tpl
index 3bbe23265b1ac2d8271e01c85a9ccaa6ecdc71be..ee272d8b5e57784105976b97d05d4e653980e636 100644 (file)
--- a/templates/CRM/Contribute/Page/ContributionType.tpl
+++ b/templates/CRM/Contribute/Page/ContributionType.tpl
@@ -71,8 +71,8 @@
 {/if}
   {if $action ne 1 and $action ne 2}
     <div class="action-link">
-      {crmButton q="action=add&reset=1" id="newContributionType"  icon="circle-plus"}{ts}Add Financial Type{/ts}{/crmButton}
-      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+      {crmButton q="action=add&reset=1" id="newContributionType"  icon="plus-circle"}{ts}Add Financial Type{/ts}{/crmButton}
+      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
     </div>
   {/if}
 {/if}

diff --git a/templates/CRM/Contribute/Page/ManagePremiums.tpl b/templates/CRM/Contribute/Page/ManagePremiums.tpl
index 10f1d5dd75876bfdaffa4ca66af54ba794f7a3d7..3cf6f21fa579d0a9f78ebe58b832f321ac06ded1 100644 (file)
--- a/templates/CRM/Contribute/Page/ManagePremiums.tpl
+++ b/templates/CRM/Contribute/Page/ManagePremiums.tpl
@@ -71,7 +71,7 @@
     {/strip}
     {if $action ne 1 and $action ne 2}
       <div class="action-link">
-      {crmButton q="action=add&reset=1" id="newManagePremium"  icon="circle-plus"}{ts}Add Premium{/ts}{/crmButton}
+      {crmButton q="action=add&reset=1" id="newManagePremium"  icon="plus-circle"}{ts}Add Premium{/ts}{/crmButton}
         </div>
     {/if}
 </div>

diff --git a/templates/CRM/Custom/Form/Group.tpl b/templates/CRM/Custom/Form/Group.tpl
index 6b50066f8216916c62370d7c49b45e799ef99d5c..2a2db7f8ce17dbce6804b77d62b566d944cd4012 100644 (file)
--- a/templates/CRM/Custom/Form/Group.tpl
+++ b/templates/CRM/Custom/Form/Group.tpl
@@ -78,7 +78,7 @@
 {if $action eq 2 or $action eq 4} {* Update or View*}
     <p></p>
     <div class="action-link">
-      {crmButton p='civicrm/admin/custom/group/field' q="action=browse&reset=1&gid=$gid"}{ts}Custom Fields for this Set{/ts}{/crmButton}
+      {crmButton p='civicrm/admin/custom/group/field' q="action=browse&reset=1&gid=$gid" icon="th-list"}{ts}Custom Fields for this Set{/ts}{/crmButton}
     </div>
 {/if}
 {$initHideBlocks}

diff --git a/templates/CRM/Custom/Page/Field.tpl b/templates/CRM/Custom/Page/Field.tpl
index 0bb7093752349db8343eeddb44189f7fb4be0a2d..fa710c8a45b14ad6c6dbc0c8058888fe02c538f5 100644 (file)
--- a/templates/CRM/Custom/Page/Field.tpl
+++ b/templates/CRM/Custom/Page/Field.tpl
@@ -77,9 +77,7 @@
         {/if}
     {/if}
     <div class="action-link">
-      {crmButton p='civicrm/admin/custom/group/field/add' q="reset=1&action=add&gid=$gid" id="newCustomField"  class="action-item" icon="circle-plus"}{ts}Add Custom Field{/ts}{/crmButton}
-      {crmButton p="civicrm/admin/custom/group" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+      {crmButton p='civicrm/admin/custom/group/field/add' q="reset=1&action=add&gid=$gid" id="newCustomField"  class="action-item" icon="plus-circle"}{ts}Add Custom Field{/ts}{/crmButton}
+      {crmButton p="civicrm/admin/custom/group" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
     </div>
 {/if}
-
-

diff --git a/templates/CRM/Custom/Page/Group.tpl b/templates/CRM/Custom/Page/Group.tpl
index 808db88fa215f550bbba5c617a9d23b8acf8e990..df13dfb88caddbbbbe1ac3f2913e1e09b025114b 100644 (file)
--- a/templates/CRM/Custom/Page/Group.tpl
+++ b/templates/CRM/Custom/Page/Group.tpl
@@ -70,7 +70,7 @@
 
         {if NOT ($action eq 1 or $action eq 2) }
         <div class="action-link">
-        {crmButton p='civicrm/admin/custom/group' q="action=add&reset=1" id="newCustomDataGroup"  icon="circle-plus"}{ts}Add Set of Custom Fields{/ts}{/crmButton}
+        {crmButton p='civicrm/admin/custom/group' q="action=add&reset=1" id="newCustomDataGroup"  icon="plus-circle"}{ts}Add Set of Custom Fields{/ts}{/crmButton}
         </div>
         {/if}
 
@@ -87,4 +87,3 @@
        {/if}
     {/if}
 {/if}
-

diff --git a/templates/CRM/Custom/Page/Option.tpl b/templates/CRM/Custom/Page/Option.tpl
index 23c9069633fe6982716c7ebd26b75b60c3806cea..526b5e5b3edd9ca693385ce02aa44ffab3037ad1 100644 (file)
--- a/templates/CRM/Custom/Page/Option.tpl
+++ b/templates/CRM/Custom/Page/Option.tpl
@@ -158,8 +158,8 @@
       {/literal}
 
       <div class="action-link">
-          {crmButton q="reset=1&action=add&fid=$fid&gid=$gid" class="action-item" icon="circle-plus"}{ts}Add Option{/ts}{/crmButton}
-          {crmButton p="civicrm/admin/custom/group/field" q="reset=1&action=browse&gid=$gid" class="action-item cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+          {crmButton q="reset=1&action=add&fid=$fid&gid=$gid" class="action-item" icon="plus-circle"}{ts}Add Option{/ts}{/crmButton}
+          {crmButton p="civicrm/admin/custom/group/field" q="reset=1&action=browse&gid=$gid" class="action-item cancel" icon="times"}{ts}Done{/ts}{/crmButton}
       </div>
     </div>
   </div>

diff --git a/templates/CRM/Financial/Page/FinancialType.tpl b/templates/CRM/Financial/Page/FinancialType.tpl
index c38cf5acfad15ba2592182d9849243805d8d5021..0584c753b47458731188d801ba3111f27811a07e 100644 (file)
--- a/templates/CRM/Financial/Page/FinancialType.tpl
+++ b/templates/CRM/Financial/Page/FinancialType.tpl
@@ -74,8 +74,8 @@
 {/if}
   {if $action ne 1 and $action ne 2}
     <div class="action-link">
-      {crmButton q="action=add&reset=1" id="newFinancialType"  icon="circle-plus"}{ts}Add Financial Type{/ts}{/crmButton}
-      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+      {crmButton q="action=add&reset=1" id="newFinancialType"  icon="plus-circle"}{ts}Add Financial Type{/ts}{/crmButton}
+      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
     </div>
   {/if}
 {/if}

diff --git a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
index 4b951fd49a6c5c66b4b176cdf787e06104a0dd63..4f4c6b47437d6121bfa3287078647abe92c2d4e0 100644 (file)
--- a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
+++ b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
@@ -31,7 +31,7 @@
   <div class="form-item">
     {if $action ne 1 and $action ne 2}
       <div class="action-link">
-      {crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount"  icon="circle-plus"}{ts}Assign Account{/ts}{/crmButton}
+      {crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount"  icon="plus-circle"}{ts}Assign Account{/ts}{/crmButton}
   {crmButton p="civicrm/admin/financial/financialType" q="action=update&id=`$aid`&reset=1" icon="pencil"}{ts}Edit Financial Type{/ts}{/crmButton}
       </div>
     {/if}
@@ -64,7 +64,7 @@
 
     {if $action ne 1 and $action ne 2}
       <div class="action-link">
-      {crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount"  icon="circle-plus"}{ts}Assign Account{/ts}{/crmButton}
+      {crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount"  icon="plus-circle"}{ts}Assign Account{/ts}{/crmButton}
   {crmButton p="civicrm/admin/financial/financialType" q="action=update&id=`$aid`&reset=1" icon="pencil"}{ts}Edit Financial Type{/ts}{/crmButton}
       </div>
     {/if}

diff --git a/templates/CRM/Mailing/Page/Browse.tpl b/templates/CRM/Mailing/Page/Browse.tpl
index 6e5cc97c6e0b3a33d0fcbee4238b1b80e78eaad2..2b1753ade7ece85fc255e895c154ef2b0aac2cfd 100644 (file)
--- a/templates/CRM/Mailing/Page/Browse.tpl
+++ b/templates/CRM/Mailing/Page/Browse.tpl
@@ -37,7 +37,7 @@
 
 {if $showLinks}
     <div class="action-link">
-      {crmButton accesskey="N"  p=$newMassUrl q='reset=1' icon="mail-closed"}{ts}{$linkTitle}{/ts}{/crmButton}<br/><br/>
+      {crmButton accesskey="N"  p=$newMassUrl q='reset=1' icon="envelope"}{ts}{$linkTitle}{/ts}{/crmButton}<br/><br/>
     </div>
 {/if}
 {include file="CRM/Mailing/Form/Search.tpl"}
@@ -84,7 +84,7 @@
     {include file="CRM/common/pager.tpl" location="bottom"}
     {if $showLinks}
       <div class="action-link">
-            {crmButton accesskey="N"  p=$newMassUrl q='reset=1' icon="mail-closed"}{ts}{$linkTitle}{/ts}{/crmButton}<br/>
+            {crmButton accesskey="N"  p=$newMassUrl q='reset=1' icon="envelope"}{ts}{$linkTitle}{/ts}{/crmButton}<br/>
       </div>
     {/if}
 

diff --git a/templates/CRM/Mailing/Page/Component.tpl b/templates/CRM/Mailing/Page/Component.tpl
index 7dc88e796df6ce9a51f104c1e7759e40ea314a87..0a1bb06eac1f72dc99a7b8987b5540597567f75b 100644 (file)
--- a/templates/CRM/Mailing/Page/Component.tpl
+++ b/templates/CRM/Mailing/Page/Component.tpl
@@ -62,7 +62,7 @@
        {if $action ne 1 and $action ne 2}
   <br/>
        <div class="action-link">
-       {crmButton q="action=add&reset=1" icon="circle-plus"}{ts}Add Mailing Component{/ts}{/crmButton}
+       {crmButton q="action=add&reset=1" icon="plus-circle"}{ts}Add Mailing Component{/ts}{/crmButton}
        </div>
        {/if}
     </div>

diff --git a/templates/CRM/Member/Page/MembershipStatus.tpl b/templates/CRM/Member/Page/MembershipStatus.tpl
index a4a83b998b12235253a074eb504482eb861646b6..9032b463ca03720594a0c99aad49ed1e03674083 100644 (file)
--- a/templates/CRM/Member/Page/MembershipStatus.tpl
+++ b/templates/CRM/Member/Page/MembershipStatus.tpl
@@ -67,8 +67,8 @@
 
         {if $action ne 1 and $action ne 2}
         <div class="action-link">
-          {crmButton q="action=add&reset=1" id="newMembershipStatus"  icon="circle-plus"}{ts}Add Membership Status{/ts}{/crmButton}
-          {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+          {crmButton q="action=add&reset=1" id="newMembershipStatus"  icon="plus-circle"}{ts}Add Membership Status{/ts}{/crmButton}
+          {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
         </div>
         {/if}
     </div>

diff --git a/templates/CRM/Member/Page/MembershipType.tpl b/templates/CRM/Member/Page/MembershipType.tpl
index b24eb0d1160bbab019f0c5dd3b7f32e887e1ce1e..d48d2f5faf8dd30b9ef745448921daef0e4e6677 100644 (file)
--- a/templates/CRM/Member/Page/MembershipType.tpl
+++ b/templates/CRM/Member/Page/MembershipType.tpl
@@ -73,7 +73,7 @@
 
   {if $action ne 1 and $action ne 2}
     <div class="action-link">
-      {crmButton p='civicrm/admin/member/membershipType/add' q="action=add&reset=1" id="newMembershipType"  icon="circle-plus"}{ts}Add Membership Type{/ts}{/crmButton}
+      {crmButton p='civicrm/admin/member/membershipType/add' q="action=add&reset=1" id="newMembershipType"  icon="plus-circle"}{ts}Add Membership Type{/ts}{/crmButton}
     </div>
   {/if}
 </div>

diff --git a/templates/CRM/Price/Page/Field.tpl b/templates/CRM/Price/Page/Field.tpl
index 413559c99d7ca0ab6278d59b42cac2ed64de34d8..14a11e55e406ed703f915daeaf2dce9f63fba010 100644 (file)
--- a/templates/CRM/Price/Page/Field.tpl
+++ b/templates/CRM/Price/Page/Field.tpl
@@ -45,9 +45,9 @@
 {if $action NEQ 8 and $priceField}
   <div class="action-link">
     {if !$isReserved}
-      {crmButton q="reset=1&action=add&sid=$sid" id="newPriceField"  icon="circle-plus"}{ts}Add Price Field{/ts}{/crmButton}
+      {crmButton q="reset=1&action=add&sid=$sid" id="newPriceField"  icon="plus-circle"}{ts}Add Price Field{/ts}{/crmButton}
     {/if}
-      {crmButton p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field" icon="zoomin"}{ts}Preview (all fields){/ts}{/crmButton}
+      {crmButton p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field" icon="television"}{ts}Preview (all fields){/ts}{/crmButton}
   </div>
   <div id="field_page">
   {strip}
@@ -96,9 +96,9 @@
   </div>
   <div class="action-link">
     {if !$isReserved}
-      {crmButton q="reset=1&action=add&sid=$sid" id="newPriceField"  icon="circle-plus"}{ts}Add Price Field{/ts}{/crmButton}
+      {crmButton q="reset=1&action=add&sid=$sid" id="newPriceField"  icon="plus-circle"}{ts}Add Price Field{/ts}{/crmButton}
     {/if}
-    {crmButton p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field" icon="zoomin"}{ts}Preview (all fields){/ts}{/crmButton}
+    {crmButton p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field" icon="television"}{ts}Preview (all fields){/ts}{/crmButton}
   </div>
 
 {else}
@@ -108,7 +108,7 @@
       {ts}None found.{/ts}
     </div>
     <div class="action-link">
-      {crmButton q="reset=1&action=add&sid=$sid" id="newPriceField"  icon="circle-plus"}{ts}Add Price Field{/ts}{/crmButton}
+      {crmButton q="reset=1&action=add&sid=$sid" id="newPriceField"  icon="plus-circle"}{ts}Add Price Field{/ts}{/crmButton}
     </div>
   {/if}
 {/if}

diff --git a/templates/CRM/Price/Page/Option.tpl b/templates/CRM/Price/Page/Option.tpl
index cd257f921cde34cff1d9fbef449786e10d08890f..feeabbb068779f9b7a890f1242d01e8314d03e45 100644 (file)
--- a/templates/CRM/Price/Page/Option.tpl
+++ b/templates/CRM/Price/Page/Option.tpl
@@ -107,8 +107,8 @@
   {/if}
   {if $addMoreFields && !$isReserved}
     <div class="action-link">
-      {crmButton q="reset=1&action=add&fid=$fid&sid=$sid" icon="circle-plus"}{ts 1=$fieldTitle}New Option for '%1'{/ts}{/crmButton}
-      {crmButton p="civicrm/admin/price/field" q="reset=1&sid=$sid" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
+      {crmButton q="reset=1&action=add&fid=$fid&sid=$sid" icon="plus-circle"}{ts 1=$fieldTitle}New Option for '%1'{/ts}{/crmButton}
+      {crmButton p="civicrm/admin/price/field" q="reset=1&sid=$sid" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
     </div>
   {/if}
 {/if}

diff --git a/templates/CRM/Price/Page/Set.tpl b/templates/CRM/Price/Page/Set.tpl
index 5935a1db6fa34f1d21d68ee4e5d3565dc81e1578..faed68a3c59d287dfdfe7042b4b1444799deafe2 100644 (file)
--- a/templates/CRM/Price/Page/Set.tpl
+++ b/templates/CRM/Price/Page/Set.tpl
@@ -76,7 +76,7 @@
 
         {if NOT ($action eq 1 or $action eq 2) }
         <div class="action-link">
-            {crmButton p='civicrm/admin/price' q="action=add&reset=1" id="newPriceSet"  icon="circle-plus"}{ts}Add Set of Price Fields{/ts}{/crmButton}
+            {crmButton p='civicrm/admin/price' q="action=add&reset=1" id="newPriceSet"  icon="plus-circle"}{ts}Add Set of Price Fields{/ts}{/crmButton}
         </div>
         {/if}
 

diff --git a/templates/CRM/SMS/Page/Provider.tpl b/templates/CRM/SMS/Page/Provider.tpl
index bedd1c697c56667cf42cdb80d3db04e6c02f85f7..27a80214e89ffc878445f19f5af7ddd3ca99ce46 100644 (file)
--- a/templates/CRM/SMS/Page/Provider.tpl
+++ b/templates/CRM/SMS/Page/Provider.tpl
@@ -68,6 +68,6 @@
 
   {/if}
   <div class="action-link">
-    {crmButton p='civicrm/admin/sms/provider' q="action=add&reset=1" icon="circle-plus"}{ts}Add SMS Provider{/ts}{/crmButton}
+    {crmButton p='civicrm/admin/sms/provider' q="action=add&reset=1" icon="plus-circle"}{ts}Add SMS Provider{/ts}{/crmButton}
   </div>
 {/if}

diff --git a/templates/CRM/UF/Page/Field.tpl b/templates/CRM/UF/Page/Field.tpl
index 0903c7fbc6b64d06144436cb039a95e160d7ef87..0a0c4cb841f9c6b2db8d3a8e4e0a14999f8d1ec3 100644 (file)
--- a/templates/CRM/UF/Page/Field.tpl
+++ b/templates/CRM/UF/Page/Field.tpl
@@ -37,7 +37,7 @@
         <div id="field_page">
         {if not ($action eq 2 or $action eq 1)}
             <div class="action-link">
-                {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="circle-plus"}{ts}Add Field{/ts}{/crmButton}{if !$isGroupReserved}{crmButton p="civicrm/admin/uf/group/update" q="action=update&id=`$gid`&reset=1&context=field" icon="pencil"}{ts}Edit Settings{/ts}{/crmButton}{/if}{crmButton p="civicrm/admin/uf/group" q="action=preview&id=`$gid`&reset=1&field=0&context=field" icon="zoomin"}{ts}Preview (all fields){/ts}{/crmButton}{if !$skipCreate }{crmButton p="civicrm/profile/create" q="gid=$gid&reset=1" icon="play"}{ts}Use (create mode){/ts}{/crmButton}{/if}
+                {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="plus-circle"}{ts}Add Field{/ts}{/crmButton}{if !$isGroupReserved}{crmButton p="civicrm/admin/uf/group/update" q="action=update&id=`$gid`&reset=1&context=field" icon="pencil"}{ts}Edit Settings{/ts}{/crmButton}{/if}{crmButton p="civicrm/admin/uf/group" q="action=preview&id=`$gid`&reset=1&field=0&context=field" icon="television"}{ts}Preview (all fields){/ts}{/crmButton}{if !$skipCreate }{crmButton p="civicrm/profile/create" q="gid=$gid&reset=1" icon="play-circle"}{ts}Use (create mode){/ts}{/crmButton}{/if}
                 <div class="clear"></div>
             </div>
         {/if}
@@ -79,7 +79,7 @@
         {/strip}
         {if not ($action eq 2 or $action eq 1)}
             <div class="action-link">
-                {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="circle-plus"}{ts}Add Field{/ts}{/crmButton}{if !$isGroupReserved}{crmButton p="civicrm/admin/uf/group" q="action=update&id=`$gid`&reset=1&context=field" icon="pencil"}{ts}Edit Settings{/ts}{/crmButton}{/if}{crmButton p="civicrm/admin/uf/group" q="action=preview&id=`$gid`&reset=1&field=0&context=field" icon="zoomin"}{ts}Preview (all fields){/ts}{/crmButton}{if !$skipCreate }{crmButton p="civicrm/profile/create" q="gid=$gid&reset=1" icon="play"}{ts}Use (create mode){/ts}{/crmButton}{/if}
+                {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="plus-circle"}{ts}Add Field{/ts}{/crmButton}{if !$isGroupReserved}{crmButton p="civicrm/admin/uf/group" q="action=update&id=`$gid`&reset=1&context=field" icon="pencil"}{ts}Edit Settings{/ts}{/crmButton}{/if}{crmButton p="civicrm/admin/uf/group" q="action=preview&id=`$gid`&reset=1&field=0&context=field" icon="television"}{ts}Preview (all fields){/ts}{/crmButton}{if !$skipCreate }{crmButton p="civicrm/profile/create" q="gid=$gid&reset=1" icon="play-circle"}{ts}Use (create mode){/ts}{/crmButton}{/if}
                 <div class="clear"></div>
             </div>
         {/if}
@@ -93,7 +93,7 @@
           {ts}None found.{/ts}
         </div>
         <div class="action-link">
-          {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="circle-plus"}{ts}Add Field{/ts}{/crmButton}
+          {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="plus-circle"}{ts}Add Field{/ts}{/crmButton}
         </div>
         {/if}
     {/if}