? 4331334-add-ctools.patch Index: dashboard.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/dashboard/dashboard.admin.inc,v retrieving revision 1.3 diff -u -p -r1.3 dashboard.admin.inc --- dashboard.admin.inc 13 Apr 2009 18:17:59 -0000 1.3 +++ dashboard.admin.inc 13 Apr 2009 18:22:54 -0000 @@ -2,8 +2,8 @@ function dashboard_settings_form(&$form_state, $dashboard = 'default') { $form = array(); - - // Remove if not used. + dashboard_add_tools(); + return system_settings_form($form); } Index: dashboard.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/dashboard/dashboard.module,v retrieving revision 1.21 diff -u -p -r1.21 dashboard.module --- dashboard.module 13 Apr 2009 18:17:59 -0000 1.21 +++ dashboard.module 13 Apr 2009 18:22:55 -0000 @@ -109,13 +109,6 @@ function dashboard_dashboard() { ); } -function dashboard_init() { - if (user_access('access user dashboard')) { - drupal_add_css(drupal_get_path('module', 'dashboard') . '/dashboard.css'); - drupal_add_js(drupal_get_path('module', 'dashboard') . '/dashboard.js'); - } -} - function dashboard_perm() { $perms = array('administer dashboard defaults'); $dashboards = module_invoke_all('dashboard'); @@ -288,3 +281,20 @@ function dashboard_example_dashboard_gad 'content' => 'Hello world', ); } + +/** + * Wrapper function to load Ctools and other dependencie. + */ +function dashboard_add_tools() { + drupal_add_css(drupal_get_path('module', 'dashboard') . '/dashboard.css'); + drupal_add_js(drupal_get_path('module', 'dashboard') . '/dashboard.js'); + dashboard_load_ctools(); +} + +/** + * Load the necessary CTools packages. + */ +function dashboard_load_ctools() { + ctools_include('content'); + ctools_get_content_types(); +} Index: dashboard.page.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/dashboard/dashboard.page.inc,v retrieving revision 1.3 diff -u -p -r1.3 dashboard.page.inc --- dashboard.page.inc 12 Apr 2009 05:47:11 -0000 1.3 +++ dashboard.page.inc 13 Apr 2009 18:22:55 -0000 @@ -4,6 +4,7 @@ * Add the CSS and JS requirements for the page. */ function dashboard_add_ui($page = NULL) { + dashboard_add_tools(); jquery_ui_add(array('ui.sortable')); drupal_add_js(array( 'dashboardPage' => $page->path,