? 651306.panels-node.edit-any-perm.patch ? 683162-convert-plugins.patch ? css-cache-clear.patch ? node_content_fix_render.patch ? panels-612116.patch ? panels-618624-3.patch ? panels.module_4.patch ? panels_pane_esi_cache.patch ? plugins/styles/corners/corners.png ? plugins/styles/corners/new-rounded-corners.zip Index: CHANGELOG.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/Attic/CHANGELOG.txt,v retrieving revision 1.1.6.83 diff -u -p -r1.1.6.83 CHANGELOG.txt --- CHANGELOG.txt 13 Jan 2010 00:51:47 -0000 1.1.6.83 +++ CHANGELOG.txt 13 Jan 2010 06:24:58 -0000 @@ -9,6 +9,7 @@ Panels 6.x-3.x-dev #618624 by johnskulski: Better classes for panel panes. #651306 by joachim: Add "edit any panel node" permission. Not sure why this was never there. #497042: Add update.php to remove unused panels_page_router_store table, if it exists. +#683162: Convert all plugins to use new $plugin = array() format. This is less brittle than the specially named hook. Panels 6.x-3.2 ============== Index: plugins/cache/simple.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/cache/Attic/simple.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 simple.inc --- plugins/cache/simple.inc 30 Apr 2009 17:37:27 -0000 1.1.2.1 +++ plugins/cache/simple.inc 13 Jan 2010 06:24:59 -0000 @@ -6,24 +6,20 @@ * Provides a simple time-based caching option for panel panes. */ -/** - * Specially named implementation of hook_panels_cache() - */ -function panels_simple_panels_cache() { - return array( - 'title' => t("Simple cache"), - 'description' => t('Simple caching is a time-based cache. This is a hard limit, and once cached it will remain that way until the time limit expires.'), - 'cache get' => 'panels_simple_cache_get_cache', - 'cache set' => 'panels_simple_cache_set_cache', - 'cache clear' => 'panels_simple_cache_clear_cache', - 'settings form' => 'panels_simple_cache_settings_form', - 'settings form submit' => 'panels_simple_cache_settings_form_submit', - 'defaults' => array( - 'lifetime' => 15, - 'granularity' => 'none', - ), - ); -} +// Plugin definition +$plugin = array( + 'title' => t("Simple cache"), + 'description' => t('Simple caching is a time-based cache. This is a hard limit, and once cached it will remain that way until the time limit expires.'), + 'cache get' => 'panels_simple_cache_get_cache', + 'cache set' => 'panels_simple_cache_set_cache', + 'cache clear' => 'panels_simple_cache_clear_cache', + 'settings form' => 'panels_simple_cache_settings_form', + 'settings form submit' => 'panels_simple_cache_settings_form_submit', + 'defaults' => array( + 'lifetime' => 15, + 'granularity' => 'none', + ), +); /** * Get cached content. Index: plugins/layouts/flexible/flexible.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/layouts/flexible/Attic/flexible.inc,v retrieving revision 1.1.2.17 diff -u -p -r1.1.2.17 flexible.inc --- plugins/layouts/flexible/flexible.inc 2 Oct 2009 17:35:48 -0000 1.1.2.17 +++ plugins/layouts/flexible/flexible.inc 13 Jan 2010 06:25:00 -0000 @@ -4,23 +4,20 @@ /** * Implementation of hook_panels_layouts() */ -function panels_flexible_panels_layouts() { - $items['flexible'] = array( - 'title' => t('Flexible'), - 'icon' => 'flexible.png', - 'theme' => 'panels_flexible', - 'admin theme' => 'panels_flexible_admin', - 'css' => 'flexible.css', - 'admin css' => 'flexible-admin.css', - 'settings form' => 'panels_flexible_settings_form', - 'settings submit' => 'panels_flexible_settings_submit', - 'settings validate' => 'panels_flexible_settings_validate', - 'panels function' => 'panels_flexible_panels', - 'hook menu' => 'panels_flexible_menu', - ); - - return $items; -} +// Plugin definition +$plugin = array( + 'title' => t('Flexible'), + 'icon' => 'flexible.png', + 'theme' => 'panels_flexible', + 'admin theme' => 'panels_flexible_admin', + 'css' => 'flexible.css', + 'admin css' => 'flexible-admin.css', + 'settings form' => 'panels_flexible_settings_form', + 'settings submit' => 'panels_flexible_settings_submit', + 'settings validate' => 'panels_flexible_settings_validate', + 'panels function' => 'panels_flexible_panels', + 'hook menu' => 'panels_flexible_menu', +); /** * Delegated implementation of hook_menu(). Index: plugins/layouts/onecol/onecol.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/layouts/onecol/Attic/onecol.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 onecol.inc --- plugins/layouts/onecol/onecol.inc 16 Dec 2008 21:27:58 -0000 1.1.2.1 +++ plugins/layouts/onecol/onecol.inc 13 Jan 2010 06:25:00 -0000 @@ -4,14 +4,11 @@ /** * implementation of hook_panels_layouts() */ -function panels_onecol_panels_layouts() { - $items['onecol'] = array( - 'title' => t('Single column'), - 'icon' => 'onecol.png', - 'theme' => 'panels_onecol', - 'css' => 'onecol.css', - 'panels' => array('middle' => t('Middle column')), - ); - - return $items; -} +// Plugin definition +$plugin = array( + 'title' => t('Single column'), + 'icon' => 'onecol.png', + 'theme' => 'panels_onecol', + 'css' => 'onecol.css', + 'panels' => array('middle' => t('Middle column')), +); Index: plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/layouts/threecol_25_50_25/Attic/threecol_25_50_25.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 threecol_25_50_25.inc --- plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc 29 Apr 2009 03:19:13 -0000 1.1.2.2 +++ plugins/layouts/threecol_25_50_25/threecol_25_50_25.inc 13 Jan 2010 06:25:00 -0000 @@ -4,20 +4,17 @@ /** * implementation of hook_panels_layouts */ -function panels_threecol_25_50_25_panels_layouts() { - $items['threecol_25_50_25'] = array( - 'title' => t('Three column 25/50/25'), - 'icon' => 'threecol_25_50_25.png', - 'theme' => 'panels_threecol_25_50_25', - 'theme arguments' => array('id', 'content'), - 'css' => 'threecol_25_50_25.css', - 'panels' => array( - 'left' => t('Left side'), - 'middle' => t('Middle column'), - 'right' => t('Right side') - ), - ); - - return $items; -} +// Plugin definition +$plugin = array( + 'title' => t('Three column 25/50/25'), + 'icon' => 'threecol_25_50_25.png', + 'theme' => 'panels_threecol_25_50_25', + 'theme arguments' => array('id', 'content'), + 'css' => 'threecol_25_50_25.css', + 'panels' => array( + 'left' => t('Left side'), + 'middle' => t('Middle column'), + 'right' => t('Right side') + ), +); Index: plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/layouts/threecol_25_50_25_stacked/Attic/threecol_25_50_25_stacked.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 threecol_25_50_25_stacked.inc --- plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc 16 Dec 2008 21:27:58 -0000 1.1.2.1 +++ plugins/layouts/threecol_25_50_25_stacked/threecol_25_50_25_stacked.inc 13 Jan 2010 06:25:00 -0000 @@ -1,23 +1,17 @@ t('Three column 25/50/25 stacked'), - 'icon' => 'threecol_25_50_25_stacked.png', - 'theme' => 'panels_threecol_25_50_25_stacked', - 'css' => 'threecol_25_50_25_stacked.css', - 'panels' => array( - 'top' => t('Top'), - 'left' => t('Left side'), - 'middle' => t('Middle column'), - 'right' => t('Right side'), - 'bottom' => t('Bottom'), - ), - ); - - return $items; -} +// Plugin definition +$plugin = array( + 'title' => t('Three column 25/50/25 stacked'), + 'icon' => 'threecol_25_50_25_stacked.png', + 'theme' => 'panels_threecol_25_50_25_stacked', + 'css' => 'threecol_25_50_25_stacked.css', + 'panels' => array( + 'top' => t('Top'), + 'left' => t('Left side'), + 'middle' => t('Middle column'), + 'right' => t('Right side'), + 'bottom' => t('Bottom'), + ), +); Index: plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/layouts/threecol_33_34_33/Attic/threecol_33_34_33.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 threecol_33_34_33.inc --- plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc 16 Dec 2008 21:27:58 -0000 1.1.2.1 +++ plugins/layouts/threecol_33_34_33/threecol_33_34_33.inc 13 Jan 2010 06:25:00 -0000 @@ -1,21 +1,15 @@ t('Three column 33/34/33'), - 'icon' => 'threecol_33_34_33.png', - 'theme' => 'panels_threecol_33_34_33', - 'css' => 'threecol_33_34_33.css', - 'panels' => array( - 'left' => t('Left side'), - 'middle' => t('Middle column'), - 'right' => t('Right side') - ), - ); - - return $items; -} +// Plugin definition +$plugin = array( + 'title' => t('Three column 33/34/33'), + 'icon' => 'threecol_33_34_33.png', + 'theme' => 'panels_threecol_33_34_33', + 'css' => 'threecol_33_34_33.css', + 'panels' => array( + 'left' => t('Left side'), + 'middle' => t('Middle column'), + 'right' => t('Right side') + ), +); Index: plugins/layouts/twocol/twocol.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/layouts/twocol/Attic/twocol.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 twocol.inc --- plugins/layouts/twocol/twocol.inc 16 Dec 2008 21:27:58 -0000 1.1.2.1 +++ plugins/layouts/twocol/twocol.inc 13 Jan 2010 06:25:00 -0000 @@ -1,20 +1,14 @@ t('Two column'), - 'icon' => 'twocol.png', - 'theme' => 'panels_twocol', - 'css' => 'twocol.css', - 'panels' => array( - 'left' => t('Left side'), - 'right' => t('Right side') - ), - ); - - return $items; -} \ No newline at end of file +// Plugin definition +$plugin = array( + 'title' => t('Two column'), + 'icon' => 'twocol.png', + 'theme' => 'panels_twocol', + 'css' => 'twocol.css', + 'panels' => array( + 'left' => t('Left side'), + 'right' => t('Right side') + ), +); Index: plugins/layouts/twocol_bricks/twocol_bricks.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/layouts/twocol_bricks/Attic/twocol_bricks.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 twocol_bricks.inc --- plugins/layouts/twocol_bricks/twocol_bricks.inc 16 Dec 2008 21:27:59 -0000 1.1.2.1 +++ plugins/layouts/twocol_bricks/twocol_bricks.inc 13 Jan 2010 06:25:00 -0000 @@ -2,30 +2,24 @@ // $Id: twocol_bricks.inc,v 1.1.2.1 2008/12/16 21:27:59 merlinofchaos Exp $ /** - * @file twocol_bricks.inc - * + * @file * Implementation for the two column bricked layout */ -/** - * Implementation of hook_panels_layouts(). - */ -function panels_twocol_bricks_panels_layouts() { - $items['twocol_bricks'] = array( - 'title' => t('Two column bricks'), - 'icon' => 'twocol_bricks.png', - 'theme' => 'panels_twocol_bricks', - 'css' => 'twocol_bricks.css', - 'panels' => array( - 'top' => t('Top'), - 'left_above' => t('Left above'), - 'right_above' => t('Right above'), - 'middle' => t('Middle'), - 'left_below' => t('Left below'), - 'right_below' => t('Right below'), - 'bottom' => t('Bottom'), - ), - ); - return $items; -} +// Plugin definition +$plugin = array( + 'title' => t('Two column bricks'), + 'icon' => 'twocol_bricks.png', + 'theme' => 'panels_twocol_bricks', + 'css' => 'twocol_bricks.css', + 'panels' => array( + 'top' => t('Top'), + 'left_above' => t('Left above'), + 'right_above' => t('Right above'), + 'middle' => t('Middle'), + 'left_below' => t('Left below'), + 'right_below' => t('Right below'), + 'bottom' => t('Bottom'), + ), +); Index: plugins/layouts/twocol_stacked/twocol_stacked.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/layouts/twocol_stacked/Attic/twocol_stacked.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 twocol_stacked.inc --- plugins/layouts/twocol_stacked/twocol_stacked.inc 16 Dec 2008 21:27:59 -0000 1.1.2.1 +++ plugins/layouts/twocol_stacked/twocol_stacked.inc 13 Jan 2010 06:25:00 -0000 @@ -1,22 +1,16 @@ t('Two column stacked'), - 'icon' => 'twocol_stacked.png', - 'theme' => 'panels_twocol_stacked', - 'css' => 'twocol_stacked.css', - 'panels' => array( - 'top' => t('Top'), - 'left' => t('Left side'), - 'right' => t('Right side'), - 'bottom' => t('Bottom') - ), - ); - - return $items; -} +// Plugin definition +$plugin = array( + 'title' => t('Two column stacked'), + 'icon' => 'twocol_stacked.png', + 'theme' => 'panels_twocol_stacked', + 'css' => 'twocol_stacked.css', + 'panels' => array( + 'top' => t('Top'), + 'left' => t('Left side'), + 'right' => t('Right side'), + 'bottom' => t('Bottom') + ), +); Index: plugins/styles/block.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/styles/Attic/block.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 block.inc --- plugins/styles/block.inc 14 Jul 2009 18:41:04 -0000 1.1.2.5 +++ plugins/styles/block.inc 13 Jan 2010 06:25:00 -0000 @@ -3,25 +3,15 @@ /** * @file - * Definition of the 'naked' panel style. + * Definition of the 'block' panel style. */ -// --------------------------------------------------------------------------- -// Panels hooks. - -/** - * Implementation of hook_panels_style_info(). - */ -function panels_block_panels_styles() { - return array( - 'title' => t('System block'), - 'description' => t('Display the pane as a system block; this is more restrictive than the default.'), - 'render pane' => 'panels_block_style_render_pane', - ); -} - -// --------------------------------------------------------------------------- -// Panels style plugin callbacks. +// Plugin definition +$plugin = array( + 'title' => t('System block'), + 'description' => t('Display the pane as a system block; this is more restrictive than the default.'), + 'render pane' => 'panels_block_style_render_pane', +); /** * Render callback. Index: plugins/styles/default.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/styles/Attic/default.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 default.inc --- plugins/styles/default.inc 24 Mar 2009 18:32:20 -0000 1.1.2.2 +++ plugins/styles/default.inc 13 Jan 2010 06:25:00 -0000 @@ -2,28 +2,16 @@ // $Id: default.inc,v 1.1.2.2 2009/03/24 18:32:20 merlinofchaos Exp $ /** - * @file styles/block.inc + * @file * Definition of the 'default' panel style. */ -// --------------------------------------------------------------------------- -// Panels hooks. - -/** - * Implementation of hook_panels_style_info(). - */ -function panels_default_panels_styles() { - return array( - 'default' => array( - 'title' => t('No style'), - 'description' => t('The default panel rendering style; displays each pane with a separator.'), - 'render panel' => 'panels_default_style_render_panel', - ), - ); -} - -// --------------------------------------------------------------------------- -// Panels style plugin callbacks. +// Plugin definition +$plugin = array( + 'title' => t('No style'), + 'description' => t('The default panel rendering style; displays each pane with a separator.'), + 'render panel' => 'panels_default_style_render_panel', +); /** * Render callback. Index: plugins/styles/list.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/styles/Attic/list.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 list.inc --- plugins/styles/list.inc 16 Dec 2008 21:27:59 -0000 1.1.2.1 +++ plugins/styles/list.inc 13 Jan 2010 06:25:00 -0000 @@ -3,32 +3,18 @@ /** - * @file styles/list.inc + * @file * Definition of the 'list' panel style. */ - -// --------------------------------------------------------------------------- -// Panels hooks. - -/** - * Implementation of hook_panels_style_info(). - */ -function panels_list_panels_styles() { - return array( - 'list' => array( - 'title' => t('List'), - 'description' => t('Presents the panes in the form of an HTML list.'), - 'render panel' => 'panels_list_style_render_panel', - 'settings form' => 'panels_list_style_settings_form', - 'settings validate' => 'panels_list_style_settings_validate', - ), - ); -} - - -// --------------------------------------------------------------------------- -// Panels style plugin callbacks. +// Plugin definition +$plugin = array( + 'title' => t('List'), + 'description' => t('Presents the panes in the form of an HTML list.'), + 'render panel' => 'panels_list_style_render_panel', + 'settings form' => 'panels_list_style_settings_form', + 'settings validate' => 'panels_list_style_settings_validate', +); /** * Render callback. Index: plugins/styles/naked.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/styles/Attic/naked.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 naked.inc --- plugins/styles/naked.inc 15 Jul 2009 22:12:19 -0000 1.1.2.1 +++ plugins/styles/naked.inc 13 Jan 2010 06:25:00 -0000 @@ -2,26 +2,16 @@ // $Id: naked.inc,v 1.1.2.1 2009/07/15 22:12:19 merlinofchaos Exp $ /** - * @file + * @file * Definition of the 'naked' panel style. */ -// --------------------------------------------------------------------------- -// Panels hooks. - -/** - * Implementation of hook_panels_style_info(). - */ -function panels_naked_panels_styles() { - return array( - 'title' => t('No markup at all'), - 'description' => t('Display the pane with no markup, not even a title.'), - 'render pane' => 'panels_naked_style_render_pane', - ); -} - -// --------------------------------------------------------------------------- -// Panels style plugin callbacks. +// Plugin definition +$plugin = array( + 'title' => t('No markup at all'), + 'description' => t('Display the pane with no markup, not even a title.'), + 'render pane' => 'panels_naked_style_render_pane', +); /** * Render callback. Index: plugins/styles/corners/rounded_corners.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/styles/corners/Attic/rounded_corners.inc,v retrieving revision 1.1.2.9 diff -u -p -r1.1.2.9 rounded_corners.inc --- plugins/styles/corners/rounded_corners.inc 28 Oct 2009 00:44:23 -0000 1.1.2.9 +++ plugins/styles/corners/rounded_corners.inc 13 Jan 2010 06:25:00 -0000 @@ -2,37 +2,25 @@ // $Id: rounded_corners.inc,v 1.1.2.9 2009/10/28 00:44:23 merlinofchaos Exp $ /** - * @file styles/rounded_corners.inc + * @file * Definition of the 'rounded_corners' panel style. */ -// --------------------------------------------------------------------------- -// Panels hooks. - -/** - * Implementation of hook_panels_style_info(). - */ -function panels_rounded_corners_panels_styles() { - return array( - 'rounded_corners' => array( - 'title' => t('Rounded corners'), - 'description' => t('Presents the panes or panels with a rounded corner box around them'), - 'render panel' => 'panels_rounded_corners_style_render_panel', - 'render pane' => 'panels_rounded_corners_style_render_pane', - 'settings form' => 'panels_rounded_corners_style_settings_form', - 'hook theme' => array( - 'panels_rounded_corners_box' => array( - 'arguments' => array('content' => NULL), - 'path' => panels_get_path('plugins/styles/corners'), - 'template' => 'panels-rounded-corners-box', - ), - ), +// Plugin definition +$plugin = array( + 'title' => t('Rounded corners'), + 'description' => t('Presents the panes or panels with a rounded corner box around them'), + 'render panel' => 'panels_rounded_corners_style_render_panel', + 'render pane' => 'panels_rounded_corners_style_render_pane', + 'settings form' => 'panels_rounded_corners_style_settings_form', + 'hook theme' => array( + 'panels_rounded_corners_box' => array( + 'arguments' => array('content' => NULL), + 'path' => panels_get_path('plugins/styles/corners'), + 'template' => 'panels-rounded-corners-box', ), - ); -} - -// --------------------------------------------------------------------------- -// Panels style plugin callbacks. + ), +); /** * Render callback. Index: plugins/task_handlers/panel_context.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/plugins/task_handlers/Attic/panel_context.inc,v retrieving revision 1.1.2.40 diff -u -p -r1.1.2.40 panel_context.inc --- plugins/task_handlers/panel_context.inc 7 Oct 2009 22:20:29 -0000 1.1.2.40 +++ plugins/task_handlers/panel_context.inc 13 Jan 2010 06:25:01 -0000 @@ -9,190 +9,186 @@ * basic page tasks provided by page_manager.module do by default. */ -/** - * Specialized implementation of hook_page_manager_task_task_handlers(). - */ -function panels_panel_context_page_manager_task_handlers() { - return array( - // is a 'context' handler type, meaning it supports the API of the - // context handlers provided by ctools context plugins. - 'handler type' => 'context', - 'visible' => TRUE, // may be added up front. - - // Administrative fields. - 'title' => t('Panel'), - 'admin summary' =>'panels_panel_context_admin_summary', - 'admin title' => 'panels_panel_context_title', - 'admin css' => array( - panels_get_path('css/panels_admin.css'), - ), - 'admin js' => array( - panels_get_path('js/layout.js'), - ), - 'operations' => array( - 'settings' => array( - 'title' => t('General'), - 'description' => t('Change general settings about this variant.'), - 'form' => 'panels_panel_context_edit_settings', - ), - 'criteria' => array( - 'title' => t('Selection rules'), - 'description' => t('Control the criteria used to decide whether or not this variant is used.'), - 'form' => array( - 'order' => array( - 'form' => t('Selection rules'), - ), - 'forms' => array( - 'form' => array( - 'include' => drupal_get_path('module', 'ctools') . '/includes/context-task-handler.inc', - 'form id' => 'ctools_context_handler_edit_criteria', - ), +// Plugin definition +$plugin = array( + // is a 'context' handler type, meaning it supports the API of the + // context handlers provided by ctools context plugins. + 'handler type' => 'context', + 'visible' => TRUE, // may be added up front. + + // Administrative fields. + 'title' => t('Panel'), + 'admin summary' =>'panels_panel_context_admin_summary', + 'admin title' => 'panels_panel_context_title', + 'admin css' => array( + panels_get_path('css/panels_admin.css'), + ), + 'admin js' => array( + panels_get_path('js/layout.js'), + ), + 'operations' => array( + 'settings' => array( + 'title' => t('General'), + 'description' => t('Change general settings about this variant.'), + 'form' => 'panels_panel_context_edit_settings', + ), + 'criteria' => array( + 'title' => t('Selection rules'), + 'description' => t('Control the criteria used to decide whether or not this variant is used.'), + 'form' => array( + 'order' => array( + 'form' => t('Selection rules'), + ), + 'forms' => array( + 'form' => array( + 'include' => drupal_get_path('module', 'ctools') . '/includes/context-task-handler.inc', + 'form id' => 'ctools_context_handler_edit_criteria', ), ), ), - 'context' => array( - 'title' => t('Contexts'), - 'description' => t('Add additional context objects to this variant that can be used by the content.'), - 'form' => array( - 'order' => array( - 'form' => t('Context'), - ), - 'forms' => array( - 'form' => array( - 'include' => drupal_get_path('module', 'ctools') . '/includes/context-task-handler.inc', - 'form id' => 'ctools_context_handler_edit_context', - ), + ), + 'context' => array( + 'title' => t('Contexts'), + 'description' => t('Add additional context objects to this variant that can be used by the content.'), + 'form' => array( + 'order' => array( + 'form' => t('Context'), + ), + 'forms' => array( + 'form' => array( + 'include' => drupal_get_path('module', 'ctools') . '/includes/context-task-handler.inc', + 'form id' => 'ctools_context_handler_edit_context', ), ), ), - 'layout' => array( - 'title' => t('Layout'), - 'description' => t('Change the layout of this panel.'), - // No AJAX so we get our CSS loaded. - 'ajax' => FALSE, - 'form' => array( - 'order' => array( - 'choose' => t('Change layout'), - 'move' => t('Move content from old layout'), + ), + 'layout' => array( + 'title' => t('Layout'), + 'description' => t('Change the layout of this panel.'), + // No AJAX so we get our CSS loaded. + 'ajax' => FALSE, + 'form' => array( + 'order' => array( + 'choose' => t('Change layout'), + 'move' => t('Move content from old layout'), + ), + 'forms' => array( + 'choose' => array( + 'form id' => 'panels_panel_context_edit_layout', ), - 'forms' => array( - 'choose' => array( - 'form id' => 'panels_panel_context_edit_layout', - ), - 'move' => array( - 'include' => array( - drupal_get_path('module', 'panels') . '/includes/display-layout.inc', - ), - 'form id' => 'panels_panel_context_edit_move', - 'submit' => 'panels_change_layout_submit', + 'move' => array( + 'include' => array( + drupal_get_path('module', 'panels') . '/includes/display-layout.inc', ), + 'form id' => 'panels_panel_context_edit_move', + 'submit' => 'panels_change_layout_submit', ), ), ), - 'content' => array( - 'title' => t('Content'), - 'description' => t('Add content items and change their location with a drag and drop interface.'), - 'ajax' => FALSE, - 'form' => array( - 'order' => array( - 'form' => t('Content'), - ), - 'forms' => array( - 'form' => array( - 'include' => array( - drupal_get_path('module', 'panels') . '/includes/display-edit.inc', - ), - 'form id' => 'panels_panel_context_edit_content', - 'no blocks' => TRUE, + ), + 'content' => array( + 'title' => t('Content'), + 'description' => t('Add content items and change their location with a drag and drop interface.'), + 'ajax' => FALSE, + 'form' => array( + 'order' => array( + 'form' => t('Content'), + ), + 'forms' => array( + 'form' => array( + 'include' => array( + drupal_get_path('module', 'panels') . '/includes/display-edit.inc', ), + 'form id' => 'panels_panel_context_edit_content', + 'no blocks' => TRUE, ), ), ), - 'preview' => array( - 'title' => t('Preview'), - 'description' => t('Get a preview of what this variant will look like.'), - 'form' => 'panels_panel_context_edit_preview', - 'ajax' => FALSE, - 'silent' => TRUE, - 'form info' => array('finish text' => t('Preview')), - ), ), + 'preview' => array( + 'title' => t('Preview'), + 'description' => t('Get a preview of what this variant will look like.'), + 'form' => 'panels_panel_context_edit_preview', + 'ajax' => FALSE, + 'silent' => TRUE, + 'form info' => array('finish text' => t('Preview')), + ), + ), - // Callback to render the data. - 'render' => 'panels_panel_context_render', + // Callback to render the data. + 'render' => 'panels_panel_context_render', - // Various callbacks for operations performed on the handler to ensure - // related data is updated properly. - 'save' => 'panels_panel_context_save', - 'delete' => 'panels_panel_context_delete', - 'export' => 'panels_panel_context_export', - 'clone' => 'panels_panel_context_clone', - - 'add features' => array( - 'criteria' => t('Selection rules'), - 'context' => t('Contexts'), - ), - // Where to go when finished. - 'add finish' => 'content', - - 'required forms' => array( - 'choose' => t('Choose layout'), - 'content' => t('Panel content'), - ), - - 'edit forms' => array( - 'content' => t('Panel content'), - 'criteria' => t('Selection rules'), - 'settings' => t('General'), - 'context' => t('Contexts'), - 'layout' => t('Change layout'), - 'move' => '', // no title makes it a 'hidden' edit form. - ), - 'forms' => array( - 'settings' => array( - 'form id' => 'panels_panel_context_edit_settings', - ), - 'choose' => array( - 'form id' => 'panels_panel_context_edit_choose', - 'no back validate' => TRUE, - ), - 'layout' => array( - 'no return' => TRUE, - 'form id' => 'panels_panel_context_edit_layout', - ), - 'move' => array( - 'include' => array( - drupal_get_path('module', 'panels') . '/includes/display-layout.inc', - ), - 'form id' => 'panels_panel_context_edit_move', - 'submit' => 'panels_change_layout_submit', - ), - 'content' => array( - 'include' => array( - drupal_get_path('module', 'panels') . '/includes/display-edit.inc', - ), - 'form id' => 'panels_panel_context_edit_content', - 'no blocks' => TRUE, - ), - 'context' => array( - 'include' => drupal_get_path('module', 'ctools') . '/includes/context-task-handler.inc', - 'form id' => 'ctools_context_handler_edit_context', + // Various callbacks for operations performed on the handler to ensure + // related data is updated properly. + 'save' => 'panels_panel_context_save', + 'delete' => 'panels_panel_context_delete', + 'export' => 'panels_panel_context_export', + 'clone' => 'panels_panel_context_clone', + + 'add features' => array( + 'criteria' => t('Selection rules'), + 'context' => t('Contexts'), + ), + // Where to go when finished. + 'add finish' => 'content', + + 'required forms' => array( + 'choose' => t('Choose layout'), + 'content' => t('Panel content'), + ), + + 'edit forms' => array( + 'content' => t('Panel content'), + 'criteria' => t('Selection rules'), + 'settings' => t('General'), + 'context' => t('Contexts'), + 'layout' => t('Change layout'), + 'move' => '', // no title makes it a 'hidden' edit form. + ), + 'forms' => array( + 'settings' => array( + 'form id' => 'panels_panel_context_edit_settings', + ), + 'choose' => array( + 'form id' => 'panels_panel_context_edit_choose', + 'no back validate' => TRUE, + ), + 'layout' => array( + 'no return' => TRUE, + 'form id' => 'panels_panel_context_edit_layout', + ), + 'move' => array( + 'include' => array( + drupal_get_path('module', 'panels') . '/includes/display-layout.inc', ), - 'criteria' => array( - 'include' => drupal_get_path('module', 'ctools') . '/includes/context-task-handler.inc', - 'form id' => 'ctools_context_handler_edit_criteria', + 'form id' => 'panels_panel_context_edit_move', + 'submit' => 'panels_change_layout_submit', + ), + 'content' => array( + 'include' => array( + drupal_get_path('module', 'panels') . '/includes/display-edit.inc', ), + 'form id' => 'panels_panel_context_edit_content', + 'no blocks' => TRUE, ), - 'default conf' => array( - 'title' => t('Panel'), - 'no_blocks' => FALSE, - 'css_id' => '', - 'css' => '', - 'contexts' => array(), - 'relationships' => array(), + 'context' => array( + 'include' => drupal_get_path('module', 'ctools') . '/includes/context-task-handler.inc', + 'form id' => 'ctools_context_handler_edit_context', ), - ); -} + 'criteria' => array( + 'include' => drupal_get_path('module', 'ctools') . '/includes/context-task-handler.inc', + 'form id' => 'ctools_context_handler_edit_criteria', + ), + ), + 'default conf' => array( + 'title' => t('Panel'), + 'no_blocks' => FALSE, + 'css_id' => '', + 'css' => '', + 'contexts' => array(), + 'relationships' => array(), + ), +); /** * Get the display for a task handler.