From 8516c1427abc307dbe7e1b923a15d3a8df18c7f9 Mon Sep 17 00:00:00 2001 From: Kurund Jalmi Date: Thu, 28 Mar 2013 17:06:29 +0530 Subject: [PATCH] worked on CRM-12202, added overlay for ajax reloading --- templates/CRM/Case/Form/ActivityChangeStatus.js | 13 +++++++++---- templates/CRM/Case/Form/CaseView.tpl | 1 + templates/CRM/Case/Form/Selector.tpl | 1 + templates/CRM/Case/Page/DashBoard.tpl | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/templates/CRM/Case/Form/ActivityChangeStatus.js b/templates/CRM/Case/Form/ActivityChangeStatus.js index cee2acd5d5..7421776de1 100644 --- a/templates/CRM/Case/Form/ActivityChangeStatus.js +++ b/templates/CRM/Case/Form/ActivityChangeStatus.js @@ -51,13 +51,18 @@ cj(function($) { }; var data = 'snippet=1&reset=1'; - $('
') - .load(CRM.url('civicrm/case/changeactivitystatus'), data, function() { - cj("#activity_change_status").val(current_status_id); - }) + + var o = $('
'); + addCiviOverlay(o); + + o.load(CRM.url('civicrm/case/changeactivitystatus'), data, function() { + removeCiviOverlay(o); + cj("#activity_change_status").val(current_status_id); + }) .dialog({ modal: true, title: ts('Change Activity Status'), + resizable: false, buttons: buttons, beforeClose: function() { $(this).dialog("destroy"); diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl index 955c03b06e..df0ad7e3b0 100644 --- a/templates/CRM/Case/Form/CaseView.tpl +++ b/templates/CRM/Case/Form/CaseView.tpl @@ -1123,3 +1123,4 @@ function printCaseReport( ) { {/if} {* view related cases if end *}
+{include file="CRM/common/overlay.tpl"} diff --git a/templates/CRM/Case/Form/Selector.tpl b/templates/CRM/Case/Form/Selector.tpl index 7c96eff158..1b86ee5113 100644 --- a/templates/CRM/Case/Form/Selector.tpl +++ b/templates/CRM/Case/Form/Selector.tpl @@ -165,3 +165,4 @@ function buildCaseDetails( caseId, contactId ) {/literal} +{include file="CRM/common/overlay.tpl"} diff --git a/templates/CRM/Case/Page/DashBoard.tpl b/templates/CRM/Case/Page/DashBoard.tpl index 102e6fb714..22d415570a 100644 --- a/templates/CRM/Case/Page/DashBoard.tpl +++ b/templates/CRM/Case/Page/DashBoard.tpl @@ -110,3 +110,4 @@ {/if} {/if} +{include file="CRM/common/overlay.tpl"} -- 2.25.1