From b43d4925e1240e70b328ee3fea5926cdc43b7cf8 Mon Sep 17 00:00:00 2001
From: mzd <mzd@ginkgostreet.com>
Date: Wed, 30 Apr 2014 19:01:23 -0400
Subject: [PATCH] CRM-14353 - remove formNavigate includes, in-progress

----------------------------------------
* CRM-14353: Fix formNavigate to work with multiple forms & ajax
  https://issues.civicrm.org/jira/browse/CRM-14353
---
 templates/CRM/Activity/Form/Activity.tpl                      | 3 ---
 templates/CRM/Contact/Form/Contact.tpl                        | 3 ---
 templates/CRM/Contact/Form/Task/Email.tpl                     | 1 -
 templates/CRM/Contact/Form/Task/SMS.tpl                       | 1 -
 templates/CRM/Contribute/Form/AdditionalPayment.tpl           | 4 ----
 templates/CRM/Contribute/Form/Contribution.tpl                | 3 ---
 templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl | 2 --
 templates/CRM/Contribute/Form/ContributionPage/Amount.tpl     | 2 --
 templates/CRM/Contribute/Form/ContributionPage/Premium.tpl    | 3 ---
 templates/CRM/Contribute/Form/ContributionPage/Settings.tpl   | 4 ----
 templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl   | 4 ----
 templates/CRM/Contribute/Form/ContributionPage/Widget.tpl     | 3 ---
 templates/CRM/Contribute/Form/UpdateSubscription.tpl          | 3 ---
 templates/CRM/Event/Form/ManageEvent/Conference.tpl           | 2 --
 templates/CRM/Event/Form/ManageEvent/EventInfo.tpl            | 3 ---
 templates/CRM/Event/Form/ManageEvent/Fee.tpl                  | 2 --
 templates/CRM/Event/Form/ManageEvent/Location.tpl             | 3 ---
 templates/CRM/Event/Form/ManageEvent/Registration.tpl         | 1 -
 templates/CRM/Event/Form/Participant.tpl                      | 2 --
 templates/CRM/Member/Form/MembershipBlock.tpl                 | 2 --
 templates/CRM/PCP/Form/PCP.tpl                                | 3 ---
 templates/CRM/SMS/Form/Group.tpl                              | 2 --
 templates/CRM/SMS/Form/Schedule.tpl                           | 3 ---
 templates/CRM/SMS/Form/Upload.tpl                             | 3 ---
 24 files changed, 62 deletions(-)

diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index c6c529de2a..951953aa43 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -303,8 +303,5 @@
     </script>
     {/literal}
   {/if}
-  {if ! $form.case_select}
-  {include file="CRM/common/formNavigate.tpl"}
-  {/if}
   </div>{* end of form block*}
 {/if} {* end of snippet if*}
diff --git a/templates/CRM/Contact/Form/Contact.tpl b/templates/CRM/Contact/Form/Contact.tpl
index 45a5340561..8923334e01 100644
--- a/templates/CRM/Contact/Form/Contact.tpl
+++ b/templates/CRM/Contact/Form/Contact.tpl
@@ -246,7 +246,4 @@
 {* include common additional blocks tpl *}
 {include file="CRM/common/additionalBlocks.tpl"}
 
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
-
 {/if}
diff --git a/templates/CRM/Contact/Form/Task/Email.tpl b/templates/CRM/Contact/Form/Task/Email.tpl
index 118f837e6c..74bfd05f87 100644
--- a/templates/CRM/Contact/Form/Task/Email.tpl
+++ b/templates/CRM/Contact/Form/Task/Email.tpl
@@ -114,4 +114,3 @@ cj( "#bcc_id" ).tokenInput( sourceDataUrl, { prePopulate: bccContact, theme: 'fa
 cj( 'ul.token-input-list-facebook, div.token-input-dropdown-facebook' ).css( 'width', '450px' );
 </script>
 {/literal}
-{include file="CRM/common/formNavigate.tpl"}
diff --git a/templates/CRM/Contact/Form/Task/SMS.tpl b/templates/CRM/Contact/Form/Task/SMS.tpl
index ca92703a43..858d913c04 100644
--- a/templates/CRM/Contact/Form/Task/SMS.tpl
+++ b/templates/CRM/Contact/Form/Task/SMS.tpl
@@ -101,4 +101,3 @@ cj( "#to"     ).tokenInput( toDataUrl,     { prePopulate: toContact,  theme: 'fa
 cj( 'ul.token-input-list-facebook, div.token-input-dropdown-facebook' ).css( 'width', '450px' );
 </script>
 {/literal}
-{include file="CRM/common/formNavigate.tpl"}
diff --git a/templates/CRM/Contribute/Form/AdditionalPayment.tpl b/templates/CRM/Contribute/Form/AdditionalPayment.tpl
index ad4bf9544d..4986af3e96 100644
--- a/templates/CRM/Contribute/Form/AdditionalPayment.tpl
+++ b/templates/CRM/Contribute/Form/AdditionalPayment.tpl
@@ -283,8 +283,4 @@ cj('#fee_amount').change( function() {
         invert              = 0
         }
     {/if}
- 
-  {* include jscript to warn if unsaved form field changes *}
-  {include file="CRM/common/formNavigate.tpl"}
-
 {/if}
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 6dcef43215..7c5597dac5 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -534,9 +534,6 @@
     {/if}
   {/if} {* not delete mode if*}
 
-  {* include jscript to warn if unsaved form field changes *}
-  {include file="CRM/common/formNavigate.tpl"}
-
 {/if} {* closing of main custom data if *}
 
 {literal}
diff --git a/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl b/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
index e80489fb1a..354be5427d 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl
@@ -72,8 +72,6 @@
 {/if} {* $action ne view *}
 </div>
 
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
 <script language="JavaScript" type="text/javascript">
 {literal}
 function getFinancialType()
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
index 917e3fde1e..4cec3180a6 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
@@ -352,8 +352,6 @@
 }
 {/if}
 
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
 {if $isQuick}
 {literal}
 <script type="text/javascript">
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
index 41f6622b7b..f73b93cf3b 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
@@ -166,6 +166,3 @@
 
   {/literal}
 </script>
-
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
index cdd5c2f1ed..6f59432e0d 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
@@ -202,7 +202,3 @@
      }
  {/literal}
 </script>
-
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
-
diff --git a/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl b/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
index 01de2f17cf..15844dfdb7 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/ThankYou.tpl
@@ -109,7 +109,3 @@
      }
  {/literal}
 </script>
-
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
-
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
index 23a41bf65d..a89c686c2d 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
@@ -136,6 +136,3 @@
     }
 </script>
 {/literal}
-
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
diff --git a/templates/CRM/Contribute/Form/UpdateSubscription.tpl b/templates/CRM/Contribute/Form/UpdateSubscription.tpl
index ac1a2fa0d7..80c416f1e3 100644
--- a/templates/CRM/Contribute/Form/UpdateSubscription.tpl
+++ b/templates/CRM/Contribute/Form/UpdateSubscription.tpl
@@ -54,6 +54,3 @@
 
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
-
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
diff --git a/templates/CRM/Event/Form/ManageEvent/Conference.tpl b/templates/CRM/Event/Form/ManageEvent/Conference.tpl
index fdef0096aa..c82bb8cbf0 100644
--- a/templates/CRM/Event/Form/ManageEvent/Conference.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Conference.tpl
@@ -59,5 +59,3 @@
         {include file="CRM/common/formButtons.tpl" location="bottom"}
     </div>
 </div>
-
-{include file="CRM/common/formNavigate.tpl"}
diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
index 1e5dae1226..a0eb361213 100644
--- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
@@ -165,9 +165,6 @@
         </div>
     {include file="CRM/common/showHide.tpl" elemType="table-row"}
 
-    {* include jscript to warn if unsaved form field changes *}
-    {include file="CRM/common/formNavigate.tpl"}
-
     {include file="CRM/Form/validate.tpl"}
 {/if}
 </div>
diff --git a/templates/CRM/Event/Form/ManageEvent/Fee.tpl b/templates/CRM/Event/Form/ManageEvent/Fee.tpl
index 4578f064db..2d4e084205 100644
--- a/templates/CRM/Event/Form/ManageEvent/Fee.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Fee.tpl
@@ -342,8 +342,6 @@
     invert              = 0
 }
 
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
 {if $isQuick}
 {literal}
 <script type="text/javascript">
diff --git a/templates/CRM/Event/Form/ManageEvent/Location.tpl b/templates/CRM/Event/Form/ManageEvent/Location.tpl
index fba092d0db..8dde0645e6 100644
--- a/templates/CRM/Event/Form/ManageEvent/Location.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Location.tpl
@@ -166,7 +166,4 @@ showLocFields( );
 {* include common additional blocks tpl *}
 {include file="CRM/common/additionalBlocks.tpl"}
 
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
-
 {/if} {* add block if end*}
diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/templates/CRM/Event/Form/ManageEvent/Registration.tpl
index 42a610d7b6..190f74bc35 100644
--- a/templates/CRM/Event/Form/ManageEvent/Registration.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Registration.tpl
@@ -433,5 +433,4 @@ $(function($) {
 }(CRM.$, CRM._)); //Generic Closure 
 {/literal}
 </script>
-{include file="CRM/common/formNavigate.tpl"}
 {/if}
diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl
index fae24aa2f2..9ee6151953 100644
--- a/templates/CRM/Event/Form/Participant.tpl
+++ b/templates/CRM/Event/Form/Participant.tpl
@@ -469,8 +469,6 @@
     </script>
     {/literal}
 
-    {* jscript to warn if unsaved form field changes *}
-    {include file="CRM/common/formNavigate.tpl"}
   {/if}
 
 
diff --git a/templates/CRM/Member/Form/MembershipBlock.tpl b/templates/CRM/Member/Form/MembershipBlock.tpl
index 444a971f8a..5e4feb6f24 100644
--- a/templates/CRM/Member/Form/MembershipBlock.tpl
+++ b/templates/CRM/Member/Form/MembershipBlock.tpl
@@ -182,8 +182,6 @@
 </script>
 {/literal}
 
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
 {if $isQuick}
 {literal}
 <script type="text/javascript">
diff --git a/templates/CRM/PCP/Form/PCP.tpl b/templates/CRM/PCP/Form/PCP.tpl
index 53744f1366..3bdb87907e 100644
--- a/templates/CRM/PCP/Form/PCP.tpl
+++ b/templates/CRM/PCP/Form/PCP.tpl
@@ -108,6 +108,3 @@
     field_type          = "radio"
     invert              = "false"
 }
-
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
diff --git a/templates/CRM/SMS/Form/Group.tpl b/templates/CRM/SMS/Form/Group.tpl
index 393298ee0a..3cc20b828e 100644
--- a/templates/CRM/SMS/Form/Group.tpl
+++ b/templates/CRM/SMS/Form/Group.tpl
@@ -67,7 +67,5 @@
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
 </div>
 
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
 </div>
 {/if}
diff --git a/templates/CRM/SMS/Form/Schedule.tpl b/templates/CRM/SMS/Form/Schedule.tpl
index 999f7be76e..86679daeb7 100644
--- a/templates/CRM/SMS/Form/Schedule.tpl
+++ b/templates/CRM/SMS/Form/Schedule.tpl
@@ -66,9 +66,6 @@
 </div><!-- /.crm-accordion-wrapper -->
 {/if}
 
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
-
 </div>
 
 <script type="text/javascript">
diff --git a/templates/CRM/SMS/Form/Upload.tpl b/templates/CRM/SMS/Form/Upload.tpl
index 4f1199d71a..b0f4404fd4 100644
--- a/templates/CRM/SMS/Form/Upload.tpl
+++ b/templates/CRM/SMS/Form/Upload.tpl
@@ -82,6 +82,3 @@
     }
 </script>
 {/literal}
-
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}
-- 
2.25.1