From d3e28be6428eef577e87c2a339e36087e3d5de34 Mon Sep 17 00:00:00 2001 From: Mathieu Lutfy Date: Thu, 20 Jul 2023 06:50:13 -0400 Subject: [PATCH] dev/user-interface#51 Remove top buttons on admin forms --- templates/CRM/ACL/Form/ACL.tpl | 3 +- templates/CRM/ACL/Form/EntityRole.tpl | 5 +- .../CRM/ACL/Form/WordPress/Permissions.tpl | 11 +-- templates/CRM/ACL/Page/EntityRole.tpl | 4 +- templates/CRM/Activity/Form/Activity.tpl | 4 - templates/CRM/Activity/Form/Task/AddToTag.tpl | 1 - templates/CRM/Activity/Form/Task/Delete.tpl | 14 ++- .../CRM/Activity/Form/Task/FileOnCase.tpl | 28 +++--- .../CRM/Activity/Form/Task/PickOption.tpl | 41 ++++----- .../CRM/Activity/Form/Task/PickProfile.tpl | 26 +++--- .../CRM/Activity/Form/Task/RemoveFromTag.tpl | 6 +- .../Form/Task/SearchTaskHookSample.tpl | 9 +- .../CRM/Activity/Import/Form/Preview.tpl | 1 - templates/CRM/Admin/Form/CMSUser.tpl | 1 - templates/CRM/Admin/Form/ContactType.tpl | 4 - templates/CRM/Admin/Form/LabelFormats.tpl | 1 - templates/CRM/Admin/Form/LocationType.tpl | 1 - templates/CRM/Admin/Form/MailSettings.tpl | 3 +- templates/CRM/Admin/Form/Mapping.tpl | 4 +- templates/CRM/Admin/Form/MessageTemplates.tpl | 1 - templates/CRM/Admin/Form/Navigation.tpl | 1 - templates/CRM/Admin/Form/OptionGroup.tpl | 1 - templates/CRM/Admin/Form/Options.tpl | 16 ++-- .../CRM/Admin/Form/ParticipantStatusType.tpl | 5 -- templates/CRM/Admin/Form/PaymentProcessor.tpl | 1 - .../CRM/Admin/Form/PaymentProcessorType.tpl | 1 - templates/CRM/Admin/Form/PdfFormats.tpl | 2 - .../CRM/Admin/Form/Preferences/Address.tpl | 1 - .../CRM/Admin/Form/Preferences/Contribute.tpl | 1 - .../CRM/Admin/Form/Preferences/Display.tpl | 1 - templates/CRM/Admin/Form/PreferencesDate.tpl | 3 +- .../CRM/Admin/Form/ScheduleReminders.tpl | 1 - templates/CRM/Admin/Form/Setting/Date.tpl | 1 - .../CRM/Admin/Form/Setting/Debugging.tpl | 1 - templates/CRM/Admin/Form/Setting/Event.tpl | 26 ------ .../CRM/Admin/Form/Setting/Localization.tpl | 1 - templates/CRM/Admin/Form/Setting/Mapping.tpl | 1 - .../CRM/Admin/Form/Setting/Miscellaneous.tpl | 3 - templates/CRM/Admin/Form/Setting/Path.tpl | 1 - .../CRM/Admin/Form/Setting/SettingForm.tpl | 1 - templates/CRM/Admin/Form/Setting/UF.tpl | 1 - templates/CRM/Admin/Form/Setting/Url.tpl | 1 - templates/CRM/Admin/Page/Options.tpl | 7 +- .../CRM/Admin/Page/PaymentProcessorType.tpl | 2 +- templates/CRM/Badge/Form/Layout.tpl | 1 - templates/CRM/Batch/Form/Batch.tpl | 7 +- templates/CRM/Campaign/Form/Campaign.tpl | 21 ++--- templates/CRM/Campaign/Form/Petition.tpl | 18 ++-- templates/CRM/Campaign/Form/Survey/Main.tpl | 8 +- .../CRM/Campaign/Form/Survey/Questions.tpl | 4 - .../CRM/Campaign/Form/Survey/Results.tpl | 59 ++++++------- templates/CRM/Campaign/Form/Task/Release.tpl | 23 ++--- templates/CRM/Campaign/Form/Task/Reserve.tpl | 86 ++++++++---------- templates/CRM/Case/Form/Activity.tpl | 6 -- templates/CRM/Case/Form/ActivityView.tpl | 1 - templates/CRM/Case/Form/Case.tpl | 4 - templates/CRM/Contact/Form/DedupeFind.tpl | 1 - templates/CRM/Contact/Form/DedupeRules.tpl | 2 - templates/CRM/Contact/Form/Domain.tpl | 9 +- templates/CRM/Contact/Form/Task/AddToTag.tpl | 12 +-- .../Contact/Form/Task/AlterPreferences.tpl | 12 +-- templates/CRM/Contact/Form/Task/Email.tpl | 1 - templates/CRM/Contact/Form/Task/Label.tpl | 9 +- .../CRM/Contact/Form/Task/RemoveFromGroup.tpl | 21 +++-- .../CRM/Contact/Form/Task/RemoveFromTag.tpl | 3 +- templates/CRM/Contact/Form/Task/SMS.tpl | 1 - .../CRM/Contact/Import/Form/MapField.tpl | 3 +- templates/CRM/Contact/Import/Form/Preview.tpl | 1 - templates/CRM/Contact/Page/View/Note.tpl | 1 - templates/CRM/Contact/Page/View/Useradd.tpl | 42 ++++----- .../CRM/Contribute/Form/Contribution.tpl | 3 - .../Form/ContributionPage/Amount.tpl | 1 - .../Form/ContributionPage/Custom.tpl | 1 - .../Form/ContributionPage/Premium.tpl | 1 - .../Form/ContributionPage/Settings.tpl | 1 - .../Form/ContributionPage/ThankYou.tpl | 1 - .../Form/ContributionPage/Widget.tpl | 1 - .../CRM/Contribute/Form/ManagePremiums.tpl | 1 - .../CRM/Contribute/Form/PaymentInstrument.tpl | 28 ------ templates/CRM/Contribute/Form/Preview.tpl | 87 ------------------- .../Contribute/Form/UpdateSubscription.tpl | 1 - .../CRM/Contribute/Import/Form/MapField.tpl | 12 ++- .../CRM/Contribute/Import/Form/Preview.tpl | 1 - templates/CRM/Core/Form/EntityForm.tpl | 1 - templates/CRM/Core/Form/Task/PickProfile.tpl | 7 +- templates/CRM/Custom/Form/Field.tpl | 1 - templates/CRM/Custom/Form/Group.tpl | 1 - templates/CRM/Custom/Form/MoveField.tpl | 3 +- templates/CRM/Custom/Form/Option.tpl | 5 +- .../CRM/Event/Form/ManageEvent/Delete.tpl | 18 ++-- templates/CRM/Event/Form/Participant.tpl | 1 - templates/CRM/Export/Form/Map.tpl | 17 ++-- templates/CRM/Export/Form/Select.tpl | 1 - .../CRM/Financial/Form/FinancialAccount.tpl | 1 - .../CRM/Financial/Form/FinancialBatch.tpl | 2 - .../Financial/Form/FinancialTypeAccount.tpl | 4 - templates/CRM/Form/basicForm.tpl | 1 - templates/CRM/Friend/Form/Friend.tpl | 1 - templates/CRM/Group/Form/Edit.tpl | 1 - templates/CRM/Import/Form/DataSource.tpl | 3 - templates/CRM/Import/Form/MapField.tpl | 7 +- templates/CRM/Mailing/Form/Subscribe.tpl | 23 ++--- templates/CRM/Member/Form/Membership.tpl | 1 - templates/CRM/Member/Form/MembershipBlock.tpl | 7 +- .../CRM/Member/Form/MembershipStatus.tpl | 1 - templates/CRM/Member/Form/MembershipType.tpl | 2 - templates/CRM/Member/Form/Task/Label.tpl | 9 +- templates/CRM/Member/Import/Form/Preview.tpl | 1 - templates/CRM/PCP/Form/PCP.tpl | 7 +- templates/CRM/Pledge/Form/Pledge.tpl | 1 - templates/CRM/Pledge/Form/PledgeView.tpl | 73 +++++++--------- templates/CRM/Price/Form/Field.tpl | 1 - templates/CRM/Price/Form/Set.tpl | 4 - templates/CRM/Price/Page/Field.tpl | 6 -- templates/CRM/Report/Form/Register.tpl | 41 ++------- templates/CRM/SMS/Form/Provider.tpl | 12 ++- templates/CRM/Tag/Form/Edit.tpl | 1 - templates/CRM/UF/Form/Field.tpl | 1 - templates/CRM/UF/Form/Group.tpl | 17 ++-- templates/CRM/UF/Page/Field.tpl | 6 -- 120 files changed, 293 insertions(+), 739 deletions(-) delete mode 100644 templates/CRM/Admin/Form/Setting/Event.tpl delete mode 100644 templates/CRM/Contribute/Form/PaymentInstrument.tpl delete mode 100644 templates/CRM/Contribute/Form/Preview.tpl diff --git a/templates/CRM/ACL/Form/ACL.tpl b/templates/CRM/ACL/Form/ACL.tpl index 15cefe0ef5..d0f2fb0dcf 100644 --- a/templates/CRM/ACL/Form/ACL.tpl +++ b/templates/CRM/ACL/Form/ACL.tpl @@ -12,10 +12,9 @@ {if $action eq 8}
{icon icon="fa-info-circle"}{/icon} - {ts}WARNING: Delete will remove this permission from the specified ACL Role.{/ts} {ts}Do you want to continue?{/ts} + {ts}WARNING: Delete will remove this permission from the specified ACL Role.{/ts} {ts}Do you want to continue?{/ts}
{else} -
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/ACL/Form/EntityRole.tpl b/templates/CRM/ACL/Form/EntityRole.tpl index a2a8799c98..273e1bcd26 100644 --- a/templates/CRM/ACL/Form/EntityRole.tpl +++ b/templates/CRM/ACL/Form/EntityRole.tpl @@ -10,11 +10,10 @@ {* this template is used for adding/editing ACL EntityRole objects *}
{if $action eq 1}{ts}Assign ACL Role{/ts}{elseif $action eq 2}{ts}Assign ACL Role{/ts}{else}{ts}Delete ACL Role Assignment{/ts}{/if} -
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
- {icon icon="fa-info-circle"}{/icon} - {ts}WARNING: Deleting this option will remove this ACL Role Assignment.{/ts} {ts}Do you want to continue?{/ts} + {icon icon="fa-info-circle"}{/icon} + {ts}WARNING: Deleting this option will remove this ACL Role Assignment.{/ts} {ts}Do you want to continue?{/ts}
{else}
{$form.name.label}
diff --git a/templates/CRM/ACL/Form/WordPress/Permissions.tpl b/templates/CRM/ACL/Form/WordPress/Permissions.tpl index 1c5e71ea5b..eb8acd484c 100644 --- a/templates/CRM/ACL/Form/WordPress/Permissions.tpl +++ b/templates/CRM/ACL/Form/WordPress/Permissions.tpl @@ -12,13 +12,8 @@

{ts}Use this form to Grant access to CiviCRM components and other CiviCRM permissions to WordPress roles.{/ts}

{ts}NOTE: Super Admin and Administrator roles will have all permissions in CiviCRM.{/ts}

-
- -
{include file="CRM/common/formButtons.tpl" location="top"}
-
- {assign var="num" value=0} @@ -54,9 +49,5 @@ {/foreach}
 
- -
- {include file="CRM/common/formButtons.tpl" location="bottom"} -
- +
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/ACL/Page/EntityRole.tpl b/templates/CRM/ACL/Page/EntityRole.tpl index 9b82cb4793..4bd0415c92 100644 --- a/templates/CRM/ACL/Page/EntityRole.tpl +++ b/templates/CRM/ACL/Page/EntityRole.tpl @@ -7,7 +7,9 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{include file="CRM/ACL/Header.tpl" step=2} +{if $action neq 8} + {include file="CRM/ACL/Header.tpl" step=2} +{/if} {if $action eq 1 or $action eq 2 or $action eq 8} {include file="CRM/ACL/Form/EntityRole.tpl"} diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl index b68f6f56ce..f554bff1b4 100644 --- a/templates/CRM/Activity/Form/Activity.tpl +++ b/templates/CRM/Activity/Form/Activity.tpl @@ -16,10 +16,6 @@ {/if}
{/if} - {if !$action or ( $action eq 1 ) or ( $action eq 2 ) } -
{include file="CRM/common/formButtons.tpl" location="top"}
- {/if} - {if $action eq 8} {* Delete action. *} diff --git a/templates/CRM/Activity/Form/Task/AddToTag.tpl b/templates/CRM/Activity/Form/Task/AddToTag.tpl index f803f4c8b4..a2e4cf4ab9 100644 --- a/templates/CRM/Activity/Form/Task/AddToTag.tpl +++ b/templates/CRM/Activity/Form/Task/AddToTag.tpl @@ -11,7 +11,6 @@

{ts}Tag Activities{/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
- - - -
diff --git a/templates/CRM/Activity/Form/Task/Delete.tpl b/templates/CRM/Activity/Form/Task/Delete.tpl index d467db4b42..0c3b076961 100644 --- a/templates/CRM/Activity/Form/Task/Delete.tpl +++ b/templates/CRM/Activity/Form/Task/Delete.tpl @@ -9,12 +9,10 @@ *} {* Confirmation of Activity deletes *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
-
- {icon icon="fa-info-circle"}{/icon} -

{ts}Are you sure you want to delete the selected Activities?{/ts}

-

{include file="CRM/Activity/Form/Task.tpl"}

-
-

-

{include file="CRM/common/formButtons.tpl" location="bottom"}
+
+ {icon icon="fa-info-circle"}{/icon} +

{ts}Are you sure you want to delete the selected Activities?{/ts}

+

{include file="CRM/Activity/Form/Task.tpl"}

+
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Activity/Form/Task/FileOnCase.tpl b/templates/CRM/Activity/Form/Task/FileOnCase.tpl index 40474330da..d8edd1898d 100644 --- a/templates/CRM/Activity/Form/Task/FileOnCase.tpl +++ b/templates/CRM/Activity/Form/Task/FileOnCase.tpl @@ -8,22 +8,14 @@ +--------------------------------------------------------------------+ *}
-
- {ts}File on Case{/ts} -
-
{include file="CRM/common/formButtons.tpl" location="top"}
- - - - - - - {include file="CRM/Activity/Form/Task.tpl"} - -
- {$form.unclosed_case_id.label} - - {$form.unclosed_case_id.html}
-
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+ + + + + + + {include file="CRM/Activity/Form/Task.tpl"} + +
{$form.unclosed_case_id.label}{$form.unclosed_case_id.html}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Activity/Form/Task/PickOption.tpl b/templates/CRM/Activity/Form/Task/PickOption.tpl index a2167dddca..61edac977e 100644 --- a/templates/CRM/Activity/Form/Task/PickOption.tpl +++ b/templates/CRM/Activity/Form/Task/PickOption.tpl @@ -8,26 +8,23 @@ +--------------------------------------------------------------------+ *}
-
- {ts}Select Group of Contacts{/ts} -
-
{include file="CRM/common/formButtons.tpl" location="top"}
- - - - - - - - - - - - - - - {include file="CRM/Activity/Form/Task.tpl"} - -
{$form.with_contact.label}{$form.with_contact.html}
{$form.assigned_to.label}{$form.assigned_to.html}
{$form.created_by.label}{$form.created_by.html}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{ts}Select Group of Contacts{/ts}
+ + + + + + + + + + + + + + + {include file="CRM/Activity/Form/Task.tpl"} + +
{$form.with_contact.label}{$form.with_contact.html}
{$form.assigned_to.label}{$form.assigned_to.html}
{$form.created_by.label}{$form.created_by.html}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Activity/Form/Task/PickProfile.tpl b/templates/CRM/Activity/Form/Task/PickProfile.tpl index f5c07d254e..978827ef3c 100644 --- a/templates/CRM/Activity/Form/Task/PickProfile.tpl +++ b/templates/CRM/Activity/Form/Task/PickProfile.tpl @@ -8,19 +8,15 @@ +--------------------------------------------------------------------+ *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
- - - - - - - - - +
{$form.uf_group_id.label}{$form.uf_group_id.html}
- {include file="CRM/Activity/Form/Task.tpl"} -
+ + + + + + + +
{$form.uf_group_id.label}{$form.uf_group_id.html}
{include file="CRM/Activity/Form/Task.tpl"}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
-
- +
{include file="CRM/common/formButtons.tpl" location="bottom"}
+ diff --git a/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl b/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl index c877716fc8..039904e8a9 100644 --- a/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl +++ b/templates/CRM/Activity/Form/Task/RemoveFromTag.tpl @@ -9,10 +9,7 @@ *} {* template to remove tags from activity *}
-

-{ts}Tag Activities (Remove){/ts} -

-
{include file="CRM/common/formButtons.tpl" location="top"}
+

{ts}Tag Activities (Remove){/ts}

-
@@ -29,7 +26,6 @@ {include file="CRM/common/Tagset.tpl"}
{include file="CRM/Activity/Form/Task.tpl"}
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl b/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl index 4f1d28038a..3947ebb535 100644 --- a/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl +++ b/templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl @@ -8,10 +8,6 @@ +--------------------------------------------------------------------+ *} {if $rows} -
{include file="CRM/common/formButtons.tpl" location="top"}
- -
-

@@ -21,7 +17,6 @@ - {foreach from=$rows item=row} @@ -37,7 +32,7 @@ {else}
- {icon icon="fa-info-circle"}{/icon} - {ts}There are no records selected.{/ts} + {icon icon="fa-info-circle"}{/icon} + {ts}There are no records selected.{/ts}
{/if} diff --git a/templates/CRM/Activity/Import/Form/Preview.tpl b/templates/CRM/Activity/Import/Form/Preview.tpl index a704ea9d28..be02d2a51f 100644 --- a/templates/CRM/Activity/Import/Form/Preview.tpl +++ b/templates/CRM/Activity/Import/Form/Preview.tpl @@ -27,7 +27,6 @@

{ts}Click 'Import Now' if you are ready to proceed.{/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
{* Summary Preview (record counts) *}
{ts}Activity Type{/ts} {ts}Activity Date{/ts}
{$row.display_name}
diff --git a/templates/CRM/Admin/Form/CMSUser.tpl b/templates/CRM/Admin/Form/CMSUser.tpl index 093b1a2021..463e6a635a 100644 --- a/templates/CRM/Admin/Form/CMSUser.tpl +++ b/templates/CRM/Admin/Form/CMSUser.tpl @@ -12,7 +12,6 @@

{ts}Synchronize Users{/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
{ts}status{/ts} {ts}Synchronize Users to Contacts:{/ts} {ts}CiviCRM will check each user record for a contact record. A new contact record will be created for each user where one does not already exist.{/ts} {ts}Do you want to continue?{/ts} diff --git a/templates/CRM/Admin/Form/ContactType.tpl b/templates/CRM/Admin/Form/ContactType.tpl index 527eec758c..41f99a21d0 100644 --- a/templates/CRM/Admin/Form/ContactType.tpl +++ b/templates/CRM/Admin/Form/ContactType.tpl @@ -8,7 +8,6 @@ +--------------------------------------------------------------------+ *} {* this template is used for adding/editing Contact Type *} -
{if $action eq 8}
@@ -16,7 +15,6 @@ {ts}WARNING: {ts}This action cannot be undone.{/ts} {ts}Do you want to continue?{/ts}{/ts}
{else} -
{include file="CRM/common/formButtons.tpl" location="top"}
- @@ -54,7 +51,6 @@ {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='description' id= $cid} {/if} - diff --git a/templates/CRM/Admin/Form/LabelFormats.tpl b/templates/CRM/Admin/Form/LabelFormats.tpl index d5bcc2a96b..1965a0a1f7 100644 --- a/templates/CRM/Admin/Form/LabelFormats.tpl +++ b/templates/CRM/Admin/Form/LabelFormats.tpl @@ -37,7 +37,6 @@ {ts 1=$formatName}Are you sure you would like to make a copy of the Label Format titled %1?{/ts} {else} -
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.label.label} @@ -24,7 +22,6 @@ {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='label' id= $cid } {/if} {$form.label.html}
{$form.description.html}
diff --git a/templates/CRM/Admin/Form/LocationType.tpl b/templates/CRM/Admin/Form/LocationType.tpl index 2689513080..724afb5dad 100644 --- a/templates/CRM/Admin/Form/LocationType.tpl +++ b/templates/CRM/Admin/Form/LocationType.tpl @@ -9,7 +9,6 @@ *} {* this template is used for adding/editing location type *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
{icon icon="fa-info-circle"}{/icon} diff --git a/templates/CRM/Admin/Form/MailSettings.tpl b/templates/CRM/Admin/Form/MailSettings.tpl index d003ef89f9..27218a6fb7 100644 --- a/templates/CRM/Admin/Form/MailSettings.tpl +++ b/templates/CRM/Admin/Form/MailSettings.tpl @@ -9,13 +9,12 @@ *} {* this template is used for adding/editing email settings. *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
{icon icon="fa-info-circle"}{/icon} {ts}WARNING: Deleting this option will result in the loss of mail settings data.{/ts} {ts}Do you want to continue?{/ts}
-
{include file="CRM/common/formButtons.tpl" location="top"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
{else}
{$form.label.label}
diff --git a/templates/CRM/Admin/Form/Mapping.tpl b/templates/CRM/Admin/Form/Mapping.tpl index b943bfd881..f71003752d 100644 --- a/templates/CRM/Admin/Form/Mapping.tpl +++ b/templates/CRM/Admin/Form/Mapping.tpl @@ -10,7 +10,6 @@ {* this template is used for adding/editing a saved mapping *}
{if $action eq 1 or $action eq 2 } -
{include file="CRM/common/formButtons.tpl" location="top"}
@@ -32,6 +31,5 @@
{/if} -
{include file="CRM/common/formButtons.tpl" loaction="bottom"}
-
+
{include file="CRM/common/formButtons.tpl" loaction="bottom"}
diff --git a/templates/CRM/Admin/Form/MessageTemplates.tpl b/templates/CRM/Admin/Form/MessageTemplates.tpl index cb42f4139d..1ccf31f3c9 100644 --- a/templates/CRM/Admin/Form/MessageTemplates.tpl +++ b/templates/CRM/Admin/Form/MessageTemplates.tpl @@ -24,7 +24,6 @@ {ts 1=$msg_title|escape}Do you want to delete the message template '%1'?{/ts} {else} -
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.name.label}
diff --git a/templates/CRM/Admin/Form/Navigation.tpl b/templates/CRM/Admin/Form/Navigation.tpl index 3a37bbc79c..a180b239db 100644 --- a/templates/CRM/Admin/Form/Navigation.tpl +++ b/templates/CRM/Admin/Form/Navigation.tpl @@ -9,7 +9,6 @@ *} {* Template for adding/editing a CiviCRM Navigation Menu Item *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.msg_title.label}
diff --git a/templates/CRM/Admin/Form/OptionGroup.tpl b/templates/CRM/Admin/Form/OptionGroup.tpl index ae96f23def..7a4b659b5e 100644 --- a/templates/CRM/Admin/Form/OptionGroup.tpl +++ b/templates/CRM/Admin/Form/OptionGroup.tpl @@ -9,7 +9,6 @@ *}

{if $action eq 1}{ts}New Option Group{/ts}{elseif $action eq 2}{ts}Edit Option Group{/ts}{else}{ts}Delete Option Group{/ts}{/if}

-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
{icon icon="fa-info-circle"}{/icon} diff --git a/templates/CRM/Admin/Form/Options.tpl b/templates/CRM/Admin/Form/Options.tpl index 2d6ab20691..a4d3c84a8b 100644 --- a/templates/CRM/Admin/Form/Options.tpl +++ b/templates/CRM/Admin/Form/Options.tpl @@ -9,13 +9,12 @@ *} {* this template is used for adding/editing options *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8} -
- {icon icon="fa-info-circle"}{/icon} - {ts 1=$gLabel}WARNING: Deleting this option will result in the loss of all %1 related records which use the option.{/ts} {ts}This may mean the loss of a substantial amount of data, and the action cannot be undone.{/ts} {ts}Do you want to continue?{/ts} -
- {else} +
+ {icon icon="fa-info-circle"}{/icon} + {ts 1=$gLabel}WARNING: Deleting this option will result in the loss of all %1 related records which use the option.{/ts} {ts}This may mean the loss of a substantial amount of data, and the action cannot be undone.{/ts} {ts}Do you want to continue?{/ts} +
+ {else}
{$form.label.label}{$form.label.html}
{if $gName eq 'custom_search'} @@ -158,7 +157,6 @@ {/if}
- {/if} -
{include file="CRM/common/formButtons.tpl" location="bottom"}
- + {/if} +
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Admin/Form/ParticipantStatusType.tpl b/templates/CRM/Admin/Form/ParticipantStatusType.tpl index 89508dfc70..5280bb06ba 100644 --- a/templates/CRM/Admin/Form/ParticipantStatusType.tpl +++ b/templates/CRM/Admin/Form/ParticipantStatusType.tpl @@ -12,7 +12,6 @@ {if $action eq 1}{ts}New Participant Status{/ts}{elseif $action eq 2}{ts}Edit Participant Status{/ts}{else}{ts}Delete Participant Status{/ts}{/if} -
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
{icon icon="fa-info-circle"}{/icon} @@ -27,13 +26,11 @@
{$form.name.html}
{ts}Name of this status type, for use in the code.{/ts}
{$form.label.label}{if $action == 2} {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_participant_status_type' field='label' id=$id}{/if} {$form.label.html}
{ts}Display label for this status.{/ts}
{$form.class.label} {$form.class.html}
@@ -54,12 +51,10 @@ 		{$form.is_counted.html}
{ts}Should a person with this status be counted as a participant for the purpose of controlling the Maximum Number of Participants?{/ts}
{$form.weight.label} {$form.weight.html}
{$form.visibility_id.label} {$form.visibility_id.html}
diff --git a/templates/CRM/Admin/Form/PaymentProcessor.tpl b/templates/CRM/Admin/Form/PaymentProcessor.tpl index 91e3ef405b..722f042447 100644 --- a/templates/CRM/Admin/Form/PaymentProcessor.tpl +++ b/templates/CRM/Admin/Form/PaymentProcessor.tpl @@ -10,7 +10,6 @@ {* This template is used for adding/configuring Payment Processors used by a particular site/domain. *}

{if $action eq 1}{ts}New Payment Processor{/ts}{elseif $action eq 2}{ts}Edit Payment Processor{/ts}{else}{ts}Delete Payment Processor{/ts}{/if}

-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
diff --git a/templates/CRM/Admin/Form/PaymentProcessorType.tpl b/templates/CRM/Admin/Form/PaymentProcessorType.tpl index 3807b2e9b2..72a431f1c0 100644 --- a/templates/CRM/Admin/Form/PaymentProcessorType.tpl +++ b/templates/CRM/Admin/Form/PaymentProcessorType.tpl @@ -10,7 +10,6 @@ {* this template is used for adding/editing available Payment Processors *}
{if $action eq 1}{ts}New Payment Procesor Type{/ts}{elseif $action eq 2}{ts}Edit Payment Procesor Type{/ts}{else}{ts}Delete Payment Procesor Type{/ts}{/if} -
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
{icon icon="fa-info-circle"}{/icon} diff --git a/templates/CRM/Admin/Form/PdfFormats.tpl b/templates/CRM/Admin/Form/PdfFormats.tpl index 7b6386d5d1..e7d8ce32d8 100644 --- a/templates/CRM/Admin/Form/PdfFormats.tpl +++ b/templates/CRM/Admin/Form/PdfFormats.tpl @@ -26,8 +26,6 @@ *} {* This template is used for adding/configuring PDF Page Formats. *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
- {if $action eq 8}
{icon icon="fa-info-circle"}{/icon} diff --git a/templates/CRM/Admin/Form/Preferences/Address.tpl b/templates/CRM/Admin/Form/Preferences/Address.tpl index 8ba9aeb666..d04d3e122f 100644 --- a/templates/CRM/Admin/Form/Preferences/Address.tpl +++ b/templates/CRM/Admin/Form/Preferences/Address.tpl @@ -8,7 +8,6 @@ +--------------------------------------------------------------------+ *}
-
{include file="CRM/common/formButtons.tpl" location="top"}

{ts}Mailing Labels{/ts}

diff --git a/templates/CRM/Admin/Form/Preferences/Contribute.tpl b/templates/CRM/Admin/Form/Preferences/Contribute.tpl index 0c40f27567..4d5a3da18f 100644 --- a/templates/CRM/Admin/Form/Preferences/Contribute.tpl +++ b/templates/CRM/Admin/Form/Preferences/Contribute.tpl @@ -8,7 +8,6 @@ +--------------------------------------------------------------------+ *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{include file="CRM/Form/basicFormFields.tpl"}
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl index 0643d07a43..9803c861a4 100644 --- a/templates/CRM/Admin/Form/Preferences/Display.tpl +++ b/templates/CRM/Admin/Form/Preferences/Display.tpl @@ -9,7 +9,6 @@ *} {* this template is used for editing Site Preferences *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Admin/Form/PreferencesDate.tpl b/templates/CRM/Admin/Form/PreferencesDate.tpl index a31f0b7f79..a7475e6dd7 100644 --- a/templates/CRM/Admin/Form/PreferencesDate.tpl +++ b/templates/CRM/Admin/Form/PreferencesDate.tpl @@ -7,9 +7,8 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{* this template is used for adding/editing location type *} +{* this template is used for editing Date Preferences *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.contact_view_options.label}
diff --git a/templates/CRM/Admin/Form/ScheduleReminders.tpl b/templates/CRM/Admin/Form/ScheduleReminders.tpl index e58203ddbb..472216870b 100644 --- a/templates/CRM/Admin/Form/ScheduleReminders.tpl +++ b/templates/CRM/Admin/Form/ScheduleReminders.tpl @@ -9,7 +9,6 @@ *} {* This template is used for adding/scheduling reminders. *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
diff --git a/templates/CRM/Admin/Form/Setting/Date.tpl b/templates/CRM/Admin/Form/Setting/Date.tpl index a3b2642159..bafec78963 100644 --- a/templates/CRM/Admin/Form/Setting/Date.tpl +++ b/templates/CRM/Admin/Form/Setting/Date.tpl @@ -12,7 +12,6 @@ {ts 1=$crmURL}Use this screen to configure default formats for date display and date input fields throughout your site. Settings use standard POSIX specifiers. New installations are preconfigured with standard United States formats. You can override this default setting and define the range of allowed dates for specific field types at Administer > Customize Data and Screens > Date Preferences{/ts} {help id='date-format'}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{ts}Date Display{/ts}
{$form.name.label}{$form.name.html}
diff --git a/templates/CRM/Admin/Form/Setting/Debugging.tpl b/templates/CRM/Admin/Form/Setting/Debugging.tpl index bf3c829baa..93842e512c 100644 --- a/templates/CRM/Admin/Form/Setting/Debugging.tpl +++ b/templates/CRM/Admin/Form/Setting/Debugging.tpl @@ -11,7 +11,6 @@ {ts}In addition to the settings on this screen, there are a number of settings you can add to your sites's settings file (civicrm.settings.php) to provide additional debugging information.{/ts} {docURL page="dev/tools/debugging/#changing-file-based-settings"}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{if !empty($form.userFrameworkLogging)} diff --git a/templates/CRM/Admin/Form/Setting/Event.tpl b/templates/CRM/Admin/Form/Setting/Event.tpl deleted file mode 100644 index c437af0973..0000000000 --- a/templates/CRM/Admin/Form/Setting/Event.tpl +++ /dev/null @@ -1,26 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC. All rights reserved. | - | | - | This work is published under the GNU AGPLv3 license with some | - | permitted exceptions and without any warranty. For full license | - | and copyright information, see https://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -{capture assign=docUrlText}{ts}CiviEvent Cart Checkout{/ts}{/capture} -{capture assign=docLink}{docURL page="CiviEvent Cart Checkout" text=$docUrlText resource="wiki"}{/capture} -
-
- {ts 1=$docLink}These settings are used to configure properties for the CiviEvent component. Please read the %1 documentation, and make sure you understand it before modifying default values.{/ts} -
-
-
{include file="CRM/common/formButtons.tpl" location="top"}
-
- - - -
{$form.enable_cart.label}{$form.enable_cart.html}
- {ts}Check to enable the Event Cart checkout workflow.{/ts}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
-
-
diff --git a/templates/CRM/Admin/Form/Setting/Localization.tpl b/templates/CRM/Admin/Form/Setting/Localization.tpl index 29fb16f2cc..186770fb4d 100644 --- a/templates/CRM/Admin/Form/Setting/Localization.tpl +++ b/templates/CRM/Admin/Form/Setting/Localization.tpl @@ -12,7 +12,6 @@ {docURL page="i18n Administrator's Guide: Using CiviCRM in your own language" resource="wiki"}
-
{include file="CRM/common/formButtons.tpl" location="top"}

{ts}Language and Currency{/ts}

diff --git a/templates/CRM/Admin/Form/Setting/Mapping.tpl b/templates/CRM/Admin/Form/Setting/Mapping.tpl index 9d73278454..3c1e306e92 100644 --- a/templates/CRM/Admin/Form/Setting/Mapping.tpl +++ b/templates/CRM/Admin/Form/Setting/Mapping.tpl @@ -11,7 +11,6 @@ {ts}CiviCRM includes plugins for several mapping and geocoding web services. When your users save a contact or event location address, a geocoding service will convert the address into geographical coordinates, which are required for mapping. Mapping services allow your users to display addresses on a map.{/ts} {help id='map-intro-id'}
-
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl b/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl index 25df8e2b46..0f2cd40dfd 100644 --- a/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl +++ b/templates/CRM/Admin/Form/Setting/Miscellaneous.tpl @@ -8,8 +8,6 @@ +--------------------------------------------------------------------+ *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
-
{$form.mapProvider.label}
@@ -17,7 +15,6 @@ {ts}The number of days before a personalized (hashed) link will expire.{/ts}
{$form.checksum_timeout.label}
- diff --git a/templates/CRM/Admin/Form/Setting/Path.tpl b/templates/CRM/Admin/Form/Setting/Path.tpl index b8fe2e067f..3d1c1c4faa 100644 --- a/templates/CRM/Admin/Form/Setting/Path.tpl +++ b/templates/CRM/Admin/Form/Setting/Path.tpl @@ -17,7 +17,6 @@

-
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.contact_undelete.label}
diff --git a/templates/CRM/Admin/Form/Setting/SettingForm.tpl b/templates/CRM/Admin/Form/Setting/SettingForm.tpl index d128edfc13..3a0fdf0a5d 100644 --- a/templates/CRM/Admin/Form/Setting/SettingForm.tpl +++ b/templates/CRM/Admin/Form/Setting/SettingForm.tpl @@ -7,7 +7,6 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.uploadDir.label}
{foreach from=$settings_fields key="setting_name" item="fieldSpec"} {include file="CRM/Admin/Form/Setting/SettingField.tpl"} diff --git a/templates/CRM/Admin/Form/Setting/UF.tpl b/templates/CRM/Admin/Form/Setting/UF.tpl index 9938e4d90c..9fdfe16c60 100644 --- a/templates/CRM/Admin/Form/Setting/UF.tpl +++ b/templates/CRM/Admin/Form/Setting/UF.tpl @@ -11,7 +11,6 @@ {ts}These settings define the CMS variables that are used with CiviCRM.{/ts}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $userFrameworkUsersTableNameEnabled} diff --git a/templates/CRM/Admin/Form/Setting/Url.tpl b/templates/CRM/Admin/Form/Setting/Url.tpl index c6df140ff6..7aa5e51b7a 100644 --- a/templates/CRM/Admin/Form/Setting/Url.tpl +++ b/templates/CRM/Admin/Form/Setting/Url.tpl @@ -17,7 +17,6 @@

-
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl index a137a2d173..030bad2c36 100644 --- a/templates/CRM/Admin/Page/Options.tpl +++ b/templates/CRM/Admin/Page/Options.tpl @@ -58,11 +58,6 @@
{if $rows} - {if $isLocked ne 1} -
- {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{if !$gLabel}{ts}Add Option{/ts}{else}{ts 1=$gLabel}Add %1{/ts}{/if}{/crmButton} -
- {/if} {foreach from=$rows item=row} {if !empty($row.icon)}{assign var='hasIcons' value=true}{/if} {/foreach} @@ -149,7 +144,7 @@
{else}
- {ts}status{/ts} + {icon icon="fa-info-circle"}{/icon} {ts}None found.{/ts}
{/if} diff --git a/templates/CRM/Admin/Page/PaymentProcessorType.tpl b/templates/CRM/Admin/Page/PaymentProcessorType.tpl index 7580755844..77d2bb64cb 100644 --- a/templates/CRM/Admin/Page/PaymentProcessorType.tpl +++ b/templates/CRM/Admin/Page/PaymentProcessorType.tpl @@ -45,7 +45,7 @@ {if $action ne 1 and $action ne 2}
- {ts}New Payment Processor{/ts} + {ts}New Payment Processor{/ts} {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
{/if} diff --git a/templates/CRM/Badge/Form/Layout.tpl b/templates/CRM/Badge/Form/Layout.tpl index b41a588247..b3a9a2febe 100644 --- a/templates/CRM/Badge/Form/Layout.tpl +++ b/templates/CRM/Badge/Form/Layout.tpl @@ -10,7 +10,6 @@ {* this template is used for adding/editing badge layouts *}

{if $action eq 1}{ts}New Badge Layout{/ts}{elseif $action eq 2}{ts}Edit Badge Layout{/ts}{else}{ts}Delete Badge Layout{/ts}{/if}

-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
{icon icon="fa-info-circle"}{/icon} diff --git a/templates/CRM/Batch/Form/Batch.tpl b/templates/CRM/Batch/Form/Batch.tpl index df8b072089..46702842d2 100644 --- a/templates/CRM/Batch/Form/Batch.tpl +++ b/templates/CRM/Batch/Form/Batch.tpl @@ -16,12 +16,11 @@

{ts}New Data Entry Batch{/ts}

{/if}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
{icon icon="fa-info-circle"}{/icon} - {ts}WARNING: Deleting this batch will result in the loss of all data entered for the batch.{/ts} {ts}This may mean the loss of a substantial amount of data, and the action cannot be undone.{/ts} {ts}Do you want to continue?{/ts} -
+ {ts}WARNING: Deleting this batch will result in the loss of all data entered for the batch.{/ts} {ts}This may mean the loss of a substantial amount of data, and the action cannot be undone.{/ts} {ts}Do you want to continue?{/ts} +
{else} @@ -46,5 +45,5 @@
{/if} -
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Campaign/Form/Campaign.tpl b/templates/CRM/Campaign/Form/Campaign.tpl index a56b9df3b7..38b6cb98ce 100644 --- a/templates/CRM/Campaign/Form/Campaign.tpl +++ b/templates/CRM/Campaign/Form/Campaign.tpl @@ -8,21 +8,12 @@ +--------------------------------------------------------------------+ *}
- - {if $action eq 8} - - - - -
-
{icon icon="fa-info-circle"}{/icon}{ts}Are you sure you want to delete this Campaign?{/ts}
-
-{else} -
- {include file="CRM/common/formButtons.tpl" location="top"} +
+ {icon icon="fa-info-circle"}{/icon} + {ts}Are you sure you want to delete this Campaign?{/ts}
- +{else} @@ -81,7 +72,5 @@ {include file="CRM/common/customDataBlock.tpl"} {/if} -
- {include file="CRM/common/formButtons.tpl" location="bottom"} -
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Campaign/Form/Petition.tpl b/templates/CRM/Campaign/Form/Petition.tpl index 1d43edbb54..92f51bccc2 100644 --- a/templates/CRM/Campaign/Form/Petition.tpl +++ b/templates/CRM/Campaign/Form/Petition.tpl @@ -9,22 +9,14 @@ *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8} -
{$form.title.label}
- - - -
-
- {icon icon="fa-info-circle"}{/icon} -  {ts}Are you sure you want to delete this Petition?{/ts}
-
+
+ {icon icon="fa-info-circle"}{/icon} + {ts}Are you sure you want to delete this Petition?{/ts} +
{else} {if $action eq 1} -
- {ts}Use this form to Add new Survey. You can create a new Activity type, specific to this Survey or select an existing activity type for this Survey.{/ts} -
+
{ts}Use this form to Add new Survey. You can create a new Activity type, specific to this Survey or select an existing activity type for this Survey.{/ts}
{/if} diff --git a/templates/CRM/Campaign/Form/Survey/Main.tpl b/templates/CRM/Campaign/Form/Survey/Main.tpl index e1601b1f8b..e08b712639 100644 --- a/templates/CRM/Campaign/Form/Survey/Main.tpl +++ b/templates/CRM/Campaign/Form/Survey/Main.tpl @@ -9,12 +9,6 @@ *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
- {if $action eq 1} -
- {ts}Use this form to Add new Survey. You can create a new Activity type, specific to this Survey or select an existing activity type for this Survey.{/ts} -
- {/if}
@@ -62,7 +56,7 @@
{$form.title.label}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
{*include profile link function*} diff --git a/templates/CRM/Campaign/Form/Survey/Questions.tpl b/templates/CRM/Campaign/Form/Survey/Questions.tpl index 00050626ce..8823f6a944 100644 --- a/templates/CRM/Campaign/Form/Survey/Questions.tpl +++ b/templates/CRM/Campaign/Form/Survey/Questions.tpl @@ -7,10 +7,7 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -
-
{include file="CRM/common/formButtons.tpl" location="top"}
- @@ -21,6 +18,5 @@
{$form.contact_profile_id.label}{$form.activity_profile_id.html}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Campaign/Form/Survey/Results.tpl b/templates/CRM/Campaign/Form/Survey/Results.tpl index 8c030d3d82..477ee6dcb5 100644 --- a/templates/CRM/Campaign/Form/Survey/Results.tpl +++ b/templates/CRM/Campaign/Form/Survey/Results.tpl @@ -7,41 +7,36 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -
-
{include file="CRM/common/formButtons.tpl" location="top"}
- - - - - - {* Create Report *} - - + +
- - {* Conditionally show table for setting up selection options - for field types = radio, checkbox or select *} - {include file="CRM/Campaign/Form/ResultOptions.tpl"} -
-
-
-
- {ts}Create Report{/ts} -
-
- - +
+ + + + {* Create Report *} + + - -
+ + {* Conditionally show table for setting up selection options - for field types = radio, checkbox or select *} + {include file="CRM/Campaign/Form/ResultOptions.tpl"} +
+
+
+
{ts}Create Report{/ts}
+
+ + - - + + - +
{$form.create_report.label} {$form.create_report.html}
{$form.report_title.label} {$form.report_title.html|crmAddClass:big}
-
-
-
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
- +
+
+
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
diff --git a/templates/CRM/Campaign/Form/Task/Release.tpl b/templates/CRM/Campaign/Form/Task/Release.tpl index 618af12e3f..f50e14db1c 100644 --- a/templates/CRM/Campaign/Form/Task/Release.tpl +++ b/templates/CRM/Campaign/Form/Task/Release.tpl @@ -7,21 +7,12 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -

-{ts}Release Respondents{/ts} -

+

{ts}Release Respondents{/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
- - - - - - -
-
- {icon icon="fa-info-circle"}{/icon}{ts 1=$surveyTitle}Do you want to release respondents for '%1' ?{/ts} -
-
{include file="CRM/Contact/Form/Task.tpl"}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
+ {icon icon="fa-info-circle"}{/icon} + {ts 1=$surveyTitle}Do you want to release respondents for '%1' ?{/ts} +
+ {include file="CRM/Contact/Form/Task.tpl"} +
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Campaign/Form/Task/Reserve.tpl b/templates/CRM/Campaign/Form/Task/Reserve.tpl index 38fe35ac7e..6eb404b6e2 100644 --- a/templates/CRM/Campaign/Form/Task/Reserve.tpl +++ b/templates/CRM/Campaign/Form/Task/Reserve.tpl @@ -7,77 +7,61 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -

-{ts}Add Respondent Reservation(s){/ts} -

+

{ts}Add Respondent Reservation(s){/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
- - - - - -
-
- {icon icon="fa-info-circle"}{/icon}{ts 1=$surveyTitle}Do you want to reserve respondents for '%1' ?{/ts} -
-
{include file="CRM/Contact/Form/Task.tpl"}
+
+ {icon icon="fa-info-circle"}{/icon} + {ts 1=$surveyTitle}Do you want to reserve respondents for '%1' ?{/ts} +
+ {include file="CRM/Contact/Form/Task.tpl"} -{* Group options *} - {* New Group *} - + {* Existing Group *} +
+
{ts}Add respondent(s) to existing group(s){/ts}
+
+ + + + + +
{$form.groups.label}{$form.groups.html}
+
+
- {* Existing Group *} -
-
- {ts}Add respondent(s) to existing group(s){/ts} -
-
- -
-
{$form.groups.html}
-
-
-
-{* End of group options *} - - -
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
{literal} {/literal} diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl index 9087752740..9f2e59923f 100644 --- a/templates/CRM/Case/Form/Activity.tpl +++ b/templates/CRM/Case/Form/Activity.tpl @@ -10,12 +10,6 @@ {* this template is used for adding/editing activities for a case. *}
- - {if $action neq 8 and $action neq 32768 } - {* Include form buttons on top for new and edit modes. *} -
{include file="CRM/common/formButtons.tpl" location="top"}
- {/if} - {if $action eq 8 or $action eq 32768 }
  diff --git a/templates/CRM/Case/Form/ActivityView.tpl b/templates/CRM/Case/Form/ActivityView.tpl index d2113d9f78..170683ff8e 100644 --- a/templates/CRM/Case/Form/ActivityView.tpl +++ b/templates/CRM/Case/Form/ActivityView.tpl @@ -9,7 +9,6 @@ *} {* View Case Activities *}
-
{include file="CRM/common/formButtons.tpl" location="top" linkButtons=$actionLinks}
{if $revs} {strip} diff --git a/templates/CRM/Case/Form/Case.tpl b/templates/CRM/Case/Form/Case.tpl index fb40297d4a..3b26a979de 100644 --- a/templates/CRM/Case/Form/Case.tpl +++ b/templates/CRM/Case/Form/Case.tpl @@ -13,10 +13,6 @@ *}
-{if $action neq 8 && $action neq 32768} -
{include file="CRM/common/formButtons.tpl" location="top"}
-{/if} -

{if $action eq 8}{ts}Delete Case{/ts}{elseif $action eq 32768}{ts}Restore Case{/ts}{/if}

{if $action eq 8 or $action eq 32768 }
diff --git a/templates/CRM/Contact/Form/DedupeFind.tpl b/templates/CRM/Contact/Form/DedupeFind.tpl index 5cb53d59af..0bb2bf13f2 100644 --- a/templates/CRM/Contact/Form/DedupeFind.tpl +++ b/templates/CRM/Contact/Form/DedupeFind.tpl @@ -14,7 +14,6 @@ {/ts}
-
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Contact/Form/DedupeRules.tpl b/templates/CRM/Contact/Form/DedupeRules.tpl index 46dd7ed9cf..b65c4f4626 100644 --- a/templates/CRM/Contact/Form/DedupeRules.tpl +++ b/templates/CRM/Contact/Form/DedupeRules.tpl @@ -7,13 +7,11 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -

{ts 1=$contactTypes.$contact_type}Matching Rule for %1 Contacts{/ts}

{ts}Configure up to five fields to evaluate when searching for 'suspected' duplicate contact records.{/ts} {help id="id-rules"}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.group_id.label}
diff --git a/templates/CRM/Contact/Form/Domain.tpl b/templates/CRM/Contact/Form/Domain.tpl index 5a1bc69c72..d3d9547eff 100644 --- a/templates/CRM/Contact/Form/Domain.tpl +++ b/templates/CRM/Contact/Form/Domain.tpl @@ -9,12 +9,9 @@ *} {* this template is used for viewing and editing Domain information (for system-generated emails CiviMail-related values) *}
-{if !($action eq 4)} -
{include file="CRM/common/formButtons.tpl" location="top"}
-{/if} -
{$form.title.label}
- -
+ + +
{$form.name.label}{help id="domain-name"}
{$form.name.html}
{ts}The name of the organization or entity which owns this CiviCRM site or domain. This is the default organization contact record.{/ts} diff --git a/templates/CRM/Contact/Form/Task/AddToTag.tpl b/templates/CRM/Contact/Form/Task/AddToTag.tpl index 7826b87b13..408b58d439 100644 --- a/templates/CRM/Contact/Form/Task/AddToTag.tpl +++ b/templates/CRM/Contact/Form/Task/AddToTag.tpl @@ -8,11 +8,8 @@ +--------------------------------------------------------------------+ *}
-

-{ts}Tag Contact(s){/ts} -

-
{include file="CRM/common/formButtons.tpl" location="top"}
- +

{ts}Tag Contacts{/ts}

+
- -
@@ -29,8 +26,7 @@ {include file="CRM/common/Tagset.tpl"}
{include file="CRM/Contact/Form/Task.tpl"}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Contact/Form/Task/AlterPreferences.tpl b/templates/CRM/Contact/Form/Task/AlterPreferences.tpl index c26d0cc276..09d23fbc59 100644 --- a/templates/CRM/Contact/Form/Task/AlterPreferences.tpl +++ b/templates/CRM/Contact/Form/Task/AlterPreferences.tpl @@ -8,11 +8,8 @@ +--------------------------------------------------------------------+ *}
-

-{ts}Add 'Do Not...' Contact(s) Preferences{/ts} -

-
{include file="CRM/common/formButtons.tpl" location="top"}
- +

{ts}Communication Preferences{/ts}

+
- -
{$form.actionTypeOption.html}
@@ -25,8 +22,7 @@
{include file="CRM/Contact/Form/Task.tpl"}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Contact/Form/Task/Email.tpl b/templates/CRM/Contact/Form/Task/Email.tpl index 02e9ed51e7..4725477ff1 100644 --- a/templates/CRM/Contact/Form/Task/Email.tpl +++ b/templates/CRM/Contact/Form/Task/Email.tpl @@ -8,7 +8,6 @@ +--------------------------------------------------------------------+ *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $suppressedEmails > 0}

{ts count=$suppressedEmails plural='Email will NOT be sent to %count contacts - (no email address on file, or communication preferences specify DO NOT EMAIL, or contact is deceased).'}Email will NOT be sent to %count contact - (no email address on file, or communication preferences specify DO NOT EMAIL, or contact is deceased).{/ts}

diff --git a/templates/CRM/Contact/Form/Task/Label.tpl b/templates/CRM/Contact/Form/Task/Label.tpl index 0f7bb84fc7..69d5f5ccae 100644 --- a/templates/CRM/Contact/Form/Task/Label.tpl +++ b/templates/CRM/Contact/Form/Task/Label.tpl @@ -8,9 +8,8 @@ +--------------------------------------------------------------------+ *}
-
{include file="CRM/Contact/Form/Task.tpl"}
-
{include file="CRM/common/formButtons.tpl" location="top"}
- +
{include file="CRM/Contact/Form/Task.tpl"}
+
@@ -28,6 +27,6 @@ -
{$form.label_name.label} {$form.label_name.html} {help id="id-select-label" file="CRM/Contact/Form/Task/Label.hlp"}
{$form.merge_same_household.html} {$form.merge_same_household.label}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl b/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl index d698025f13..448a8b93a0 100644 --- a/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl +++ b/templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl @@ -8,15 +8,14 @@ +--------------------------------------------------------------------+ *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
- - - - - - - - -
{if $group.id}{ts}Group{/ts}{else}{$form.group_id.label}{/if}{$form.group_id.html}
{include file="CRM/Contact/Form/Task.tpl"}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+ + + + + + + + +
{if $group.id}{ts}Group{/ts}{else}{$form.group_id.label}{/if}{$form.group_id.html}
{include file="CRM/Contact/Form/Task.tpl"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl b/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl index 1a095592dc..1a3a071a06 100644 --- a/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl +++ b/templates/CRM/Contact/Form/Task/RemoveFromTag.tpl @@ -10,9 +10,8 @@ {* template to remove tags from contact *}

- {ts}Tag Contact(s) (Remove){/ts} + {ts}Remove Tags from Contacts{/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Contact/Form/Task/SMS.tpl b/templates/CRM/Contact/Form/Task/SMS.tpl index a89731bd3d..b3862f88c4 100644 --- a/templates/CRM/Contact/Form/Task/SMS.tpl +++ b/templates/CRM/Contact/Form/Task/SMS.tpl @@ -8,7 +8,6 @@ +--------------------------------------------------------------------+ *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $suppressedSms > 0}

{ts count=$suppressedSms plural='SMS will NOT be sent to %count contacts - (no phone number on file, or communication preferences specify DO NOT SMS, or contact is deceased).'}SMS will NOT be sent to %count contact - (no phone number on file, or communication preferences specify DO NOT SMS, or contact is deceased).{/ts}

diff --git a/templates/CRM/Contact/Import/Form/MapField.tpl b/templates/CRM/Contact/Import/Form/MapField.tpl index f73cdbce1c..ba44ae78f3 100644 --- a/templates/CRM/Contact/Import/Form/MapField.tpl +++ b/templates/CRM/Contact/Import/Form/MapField.tpl @@ -17,9 +17,8 @@

{ts}Review the values shown below from the first 2 rows of your import file and select the matching CiviCRM database fields from the drop-down lists in the right-hand column. Select '- do not import -' for any columns in the import file that you want ignored.{/ts}

{ts}If you think you may be importing additional data from the same data source, check 'Save this field mapping' at the bottom of the page before continuing. The saved mapping can then be easily reused the next time data is imported.{/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
{* Table for mapping data to CRM fields *} - {include file="CRM/Contact/Import/Form/MapTable.tpl" mapper=$form.mapper} + {include file="CRM/Contact/Import/Form/MapTable.tpl" mapper=$form.mapper} {* // Set default location type *} {literal} diff --git a/templates/CRM/Contact/Import/Form/Preview.tpl b/templates/CRM/Contact/Import/Form/Preview.tpl index eab53cdd04..c003443b89 100644 --- a/templates/CRM/Contact/Import/Form/Preview.tpl +++ b/templates/CRM/Contact/Import/Form/Preview.tpl @@ -26,7 +26,6 @@

{ts}Click 'Import Now' if you are ready to proceed.{/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
{* Summary Preview (record counts) *} diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl index cc11d8e9c2..279ce5ea42 100644 --- a/templates/CRM/Contact/Page/View/Note.tpl +++ b/templates/CRM/Contact/Page/View/Note.tpl @@ -44,7 +44,6 @@ {/if} {elseif $action eq 1 or $action eq 2} {* action is add or update *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Contact/Page/View/Useradd.tpl b/templates/CRM/Contact/Page/View/Useradd.tpl index 1803ce244a..457fe1bc62 100644 --- a/templates/CRM/Contact/Page/View/Useradd.tpl +++ b/templates/CRM/Contact/Page/View/Useradd.tpl @@ -8,27 +8,27 @@ +--------------------------------------------------------------------+ *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
-
{$form.subject.label}
- - - - - - - - - - - - - - - -
{$form.name.label}{$form.name.html}
{$form.cms_name.label}{$form.cms_name.html} {ts}Check Availability{/ts}
- {ts}Select a username; punctuation is not allowed except for periods, hyphens, and underscores.{/ts} -
{$form.cms_pass.label}{$form.cms_pass.html}
{$form.cms_confirm_pass.label}{$form.cms_confirm_pass.html}
{$form.email.label}{$form.email.html}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+ + + + + + + + + + + + + + + + + +
{$form.name.label}{$form.name.html}
{$form.cms_name.label}{$form.cms_name.html} {ts}Check Availability{/ts}
+ {ts}Select a username; punctuation is not allowed except for periods, hyphens, and underscores.{/ts} +
{$form.cms_pass.label}{$form.cms_pass.html}
{$form.cms_confirm_pass.label}{$form.cms_confirm_pass.html}
{$form.email.label}{$form.email.html}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
{/literal} {/if}
- diff --git a/templates/CRM/Import/Form/MapField.tpl b/templates/CRM/Import/Form/MapField.tpl index 7a543b6185..587c68ac6f 100644 --- a/templates/CRM/Import/Form/MapField.tpl +++ b/templates/CRM/Import/Form/MapField.tpl @@ -18,11 +18,8 @@

{ts}Review the values shown below from the first 2 rows of your import file and select the matching CiviCRM database fields from the drop-down lists in the right-hand column. Select '- do not import -' for any columns in the import file that you want ignored.{/ts}

{ts}If you think you may be importing additional data from the same data source, check 'Save this field mapping' at the bottom of the page before continuing. The saved mapping can then be easily reused the next time data is imported.{/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
- {* Table for mapping data to CRM fields *} - {include file="CRM/Import/Form/MapTableCommon.tpl" mapper=$form.mapper} -
- + {* Table for mapping data to CRM fields *} + {include file="CRM/Import/Form/MapTableCommon.tpl" mapper=$form.mapper}
{include file="CRM/common/formButtons.tpl" location="bottom"}
{$initHideBoxes|smarty:nodefaults} {literal} diff --git a/templates/CRM/Mailing/Form/Subscribe.tpl b/templates/CRM/Mailing/Form/Subscribe.tpl index 30825af46a..5c35845376 100644 --- a/templates/CRM/Mailing/Form/Subscribe.tpl +++ b/templates/CRM/Mailing/Form/Subscribe.tpl @@ -9,17 +9,12 @@ *} {* this template is used for web-based subscriptions to mailing list type groups *}
-{if $single} -
- {ts}Enter your email address and click Subscribe. You will receive a confirmation request via email shortly. Your subscription will be activated after you respond to that email.{/ts} -
-{else} -
- {ts}Enter your email address and check the box next to each mailing list you want to join. Then click the Subscribe button. You will receive a confirmation request via email for each selected list. Activate your subscription to each list by responding to the corresponding confirmation email.{/ts} -
-{/if} - - + {if $single} +
{ts}Enter your email address and click Subscribe. You will receive a confirmation request via email shortly. Your subscription will be activated after you respond to that email.{/ts}
+ {else} +
{ts}Enter your email address and check the box next to each mailing list you want to join. Then click the Subscribe button. You will receive a confirmation request via email for each selected list. Activate your subscription to each list by responding to the corresponding confirmation email.{/ts}
+ {/if} +
-
{$form.email.label}{$form.email.html}
@@ -39,6 +34,6 @@ {/if}
-
{include file="CRM/common/formButtons.tpl" location="top"}
-
+
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl index a5a39ff270..8d0a88343e 100644 --- a/templates/CRM/Member/Form/Membership.tpl +++ b/templates/CRM/Member/Form/Membership.tpl @@ -62,7 +62,6 @@ {ts}submit credit card membership{/ts}
{/if} -
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
{icon icon="fa-info-circle"}{/icon} diff --git a/templates/CRM/Member/Form/MembershipBlock.tpl b/templates/CRM/Member/Form/MembershipBlock.tpl index 3c4af099d2..fa4667579b 100644 --- a/templates/CRM/Member/Form/MembershipBlock.tpl +++ b/templates/CRM/Member/Form/MembershipBlock.tpl @@ -9,11 +9,10 @@ *} {* Configure Membership signup/renewal block for an Online Contribution page *}
-
+
{ts}Use this form to enable and configure a Membership Signup and Renewal section for this Online Contribution Page. If you're not using this page for membership signup, leave the Enabled box un-checked..{/ts} {docURL page="user/membership/online-membership-sign-up/"} -
+
{if !empty($form.membership_type.html)} -
{include file="CRM/common/formButtons.tpl" location="top"}
@@ -101,7 +100,7 @@ {ts 1=$linkURL}You need to have at least one Membership Type with 'Public' visibility in order to enable self-service Membership Signup and Renewal.{/ts} {/if} -
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
{literal} diff --git a/templates/CRM/Member/Form/MembershipStatus.tpl b/templates/CRM/Member/Form/MembershipStatus.tpl index da4445c6ee..6ff7a666d8 100644 --- a/templates/CRM/Member/Form/MembershipStatus.tpl +++ b/templates/CRM/Member/Form/MembershipStatus.tpl @@ -10,7 +10,6 @@ {* this template is used for adding/editing/deleting membership status *}
{if $action eq 1}{ts}New Membership Status{/ts}{elseif $action eq 2}{ts}Edit Membership Status{/ts}{else}{ts}Delete Membership Status{/ts}{/if} -
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
{icon icon="fa-info-circle"}{/icon} diff --git a/templates/CRM/Member/Form/MembershipType.tpl b/templates/CRM/Member/Form/MembershipType.tpl index a263d77f42..e6106b044f 100644 --- a/templates/CRM/Member/Form/MembershipType.tpl +++ b/templates/CRM/Member/Form/MembershipType.tpl @@ -12,9 +12,7 @@ {include file="CRM/Core/Form/EntityForm.tpl"} {else}
-
-
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.member_is_active.html} {$form.member_is_active.label}
{foreach from=$tpl_standardised_fields item=fieldName} {assign var=fieldSpec value=$entityFields.$fieldName} diff --git a/templates/CRM/Member/Form/Task/Label.tpl b/templates/CRM/Member/Form/Task/Label.tpl index 770f3e26f1..56213aa50e 100644 --- a/templates/CRM/Member/Form/Task/Label.tpl +++ b/templates/CRM/Member/Form/Task/Label.tpl @@ -8,9 +8,8 @@ +--------------------------------------------------------------------+ *}
-
{include file="CRM/Member/Form/Task.tpl"}
-
{include file="CRM/common/formButtons.tpl" location="top"}
-
+
{include file="CRM/Member/Form/Task.tpl"}
+
@@ -31,6 +30,6 @@ -
{$form.label_name.label} {$form.label_name.html} {help id="id-select-label" file="CRM/Contact/Form/Task/Label.hlp"}
{$form.merge_same_household.html} {$form.merge_same_household.label}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Member/Import/Form/Preview.tpl b/templates/CRM/Member/Import/Form/Preview.tpl index 8a50794bdf..e79bb0f1d9 100644 --- a/templates/CRM/Member/Import/Form/Preview.tpl +++ b/templates/CRM/Member/Import/Form/Preview.tpl @@ -27,7 +27,6 @@

{ts}Click 'Import Now' if you are ready to proceed.{/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
{* Summary Preview (record counts) *} diff --git a/templates/CRM/PCP/Form/PCP.tpl b/templates/CRM/PCP/Form/PCP.tpl index 2df7a6719e..156667116d 100644 --- a/templates/CRM/PCP/Form/PCP.tpl +++ b/templates/CRM/PCP/Form/PCP.tpl @@ -7,11 +7,10 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -
{include file="CRM/common/formButtons.tpl" location="top"}
- - - + + +
 {$form.pcp_active.html} {$form.pcp_active.label}
 {$form.pcp_active.html} {$form.pcp_active.label}
diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl index df3640751c..6222226b84 100644 --- a/templates/CRM/Pledge/Form/Pledge.tpl +++ b/templates/CRM/Pledge/Form/Pledge.tpl @@ -26,7 +26,6 @@ {/if} {/if}
-
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
{icon icon="fa-info-circle"}{/icon} diff --git a/templates/CRM/Pledge/Form/PledgeView.tpl b/templates/CRM/Pledge/Form/PledgeView.tpl index 742e47a4bd..bc9e1aa6b8 100644 --- a/templates/CRM/Pledge/Form/PledgeView.tpl +++ b/templates/CRM/Pledge/Form/PledgeView.tpl @@ -14,57 +14,50 @@ {/if}
-
{include file="CRM/common/formButtons.tpl" location="top"}
- - - - - - - +
{ts}Pledge By{/ts}{$displayName}
{ts}Total Pledge Amount{/ts}{$amount|crmMoney:$currency} - {if $originalPledgeAmount}
{icon icon="fa-info-circle"}{/icon}{ts 1=$originalPledgeAmount|crmMoney:$currency} Pledge total has changed due to payment adjustments. Original pledge amount was %1.{/ts}
{/if} -
{ts}To be paid in{/ts}{$installments} {ts}installments of{/ts} {$original_installment_amount|crmMoney:$currency} {ts}every{/ts} {$frequency_interval} {$frequencyUnit}
+ + + + + + - {if $start_date} - - - {/if} + + + {/if} {if $end_date} - - {/if} - {if $cancel_date} - + {/if} - {/if} - - + + + + {if $campaign} - - - - + + + + {/if} - {if $acknowledge_date} - - {/if} + + {/if} {if $contribution_page} - + {/if} - {$pledge_status} + {$pledge_status} {if $honor_contact_id} - + {/if} - - - - + + + {include file="CRM/Custom/Page/CustomDataView.tpl"} -
{ts}Pledge By{/ts}{$displayName}
{ts}Total Pledge Amount{/ts}{$amount|crmMoney:$currency} + {if $originalPledgeAmount}
{icon icon="fa-info-circle"}{/icon}{ts 1=$originalPledgeAmount|crmMoney:$currency} Pledge total has changed due to payment adjustments. Original pledge amount was %1.{/ts}
{/if} +
{ts}To be paid in{/ts}{$installments} {ts}installments of{/ts} {$original_installment_amount|crmMoney:$currency} {ts}every{/ts} {$frequency_interval} {$frequencyUnit}
{ts}Payments are due on the{/ts}{$frequency_day} day of the period
{ts}Pledge Made{/ts}{$create_date|truncate:10:''|crmDate}
{ts}Payment Start{/ts}{$start_date|truncate:10:''|crmDate}
{ts}Pledge Made{/ts}{$create_date|truncate:10:''|crmDate}
{ts}Payment Start{/ts}{$start_date|truncate:10:''|crmDate}
{ts}End Date{/ts}{$end_date|truncate:10:''|crmDate}
{ts}Cancelled Date{/ts}{$cancel_date|truncate:10:''|crmDate}
{ts}End Date{/ts}{$end_date|truncate:10:''|crmDate}
{ts}Financial Type{/ts}{$financial_type}  - {if $is_test} - {ts}(test){/ts} + {if $cancel_date} +
{ts}Cancelled Date{/ts}{$cancel_date|truncate:10:''|crmDate}
{ts}Financial Type{/ts}{$financial_type} {if $is_test}{ts}(test){/ts}{/if}
{ts}Campaign{/ts}{$campaign}
{ts}Campaign{/ts}{$campaign}
{ts}Received{/ts}{$acknowledge_date|truncate:10:''|crmDate} 
{ts}Received{/ts}{$acknowledge_date|truncate:10:''|crmDate} 
{ts}Self-service Payments Page{/ts}{$contribution_page}
{ts}Self-service Payments Page{/ts}{$contribution_page}
{ts}Pledge Status{/ts}
{ts}Pledge Status{/ts}
{$honor_type}{$honor_display}
{$honor_type}{$honor_display}
{ts}Initial Reminder Day{/ts}{$initial_reminder_day} days prior to schedule date
{ts}Maximum Reminders Send{/ts}{$max_reminders} 
{ts}Send additional reminders{/ts}{$additional_reminder_day} days after the last one sent
{ts}Initial Reminder Day{/ts}{$initial_reminder_day} days prior to schedule date
{ts}Maximum Reminders Send{/ts}{$max_reminders} 
{ts}Send additional reminders{/ts}{$additional_reminder_day} days after the last one sent
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+ +
{include file="CRM/common/formButtons.tpl" location="bottom"}
- diff --git a/templates/CRM/Price/Form/Field.tpl b/templates/CRM/Price/Form/Field.tpl index a449865a09..f04698cd59 100644 --- a/templates/CRM/Price/Form/Field.tpl +++ b/templates/CRM/Price/Form/Field.tpl @@ -79,7 +79,6 @@ {/literal}
-
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Price/Form/Set.tpl b/templates/CRM/Price/Form/Set.tpl index b94e660994..aec1461134 100644 --- a/templates/CRM/Price/Form/Set.tpl +++ b/templates/CRM/Price/Form/Set.tpl @@ -13,8 +13,6 @@ {capture assign="enableComponents"}{crmURL p='civicrm/admin/setting/component' q="reset=1"}{/capture}
-
{include file="CRM/common/formButtons.tpl" location="top"}
-
{$form.label.label}
@@ -72,7 +70,6 @@
{$form.title.label}
{include file="CRM/common/formButtons.tpl" location="bottom"}
-
{if $action eq 2 or $action eq 4} {* Update or View*}

@@ -80,4 +77,3 @@ {ts}Fields for this Set{/ts}
{/if} - diff --git a/templates/CRM/Price/Page/Field.tpl b/templates/CRM/Price/Page/Field.tpl index bfe4393eae..fb1b16ae29 100644 --- a/templates/CRM/Price/Page/Field.tpl +++ b/templates/CRM/Price/Page/Field.tpl @@ -27,12 +27,6 @@ {* priceField is set when e.g. in browse mode *} {if $action NEQ 8 and !empty($priceField)}
-
- {if !$isReserved} - {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="television"}{ts}Preview (all fields){/ts}{/crmButton} -
{strip} {* handle enable/disable actions*} diff --git a/templates/CRM/Report/Form/Register.tpl b/templates/CRM/Report/Form/Register.tpl index 49f8ff0d5c..f28978bec2 100644 --- a/templates/CRM/Report/Form/Register.tpl +++ b/templates/CRM/Report/Form/Register.tpl @@ -7,37 +7,14 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{if $action eq 8} -

{ts}Delete Report Template{/ts}

-{elseif $action eq 2} -

{ts}Edit Report Template{/ts}

-{else} -

{ts}New Report Template{/ts}

-{/if}
{if $action eq 8} - - - - - - - - - {else} - +
+ {icon icon="fa-info-circle"}{/icon} + {ts}WARNING: Deleting this option will result in the loss of all Report related records which use the option. This may mean the loss of a substantial amount of data, and the action cannot be undone. Do you want to continue?{/ts} +
+ {else}
{include file="CRM/common/formButtons.tpl" location="top"}
-
-
- {icon icon="fa-info-circle"}{/icon} - {ts}WARNING: Deleting this option will result in the loss of all Report related records which use the option. This may mean the loss of a substantial amount of data, and the action cannot be undone. Do you want to continue?{/ts} -
-
- - - - - {/if} - - - -
{include file="CRM/common/formButtons.tpl" location="top"}
-
{$form.label.label} {$form.label.html}
{ts}Report title appear in the display screen.{/ts} @@ -71,11 +48,7 @@ 		{$form.is_active.label} {$form.is_active.html}
{include file="CRM/common/formButtons.tpl" location="bottom"}
-
+ {/if} +
{include file="CRM/common/formButtons.tpl" location="botttom"}
diff --git a/templates/CRM/SMS/Form/Provider.tpl b/templates/CRM/SMS/Form/Provider.tpl index 183d5a20c0..9282a16a46 100644 --- a/templates/CRM/SMS/Form/Provider.tpl +++ b/templates/CRM/SMS/Form/Provider.tpl @@ -9,17 +9,15 @@ *} {* This template is used for adding/configuring SMS Providers *}
-
{include file="CRM/common/formButtons.tpl" location="top"}
- {if $action eq 8}
- {icon icon="fa-info-circle"}{/icon} - {ts}Do you want to continue?{/ts} + {icon icon="fa-info-circle"}{/icon} + {ts}Do you want to continue?{/ts}
{elseif $action eq 128}
- {icon icon="fa-info-circle"}{/icon} - {ts}Are you sure you would like to execute this job?{/ts} + {icon icon="fa-info-circle"}{/icon} + {ts}Are you sure you would like to execute this job?{/ts}
{else} @@ -53,7 +51,7 @@
{/if} -
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Tag/Form/Edit.tpl b/templates/CRM/Tag/Form/Edit.tpl index f7cbada056..affb637f89 100644 --- a/templates/CRM/Tag/Form/Edit.tpl +++ b/templates/CRM/Tag/Form/Edit.tpl @@ -10,7 +10,6 @@ {* this template is used for adding/editing a tag (admin) *}
{if $action eq 1 or $action eq 2 } -
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/UF/Form/Field.tpl b/templates/CRM/UF/Form/Field.tpl index 86948079ff..1743782aac 100644 --- a/templates/CRM/UF/Form/Field.tpl +++ b/templates/CRM/UF/Form/Field.tpl @@ -14,7 +14,6 @@ {ts}WARNING: Deleting this profile field will remove it from Profile forms and listings. If this field is used in any 'stand-alone' Profile forms, you will need to update those forms to remove this field.{/ts} {ts}Do you want to continue?{/ts} {else} -
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.name.label}
diff --git a/templates/CRM/UF/Form/Group.tpl b/templates/CRM/UF/Form/Group.tpl index 24c97000be..a7d8d5bf53 100644 --- a/templates/CRM/UF/Form/Group.tpl +++ b/templates/CRM/UF/Form/Group.tpl @@ -9,20 +9,15 @@ *} {* add/update/view CiviCRM Profile *} {if $action eq 8} -

{ts}Delete CiviCRM Profile{/ts} - {$profileTitle}

-{/if} -
-{* CRM-13693 Duplicate Delete button *} -{if $action neq 8} -
{include file="CRM/common/formButtons.tpl" location="top"}
+

{ts}Delete CiviCRM Profile{/ts} - {$profileTitle}

{/if} +
{if ($action eq 2 or $action eq 4) and $snippet neq 'json' } {* Update or View*} -
- {ts}View or Edit Fields for this Profile{/ts} -
-
+
+ {ts}View or Edit Fields for this Profile{/ts} +
+
{/if} - {if $action eq 8 or $action eq 64}
{icon icon="fa-info-circle"}{/icon} diff --git a/templates/CRM/UF/Page/Field.tpl b/templates/CRM/UF/Page/Field.tpl index f266f1fab1..aad5e08c3d 100644 --- a/templates/CRM/UF/Page/Field.tpl +++ b/templates/CRM/UF/Page/Field.tpl @@ -16,12 +16,6 @@
{if $ufField}
- {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="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="wrench"}{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} {strip} {* handle enable/disable actions*} {include file="CRM/common/enableDisableApi.tpl"} -- 2.25.1
{$form.field_name.label} {help id='field_name_0'}