Merge pull request #3614 from eileenmcnaughton/CRM-14951

[civicrm-core.git] / CRM / Contact / Page / DashBoard.php

diff --git a/CRM/Contact/Page/DashBoard.php b/CRM/Contact/Page/DashBoard.php
index 2d51109b34ac348d3a72457aa2e8e11c2e98de71..6ef7b94e4be383599603fb95e31df174eb2fbbc5 100644 (file)
--- a/CRM/Contact/Page/DashBoard.php
+++ b/CRM/Contact/Page/DashBoard.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -48,19 +48,11 @@ class CRM_Contact_Page_DashBoard extends CRM_Core_Page {
   function run() {
     // Add dashboard js and css
     $resources = CRM_Core_Resources::singleton();
-    $resources->addScriptFile('civicrm', 'packages/jquery/plugins/jquery.dashboard.js', 0, 'html-header', FALSE);
-    $resources->addStyleFile('civicrm', 'packages/jquery/css/dashboard.css');
+    $resources->addScriptFile('civicrm', 'js/jquery/jquery.dashboard.js', 0, 'html-header', FALSE);
+    $resources->addStyleFile('civicrm', 'css/dashboard.css');
 
     $config = CRM_Core_Config::singleton();
 
-    // Add dashlet-specific js files
-    // TODO: Need a much better way of managing on-the-fly js requirements. Require.js perhaps?
-    // Checking if a specific dashlet is enabled is a pain and including the js here sucks anyway
-    // So here's a compromise:
-    if (in_array('CiviCase', $config->enableComponents)) {
-      $resources->addScriptFile('civicrm', 'templates/CRM/Case/Form/ActivityChangeStatus.js');
-    }
-
     $resetCache = CRM_Utils_Request::retrieve('resetCache', 'Positive', CRM_Core_DAO::$_nullObject);
 
     CRM_Utils_System::setTitle(ts('CiviCRM Home'));