From: Tim Otten <totten@civicrm.org>
Date: Tue, 6 Aug 2013 23:16:18 +0000 (-0700)
Subject: CRM-12910 - logButton.tpl - More client-side logic:
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=74c0049328bef2d6eba11e14159ff7cb96c7ed09;p=civicrm-core.git

CRM-12910 - logButton.tpl - More client-side logic:
 * Use JS variable instead of Smarty variable
 * Construct URL on client side

----------------------------------------
* CRM-12910: Display revision history for each item under "Job"
  http://issues.civicrm.org/jira/browse/CRM-12910
---

diff --git a/templates/CRM/common/logButton.tpl b/templates/CRM/common/logButton.tpl
index 58362654b3..7db01d17dc 100644
--- a/templates/CRM/common/logButton.tpl
+++ b/templates/CRM/common/logButton.tpl
@@ -43,23 +43,24 @@
 
 {literal}
 <script type="text/javascript">
+var cssDialogSelector = ".dialog-{/literal}{$snippet.css_class}{literal}";
 cj(document).on("click", ".{/literal}{$snippet.css_class}{literal}", function() {
-  cj(".dialog-{/literal}{$snippet.css_class}{literal}").show( );
-  cj(".dialog-{/literal}{$snippet.css_class}{literal}").dialog({
+  cj(cssDialogSelector).show( );
+  cj(cssDialogSelector).dialog({
     title: "{/literal}{ts}Revisions{/ts}{literal}",
     modal: true,
     width: "680px",
     bgiframe: true,
     overlay: { opacity: 0.5, background: "black" },
     open:function() {
-      var ajaxurl = {/literal}'{crmURL p="civicrm/report/instance/`$snippet.instance_id`" h=0 }'{literal};
+      var ajaxurl = CRM.url("civicrm/report/instance/{/literal}{$snippet.instance_id}{literal}");
       cj.ajax({
         data: "reset=1&snippet=4&section=2&altered_contact_id_op=eq&altered_contact_id_value={/literal}{$snippet.contact_id}{literal}&log_type_table_op=has&log_type_table_value={/literal}{$snippet.table_name}{literal}",
         url:  ajaxurl,
         success: function (data) {
-          cj(".dialog-{/literal}{$snippet.css_class}{literal} .revision-content").html(data);
-          if (!cj(".dialog-{/literal}{$snippet.css_class}{literal} .revision-content .report-layout").length) {
-            cj(".dialog-{/literal}{$snippet.css_class}{literal} .revision-content").html("Sorry, couldn't find any revisions.");
+          cj(cssDialogSelector + " .revision-content").html(data);
+          if (!cj(cssDialogSelector + " .revision-content .report-layout").length) {
+            cj(cssDialogSelector + " .revision-content").html("Sorry, couldn't find any revisions.");
           }
         }
       });