Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-09-25-01-46-57

[civicrm-core.git] / templates / CRM / Mailing / Page / Tab.tpl

diff --git a/templates/CRM/Mailing/Page/Tab.tpl b/templates/CRM/Mailing/Page/Tab.tpl
index 57c2cb29cd3235a2562eb42fa89220b03b63b14f..2b11fc06a8bc18ceb246c0bbbf4f8cca1d657d36 100644 (file)
--- a/templates/CRM/Mailing/Page/Tab.tpl
+++ b/templates/CRM/Mailing/Page/Tab.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -46,7 +46,6 @@
     buildMailingContact();
 
     function buildMailingContact() {
-      var columns = '';
       var sourceUrl = {/literal}'{crmURL p="civicrm/ajax/contactmailing" h=0 q="contact_id=$contactId"}'{literal};
 
       var ZeroRecordText = {/literal}'{ts escape="js"}No mailings found{/ts}.'{literal};
@@ -58,7 +57,7 @@
         "aoColumns": [
           {sClass: 'crm-mailing-contact-subject'},
           {sClass: 'crm-mailing-contact_created'},
-          {sClass: 'crm-contact-activity_contact'},
+          {sClass: 'crm-contact-activity_contact', bSortable:false},
           {sClass: 'crm-mailing-contact-date'},
           {sClass: 'crm-mailing_openstats', bSortable:false},
           {sClass: 'crm-mailing-contact-links', bSortable: false}
@@ -101,11 +100,12 @@
 
         CRM.confirm( ''
           ,{
-            title: ts('Change Activity Status'),
+            title: ts('Email Message'),
             message: o,
-            width: 'auto'
-          }
-
+            width : "680px", // don't remove px
+            height: "560"
+          },
+          ts('Done')
         );
         return false;
       });