Cleanup ui.dialog params and css

diff --git a/css/civicrm.css b/css/civicrm.css
index dc02ed50aeb9fbdb60522e38381147be6d9c8d2c..aa6571629324af81a699253557cc7b968064d424 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3946,11 +3946,11 @@ div.m ul#civicrm-menu,
   background-image: url("../packages/jquery/css/images/pbar-ani.gif");
 }
 
-div.ui-dialog {
+.crm-container.ui-dialog {
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.6);
 }
 
-.ui-dialog-titlebar.ui-widget-header {
+.crm-container .ui-dialog-titlebar.ui-widget-header {
   background: url("../i/crm-button-bg.gif") repeat-x scroll left center #70716B;
   color: white;
 }

diff --git a/js/Common.js b/js/Common.js
index f16aba4844716292b91d6eacacedd1e7b6f850d0..dce5b31b2bb8a3d5e1f0f6fa1fa7af979c308062 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -425,6 +425,7 @@ CRM.validate = CRM.validate || {
     })
     // Modal dialogs should disable scrollbars
     .on('dialogopen', function(e) {
+      $(e.target).parent().addClass('crm-container');
       if ($(e.target).dialog('option', 'modal')) {
         $(e.target).addClass('modal-dialog');
         $('body').css({overflow: 'hidden'});
@@ -670,7 +671,7 @@ CRM.validate = CRM.validate || {
         }
       };
     });
-    dialog = $('<div class="crm-container crm-confirm-dialog"></div>')
+    dialog = $('<div class="crm-confirm-dialog"></div>')
       .html(options.message)
       .dialog(settings)
       .trigger('crmLoad');
@@ -789,7 +790,7 @@ CRM.validate = CRM.validate || {
     // bind the event for image popup
     $('body')
       .on('click', 'a.crm-image-popup', function() {
-        var o = $('<div class="crm-container crm-custom-image-popup"><img src=' + $(this).attr('href') + '></div>');
+        var o = $('<div class="crm-custom-image-popup"><img src=' + $(this).attr('href') + '></div>');
 
         CRM.confirm('',
           {

diff --git a/templates/CRM/Case/Form/ActivityChangeStatusJs.tpl b/templates/CRM/Case/Form/ActivityChangeStatusJs.tpl
index f6bbf8fc46b58bb5553a5be0b1fe1211f73fe5d0..eca6d42e62762de202febba855a2aafb976ef619 100644 (file)
--- a/templates/CRM/Case/Form/ActivityChangeStatusJs.tpl
+++ b/templates/CRM/Case/Form/ActivityChangeStatusJs.tpl
@@ -36,7 +36,7 @@
           current_status_id = $(this).attr('current_status'),
           caseId = $(this).attr('case_id'),
           data = 'snippet=1&reset=1',
-          $el = $('<div class="crm-container crm-activity_change_status"></div>');
+          $el = $('<div class="crm-activity_change_status"></div>');
         $el.block({theme:true});
 
         $el.load(CRM.url('civicrm/case/changeactivitystatus'), data, function() {

diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl
index 2b51c4b818ff8f9e40b011fb25b18c709e9162f8..6b90eaaff0c0cb4451518ed8f7f835632dad1232 100644 (file)
--- a/templates/CRM/Case/Form/CaseView.tpl
+++ b/templates/CRM/Case/Form/CaseView.tpl
@@ -330,13 +330,7 @@
     cj("#dialog").dialog({
       title: "Assign Case Role",
       modal: true,
-      bgiframe: true,
       close: function(event, ui) { cj("#rel_contact").unautocomplete( ); },
-      overlay: {
-        opacity: 0.5,
-        background: "black"
-      },
-
       open:function() {
         /* set defaults if editing */
         cj("#rel_contact").val("");
@@ -610,13 +604,7 @@ function addRole() {
   cj("#addRoleDialog").dialog({
     title: "Add Role",
     modal: true,
-    bgiframe: true,
     close: function(event, ui) { cj("#role_contact").unautocomplete( ); },
-    overlay: {
-      opacity: 0.5,
-      background: "black"
-    },
-
     open:function() {
       /* set defaults if editing */
       cj("#role_contact").val( "" );

diff --git a/templates/CRM/Contact/Import/Form/Preview.tpl b/templates/CRM/Contact/Import/Form/Preview.tpl
index e58c7c9fa7fafd9a1758a242ccd5c5d724d1e2a7..67ce8b429632e0088390f4dda13a0a83dc80f9d7 100644 (file)
--- a/templates/CRM/Contact/Import/Form/Preview.tpl
+++ b/templates/CRM/Contact/Import/Form/Preview.tpl
@@ -56,10 +56,8 @@ function verify( ) {
     width         : 350,
     height        : 160,
     resizable     : false,
-    bgiframe      : true,
     draggable     : true,
     closeOnEscape : false,
-    overlay       : { opacity: 0.5, background: "black" },
     open          : function ( ) {
         cj("#id-processing").dialog().parents(".ui-dialog").find(".ui-dialog-titlebar").remove();
     }

diff --git a/templates/CRM/Contact/Page/Inline/Email.tpl b/templates/CRM/Contact/Page/Inline/Email.tpl
index c18f2f46a8817d0cbf65af49c0003c5baca6a3ea..67c109d9ec7c08e445f79fb23b1fb5f2044afd54 100644 (file)
--- a/templates/CRM/Contact/Page/Inline/Email.tpl
+++ b/templates/CRM/Contact/Page/Inline/Email.tpl
@@ -73,21 +73,12 @@ function showHideSignature( blockId ) {
   cj("#Email_Block_" + blockId + "_signature").dialog({
       title: "Signature",
       modal: true,
-      bgiframe: true,
       width: 900,
       height: 500,
-      overlay: { 
-          opacity: 0.5, 
-          background: "black"
-      },
-
       beforeclose: function(event, ui) {
         cj(this).dialog("destroy");
       },
-      open:function() {
-      },
-
-      buttons: { 
+      buttons: {
         "Done": function() { 
                   cj(this).dialog("destroy"); 
                 } 

diff --git a/templates/CRM/Core/I18n/Dialog.tpl b/templates/CRM/Core/I18n/Dialog.tpl
index 0f70cd9a435b674fd385f414e77f89f6d48d8d7b..291002f66ceba9370f377e03f946e06770ec765e 100644 (file)
--- a/templates/CRM/Core/I18n/Dialog.tpl
+++ b/templates/CRM/Core/I18n/Dialog.tpl
@@ -37,8 +37,6 @@ function loadDialog( url, fieldName ) {
       width       : 290,
       height      : 290,
       resizable   : true,
-      bgiframe    : true,
-      overlay     : { opacity: 0.5, background: "black" },
       beforeclose : function(event, ui) {
                      cj(this).dialog("destroy");
                        }

diff --git a/templates/CRM/Financial/Form/Search.tpl b/templates/CRM/Financial/Form/Search.tpl
index 72028b6987ee66454c04840d7e5b90f805e69150..3975986860ad4be2897c2c1f888a0d7a40fff8a8 100644 (file)
--- a/templates/CRM/Financial/Form/Search.tpl
+++ b/templates/CRM/Financial/Form/Search.tpl
@@ -164,12 +164,6 @@ cj(function($) {
       $("#enableDisableStatusMsg").dialog({
         title: {/literal}'{ts escape="js"}Confirm Changes{/ts}'{literal},
         modal: true,
-        bgiframe: true,
-        position: "center",
-        overlay: {
-          opacity: 0.5,
-          background: "black"
-        },
         open:function() {
           switch (op) {{/literal}
             case 'reopen':

diff --git a/templates/CRM/Financial/Page/BatchTransaction.tpl b/templates/CRM/Financial/Page/BatchTransaction.tpl
index 091d29fa90e9b6f773658f77d6d50a85f10b288d..20aef58a11675212f6061a9c0e75ad3eb99ce22e 100644 (file)
--- a/templates/CRM/Financial/Page/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Page/BatchTransaction.tpl
@@ -101,11 +101,6 @@ function assignRemove(recordID, op) {
     cj("#enableDisableStatusMsg").dialog({
       title: {/literal}'{ts escape="js"}Close Batch{/ts}'{literal},
       modal: true,
-      bgiframe: true,
-      overlay: {
-        opacity: 0.5,
-        background: "black"
-      },
       open:function() {
         if (op == 'close') {
           var msg = {/literal}'{ts escape="js"}Are you sure you want to close this batch?{/ts}'{literal};

diff --git a/templates/CRM/Report/Form/Case/Detail.tpl b/templates/CRM/Report/Form/Case/Detail.tpl
index dcf9bf3ecc966278abb5d7563db2dcdc1299f859..7db6b69fc984c8704332824b719a5296c6ce85f5 100644 (file)
--- a/templates/CRM/Report/Form/Case/Detail.tpl
+++ b/templates/CRM/Report/Form/Case/Detail.tpl
@@ -293,13 +293,8 @@ function viewCase( caseId ,contactId ) {
    cj("#casedetails").dialog({
         title: "Case Details",
         modal: true,
-        bgiframe: true,
         width : 700,
   height: 400,
-        overlay: {
-                   opacity: 0.5,
-                 background: "black"
-               },
         open:function() {
        var dataUrl = {/literal}"{crmURL p='civicrm/case/ajax/details' h=0 q="snippet=4" }"{literal};
       dataUrl     = dataUrl + '&caseId=' +caseId + '&contactId=' +contactId ;

diff --git a/templates/CRM/common/dedupe.tpl b/templates/CRM/common/dedupe.tpl
index 93b10d11e9088dfc6a4fefa8d5e2d850e0cdeaef..1b9b2a45d012bc26638d0703cb3d1d671bbaa331 100644 (file)
--- a/templates/CRM/common/dedupe.tpl
+++ b/templates/CRM/common/dedupe.tpl
@@ -22,11 +22,6 @@ function processDupes( cid, oid, oper, context, reloadURL ) {
   cj("#processDupes").dialog({
     title: title,
     modal: true,
-    bgiframe: true,
-    overlay: {
-      opacity: 0.5,
-      background: "black"
-    },
 
     open:function() {
        cj( '#processDupes' ).show( ).html( msg );