dev/user-interface#51 Remove top buttons on admin forms
authorMathieu Lutfy <mathieu@symbiotic.coop>
Thu, 20 Jul 2023 10:50:13 +0000 (06:50 -0400)
committerMathieu Lu <mathieu@symbiotic.coop>
Thu, 20 Jul 2023 18:29:18 +0000 (14:29 -0400)
120 files changed:
templates/CRM/ACL/Form/ACL.tpl
templates/CRM/ACL/Form/EntityRole.tpl
templates/CRM/ACL/Form/WordPress/Permissions.tpl
templates/CRM/ACL/Page/EntityRole.tpl
templates/CRM/Activity/Form/Activity.tpl
templates/CRM/Activity/Form/Task/AddToTag.tpl
templates/CRM/Activity/Form/Task/Delete.tpl
templates/CRM/Activity/Form/Task/FileOnCase.tpl
templates/CRM/Activity/Form/Task/PickOption.tpl
templates/CRM/Activity/Form/Task/PickProfile.tpl
templates/CRM/Activity/Form/Task/RemoveFromTag.tpl
templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl
templates/CRM/Activity/Import/Form/Preview.tpl
templates/CRM/Admin/Form/CMSUser.tpl
templates/CRM/Admin/Form/ContactType.tpl
templates/CRM/Admin/Form/LabelFormats.tpl
templates/CRM/Admin/Form/LocationType.tpl
templates/CRM/Admin/Form/MailSettings.tpl
templates/CRM/Admin/Form/Mapping.tpl
templates/CRM/Admin/Form/MessageTemplates.tpl
templates/CRM/Admin/Form/Navigation.tpl
templates/CRM/Admin/Form/OptionGroup.tpl
templates/CRM/Admin/Form/Options.tpl
templates/CRM/Admin/Form/ParticipantStatusType.tpl
templates/CRM/Admin/Form/PaymentProcessor.tpl
templates/CRM/Admin/Form/PaymentProcessorType.tpl
templates/CRM/Admin/Form/PdfFormats.tpl
templates/CRM/Admin/Form/Preferences/Address.tpl
templates/CRM/Admin/Form/Preferences/Contribute.tpl
templates/CRM/Admin/Form/Preferences/Display.tpl
templates/CRM/Admin/Form/PreferencesDate.tpl
templates/CRM/Admin/Form/ScheduleReminders.tpl
templates/CRM/Admin/Form/Setting/Date.tpl
templates/CRM/Admin/Form/Setting/Debugging.tpl
templates/CRM/Admin/Form/Setting/Event.tpl [deleted file]
templates/CRM/Admin/Form/Setting/Localization.tpl
templates/CRM/Admin/Form/Setting/Mapping.tpl
templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
templates/CRM/Admin/Form/Setting/Path.tpl
templates/CRM/Admin/Form/Setting/SettingForm.tpl
templates/CRM/Admin/Form/Setting/UF.tpl
templates/CRM/Admin/Form/Setting/Url.tpl
templates/CRM/Admin/Page/Options.tpl
templates/CRM/Admin/Page/PaymentProcessorType.tpl
templates/CRM/Badge/Form/Layout.tpl
templates/CRM/Batch/Form/Batch.tpl
templates/CRM/Campaign/Form/Campaign.tpl
templates/CRM/Campaign/Form/Petition.tpl
templates/CRM/Campaign/Form/Survey/Main.tpl
templates/CRM/Campaign/Form/Survey/Questions.tpl
templates/CRM/Campaign/Form/Survey/Results.tpl
templates/CRM/Campaign/Form/Task/Release.tpl
templates/CRM/Campaign/Form/Task/Reserve.tpl
templates/CRM/Case/Form/Activity.tpl
templates/CRM/Case/Form/ActivityView.tpl
templates/CRM/Case/Form/Case.tpl
templates/CRM/Contact/Form/DedupeFind.tpl
templates/CRM/Contact/Form/DedupeRules.tpl
templates/CRM/Contact/Form/Domain.tpl
templates/CRM/Contact/Form/Task/AddToTag.tpl
templates/CRM/Contact/Form/Task/AlterPreferences.tpl
templates/CRM/Contact/Form/Task/Email.tpl
templates/CRM/Contact/Form/Task/Label.tpl
templates/CRM/Contact/Form/Task/RemoveFromGroup.tpl
templates/CRM/Contact/Form/Task/RemoveFromTag.tpl
templates/CRM/Contact/Form/Task/SMS.tpl
templates/CRM/Contact/Import/Form/MapField.tpl
templates/CRM/Contact/Import/Form/Preview.tpl
templates/CRM/Contact/Page/View/Note.tpl
templates/CRM/Contact/Page/View/Useradd.tpl
templates/CRM/Contribute/Form/Contribution.tpl
templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
templates/CRM/Contribute/Form/ContributionPage/Custom.tpl
templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
templates/CRM/Contribute/Form/ManagePremiums.tpl
templates/CRM/Contribute/Form/PaymentInstrument.tpl [deleted file]
templates/CRM/Contribute/Form/Preview.tpl [deleted file]
templates/CRM/Contribute/Form/UpdateSubscription.tpl
templates/CRM/Contribute/Import/Form/MapField.tpl
templates/CRM/Contribute/Import/Form/Preview.tpl
templates/CRM/Core/Form/EntityForm.tpl
templates/CRM/Core/Form/Task/PickProfile.tpl
templates/CRM/Custom/Form/Field.tpl
templates/CRM/Custom/Form/Group.tpl
templates/CRM/Custom/Form/MoveField.tpl
templates/CRM/Custom/Form/Option.tpl
templates/CRM/Event/Form/ManageEvent/Delete.tpl
templates/CRM/Event/Form/Participant.tpl
templates/CRM/Export/Form/Map.tpl
templates/CRM/Export/Form/Select.tpl
templates/CRM/Financial/Form/FinancialAccount.tpl
templates/CRM/Financial/Form/FinancialBatch.tpl
templates/CRM/Financial/Form/FinancialTypeAccount.tpl
templates/CRM/Form/basicForm.tpl
templates/CRM/Friend/Form/Friend.tpl
templates/CRM/Group/Form/Edit.tpl
templates/CRM/Import/Form/DataSource.tpl
templates/CRM/Import/Form/MapField.tpl
templates/CRM/Mailing/Form/Subscribe.tpl
templates/CRM/Member/Form/Membership.tpl
templates/CRM/Member/Form/MembershipBlock.tpl
templates/CRM/Member/Form/MembershipStatus.tpl
templates/CRM/Member/Form/MembershipType.tpl
templates/CRM/Member/Form/Task/Label.tpl
templates/CRM/Member/Import/Form/Preview.tpl
templates/CRM/PCP/Form/PCP.tpl
templates/CRM/Pledge/Form/Pledge.tpl
templates/CRM/Pledge/Form/PledgeView.tpl
templates/CRM/Price/Form/Field.tpl
templates/CRM/Price/Form/Set.tpl
templates/CRM/Price/Page/Field.tpl
templates/CRM/Report/Form/Register.tpl
templates/CRM/SMS/Form/Provider.tpl
templates/CRM/Tag/Form/Edit.tpl
templates/CRM/UF/Form/Field.tpl
templates/CRM/UF/Form/Group.tpl
templates/CRM/UF/Page/Field.tpl

index 15cefe0ef5944da947829ddf6bbf34558d8cdcd2..d0f2fb0dcfa43dcc27c8086c3464ef33a7922f58 100644 (file)
 {if $action eq 8}
   <div class="messages status no-popup">
     {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}
   </div>
 {else}
-   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
    <table class="form-layout-compressed">
      <tr class="crm-acl-form-block-name">
         <td class="label">{$form.name.label}</td>
index a2a8799c982baddf239a2be986f3dbffcb0e11c5..273e1bcd2618cd993ddd8201c94fb306315a9fc9 100644 (file)
 {* this template is used for adding/editing ACL EntityRole objects *}
 <div class="crm-block crm-form-block crm-acl-entityrole-form-block">
 <fieldset><legend>{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}</legend>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 {if $action eq 8}
   <div class="messages status no-popup">
-  {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}
   </div>
 {else}
     <table class="form-layout-compressed">
index 1c5e71ea5b6359174e2d8de32fd323e830d45286..eb8acd484cac639c902a3ea7fca568da5f4a3fed 100644 (file)
   <p>{ts}Use this form to Grant access to CiviCRM components and other CiviCRM permissions to WordPress roles.{/ts}</p>
   <p>{ts}<strong>NOTE: Super Admin</strong> and <strong>Administrator</strong> roles will have all permissions in CiviCRM.{/ts}</p>
 </div>
-
 <div class="crm-block crm-form-block crm-export-form-block">
-
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-
   <table>
-
     <tr>
       <td class="label">&nbsp;</td>
       {assign var="num" value=0}
@@ -54,9 +49,5 @@
     {/foreach}
 
   </table>
-
-  <div class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl" location="bottom"}
-  </div>
-
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index 9b82cb4793cc5249f9e61380a6607e53bddeeb83..4bd0415c9214c82818c2c7430c2e411c18a8d895 100644 (file)
@@ -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"}
index b68f6f56ce0389a4dd776741bf8faf84574422ca..f554bff1b4ccced73da679824d9a960f235a7bbf 100644 (file)
     {/if}
     <div class="crm-block crm-form-block crm-activity-form-block">
   {/if}
-  {if !$action or ( $action eq 1 ) or ( $action eq 2 ) }
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-  {/if}
-
   {if $action eq 8} {* Delete action. *}
   <table class="form-layout">
   <tr>
index f803f4c8b4fc7f82318906641322f31a78760241..a2e4cf4ab9f4dbd37cf6b6585fe81a25b8ad2d2b 100644 (file)
@@ -11,7 +11,6 @@
 <h3>
 {ts}Tag Activities{/ts}
 </h3>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 <table class="form-layout-compressed">
     <tr class="crm-activity-task-addtotag-form-block-tag">
         <td>
index d467db4b42a7da700b889196471407e494809d71..0c3b0769617712c644b336c5bb9e133a92bc509f 100644 (file)
@@ -9,12 +9,10 @@
 *}
 {* Confirmation of Activity deletes  *}
 <div class="crm-block crm-form-block crm-activity_delete-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-<div class="messages status no-popup">
-     {icon icon="fa-info-circle"}{/icon}
-          <p>{ts}Are you sure you want to delete the selected Activities?{/ts}</p>
-        <p>{include file="CRM/Activity/Form/Task.tpl"}</p>
-    </div>
-<p>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  <div class="messages status no-popup">
+    {icon icon="fa-info-circle"}{/icon}
+     <p>{ts}Are you sure you want to delete the selected Activities?{/ts}</p>
+     <p>{include file="CRM/Activity/Form/Task.tpl"}</p>
+  </div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index 40474330da2217f5cb62c72a06eca4635074e475..d8edd1898d4502bcc9bde40e1228fb8f80249f21 100644 (file)
@@ -8,22 +8,14 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-form crm-form-block crm-file-on-case-form-block">
-<div class="help">
-   {ts}File on Case{/ts}
-</div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-   <table class="form-layout-compressed">
-      <tr class="crm-file-on-case-form-block-unclosed_cases">
-         <td class="label">
-           {$form.unclosed_case_id.label}
-         </td>
-         <td>
-           {$form.unclosed_case_id.html}<br />
-         </td>
-      </tr>
-     <tr>
-        {include file="CRM/Activity/Form/Task.tpl"}
-     </tr>
-</table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  <table class="form-layout-compressed">
+    <tr class="crm-file-on-case-form-block-unclosed_cases">
+      <td class="label">{$form.unclosed_case_id.label}</td>
+      <td>{$form.unclosed_case_id.html}</td>
+    </tr>
+    <tr>
+      {include file="CRM/Activity/Form/Task.tpl"}
+    </tr>
+  </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index a2167dddcad2ed67d0306e3be90904645841b16c..61edac977e831127b008a6a546b5af1d0a86dc7c 100644 (file)
@@ -8,26 +8,23 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-form crm-form-block crm-pick-option-form-block">
-<div class="help">
-   {ts}Select Group of Contacts{/ts}
-</div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-   <table class="form-layout-compressed">
-      <tr class="crm-pick-option-form-block-with_contact">
-         <td class="label">{$form.with_contact.label}</td>
-         <td>{$form.with_contact.html}</td>
-      </tr>
-      <tr  class="crm-pick-option-form-block-assigned_to">
-        <td class="label">{$form.assigned_to.label}</td>
-        <td>{$form.assigned_to.html}</td>
-      </tr>
-      <tr  class="crm-pick-option-form-block-created_by">
-        <td class="label">{$form.created_by.label}</td>
-        <td>{$form.created_by.html}</td>
-     </tr>
-     <tr>
-        {include file="CRM/Activity/Form/Task.tpl"}
-     </tr>
-</table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  <div class="help">{ts}Select Group of Contacts{/ts}</div>
+  <table class="form-layout-compressed">
+    <tr class="crm-pick-option-form-block-with_contact">
+      <td class="label">{$form.with_contact.label}</td>
+      <td>{$form.with_contact.html}</td>
+    </tr>
+    <tr class="crm-pick-option-form-block-assigned_to">
+      <td class="label">{$form.assigned_to.label}</td>
+      <td>{$form.assigned_to.html}</td>
+    </tr>
+    <tr class="crm-pick-option-form-block-created_by">
+      <td class="label">{$form.created_by.label}</td>
+      <td>{$form.created_by.html}</td>
+    </tr>
+    <tr>
+      {include file="CRM/Activity/Form/Task.tpl"}
+    </tr>
+  </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index f5c07d254ed83544eebb88e2993dc83b52e456e0..978827ef3c9d39ddc149c188ddfa8a39cce4a23b 100644 (file)
@@ -8,19 +8,15 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-activityPickProfile-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-<table class="form-layout-compressed">
-   <tr class="crm-activityPickProfile-form-block-uf_group_id">
-     <td>{$form.uf_group_id.label}</td>
-     <td>{$form.uf_group_id.html}</td>
-   </tr>
-   <tr>
-       <td class="label"></td>
-       <td>
-            {include file="CRM/Activity/Form/Task.tpl"}
-       </td>
-   </tr>
+  <table class="form-layout-compressed">
+    <tr class="crm-activityPickProfile-form-block-uf_group_id">
+      <td>{$form.uf_group_id.label}</td>
+      <td>{$form.uf_group_id.html}</td>
+    </tr>
+    <tr>
+      <td class="label"></td>
+      <td>{include file="CRM/Activity/Form/Task.tpl"}</td>
+    </tr>
   </table>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"  location="bottom"}</div>
-        </div>
-
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"  location="bottom"}</div>
+</div>
index c877716fc855ffbd8903732fa22e436c69f3d9f0..039904e8a984a9534287ab36c6aa54114f80693f 100644 (file)
@@ -9,10 +9,7 @@
 *}
 {* template to remove tags from activity  *}
 <div class="crm-form-block crm-block crm-activity-task-removefromtag-form-block">
-<h3>
-{ts}Tag Activities (Remove){/ts}
-</h3>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
+<h3>{ts}Tag Activities (Remove){/ts}</h3>
 <table class="form-layout-compressed">
     <tr class="crm-activity-task-removefromtag-form-block-tag">
         <td>
@@ -29,7 +26,6 @@
             {include file="CRM/common/Tagset.tpl"}
         </td>
     </tr>
-
     <tr><td>{include file="CRM/Activity/Form/Task.tpl"}</td></tr>
 </table>
     <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
index 4f1d28038a95885f65f5344840af35857e82d448..3947ebb535b8618243e6c30fc2f4ac34333375f8 100644 (file)
@@ -8,10 +8,6 @@
  +--------------------------------------------------------------------+
 *}
 {if $rows}
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-
-<div class="spacer"></div>
-
 <div>
 <br />
 <table>
@@ -21,7 +17,6 @@
     <td>{ts}Activity Type{/ts}</td>
     <td>{ts}Activity Date{/ts}</td>
   </tr>
-
   {foreach from=$rows item=row}
     <tr class="{cycle values="odd-row,even-row"}">
         <td>{$row.display_name}</td>
@@ -37,7 +32,7 @@
 
 {else}
    <div class="messages status no-popup">
-          {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}
    </div>
 {/if}
index a704ea9d28962d1fda1dadfcc08f8532668eefd1..be02d2a51f6481171d589d93ffe8f98682f60605 100644 (file)
@@ -27,7 +27,6 @@
 
     <p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
  </div>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 
  {* Summary Preview (record counts) *}
  <table id="preview-counts" class="report">
index 093b1a2021477fcbb544521ca2265fb0cf085b7f..463e6a635ad492737c6cf3b01cab9bd5bc97e0a6 100644 (file)
@@ -12,7 +12,6 @@
 <div class="help">
     <p>{ts}Synchronize Users{/ts}</p>
 </div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 <div class="messages status no-popup">
       <img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}"/>
            <span class="label">{ts}Synchronize Users to Contacts:{/ts}</span> {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}
index 527eec758c395af155724019972ccdb3fc7c7d6b..41f99a21d0520c9526061d31e8153445bac9ef0e 100644 (file)
@@ -8,7 +8,6 @@
  +--------------------------------------------------------------------+
 *}
 {* this template is used for adding/editing Contact Type  *}
-
 <div class="crm-block crm-form-block crm-contact-type-form-block">
 {if $action eq 8}
   <div class="messages status no-popup">
@@ -16,7 +15,6 @@
         {ts}WARNING: {ts}This action cannot be undone.{/ts} {ts}Do you want to continue?{/ts}{/ts}
     </div>
 {else}
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
  <table class="form-layout-compressed">
    <tr class="crm-contact-type-form-block-label">
       <td class="label">{$form.label.label}
@@ -24,7 +22,6 @@
         {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='label' id= $cid }
       {/if}
       </td>
-
       <td>{$form.label.html}</td>
    </tr>
    <tr class="crm-contact-type-form-block-parent_id">
@@ -54,7 +51,6 @@
        {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='description' id= $cid}
      {/if}
      </td>
-
      <td>{$form.description.html}</td>
    </tr>
    <tr class="crm-contact-type-form-block-is_active">
index d5bcc2a96b98548ecad14ee5f98e47205d3cf984..1965a0a1f7fbc7abb46921fd144adfe57ff6a8a4 100644 (file)
@@ -37,7 +37,6 @@
       {ts 1=$formatName}Are you sure you would like to make a copy of the Label Format titled <strong>%1</strong>?{/ts}
     </div>
   {else}
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout-compressed">
       <tr class="crm-labelFormat-form-block-name">
         <td class="right">{$form.label.label}</td>
index 26895130804f0129a6b5fb05e34ce1b328cc37d3..724afb5dad5a3f9d4974e5fe6619da968995710c 100644 (file)
@@ -9,7 +9,6 @@
 *}
 {* this template is used for adding/editing location type  *}
 <div class="crm-block crm-form-block crm-location-type-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 {if $action eq 8}
   <div class="messages status no-popup">
      {icon icon="fa-info-circle"}{/icon}
index d003ef89f9ba1c2529b145138645f8579e897612..27218a6fb7952874adfa21feac90a8731a7c602c 100644 (file)
@@ -9,13 +9,12 @@
 *}
 {* this template is used for adding/editing email settings.  *}
 <div class="crm-block crm-form-block crm-mail-settings-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {if $action eq 8}
     <div class="messages status no-popup">
       {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}
     </div>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
+    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
   {else}
     <table class="form-layout-compressed">
 
index b943bfd881d81b5f8ca4ad8323906b4ca97003f3..f71003752dc6fbf97b97e731b525401aa0c4c7ed 100644 (file)
@@ -10,7 +10,6 @@
 {* this template is used for adding/editing a saved mapping *}
 <div class="crm-block crm-form-block crm-mapping-form-block">
     {if $action eq 1 or $action eq 2 }
-      <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
       <table class="form-layout-compressed">
        <tr class="crm-mapping-form-block-name">
           <td class="label">{$form.name.label}</td>
@@ -32,6 +31,5 @@
         </div>
         <br />
     {/if}
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" loaction="bottom"}</div>
-    <div class="spacer"></div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" loaction="bottom"}</div>
 </div>
index cb42f4139d12d8f57529bc8bd930094783ab00e0..1ccf31f3c991a1fa16e9c602e174ea14086d3a2b 100644 (file)
@@ -24,7 +24,6 @@
         {ts 1=$msg_title|escape}Do you want to delete the message template '%1'?{/ts}
       </div>
     {else}
-      <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
       <table class="form-layout-compressed">
         <tr>
           <td class="label-left">{$form.msg_title.label}</td>
index 3a37bbc79cba81535b2cbce198c0bde91b5fd1d7..a180b239db1f67e62c6a73688833c2db12bd0801 100644 (file)
@@ -9,7 +9,6 @@
 *}
 {* Template for adding/editing a CiviCRM Navigation Menu Item *}
 <div class="crm-block crm-form-block crm-navigation-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   <table class="form-layout-compressed">
     <tr class="crm-navigation-form-block-label">
       <td class="label">{$form.label.label}</td><td>{$form.label.html}</td>
index ae96f23def60c393331ba337df401a846944f0ee..7a4b659b5e33d211fa1f6ebcea24a2d45399d2b9 100644 (file)
@@ -9,7 +9,6 @@
 *}
 <h3>{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}</h3>
 <div class="crm-block crm-form-block crm-admin-optiongroup-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
    {if $action eq 8}
       <div class="messages status no-popup">
           {icon icon="fa-info-circle"}{/icon}
index 2d6ab20691e373799fe2eb98490ac40597863f62..a4d3c84a8ba7ad413e03006ddb496ff9df8b3fcf 100644 (file)
@@ -9,13 +9,12 @@
 *}
 {* this template is used for adding/editing options *}
 <div class="crm-block crm-form-block crm-admin-options-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {if $action eq 8}
-      <div class="messages status no-popup">
-        {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}
-      </div>
-    {else}
+    <div class="messages status no-popup">
+      {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}
+    </div>
+  {else}
     <table class="form-layout-compressed">
         {if $gName eq 'custom_search'}
            <tr class="crm-admin-options-form-block-custom_search_path">
            </tr>
         {/if}
     </table>
-    {/if}
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
- </fieldset>
+  {/if}
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index 89508dfc705b168aaddbed82da8dc8af24c2b3b0..5280bb06ba8f23611ee8a8c2ec5f1204f8d48101 100644 (file)
@@ -12,7 +12,6 @@
     <legend>
       {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}
     </legend>
-   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     {if $action eq 8}
       <div class="messages status no-popup">
        {icon icon="fa-info-circle"}{/icon}
            <td>{$form.name.html}<br />
            <span class="description">{ts}Name of this status type, for use in the code.{/ts}</span></td>
         </tr>
-
         <tr class="crm-participant-status-form-block-label">
            <td class="label">{$form.label.label}{if $action == 2} {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_participant_status_type' field='label' id=$id}{/if}</td>
            <td>{$form.label.html}<br />
            <span class="description">{ts}Display label for this status.{/ts}</span></td>
         </tr>
-
         <tr class="crm-participant-status-form-block-class">
            <td class="label">{$form.class.label}</td>
            <td>{$form.class.html}<br />
            <td>{$form.is_counted.html}<br />
            <span class="description">{ts}Should a person with this status be counted as a participant for the purpose of controlling the Maximum Number of Participants?{/ts}</td>
         </tr>
-
         <tr class="crm-participant-status-form-block-weight">
            <td class="label">{$form.weight.label}</td>
            <td>{$form.weight.html}</td>
         </tr>
-
         <tr class="crm-participant-status-form-block-visibility_id">
            <td class="label">{$form.visibility_id.label}</td>
            <td>{$form.visibility_id.html}<br />
index 91e3ef405b205f19455c4db5518a6085ba355ff2..722f042447c9a17933a405a483efb4205e7acda5 100644 (file)
@@ -10,7 +10,6 @@
 {* This template is used for adding/configuring Payment Processors used by a particular site/domain.  *}
 <h3>{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}</h3>
 <div class="crm-block crm-form-block crm-paymentProcessor-form-block">
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 
 {if $action eq 8}
   <div class="messages status no-popup">
index 3807b2e9b21a1b404504ca1d1e02d015049aa446..72a431f1c044ecf570321e7b9bc090d79e38efc0 100644 (file)
@@ -10,7 +10,6 @@
 {* this template is used for adding/editing available Payment Processors  *}
 <div class="crm-block crm-form-block crm-paymentProcessor-type-form-block">
 <fieldset><legend>{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}</legend>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 {if $action eq 8}
   <div class="messages status no-popup">
       {icon icon="fa-info-circle"}{/icon}
index 7b6386d5d1756c0f34967c5a97a0bb3ecf4d4571..e7d8ce32d8b71a3b782e492b2a52f49d1f104592 100644 (file)
@@ -26,8 +26,6 @@
 *}
 {* This template is used for adding/configuring PDF Page Formats.  *}
 <div class="crm-block crm-form-block crm-pdfFormat-form-block">
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-
 {if $action eq 8}
   <div class="messages status no-popup">
       {icon icon="fa-info-circle"}{/icon}
index 8ba9aeb66608108de352f73c7f1e7c37f658a864..d04d3e122ff87f3ea1ad9ec28ecd7d041569f7ca 100644 (file)
@@ -8,7 +8,6 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-preferences-address-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <h3>{ts}Mailing Labels{/ts}</h3>
         <table class="form-layout">
         <tr class="crm-preferences-address-form-block-mailing_format">
index 0c40f27567eb5013c52d67d40f315c699a2b0670..4d5a3da18ffff599340af1ec21252c9a7ddbebc9 100644 (file)
@@ -8,7 +8,6 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm--block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {include file="CRM/Form/basicFormFields.tpl"}
 
   <table class="form-layout" id="invoicing_blocks">
index 0643d07a43b964aa97a37b74261defedcebda96a..9803c861a47bb9da0a1402f5fd34ed459081bd49 100644 (file)
@@ -9,7 +9,6 @@
 *}
 {* this template is used for editing Site Preferences  *}
 <div class="crm-block crm-form-block crm-preferences-display-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   <table class="form-layout">
     <tr class="crm-preferences-display-form-block-contact_view_options">
       <td class="label">{$form.contact_view_options.label}</td>
index a31f0b7f7903862cf8e1a6c42c2e818b5a5f015f..a7475e6dd7d81127b70829d0fbe8bdcd96a0d433 100644 (file)
@@ -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 *}
 <div class="crm-block crm-form-block crm-preferences-date-form-block">
-        <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
         <table class='form-layout-compressed'>
             <tr class="crm-preferences-date-form-block-name">
                 <td class="label">{$form.name.label}</td><td>{$form.name.html}</td>
index e58203ddbbd65425d4f9b3cf0838f06f32120289..472216870b99a8e32730e51a7cc1a40c2783b1a2 100644 (file)
@@ -9,7 +9,6 @@
 *}
 {* This template is used for adding/scheduling reminders.  *}
 <div class="crm-block crm-form-block crm-scheduleReminder-form-block">
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 
 {if $action eq 8}
   <div class="messages status no-popup">
index a3b2642159c66ade2dbfba2a84cd406ceb4d9aaa..bafec789632b9eee1ec5f821e3d91c39fc3cc387 100644 (file)
@@ -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 <a href="%1">Administer > Customize Data and Screens > Date Preferences</a>{/ts} {help id='date-format'}
 </div>
 <div class="crm-block crm-form-block crm-date-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 <fieldset><legend>{ts}Date Display{/ts}</legend>
    <table class="form-layout-compressed">
        <tr class="crm-date-form-block-dateformatDatetime">
index bf3c829baa5abbc3d65da86291ac0be05f0c4029..93842e512ce2721bab7ba241631a9474d2d2f5b3 100644 (file)
@@ -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"}
 </div>
 <div class="crm-block crm-form-block crm-debugging-form-block">
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout">
         {if !empty($form.userFrameworkLogging)}
             <tr class="crm-debugging-form-block-userFrameworkLogging">
diff --git a/templates/CRM/Admin/Form/Setting/Event.tpl b/templates/CRM/Admin/Form/Setting/Event.tpl
deleted file mode 100644 (file)
index c437af0..0000000
+++ /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}
-<div class="crm-block crm-form-block">
-<div class="help">
-    {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}
-</div>
-<div class="crm-block crm-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-      <table class="form-layout-compressed">
-        <tr class="crm-mail-form-block-enable_cart">
-            <td class="label">{$form.enable_cart.label}</td><td>{$form.enable_cart.html}<br />
-            <span class="description">{ts}Check to enable the Event Cart checkout workflow.{/ts}</span></td>
-        </tr>
-      </table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-<div class="spacer"></div>
-</div>
index 29fb16f2cc33c8e68c1afae5afd79fa9965c0707..186770fb4db71520eb53caa389f605c072f65e50 100644 (file)
@@ -12,7 +12,6 @@
   {docURL page="i18n Administrator's Guide: Using CiviCRM in your own language" resource="wiki"}
 </div>
 <div class="crm-block crm-form-block crm-localization-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"} </div>
     <h3>{ts}Language and Currency{/ts}</h3>
         <table class="form-layout-compressed">
             <tr class="crm-localization-form-block-lcMessages">
index 9d73278454336f35768c22e923af66b73c45fe89..3c1e306e92e277315041cac71bbcce4c27aef6f0 100644 (file)
@@ -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'}
 </div>
 <div class="crm-block crm-form-block crm-map-form-block">
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout-compressed">
          <tr class="crm-map-form-block-mapProvider">
              <td>{$form.mapProvider.label}</td>
index 25df8e2b467938031518aec1571c81cad1eb40c4..0f2cd40dfd7d9f16d0a90aeffc686f9c5e4eebec 100644 (file)
@@ -8,8 +8,6 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-miscellaneous-form-block">
-   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-
     <table class="form-layout">
       <tr class="crm-miscellaneous-form-block-checksum_timeout">
         <td class="label">{$form.checksum_timeout.label}</td>
@@ -17,7 +15,6 @@
             <span class="description">{ts}The number of days before a personalized (hashed) link will expire.{/ts}</span></td>
       </tr>
     </table>
-
     <table class="form-layout">
       <tr class="crm-miscellaneous-form-block-contact_undelete">
         <td class="label">{$form.contact_undelete.label}</td>
index b8fe2e067fbf37306310c531164e579ee146cc86..3d1c1c4faa1d6fc0a09976119b3c17338476ac27 100644 (file)
@@ -17,7 +17,6 @@
     </p>
 </div>
 <div class="crm-block crm-form-block crm-path-form-block">
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
            <table class="form-layout">
             <tr class="crm-path-form-block-uploadDir">
                 <td class="label">{$form.uploadDir.label}</td>
index d128edfc139ab767986cf9a44d577e3e6a7a2fb1..3a0fdf0a5d80b5be4f4753d41f3f68598cfecd2b 100644 (file)
@@ -7,7 +7,6 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 <table class="form-layout-compressed">
   {foreach from=$settings_fields key="setting_name" item="fieldSpec"}
     {include file="CRM/Admin/Form/Setting/SettingField.tpl"}
index 9938e4d90c33f1a29f164589e4b6801708142d1c..9fdfe16c6098fcf046dc39866f3c524d97321d75 100644 (file)
@@ -11,7 +11,6 @@
     {ts}These settings define the CMS variables that are used with CiviCRM.{/ts}
 </div>
 <div class="crm-block crm-form-block crm-uf-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
       <table class="form-layout-compressed">
         {if $userFrameworkUsersTableNameEnabled}
         <tr class="crm-uf-form-block-userFrameworkUsersTableName">
index c6df140ff65ed0730365687e01d4bb3322acf1e1..7aa5e51b7a6e87f29aa42d98c9b24350fae78f0c 100644 (file)
@@ -17,7 +17,6 @@
   </p>
 </div>
 <div class="crm-block crm-form-block crm-url-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 <table class="form-layout">
     <tr class="crm-url-form-block-userFrameworkResourceURL">
         <td class="label">
index a137a2d173ab949a678e430b8ea8420611b6e263..030bad2c3600a811e0c316c78db0bbc887f47900 100644 (file)
 
 <div class="crm-content-block crm-block">
 {if $rows}
-  {if $isLocked ne 1}
-    <div class="action-link">
-      {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{if !$gLabel}{ts}Add Option{/ts}{else}{ts 1=$gLabel}Add %1{/ts}{/if}{/crmButton}
-    </div>
-  {/if}
 {foreach from=$rows item=row}
   {if !empty($row.icon)}{assign var='hasIcons' value=true}{/if}
 {/foreach}
 </div>
 {else}
     <div class="messages status no-popup">
-      <img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}"/>
+      {icon icon="fa-info-circle"}{/icon}
       {ts}None found.{/ts}
     </div>
 {/if}
index 7580755844c99b0f72911842767b874f7a4f775a..77d2bb64cbd8eecae13f3c3bb1af98e380d18ae7 100644 (file)
@@ -45,7 +45,7 @@
 
         {if $action ne 1 and $action ne 2}
         <div class="action-link">
-          <a href="{crmURL q="action=add&reset=1"}" id="newPaymentProcessor"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}New Payment Processor{/ts}</a>
+          <a class="button" href="{crmURL q="action=add&reset=1"}" id="newPaymentProcessor"><i class="crm-i fa-plus-circle" aria-hidden="true"></i> {ts}New Payment Processor{/ts}</a>
           {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
         </div>
         {/if}
index b41a588247cc67b3aa50f9ca9ee3fbf064616593..b3a9a2febec470aa6f74ec751aac5d59a700396e 100644 (file)
@@ -10,7 +10,6 @@
 {* this template is used for adding/editing badge layouts *}
 <h3>{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}</h3>
 <div class="crm-block crm-form-block crm-badge-layout-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {if $action eq 8}
     <div class="messages status no-popup">
       {icon icon="fa-info-circle"}{/icon}
index df8b0720894ea63a1079e846e8bfba3c000e2d3a..46702842d22297e34e6b6ed33f4013323a42839a 100644 (file)
   <h3>{ts}New Data Entry Batch{/ts}</h3>
 {/if}
 <div class="crm-block crm-form-block crm-batch-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 {if $action eq 8}
   <div class="messages status no-popup">
      {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}
-      </div>
+     {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}
+  </div>
 {else}
   <table class="form-layout-compressed">
       <tr class="crm-batch-form-block-title">
@@ -46,5 +45,5 @@
       </tr>
   </table>
 {/if}
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index a56b9df3b71cce2bc1052a2b7612a32605173149..38b6cb98ce94fc033681f5cecab9b799aa861858 100644 (file)
@@ -8,21 +8,12 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-campaign-form-block">
-
-
 {if $action eq 8}
-  <table class="form-layout">
-    <tr>
-      <td colspan="2">
-        <div class="status">{icon icon="fa-info-circle"}{/icon}{ts}Are you sure you want to delete this Campaign?{/ts}</div>
-      </td>
-    </tr>
-  </table>
-{else}
-  <div class="crm-submit-buttons">
-       {include file="CRM/common/formButtons.tpl" location="top"}
+  <div class="messages status no-popup">
+    {icon icon="fa-info-circle"}{/icon}
+    {ts}Are you sure you want to delete this Campaign?{/ts}
   </div>
-
+{else}
   <table class="form-layout-compressed">
   <tr class="crm-campaign-form-block-title">
       <td class="label">{$form.title.label}</td>
@@ -81,7 +72,5 @@
   {include file="CRM/common/customDataBlock.tpl"}
 
 {/if}
-<div class="crm-submit-buttons">
-     {include file="CRM/common/formButtons.tpl" location="bottom"}
-</div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index 1d43edbb54c7fe0ac981a65b3894aa3dc107b7fe..92f51bccc2ad72914852c053cfe116b664778e64 100644 (file)
@@ -9,22 +9,14 @@
 *}
 
 <div class="crm-block crm-form-block crm-campaign-survey-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {if $action eq 8}
-    <table class="form-layout">
-      <tr>
-        <td colspan="2">
-          <div class="status">
-            {icon icon="fa-info-circle"}{/icon}
-            &nbsp;{ts}Are you sure you want to delete this Petition?{/ts}</div>
-        </td>
-      </tr>
-    </table>
+    <div class="messages status no-popup">
+      {icon icon="fa-info-circle"}{/icon}
+      {ts}Are you sure you want to delete this Petition?{/ts}
+    </div>
   {else}
     {if $action  eq 1}
-      <div class="help">
-        {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}
-      </div>
+      <div class="help">{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}</div>
     {/if}
     <table class="form-layout">
       <tr class="crm-campaign-survey-form-block-title">
index e1601b1f8b35e0245a5f431a84e1a66c27e21326..e08b71263905aa795d43ecbfe2327431f2835e50 100644 (file)
@@ -9,12 +9,6 @@
 *}
 
 <div class="crm-block crm-form-block crm-campaign-survey-main-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-  {if $action  eq 1}
-    <div class="help">
-      {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}
-    </div>
-  {/if}
   <table class="form-layout-compressed">
    <tr class="crm-campaign-survey-main-form-block-title">
        <td class="label">{$form.title.label}</td>
@@ -62,7 +56,7 @@
        </td>
    </tr>
   </table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
 
 {*include profile link function*}
index 00050626cea37b78cfeb2793a1eb105e96b2f84c..8823f6a944b22a6188214b578c2f70a89340dacc 100644 (file)
@@ -7,10 +7,7 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-
 <div class="crm-block crm-form-block crm-campaign-survey-questions-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-
   <table class="form-layout-compressed">
     <tr class="crm-campaign-survey-questions-form-block-contact_profile_id">
       <td class="label">{$form.contact_profile_id.label}</td>
@@ -21,6 +18,5 @@
       <td class="view-value">{$form.activity_profile_id.html}</td>
     </tr>
   </table>
-
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index 8c030d3d822ca44601b486144ac8e650c1aa43ad..477ee6dcb5d9e7b8308356fed65663dcde0c1150 100644 (file)
@@ -7,41 +7,36 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-
 <div class="crm-block crm-form-block crm-campaign-survey-results-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-      <table class="form-layout-compressed">
-       <tr id='showoption'>
-           <td colspan="2">
-           <table class="form-layout-compressed">
-               {* Conditionally show table for setting up selection options - for field types = radio, checkbox or select *}
-               {include file="CRM/Campaign/Form/ResultOptions.tpl"}
-           </table>
-           </td>
-       </tr>
-
-       {* Create Report *}
-       <tr id='showoption'>
-         <td colspan="2">
-           <div id="new-group" class="crm-accordion-wrapper ">
-           <div class="crm-accordion-header">
-             {ts}Create Report{/ts}
-           </div><!-- /.crm-accordion-header -->
-           <div class="crm-accordion-body">
-           <table class="form-layout-compressed">
-             <tr>
+  <table class="form-layout-compressed">
+    <tr id='showoption'>
+      <td colspan="2">
+        <table class="form-layout-compressed">
+          {* Conditionally show table for setting up selection options - for field types = radio, checkbox or select *}
+          {include file="CRM/Campaign/Form/ResultOptions.tpl"}
+        </table>
+      </td>
+    </tr>
+    {* Create Report *}
+    <tr id='showoption'>
+      <td colspan="2">
+        <div id="new-group" class="crm-accordion-wrapper">
+          <div class="crm-accordion-header">{ts}Create Report{/ts}</div>
+          <div class="crm-accordion-body">
+            <table class="form-layout-compressed">
+              <tr>
                 <td class="label">{$form.create_report.label}</td>
                 <td>{$form.create_report.html}</td>
-             </tr>
-             <tr>
+              </tr>
+              <tr>
                 <td class="label">{$form.report_title.label}</td>
                 <td>{$form.report_title.html|crmAddClass:big}</td>
-             </tr>
+              </tr>
             </table>
-            </div><!-- /.crm-accordion-body -->
-            </div><!-- /.crm-accordion-wrapper -->
-         </td>
-       </tr>
-      </table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-
+          </div>
+        </div>
+      </td>
+    </tr>
+  </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+</div>
index 618af12e3fdbd21a414302eb30d49ca5e7912175..f50e14db1ca1fc4deaecfd5d79667d11c3fec6d5 100644 (file)
@@ -7,21 +7,12 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-<h3>
-{ts}Release Respondents{/ts}
-</h3>
+<h3>{ts}Release Respondents{/ts}</h3>
 <div class="crm-form-block crm-block crm-campaign-task-release-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-<table class="form-layout-compressed">
-  <tr class="crm-campaign-task-release-form-block-surveytitle">
-    <td colspan=2>
-      <div class="status">
-        {icon icon="fa-info-circle"}{/icon}{ts 1=$surveyTitle}Do you want to release respondents for '%1' ?{/ts}
-      </div>
-    </td>
-  </tr>
-
-    <tr><td colspan=2>{include file="CRM/Contact/Form/Task.tpl"}</td></tr>
-</table>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  <div class="messages status no-popup">
+    {icon icon="fa-info-circle"}{/icon}
+    {ts 1=$surveyTitle}Do you want to release respondents for '%1' ?{/ts}
+  </div>
+  {include file="CRM/Contact/Form/Task.tpl"}
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index 38fe35ac7e2b6c375cf954a1595a46df2e3ef6b5..6eb404b6e27710bcf82e31e7d1743367862d0f64 100644 (file)
@@ -7,77 +7,61 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-<h3>
-{ts}Add Respondent Reservation(s){/ts}
-</h3>
+<h3>{ts}Add Respondent Reservation(s){/ts}</h3>
 <div class="crm-form-block crm-block crm-campaign-task-reserve-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-<table class="form-layout-compressed">
-  <tr class="crm-campaign-task-reserve-form-block-surveytitle">
-    <td colspan=2>
-      <div class="status">
-        {icon icon="fa-info-circle"}{/icon}{ts 1=$surveyTitle}Do you want to reserve respondents for '%1' ?{/ts}
-      </div>
-    </td>
-  </tr>
-  <tr><td colspan=2>{include file="CRM/Contact/Form/Task.tpl"}</td></tr>
-</table>
+  <div class="messages status no-popup">
+    {icon icon="fa-info-circle"}{/icon}
+    {ts 1=$surveyTitle}Do you want to reserve respondents for '%1' ?{/ts}
+  </div>
+  {include file="CRM/Contact/Form/Task.tpl"}
 
-{* Group options *}
- {* New Group *}
- <div id="new-group" class="crm-accordion-wrapper collapsed">
- <div class="crm-accordion-header">
- {ts}Add respondent(s) to a new group{/ts}
- </div><!-- /.crm-accordion-header -->
- <div class="crm-accordion-body">
+  {* New Group *}
+  <div id="new-group" class="crm-accordion-wrapper collapsed">
+    <div class="crm-accordion-header">{ts}Add respondent(s) to a new group{/ts}</div>
+    <div class="crm-accordion-body">
             <table class="form-layout-compressed">
              <tr>
-               <td class="description label">{$form.newGroupName.label}</td>
+               <td class="label">{$form.newGroupName.label}</td>
                <td>{$form.newGroupName.html}</td>
              </tr>
              <tr>
-               <td class="description label">{$form.newGroupDesc.label}</td>
+               <td class="label">{$form.newGroupDesc.label}</td>
                <td>{$form.newGroupDesc.html}</td>
              </tr>
             </table>
</div><!-- /.crm-accordion-body -->
</div><!-- /.crm-accordion-wrapper -->
   </div>
 </div>
 
+  {* Existing Group *}
+  <div class="crm-accordion-wrapper crm-existing_group-accordion {if $hasExistingGroups} {else}collapsed{/if}">
+    <div class="crm-accordion-header">{ts}Add respondent(s) to existing group(s){/ts}</div>
+    <div class="crm-accordion-body">
+      <table class="form-layout-compressed">
+        <tr>
+          <td class="label">{$form.groups.label}</td>
+          <td>{$form.groups.html}</td>
+        </tr>
+      </table>
+    </div>
+  </div>
 
- {* Existing Group *}
- <div class="crm-accordion-wrapper crm-existing_group-accordion {if $hasExistingGroups} {else}collapsed{/if}">
- <div class="crm-accordion-header">
-  {ts}Add respondent(s) to existing group(s){/ts}
- </div><!-- /.crm-accordion-header -->
- <div class="crm-accordion-body">
-
-        <div class="form-item">
-        <table><tr><td style="width: 14em;"></td><td>{$form.groups.html}</td></tr></table>
-        </div>
- </div><!-- /.crm-accordion-body -->
- </div><!-- /.crm-accordion-wrapper -->
-{* End of group options *}
-
-
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
 
 {literal}
 <script type="text/javascript">
+  CRM.$(function($) {
+    setDefaultGroup();
+  });
 
- CRM.$(function($) {
-   setDefaultGroup( );
- });
-
- function setDefaultGroup( )
- {
+  function setDefaultGroup() {
     var invalidGroupName = {/literal}'{$invalidGroupName}'{literal};
-    if ( invalidGroupName ) {
+    if (invalidGroupName) {
        cj("#new-group.collapsed").crmAccordionToggle();
     } else {
-       cj("#newGroupName").val( '' );
-       cj("#newGroupDesc").val( '' );
+       cj("#newGroupName").val('');
+       cj("#newGroupDesc").val('');
     }
- }
 }
 </script>
 {/literal}
index 9087752740e797778ae52f18fb4866f180c9412e..9f2e59923f99ba5f4f3862d2d0f04714a41d0193 100644 (file)
 
 {* this template is used for adding/editing activities for a case. *}
 <div class="crm-block crm-form-block crm-case-activity-form-block">
-
-  {if $action neq 8 and $action  neq 32768 }
-  {* Include form buttons on top for new and edit modes. *}
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-  {/if}
-
   {if $action eq 8 or $action eq 32768 }
   <div class="messages status no-popup">
     <i class="crm-i fa-info-circle" aria-hidden="true"></i> &nbsp;
index d2113d9f7840043a7f2b74c1b138511480b8e613..170683ff8e5d926315db3f9a23d2371858aa4f56 100644 (file)
@@ -9,7 +9,6 @@
 *}
 {* View Case Activities *}
 <div class="crm-block crm-content-block crm-case-activity-view-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top" linkButtons=$actionLinks}</div>
   {if $revs}
     {strip}
       <table class="crm-info-panel">
index fb40297d4a3ad17f909efbf5c2df34458f7ed8be..3b26a979de7aa587da6707161b346d85c7264f04 100644 (file)
 *}
 <div class="crm-block crm-form-block crm-case-form-block">
 
-{if $action neq 8 && $action neq 32768}
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-{/if}
-
 <h3>{if $action eq 8}{ts}Delete Case{/ts}{elseif $action eq 32768}{ts}Restore Case{/ts}{/if}</h3>
 {if $action eq 8 or $action eq 32768 }
       <div class="messages status no-popup">
index 5cb53d59af9e69523a8fe3a973156eb557870663..0bb2bf13f2ee9754fc98caa2b0b253ce76266f67 100644 (file)
@@ -14,7 +14,6 @@
     {/ts}
 </div>
 <div class="crm-block crm-form-block crm-dedupe-find-form-block">
-   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
    <table class="form-layout-compressed">
      <tr class="crm-dedupe-find-form-block-group_id">
        <td class="label">{$form.group_id.label}</td>
index 46dd7ed9cf037b871cc020a78da084170530f9fa..b65c4f4626c666423590504f3db608596fccee84 100644 (file)
@@ -7,13 +7,11 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-
 <h3>{ts 1=$contactTypes.$contact_type}Matching Rule for %1 Contacts{/ts}</h3>
 <div class="crm-block crm-form-block crm-dedupe-rules-form-block">
     <div class="help">
         {ts}Configure up to five fields to evaluate when searching for 'suspected' duplicate contact records.{/ts} {help id="id-rules"}
     </div>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   <table class="form-layout">
      <tr class="crm-dedupe-rules-form-block-title">
         <td class="label">{$form.title.label}</td>
index 5a1bc69c726deaa27b4e84d60d6627eda9b95fef..d3d9547effe20a903d9be8fab4173d7008c0cf40 100644 (file)
@@ -9,12 +9,9 @@
 *}
 {* this template is used for viewing and editing Domain information (for system-generated emails CiviMail-related values) *}
 <div class="crm-block crm-form-block crm-domain-form-block">
-{if !($action eq 4)}
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-{/if}
-    <table class="form-layout-compressed">
-  <tr>
-        <td>
+  <table class="form-layout-compressed">
+    <tr>
+      <td>
       {$form.name.label}{help id="domain-name"}<br />
       {$form.name.html}
       <br /><span class="description">{ts}The name of the organization or entity which owns this CiviCRM site or domain. This is the default organization contact record.{/ts}</span>
index 7826b87b13c6fcd2d47c59e3115f377916e504dc..408b58d4391e18ece67cba2b4b914a8175de2565 100644 (file)
@@ -8,11 +8,8 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-form-block crm-block crm-contact-task-addtotag-form-block">
-<h3>
-{ts}Tag Contact(s){/ts}
-</h3>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-<table class="form-layout-compressed">
+  <h3>{ts}Tag Contacts{/ts}</h3>
+  <table class="form-layout-compressed">
     <tr class="crm-contact-task-addtotag-form-block-tag">
         <td>
             <div class="listing-box">
@@ -29,8 +26,7 @@
             {include file="CRM/common/Tagset.tpl"}
         </td>
     </tr>
-
     <tr><td>{include file="CRM/Contact/Form/Task.tpl"}</td></tr>
-</table>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index c26d0cc2763f19adca7f5d9c5ef4260fe5a8e5ef..09d23fbc59ff706a880cd85282ce8e7b09130684 100644 (file)
@@ -8,11 +8,8 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-form-block crm-block crm-contact-task-addtodonot-form-block">
-<h3>
-{ts}Add 'Do Not...' Contact(s) Preferences{/ts}
-</h3>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-<table class="form-layout-compressed">
+  <h3>{ts}Communication Preferences{/ts}</h3>
+  <table class="form-layout-compressed">
     <tr><td>{$form.actionTypeOption.html}</td></tr>
     <tr class="crm-contact-task-addtodonot-form-block-pref">
         <td>
@@ -25,8 +22,7 @@
             </div>
         </td>
     </tr>
-
     <tr><td>{include file="CRM/Contact/Form/Task.tpl"}</td></tr>
-</table>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index 02e9ed51e71e1d8241fd27b3fc64b41e7c56760b..4725477ff10f0a677422233bafcdebcad166122c 100644 (file)
@@ -8,7 +8,6 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-contactEmail-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 {if $suppressedEmails > 0}
     <div class="status">
         <p>{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}</p>
index 0f7bb84fc75731a7fa8d59cad3ebe98df75b85e2..69d5f5ccaefc510e4215327c8052f14921916de7 100644 (file)
@@ -8,9 +8,8 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-contact-task-mailing-label-form-block">
-<div class="messages status no-popup">{include file="CRM/Contact/Form/Task.tpl"}</div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-<table class="form-layout-compressed">
+  <div class="messages status no-popup">{include file="CRM/Contact/Form/Task.tpl"}</div>
+  <table class="form-layout-compressed">
      <tr class="crm-contact-task-mailing-label-form-block-label_name">
         <td class="label">{$form.label_name.label}</td>
         <td>{$form.label_name.html} {help id="id-select-label" file="CRM/Contact/Form/Task/Label.hlp"}</td>
@@ -28,6 +27,6 @@
      <tr class="crm-contact-task-mailing-label-form-block-merge_same_household">
         <td></td><td>{$form.merge_same_household.html} {$form.merge_same_household.label}</td>
      </tr>
-</table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index d698025f131edd735950e0ac0128ddbda1f49f52..448a8b93a02d295ffa5ab2b73502ad98c4ea325c 100644 (file)
@@ -8,15 +8,14 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-form-block crm-block crm-contact-task-removefromgroup-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
- <table class="form-layout-compressed">
-     <tr class="crm-contact-task-removefromgroupform-block-group_id">
-        <td class="label">{if $group.id}{ts}Group{/ts}{else}{$form.group_id.label}{/if}</td>
-        <td>{$form.group_id.html}</td>
-      </tr>
-      <tr>
-        <td></td><td>{include file="CRM/Contact/Form/Task.tpl"}</td>
-      </tr>
- </table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  <table class="form-layout-compressed">
+    <tr class="crm-contact-task-removefromgroupform-block-group_id">
+      <td class="label">{if $group.id}{ts}Group{/ts}{else}{$form.group_id.label}{/if}</td>
+      <td>{$form.group_id.html}</td>
+    </tr>
+    <tr>
+      <td></td><td>{include file="CRM/Contact/Form/Task.tpl"}</td>
+    </tr>
+  </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index 1a095592dcde63cd034ca3ac61a62ac623019d80..1a3a071a066eca93a1cfb813c2ff0b3cbec42049 100644 (file)
@@ -10,9 +10,8 @@
 {* template to remove tags from contact  *}
 <div class="crm-form-block crm-block crm-contact-task-removefromtag-form-block">
   <h3>
-    {ts}Tag Contact(s) (Remove){/ts}
+    {ts}Remove Tags from Contacts{/ts}
   </h3>
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   <table class="form-layout-compressed">
     <tr class="crm-contact-task-removefromtag-form-block-tag">
       <td>
index a89731bd3d0d03068e5fcde48661b95c8d314eb5..b3862f88c4234179885e2f0ce8d934941f4b740d 100644 (file)
@@ -8,7 +8,6 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-contactSMS-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 {if $suppressedSms > 0}
     <div class="status">
         <p>{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}</p>
index f73cdbce1cfd688489eacaa64cddccdb3912ad1e..ba44ae78f3fee93f654244211ddc786165257c6a 100644 (file)
@@ -17,9 +17,8 @@
     <p>{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}</p>
     <p>{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}</p>
 </div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {* 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}
index eab53cdd04a76edf41c0c3740779d8bde503df49..c003443b899b0d7fda87735375f41accf29ba86c 100644 (file)
@@ -26,7 +26,6 @@
 
     <p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
 </div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 
 <div id="preview-info">
  {* Summary Preview (record counts) *}
index cc11d8e9c2c1ac4bde024928558dee5f252c9c29..279ce5ea42872021ed7a644f387ed720803187c4 100644 (file)
@@ -44,7 +44,6 @@
         {/if}
 {elseif $action eq 1 or $action eq 2} {* action is add or update *}
   <div class="crm-block crm-form-block crm-note-form-block">
-    <div class="content crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
         <table class="form-layout">
             <tr>
                 <td class="label">{$form.subject.label}</td>
index 1803ce244a34790cc15ce1b698b89a7e43d820fd..457fe1bc6230e05507a8f8173f1d62c7de2a06da 100644 (file)
@@ -8,27 +8,27 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-useradd-form-block">
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-        <table class="form-layout-compressed">
-            <tr>
-                <td class="label">{$form.name.label}</td><td>{$form.name.html}</td>
-            </tr>
-            <tr>
-                <td class="label">{$form.cms_name.label}</td><td>{$form.cms_name.html} <a id="checkavailability" href="#" onClick="return false;">{ts}<strong>Check Availability</strong>{/ts}</a> <span id="msgbox" style="display:none"></span><br />
-                    <span class="description">{ts}Select a username; punctuation is not allowed except for periods, hyphens, and underscores.{/ts}</span>
-                </td>
-            </tr>
-            <tr>
-                <td class="label">{$form.cms_pass.label}</td><td>{$form.cms_pass.html}</td>
-            </tr>
-            <tr>
-                <td class="label">{$form.cms_confirm_pass.label}</td><td>{$form.cms_confirm_pass.html}</td>
-            </tr>
-            <tr>
-                <td class="label">{$form.email.label}</td><td>{$form.email.html}</td>
-            </tr>
-        </table>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  <table class="form-layout-compressed">
+    <tr>
+      <td class="label">{$form.name.label}</td><td>{$form.name.html}</td>
+    </tr>
+    <tr>
+      <td class="label">{$form.cms_name.label}</td>
+      <td>{$form.cms_name.html} <a id="checkavailability" href="#" onClick="return false;">{ts}<strong>Check Availability</strong>{/ts}</a> <span id="msgbox" style="display:none"></span><br />
+        <span class="description">{ts}Select a username; punctuation is not allowed except for periods, hyphens, and underscores.{/ts}</span>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">{$form.cms_pass.label}</td><td>{$form.cms_pass.html}</td>
+    </tr>
+    <tr>
+      <td class="label">{$form.cms_confirm_pass.label}</td><td>{$form.cms_confirm_pass.html}</td>
+    </tr>
+    <tr>
+      <td class="label">{$form.email.label}</td><td>{$form.email.html}</td>
+    </tr>
+  </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
 <script type="text/javascript">
 {include file="CRM/common/checkUsernameAvailable.tpl"}
index 0217547ef0f3bcadb2ec84fb007b3c7072a65e2c..9b0c1a46c306adfe0790f703b7401757994cefc2 100644 (file)
@@ -55,9 +55,6 @@
         <a class="open-inline-noreturn action-item crm-hover-button" href="{$ccModeLink}"><i class="crm-i fa-credit-card" aria-hidden="true"></i> {ts}submit credit card contribution{/ts}</a>
       </div>
     {/if}
-      <div class="crm-submit-buttons">
-        {include file="CRM/common/formButtons.tpl" location=''}
-      </div>
       {if !empty($isOnline)}{assign var=valueStyle value=" class='view-value'"}{else}{assign var=valueStyle value=""}{/if}
       <table class="form-layout-compressed">
         <tr class="crm-contribution-form-block-contact_id">
index 9a79d13d4c721160685a3aef088b85ab1d3748d3..bc75790925348aa2ed9f343aa5452b01cc12e92b 100644 (file)
@@ -13,7 +13,6 @@
 <div class="help">
     {ts}Use this form to configure Contribution Amount options. You can give contributors the ability to enter their own contribution amounts and/or provide a fixed list of amounts. For fixed amounts, you can enter a label for each 'level' of contribution (e.g. Friend, Sustainer, etc.). If you allow people to enter their own dollar amounts, you can also set minimum and maximum values. Depending on your choice of Payment Processor, you may be able to offer a recurring contribution option.{/ts} {docURL page="user/contributions/payment-processors"}
 </div>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     {if !$paymentProcessor}
         {capture assign=ppUrl}{crmURL p='civicrm/admin/paymentProcessor' q="reset=1"}{/capture}
         <div class="status message">
index ad8a9b2bf1785042117b0141933c230f857fb623..bb7fbf5de32534a23763e6e60abcd2c5cec040fe 100644 (file)
@@ -12,7 +12,6 @@
 <div class="help">
     <p>{ts}You may want to collect information from contributors beyond what is required to make a contribution. For example, you may want to inquire about volunteer availability and skills. Add any number of fields to your contribution form by selecting CiviCRM Profiles (collections of fields) to include at the beginning of the page, and/or at the bottom.{/ts} {help id="contrib-profile"}</p>
 </div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout-compressed">
     <tr class="crm-contribution-contributionpage-custom-form-block-custom_pre_id">
        <td class="label">{$form.custom_pre_id.label}</td>
index f4f55b8295fdfcf87cb437820f554c81927208e6..566b0ed78eb455591eafe34d7c6de3e6b3c6d74d 100644 (file)
@@ -13,7 +13,6 @@
   {ts}Then select and review the premiums that you want to offer on this contribution page.{/ts}
 </div>
 <div id="id_Premiums" class="crm-block crm-form-block crm-contribution-contributionpage-premium-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   <table class="form-layout-compressed">
     <tr class="crm-contribution-contributionpage-premium-form-block-premiums_active">
       <td class="label">{$form.premiums_active.label}</td>
index 3feb04802c9bfebfbc60198a06c7f7a01e1aeb88..e67122889cdf464b2334bbdc77fe2deff7eda1b2 100644 (file)
@@ -18,7 +18,6 @@
     {/if}
 </div>
 <div class="crm-block crm-form-block crm-contribution-contributionpage-settings-form-block">
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout-compressed">
       <tr class="crm-contribution-contributionpage-settings-form-block-frontend-title">
         <td class="label">{$form.frontend_title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='frontend_title' id=$contributionPageID}{/if}</td>
index f0907b22f305a4a065fa80231700c9b8cf4bae78..77bdef9dfeba62a2ac9156abf837b5f52e561a68 100644 (file)
@@ -12,7 +12,6 @@
 <div class="help">
     <p>{ts}Use this form to configure the thank-you message and receipting options.{/ts} {help id="id_thank"}</p>
 </div>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout">
     <tr class="crm-contribution-contributionpage-thankyou-form-block-thankyou_title">
        <td class="label">{$form.thankyou_title.label}{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='thankyou_title' id=$contributionPageID}{/if} {help id="id_thankyou-title"}</td>
index 7650bf15ad634cd92c2c89d140cdf4eb35a942b6..eb272f6886ad6484cabe0630013e98bca28198c7 100644 (file)
@@ -19,7 +19,6 @@
     <div class="help">
         {ts}CiviContribute widgets allow you and your supporters to easily promote this fund-raising campaign. Widget code can be added to any web page.  It will provide a real-time display of current contribution results and a direct link to this contribution page.{/ts} {help id="id-intro"}
     </div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout-compressed">
       <tr class="crm-contribution-contributionpage-widget-form-block-is_active"><td style="width: 12em;">&nbsp;</td><td style="font-size: 10pt;">{$form.is_active.html}&nbsp;{$form.is_active.label}</td></tr>
     </table>
index 621367eafbbbceeeae0545f6c820811590e41daa..b32fd20a7a3059388930d4f4da59d001f70fcce8 100644 (file)
@@ -17,7 +17,6 @@
   {elseif $action eq 1024}
      {include file="CRM/Contribute/Form/Contribution/PremiumBlock.tpl" context="previewPremium"}
   {else}
-     <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {crmRegion name="contribute-form-managepremiums-standard-fields"}
   <table class="form-layout-compressed">
      <tr class="crm-contribution-form-block-name">
diff --git a/templates/CRM/Contribute/Form/PaymentInstrument.tpl b/templates/CRM/Contribute/Form/PaymentInstrument.tpl
deleted file mode 100644 (file)
index 113c948..0000000
+++ /dev/null
@@ -1,28 +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       |
- +--------------------------------------------------------------------+
-*}
-{* this template is used for adding/editing/deleting Payment-Method  *}
-<div class="crm-block crm-form-block crm-contribution-payment_instrument-form-block">
-<fieldset><legend>{if $action eq 1}{ts}New Payment Method{/ts}{elseif $action eq 2}{ts}Edit Payment Method{/ts}{else}{ts}Delete Payment Method{/ts}{/if}</legend>
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-   {if $action eq 8}
-      <div class="messages status no-popup">
-           {icon icon="fa-info-circle"}{/icon}
-          {ts}WARNING: Deleting this option will result in the loss of all contribution records which use this 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}
-      </div>
-     {else}
-     <table>
-   <tr class="crm-contribution-form-block-name"><td class="label">{$form.name.label}</td><td class="html-adjust">{$form.name.html}</td></tr>
-      <tr class="crm-contribution-form-block-description"><td class="label">{$form.description.label}</td><td class="html-adjust">{$form.description.html}</td></tr>
-        <tr class="crm-contribution-form-block-is_active"><td class="label">{$form.is_active.label}</td><td class="html-adjust">{$form.is_active.html}</td></tr>
-     </table>
-     {/if}
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-</fieldset>
-</div>
diff --git a/templates/CRM/Contribute/Form/Preview.tpl b/templates/CRM/Contribute/Form/Preview.tpl
deleted file mode 100644 (file)
index a4afeb0..0000000
+++ /dev/null
@@ -1,87 +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       |
- +--------------------------------------------------------------------+
-*}
-<div class="crm-block crm-form-block crm-contribution-preview-form-block">
-    <fieldset><legend>{ts}Contribution Page{/ts}</legend>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-    <table class="form-layout-compressed">
-    <tr class="crm-contribution-form-block-intro_text">
-       <td class="label">{$form.intro_text.label}</td>
-       <td class="html-adjust">{$form.intro_text.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-amount">
-       <td class="label">{$form.amount.label}</td>
-       <td class="html-adjust">{$form.amount.html}</td>
-    </tr>
-{if $is_allow_other_amount}
-    <tr class="crm-contribution-form-block-amount_other">
-       <td class="label">{$form.amount_other.label}</td>
-       <td class="html-adjust">{$form.amount_other.html}</td>
-    </tr>
-{/if}
-    <tr class="crm-contribution-form-block-email">
-       <td class="label">{$form.email.label}</td>
-       <td class="html-adjust">{$form.email.html}</td>
-    </tr>
-{include file="CRM/UF/Form/Block.tpl" fields=$customPre}
-    <tr class="crm-contribution-form-block-_qf_Preview_next_express"><td></td><td>{$form._qf_Preview_next_express.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-first_name">
-       <td class="label">{$form.first_name.label}</td>
-       <td class="html-adjust">{$form.first_name.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-middle_name">
-       <td class="label">{$form.middle_name.label}</td>
-       <td class="html-adjust">{$form.middle_name.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-last_name">
-       <td class="label">{$form.last_name.label}</td>
-       <td class="html-adjust">{$form.last_name.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-street1">
-       <td class="label">{$form.street1.label}</td>
-       <td class="html-adjust">{$form.street1.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-city">
-       <td class="label">{$form.city.label}</td>
-       <td class="html-adjust">{$form.city.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-state_province">
-       <td class="label">{$form.state_province.label}</td>
-       <td class="html-adjust">{$form.state_province.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-postal_code">
-       <td class="label">{$form.postal_code.label}</td>
-       <td class="html-adjust">{$form.postal_code.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-country_id">
-       <td class="label">{$form.country_id.label}</td>
-       <td class="html-adjust">{$form.country_id.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-credit_card_number">
-       <td class="label">{$form.credit_card_number.label}</td>
-       <td class="html-adjust">{$form.credit_card_number.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-cvv2">
-       <td class="label">{$form.cvv2.label}</td>
-       <td class="html-adjust">{$form.cvv2.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-credit_card_type">
-       <td class="label">{$form.credit_card_type.label}</td>
-       <td class="html-adjust">{$form.credit_card_type.html}</td>
-    </tr>
-    <tr class="crm-contribution-form-block-credit_card_exp_date">
-       <td class="label">{$form.credit_card_exp_date.label}</td>
-       <td class="html-adjust">{$form.credit_card_exp_date.html}</td>
-    </tr>
-{include file="CRM/UF/Form/Block.tpl" fields=$customPost}
-    </table>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-    </fieldset>
-</div>
index c49249f3b060f459c5127cad67b385768f4f5596..a31e6b07af7f20a644acc33a0bf5b1582d94262e 100644 (file)
@@ -18,7 +18,6 @@
       {/if}
     </div>
   {/if}
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {if $form.amount.frozen}
   <div class="help">
     {icon icon="fa-info-circle"}{/icon}
index defcc4c38e5c0c5e9455f7fa33b01e64e00f77fe..985aa28ec1eae6a6aefe10246ca10d11be466b94 100644 (file)
  <div class="help">
     <p>{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}</p>
     <p>{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}</p>
-</div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-{* Table for mapping data to CRM fields *}
-{include file="CRM/Import/Form/MapTableCommon.tpl" mapper=$form.mapper}
-
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
- {$initHideBoxes|smarty:nodefaults}
+  </div>
+  {* Table for mapping data to CRM fields *}
+  {include file="CRM/Import/Form/MapTableCommon.tpl" mapper=$form.mapper}
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  {$initHideBoxes|smarty:nodefaults}
 </div>
 {literal}
 <script type="text/javascript" >
index 9f4f93f658ff0400f2bff1c03d8c2f3a878811fa..32e3b0e34dfd9a98e8b3871a74737d6d58a584a5 100644 (file)
@@ -26,7 +26,6 @@
 
     <p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
  </div>
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 
  {* Summary Preview (record counts) *}
  <table id="preview-counts" class="report">
index 903eb96bb3ea9a19edaefbeac0b3830d52a74eb5..3981e367aba13b32b327a14b01c36d210a5425d7 100644 (file)
@@ -9,7 +9,6 @@
 *}
 {* this template is used for adding/editing entities  *}
 <div class="crm-block crm-form-block crm-{$entityInClassFormat}-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {if $action eq 8}
     <div class="messages status no-popup">
       {icon icon="fa-info-circle"}{/icon}
index 4b26c3ab8b70c96577b2f819c1c7d2e25819bfed..00493ce7f38f45581a9800e647016682b0a8cdad 100644 (file)
@@ -8,8 +8,7 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-form crm-form-block crm-{$taskComponent.lc}-task-pickprofile-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-   <table class="form-layout-compressed">
+  <table class="form-layout-compressed">
      <tr class="crm-{$taskComponent.lc}-task-pickprofile-form-block-uf_group_id">
        <td class="label">{$form.uf_group_id.label}</td><td>{$form.uf_group_id.html}</td>
      </tr>
@@ -19,6 +18,6 @@
          {assign var="ucfirst" value=$taskComponent.ucfirst}
          {include file="CRM/$ucfirst/Form/Task.tpl"}</td>
      </tr>
- </table>
-   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index 7ed7436ceabea472da0ab8de38458a5c08ef6b45..68733a0d087c7b124e3874f35b647e4ea0840c92 100644 (file)
@@ -8,7 +8,6 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-custom-field-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   <table class="form-layout">
     <tr class="crm-custom-field-form-block-label">
       <td class="label">{$form.label.label}
index da3d1178ebd8a2ac341613c6bc990fc71d4757c4..ed4367d63f15a0e510ea37d352bb42a36a3da2ff 100644 (file)
@@ -10,7 +10,6 @@
 {* add/update/view custom data group *}
 <div class="help">{ts}Use Custom Field Sets to add logically related fields for a specific type of CiviCRM record (e.g. contact records, contribution records, etc.).{/ts} {help id="id-group_intro"}</div>
 <div class="crm-block crm-form-block">
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout">
     <tr>
         <td class="label">{$form.title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_custom_group' field='title' id=$gid}{/if}</td>
index 2b4ea4da915c0799ae7e8e1fa69cf8bf4cd0b75d..cc5c36badbc7276559b4901781d61721716f6093 100644 (file)
@@ -7,7 +7,6 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-
 <div class="crm-block crm-form-block crm-move-field-block">
     <table class="form-layout-compressed">
         <tr><td class="label">{$form.dst_group_id.label}</td>
@@ -17,5 +16,5 @@
         </tr>
         <tr><td class="label">{$form.is_copy.label}</td><td>{$form.is_copy.html}</td></tr>
     </table>
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
+    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index f45cb95e8b42e121663b734ca2c34bb3de861661..0080f20ae2c706a1ab85b49aff1d39fa34b0d473 100644 (file)
@@ -9,9 +9,6 @@
 *}
 <div class="crm-block {if $action eq 4}crm-content-block {else}crm-form-block {/if}crm-custom_option-form-block">
 <h3>{if $action eq 4 }{ts}View Option{/ts}{elseif $action eq 2}{ts}Edit Option{/ts}{elseif $action eq 8}{ts 1=$label}Delete Option "%1"{/ts}{else}{ts}Add Option{/ts}{/if}</h3>
-    {if $action ne 4 AND $action ne 8}
-        <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-    {/if} {* $action ne view *}
     {if $action eq 8}
       <div class="messages status no-popup">
           {icon icon="fa-info-circle"}{/icon}
@@ -49,5 +46,5 @@
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
     {else}
         <div class="crm-submit-buttons">{$form.done.html}</div>
-    {/if} {* $action ne view *}
+    {/if}
 </div>
index 55030635957ad5a36211d0f687abe3d57a29944f..a4056ef805ce91f48bbe45549de78b772d08de04 100644 (file)
@@ -9,21 +9,15 @@
 *}
 {* this template is used for confirmation of delete for event  *}
 <div class="crm-block crm-form-block crm-event-manage-delete-form-block">
-<div class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl" location="top"}
-</div>
-<div class="messages status no-popup">
-   {icon icon="fa-info-circle"}{/icon}
-   <div>
+  <div class="messages status no-popup">
+    {icon icon="fa-info-circle"}{/icon}
+    <div>
        {if $isTemplate}
          {ts}Warning: Deleting this event template will also delete associated Event Registration Page and Event Fee configurations.{/ts} {ts}This action cannot be undone.{/ts} {ts}Do you want to continue?{/ts}
        {else}
             {ts}Warning: Deleting this event will also delete associated Event Registration Page and Event Fee configurations.{/ts} {ts}This action cannot be undone.{/ts} {ts}Do you want to continue?{/ts}
        {/if}
-   </div>
-</div>
-
-<div class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl" location="bottom"}
-</div>
+    </div>
+  </div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index af5bdea715df8626ddd7291253244fea6e20fdff..d40cee4c4674073dd26596ecbb42900403a5599e 100644 (file)
@@ -49,7 +49,6 @@
           {$form.delete_participant.html}
         {/if}
         {else} {* If action is other than Delete *}
-        <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
         <table class="form-layout-compressed">
           {if $context EQ 'standalone' OR $context EQ 'participant' OR $action EQ 2}
             <tr class="crm-participant-form-contact-id">
index c6d4e903c758c6f5ebfb3a63c5a4be57409a2d2f..795524f390db0337e5a0da320a9065ec4a7bf2e8 100644 (file)
@@ -8,19 +8,14 @@
  +--------------------------------------------------------------------+
 *}
 <div class="help">
-<p>{ts}Select the fields to be exported using the table below. You'll see a live preview of the first few records for each field.{/ts}</p>
-
-<p>{ts}Your export can include multiple types of contacts, and non-applicable fields will be empty (e.g. <strong>Last Name</strong> will not be populated for an Organization record).{/ts}</p>
-
-<p>{ts}If you want to use the same export setup in the future, check 'Save Fields' at the bottom of the page before continuing. You will then be able to reload this setup with a single click.{/ts}</p>
+  <p>{ts}Select the fields to be exported using the table below. You'll see a live preview of the first few records for each field.{/ts}</p>
+  <p>{ts}Your export can include multiple types of contacts, and non-applicable fields will be empty (e.g. <strong>Last Name</strong> will not be populated for an Organization record).{/ts}</p>
+  <p>{ts}If you want to use the same export setup in the future, check 'Save Fields' at the bottom of the page before continuing. You will then be able to reload this setup with a single click.{/ts}</p>
 </div>
-
 <div class="crm-block crm-form-block crm-export-map-form-block">
-{* Export Wizard - Step 3 (map export data fields) *}
-
- {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
- {include file="CRM/common/WizardHeader.tpl"}
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
+  {* Export Wizard - Step 3 (map export data fields) *}
+  {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
+  {include file="CRM/common/WizardHeader.tpl"}
 
   <crm-angular-js modules="exportui">
     <crm-export-ui class="crm-export-field-selector-outer"></crm-export-ui>
index f23a9336f9861ace641e3b8952d33e617b94fa2f..24273d8dae5906f5ad5a25504223783e58d28620 100644 (file)
@@ -19,7 +19,6 @@
  {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
  {include file="CRM/common/WizardHeader.tpl"}
 
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
  <div id="export-type">
   <div class="crm-section crm-exportOption-section">
     <h3>{ts count=$totalSelectedRecords plural='%count records selected for export.'}One record selected for export.{/ts}</h3>
index a234bf887af4abe1c944f4b71810d617667e777d..a338c406b4b660f081d25947f642d738e50e03f7 100644 (file)
@@ -15,7 +15,6 @@
     {ts}WARNING: You cannot delete a {$delName} Financial Account if it is currently used by any Financial Types. Consider disabling this option instead.{/ts} {ts}Deleting a financial type cannot be undone.{/ts} {ts}Do you want to continue?{/ts}
   </div>
 {else}
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   <table class="form-layout-compressed">
     <tr class="crm-contribution-form-block-name">
       <td class="label">{$form.name.label}</td>
index 6dbaef87879069f7024c9f0ddceb1b59d46cbdf9..b1993f55e5c70f56ada440da367f5e8eb346506b 100644 (file)
@@ -15,8 +15,6 @@
     {ts}WARNING: You cannot delete a financial type if it is currently used by any Contributions, Contribution Pages or Membership Types. Consider disabling this option instead.{/ts} {ts}Deleting a financial type cannot be undone.{/ts} {ts}Do you want to continue?{/ts}
   </div>
 {else}
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-
   <table class="form-layout">
     <tr class="crm-contribution-form-block-name">
       <td class="label">{$form.title.label}</td>
index 498460aa74cb7f28965fe6ef546600f592154f79..dfca52cc4f2d7610c15433009a7ff9b9ded2e74d 100644 (file)
       {ts}WARNING: You cannot delete a financial type if it is currently used by any Contributions, Contribution Pages or Membership Types. Consider disabling this option instead.{/ts} {ts}Deleting a financial type cannot be undone. Unbalanced transactions may be created if you delete this account.{/ts} {ts}Do you want to continue?{/ts}
       </div>
   {else}
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-
     <table class="form-layout">
-
       <tr class="crm-contribution-form-block-account_relationship">
       <td class="label">{$form.account_relationship.label}</td>
   <td class="html-adjust">{$form.account_relationship.html}</td>
@@ -27,7 +24,6 @@
       <td class="label">{$form.financial_account_id.label}</td>
   <td class="html-adjust">{$form.financial_account_id.html}</td>
       </tr>
-
     </table>
    {/if}
    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="botttom"}</div>
index 8981b84705fa591ae646c8e0987e64f2d1722674..77923f064cebd7af1dd4bb4fd954b7038651c555 100644 (file)
@@ -8,7 +8,6 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-{$formName}-block">
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     {include file="CRM/Form/basicFormFields.tpl"}
     <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index 31ff89aded17e3ed40a9bb198cb853be24520974..7a5120affd62851c29e47b03babadfe358111f78 100644 (file)
@@ -24,7 +24,6 @@
   {/if}
   {ts}If sharing through social media is enabled, links allowing people to share with their social network will also be included on the Tell a Friend form (e.g. Facebook "Like" and Twitter). You can turn social media sharing on and off from the Settings tab.{/ts}
 </div>
-   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout">
         <tr class="crm-friend-manage-form-block-tf_is_active">
            <td class="label"">{$form.tf_is_active.html}</td>
index 716bd6f6615c71efcc26bcc11a6297ddd2a5e23f..2a96a0300651b869d068cc0cef39df663929f50e 100644 (file)
@@ -20,7 +20,6 @@
       {ts}Enter a unique name and a description for your new group here. Then click 'Continue' to find contacts to add to your new group.{/ts}
     {/if}
   </div>
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   <table class="form-layout">
 
     <tr class="crm-group-form-block-frontend-title">
index aa85adc053d01b1710d924af0a2820f583614182..67150159000eaadda91bb37ca570fc11993d9196 100644 (file)
@@ -21,8 +21,6 @@
   <div class="help">
     {ts 1=$importEntity 2= $importEntities}The %1 Import Wizard allows you to easily upload %2 from other applications into CiviCRM.{/ts}
   </div>
-
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   <div id="choose-data-source" class="form-item">
     <h3>{ts}Choose Data Source{/ts}</h3>
     <table class="form-layout">
     {literal}<script type="text/javascript">CRM.$('#use_existing_upload').prop('checked',true).change();</script>{/literal}
   {/if}
 </div>
-
index 7a543b618546c299b11631993083c19f3061bcc5..587c68ac6fe1168357bb588c944cb968ad2267a8 100644 (file)
     <p>{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}</p>
     <p>{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}</p>
   </div>
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-    {* Table for mapping data to CRM fields *}
-    {include file="CRM/Import/Form/MapTableCommon.tpl" mapper=$form.mapper}
-  <br />
-
+  {* Table for mapping data to CRM fields *}
+  {include file="CRM/Import/Form/MapTableCommon.tpl" mapper=$form.mapper}
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
     {$initHideBoxes|smarty:nodefaults}
     {literal}
index 30825af46a8646ce4a3fe608ad9c9173a82ea15d..5c358453760850310ad2943c644974b52c8c3d85 100644 (file)
@@ -9,17 +9,12 @@
 *}
 {* this template is used for web-based subscriptions to mailing list type groups  *}
 <div class="crm-block crm-mailing-subscribe-form-block">
-{if $single}
-    <div class="help">
-        {ts}Enter your email address and click <strong>Subscribe</strong>. You will receive a confirmation request via email shortly. Your subscription will be activated after you respond to that email.{/ts}
-    </div>
-{else}
-    <div class="help">
-        {ts}Enter your email address and check the box next to each mailing list you want to join. Then click the <strong>Subscribe</strong> 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}
-    </div>
-{/if}
-
-<table class="form-layout-compressed">
+  {if $single}
+    <div class="help">{ts}Enter your email address and click <strong>Subscribe</strong>. You will receive a confirmation request via email shortly. Your subscription will be activated after you respond to that email.{/ts}</div>
+  {else}
+    <div class="help">{ts}Enter your email address and check the box next to each mailing list you want to join. Then click the <strong>Subscribe</strong> 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}</div>
+  {/if}
+  <table class="form-layout-compressed">
     <tr class="crm-mailing-subscribe-form-block-email"><td style="width: 10%;">{$form.email.label}</td><td>{$form.email.html}</td></tr>
     <tr><td colspan="2">
         <div class="spacer"></div>
@@ -39,6 +34,6 @@
         {/if}
         </td>
     </tr>
-</table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-</div><!-- end crm-block -->
+  </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+</div>
index a5a39ff270f97c88e9c2e0ee30d14060d938fc07..8d0a88343e186c033f1b91c4a3a20bcdef84bc71 100644 (file)
@@ -62,7 +62,6 @@
      <a class="open-inline-noreturn action-item crm-hover-button" href="{$ccModeLink}"><i class="crm-i fa-credit-card" aria-hidden="true"></i> {ts}submit credit card membership{/ts}</a>
     </div>
     {/if}
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     {if $action eq 8}
     <div class="messages status no-popup">
       {icon icon="fa-info-circle"}{/icon}
index 3c4af099d2ddb573b1afce6f80187027a4c3fb58..fa4667579b6ae4ca6e6bdf24c7bf2989a7d135cc 100644 (file)
@@ -9,11 +9,10 @@
 *}
 {* Configure Membership signup/renewal block for an Online Contribution page *}
 <div id="form" class="crm-block crm-form-block crm-member-membershipblock-form-block">
-<div class="help">
+  <div class="help">
     {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 <strong>Enabled</strong> box un-checked..{/ts} {docURL page="user/membership/online-membership-sign-up/"}
-</div>
+  </div>
   {if !empty($form.membership_type.html)}
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout-compressed">
         <tr class="crm-member-membershipblock-form-block-member_is_active">
             <td class="label"></td><td class="html-adjust">{$form.member_is_active.html}&nbsp;{$form.member_is_active.label}</td>
          {ts 1=$linkURL}You need to have at least one <a href="%1">Membership Type</a> with 'Public' visibility in order to enable self-service Membership Signup and Renewal.{/ts}
       </div>
   {/if}
-      <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
 
 {literal}
index da4445c6ee87af270e32891530fde66443392364..6ff7a666d899231c48e875684c235e4306dd58b0 100644 (file)
@@ -10,7 +10,6 @@
 {* this template is used for adding/editing/deleting membership status  *}
 <div class="crm-block crm-form-block crm-membership-status-form-block" id=membership_status>
 <fieldset><legend>{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}</legend>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   {if $action eq 8}
     <div class="messages status no-popup">
       {icon icon="fa-info-circle"}{/icon}
index a263d77f4212b6228ca17255a721a98a5d04186b..e6106b044fd68af996f9eec0790d8d37dfdc499e 100644 (file)
@@ -12,9 +12,7 @@
   {include file="CRM/Core/Form/EntityForm.tpl"}
 {else}
 <div class="crm-block crm-form-block crm-membership-type-form-block">
-
   <div class="form-item" id="membership_type_form">
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout-compressed">
       {foreach from=$tpl_standardised_fields item=fieldName}
        {assign var=fieldSpec value=$entityFields.$fieldName}
index 770f3e26f1269fe49cc777bda2ceb4f6e5a3c50e..56213aa50e37ca2918370d935a3e8bc4ce6afc31 100644 (file)
@@ -8,9 +8,8 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-contact-task-mailing-label-form-block">
-<div class="messages status no-popup">{include file="CRM/Member/Form/Task.tpl"}</div>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-<table class="form-layout-compressed">
+  <div class="messages status no-popup">{include file="CRM/Member/Form/Task.tpl"}</div>
+  <table class="form-layout-compressed">
      <tr class="crm-contact-task-mailing-label-form-block-label_name">
         <td class="label">{$form.label_name.label}</td>
         <td>{$form.label_name.html} {help id="id-select-label" file="CRM/Contact/Form/Task/Label.hlp"}</td>
@@ -31,6 +30,6 @@
      <tr class="crm-contact-task-mailing-label-form-block-merge_same_household">
         <td></td><td>{$form.merge_same_household.html} {$form.merge_same_household.label}</td>
      </tr>
-</table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
index 8a50794bdff2df2faebf38a35e187a2ca90bc6c4..e79bb0f1d93519cec52fe34803fdbca849962bea 100644 (file)
@@ -27,7 +27,6 @@
 
     <p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
  </div>
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 
  {* Summary Preview (record counts) *}
  <table id="preview-counts" class="report">
index 2df7a6719e5519bf880a5a24c76c7d89edd8a0a3..156667116dc5971ae74d80092c43f2f8a9244563 100644 (file)
@@ -7,11 +7,10 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
 <table class="form-layout">
-  <tr  class="crm-contribution-contributionpage-pcp-form-block-pcp_active">
-      <td class="label">&nbsp;</td>
-      <td>{$form.pcp_active.html} {$form.pcp_active.label}</td>
+  <tr class="crm-contribution-contributionpage-pcp-form-block-pcp_active">
+    <td class="label">&nbsp;</td>
+    <td>{$form.pcp_active.html} {$form.pcp_active.label}</td>
   </tr>
 </table>
 
index df3640751c78df0c6d1b0d8c468059bf50acd277..6222226b848643bdfa8c4ec8dccf8f05fa401b21 100644 (file)
@@ -26,7 +26,6 @@
     {/if}
 {/if}
 <div class="crm-block crm-form-block crm-pledge-form-block">
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
    {if $action eq 8}
     <div class="messages status no-popup">
     {icon icon="fa-info-circle"}{/icon}
index 742e47a4bd9862a25226b36011fae6bd4aa13a56..bc9e1aa6b840f5066c06ab14a8a2b29c56a05dbd 100644 (file)
 {/if}
 
 <div class="crm-block crm-content-block crm-pledge-view-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-<table class="crm-info-panel">
-     <tr class="crm-pledge-form-block-displayName"><td class="label">{ts}Pledge By{/ts}</td><td class="bold"><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$contactId"}">{$displayName}</a></td></tr>
-     <tr class="crm-pledge-form-block-amount">
-        <td class="label">{ts}Total Pledge Amount{/ts}</td>
-        <td><span class="bold">{$amount|crmMoney:$currency}</span>
-            {if $originalPledgeAmount}<div class="messages status no-popup">{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}</div>{/if}
-        </td>
-     </tr>
-     <tr class="crm-pledge-form-block-installments"><td class="label">{ts}To be paid in{/ts}</td><td>{$installments} {ts}installments of{/ts} {$original_installment_amount|crmMoney:$currency} {ts}every{/ts} {$frequency_interval} {$frequencyUnit}</td></tr>
+  <table class="crm-info-panel">
+    <tr class="crm-pledge-form-block-displayName"><td class="label">{ts}Pledge By{/ts}</td><td class="bold"><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$contactId"}">{$displayName}</a></td></tr>
+    <tr class="crm-pledge-form-block-amount">
+      <td class="label">{ts}Total Pledge Amount{/ts}</td>
+      <td><span class="bold">{$amount|crmMoney:$currency}</span>
+        {if $originalPledgeAmount}<div class="messages status no-popup">{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}</div>{/if}
+      </td>
+    </tr>
+    <tr class="crm-pledge-form-block-installments"><td class="label">{ts}To be paid in{/ts}</td><td>{$installments} {ts}installments of{/ts} {$original_installment_amount|crmMoney:$currency} {ts}every{/ts} {$frequency_interval} {$frequencyUnit}</td></tr>
     <tr><td class="label">{ts}Payments are due on the{/ts}</td><td>{$frequency_day} day of the period</td></tr>
-
     {if $start_date}
-       <tr class="crm-pledge-form-block-create_date"><td class="label">{ts}Pledge Made{/ts}</td><td>{$create_date|truncate:10:''|crmDate}</td></tr>
-         <tr class="crm-pledge-form-block-start_date"><td class="label">{ts}Payment Start{/ts}</td><td>{$start_date|truncate:10:''|crmDate}</td></tr>
-  {/if}
+      <tr class="crm-pledge-form-block-create_date"><td class="label">{ts}Pledge Made{/ts}</td><td>{$create_date|truncate:10:''|crmDate}</td></tr>
+      <tr class="crm-pledge-form-block-start_date"><td class="label">{ts}Payment Start{/ts}</td><td>{$start_date|truncate:10:''|crmDate}</td></tr>
+    {/if}
     {if $end_date}
-         <tr class="crm-pledge-form-block-end_date"><td class="label">{ts}End Date{/ts}</td><td>{$end_date|truncate:10:''|crmDate}</td></tr>
-  {/if}
-    {if $cancel_date}
-         <tr class="crm-pledge-form-block-cancel_date"><td class="label">{ts}Cancelled Date{/ts}</td><td>{$cancel_date|truncate:10:''|crmDate}</td></tr>
+      <tr class="crm-pledge-form-block-end_date"><td class="label">{ts}End Date{/ts}</td><td>{$end_date|truncate:10:''|crmDate}</td></tr>
     {/if}
-        <tr class="crm-pledge-form-block-contribution_type crm-pledge-form-block-financial_type"><td class="label">{ts}Financial Type{/ts}</td><td>{$financial_type}&nbsp;
-    {if $is_test}
-        {ts}(test){/ts}
+    {if $cancel_date}
+      <tr class="crm-pledge-form-block-cancel_date"><td class="label">{ts}Cancelled Date{/ts}</td><td>{$cancel_date|truncate:10:''|crmDate}</td></tr>
     {/if}
-        </td></tr>
-
+    <tr class="crm-pledge-form-block-contribution_type crm-pledge-form-block-financial_type">
+      <td class="label">{ts}Financial Type{/ts}</td>
+      <td>{$financial_type}&nbsp;{if $is_test}{ts}(test){/ts}{/if}</td>
+    </tr>
     {if $campaign}
-  <tr class="crm-pledge-form-block-campaign">
-      <td class="label">{ts}Campaign{/ts}</td>
-          <td>{$campaign}</td>
-  </tr>
+      <tr class="crm-pledge-form-block-campaign">
+        <td class="label">{ts}Campaign{/ts}</td>
+        <td>{$campaign}</td>
+      </tr>
     {/if}
-
     {if $acknowledge_date}
-            <tr class="crm-pledge-form-block-acknowledge_date"><td class="label">{ts}Received{/ts}</td><td>{$acknowledge_date|truncate:10:''|crmDate}&nbsp;</td></tr>
-  {/if}
+      <tr class="crm-pledge-form-block-acknowledge_date"><td class="label">{ts}Received{/ts}</td><td>{$acknowledge_date|truncate:10:''|crmDate}&nbsp;</td></tr>
+    {/if}
     {if $contribution_page}
-            <tr class="crm-pledge-form-block-contribution_page"><td class="label">{ts}Self-service Payments Page{/ts}</td><td>{$contribution_page}</td></tr>
+      <tr class="crm-pledge-form-block-contribution_page"><td class="label">{ts}Self-service Payments Page{/ts}</td><td>{$contribution_page}</td></tr>
     {/if}
-        <tr class="crm-pledge-form-block-pledge_status"><td class="label">{ts}Pledge Status{/ts}</td><td{if $status_id eq 3} class="font-red bold"{/if}>{$pledge_status} </td></tr>
+      <tr class="crm-pledge-form-block-pledge_status"><td class="label">{ts}Pledge Status{/ts}</td><td{if $status_id eq 3} class="font-red bold"{/if}>{$pledge_status} </td></tr>
     {if $honor_contact_id}
-            <tr class="crm-pledge-form-block-honor_type"><td class="label">{$honor_type}</td><td>{$honor_display}</td></tr>
+      <tr class="crm-pledge-form-block-honor_type"><td class="label">{$honor_type}</td><td>{$honor_display}</td></tr>
     {/if}
-        <tr class="crm-pledge-form-block-initial_reminder_day"><td class="label">{ts}Initial Reminder Day{/ts}</td><td>{$initial_reminder_day}&nbsp;days prior to schedule date </td></tr>
-        <tr class="crm-pledge-form-block-max_reminders"><td class="label">{ts}Maximum Reminders Send{/ts}</td><td>{$max_reminders}&nbsp;</td></tr>
-        <tr class="crm-pledge-form-block-additional_reminder_day"><td class="label">{ts}Send additional reminders{/ts}</td><td>{$additional_reminder_day}&nbsp;days after the last one sent</td></tr>
-
+    <tr class="crm-pledge-form-block-initial_reminder_day"><td class="label">{ts}Initial Reminder Day{/ts}</td><td>{$initial_reminder_day}&nbsp;days prior to schedule date </td></tr>
+    <tr class="crm-pledge-form-block-max_reminders"><td class="label">{ts}Maximum Reminders Send{/ts}</td><td>{$max_reminders}&nbsp;</td></tr>
+    <tr class="crm-pledge-form-block-additional_reminder_day"><td class="label">{ts}Send additional reminders{/ts}</td><td>{$additional_reminder_day}&nbsp;days after the last one sent</td></tr>
     {include file="CRM/Custom/Page/CustomDataView.tpl"}
-</table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  </table>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
-
index a449865a09d6218223db9f65b7e8e8ffd898b98d..f04698cd593f9f6d75efc0f7f7be5bd231f247ac 100644 (file)
@@ -79,7 +79,6 @@
 </script>
 {/literal}
 <div class="crm-block crm-form-block crm-price-field-form-block">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   <table class="form-layout">
     <tr class="crm-price-field-form-block-label">
       <td class="label">{$form.label.label}</td>
index b94e6609947c2635d5242868d211e82af24143b8..aec1461134a1d272b4b9bc1e3f49f72c9a664dec 100644 (file)
@@ -13,8 +13,6 @@
 </div>
 {capture assign="enableComponents"}{crmURL p='civicrm/admin/setting/component' q="reset=1"}{/capture}
 <div class="crm-form-block">
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-
     <table class="form-layout">
         <tr class="crm-price-set-form-block-title">
            <td class="label">{$form.title.label}</td>
@@ -72,7 +70,6 @@
         </tr>
      </table>
      <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-
 </div>
 {if $action eq 2 or $action eq 4} {* Update or View*}
     <p></p>
@@ -80,4 +77,3 @@
     <a href="{crmURL p='civicrm/admin/price/field' q="action=browse&reset=1&sid=$sid"}" class="button"><span>{ts}Fields for this Set{/ts}</span></a>
     </div>
 {/if}
-
index bfe4393eaefb95f9e3832413fbe3c310a402e0fb..fb1b16ae29368fbc368aaf7d6849ad0f9be33154 100644 (file)
 {* priceField is set when e.g. in browse mode *}
 {if $action NEQ 8 and !empty($priceField)}
 <div class="crm-content-block crm-block">
-  <div class="action-link">
-    {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}
-  </div>
   <div id="field_page">
   {strip}
   {* handle enable/disable actions*}
index 49f8ff0d5c741f885cd140dc14eb3d3bf498d4ba..f28978bec290dcb315da1aa802b11092f2fafc4f 100644 (file)
@@ -7,37 +7,14 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-{if $action eq 8}
-  <h3>{ts}Delete Report Template{/ts}</h3>
-{elseif $action eq 2}
-  <h3>{ts}Edit Report Template{/ts}</h3>
-{else}
-  <h3>{ts}New Report Template{/ts}</h3>
-{/if}
 <div class="crm-block crm-form-block crm-report-register-form-block">
   {if $action eq 8}
-  <table class="form-layout">
-    <tr class="buttons">
-      <td><div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-      </td>
-      <td></td>
-    </tr>
-    <tr>
-      <td colspan=2>
-        <div class="messages status no-popup">
-          {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}
-        </div>
-      </td>
-    </tr>
-    {else}
-
+    <div class="messages status no-popup">
+      {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}
+    </div>
+  {else}
     <table class="form-layout">
-      <tr class="buttons crm-report-register-form-block-buttons">
-        <td><div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-        </td>
-        <td></td>
-      </tr>
       <tr class="crm-report-register-form-block-label">
         <td class="label">{$form.label.label}</td>
         <td class="view-value">{$form.label.html} <br /><span class="description">{ts}Report title appear in the display screen.{/ts}</span>
         <td class="label">{$form.is_active.label}</td>
         <td class="view-value">{$form.is_active.html}</td>
       </tr>
-      {/if}
-      <tr class="buttons crm-report-register-form-block-buttons">
-        <td><div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-        </td>
-        <td></td>
-      </tr>
     </table>
+  {/if}
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="botttom"}</div>
 </div>
index 183d5a20c06770219a79ca6cd14ded1f075d2c7b..9282a16a46bf4958851d08b4e32e2e801079754f 100644 (file)
@@ -9,17 +9,15 @@
 *}
 {* This template is used for adding/configuring SMS Providers  *}
 <div class="crm-block crm-form-block crm-job-form-block">
- <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-
 {if $action eq 8}
   <div class="messages status no-popup">
-      {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}
   </div>
 {elseif $action eq 128}
   <div class="messages status no-popup">
-      {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}
   </div>
 {else}
   <table class="form-layout-compressed">
@@ -53,7 +51,7 @@
   </table>
 {/if}
 </table>
-       <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
   </fieldset>
 </div>
 
index f7cbada056f8ddd80cbcb807df2497da8bf0fc92..affb637f896bc575553faa37ddc23c6a1171cf3e 100644 (file)
@@ -10,7 +10,6 @@
 {* this template is used for adding/editing a tag (admin)  *}
 <div class="crm-block crm-form-block crm-tag-form-block">
   {if $action eq 1 or $action eq 2 }
-    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
     <table class="form-layout-compressed">
        <tr class="crm-tag-form-block-label">
           <td class="label">{$form.name.label}</td>
index 86948079ff505fbc2cff0d432c5524b8ab558fb0..1743782aacb0967b5ddade0839f8c9ec7729fd86 100644 (file)
@@ -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}
   </div>
 {else}
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
   <table class="form-layout-compressed">
     <tr class="crm-uf-field-form-block-field_name">
       <td class="label">{$form.field_name.label} {help id='field_name_0'}</td>
index 24c97000be23873404f39b3068c6a8f9d178a17f..a7d8d5bf53c5050093188b63f9279b0b3f17c5c0 100644 (file)
@@ -9,20 +9,15 @@
 *}
 {* add/update/view CiviCRM Profile *}
 {if $action eq 8}
- <h3> {ts}Delete CiviCRM Profile{/ts} - {$profileTitle}</h3>
-{/if}
-<div class=" crm-block crm-form-block crm-uf_group-form-block">
-{* CRM-13693 Duplicate Delete button *}
-{if $action neq 8}
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
+  <h3>{ts}Delete CiviCRM Profile{/ts} - {$profileTitle}</h3>
 {/if}
+<div class="crm-block crm-form-block crm-uf_group-form-block">
 {if ($action eq 2 or $action eq 4) and $snippet neq 'json' } {* Update or View*}
-    <div class="action-link">
-  <a href="{crmURL p='civicrm/admin/uf/group/field' q="action=browse&reset=1&gid=$gid"}" class="button"><span>{ts}View or Edit Fields for this Profile{/ts}</a></span>
-  <div class="clear"></div>
-    </div>
+  <div class="action-link">
+    <a href="{crmURL p='civicrm/admin/uf/group/field' q="action=browse&reset=1&gid=$gid"}" class="button"><span>{ts}View or Edit Fields for this Profile{/ts}</a></span>
+    <div class="clear"></div>
+  </div>
 {/if}
-
 {if $action eq 8 or $action eq 64}
     <div class="messages status no-popup">
            {icon icon="fa-info-circle"}{/icon}
index f266f1fab1d634af2f1ab8b3e4e62804159ef67c..aad5e08c3d511918c4c42c44ef00e19242a8d2f2 100644 (file)
 <div class="crm-content-block">
     {if $ufField}
         <div id="field_page">
-        {if not ($action eq 2 or $action eq 1)}
-            <div class="action-link">
-                {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="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}
-                <div class="clear"></div>
-            </div>
-        {/if}
         {strip}
         {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}