From 706cff6dbe0d64c1f08925d6df3f42f6635e3908 Mon Sep 17 00:00:00 2001 From: Kurund Jalmi Date: Wed, 1 May 2013 18:09:51 -0700 Subject: [PATCH] worked on CRM-12357, fixed position of dialog and also added new param to modify default label for CRM.confirm --- js/Common.js | 6 ++++-- templates/CRM/Mailing/Page/Tab.tpl | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/js/Common.js b/js/Common.js index 191eba268f..294f76b98b 100644 --- a/js/Common.js +++ b/js/Common.js @@ -704,8 +704,9 @@ CRM.validate = CRM.validate || { * @param options {object|void} Override defaults, keys include 'title', 'message', * see jQuery.dialog for full list of available params */ - CRM.confirm = function (buttons, options) { + CRM.confirm = function (buttons, options, cancelLabel) { var dialog, callbacks = {}; + cancelLabel = cancelLabel || ts('Cancel'); var settings = { title: ts('Confirm Action'), message: ts('Are you sure you want to continue?'), @@ -716,7 +717,8 @@ CRM.validate = CRM.validate || { }, buttons: {} }; - settings.buttons[ts('Cancel')] = function () { + + settings.buttons[cancelLabel] = function () { dialog.dialog('close'); }; options = options || {}; diff --git a/templates/CRM/Mailing/Page/Tab.tpl b/templates/CRM/Mailing/Page/Tab.tpl index 57c2cb29cd..ecc040c23c 100644 --- a/templates/CRM/Mailing/Page/Tab.tpl +++ b/templates/CRM/Mailing/Page/Tab.tpl @@ -103,9 +103,10 @@ ,{ title: ts('Change Activity Status'), message: o, - width: 'auto' - } - + width : "680px", // don't remove px + height: "560" + }, + ts('Done') ); return false; }); -- 2.25.1