worked on CRM-12357, fixed position of dialog and also added new param to modify...

diff --git a/js/Common.js b/js/Common.js
index 191eba268f6a0c12b052b91918a2f6ef1ec414a0..294f76b98b295d97f1c3abc569bcacf59e128062 100644 (file)
--- 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 57c2cb29cd3235a2562eb42fa89220b03b63b14f..ecc040c23cca1ebeebbd48c6fe61e7d9018ef71f 100644 (file)
--- 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;
       });