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

diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index c6c529de2aac71983a42b557423f7d8a2cd82a7e..951953aa437255f23b7439e7b5b34c29c7f39311 100644 (file)
--- 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 45a53405617897f2ab4ca78ce9a72d02f063f3cf..8923334e0188167c78d4691f382238f5b6cfbd17 100644 (file)
--- 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 118f837e6cbd748b368f753188cbe66a49508377..74bfd05f87a4a38dd0a28d7b76029557689523fa 100644 (file)
--- 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 ca92703a43d5491d6880344f0503940e84c4f7c0..858d913c04538c5cd9e47b7a0ca2963857aa2660 100644 (file)
--- 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 ad4bf9544d5a642885a1734ff3047842b7c3de59..4986af3e9682e14d9020e3aaa241d615a99be965 100644 (file)
--- 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 6dcef43215cef3a5f61f2f3f258ad3f5a88afb35..7c5597dac574956f2111d2311d2797a13d7848cd 100644 (file)
--- 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 e80489fb1a09bb8035773cf01cc533e91a9f29c0..354be5427d7f88e0f1ab4f0ca614089ea6cf0fe3 100644 (file)
--- 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 917e3fde1ecdb02dc72d25b7bfa6f029d770a9c1..4cec3180a6ae7926a512ce7ae6594a0773658e9e 100644 (file)
--- 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 41f6622b7bdbb7d60ebe190101b40fdec74b65a8..f73b93cf3ba73d13d349d2c689f2e62693f5d0e5 100644 (file)
--- 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 cdd5c2f1ed784971f5b842d63c2f01d5e312bbe4..6f59432e0d1bc258c16955ed408783e1c6256b38 100644 (file)
--- 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 01de2f17cf96fb287e263202f194e3d18c9098a4..15844dfdb79da39bd3d6fe8b924d589989c9a597 100644 (file)
--- 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 23a41bf65da075f802a491152bcc7ac1dd45672c..a89c686c2df69f31f59fd13395a4b0ab9297da2a 100644 (file)
--- 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 ac1a2fa0d7516feb5ebffc0127486f56cda7d61e..80c416f1e35ebd4609e8636d80518ea8c31bd9fa 100644 (file)
--- 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 fdef0096aa9ee91afd0ead440934b6869690f22f..c82bb8cbf02996b81f64af8b07229cfd0a0d5c05 100644 (file)
--- 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 1e5dae1226439becc65987a8d8dc851fc10a9034..a0eb361213b0ba0df900cb35ff8811b65b95af5f 100644 (file)
--- 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 4578f064db754fb87a5441de334c29c9e9aecd2b..2d4e0842055d27e1487c67f85691e4e39d2783b2 100644 (file)
--- 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 fba092d0db6eda3910145a0a0711954fd41e2982..8dde0645e662253afa8e661a03525de7b72623c1 100644 (file)
--- 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 42a610d7b6cf3dbb7740e609d2786b78026a5276..190f74bc3575364d8c20c4e154968ca4831fb049 100644 (file)
--- 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 fae24aa2f2c44abcbd6206df1a9eaca83c482998..9ee615195328b9953ad76e7e5787052f2458d75d 100644 (file)
--- 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 444a971f8ac0e67adb3b5f0c6daf2df369e58905..5e4feb6f24dede21606a333441aaefcfe254de60 100644 (file)
--- 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 53744f136645107bc111b7ac341f3bff9c8fff08..3bdb87907ea7f3106b0105ff57a12f6637654da6 100644 (file)
--- 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 393298ee0a744e4e38c755efaa7a282d8e73a880..3cc20b828e8ffa47ebeac960b572b1d567a69be0 100644 (file)
--- 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 999f7be76e3f889192e22b3bb66be49c0725e260..86679daeb77202ce48af2d27d10f353cdde64639 100644 (file)
--- 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 4f1199d71a21cd270e696127eda10d012fec6f74..b0f4404fd48c0382cc2f81695e7003f75e544ecc 100644 (file)
--- 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"}