From 201ddbaf71455ead605a1d3e0c32c0012839ff85 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 28 Mar 2013 09:36:18 -0700
Subject: [PATCH] Fix dashboard popups CRM-12239

---
 css/civicrm.css                    | 50 +++++++++++++++---------------
 templates/CRM/common/dashboard.tpl | 11 +++----
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 0b8a869e49..907485d329 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2649,7 +2649,7 @@ div.grippie {
 
 /* accordion styles */
 
-#crm-container .crm-accordion-header {
+.crm-container .crm-accordion-header {
   background-image: url("../i/TreeMinusWhite.gif");
   background-repeat: no-repeat;
   background-position: 2px center;
@@ -2660,63 +2660,63 @@ div.grippie {
   background-color: #5D677B;
 }
 
-#crm-container .crm-accordion-header:hover {
+.crm-container .crm-accordion-header:hover {
   background-color: #32414f;
 }
 
-#crm-container .collapsed .crm-accordion-header {
+.crm-container .collapsed .crm-accordion-header {
   background-image: url("../i/TreePlusWhite.gif");
 }
 
-#crm-container .collapsed .crm-accordion-body,
-#crm-container .crm-collapsible.collapsed .collapsible-title + * {
+.crm-container .collapsed .crm-accordion-body,
+.crm-container .crm-collapsible.collapsed .collapsible-title + * {
   display: none;
 }
 
-#crm-container .crm-accordion-inner .crm-accordion-header,
-#crm-container .crm-accordion-wrapper .crm-master-accordion-header,
-#crm-container .crm-collapsible .collapsible-title {
+.crm-container .crm-accordion-inner .crm-accordion-header,
+.crm-container .crm-accordion-wrapper .crm-master-accordion-header,
+.crm-container .crm-collapsible .collapsible-title {
   background-image: url("../i/TreeMinus.gif");
   background-color: transparent;
   color: #3E3E3E;
 }
 
-#crm-container .crm-accordion-inner.collapsed .crm-accordion-header,
-#crm-container .crm-accordion-wrapper.collapsed .crm-master-accordion-header,
-#crm-container .crm-collapsible.collapsed .collapsible-title {
+.crm-container .crm-accordion-inner.collapsed .crm-accordion-header,
+.crm-container .crm-accordion-wrapper.collapsed .crm-master-accordion-header,
+.crm-container .crm-collapsible.collapsed .collapsible-title {
   background-image: url("../i/TreePlus.gif");
 }
 
-#crm-container .crm-accordion-wrapper .crm-master-accordion-header {
+.crm-container .crm-accordion-wrapper .crm-master-accordion-header {
   background-color: transparent;
   font-size: 16px;
   color: #3e3e3e;
   margin-bottom: 0px;
 }
 
-#crm-container .crm-accordion-inner .crm-accordion-header {
+.crm-container .crm-accordion-inner .crm-accordion-header {
   font-size: 12px;
 }
 
-#crm-container .crm-accordion-wrapper {
+.crm-container .crm-accordion-wrapper {
   margin-bottom: 4px;
 }
 
-#crm-container .crm-accordion-header {
+.crm-container .crm-accordion-header {
   -moz-border-radius: 4px 4px 0px 0px;
   -webkit-border-radius: 4px 4px 0px 0px;
   -khtml-border-radius: 4px 4px 0px 0px;
   border-radius: 4px 4px 0px 0px;
 }
 
-#crm-container .collapsed .crm-accordion-header {
+.crm-container .collapsed .crm-accordion-header {
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   -khtml-border-radius: 4px;
   border-radius: 4px;
 }
 
-#crm-container .crm-accordion-body {
+.crm-container .crm-accordion-body {
   -moz-border-radius: 0px 0px 4px 4px;
   -webkit-border-radius: 0px 0px 4px 4px;
   -khtml-border-radius: 0px 0px 4px 4px;
@@ -2726,7 +2726,7 @@ div.grippie {
   padding: 4px 0px;
 }
 
-#crm-container .crm-collapsible .collapsible-title {
+.crm-container .crm-collapsible .collapsible-title {
   padding-left: 19px;
   text-decoration: none;
   background-repeat: no-repeat;
@@ -2734,33 +2734,33 @@ div.grippie {
   cursor: pointer;
 }
 
-#crm-container .crm-master-accordion-header+.crm-accordion-body {
+.crm-container .crm-master-accordion-header+.crm-accordion-body {
   border: none;
   padding: 0px;
 }
 
-#crm-container .crm-accordion-header.active {
+.crm-container .crm-accordion-header.active {
   font-weight: bold;
   background-color: #41477E;
 }
 
-#crm-container .crm-accordion-header.active:hover {
+.crm-container .crm-accordion-header.active:hover {
   background-color: #2E3471;
 }
 
-#crm-container .crm-accordion-header a.close-accordion {
+.crm-container .crm-accordion-header a.close-accordion {
   font-weight: normal !important;
   float: right;
   color: #FFF !important;
   text-decoration: none;
 }
 
-#crm-container .crm-accordion-header a.close-accordion:hover {
+.crm-container .crm-accordion-header a.close-accordion:hover {
   text-decoration: underline !important;
 }
 
-#crm-container .crm-master-accordion-header.crm-accordion-header:hover,
-#crm-container .crm-collapsible .collapsible-title:hover {
+.crm-container .crm-master-accordion-header.crm-accordion-header:hover,
+.crm-container .crm-collapsible .collapsible-title:hover {
   background-color: transparent;
   color: #0200A0;
 }
diff --git a/templates/CRM/common/dashboard.tpl b/templates/CRM/common/dashboard.tpl
index 16e1bfa1c2..6549502590 100644
--- a/templates/CRM/common/dashboard.tpl
+++ b/templates/CRM/common/dashboard.tpl
@@ -26,8 +26,7 @@
 {literal}
 <script type="text/javascript">
     
-// Create closure, so that we don't accidentally spoil the global/window namespace.
-cj(function() {
+cj(function($) {
   // The set of options we can use to initialize jQuery.dashboard().
   var options = {
     // Optional. Defaults to 3.  You'll need to change the width of columns in CSS too.
@@ -204,12 +203,10 @@ cj(function() {
     }
   };
 
-  // Initialize the dashboard using these options, and save to the global/window
-  // namesapace so that server-side executable js file callbacks can access
-  // window.dashboardDemo.widgets by ID.
-  window.dashboardDemo = cj('#civicrm-dashboard').dashboard(options);
+  // Initialize the dashboard using these options
+  $('#civicrm-dashboard').dashboard(options);
 
-}); // End closure.
+});
 
 </script>
 {/literal}
-- 
2.25.1