From 80bc28208fbcfe886024d6fb1c2b38adf063dd92 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Sun, 27 Sep 2015 21:08:59 -0400 Subject: [PATCH] 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 --- CRM/Core/Form/Renderer.php | 2 +- CRM/Core/Smarty/plugins/block.crmButton.php | 2 +- bower.json | 2 +- templates/CRM/ACL/Page/ACL.tpl | 2 +- templates/CRM/ACL/Page/EntityRole.tpl | 2 +- templates/CRM/Admin/Page/ContactType.tpl | 4 +-- templates/CRM/Admin/Page/EventTemplate.tpl | 2 +- templates/CRM/Admin/Page/Job.tpl | 4 +-- templates/CRM/Admin/Page/LocationType.tpl | 4 +-- templates/CRM/Admin/Page/MailSettings.tpl | 4 +-- templates/CRM/Admin/Page/MessageTemplates.tpl | 2 +- templates/CRM/Admin/Page/OptionGroup.tpl | 4 +-- templates/CRM/Admin/Page/Options.tpl | 6 ++-- .../CRM/Admin/Page/ParticipantStatusType.tpl | 4 +-- templates/CRM/Admin/Page/PaymentProcessor.tpl | 4 +-- .../CRM/Admin/Page/PaymentProcessorType.tpl | 2 +- templates/CRM/Admin/Page/PdfFormats.tpl | 4 +-- templates/CRM/Admin/Page/Persistent.tpl | 4 +-- templates/CRM/Admin/Page/RelationshipType.tpl | 6 ++-- .../CRM/Admin/Page/ScheduleReminders.tpl | 2 +- templates/CRM/Admin/Page/Tag.tpl | 8 ++--- .../CRM/Campaign/Form/Search/Petition.tpl | 4 +-- templates/CRM/Campaign/Form/Search/Survey.tpl | 4 +-- templates/CRM/Case/Form/ActivityView.tpl | 2 +- templates/CRM/Case/Form/CaseView.tpl | 19 ++++++----- .../CRM/Contact/Page/DedupeException.tpl | 2 +- templates/CRM/Contact/Page/DedupeFind.tpl | 32 +++++++++---------- templates/CRM/Contact/Page/DedupeRules.tpl | 2 +- templates/CRM/Contact/Page/View/Email.tpl | 2 +- templates/CRM/Contact/Page/View/Note.tpl | 2 +- .../CRM/Contact/Page/View/Relationship.tpl | 3 +- templates/CRM/Contact/Page/View/SMS.tpl | 2 +- .../CRM/Contribute/Page/ContributionType.tpl | 4 +-- .../CRM/Contribute/Page/ManagePremiums.tpl | 2 +- templates/CRM/Custom/Form/Group.tpl | 2 +- templates/CRM/Custom/Page/Field.tpl | 6 ++-- templates/CRM/Custom/Page/Group.tpl | 3 +- templates/CRM/Custom/Page/Option.tpl | 4 +-- .../CRM/Financial/Page/FinancialType.tpl | 4 +-- .../Financial/Page/FinancialTypeAccount.tpl | 4 +-- templates/CRM/Mailing/Page/Browse.tpl | 4 +-- templates/CRM/Mailing/Page/Component.tpl | 2 +- .../CRM/Member/Page/MembershipStatus.tpl | 4 +-- templates/CRM/Member/Page/MembershipType.tpl | 2 +- templates/CRM/Price/Page/Field.tpl | 10 +++--- templates/CRM/Price/Page/Option.tpl | 4 +-- templates/CRM/Price/Page/Set.tpl | 2 +- templates/CRM/SMS/Page/Provider.tpl | 2 +- templates/CRM/UF/Page/Field.tpl | 6 ++-- 49 files changed, 104 insertions(+), 109 deletions(-) diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php index 98fc261d03..57275373a0 100644 --- 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'] .= ' '; + $el['html'] .= ' '; } } diff --git a/CRM/Core/Smarty/plugins/block.crmButton.php b/CRM/Core/Smarty/plugins/block.crmButton.php index a53156a25a..fa98b5e41f 100644 --- 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 " $text"; + return " $text"; } diff --git a/bower.json b/bower.json index 5d0e6e166d..11b6879610 100644 --- 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 9957bd29bb..830d88a104 100644 --- 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}
- {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}
{/if} diff --git a/templates/CRM/ACL/Page/EntityRole.tpl b/templates/CRM/ACL/Page/EntityRole.tpl index 2d4226fec2..14e3318504 100644 --- 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}
- {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}
{/if} diff --git a/templates/CRM/Admin/Page/ContactType.tpl b/templates/CRM/Admin/Page/ContactType.tpl index 58fee6df20..0b58e0ce8f 100644 --- a/templates/CRM/Admin/Page/ContactType.tpl +++ b/templates/CRM/Admin/Page/ContactType.tpl @@ -63,7 +63,7 @@ {/if}
- {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}
{/if} diff --git a/templates/CRM/Admin/Page/EventTemplate.tpl b/templates/CRM/Admin/Page/EventTemplate.tpl index 3a20e1da7e..482912eee4 100644 --- a/templates/CRM/Admin/Page/EventTemplate.tpl +++ b/templates/CRM/Admin/Page/EventTemplate.tpl @@ -30,7 +30,7 @@
{if $action ne 1 and $action ne 2}
- {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}
{/if} diff --git a/templates/CRM/Admin/Page/Job.tpl b/templates/CRM/Admin/Page/Job.tpl index 06bc3374b0..527005ef21 100644 --- 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}
- {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}
{/if} diff --git a/templates/CRM/Admin/Page/LocationType.tpl b/templates/CRM/Admin/Page/LocationType.tpl index fb3934095f..d199af306f 100644 --- a/templates/CRM/Admin/Page/LocationType.tpl +++ b/templates/CRM/Admin/Page/LocationType.tpl @@ -69,7 +69,7 @@
{/if}
- {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}
{/if} diff --git a/templates/CRM/Admin/Page/MailSettings.tpl b/templates/CRM/Admin/Page/MailSettings.tpl index 77d7181a75..5d2e494109 100644 --- a/templates/CRM/Admin/Page/MailSettings.tpl +++ b/templates/CRM/Admin/Page/MailSettings.tpl @@ -75,7 +75,7 @@ {/if}
- {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}
{/if} diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl index eb47f5051f..b5e14ff390 100644 --- 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'}
- {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}
{/if} diff --git a/templates/CRM/Admin/Page/OptionGroup.tpl b/templates/CRM/Admin/Page/OptionGroup.tpl index 6e520f8896..9b2f03e019 100644 --- 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}
- {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}
{/if} diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl index 4b0d4db38e..104760f65e 100644 --- a/templates/CRM/Admin/Page/Options.tpl +++ b/templates/CRM/Admin/Page/Options.tpl @@ -72,7 +72,7 @@ {if $rows} {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}
@@ -158,9 +158,9 @@ {/if}
{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}
{/if} diff --git a/templates/CRM/Admin/Page/ParticipantStatusType.tpl b/templates/CRM/Admin/Page/ParticipantStatusType.tpl index d07c78ec68..b5d7cb2971 100644 --- 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}
- {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}
{/if} diff --git a/templates/CRM/Admin/Page/PaymentProcessor.tpl b/templates/CRM/Admin/Page/PaymentProcessor.tpl index c6e06dfa84..873f0754f3 100644 --- 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}
- {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}
{/if} @@ -72,7 +72,7 @@ {ts}There are no Payment Processors entered.{/ts}
- {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}
{/if} {/if} diff --git a/templates/CRM/Admin/Page/PaymentProcessorType.tpl b/templates/CRM/Admin/Page/PaymentProcessorType.tpl index 8464941f31..e09bd7c10d 100644 --- 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}
» {ts}New Payment Processor{/ts} - {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}
{/if} diff --git a/templates/CRM/Admin/Page/PdfFormats.tpl b/templates/CRM/Admin/Page/PdfFormats.tpl index c480089c03..c7853be3f2 100644 --- a/templates/CRM/Admin/Page/PdfFormats.tpl +++ b/templates/CRM/Admin/Page/PdfFormats.tpl @@ -65,7 +65,7 @@ {/if}
- {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}
{/if} diff --git a/templates/CRM/Admin/Page/Persistent.tpl b/templates/CRM/Admin/Page/Persistent.tpl index bac43642be..499fdd4bf7 100644 --- a/templates/CRM/Admin/Page/Persistent.tpl +++ b/templates/CRM/Admin/Page/Persistent.tpl @@ -2,7 +2,7 @@ {if $type eq 'configTemplates'}
- {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}
{if !empty( $template_row) } @@ -33,7 +33,7 @@
- {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}

{if !empty( $template_row) } diff --git a/templates/CRM/Admin/Page/RelationshipType.tpl b/templates/CRM/Admin/Page/RelationshipType.tpl index 98d89f03d8..edde7f1074 100644 --- 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)}
- {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}
{/if} @@ -82,7 +82,7 @@ {/if}
- {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}
{/if} diff --git a/templates/CRM/Admin/Page/ScheduleReminders.tpl b/templates/CRM/Admin/Page/ScheduleReminders.tpl index d568af75d7..cca81aa175 100644 --- 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} {/if} {/if} diff --git a/templates/CRM/Admin/Page/Tag.tpl b/templates/CRM/Admin/Page/Tag.tpl index 30c4df4463..3eace2e763 100644 --- 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)}
- {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}
@@ -81,9 +81,9 @@ {if !($action eq 1 and $action eq 2)}
- {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}
diff --git a/templates/CRM/Campaign/Form/Search/Petition.tpl b/templates/CRM/Campaign/Form/Search/Petition.tpl index e5f0522472..64ba5a5e62 100755 --- a/templates/CRM/Campaign/Form/Search/Petition.tpl +++ b/templates/CRM/Campaign/Form/Search/Petition.tpl @@ -31,7 +31,7 @@
- {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}
{elseif $buildSelector} @@ -72,7 +72,7 @@ {else}
- {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}
{* build search form here *} diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl index e7b699babd..4352178dac 100755 --- a/templates/CRM/Campaign/Form/Search/Survey.tpl +++ b/templates/CRM/Campaign/Form/Search/Survey.tpl @@ -31,7 +31,7 @@
- {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}
{elseif $buildSelector} @@ -76,7 +76,7 @@ {else}
- {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}
{* build search form here *} diff --git a/templates/CRM/Case/Form/ActivityView.tpl b/templates/CRM/Case/Form/ActivityView.tpl index a891fc997e..b9d24da200 100644 --- a/templates/CRM/Case/Form/ActivityView.tpl +++ b/templates/CRM/Case/Form/ActivityView.tpl @@ -78,6 +78,6 @@ {/if} {/if}
- {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}
diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl index a3eee282f5..a28925c0ad 100644 --- 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} - +

{ts}Summary{/ts}

{if $multiClient} @@ -119,7 +119,7 @@ {if $hasAccessToAllCases} {ts}Print Report{/ts} {/if} - + {if $mergeCases} {ts}Merge Case{/ts} {$form._qf_CaseView_next_merge_case.html} @@ -127,7 +127,7 @@ {$form.merge_case_id.html} {/if} - + {if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))} {ts}Assign to Another Client{/ts} {/if} @@ -143,7 +143,7 @@ {ts}Roles{/ts}
- + {if $hasAccessToAllCases}
{ts}Add new role{/ts} @@ -155,12 +155,12 @@
{/if} - +
- +
@@ -186,11 +186,11 @@ })(CRM.$); {/literal} - +
{ts}Are you sure you want to end this relationship?{/ts}
- + @@ -201,7 +201,7 @@
- {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}
@@ -320,4 +320,3 @@
{include file="CRM/common/formButtons.tpl" location="bottom"}
{/if} {* view related cases if end *} - diff --git a/templates/CRM/Contact/Page/DedupeException.tpl b/templates/CRM/Contact/Page/DedupeException.tpl index e1252025ba..d346dd1089 100644 --- a/templates/CRM/Contact/Page/DedupeException.tpl +++ b/templates/CRM/Contact/Page/DedupeException.tpl @@ -44,7 +44,7 @@

- {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}
{* process the dupe contacts *} diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl b/templates/CRM/Contact/Page/DedupeFind.tpl index 9ed0b08e32..18a05eb01c 100644 --- a/templates/CRM/Contact/Page/DedupeFind.tpl +++ b/templates/CRM/Contact/Page/DedupeFind.tpl @@ -72,18 +72,18 @@
Show / Hide columns: - + - + - + - +

- + - + @@ -135,7 +135,7 @@ {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 055d92f91c..db1c90ab84 100644 --- a/templates/CRM/Contact/Page/DedupeRules.tpl +++ b/templates/CRM/Contact/Page/DedupeRules.tpl @@ -61,7 +61,7 @@ {/strip}
- {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}
{/foreach} diff --git a/templates/CRM/Contact/Page/View/Email.tpl b/templates/CRM/Contact/Page/View/Email.tpl index 7e8a9dc9ec..e26eff9711 100644 --- a/templates/CRM/Contact/Page/View/Email.tpl +++ b/templates/CRM/Contact/Page/View/Email.tpl @@ -32,7 +32,7 @@
{ts}To{/ts}
{$toName|escape}
{ts}Subject{/ts}
{$subject}
{ts}Message{/ts}
{$message}
-
 
{crmButton class="cancel" icon="close" p='civicrm/contact/view' q="history=1&show=1&selectedChild=activity"}">{ts}Done{/ts}{/crmButton}
+
 
{crmButton class="cancel" icon="times" p='civicrm/contact/view' q="history=1&show=1&selectedChild=activity"}">{ts}Done{/ts}{/crmButton}
diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl index fda7ceb3de..a253b261ff 100644 --- a/templates/CRM/Contact/Page/View/Note.tpl +++ b/templates/CRM/Contact/Page/View/Note.tpl @@ -38,7 +38,7 @@ {/if}
  {ts}Contact{/ts} 1
- {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}
{if $comments} diff --git a/templates/CRM/Contact/Page/View/Relationship.tpl b/templates/CRM/Contact/Page/View/Relationship.tpl index b8da0e402a..1b5fbe3f00 100644 --- a/templates/CRM/Contact/Page/View/Relationship.tpl +++ b/templates/CRM/Contact/Page/View/Relationship.tpl @@ -30,7 +30,7 @@
{if $permission EQ 'edit'}
- {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}
{/if} @@ -63,4 +63,3 @@ {/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 184549a1f0..f20cf770db 100644 --- a/templates/CRM/Contact/Page/View/SMS.tpl +++ b/templates/CRM/Contact/Page/View/SMS.tpl @@ -33,7 +33,7 @@
{ts}Message{/ts}
{$message}
 
- {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}
diff --git a/templates/CRM/Contribute/Page/ContributionType.tpl b/templates/CRM/Contribute/Page/ContributionType.tpl index 3bbe23265b..ee272d8b5e 100644 --- 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}
- {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}
{/if} {/if} diff --git a/templates/CRM/Contribute/Page/ManagePremiums.tpl b/templates/CRM/Contribute/Page/ManagePremiums.tpl index 10f1d5dd75..3cf6f21fa5 100644 --- 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}
- {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}
{/if}
diff --git a/templates/CRM/Custom/Form/Group.tpl b/templates/CRM/Custom/Form/Group.tpl index 6b50066f82..2a2db7f8ce 100644 --- 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*}

- {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}
{/if} {$initHideBlocks} diff --git a/templates/CRM/Custom/Page/Field.tpl b/templates/CRM/Custom/Page/Field.tpl index 0bb7093752..fa710c8a45 100644 --- a/templates/CRM/Custom/Page/Field.tpl +++ b/templates/CRM/Custom/Page/Field.tpl @@ -77,9 +77,7 @@ {/if} {/if}
- {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}
{/if} - - diff --git a/templates/CRM/Custom/Page/Group.tpl b/templates/CRM/Custom/Page/Group.tpl index 808db88fa2..df13dfb88c 100644 --- 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) }
- {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}
{/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 23c9069633..526b5e5b3e 100644 --- a/templates/CRM/Custom/Page/Option.tpl +++ b/templates/CRM/Custom/Page/Option.tpl @@ -158,8 +158,8 @@ {/literal}
- {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}
diff --git a/templates/CRM/Financial/Page/FinancialType.tpl b/templates/CRM/Financial/Page/FinancialType.tpl index c38cf5acfa..0584c753b4 100644 --- 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}
- {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}
{/if} {/if} diff --git a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl index 4b951fd49a..4f4c6b4743 100644 --- a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl +++ b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl @@ -31,7 +31,7 @@
{if $action ne 1 and $action ne 2}
- {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}
{/if} @@ -64,7 +64,7 @@ {if $action ne 1 and $action ne 2}
- {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}
{/if} diff --git a/templates/CRM/Mailing/Page/Browse.tpl b/templates/CRM/Mailing/Page/Browse.tpl index 6e5cc97c6e..2b1753ade7 100644 --- a/templates/CRM/Mailing/Page/Browse.tpl +++ b/templates/CRM/Mailing/Page/Browse.tpl @@ -37,7 +37,7 @@ {if $showLinks}
- {crmButton accesskey="N" p=$newMassUrl q='reset=1' icon="mail-closed"}{ts}{$linkTitle}{/ts}{/crmButton}

+ {crmButton accesskey="N" p=$newMassUrl q='reset=1' icon="envelope"}{ts}{$linkTitle}{/ts}{/crmButton}

{/if} {include file="CRM/Mailing/Form/Search.tpl"} @@ -84,7 +84,7 @@ {include file="CRM/common/pager.tpl" location="bottom"} {if $showLinks}
- {crmButton accesskey="N" p=$newMassUrl q='reset=1' icon="mail-closed"}{ts}{$linkTitle}{/ts}{/crmButton}
+ {crmButton accesskey="N" p=$newMassUrl q='reset=1' icon="envelope"}{ts}{$linkTitle}{/ts}{/crmButton}
{/if} diff --git a/templates/CRM/Mailing/Page/Component.tpl b/templates/CRM/Mailing/Page/Component.tpl index 7dc88e796d..0a1bb06eac 100644 --- 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}
- {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}
{/if}
diff --git a/templates/CRM/Member/Page/MembershipStatus.tpl b/templates/CRM/Member/Page/MembershipStatus.tpl index a4a83b998b..9032b463ca 100644 --- 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}
- {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}
{/if} diff --git a/templates/CRM/Member/Page/MembershipType.tpl b/templates/CRM/Member/Page/MembershipType.tpl index b24eb0d116..d48d2f5faf 100644 --- 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}
- {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}
{/if} diff --git a/templates/CRM/Price/Page/Field.tpl b/templates/CRM/Price/Page/Field.tpl index 413559c99d..14a11e55e4 100644 --- a/templates/CRM/Price/Page/Field.tpl +++ b/templates/CRM/Price/Page/Field.tpl @@ -45,9 +45,9 @@ {if $action NEQ 8 and $priceField}
{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}
{strip} @@ -96,9 +96,9 @@
{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}
{else} @@ -108,7 +108,7 @@ {ts}None found.{/ts}
- {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} {/if} diff --git a/templates/CRM/Price/Page/Option.tpl b/templates/CRM/Price/Page/Option.tpl index cd257f921c..feeabbb068 100644 --- a/templates/CRM/Price/Page/Option.tpl +++ b/templates/CRM/Price/Page/Option.tpl @@ -107,8 +107,8 @@ {/if} {if $addMoreFields && !$isReserved}
- {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}
{/if} {/if} diff --git a/templates/CRM/Price/Page/Set.tpl b/templates/CRM/Price/Page/Set.tpl index 5935a1db6f..faed68a3c5 100644 --- 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) }
- {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}
{/if} diff --git a/templates/CRM/SMS/Page/Provider.tpl b/templates/CRM/SMS/Page/Provider.tpl index bedd1c697c..27a80214e8 100644 --- a/templates/CRM/SMS/Page/Provider.tpl +++ b/templates/CRM/SMS/Page/Provider.tpl @@ -68,6 +68,6 @@ {/if}
- {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}
{/if} diff --git a/templates/CRM/UF/Page/Field.tpl b/templates/CRM/UF/Page/Field.tpl index 0903c7fbc6..0a0c4cb841 100644 --- a/templates/CRM/UF/Page/Field.tpl +++ b/templates/CRM/UF/Page/Field.tpl @@ -37,7 +37,7 @@
{if not ($action eq 2 or $action eq 1)}
- {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}
{/if} @@ -79,7 +79,7 @@ {/strip} {if not ($action eq 2 or $action eq 1)}
- {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}
{/if} @@ -93,7 +93,7 @@ {ts}None found.{/ts}
- {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}
{/if} {/if} -- 2.25.1