Index: panels.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels.install,v retrieving revision 1.1.6.47 diff -u -p -r1.1.6.47 panels.install --- panels.install 26 May 2008 21:23:07 -0000 1.1.6.47 +++ panels.install 27 May 2008 17:13:15 -0000 @@ -1,6 +1,7 @@ contexts); - $relationships = $ids = array(); // Not resetting $keywords! + // Not resetting $keywords! + $relationships = $ids = array(); if (!empty($rels)) { foreach ($rels as $id => $relationship) { $name = $relationship['name']; @@ -457,12 +460,13 @@ function panels_update_5212() { */ function panels_update_5213() { $ret = array(); - switch($GLOBALS['db_type']) { + switch ($GLOBALS['db_type']) { case 'mysql': case 'mysqli': $ret[] = update_sql("ALTER TABLE {panels_pane} ADD COLUMN cache longtext AFTER configuration"); $ret[] = update_sql("ALTER TABLE {panels_display} ADD COLUMN cache longtext AFTER panel_settings"); - break; + break; + case 'pgsql': db_add_column($ret, 'panels_pane', 'cache', 'text'); db_add_column($ret, 'panels_display', 'cache', 'text'); @@ -476,7 +480,7 @@ function panels_update_5213() { */ function panels_update_5214() { $ret = array(); - switch($GLOBALS['db_type']) { + switch ($GLOBALS['db_type']) { case 'mysql': case 'mysqli': $ret[] = update_sql(<< 1)); db_add_column($ret, 'panels_display', 'title', 'varchar(128)'); @@ -550,13 +556,14 @@ function panels_update_5216() { */ function panels_update_5217() { $ret = array(); - switch($GLOBALS['db_type']) { + switch ($GLOBALS['db_type']) { case 'mysql': case 'mysqli': $ret[] = update_sql("ALTER TABLE {panels_page} ADD COLUMN switcher_type varchar(128) AFTER no_blocks"); $ret[] = update_sql("ALTER TABLE {panels_page} ADD COLUMN switcher_name varchar(128) AFTER no_blocks"); $ret[] = update_sql("ALTER TABLE {panels_page} ADD COLUMN switcher_options longtext AFTER switcher_type"); break; + case 'pgsql': db_add_column($ret, 'panels_page', 'switcher_type', 'varchar(128)'); db_add_column($ret, 'panels_page', 'switcher_name', 'varchar(128)'); @@ -564,3 +571,4 @@ function panels_update_5217() { } return $ret; } + Index: panels.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels.module,v retrieving revision 1.10.4.104 diff -u -p -r1.10.4.104 panels.module --- panels.module 24 May 2008 23:37:14 -0000 1.10.4.104 +++ panels.module 27 May 2008 17:18:26 -0000 @@ -1,5 +1,7 @@ '. t('Panels is the core engine for a number of submodules, including panels-pages, panels-nodes, and mini-panels. Panels allows the website adminstrator (or sometimes the end-user) to manipulate the layout of individual pages, sidebars, and content pieces, as well as easily dictate what content is displayed in the layout.') .'

'; $output .= '

'. t('Most Drupal users are familiar with the block to region layout mechanism in which you can assign a block to any region defined in your theme. Panels takes this concept a massive step forward. Through the panels interface you can start by creating a layout with any number of columns, headers, and footer, and control the width of those areas.') .'

'; $output .= '

'. t('After creating your layout, you can assign pieces of content to those areas in an easy drag and drop interface. Content is not limited to blocks, but can be nodes, views, blocks, or other types of content that extend themselves to panels.') .'

'; - $output .= '

'. t('Panels-pages') .'' .t(', is the the primary panels module, you can use this for creating single full page layouts. This replaces the standard panel that existed in the earlier versions of panels. If you are upgrading your site from Panels 1, and you cannot find where your panels went, be sure to enable the panel pages module!') .'

'; - $output .= '

'. t('Panels-nodes') .'' .t(', is useful for creating layouts that only occupy the content area of your pages. Frequently, it is desirable to add an area to a node layout, such as a pull quote for a newspaper or a photo block, that you don\'t necessarily want on every node. Panels Nodes lets you control the layout of a single node at a time and place content such as blog posts, images, blogs in and around the post.') .'

'; - $output .= '

'. t('Mini-panels') .'' .t(', is a layout mechanism for blocks. It won\'t take long using panels before you get to a point when you want a panel inside of a panel. Or a panel that can be used as a block. That is exactly what mini-panels does. You can create a small panel here with various pieces of content and then put it inside of a panels-page or panels-node.') .'

'; + $output .= '

'. t('Panels-pages') .''. t(', is the the primary panels module, you can use this for creating single full page layouts. This replaces the standard panel that existed in the earlier versions of panels. If you are upgrading your site from Panels 1, and you cannot find where your panels went, be sure to enable the panel pages module!') .'

'; + $output .= '

'. t('Panels-nodes') .''. t(', is useful for creating layouts that only occupy the content area of your pages. Frequently, it is desirable to add an area to a node layout, such as a pull quote for a newspaper or a photo block, that you don\'t necessarily want on every node. Panels Nodes lets you control the layout of a single node at a time and place content such as blog posts, images, blogs in and around the post.') .'

'; + $output .= '

'. t('Mini-panels') .''. t(', is a layout mechanism for blocks. It won\'t take long using panels before you get to a point when you want a panel inside of a panel. Or a panel that can be used as a block. That is exactly what mini-panels does. You can create a small panel here with various pieces of content and then put it inside of a panels-page or panels-node.') .'

'; return $output; } } @@ -45,15 +47,16 @@ function panels_menu($may_cache) { 'title' => t('Autocomplete node'), 'callback' => 'panels_node_autocomplete', 'access' => user_access('access content'), - 'type' => MENU_CALLBACK + 'type' => MENU_CALLBACK, ); - $items[] = array( // TODO Deprecated generalized ajax handler. Remove if at all possible. + // TODO Deprecated generalized ajax handler. Remove if at all possible. + $items[] = array( 'path' => 'panels/ajax', 'title' => t('ajax'), 'callback' => 'panels_ajax_passthru', 'callback arguments' => array('panels_ajax'), 'access' => user_access('access content'), - 'type' => MENU_CALLBACK + 'type' => MENU_CALLBACK, ); $items[] = array( 'path' => 'panels/common/ajax', @@ -61,7 +64,7 @@ function panels_menu($may_cache) { 'callback' => 'panels_ajax_passthru', 'callback arguments' => array('panels_common_ajax'), 'access' => user_access('access content'), - 'type' => MENU_CALLBACK + 'type' => MENU_CALLBACK, ); $items[] = array( 'path' => 'panels/ajax/add-content', @@ -69,7 +72,7 @@ function panels_menu($may_cache) { 'callback' => 'panels_ajax_passthru', 'callback arguments' => array('panels_ajax_add_content'), 'access' => user_access('access content'), - 'type' => MENU_CALLBACK + 'type' => MENU_CALLBACK, ); $items[] = array( 'path' => 'panels/ajax/add-config', @@ -77,7 +80,7 @@ function panels_menu($may_cache) { 'callback' => 'panels_ajax_passthru', 'callback arguments' => array('panels_ajax_add_config'), 'access' => user_access('access content'), - 'type' => MENU_CALLBACK + 'type' => MENU_CALLBACK, ); $items[] = array( 'path' => 'panels/ajax/configure', @@ -85,7 +88,7 @@ function panels_menu($may_cache) { 'callback' => 'panels_ajax_passthru', 'callback arguments' => array('panels_ajax_configure'), 'access' => user_access('access content'), - 'type' => MENU_CALLBACK + 'type' => MENU_CALLBACK, ); $items[] = array( 'path' => 'panels/ajax/toggle-shown', @@ -93,15 +96,15 @@ function panels_menu($may_cache) { 'callback' => 'panels_ajax_passthru', 'callback arguments' => array('panels_ajax_toggle_shown'), 'access' => user_access('access content'), - 'type' => MENU_CALLBACK - ); + 'type' => MENU_CALLBACK, + ); $items[] = array( 'path' => 'panels/ajax/cache', 'title' => t('ajax'), 'callback' => 'panels_ajax_passthru', 'callback arguments' => array('panels_ajax_cache'), 'access' => user_access('access content'), - 'type' => MENU_CALLBACK + 'type' => MENU_CALLBACK, ); $items[] = array( 'path' => 'panels/ajax/cache-settings', @@ -109,7 +112,7 @@ function panels_menu($may_cache) { 'callback' => 'panels_ajax_passthru', 'callback arguments' => array('panels_ajax_cache_settings'), 'access' => user_access('access content'), - 'type' => MENU_CALLBACK + 'type' => MENU_CALLBACK, ); $items[] = array( 'path' => 'panels/ajax/panel_settings', @@ -117,7 +120,7 @@ function panels_menu($may_cache) { 'callback' => 'panels_ajax_passthru', 'callback arguments' => array('panels_panel_settings_ajax'), 'access' => user_access('access content'), - 'type' => MENU_CALLBACK + 'type' => MENU_CALLBACK, ); } else { @@ -165,24 +168,24 @@ function panels_ajax_render($output = NU case 'dismiss': $temp->type = $output; break; + default: $temp->type = 'display'; } $temp->title = $title; - $temp->url = $url; - $output = $temp; + $temp->url = $url; + $output = $temp; } if (!$output->output || !$output->type) { $output->output = t('The input was invalid'); - $output->type = 'display'; - $output->title = t('Error'); + $output->type = 'display'; + $output->title = t('Error'); } drupal_set_header('Content-Type: text/javascript; charset=utf-8'); print drupal_to_js($output); exit; } - /** * Handle a form for AJAX in a manner that happens to be basically the * opposite of the normal flow; if the form hasn't been processed, @@ -243,7 +246,7 @@ function panels_perm() { * Custom form element to do our nice images. */ function panels_elements() { - $type['panels_imagebutton'] = array('#input' => TRUE, '#button_type' => 'submit',); + $type['panels_imagebutton'] = array('#input' => TRUE, '#button_type' => 'submit'); return $type; } @@ -380,18 +383,18 @@ function panels_get($var) { /** * Main API entry point to edit a panel display. - * + * * Sample implementations utiltizing the the complex $destination behavior can be found * in panels_page_edit_content() and, in a separate contrib module, OG Blueprints * (http://drupal.org/project/og_blueprints), og_blueprints_blueprint_edit(). - * + * * @ingroup mainapi - * + * * @param object $display instanceof panels_display \n * A fully loaded panels $display object, as returned from panels_load_display(). * Merely passing a did is NOT sufficient. \n * Note that 'fully loaded' means the $display must already be loaded with any contexts - * the caller wishes to have set for the display. + * the caller wishes to have set for the display. * @param mixed $destination \n * The redirect destination that the user should be taken to on form submission or * cancellation. With panels_edit, $destination has complex effects on the return @@ -400,10 +403,11 @@ function panels_get($var) { * at different stages of FAPI. Under most circumstances, simply passing in * drupal_get_destination() is all that's necessary. * @param array $content_types \n - * An associative array of allowed content types, typically as returned from + * An associative array of allowed content types, typically as returned from * panels_common_get_allowed_types(). Note that context partially governs available content types, - * so you will want to create any relevant contexts using panels_create_context() or - * panels_create_context_empty() to make sure all the appropriate content types are available. + * so you will want to create any relevant contexts using panels_create_context() or + * panels_create_context_empty() to make sure all the appropriate content types are available. + * * @return * Because the functions called by panels_edit() invoke the form API, this function * returns different values depending on the stage of form submission we're at. In Drupal 5, @@ -411,14 +415,14 @@ function panels_get($var) { * get at different stages: * -# If !$_POST['op']: then we're on on the initial passthrough and the form is being * rendered, so it's the $form itself that's being returned. Because negative margins, - * a common CSS technique, bork the display editor's ajax drag-and-drop, it's important + * a common CSS technique, bork the display editor's ajax drag-and-drop, it's important * that the $output be printed, not returned. Use this syntax in the caller function: \n * print theme('page', panels_edit($display, $destination, $content_types), FALSE); \n * -# If $_POST['op'] == t('Cancel'): form submission has been cancelled. If empty($destination) == FALSE, - * then there is no return value and the panels API takes care of redirecting to $destination. + * then there is no return value and the panels API takes care of redirecting to $destination. * If empty($destination) == TRUE, then there's still no return value, but the caller function * has to take care of form redirection. - * -# If $_POST['op'] == ('Save'): the form has been submitted successfully and has run through + * -# If $_POST['op'] == ('Save'): the form has been submitted successfully and has run through * panels_edit_display_submit(). $output depends on the value of $destination: * - If empty($destination) == TRUE: $output contains the modified $display * object, and no redirection will occur. This option is useful if the caller @@ -426,14 +430,14 @@ function panels_get($var) { * the page request is complete. Using hook_form_alter() to add an additional submit * handler is typically the preferred method for something like this, but there * are certain use cases where that is infeasible and $destination = NULL should - * be used instead. If this method is employed, the caller will need to handle form + * be used instead. If this method is employed, the caller will need to handle form * redirection. Note that having $_REQUEST['destination'] set, whether via * drupal_get_destination() or some other method, will NOT interfere with this * functionality; consequently, you can use drupal_get_destination() to safely store * your desired redirect in the caller function, then simply use drupal_goto() once * panels_edit() has done its business. * - If empty($destination) == FALSE: the form will redirect to the URL string - * given in $destination and NO value will be returned. + * given in $destination and NO value will be returned. */ function panels_edit($display, $destination = NULL, $content_types = NULL) { panels_load_include('display_edit'); @@ -443,12 +447,12 @@ function panels_edit($display, $destinat /** * API entry point for selecting a layout for a given display. - * + * * Layout selection is nothing more than a list of radio items encompassing the available * layouts for this display, as defined by .inc files in the panels/layouts subdirectory. * The only real complexity occurs when a user attempts to change the layout of a display * that has some content in it. - * + * * @param object $display instanceof panels_display \n * A fully loaded panels $display object, as returned from panels_load_display(). * Merely passing a did is NOT sufficient. @@ -459,7 +463,7 @@ function panels_edit($display, $destinat * Basic usage is a string containing the URL that the form should redirect to upon submission. * For a discussion of advanced usages, see panels_edit(). * @param mixed $allowed_layouts - * Allowed layouts has three different behaviors that depend on which of three value types + * Allowed layouts has three different behaviors that depend on which of three value types * are passed in by the caller: * #- if $allowed_layouts instanceof panels_allowed_layouts (includes subclasses): the most * complex use of the API. The caller is passing in a loaded panels_allowed_layouts object @@ -469,14 +473,14 @@ function panels_edit($display, $destinat * will call the $allowed_layouts . '_allowed_layouts' var. If the data was stored properly * in the system var, the $allowed_layouts object will be unserialized and recreated. * @see panels_common_set_allowed_layouts() - * #- if is_null($allowed_layouts): the default behavior, which also provides backwards + * #- if is_null($allowed_layouts): the default behavior, which also provides backwards * compatibility for implementations of the Panels2 API written before beta4. In this case, * a dummy panels_allowed_layouts object is created which does not restrict any layouts. * Subsequent behavior is indistinguishable from pre-beta4 behavior. - * + * * @return - * Can return nothing, or a modified $display object, or a redirection string; return values for the - * panels_edit* family of functions are quite complex. See panels_edit() for detailed discussion. + * Can return nothing, or a modified $display object, or a redirection string; return values for the + * panels_edit* family of functions are quite complex. See panels_edit() for detailed discussion. * @see panels_edit() */ function panels_edit_layout($display, $finish, $destination = NULL, $allowed_layouts = NULL) { @@ -487,26 +491,26 @@ function panels_edit_layout($display, $f /** * API entry point for configuring the layout settings for a given display. - * + * * For all layouts except Flexible, the layout settings form allows the user to select styles, * as defined by .inc files in the panels/styles subdirectory, for the panels in their display. * For the Flexible layout, the layout settings form allows the user to provide dimensions * for their flexible layout in addition to applying styles to panels. - * + * * TODO and at some point, individual panes should be stylable as well as whole panels. - * + * * @param object $display instanceof panels_display \n * A fully loaded panels $display object, as returned from panels_load_display(). * Merely passing a did is NOT sufficient. * @param string $finish - * A string that will be used for the text of (one of) the form submission button(s). Note that - * panels will NOT wrap $finish in t() for you, so your caller should make sure to do so. \n - * The submit behavior of the form is primarily governed by the value of $destination (see + * A string that will be used for the text of (one of) the form submission button(s). Note that + * panels will NOT wrap $finish in t() for you, so your caller should make sure to do so. \n + * The submit behavior of the form is primarily governed by the value of $destination (see * below), but is secondarily governed by $finish as follows: * -# If $finish != t('Save'), then two #submit buttons will be present: one with the button * text t('Save'), and the other with the button text $finish. . - * - Clicking the 'Save' button will save any changes on the form to the $display object and - * keep the user on the same editing page. + * - Clicking the 'Save' button will save any changes on the form to the $display object and + * keep the user on the same editing page. * - Clicking the $finish button will also save the $display object, but the user will be * redirected to the URL specified in $destination. * -# If $finish == t('Save'), then there is only one button, still called t('Save'), but it @@ -527,15 +531,16 @@ function panels_edit_layout($display, $f * on the title textfield will indicate that the $title string will be used as the default page title * if none is provided on this form. When utilizing this option, note that the panels API can only * provide the data for these values; you must implement the appropriate conditionals to make it true. + * * @return - * Can return nothing, or a modified $display object, or a redirection string; return values for the - * panels_edit* family of functions are quite complex. See panels_edit() for detailed discussion. + * Can return nothing, or a modified $display object, or a redirection string; return values for the + * panels_edit* family of functions are quite complex. See panels_edit() for detailed discussion. * @see panels_edit() */ function panels_edit_layout_settings($display, $finish, $destination = NULL, $title = FALSE) { panels_load_include('display_edit'); panels_load_include('plugins'); - return _panels_edit_layout_settings( $display, $finish, $destination, $title); + return _panels_edit_layout_settings($display, $finish, $destination, $title); } @@ -544,7 +549,7 @@ function panels_edit_layout_settings($di /** * Forms the basis of a panel display - * + * */ class panels_display { var $args = array(); @@ -569,19 +574,21 @@ class panels_display { $this->panels[$location][] = $pane->pid; } } - + function duplicate_pane($pid, $location = FALSE) { $pane = $this->clone_pane($pid); $this->add_pane($pane, $location); } - + function clone_pane($pid) { $pane = drupal_clone($this->content[$pid]); - foreach (array_keys($this->content) as $pidcheck) - unset($pane->position); // necessary? + foreach (array_keys($this->content) as $pidcheck) { + // necessary? + unset($pane->position); + } return $pane; } - + function next_new_pid() { // necessary if/until we use this method and ONLY this method for adding temporary pids. // then we can do it with a nice static var. @@ -628,7 +635,6 @@ function panels_sanitize_display(&$displ } } - /** * Creates a new display, setting the ID to our magic new id. */ @@ -640,11 +646,12 @@ function panels_new_display() { /** * Load and fill the requested $display object(s). - * + * * Helper function primarily for for panels_load_display(). * * @param array $dids * An indexed array of dids to be loaded from the database. + * * @return $displays * An array of displays, keyed by their display dids. */ @@ -657,13 +664,14 @@ function panels_load_displays($dids) { $subs = implode(', ', array_fill(0, count($dids), '%d')); $result = db_query("SELECT * FROM {panels_display} WHERE did IN ($subs)", $dids); - + while ($obj = db_fetch_array($result)) { $display = new panels_display(); foreach ($obj as $key => $value) { $display->$key = $value; - if (in_array($key, array('layout_settings', 'panel_settings', 'cache'))) { // unserialize important bits + // unserialize important bits + if (in_array($key, array('layout_settings', 'panel_settings', 'cache'))) { $display->$key = empty($display->$key) ? array() : unserialize($display->$key); } } @@ -672,7 +680,7 @@ function panels_load_displays($dids) { $displays[$display->did] = $display; } - + $result = db_query("SELECT * FROM {panels_pane} WHERE did IN ($subs) ORDER BY did, panel, position", $dids); while ($pane = db_fetch_object($result)) { @@ -688,11 +696,12 @@ function panels_load_displays($dids) { /** * Load a single display. - * + * * @ingroup mainapi - * + * * @param int $did * The display id (did) of the display to be loaded. + * * @return object $display instanceof panels_display \n * Returns a partially-loaded panels_display object. $display objects returned from * from this function have only the following data: @@ -707,11 +716,10 @@ function panels_load_displays($dids) { * - $display->cache (any relevant data from panels_simple_cache) * - $display->args * - $display->incoming_content - * + * * While all of these members are defined, $display->context is NEVER defined in the returned $display; * it must be set using one of the panels_context_create() functions. */ - function panels_load_display($did) { $displays = panels_load_displays(array($did)); if (!empty($displays)) { @@ -721,17 +729,18 @@ function panels_load_display($did) { /** * Save a display object. - * + * * @ingroup mainapi - * + * * Note a new $display only receives a real did once it is run through this function. * Until then, it uses a string placeholder, 'new', in place of a real did. The same * applies to all new panes (whether on a new $display or not); in addition, * panes have sequential numbers appended, of the form 'new-1', 'new-2', etc. - * + * * @param object $display instanceof panels_display \n - * The display object to be saved. Passed by reference so the caller need not use + * The display object to be saved. Passed by reference so the caller need not use * the return value for any reason except convenience. + * * @return object $display instanceof panels_display \n */ function panels_save_display(&$display) { @@ -746,7 +755,7 @@ function panels_save_display(&$display) $display->did = db_next_id("{panels_display}_did"); db_query("INSERT INTO {panels_display} (did, layout, layout_settings, panel_settings, cache, title, hide_title) VALUES (%d, '%s', '%s', '%s', '%s', '%s', %d)", $display->did, $display->layout, serialize($display->layout_settings), serialize($display->panel_settings), serialize($display->cache), $display->title, $display->hide_title); } - + // update all the panes foreach ((array) $display->panels as $id => $panes) { $position = 0; @@ -761,11 +770,12 @@ function panels_save_display(&$display) if (empty($pane->cache)) { $pane->cache = array(); } - + $type = panels_get_content_type($pane->type); $access = isset($pane->access) ? implode(', ', $pane->access) : ''; $visibility = $type['visibility serialize'] ? serialize($pane->visibility) : $pane->visibility; - $f = 'pid, did, panel, type, subtype, configuration, cache, shown, access, visibility, position'; // doin it this way for readability + // doin it this way for readability + $f = 'pid, did, panel, type, subtype, configuration, cache, shown, access, visibility, position'; $q = "%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d"; $v = array($pane->pid, $display->did, $pane->panel, $pane->type, $pane->subtype, serialize($pane->configuration), serialize($pane->cache), $pane->shown, $access, $visibility, $pane->position); db_query("INSERT INTO {panels_pane} ($f) VALUES ($q)", $v); @@ -780,7 +790,8 @@ function panels_save_display(&$display) panels_load_include('plugins'); panels_clear_cached_content($display); - return $display; // to be nice, even tho we have a reference. + // to be nice, even tho we have a reference. + return $display; } /** @@ -799,17 +810,17 @@ function panels_delete_display($display) /** * Exports the provided display into portable code. - * + * * This function is primarily intended as a mechanism for cloning displays. * It generates an exact replica (in code) of the provided $display, with * the exception that it replaces all ids (dids and pids) with 'new-*' values. * Only once panels_save_display() is called on the code version of $display will * the exported display written to the database and permanently saved. - * + * * @see panels_page_export() or _panels_page_fetch_display() for sample implementations. - * + * * @ingroup mainapi - * + * * @param object $display instanceof panels_display \n * This export function does no loading of additional data about the provided * display. Consequently, the caller should make sure that all the desired data @@ -817,6 +828,7 @@ function panels_delete_display($display) * @param string $prefix * A string prefix that is prepended to each line of exported code. This is primarily * used for prepending a double space when exporting so that the code indents and lines up nicely. + * * @return string $output * The passed-in $display expressed as code, ready to be imported. Import by running * eval($output) in the caller function; doing so will create a new $display variable @@ -979,7 +991,7 @@ function panels_render_panes($display) { $panes = array(); $later = array(); - foreach ($display->content as $pid => $pane) { + foreach ($display->content as $pid => $pane) { // TODO Really ought to design a method for creating a quick-access set of content_type (and other plugin) data to help optimize render performance // If the user can't see this pane, do not render it. if (!$pane->shown || !panels_pane_access($pane, $display)) { @@ -1110,6 +1122,7 @@ function panels_get_panel_style_and_sett * The ID of the panel being rendered * @param $panes * An array of panes that are assigned to the panel that's being rendered. + * * @return * The rendered HTML for a panel. * @render @@ -1129,14 +1142,13 @@ function panels_render_panel($display, $ return theme($style['render panel'], $display, $owner_id, $panes, $style_settings, $panel); } - /** * Print the layout link. Sends out to a theme function. * @layout */ function panels_print_layout_link($id, $layout, $link) { drupal_add_css(panels_get_path('css/panels_admin.css')); - $file = panels_get_path($layout['icon'], false, $layout['module']); + $file = panels_get_path($layout['icon'], false, $layout['module']); $image = l(theme('image', $file), $link, NULL, NULL, NULL, NULL, TRUE); $title = l($layout['title'], $link); return theme('panels_layout_link', $title, $id, $image, $link); @@ -1241,7 +1253,8 @@ function theme_panels_pane($content, $pa function panels_node_autocomplete($string) { // TODO: Compare this to the nodequeue version, see which is better. // TODO: The nodequeue version is totally better. Steal it. - if ($string != '') { // if there are node_types passed, we'll use those in a MySQL IN query. + // if there are node_types passed, we'll use those in a MySQL IN query. + if ($string != '') { $preg_matches = array(); $match = preg_match('/\[nid: (\d+)\]/', $string, $preg_matches); if (!$match) { @@ -1266,3 +1279,4 @@ function panels_node_autocomplete($strin print drupal_to_js($matches); } } + Index: arguments/nid.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/arguments/Attic/nid.inc,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 nid.inc --- arguments/nid.inc 24 May 2008 05:20:17 -0000 1.1.2.6 +++ arguments/nid.inc 27 May 2008 16:46:59 -0000 @@ -1,15 +1,17 @@ t("Node ID"), - 'keyword' => 'node', // keyword to use for %substitution + // keyword to use for %substitution + 'keyword' => 'node', 'description' => t('Restricts the argument to a node id.'), 'context' => 'panels_nid_context', 'settings form' => 'panels_nid_settings_form', @@ -157,3 +159,4 @@ function panels_nid_choose_display($conf // Empty return says to use the default display. return; } + Index: arguments/node_add.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/arguments/Attic/node_add.inc,v retrieving revision 1.1.2.7 diff -u -p -r1.1.2.7 node_add.inc --- arguments/node_add.inc 24 May 2008 05:20:17 -0000 1.1.2.7 +++ arguments/node_add.inc 27 May 2008 16:46:59 -0000 @@ -1,15 +1,17 @@ t("Node add form"), - 'keyword' => 'node_type', // keyword to use for %substitution + // keyword to use for %substitution + 'keyword' => 'node_type', 'description' => t('Displays the node add form for a content type.'), 'context' => 'panels_node_add_context', 'settings form' => 'panels_node_add_settings_form', @@ -149,3 +151,4 @@ function panels_node_add_displays($conf, return $displays; } + Index: arguments/node_edit.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/arguments/Attic/node_edit.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 node_edit.inc --- arguments/node_edit.inc 24 May 2008 05:20:17 -0000 1.1.2.5 +++ arguments/node_edit.inc 27 May 2008 16:46:59 -0000 @@ -1,15 +1,17 @@ t("Node edit form"), - 'keyword' => 'node', // keyword to use for %substitution + // keyword to use for %substitution + 'keyword' => 'node', 'description' => t('Displays the node edit form for a node.'), 'context' => 'panels_node_edit_context', 'settings form' => 'panels_node_edit_settings_form', @@ -83,6 +85,7 @@ function panels_node_edit_settings_form( return $form; } + /** * There appears to be a bit of a bug with the way we're handling forms; it causes * 'checkboxes' to get invalid values added to them when empty. This takes care Index: arguments/term.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/arguments/Attic/term.inc,v retrieving revision 1.1.2.7 diff -u -p -r1.1.2.7 term.inc --- arguments/term.inc 24 May 2008 05:20:17 -0000 1.1.2.7 +++ arguments/term.inc 27 May 2008 16:47:55 -0000 @@ -1,15 +1,17 @@ t("Taxonomy term"), - 'keyword' => 'term', // keyword to use for %substitution + // keyword to use for %substitution + 'keyword' => 'term', 'description' => t('Restricts the argument to a taxonomy term.'), 'context' => 'panels_term_context', 'settings form' => 'panels_term_settings_form', @@ -21,7 +23,6 @@ function panels_term_panels_arguments() return $args; } - /** * Discover if this argument gives us the term we crave. */ @@ -39,6 +40,7 @@ function panels_term_context($arg = NULL } $term = taxonomy_get_term($arg); break; + case 'term': $terms = taxonomy_get_term_by_name($arg); if (count($terms) != 1) { @@ -46,7 +48,8 @@ function panels_term_context($arg = NULL foreach ($conf['vids'] as $vid => $active) { if ($active == 1 && $potential->vid == $vid) { $term = $potential; - break 3; // break out of the foreaches AND the case + // break out of the foreaches AND the case + break 3; } } } @@ -207,3 +210,4 @@ function panels_term_title($context) { return $context->page_title; } } + Index: arguments/uid.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/arguments/Attic/uid.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 uid.inc --- arguments/uid.inc 5 Nov 2007 22:14:37 -0000 1.1.2.1 +++ arguments/uid.inc 27 May 2008 16:48:13 -0000 @@ -1,15 +1,17 @@ t("User ID"), - 'keyword' => 'user', // keyword to use for %substitution + // keyword to use for %substitution + 'keyword' => 'user', 'description' => t('Creates a user object from the argument.'), 'context' => 'panels_uid_context', 'settings form' => 'panels_uid_settings_form', Index: arguments/vid.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/arguments/Attic/vid.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 vid.inc --- arguments/vid.inc 5 Nov 2007 22:14:37 -0000 1.1.2.1 +++ arguments/vid.inc 27 May 2008 16:47:00 -0000 @@ -1,15 +1,17 @@ t("Vocabulary ID"), - 'keyword' => 'vocabulary', // keyword to use for %substitution + // keyword to use for %substitution + 'keyword' => 'vocabulary', 'description' => t('Loads a vocabulary object from the argument.'), 'context' => 'panels_vid_context', 'settings form' => 'panels_vid_settings_form', @@ -118,3 +120,4 @@ function panels_vid_choose_display($conf // Empty return says to use the default display. return; } + Index: content_types/block.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/block.inc,v retrieving revision 1.1.6.22 diff -u -p -r1.1.6.22 block.inc --- content_types/block.inc 24 Mar 2008 05:31:41 -0000 1.1.6.22 +++ content_types/block.inc 27 May 2008 16:49:02 -0000 @@ -1,5 +1,7 @@ pages) { if ($block_visibility->visibility < 2) { - $path = drupal_get_path_alias($_GET['q']); - $regexp = '/^('. preg_replace(array('/(\r\n?|\n)/', '/\\\\\*/', '/(^|\|)\\\\($|\|)/'), array('|', '.*', '\1'. preg_quote(variable_get('site_frontpage', 'node'), '/') .'\2'), preg_quote($block_visibility->pages, '/')) .')$/'; + $path = drupal_get_path_alias($_GET['q']); + $regexp = '/^('. preg_replace(array('/(\r\n?|\n)/', '/\\\\\*/', '/(^|\|)\\\\($|\|)/'), array('|', '.*', '\1'. preg_quote(variable_get('site_frontpage', 'node'), '/') .'\2'), preg_quote($block_visibility->pages, '/')) .')$/'; $page_match = !($block_visibility->visibility xor preg_match($regexp, $path)); - } else { + } + else { $page_match = drupal_eval($block_visibility->pages); } - } else { + } + else { $page_match = TRUE; } @@ -218,7 +222,6 @@ function panels_default_block_info($modu // These are all on behalf of modules that don't implement panels but we that // we care about. - function menu_panels_block_info($module, $delta, &$info) { $info['icon'] = 'icon_core_block_menu.png'; $info['category'] = array(t('Menus'), -2); @@ -226,16 +229,18 @@ function menu_panels_block_info($module, function forum_panels_block_info($module, $delta, &$info) { $info['category'] = t('Core blocks'); - switch($delta) { + switch ($delta) { case '0': $info['icon'] = 'icon_core_activeforumtopics.png'; break; + case '1': $info['icon'] = 'icon_core_newforumtopics.png'; break; + default: // safety net - panels_default_block_info($module, $delta, $info); + panels_default_block_info($module, $delta, $info); } } @@ -286,23 +291,27 @@ function block_panels_block_info($module function user_panels_block_info($module, $delta, &$info) { $info['category'] = t('Core blocks'); - switch($delta) { + switch ($delta) { case '0': $info['icon'] = 'icon_core_userlogin.png'; break; + case '1': $info['icon'] = 'icon_core_navigation.png'; $info['category'] = array(t('Menus'), -2); break; + case '2': $info['icon'] = 'icon_core_whosnew.png'; break; + case '2': $info['icon'] = 'icon_core_whosonline.png'; break; + default: // safety net - panels_default_block_info($module, $delta, $info); + panels_default_block_info($module, $delta, $info); } } Index: content_types/custom.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/custom.inc,v retrieving revision 1.2.6.17 diff -u -p -r1.2.6.17 custom.inc --- content_types/custom.inc 24 May 2008 01:39:13 -0000 1.2.6.17 +++ content_types/custom.inc 27 May 2008 16:49:20 -0000 @@ -1,5 +1,7 @@ t('Custom'), 'weight' => -10, - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'content_types' => 'panels_admin_content_types_custom', 'render callback' => 'panels_content_custom', 'add callback' => 'panels_admin_edit_custom', @@ -25,9 +28,9 @@ function panels_custom_panels_content_ty function panels_content_custom($conf) { static $delta = 0; - $block = new stdClass(); - $block->module = 'custom'; - $block->delta = ++$delta; + $block = new stdClass(); + $block->module = 'custom'; + $block->delta = ++$delta; $block->subject = filter_xss_admin($conf['title']); $block->content = check_markup($conf['body'], $conf['format'], FALSE); Index: content_types/form.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/form.inc,v retrieving revision 1.1.2.7 diff -u -p -r1.1.2.7 form.inc --- content_types/form.inc 24 May 2008 01:39:13 -0000 1.1.2.7 +++ content_types/form.inc 27 May 2008 16:46:59 -0000 @@ -1,5 +1,7 @@ t('Generic form'), 'content_types' => 'panels_admin_content_types_form', - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'render callback' => 'panels_content_form', 'add callback' => 'panels_admin_edit_form', 'edit callback' => 'panels_admin_edit_form', @@ -57,7 +60,7 @@ function panels_content_form($conf, $pan else { $block->subject = t('Form'); $block->content = t('Form goes here.'); - $block->delta = 'unknown'; + $block->delta = 'unknown'; } return $block; @@ -66,3 +69,4 @@ function panels_content_form($conf, $pan function panels_admin_title_form($conf, $context) { return t('"@s" base form', array('@s' => $context->identifier)); } + Index: content_types/node.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/node.inc,v retrieving revision 1.2.6.24 diff -u -p -r1.2.6.24 node.inc --- content_types/node.inc 9 Jan 2008 16:55:21 -0000 1.2.6.24 +++ content_types/node.inc 27 May 2008 16:46:59 -0000 @@ -1,2 +1,5 @@ t('Node type description'), - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'content_types' => 'panels_admin_content_types_node_attachments', 'render callback' => 'panels_content_node_attachments', // 'add callback' => 'panels_admin_edit_node_attachments', @@ -57,3 +60,4 @@ function panels_admin_content_types_node function panels_admin_title_node_attachments($conf, $context) { return t('"@s" attachments', array('@s' => $context->identifier)); } + Index: content_types/node_book_nav.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/node_book_nav.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 node_book_nav.inc --- content_types/node_book_nav.inc 24 May 2008 01:39:13 -0000 1.1.2.5 +++ content_types/node_book_nav.inc 27 May 2008 16:50:23 -0000 @@ -1,5 +1,7 @@ t('Node book navigation'), - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'content_types' => 'panels_admin_content_types_node_book_nav', 'render callback' => 'panels_content_node_book_nav', // 'add callback' => 'panels_admin_edit_node_book_nav', @@ -59,3 +62,4 @@ function panels_admin_content_types_node function panels_admin_title_node_book_nav($conf, $context) { return t('"@s" book navigation', array('@s' => $context->identifier)); } + Index: content_types/node_comment_form.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/node_comment_form.inc,v retrieving revision 1.1.2.7 diff -u -p -r1.1.2.7 node_comment_form.inc --- content_types/node_comment_form.inc 24 May 2008 01:39:13 -0000 1.1.2.7 +++ content_types/node_comment_form.inc 27 May 2008 16:50:40 -0000 @@ -1,5 +1,7 @@ t('Node comment form'), - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'content_types' => 'panels_admin_content_types_node_comment_form', 'render callback' => 'panels_content_node_comment_form', 'add callback' => 'panels_admin_edit_node_comment_form', @@ -26,7 +29,7 @@ function panels_content_node_comment_for $node = isset($context->data) ? drupal_clone($context->data) : NULL; $block = new stdClass(); $block->module = 'comments'; - $block->delta = $node->nid; + $block->delta = $node->nid; $block->subject = t('Add comment'); @@ -35,7 +38,7 @@ function panels_content_node_comment_for } else { if (user_access('post comments') && node_comment_mode($node->nid) == COMMENT_NODE_READ_WRITE) { - $block->content = drupal_get_form('panels_comment_form', array('nid' => $node->nid)); + $block->content = drupal_get_form('panels_comment_form', array('nid' => $node->nid)); } } @@ -73,3 +76,4 @@ function panels_comment_form($edit) { $form['#submit']['comment_form_submit'] = array(); return $form; } + Index: content_types/node_comments.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/node_comments.inc,v retrieving revision 1.1.2.9 diff -u -p -r1.1.2.9 node_comments.inc --- content_types/node_comments.inc 24 May 2008 01:39:13 -0000 1.1.2.9 +++ content_types/node_comments.inc 27 May 2008 16:51:09 -0000 @@ -1,5 +1,7 @@ t('Node comments'), 'content_types' => 'panels_admin_content_types_node_comments', - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'render callback' => 'panels_content_node_comments', 'add callback' => 'panels_admin_edit_node_comments', 'edit callback' => 'panels_admin_edit_node_comments', @@ -26,7 +29,7 @@ function panels_content_node_comments($c $node = isset($context->data) ? drupal_clone($context->data) : NULL; $block = new stdClass(); $block->module = 'comments'; - $block->delta = $node->nid; + $block->delta = $node->nid; $block->subject = t('Comments'); if (empty($node)) { @@ -119,7 +122,7 @@ function panels_comment_render($node, $c $query_args = array($node->nid); if (!user_access('administer comments')) { - $query .= ' AND c.status = %d'; + $query .= ' AND c.status = %d'; $query_count .= ' AND status = %d'; $query_args[] = COMMENT_PUBLISHED; } @@ -149,7 +152,7 @@ function panels_comment_render($node, $c drupal_add_css(drupal_get_path('module', 'comment') .'/comment.css'); while ($comment = db_fetch_object($result)) { $comment = drupal_unpack($comment); - $comment->name = $comment->uid ? $comment->registered_name : $comment->name; + $comment->name = $comment->uid ? $comment->registered_name : $comment->name; $comment->depth = count(explode('.', $comment->thread)) - 1; if ($mode == COMMENT_MODE_THREADED_COLLAPSED || $mode == COMMENT_MODE_THREADED_EXPANDED) { @@ -187,3 +190,4 @@ function panels_comment_render($node, $c return $output; } + Index: content_types/node_content.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/node_content.inc,v retrieving revision 1.1.2.12 diff -u -p -r1.1.2.12 node_content.inc --- content_types/node_content.inc 24 May 2008 01:39:13 -0000 1.1.2.12 +++ content_types/node_content.inc 27 May 2008 16:51:33 -0000 @@ -1,5 +1,7 @@ t('Node content'), 'weight' => -10, - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'content_types' => 'panels_admin_content_types_node_content', 'render callback' => 'panels_content_node_content', 'add callback' => 'panels_admin_edit_node_content', @@ -45,10 +48,10 @@ function panels_content_node_content($co $node = isset($context->data) ? drupal_clone($context->data) : NULL; $block = new stdClass(); $block->module = 'node'; - $block->delta = $node->nid; + $block->delta = $node->nid; if (empty($node)) { - $block->delta = 'placeholder'; + $block->delta = 'placeholder'; $block->subject = t('Node title.'); $block->content = t('Node content goes here.'); } @@ -93,7 +96,7 @@ function panels_admin_node_content($node } if (empty($conf['no_extras'])) { - // Allow modules to make their own additions to the node. + // Allow modules to make their own additions to the node. node_invoke_nodeapi($node, 'view', $conf['teaser'], $conf['page']); } @@ -170,27 +173,27 @@ function panels_admin_edit_node_content( '#type' => 'checkbox', '#default_value' => $conf['page'], '#title' => t('Node page'), - '#description' => t('Check here if the node is being displayed on a page by itself.') + '#description' => t('Check here if the node is being displayed on a page by itself.'), ); $form['links'] = array( '#type' => 'checkbox', '#default_value' => $conf['links'], '#title' => t('Display links'), - '#description' => t('Check here to display the links with the post.') + '#description' => t('Check here to display the links with the post.'), ); $form['no_extras'] = array( '#type' => 'checkbox', '#default_value' => $conf['no_extras'], '#title' => t('No extras'), - '#description' => t('Check here to disable additions that modules might make to the node, such as file attachments and CCK fields; this should just display the basic teaser or body.') + '#description' => t('Check here to disable additions that modules might make to the node, such as file attachments and CCK fields; this should just display the basic teaser or body.'), ); $form['identifier'] = array( '#type' => 'textfield', '#default_value' => $conf['identifier'], '#title' => t('Identifier'), - '#description' => t('Whatever is placed here will appear in $node->panel_identifier to make it easier to theme a node or part of a node as necessary.') + '#description' => t('Whatever is placed here will appear in $node->panel_identifier to make it easier to theme a node or part of a node as necessary.'), ); return $form; @@ -199,3 +202,4 @@ function panels_admin_edit_node_content( function panels_admin_title_node_content($conf, $context) { return t('"@s" content', array('@s' => $context->identifier)); } + Index: content_types/node_form.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/node_form.inc,v retrieving revision 1.1.2.7 diff -u -p -r1.1.2.7 node_form.inc --- content_types/node_form.inc 24 May 2008 04:59:05 -0000 1.1.2.7 +++ content_types/node_form.inc 27 May 2008 16:46:59 -0000 @@ -1,5 +1,7 @@ content = t('Publishing options.'); } break; + case 'comment': $block->subject = t('Comment options'); $block->delta = 'comment-options'; @@ -155,6 +158,7 @@ function panels_content_node_form($conf, $block->content = t('Comment options.'); } break; + case 'author': $block->subject = $block->content = t('Authoring information'); $block->delta = 'author-options'; @@ -172,6 +176,7 @@ function panels_content_node_form($conf, $block->content = t('Authoring information.'); } break; + case 'menu': $block->subject = t('Menu options'); $block->delta = 'menu-options'; @@ -189,6 +194,7 @@ function panels_content_node_form($conf, $block->content = t('Menu options.'); } break; + case 'url_path': $block->subject = t('URL path options'); $block->delta = 'url-path-options'; @@ -205,6 +211,7 @@ function panels_content_node_form($conf, $block->content = t('URL Path options.'); } break; + case 'attachments': $block->subject = t('Attach files'); $block->delta = 'url-path-options'; @@ -220,6 +227,7 @@ function panels_content_node_form($conf, $block->content = t('Attach files.'); } break; + case 'taxonomy': $block->subject = t('Categories'); $block->delta = 'url-path-options'; @@ -235,6 +243,7 @@ function panels_content_node_form($conf, $block->content = t('Categories.'); } break; + case 'book': $block->subject = t('Book options'); $block->delta = 'book-options'; @@ -254,6 +263,7 @@ function panels_content_node_form($conf, $block->content = t('Book options.'); } break; + case 'input_format': $block->subject = t('Input format'); $block->delta = 'format-options'; @@ -290,3 +300,4 @@ function panels_admin_title_node_form($c $choices = panels_admin_content_types_node_form(); return t('"@s" @type', array('@s' => $context->identifier, '@type' => drupal_strtolower($choices[$conf['id']]['title']))); } + Index: content_types/node_type_desc.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/node_type_desc.inc,v retrieving revision 1.1.2.8 diff -u -p -r1.1.2.8 node_type_desc.inc --- content_types/node_type_desc.inc 24 May 2008 01:39:13 -0000 1.1.2.8 +++ content_types/node_type_desc.inc 27 May 2008 16:51:58 -0000 @@ -1,5 +1,7 @@ t('Node type description'), 'content_types' => 'panels_admin_content_types_node_type_desc', - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'render callback' => 'panels_content_node_type_desc', 'add callback' => 'panels_admin_edit_node_type_desc', 'edit callback' => 'panels_admin_edit_node_type_desc', @@ -29,12 +32,12 @@ function panels_content_node_type_desc($ $type = node_get_types('type', $node); $block->subject = $type->name; $block->content = filter_xss_admin($type->description); - $block->delta = $node->type; + $block->delta = $node->type; } else { $block->subject = t('Node type description'); $block->content = t('Node type description goes here.'); - $block->delta = 'unknown'; + $block->delta = 'unknown'; } return $block; @@ -59,3 +62,4 @@ function panels_admin_content_types_node function panels_admin_title_node_type_desc($conf, $context) { return t('"@s" type description', array('@s' => $context->identifier)); } + Index: content_types/profile_fields.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/profile_fields.inc,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 profile_fields.inc --- content_types/profile_fields.inc 24 May 2008 01:39:13 -0000 1.1.2.3 +++ content_types/profile_fields.inc 27 May 2008 16:52:47 -0000 @@ -1,5 +1,7 @@ t('Profile Fields'), 'content_types' => 'panels_profile_fields_content_type', - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'render callback' => 'panels_profile_fields_content', 'add callback' => 'panels_profile_fields_configure', 'edit callback' => 'panels_profile_fields_configure', 'title callback' => 'panels_profile_fields_configure_title', ); - } + } return $items; } /** - * 'Render' callback for the 'profile fields' content type. + * 'Render' callback for the 'profile fields' content type. */ function panels_profile_fields_content($conf, $panel_args, $context) { $account = isset($context->data) ? drupal_clone($context->data) : NULL; $block = new stdClass(); $block->module = 'profile fields'; - if ($account) { + if ($account) { // Get the category from the options $category = str_replace("_", " ", $conf['category']); // Set the subject to the name of the category $block->subject = $category; - + // Put all the fields in the category into an array $profile = profile_view_profile($account); if (is_array($profile[$category])) { - foreach($profile[$category] as $field) { + foreach ($profile[$category] as $field) { $vars[$field['class']]['title'] = $field['title']; $vars[$field['class']]['value'] = $field['value']; } } - + if (sizeof($vars) == 0) { // Output the given empty text $output = $conf['empty']; - } else { + } + else { // Call the theme function with the field vars - $output = theme('profile_fields_pane',$category, $vars); + $output = theme('profile_fields_pane', $category, $vars); } - + $block->content = $output; $block->delta = $account->uid; } else { $block->subject = $conf['category']; $block->content = t('Profile content goes here.'); - $block->delta = 'unknown'; + $block->delta = 'unknown'; } return $block; @@ -96,13 +100,13 @@ function panels_profile_fields_content_t } /** - * Helper function : build the list of categories for the 'edit' form. + * Helper function : build the list of categories for the 'edit' form. */ function _panels_profile_fields_options() { $cat_list = array(); $categories = profile_categories(); - foreach($categories as $key => $value) { + foreach ($categories as $key => $value) { $cat_list[str_replace(" ", "_", $value['name'])] = $value['title']; } @@ -110,7 +114,7 @@ function _panels_profile_fields_options( } /** - * 'Edit' callback for the 'profile fields' content type. + * 'Edit' callback for the 'profile fields' content type. */ function panels_profile_fields_configure($id, $parents, $conf = array()) { // Apply defaults @@ -126,7 +130,7 @@ function panels_profile_fields_configure '#prefix' => '
', '#suffix' => '
', ); - + $form['empty'] = array( '#type' => 'textarea', '#title' => 'Empty text', @@ -141,7 +145,7 @@ function panels_profile_fields_configure } /** - * 'Title' callback for the 'profile fields' content type. + * 'Title' callback for the 'profile fields' content type. */ function panels_profile_fields_configure_title($conf, $context) { return t('"@s" profile fields', array('@s' => $conf['category'])); Index: content_types/term_description.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/term_description.inc,v retrieving revision 1.1.2.8 diff -u -p -r1.1.2.8 term_description.inc --- content_types/term_description.inc 24 May 2008 01:39:13 -0000 1.1.2.8 +++ content_types/term_description.inc 27 May 2008 16:52:56 -0000 @@ -1,5 +1,7 @@ t('Term description'), 'content_types' => 'panels_admin_content_types_term_description', - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'render callback' => 'panels_content_term_description', 'add callback' => 'panels_admin_edit_term_description', 'edit callback' => 'panels_admin_edit_term_description', @@ -66,3 +69,4 @@ function panels_admin_content_types_term function panels_admin_title_term_description($conf, $context) { return t('"@s" term description', array('@s' => $context->identifier)); } + Index: content_types/term_list.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/term_list.inc,v retrieving revision 1.1.2.8 diff -u -p -r1.1.2.8 term_list.inc --- content_types/term_list.inc 24 May 2008 04:59:05 -0000 1.1.2.8 +++ content_types/term_list.inc 27 May 2008 16:53:07 -0000 @@ -1,5 +1,7 @@ t('List of related terms'), 'content_types' => 'panels_admin_content_types_term_list', - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'render callback' => 'panels_content_term_list', 'add callback' => 'panels_admin_edit_term_list', 'edit callback' => 'panels_admin_edit_term_list', @@ -33,19 +36,23 @@ function panels_content_term_list($conf, case 'related': $terms = taxonomy_get_related($term->tid); break; + case 'child': default: $terms = taxonomy_get_children($term->tid); break; + case 'top': $terms = taxonomy_get_children(0, $term->vid); break; + case 'sibling': $parent = db_result(db_query("SELECT parent FROM {term_hierarchy} WHERE tid = %d", $term->tid)); $terms = taxonomy_get_children($parent, $term->vid); // Remove the term that started this. unset($terms[$term->tid]); break; + case 'synonyms': $terms = taxonomy_get_synonyms($term->tid); break; @@ -124,3 +131,4 @@ function panels_admin_title_term_list($c $options = panels_admin_term_list_options(); return t('"@s" @type', array('@s' => $context->identifier, '@type' => drupal_strtolower($options[$conf['type']]))); } + Index: content_types/user_picture.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/user_picture.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 user_picture.inc --- content_types/user_picture.inc 24 May 2008 01:39:13 -0000 1.1.2.2 +++ content_types/user_picture.inc 27 May 2008 16:53:17 -0000 @@ -1,5 +1,7 @@ data) ? drupal_clone($context->data) : NULL; $block = new stdClass(); $block->module = 'term-list'; - + if ($account === FALSE || ($account->access == 0 && !user_access('administer users'))) { return drupal_not_found(); } @@ -55,3 +57,4 @@ function panels_admin_content_types_user function panels_admin_title_user_picture($conf, $context) { return t('"@s" user picture', array('@s' => $context->identifier)); } + Index: content_types/user_profile.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/Attic/user_profile.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 user_profile.inc --- content_types/user_profile.inc 24 May 2008 01:39:13 -0000 1.1.2.2 +++ content_types/user_profile.inc 27 May 2008 16:53:27 -0000 @@ -1,5 +1,7 @@ data) ? drupal_clone($context->data) : NULL; $block = new stdClass(); $block->module = 'term-list'; - + if ($account === FALSE || ($account->access == 0 && !user_access('administer users'))) { return drupal_not_found(); } @@ -75,3 +77,4 @@ function panels_admin_content_types_user function panels_admin_title_user_profile($conf, $context) { return t('"@s" user profile', array('@s' => $context->identifier)); } + Index: content_types/views.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/content_types/views.inc,v retrieving revision 1.4.4.27 diff -u -p -r1.4.4.27 views.inc --- content_types/views.inc 9 Jan 2008 16:55:21 -0000 1.4.4.27 +++ content_types/views.inc 27 May 2008 16:46:59 -0000 @@ -1,2 +1,5 @@ data) ? drupal_clone($context->data) : NULL; - $max_depth = (!empty($conf['max_depth'])? (int)$conf['max_depth'] : NULL); + $max_depth = (!empty($conf['max_depth']) ? (int)$conf['max_depth'] : NULL); if ($conf['tree'] == FALSE) { $terms = taxonomy_get_tree($vocab->vid, 0, -1, $max_depth); $items = array(); @@ -38,10 +40,10 @@ function panels_content_vocabulary_terms } $block = new stdClass(); - $block->module = 'node_type'; + $block->module = 'node_type'; $block->subject = $vocab->name; $block->content = $output; - $block->delta = $vocab->tid; + $block->delta = $vocab->tid; return $block; } @@ -104,3 +106,4 @@ function panels_admin_edit_vocabulary_te return $form; } + Index: contexts/node.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/contexts/Attic/node.inc,v retrieving revision 1.1.2.9 diff -u -p -r1.1.2.9 node.inc --- contexts/node.inc 24 May 2008 06:15:33 -0000 1.1.2.9 +++ contexts/node.inc 27 May 2008 16:54:17 -0000 @@ -1,5 +1,7 @@ data = $data; - $context->title = $data->title; + $context->data = $data; + $context->title = $data->title; $context->argument = $data->nid; return $context; } @@ -60,7 +62,7 @@ function panels_context_node_settings_fo '#type' => 'textfield', '#maxlength' => 512, '#autocomplete_path' => 'panels/node/autocomplete', - '#weight' => -10, + '#weight' => -10, ); if (!empty($conf['nid'])) { @@ -116,5 +118,5 @@ function panels_context_node_settings_fo else { form_set_value($form['nid'], $node->nid); } - } + Index: contexts/node_add_form.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/contexts/Attic/node_add_form.inc,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 node_add_form.inc --- contexts/node_add_form.inc 22 Dec 2007 19:48:52 -0000 1.1.2.3 +++ contexts/node_add_form.inc 27 May 2008 16:55:10 -0000 @@ -1,5 +1,7 @@ data = $type; // In a form, $data is the object being edited. - $context->title = $types[$type]->name; + // In a form, $data is the object being edited. + $context->data = $type; + $context->title = $types[$type]->name; $context->argument = $type; // These are specific pieces of data to this form. - $context->form = $form; // All forms should place the form here. - $context->form_id = $type . '_node_form'; + // All forms should place the form here. + $context->form = $form; + $context->form_id = $type . '_node_form'; $context->form_title = t('Submit @name', array('@name' => $types[$type]->name)); - $context->node_type = $type; + $context->node_type = $type; return $context; } } @@ -65,7 +69,7 @@ function panels_context_node_add_form_se $options[0] = t('External source'); } - foreach (node_get_types() as $type => $info) { + foreach (node_get_types() as $type => $info) { $options[$type] = $info->name; } @@ -83,3 +87,4 @@ function panels_context_node_add_form_se return $form; } + Index: contexts/node_edit_form.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/contexts/Attic/node_edit_form.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 node_edit_form.inc --- contexts/node_edit_form.inc 24 May 2008 06:15:33 -0000 1.1.2.5 +++ contexts/node_edit_form.inc 27 May 2008 16:55:39 -0000 @@ -1,5 +1,7 @@ type . '_node_form', $node); drupal_process_form($node->type . '_node_form', $form); // Fill in the 'node' portion of the context - $context->data = $node; - $context->title = $node->title; + $context->data = $node; + $context->title = $node->title; $context->argument = $node->nid; - $context->form = $form; - $context->form_id = $node->type . '_node_form'; + $context->form = $form; + $context->form_id = $node->type . '_node_form'; $context->form_title = $node->title; - $context->node_type = $node->type; + $context->node_type = $node->type; return $context; } } @@ -79,7 +81,7 @@ function panels_context_node_edit_form_s '#type' => 'textfield', '#maxlength' => 512, '#autocomplete_path' => 'panels/node/autocomplete', - '#weight' => -10, + '#weight' => -10, ); if (!empty($conf['nid'])) { @@ -131,3 +133,4 @@ function panels_context_node_edit_form_s form_error($form['node'], t('Invalid post selected')); } } + Index: contexts/term.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/contexts/Attic/term.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 term.inc --- contexts/term.inc 24 May 2008 01:39:14 -0000 1.1.2.5 +++ contexts/term.inc 27 May 2008 16:55:53 -0000 @@ -1,5 +1,7 @@ data = $data; - $context->title = $data->name; + $context->data = $data; + $context->title = $data->name; $context->argument = $data->tid; return $context; } Index: contexts/user.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/contexts/Attic/user.inc,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 user.inc --- contexts/user.inc 24 May 2008 01:39:14 -0000 1.1.2.6 +++ contexts/user.inc 27 May 2008 16:56:02 -0000 @@ -1,5 +1,7 @@ data = $data; - $context->title = $data->name; + $context->data = $data; + $context->title = $data->name; $context->argument = $data->uid; return $context; } @@ -48,3 +50,4 @@ function panels_context_user_settings_fo $form = array(); return $form; } + Index: contexts/vocabulary.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/contexts/Attic/vocabulary.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 vocabulary.inc --- contexts/vocabulary.inc 22 Dec 2007 19:48:52 -0000 1.1.2.4 +++ contexts/vocabulary.inc 27 May 2008 16:56:15 -0000 @@ -1,5 +1,7 @@ data = $data; - $context->title = $data->name; + $context->data = $data; + $context->title = $data->name; $context->argument = $data->vid; return $context; } @@ -67,3 +69,4 @@ function panels_context_vocabulary_setti return $form; } + Index: docs/docs.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/docs/Attic/docs.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 docs.inc --- docs/docs.inc 18 May 2008 23:46:43 -0000 1.1.2.1 +++ docs/docs.inc 27 May 2008 16:46:59 -0000 @@ -1,5 +1,7 @@ Pane: Panes are individual content items, and are the smallest/highest-level unit of content - * that the Panels API itself configures and renders. If you've used the Panels 2 content + * that the Panels API itself configures and renders. If you've used the Panels 2 content * editor at all, then you're probably most familiar with panes via the 'Add Content' @ref modal * where you pick out the content you'd like to add. Each one of the items on that form is * a @ref content_type (or subtype); once you select one and fill out the form, * you'll see a graphical representation of the new pane appear. \n\n - * - @anchor region Panel: Panels are the containers that hold @ref pane "Panes". When you select + * - @anchor region Panel: Panels are the containers that hold @ref pane "Panes". When you select * a @ref layout "layout", what you're choosing is the number and arrangement of panels. The content editor * represents panels quite well: panels are the blue (by default) boxes with their name at the top and the - * plus-shaped button that opens the 'Add content' @ref modal . And yes the namespace ambiguity is awful - + * plus-shaped button that opens the 'Add content' @ref modal . And yes the namespace ambiguity is awful - * we're resolving it soon by changing this term to 'Region'. \n\n * - @anchor display Display: The Display unit is the most abstract of the three layout terms. Again, the Panels 2 content editor * is a good way to think about it: there's no visual representation of a display in the editor because the display IS what you're editing: it's the object that contains - * the @ref region "panels", and it's settings in the display object that govern, for example, which content types are available on the + * the @ref region "panels", and it's settings in the display object that govern, for example, which content types are available on the * 'Add Content' form. \n\n * Displays are abstract and often the most difficult for newcomers to Panels to understand. They're also probably the most important thing that developers - * implementing the Panels API in a @ref client_module "client module" need to understand, as client modules work almost + * implementing the Panels API in a @ref client_module "client module" need to understand, as client modules work almost * exclusively with display objects. Displays are essentially the 'root' object of the API - this is functionally true in * Panels 2, but it will be literally the case after Panels is rewritten in OO for Panels 3. \n\n * In addition to @ref region "Panels", displays hold almost all of the @ref terms_plugins "Panels plugins" and are required * in most of the @ref mainapi "main API functions"; this is why client modules interact with the Panels API primarily through * display objects.\n\n * @section terms_plugins Panels Plugins - * The Panels API is essentially just a structure for negotiating its plugins. For a thorough introduction to plugins, + * The Panels API is essentially just a structure for negotiating its plugins. For a thorough introduction to plugins, * see the introduction to the @ref plugins_api "plugins API". * - @anchor arguments Arguments: * - @anchor content_types Content Types: @@ -68,51 +70,51 @@ * The Panels API uses a system of plugins to manage pretty much everything it does. Without the * plugins, the API is an empty shell; plugins define the 'what, where, and how' of Panels' behavior. Panels uses six different types of plugins. Specific reference information for each plugin type is available on the corresponding page: * - @subpage plugin_arguments "Arguments" - * - @subpage plugin_content_types "Content Types" + * - @subpage plugin_content_types "Content Types" * - @subpage plugin_context "Context" * - @subpage plugin_layouts "Layouts" * - @subpage plugin_styles "Styles" * - @subpage plugin_relationships "Relationships". \n\n - * + * * These correspond to the similarly-named subdirectories filled with .inc files - each of those .inc files declares (at least) one plugin. - * + * * @section plugmain_structure Structure of a Plugin * All panels plugins have the same basic structure. Each plugin begins with a declaration function, which the Panels API identifies either by * function name alone or through a combination of function name and .inc file location depending on the @ref plugmain_method "method being used". * Regardless of the method or plugin type, the API expects the same thing to be returned from the definition function: an array containing function names - * and/or configuration values. The array keys to be used depend entirely on the content type, so see one of the plugin subpages for examples. \n\n - * + * and/or configuration values. The array keys to be used depend entirely on the content type, so see one of the plugin subpages for examples. \n\n + * * Once the Panels API is aware of a plugin, it will call functions/grab configuration values from the plugin definition on an as-needed basis. (Various * systems minimize the number of times that a given include file needs to be loaded). */ - /** * @page plugin_arguments Panels Plugins Reference: Arguments - * + * */ /** * @page plugin_content_types Panels Plugins Reference: Content Types - * + * */ /** * @page plugin_context Panels Plugins Reference: Context - * + * */ /** * @page plugin_layouts Panels Plugins Reference: Layouts - * + * */ /** * @page plugin_styles Panels Plugins Reference: Styles - * + * */ /** * @page plugin_relationships Panels Plugins Reference: Relationships - * - */ \ No newline at end of file + * + */ + Index: includes/common.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/includes/Attic/common.inc,v retrieving revision 1.1.2.26 diff -u -p -r1.1.2.26 common.inc --- includes/common.inc 24 May 2008 01:39:14 -0000 1.1.2.26 +++ includes/common.inc 27 May 2008 17:00:41 -0000 @@ -1,16 +1,17 @@ list_layouts() as $layout_name) { // TODO would be nice if there was a way to just fetch the names easily + // TODO would be nice if there was a way to just fetch the names easily + foreach ($this->list_layouts() as $layout_name) { $this->allowed_layout_settings[$layout_name] = $start_allowed ? 1 : 0; } } - + /** * Manage panels_common_set_allowed_layouts(), the FAPI code for selecting allowed layouts. - * + * * MAKE SURE to set panels_allowed_layouts::allow_new before calling this method. If you want the panels API * to handle saving these allowed layout settings, panels_allowed_layouts::module_name must also be set. - * - * Below is a sample implementation; refer to the rest of the class documentation to understand all the + * + * Below is a sample implementation; refer to the rest of the class documentation to understand all the * specific pieces. Values that are intended to be replaced are wrapped with <>. - * + * * \n @code * function docdemo_allowed_layouts() { * panels_load_include('common'); @@ -120,33 +123,33 @@ class panels_allowed_layouts { * } * } * @endcode \n - * + * * If $allowed_layouts->form_state == 'failed-validate' || 'render', then you'll need to return * $result as it contains the structured form HTML generated by drupal_render_form() and is ready * to be passed through index.php's call to theme('page', ...). - * + * * However, if $allowed_layouts->form_state == 'submit', then the form has been submitted and we should * react. It's really up to your client module how you handle the rest; panels_allowed_layouts::save() (or - * panels_allowed_layouts::api_save(), if that's the route you're going) will have already been called, + * panels_allowed_layouts::api_save(), if that's the route you're going) will have already been called, * so if those methods handle your save routine, then all there is left to do is handle redirects, if you * want. The current implementation of the allowed layouts form currently never redirects, so it's up to - * you to control where the user ends up next. - * + * you to control where the user ends up next. + * * @param string $title * Used to set the title of the allowed layouts form. If no value is given, defaults to * 'Panels: Allowed Layouts'. - * + * * @return mixed $result - * - On the first passthrough when the form is being rendered, $result is the form's structured + * - On the first passthrough when the form is being rendered, $result is the form's structured * HTML, ready to be pushed to the screen with a call to theme('page', ...). - * - A successful second passthrough indicates a successful submit, and + * - A successful second passthrough indicates a successful submit, and * $result === panels_allowed_layouts::allowed_layout_settings. Returning it is simply for convenience. */ function set_allowed($title = 'Panels: Allowed Layouts') { $this->sync_with_available(); $form_id = 'panels_common_set_allowed_layouts'; $form = drupal_retrieve_form($form_id, $this, $title); - + if ($result = drupal_process_form($form_id, $form)) { // successful submit $this->form_state = 'submit'; @@ -156,11 +159,11 @@ class panels_allowed_layouts { $result = drupal_render_form($form_id, $form); return $result; } - + /** * Checks for newly-added layouts and deleted layouts. If any are found, updates panels_allowed_layouts::allowed_layout_settings; * new additions are made according to panels_allowed_layouts::allow_new, while deletions are unset(). - * + * * Note that any changes made by this function are not saved in any permanent location. */ function sync_with_available() { @@ -172,20 +175,20 @@ class panels_allowed_layouts { unset($this->allowed_layout_settings[$deleted_layout]); } } - + /** - * Use panels_allowed_layouts::module_name to generate a variable for variable_set(), in which + * Use panels_allowed_layouts::module_name to generate a variable for variable_set(), in which * a serialized version of $this will be stored. - * + * * Does nothing if panels_allowed_layouts::module_name is not set. - * + * * IMPORTANT NOTE: if you use variable_get() in a custom client module save() method, you MUST - * wrap $this in serialize(), then unserialize() what you get from variable_get(). Failure to + * wrap $this in serialize(), then unserialize() what you get from variable_get(). Failure to * do so will result in an incomplete object. The following code will work: * @code * $allowed_layouts = unserialize(variable_get('your_variable_name', serialize('')); * @endcode - * + * * If you don't serialize the second parameter of variable_get() and the variable name you provide * can't be found, an E_STRICT warning will be generated for trying to unserialize an entity * that has not been serialized. @@ -196,10 +199,10 @@ class panels_allowed_layouts { variable_set($this->module_name . "_allowed_layouts", serialize($this)); } } - + /** * Snag a list of the current layouts for internal use. - * + * * Data is not saved in a class member in order to ensure that it's * fresh. * @@ -321,7 +324,7 @@ function panels_common_get_allowed_types // Get a list of all types that are available $default_types = variable_get($module . '_defaults', $default_defaults); - $allowed_types = variable_get($module .'_allowed_types', $default_allowed_types); + $allowed_types = variable_get($module . '_allowed_types', $default_allowed_types); // By default, if they haven't gone and done the initial setup here, // let all 'other' types (which will be all types) be available. @@ -337,36 +340,37 @@ function panels_common_get_allowed_types /** * The FAPI code for generating an 'allowed layouts' selection form. - * + * * NOTE: Because the Panels API does not guarantee a particular method of storing the data on allowed layouts, * it is not_possible for the Panels API to implement any checks that determine whether reductions in - * the set of allowed layouts conflict with pre-existing layout selections. $displays in that category + * the set of allowed layouts conflict with pre-existing layout selections. $displays in that category * will continue to function with their current layout as normal until the user/owner/admin attempts - * to change layouts on that display, at which point they will have to select from the new set of + * to change layouts on that display, at which point they will have to select from the new set of * allowed layouts. If this is not the desired behavior for your client module, it's up to you to * write a validation routine that determines what should be done with conflicting layouts. - * + * * Remember that changing layouts where panes have already been created can result in data loss; - * consult panels_change_layout() to see how the Panels API handles that process. Running - * drupal_execute('panels_change_layout', ...) is one possible starting point. - * + * consult panels_change_layout() to see how the Panels API handles that process. Running + * drupal_execute('panels_change_layout', ...) is one possible starting point. + * * @ingroup forms - * + * * @param array $allowed_layouts * The set of allowed layouts that should be used as the default values * for this form. If none is provided, then by default no layouts will be restricted. * @param string $title * The title that will be used for the form. Defaults to 'Panels: Allowed Layouts' if * no value was provided in panels_allowed_layouts::set_allowed. - */ // TODO need to add something that handles $finish & $destination-type stuff. + */ +// TODO need to add something that handles $finish & $destination-type stuff. function panels_common_set_allowed_layouts($allowed_layouts, $title) { $layouts = panels_get_layouts(); foreach ($layouts as $id => $layout) { $options[$id] = panels_print_layout_icon($id, $layout, check_plain($layout['title'])); } - + drupal_set_title($title); - + $form['variables'] = array('#type' => 'value', '#value' => array($allowed_layouts)); drupal_add_js(panels_get_path('js/layout.js')); @@ -377,7 +381,7 @@ function panels_common_set_allowed_layou '#description' => t('Check the boxes for all layouts you want to allow users choose from when picking a layout. You must allow at least one layout.'), '#default_value' => array_keys(array_filter($allowed_layouts->allowed_layout_settings)), ); - + $form['clearer'] = array( // TODO: FIx this to use clear-block instead '#value' => '
', @@ -387,7 +391,7 @@ function panels_common_set_allowed_layou '#type' => 'submit', '#value' => t('Save'), ); - + $form['#token'] = FALSE; return $form; } @@ -398,7 +402,7 @@ function panels_common_set_allowed_layou form_set_error('layouts', 'You must choose at least one layout to allow.'); } } - + function panels_common_set_allowed_layouts_submit($form_id, $form_values) { list($allowed_layouts) = $form_values['variables']; foreach ($form_values['layouts'] as $layout => $setting) { @@ -458,7 +462,6 @@ function panels_common_get_layout_inform // --------------------------------------------------------------------------- // contexts -- highly resemble arguments. - function panels_common_context_info($type = NULL) { static $info = NULL; @@ -568,7 +571,7 @@ function panels_common_add_context_form( // Store the order the choices are in so javascript can manipulate it. $form_location['markup'] = array( - '#value' => ' ' + '#value' => ' ', ); $form['context_order'] = array( '#type' => 'hidden', @@ -608,7 +611,7 @@ function panels_common_add_required_cont // Store the order the choices are in so javascript can manipulate it. $form_location['markup'] = array( - '#value' => ' ' + '#value' => ' ', ); $form['requiredcontext_order'] = array( '#type' => 'hidden', @@ -646,7 +649,7 @@ function panels_common_add_relationship_ // Store the order the choices are in so javascript can manipulate it. $form_location['markup'] = array( - '#value' => ' ' + '#value' => ' ', ); $form['relationship_order'] = array( '#type' => 'hidden', @@ -838,9 +841,9 @@ function theme_panels_common_context_ite */ function theme_panels_common_context_item_form($form) { $output = ''; - $type = $form['#panels_context_type']; + $type = $form['#panels_context_type']; $module = $form['#panels_context_module']; - $name = $form['#panel_name']; + $name = $form['#panel_name']; $type_info = panels_common_context_info($type); @@ -867,7 +870,7 @@ function theme_panels_common_context_ite if (!empty($form['buttons'])) { // Display the add context item. - $row = array(); + $row = array(); $row[] = array('data' => drupal_render($form['buttons'][$type]['item']), 'class' => 'title'); $row[] = array('data' => drupal_render($form['buttons'][$type]['add']), 'class' => 'add', 'width' => "60%"); $output .= '
'; @@ -975,8 +978,8 @@ function panels_common_ajax_context_item $output->relationships_table = drupal_render($rel_form); } - $output->type = 'add'; - $output->output = theme('panels_common_context_item_row', $type, $arg_form[$type], $position, $position); + $output->type = 'add'; + $output->output = theme('panels_common_context_item_row', $type, $arg_form[$type], $position, $position); $output->position = $position; panels_ajax_render($output); } @@ -1042,7 +1045,7 @@ function panels_common_ajax_context_item $retval = drupal_process_form($form_id, $form); if ($retval) { - $output = new stdClass(); + $output = new stdClass(); // successful submit // Save changes @@ -1471,10 +1474,13 @@ function panels_common_ajax($module = NU switch ($module) { case 'edit': return panels_common_ajax_context_item_edit($data, $info, $info2); + case 'add': return panels_common_ajax_context_item_add($data, $info, $info2); + case 'panel_settings': return panels_common_panel_settings_ajax($data, $info); + default: panels_ajax_render(t('An error occurred'), t('Error')); } @@ -1547,7 +1553,7 @@ function theme_panels_common_content_lis function theme_panels_common_context_list($object) { $titles = array(); $output = ''; - $count = 1; + $count = 1; // First, make a list of arguments. Arguments are pretty simple. if (!empty($object->arguments)) { foreach ($object->arguments as $argument) { @@ -1586,3 +1592,4 @@ function theme_panels_common_context_lis return "$output
\n"; } } + Index: includes/display_edit.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/includes/Attic/display_edit.inc,v retrieving revision 1.1.2.46 diff -u -p -r1.1.2.46 display_edit.inc --- includes/display_edit.inc 25 May 2008 21:19:57 -0000 1.1.2.46 +++ includes/display_edit.inc 27 May 2008 17:07:49 -0000 @@ -1,6 +1,7 @@ 'value', - '#value' => $display + '#value' => $display, ); if (!empty($destination)) { $form['destination'] = array( '#type' => 'value', - '#value' => $destination + '#value' => $destination, ); } else { @@ -112,7 +113,7 @@ function panels_edit_display($display, $ if ($caches && user_access('use panels caching features')) { $form['button'][$pid]['cache'] = panels_add_button('icon-cache.png', t('Caching'), t('Control caching'), 'pane-cache'); } - $form['button'][$pid]['show_hide'] = panels_add_button($pane->shown ? 'icon-hidepane.png' : 'icon-showpane.png' , t('Show/Hide Toggle'), $pane->shown ? t('Hide this pane') : t('Show this pane'), 'pane-toggle-shown'); + $form['button'][$pid]['show_hide'] = panels_add_button($pane->shown ? 'icon-hidepane.png' : 'icon-showpane.png', t('Show/Hide Toggle'), $pane->shown ? t('Hide this pane') : t('Show this pane'), 'pane-toggle-shown'); $form['button'][$pid]['configure'] = panels_add_button('icon-configure.png', t('Configure'), t('Configure this pane'), 'pane-configure'); $form['button'][$pid]['delete'] = panels_add_button('icon-delete.png', t('Delete'), t('Remove this pane'), 'pane-delete'); } @@ -127,7 +128,8 @@ function panels_edit_display($display, $ foreach ($layout_panels as $panel_id => $title) { $form['panel']['pane'][$panel_id] = array( - '#type' => 'hidden', // Use 'hidden' instead of 'value' so the js can access it. + // Use 'hidden' instead of 'value' so the js can access it. + '#type' => 'hidden', '#default_value' => implode(',', (array) $display->panels[$panel_id]), ); } @@ -169,11 +171,12 @@ function panels_edit_display($display, $ /** * Theme the form for editing display content. - * + * * @ingroup themeable * * @param array $form * A structured FAPI $form array. + * * @return string $output * HTML ready to be rendered. Note that the html produced here should be printed, * not returned, as it bypasses block rendering. Block rendering must be bypassed @@ -208,7 +211,7 @@ function theme_panels_edit_display($form /** * Handle form submission of the display content editor. - * + * * The behavior of this function is fairly complex and irregular compared to * most FAPI submit handlers. See the documentation on panels_edit() for a * detailed discussion of this behavior. @@ -223,7 +226,8 @@ function panels_edit_display_submit($for $display->panels[$panel_id] = array(); if ($panes) { $pids = explode(',', $panes); - foreach (array_filter($pids) as $pid) { // need to filter the array, b/c passing it in a hidden field can generate trash + // need to filter the array, b/c passing it in a hidden field can generate trash + foreach (array_filter($pids) as $pid) { if ($old_content[$pid]) { $display->panels[$panel_id][] = $pid; $old_content[$pid]->panel = $panel_id; @@ -244,20 +248,24 @@ function panels_edit_display_submit($for /** * Handle calling and processing of the form for editing display layouts. - * + * * Helper function for panels_edit_layout(). * * @see panels_edit_layout() for details on the various behaviors of this function. */ function _panels_edit_layout($display, $finish, $destination, $allowed_layouts) { panels_load_include('common'); - if (is_string($allowed_layouts)) { // module_name has been provided; the data was saved by the api_save() method. + // module_name has been provided; the data was saved by the api_save() method. + if (is_string($allowed_layouts)) { $allowed_layouts = unserialize(variable_get($allowed_layouts . "_allowed_layouts", serialize(''))); } - if (!$allowed_layouts) { // if no parameter was provided, or the variable_get failed - $allowed_layouts = unserialize(variable_get('panels_common_allowed_layouts', serialize(''))); // tries to load the common panels allowed layouts - if (!$allowed_layouts) { - $allowed_layouts = new panels_allowed_layouts(); // still no dice. simply creates a dummy version where all layouts are allowed. + // if no parameter was provided, or the variable_get failed + if (!$allowed_layouts) { + // tries to load the common panels allowed layouts + $allowed_layouts = unserialize(variable_get('panels_common_allowed_layouts', serialize(''))); + if (!$allowed_layouts) { + // still no dice. simply creates a dummy version where all layouts are allowed. + $allowed_layouts = new panels_allowed_layouts(); $allowed_layouts->allow_new = TRUE; } } @@ -278,7 +286,7 @@ function _panels_edit_layout($display, $ /** * Form definition for the display layout editor. - * + * * @ingroup forms */ function panels_choose_layout($display, $finish, $destination, $allowed_layouts) { @@ -298,7 +306,7 @@ function panels_choose_layout($display, '#type' => 'radios', '#title' => t('Choose layout'), '#options' => $options, - '#default_value' => in_array($display->layout, array_keys($layouts)) ? $display->layout : NULL, + '#default_value' => in_array($display->layout, array_keys($layouts)) ? $display->layout : NULL, ); $form['clearer'] = array( @@ -336,13 +344,14 @@ function panels_choose_layout($display, ); } - $form['#token'] = FALSE; // no token please + // no token please + $form['#token'] = FALSE; return $form; } /** * Handle form submission of the display layout editor. - * + * * The behavior of this function is fairly complex and irregular compared to * most FAPI submit handlers. See the documentation on panels_edit_layout() for * detailed discussion of this behavior. @@ -355,7 +364,7 @@ function panels_choose_layout_submit($fo if (!empty($form_values['old'])) { foreach ($form_values['old'] as $id => $new_id) { $content[$new_id] = array_merge((array) $content[$new_id], $display->panels[$id]); - foreach($content[$new_id] as $pid) { + foreach ($content[$new_id] as $pid) { $display->content[$pid]->panel = $new_id; } } @@ -379,14 +388,14 @@ function panels_choose_layout_submit($fo /** * Form definition for the display layout converter. - * + * * This form is only triggered if the user attempts to change the layout * for a display that has already had content assigned to it. It allows * the user to select where the panes located in to-be-deleted panels should * be relocated to. - * + * * @ingroup forms - * + * * @param array $form * A structured FAPI $form array. * @param object $display instanceof panels_display \n @@ -454,8 +463,8 @@ function panels_change_layout(&$form, $d /** * Handle calling and processing of the form for editing display layout settings. - * - * Helper function for panels_edit_layout_settings(). + * + * Helper function for panels_edit_layout_settings(). * * @see panels_edit_layout_settings() for details on the various behaviors of this function. */ @@ -475,25 +484,26 @@ function _panels_edit_layout_settings($d /** * Form definition for the display layout settings editor. - * + * * @ingroup forms * @see panels_edit_layout_settings_form_validate() * @see panels_edit_layout_settings_form_submit() */ function panels_edit_layout_settings_form($display, $finish, $destination, $title) { $layout = panels_get_layout($display->layout); - if (!empty($layout['settings form']) && function_exists($layout['settings form'])) { // TODO doc the ability to do this as part of the API + // TODO doc the ability to do this as part of the API + if (!empty($layout['settings form']) && function_exists($layout['settings form'])) { $form['layout_settings'] = $layout['settings form']($display, $layout, $display->layout_settings); $form['layout_settings']['#tree'] = TRUE; } if ($title) { - $form['display_title'] = array ( + $form['display_title'] = array( '#type' => 'fieldset', '#title' => t('Panel Title'), '#tree' => TRUE, ); - + $form['display_title']['title'] = array( '#type' => 'textfield', '#size' => 35, @@ -501,14 +511,14 @@ function panels_edit_layout_settings_for '#title' => t('Title'), '#description' => t('The title of this panel. Your theme will render this text as the main page title users view this display, unless this text is overridden elsewhere.'), ); - + $form['display_title']['hide_title'] = array( '#type' => 'checkbox', '#title' => t('Hide Title?'), '#default_value' => $display->hide_title, '#description' => t('Check this box to hide the main page title for this panel.'), ); - + if (is_string($title)) { $form['display_title']['title']['#description'] .= t(" If you leave this field blank, then the default title, '@title', will be used instead.", array('@title' => $title)); } @@ -565,7 +575,7 @@ function panels_edit_layout_settings_for if (!empty($layout['settings submit']) && function_exists($layout['settings submit'])) { $layout['settings submit']($form_values['layout_settings'], $display, $layout, $display->layout_settings); } - + if (isset($form_values['display_title']['title'])) { $display->title = $form_values['display_title']['title']; $display->hide_title = $form_values['display_title']['hide_title']; @@ -624,7 +634,7 @@ function panels_show_pane($display, $pan else { $block = _panels_render_preview_pane_disabled($pane, $display->context); } - + $output = theme('panels_pane_dnd', $block, $pane->pid, empty($content_type) ? panels_get_pane_title($pane, $display->context) : $block->title, $left_buttons, $buttons); if ($skin) { $class = 'panel-pane' . ($pane->shown ? '' : ' hidden-pane'); @@ -641,7 +651,7 @@ function panels_show_pane($display, $pan */ function _panels_render_preview_pane_disabled($pane, $context) { $block = new stdClass(); - $block->title = panels_get_pane_title($pane, $context); + $block->title = panels_get_pane_title($pane, $context); $block->content = '' . t("Dynamic content previews have been disabled to improve performance and stability for this editing screen.") . ''; return $block; } @@ -669,6 +679,7 @@ function panels_ajax($op = NULL, $did = $output = panels_edit_submit_subform($cache->display); } break; + default: pdbg('panels_ajax', serialize(array('did' => $did, 'data' => array('op' => $op, 'pid' => $pid)))); } @@ -695,8 +706,8 @@ function panels_ajax_add_content($did = if ($layout && array_key_exists($panel_id, $layout_panels)) { $output->output = panels_add_content($cache, $panel_id); - $output->type = 'display'; - $output->title = t('Add content to !s', array('!s' => $layout_panels[$panel_id])); + $output->type = 'display'; + $output->title = t('Add content to !s', array('!s' => $layout_panels[$panel_id])); } } panels_ajax_render($output); @@ -704,17 +715,18 @@ function panels_ajax_add_content($did = function panels_add_content($cache, $panel_id) { $return = new stdClass(); - $return->type = 'display'; + $return->type = 'display'; $return->title = t('Choose type'); - panels_set('return', $return); // TODO get rid of this deprecated method + // TODO get rid of this deprecated method + panels_set('return', $return); if (!isset($cache->content_types)) { $cache->content_types = panels_get_available_content_types(); } - $weights = array(t('Contributed modules') => 0); + $weights = array(t('Contributed modules') => 0); $categories = array(); - $titles = array(); + $titles = array(); foreach ($cache->content_types as $id => $types) { if (is_array($types)) { @@ -806,7 +818,7 @@ function panels_ajax_toggle_shown($did = if ((is_numeric($did) || $did == 'new') && $cache = panels_cache_get($did)) { $ajax_vars = new stdClass(); list($ajax_vars->type, $ajax_vars->id, $ajax_vars->old_op) = array('toggle-shown', $pid, drupal_strtolower($op)); - + if ($op == 'Show') { list($cache->display->content[$pid]->shown, $ajax_vars->output, $ajax_vars->new_op) = array(1, 'Hide', 'hide'); } @@ -814,9 +826,10 @@ function panels_ajax_toggle_shown($did = list($cache->display->content[$pid]->shown, $ajax_vars->output, $ajax_vars->new_op) = array(0, 'Show', 'show'); } else { - panels_ajax_render(); // bad args, error out. + // bad args, error out. + panels_ajax_render(); } - + panels_cache_set($cache->display->did, $cache); panels_ajax_render($ajax_vars); } @@ -825,13 +838,13 @@ function panels_ajax_toggle_shown($did = /** * Entry point for AJAX: Add pane configuration. - * + * * After updating the $cache data and equipping a new $pane object with basic values, * the general-purpose ajax form handler, panels_ajax_form(), is called and pushes the * configuration form to the screen. - * + * * Once form submission is completed, data is pushed back into js by panels_ajax_render(). - * + * * @param int $did * The display id for the display object currently being edited. Errors out silently if absent. * @param string $pane_info @@ -841,7 +854,7 @@ function panels_ajax_toggle_shown($did = * @endcode \n * $id contains the name of the content type, $panel_id the name of the panel region * to which the pane will be added, and $content_id is the name of the content subtype. - * + * * @see panels_content_config_form() */ function panels_ajax_add_config($did = NULL, $pane_info = NULL) { @@ -850,23 +863,26 @@ function panels_ajax_add_config($did = N $pid = $cache->display->next_new_pid(); $pane = new stdClass(); $pane->pid = "new-$pid"; - unset($cache->content_config[$pane->pid], $cache->pane); // Ensure there's no data relics. - $cc =& $cache->content_config[$pane->pid]; - - list($cc['content_type'], $cc['panel_id'], $cc['content_subtype']) = explode('-', $pane_info, 3); + // Ensure there's no data relics. + unset($cache->content_config[$pane->pid], $cache->pane); + $cc = &$cache->content_config[$pane->pid]; + + list($cc['content_type'], $cc['panel_id'], $cc['content_subtype']) = explode('-', $pane_info, 3); list($pane->type, $pane->subtype, $pane->configuration, $pane->access) = array($cc['content_type'], $cc['content_subtype'], array(), array()); _panels_ajax_ct_preconfigure($cache, $pane); $cache->pane = drupal_clone($pane); panels_cache_set($did, $cache); } - else { // Not the render passthrough, so the above data has been cached; we retrieve $pane from $cache. + else { + // Not the render passthrough, so the above data has been cached; we retrieve $pane from $cache. $pane = $cache->pane; - unset ($cache->pane); + unset($cache->pane); } - + $ajax_vars = panels_ajax_form('panels_content_config_form', t('Configure !subtype_title', array('!subtype_title' => $cache->content_config[$pane->pid]['ct_data']['subtype']['title'])), - url($_GET['q'], NULL, NULL, TRUE), $cache, $pane, TRUE); + url($_GET['q'], NULL, NULL, TRUE), $cache, $pane, TRUE + ); panels_ajax_render($ajax_vars); } panels_ajax_render(); @@ -874,34 +890,37 @@ function panels_ajax_add_config($did = N /** * Entry point for AJAX: Edit pane configuration. - * + * * Prepares the display $cache and a pre-existing $pane so that the pane configuration * form for the $pane can be rendered. - * + * * Once form submission is completed, data is pushed back into js by panels_ajax_render(). - * + * * @param int $did * The display id of the display object currently being edited. Errors out silently if absent. - * @param + * @param * The pane id of the pane object whose configuration form we're calling up to edit. - * + * * @see panels_content_config_form() */ function panels_ajax_configure($did = NULL, $pid = NULL) { if ((is_numeric($did) || $did == 'new') && $cache = panels_cache_get($did)) { - if (isset($cache->display->content[$pid]) && $pane = $cache->display->content[$pid]) {// && $pane = $cache->display->content[$pid]) { - if (!isset($_POST['form_id']) && empty($cc['built'])) { // Only perform on a form rendering passthrough and if the data hasn't already been built. - $cc =& $cache->content_config[$pane->pid]; + if (isset($cache->display->content[$pid]) && $pane = $cache->display->content[$pid]) { + // && $pane = $cache->display->content[$pid]) { + // Only perform on a form rendering passthrough and if the data hasn't already been built. + if (!isset($_POST['form_id']) && empty($cc['built'])) { + $cc = &$cache->content_config[$pane->pid]; if (!isset($cc)) { list($cc['content_type'], $cc['content_subtype']) = array($pane->type, $pane->subtype); _panels_ajax_ct_preconfigure($cache, $pane); panels_cache_set($did, $cache); } } - + $ajax_vars = panels_ajax_form('panels_content_config_form', t('Configure !subtype_title', array('!subtype_title' => $cache->content_config[$pane->pid]['ct_data']['subtype']['title'])), - url($_GET['q'], NULL, NULL, TRUE), $cache, $pane); + url($_GET['q'], NULL, NULL, TRUE), $cache, $pane + ); panels_ajax_render($ajax_vars); } } @@ -916,31 +935,33 @@ function panels_ajax_configure($did = NU * The loaded $cache object containing all the current $display editing data. * @param object $pane * The $pane object this ajax callback intends to operate on. - * + * * @see panels_ajax_configure() * @see panels_ajax_add_config() */ function _panels_ajax_ct_preconfigure(&$cache, &$pane) { - $cc =& $cache->content_config[$pane->pid]; - $cc['built'] = TRUE; // indicates that the data for this pane has been built for this round of edits and need not be rebuilt + $cc = &$cache->content_config[$pane->pid]; + // indicates that the data for this pane has been built for this round of edits and need not be rebuilt + $cc['built'] = TRUE; $subtype = $cc['ct_data']['subtype'] = $cache->content_types[$pane->type][$pane->subtype]; $type = $cc['ct_data']['type'] = panels_get_content_type($pane->type); - + $cc['ignore_roles'] = $type['ignore roles']; - + if (panels_plugin_get_function('content_types', $type, 'visibility control')) { $cc['visibility_controller'] = $type['visibility control']; - $cc['ignore_roles'] = TRUE; // defaults to NOT using the built-in pane access system if the ct defines a visibility callback + // defaults to NOT using the built-in pane access system if the ct defines a visibility callback + $cc['ignore_roles'] = TRUE; if (isset($type['roles and visibility']) && $type['roles and visibility'] === TRUE) { $cc['ignore_roles'] = FALSE; } } - + if (panels_plugin_get_function('content_types', $type, 'form control')) { $cc['form_controller'] = $type['form control']; } } - + /** * Master FAPI definition for all pane add/edit configuration forms. * @@ -951,14 +972,16 @@ function _panels_ajax_ct_preconfigure(&$ * @param bool $add * A boolean indicating whether we are adding a new pane ($add === TRUE) * operation in this operation, or editing an existing pane ($add === FALSE). + * * @return array $form * A structured FAPI form definition, having been passed through all the appropriate * content-type specific callbacks. */ function panels_content_config_form($cache, $pane, $add = FALSE) { $op = $add ? 'add' : 'edit'; - $cc = $cache->content_config[$pane->pid]; // for brevity and readability. - + // for brevity and readability. + $cc = $cache->content_config[$pane->pid]; + $form['start_form'] = array('#value' => '
'); $form['configuration'] = panels_ct_conf_form($cc['ct_data'], $cache->display->context, $pane->configuration); @@ -966,7 +989,7 @@ function panels_content_config_form($cac $form['configuration'] += $form_additions; } $form['configuration']['#tree'] = TRUE; - + if (!$cc['ignore_roles']) { if (user_access('administer pane access')) { $rids = array(); @@ -974,7 +997,7 @@ function panels_content_config_form($cac while ($obj = db_fetch_object($result)) { $rids[$obj->rid] = $obj->name; } - + $form['access'] = array( '#type' => 'checkboxes', '#title' => t('Access'), @@ -990,20 +1013,20 @@ function panels_content_config_form($cac ); } } - + if (isset($cc['visibility_controller'])) { $form['visibility'] = $cc['visibility_controller']($cache->display->context, $pane->subtype, $pane->configuration, $add); } - + $form['end_form'] = array('#value' => '
'); $form['next'] = array( '#type' => 'submit', '#value' => $add ? t('Add pane') : t('Save'), ); - + $form['vars'] = array('#type' => 'value', '#value' => array($cache, $pane, $add, $op)); - + // Allows content types that define this callback to have full control over the pane config form. if (isset($cc['form_controller'])) { call_user_func_array($cc['form_controller'], array(&$form, &$cache, $add)); @@ -1013,9 +1036,9 @@ function panels_content_config_form($cac /** * FAPI validator for panels_content_config_form(). - * + * * Call any validation functions defined by the content type. - * + * */ function panels_content_config_form_validate($form_id, $form_values, $form) { list($cache, $pane, $add, $op) = $form_values['vars']; @@ -1024,44 +1047,45 @@ function panels_content_config_form_vali /** * FAPI submit handler for panels_content_config_form(). - * - * Call any submit handlers defined by the content type, update - * the $cache object with the relevant data, save $cache to the + * + * Call any submit handlers defined by the content type, update + * the $cache object with the relevant data, save $cache to the * object_cache table, and return data for ajax updates. - * + * * @return object $ajax_vars * Variables to be passed to the ajax handler so that the overall edit form can * be updated as needed. */ function panels_content_config_form_submit($form_id, $form_values) { list($cache, $pane, $add, $op) = $form_values['vars']; - $cache->display->content[$pane->pid] = $pane; // Start by saving all initial $pane values into the array of pane data in $display->content. - - panels_ct_pane_submit_form($pane->type, $form_values['configuration'], $op); // Call the submit handler provided by the pane type, if any. + // Start by saving all initial $pane values into the array of pane data in $display->content. + $cache->display->content[$pane->pid] = $pane; + // Call the submit handler provided by the pane type, if any. + panels_ct_pane_submit_form($pane->type, $form_values['configuration'], $op); if (isset($form_values['visibility'])) { if ($visibility_submit = panels_plugin_get_function('content_types', $cache->content_config[$pane->pid]['ct_data']['type'], 'visibility submit')) { $cache->display->content[$pane->pid]->visibility = $visibility_submit($form_values['visibility']); } else { - // If no visibility submit callback is defined, fall back to the default storage behavior. Should be - // adequate for the vast majority of use cases, so most client modules won't need to define callbacks. + // If no visibility submit callback is defined, fall back to the default storage behavior. Should be + // adequate for the vast majority of use cases, so most client modules won't need to define callbacks. $cache->display->content[$pane->pid]->visibility = is_array($form_values['visibility']) ? array_keys(array_filter($form_values['visibility'])) : $form_values['visibility']; } } else { $cache->display->content[$pane->pid]->visibility = ''; } - + if (isset($form_values['access'])) { $cache->display->content[$pane->pid]->access = array_keys(array_filter($form_values['access'])); } else { $cache->display->content[$pane->pid]->access = array(); } - + $cache->display->content[$pane->pid]->configuration = $form_values['configuration']; - + // Call submit handlers specific to the $op ('add' or 'edit'). $ajax_vars = call_user_func_array("panels_content_config_" . $op . "_form_submit", array($form_values, &$cache, $pane)); $ajax_vars->id = $pane->pid; @@ -1071,16 +1095,17 @@ function panels_content_config_form_subm function panels_content_config_add_form_submit($form_values, $cache, $pane) { $ajax_vars = new stdClass(); - $ajax_vars->type = 'add'; + $ajax_vars->type = 'add'; $ajax_vars->region = $cache->content_config[$pane->pid]['panel_id']; - + $cache->display->panels[$cache->content_config[$pane->pid]['panel_id']][] = $pane->pid; $cache->display->content[$pane->pid]->shown = 1; - + // we need to fake the buttons a little. - $buttons['show_hide'] = panels_add_button('icon-hidepane.png', t('Show/Hide Toggle'), t('Hide this pane'), 'pane-toggle-shown'); // new panes are shown by default + // new panes are shown by default + $buttons['show_hide'] = panels_add_button('icon-hidepane.png', t('Show/Hide Toggle'), t('Hide this pane'), 'pane-toggle-shown'); $buttons['show_hide']['#parents'] = array('button', $pane->pid, 'show_hide'); - + if (panels_get_caches() && user_access('use panels caching features')) { $buttons['cache'] = panels_add_button('icon-cache.png', t('Caching'), t('Control caching'), 'pane-cache'); $buttons['cache']['#parents'] = array('button', $pane->pid, 'cache'); @@ -1100,9 +1125,9 @@ function panels_content_config_add_form_ function panels_content_config_edit_form_submit($form_values, $cache, $pane) { $block = _panels_render_preview_pane_disabled($pane, $cache->display->context); - + $ajax_vars = new stdClass(); - $ajax_vars->type = 'replace'; + $ajax_vars->type = 'replace'; $ajax_vars->output = theme('panels_pane_collapsible', $block, $cache->display); return $ajax_vars; } @@ -1122,8 +1147,9 @@ function panels_ajax_cache($did = NULL, } $method = panels_ajax_form('panels_edit_cache_method_form', - t('Select cache method'), url($_GET['q'], NULL, NULL, TRUE), - $cache->display, $pid); + t('Select cache method'), url($_GET['q'], NULL, NULL, TRUE), + $cache->display, $pid + ); return panels_ajax_cache_settings($cache, $pid, $method); } @@ -1189,7 +1215,8 @@ function panels_ajax_cache_settings($cac else { $cache->display = panels_ajax_form('panels_edit_cache_settings_form', t('Configure cache settings'), url($_GET['q'], NULL, NULL, TRUE), - $cache->display, $pid, $method, $function); + $cache->display, $pid, $method, $function + ); } panels_cache_set($cache->display->did, $cache); @@ -1386,8 +1413,8 @@ function panels_panel_settings($display) ); $layout_options = array_merge(array('-1' => t('Use the default panel style')), $options); - $layout = panels_get_layout($display->layout); - $layout_panels = panels_get_panels($layout, $display); + $layout = panels_get_layout($display->layout); + $layout_panels = panels_get_panels($layout, $display); $checkboxes = array(); foreach ($layout_panels as $id => $name) { @@ -1463,7 +1490,7 @@ function panels_panel_settings_submit($f /** * AJAX incoming to deal with the style settings modal - * + * * @ingroup panels_ajax */ function panels_panel_settings_ajax($did, $panel, $name) { @@ -1480,9 +1507,10 @@ function panels_panel_settings_ajax($did // Render the panels ajax form. This only returns to us on successful // submit; otherwise the form is rendered for us and nothing else happens. $style_settings[$panel] = panels_ajax_form('panels_common_style_settings_form', - t('Edit style settings for @style', array('@style' => $style['title'])), + t('Edit style settings for @style', array('@style' => $style['title'])), url($_GET['q'], NULL, NULL, TRUE), - $did, $style, $style_settings[$panel]); + $did, $style, $style_settings[$panel] + ); panels_common_cache_set('style_settings', $did, $style_settings); panels_ajax_render('dismiss'); @@ -1490,7 +1518,7 @@ function panels_panel_settings_ajax($did /** * Form for the style settings modal. - * + * * @ingroup panels_ajax */ function panels_common_style_settings_form($did, $style, $style_settings) { @@ -1622,10 +1650,10 @@ function theme_panels_pane_collapsible($ */ // @DND function theme_panels_hidden() { - $close_text = t('Close Window'); - $close_image = theme('image', panels_get_path('images/icon-delete.png'), t('Close window'), t('Close window')); + $close_text = t('Close Window'); + $close_image = theme('image', panels_get_path('images/icon-delete.png'), t('Close window'), t('Close window')); $throbber_image = theme('image', panels_get_path('images/throbber.gif'), t('Loading...'), t('Loading')); - $output = <<\n
\n
\n @@ -1647,3 +1675,4 @@ EOF; return $output; } + Index: includes/plugins.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/includes/Attic/plugins.inc,v retrieving revision 1.1.2.41 diff -u -p -r1.1.2.41 plugins.inc --- includes/plugins.inc 24 May 2008 04:59:04 -0000 1.1.2.41 +++ includes/plugins.inc 27 May 2008 17:10:40 -0000 @@ -1,5 +1,7 @@ type = $type; - $this->data = $data; + $this->type = $type; + $this->data = $data; $this->title = t('Unknown context'); } @@ -35,11 +40,25 @@ class panels_context { return (bool) array_intersect($a, $b); } - function get_argument() { return $this->argument; } - function get_keyword() { return $this->keyword; } - function get_identifier() { return $this->identifier; } - function get_title() { return $this->title; } - function get_page_title() { return $this->page_title; } + function get_argument() { + return $this->argument; + } + + function get_keyword() { + return $this->keyword; + } + + function get_identifier() { + return $this->identifier; + } + + function get_title() { + return $this->title; + } + + function get_page_title() { + return $this->page_title; + } } /** @@ -89,7 +108,7 @@ class panels_optional_context extends pa */ function add_empty(&$contexts) { $context = new panels_context('any'); - $context->title = t('No context'); + $context->title = t('No context'); $context->identifier = t('No context'); $contexts = array_merge(array('empty' => $context), $contexts); } @@ -147,7 +166,8 @@ function panels_pane_access($pane, $disp // Call the content type's custom-defined visibility rendering check. // Pass as much possibly relevant data as possible. $visibility_access = $visibility_check($pane, $display, $user); - if (!empty($type['roles and visibility'])) { // Content type marked both access modes to be ANDed together. + // Content type marked both access modes to be ANDed together. + if (!empty($type['roles and visibility'])) { return ($visibility_access === TRUE && $role_access === TRUE) ? TRUE : FALSE; } // Err on the safe side: if EVERYTHING else has failed, then don't render the pane. @@ -161,6 +181,7 @@ function panels_pane_access($pane, $disp * The pane object to test. * @param object $account * The current $user object. + * * @return bool $role_access * The boolean result of the roles-based segment of the Panels access system. */ @@ -262,7 +283,7 @@ function panels_ct_conf_form($ct_data, $ $form['override_title_markup'] = array( '#prefix' => '
', '#suffix' => '
', - '#value' => t('You may use %keywords from contexts, as well as %title to contain the original title.'), + '#value' => t('You may use %keywords from contexts, as well as %title to contain the original title.'), ); } @@ -314,7 +335,6 @@ function panels_ct_pane_config_form($pan } } - /** * Call any add/edit validators defined by the content type. * @@ -334,6 +354,7 @@ function panels_ct_pane_validate_form($c return $function($form, $form_values); } } + /** * Call any add/edit submit handlers defined by the content type. * @@ -479,7 +500,8 @@ function panels_get_pane_content($displa if (!$context) { $context = new panels_context; } - if (!$incoming_content === '') { // FIXME misplaced bang? + // FIXME misplaced bang? + if (!$incoming_content === '') { $incoming_content = t('Incoming content will be displayed here.'); } @@ -487,7 +509,8 @@ function panels_get_pane_content($displa if (empty($pane->cache['method'])) { $content = panels_ct_get_content($pane->type, $pane->configuration, $args, $context, $incoming_content); foreach (module_implements('panels_pane_content_alter') as $module) { - $function = $module . 'panels_pane_content_alter'; // TODO This makes the third hook invocation on the render path. How badly is this hindering performance? + // TODO This makes the third hook invocation on the render path. How badly is this hindering performance? + $function = $module . 'panels_pane_content_alter'; $function($content, $pane, $args, $context); } } @@ -650,9 +673,11 @@ class panels_cache_object { case 'setting': $this->js[] = array($info, $type, $scope); break; + case 'inline': $this->js[] = array($info['code'], $type, $scope, $info['defer']); break; + default: $this->js[] = array($id, $type, $scope, $info['defer'], $info['cache']); } @@ -715,7 +740,7 @@ function panels_argument_get_context($ar if ($context) { $context->identifier = $argument['identifier']; $context->page_title = $argument['title']; - $context->keyword = $argument['keyword']; + $context->keyword = $argument['keyword']; return $context; } } @@ -893,7 +918,7 @@ function panels_relationship_get_context if ($context) { $context->identifier = $relationship['identifier']; $context->page_title = $relationship['title']; - $context->keyword = $relationship['keyword']; + $context->keyword = $relationship['keyword']; return $context; } } @@ -1095,7 +1120,7 @@ function panels_context_get_context($con if ($return) { $return->identifier = $context['identifier']; $return->page_title = $context['title']; - $return->keyword = $context['keyword']; + $return->keyword = $context['keyword']; return $return; } } @@ -1150,7 +1175,6 @@ function panels_context_load_contexts($o * Match up external contexts to our required contexts. It shouldn't be * possible to get here without the contexts already lining up properly. */ - function panels_context_match_required_contexts($required, $contexts) { $return = array(); if (!is_array($required)) { @@ -1287,9 +1311,9 @@ function panels_load_includes($plugin_ty $file_list[$module] = drupal_system_listing("$file" . '.inc$', $path, 'name', 0); } $info = array(); - foreach(array_filter($file_list) as $module => $files) { + foreach (array_filter($file_list) as $module => $files) { foreach ($files as $file) { - require_once('./'. $file->filename); + require_once ('./' . $file->filename); $result = _panels_process_plugin('panels', $module . $file->name, dirname($file->filename), $hook); if (is_array($result)) { $info = array_merge($info, $result); @@ -1376,7 +1400,7 @@ function _panels_process_plugin($module, return NULL; } $result = $function(); - if (!isset($result) || !is_array($result)) { + if (!isset($result) || !is_array($result)) { return NULL; } @@ -1448,6 +1472,7 @@ function panels_get_plugins($plugin, $ho * * @param $layout * Name of a panel layout. + * * @return * An array with information about the requested panel layout. */ @@ -1470,6 +1495,7 @@ function panels_get_layouts() { * * @param $style * Name of a panel style. + * * @return * An array with information about the requested panel style. */ @@ -1492,6 +1518,7 @@ function panels_get_styles() { * * @param $argument * Name of a panel argument. + * * @return * An array with information about the requested panel argument. */ @@ -1514,6 +1541,7 @@ function panels_get_arguments() { * * @param $content type * Name of a panel content type. + * * @return * An array with information about the requested panel content type. */ @@ -1536,6 +1564,7 @@ function panels_get_content_types() { * * @param $content type * Name of a panel content type. + * * @return * An array with information about the requested relationship */ @@ -1558,6 +1587,7 @@ function panels_get_relationships() { * * @param $context * Name of a panel context. + * * @return * An array with information about the requested panel context. */ @@ -1580,6 +1610,7 @@ function panels_get_contexts() { * * @param $cache * Name of a panel cache. + * * @return * An array with information about the requested panel cache. */ @@ -1602,6 +1633,7 @@ function panels_get_caches() { * * @param $switcher * Name of a panel switcher. + * * @return * An array with information about the requested panel switcher. */ @@ -1618,3 +1650,4 @@ function panels_get_switcher($switcher) function panels_get_switchers() { return panels_get_plugins('switchers', 'panels_switchers'); } + Index: layouts/flexible.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/Attic/flexible.inc,v retrieving revision 1.1.2.10 diff -u -p -r1.1.2.10 flexible.inc --- layouts/flexible.inc 18 Mar 2008 02:49:12 -0000 1.1.2.10 +++ layouts/flexible.inc 27 May 2008 17:08:33 -0000 @@ -1,5 +1,7 @@ '
', '#suffix' => '
', - '#value' => t('If a sidebar is selected, enter the width of the sidebar.'), + '#value' => t('If a sidebar is selected, enter the width of the sidebar.'), ); $form['sidebars']['width_type'] = array( @@ -360,3 +362,4 @@ function theme_panels_flexible($id, $con drupal_set_html_head("\n"); return $output; } + Index: layouts/onecol.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/Attic/onecol.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 onecol.inc --- layouts/onecol.inc 17 Dec 2007 22:09:19 -0000 1.1.2.4 +++ layouts/onecol.inc 27 May 2008 16:46:57 -0000 @@ -1,5 +1,7 @@ You can edit existing mini panels, or click add to create a new one.

'); + $output = '

'; + $output .= t('You can edit existing mini panels, or click add to create a new one.'); + $output .= '

'; + break; + case 'admin/panels/panel-mini/add': - return t('

Mini panels are the small variants of panel pages. Instead of pages, they define blocks.

'); + $output = '

'; + $output .= t('Mini panels are the small variants of panel pages. Instead of pages, they define blocks.'); + $output .= '

'; + break; } + return $output; } /** @@ -22,7 +38,7 @@ function panels_mini_perm() { } /** - * Implementation of hook_menu() + * Implementation of hook_menu(). */ function panels_mini_menu($may_cache) { if ($may_cache) { @@ -83,7 +99,7 @@ function panels_mini_menu($may_cache) { if (arg(0) == 'admin' && arg(1) == 'panels' && arg(2) == 'panel-mini') { $mini = panels_mini_load(arg(3)); if ($mini && empty($mini->disabled)) { - $items = array(); + $items = array(); panels_mini_menu_items($items, "admin/panels/panel-mini/$mini->name", $mini); } } @@ -230,7 +246,8 @@ function panels_mini_list_page() { $item = array(); $item[] = check_plain($panel_mini->title); $item[] = check_plain($panel_mini->name); - $item[] = $panel_mini->type; // this is safe as it's always programmatic + // this is safe as it's always programmatic + $item[] = $panel_mini->type; if (empty($panel_mini->display)) { $panel_mini->display = panels_load_display($panel_mini->did); @@ -244,10 +261,12 @@ function panels_mini_list_page() { case 'title': $sorts[] = $item[0]; break; + case 'name': default: $sorts[] = $item[1]; break; + case 'type': $sorts[] = $panel_mini->type . $item[0]; break; @@ -312,7 +331,7 @@ function panels_mini_preview_panel($mini } /** - * Page callback to export a panel page to PHP code. + * Page callback to export a mini panel to PHP code. */ function panels_mini_edit_export($panel_mini) { if (!is_object($panel_mini)) { @@ -326,11 +345,12 @@ function panels_mini_edit_export($panel_ '#type' => 'textarea', '#title' => $panel_mini->title, '#default_value' => $code, - '#rows' => $lines); + '#rows' => $lines, + ); return $form; } -/* +/** * Page callback to import a mini panel from PHP code. */ function panels_mini_import_mini() { @@ -343,8 +363,8 @@ function panels_mini_import_mini() { return drupal_get_form('panels_mini_import_form'); } -/* - * Form for the mini panel import +/** + * Form for the mini panel import. */ function panels_mini_import_form() { $form['panel_mini'] = array( @@ -364,8 +384,8 @@ function panels_mini_import_form() { return $form; } -/* - * Handle the submit button on importing a panel mini. +/** + * Handle the submit button on importing a mini panel. */ function panels_mini_import_form_submit($form_id, $form) { ob_start(); @@ -384,7 +404,6 @@ function panels_mini_import_form_submit( } } - /** * Handle the add mini panel page. */ @@ -412,8 +431,9 @@ function panels_mini_add_page($layout = } /** - * Edit a mini panel. Called from both the add and edit points to provide for - * common flow. + * Edit a mini panel. + * + * Called from both the add and edit points to provide for common flow. */ function panels_mini_edit($panel_mini) { if (!is_object($panel_mini)) { @@ -424,7 +444,7 @@ function panels_mini_edit($panel_mini) { } /** - * The form to edit the settings of a mini panel. + * Form to edit the settings of a mini panel. */ function panels_mini_edit_form($panel_mini) { panels_load_include('common'); @@ -436,7 +456,7 @@ function panels_mini_edit_form($panel_mi ); $form['panel_mini'] = array( '#type' => 'value', - '#value' => $panel_mini + '#value' => $panel_mini, ); $form['right'] = array( @@ -486,7 +506,7 @@ function panels_mini_edit_form($panel_mi '#value' => check_plain($layout['title']), ); $form['right']['layout']['layout-content'] = array( - '#value' => theme('panels_common_content_list', $panel_mini->display), //$content, + '#value' => theme('panels_common_content_list', $panel_mini->display), ); $contexts = theme('panels_common_context_list', $panel_mini); @@ -550,7 +570,7 @@ function panels_mini_edit_form_submit($f } } - $panel_mini->title = $form_values['title']; + $panel_mini->title = $form_values['title']; $panel_mini->name = $form_values['name']; if ($panel_mini->pid == 'new') { @@ -573,7 +593,7 @@ function panels_mini_edit_form_submit($f } /** - * Form to edit context features of a mini panel + * Form to edit context features of a mini panel. */ function panels_mini_edit_context($panel_mini, $next = NULL) { if (!empty($_POST)) { @@ -588,7 +608,7 @@ function panels_mini_edit_context($panel } /** - * The form to edit the context settings of a panel mini + * Form to edit the context settings of a mini panel. */ function panels_mini_context_form($panel_mini, $next = NULL) { drupal_add_css(panels_get_path('css/panels_admin.css')); @@ -602,7 +622,7 @@ function panels_mini_context_form($panel $form['panel_mini'] = array( '#type' => 'value', - '#value' => $panel_mini + '#value' => $panel_mini, ); $form['right'] = array( @@ -631,9 +651,8 @@ function panels_mini_context_form($panel return $form; } - /** - * Process submission of the panel mini edit form + * Process submission of the mini panel edit form. */ function panels_mini_context_form_submit($form_id, $form_values) { $panel_mini = $form_values['panel_mini']; @@ -652,7 +671,7 @@ function panels_mini_context_form_submit } /** - * Enable a default panel mini + * Enable a default mini panel. */ function panels_mini_enable_page($name = NULL) { $defaults = panels_mini_default_panels(); @@ -666,7 +685,7 @@ function panels_mini_enable_page($name = } /** - * Disable a default panel. + * Disable a default mini panel. */ function panels_mini_disable_page($name = NULL) { $defaults = panels_mini_default_panels(); @@ -759,8 +778,9 @@ function panels_mini_edit_layout_setting // Allow the rest of the system access to mini panels /** - * Implementation of hook_block(). Expose qualifying mini panels to Drupal's - * block system. + * Implementation of hook_block(). + * + * Expose qualifying mini panels to Drupal's block system. */ function panels_mini_block($op = 'list', $delta = 0, $edit = array()) { if ($op == 'list') { @@ -783,7 +803,7 @@ function panels_mini_block($op = 'list', $panel_mini->context = $panel_mini->display->context = panels_context_load_contexts($panel_mini); $block = array( 'subject' => $panel_mini->title, - 'content' => panels_render_display($panel_mini->display) + 'content' => panels_render_display($panel_mini->display), ); return $block; } @@ -805,7 +825,7 @@ function panels_mini_panels_content_type } /** - * Return each available mini panel available as a sub type + * Return each available mini panel available as a subtype. */ function panels_mini_content_types() { $types = array(); @@ -836,8 +856,7 @@ function panels_mini_content_types() { } /** - * Statically store what IDs have been used so that we can ensure - * all mini panels get a unique id. + * Statically store all used IDs to ensure all mini panels get a unique id. */ function panels_mini_get_id($name) { static $id_cache = array(); @@ -854,7 +873,7 @@ function panels_mini_get_id($name) { } /** - * Render a mini panel called from a panels display + * Render a mini panel called from a panels display. */ function panels_mini_content($conf, $panel_args, &$contexts) { $mini = panels_mini_load($conf['name']); @@ -875,18 +894,19 @@ function panels_mini_content($conf, $pan $mini->display->args = $panel_args; $mini->display->css_id = panels_mini_get_id($conf['name']); $mini->display->owner = $mini; - $mini->display->owner->id = $mini->name; // unique ID of this mini. + // unique ID of this mini. + $mini->display->owner->id = $mini->name; $block = new stdClass(); - $block->module = 'panels_mini'; - $block->delta = $conf['name']; + $block->module = 'panels_mini'; + $block->delta = $conf['name']; $block->subject = filter_xss_admin($mini->title); $block->content = panels_render_display($mini->display); return $block; - } + /** - * From to add a mini panel to a panel. + * Form to add a mini panel to a panel. */ function panels_mini_add_mini_panel($id, $parents, $conf = array()) { $conf['name'] = $id; @@ -894,8 +914,9 @@ function panels_mini_add_mini_panel($id, } /** - * Returns an edit form for the mini panel; there isn't much here as most - * of this is set up at mini panel creation time. + * Returns an edit form for the mini panel. + * + * There isn't much here as most of this is set up at mini panel creation time. */ function panels_mini_edit_mini_panel($id, $parents, $conf) { $form['name'] = array( @@ -923,7 +944,7 @@ function panels_mini_title_mini_panel($c // Database functions. /** - * Sanitize a mini, to guarantee certain data is as we believe it will be. + * Sanitize a mini panel, to guarantee certain data is as we believe it will be. */ function panels_mini_sanitize($mini) { foreach (array('contexts', 'relationships', 'requiredcontexts') as $id) { @@ -936,7 +957,9 @@ function panels_mini_sanitize($mini) { } /** - * Fetch all panel pages in the system. This function does not cache. + * Fetch all mini panels in the system. + * + * This function does not cache. */ function panels_mini_load_all($page_size = 0) { $panels = $dids = array(); @@ -1083,8 +1106,9 @@ function panels_mini_delete($panel_mini) } /** - * Export a panel page into PHP code for use in import. The code returned from - * can be used directly in panels_mini_save(). + * Export a mini panel into PHP code for use in import. + * + * The code returned from can be used directly in panels_mini_save(). */ function panels_mini_export($panel_mini, $prefix = '') { $output = ''; @@ -1103,7 +1127,7 @@ function panels_mini_export($panel_mini, } /** - * Get all 'default' panels. + * Get all 'default' mini panels. */ function panels_mini_default_panels() { $panels = module_invoke_all('default_panel_minis'); @@ -1115,7 +1139,7 @@ function panels_mini_default_panels() { } /** - * Provide panels mini with its own category + * Provide mini panels with its own category. */ function panels_mini_panels_block_info($module, $delta, &$info) { // Remove the block version of mini panels from being available content types. @@ -1123,7 +1147,7 @@ function panels_mini_panels_block_info($ } /** - * Implementation of hook_panels_exportables() + * Implementation of hook_panels_exportables(). */ function panels_mini_panels_exportables($op = 'list', $panels = NULL, $name = 'foo') { static $all_panels = NULL; @@ -1151,5 +1175,5 @@ function panels_mini_panels_exportables( $code .= "}\n"; return $code; } - } + Index: panels_node/panels_node.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_node/Attic/panels_node.install,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 panels_node.install --- panels_node/panels_node.install 22 Nov 2007 16:43:31 -0000 1.1.2.4 +++ panels_node/panels_node.install 27 May 2008 16:46:56 -0000 @@ -1,8 +1,9 @@ '; @@ -121,7 +130,7 @@ function panels_node_admin() { // Node hooks /** - * Implementation of hook_node_info + * Implementation of hook_node_info(). */ function panels_node_node_info() { return array( @@ -130,12 +139,12 @@ function panels_node_node_info() { 'module' => 'panels_node', 'body_label' => t('Teaser'), 'description' => t("A panel a page layout broken up into rows and columns."), - ) + ), ); } /** - * Implementation of hook_access + * Implementation of hook_access(). */ function panels_node_access($op, $node = NULL) { if (user_access('administer panel-nodes')) { @@ -160,11 +169,10 @@ function panels_node_add() { $output .= panels_print_layout_link($id, $layout, $_GET['q'] . '/' . $id); } return $output; - } /** - * Implementation of hook_form. + * Implementation of hook_form(). */ function panels_node_form(&$node, &$param) { $form['panels_node']['#tree'] = TRUE; @@ -186,7 +194,7 @@ function panels_node_form(&$node, &$para $type = node_get_types('type', $node); $form['title'] = array( - '#type'=> 'textfield', + '#type' => 'textfield', '#title' => check_plain($type->title_label), '#required' => TRUE, '#default_value' => $node->title, @@ -220,7 +228,7 @@ function panels_node_form(&$node, &$para } /** - * Implementation of hook_validate() + * Implementation of hook_validate(). */ function panels_node_validate($node) { if (!$node->nid && empty($node->panels_node['layout'])) { @@ -229,10 +237,11 @@ function panels_node_validate($node) { } /** - * Implementation of hook_load() + * Implementation of hook_load(). * - * Panels does not use revisions for nodes because that would open us up to have completely - * separate displays, and we'd have to copy them, and that's going to be a LOT of data. + * Panels does not use revisions for nodes because that would open us up + * to have completely separate displays, and we'd have to copy them, + * and that's going to be a LOT of data. */ function panels_node_load($node) { // We shortcut this because only in some really drastic corruption circumstance will this @@ -242,7 +251,7 @@ function panels_node_load($node) { } /** - * Implementation of hook_insert() + * Implementation of hook_insert(). */ function panels_node_insert(&$node) { // Create a new display and record that. @@ -257,7 +266,7 @@ function panels_node_insert(&$node) { } /** - * Implementation of hook_delete() + * Implementation of hook_delete(). */ function panels_node_delete(&$node) { db_query("DELETE FROM {panels_node} WHERE nid = %d", $node->nid); @@ -267,16 +276,15 @@ function panels_node_delete(&$node) { } /** - * Implementation of hook_update() + * Implementation of hook_update(). */ function panels_node_update($node) { db_query("UPDATE {panels_node} SET css_id = '%s' WHERE nid = %d", $node->panels_node['css_id'], $node->nid); } /** - * Implementation of hook_view() + * Implementation of hook_view(). */ - function panels_node_view($node, $teaser = FALSE, $page = FALSE) { panels_load_include('plugins'); if ($teaser) { @@ -302,7 +310,7 @@ function panels_node_view($node, $teaser // Administrative pages /** - * Settings for panel nodes + * Settings for panel nodes. */ function panels_node_settings() { panels_load_include('common'); @@ -346,3 +354,4 @@ function panels_node_edit_content($node) // messes up the drag & drop. print theme('page', panels_edit($display, "node/$node->nid/panel_content", $content_types), FALSE); } + Index: panels_node_legacy/panels_node_legacy.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_node_legacy/Attic/panels_node_legacy.module,v retrieving revision 1.1.2.7 diff -u -p -r1.1.2.7 panels_node_legacy.module --- panels_node_legacy/panels_node_legacy.module 24 May 2008 01:39:14 -0000 1.1.2.7 +++ panels_node_legacy/panels_node_legacy.module 27 May 2008 17:22:53 -0000 @@ -1,8 +1,17 @@ '; @@ -35,7 +44,8 @@ function panels_node_panels_content_type $items['node'] = array( 'title' => t('Node'), 'weight' => -10, - 'single' => TRUE, // only provides a single content type + // only provides a single content type + 'single' => TRUE, 'content_types' => 'panels_node_legacy_content_types', 'render callback' => 'panels_node_legacy_render', 'add callback' => 'panels_node_legacy_add', @@ -48,8 +58,9 @@ function panels_node_panels_content_type } /** - * Output function for the 'node' content type. Outputs a node - * based on the module and delta supplied in the configuration. + * Output function for the 'node' content type. + * + * Outputs a node based on the module and delta supplied in the configuration. */ function panels_node_legacy_render($conf, $panel_args) { $nid = $conf['nid']; @@ -128,7 +139,7 @@ function panels_node_legacy_add($id, $pa '#type' => 'textfield', '#maxlength' => 512, '#autocomplete_path' => 'panels/node/autocomplete', - '#weight' => -10, + '#weight' => -10, ); $form['validate_me'] = array('#type' => 'value', '#value' => TRUE); return $form; @@ -152,14 +163,14 @@ function panels_node_legacy_edit($id, $p '#type' => 'checkbox', '#default_value' => $conf['links'], '#title' => t('Display links'), - '#description' => t('Check here to display the links with the post.') + '#description' => t('Check here to display the links with the post.'), ); $form['leave_node_title'] = array( '#type' => 'checkbox', '#default_value' => $conf['leave_node_title'], '#title' => t('Leave node title'), - '#description' => t('Advanced: if checked, do not touch the node title; this can cause the node title to appear twice unless your theme is aware of this.') + '#description' => t('Advanced: if checked, do not touch the node title; this can cause the node title to appear twice unless your theme is aware of this.'), ); return $form; @@ -197,6 +208,7 @@ function panels_node_legacy_edit_validat form_error($form['nid'], t('Invalid node')); } } + /** * Returns the administrative title for a node. */ @@ -213,3 +225,4 @@ function panels_node_legacy_title($conf) return t('Deleted/missing node @nid', array('@nid' => $conf['nid'])); } } + Index: panels_page/panels_page.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_page/Attic/panels_page.admin.inc,v retrieving revision 1.1.2.45 diff -u -p -r1.1.2.45 panels_page.admin.inc --- panels_page/panels_page.admin.inc 24 May 2008 05:37:14 -0000 1.1.2.45 +++ panels_page/panels_page.admin.inc 27 May 2008 17:24:11 -0000 @@ -1,8 +1,13 @@ name); - $item[] = $panel_page->type; // this is safe as it's always programmatic + // this is safe as it's always programmatic + $item[] = $panel_page->type; $display = panels_page_fetch_display($panel_page); @@ -56,13 +62,16 @@ function panels_page_list_page() { case 'title': $sorts[] = $item[0]; break; + case 'name': default: $sorts[] = $item[1]; break; + case 'type': $sorts[] = $panel_page->type . $item[0]; break; + case 'url': $sorts[] = $panel_page->path; break; @@ -115,7 +124,7 @@ function panels_page_disable_page($name drupal_goto(); } -/* +/** * Provide a form to confirm deletion of a panel page. */ function panels_page_delete_confirm($panel_page) { @@ -125,7 +134,7 @@ function panels_page_delete_confirm($pan $form['pid'] = array('#type' => 'value', '#value' => $panel_page->pid); $form['did'] = array('#type' => 'value', '#value' => $panel_page->did); if ($panel_page->type != t('Overridden')) { - return confirm_form( $form, + return confirm_form($form, t('Are you sure you want to delete "@title"?', array('@title' => panels_page_get_title($panel_page))), $_GET['destination'] ? $_GET['destination'] : 'admin/panels/panel-page', t('This action cannot be undone.'), @@ -133,7 +142,7 @@ function panels_page_delete_confirm($pan ); } else { - return confirm_form( $form, + return confirm_form($form, t('Are you sure you want to revert "@title" to its default setup?', array('@title' => panels_page_get_title($panel_page))), $_GET['destination'] ? $_GET['destination'] : 'admin/panels/panel-page', t('This action cannot be undone.'), @@ -142,7 +151,7 @@ function panels_page_delete_confirm($pan } } -/* +/** * Handle the submit button to delete a panel page. */ function panels_page_delete_confirm_submit($form_id, $form) { @@ -154,7 +163,7 @@ function panels_page_delete_confirm_subm } /** - * Handle the add panel-page page + * Handle the add panel-page page. */ function panels_page_add_page($layout = NULL) { $layouts = panels_get_layouts(); @@ -164,7 +173,7 @@ function panels_page_add_page($layout = drupal_set_message(t('The chosen layout %layout is invalid. Please select a new one.', array('%layout' => $layout)), 'warning'); unset($layout); } - // If no page layout is given, choose one first. + // If no page layout is given, choose one first. if ($layout === NULL) { foreach ($layouts as $id => $layout) { $output .= panels_print_layout_link($id, $layout, $_GET['q'] . '/' . $id); @@ -182,10 +191,10 @@ function panels_page_add_page($layout = return drupal_get_form('panels_page_edit_form', panels_page_sanitize($panel_page)); } - /** - * Edit a panel page. Called from both the add and edit points to provide - * for common flow. + * Edit a panel page. + * + * Called from both the add and edit points to provide for common flow. */ function panels_page_edit($panel_page) { if (!is_object($panel_page)) { @@ -215,7 +224,7 @@ function panels_page_edit_form($panel_pa $form['panel_page'] = array( '#type' => 'value', - '#value' => $panel_page + '#value' => $panel_page, ); $form['right'] = array( @@ -249,7 +258,7 @@ function panels_page_edit_form($panel_pa $panel_page->context = $panel_page->display->context = panels_context_load_contexts($panel_page); $form['right']['layout']['layout-content'] = array( - '#value' => theme('panels_common_content_list', $panel_page->display), //$content, + '#value' => theme('panels_common_content_list', $panel_page->display), ); $contexts = theme('panels_common_context_list', $panel_page); @@ -308,7 +317,7 @@ function panels_page_edit_form($panel_pa } /** - * Validate a panel page edit form + * Validate a panel page edit form. */ function panels_page_edit_form_validate($form_id, $form_values, $form) { // Test uniqueness of name: @@ -352,9 +361,9 @@ function panels_page_edit_form_submit($f $panel_page = $form_values['panel_page']; $panel_page->title = $form_values['title']; - $panel_page->name = preg_replace("/[\W]+/", '', $form_values['name']); + $panel_page->name = preg_replace("/[\W]+/", '', $form_values['name']); $panel_page->css_id = $form_values['css_id']; - $panel_page->path = $form_values['path']; + $panel_page->path = $form_values['path']; if ($panel_page->pid == 'new') { unset($_SESSION['pp_import']); @@ -375,7 +384,7 @@ function panels_page_edit_form_submit($f } /** - * Edit advanced settings of a panel page + * Edit advanced settings of a panel page. */ function panels_page_edit_advanced($name, $next = NULL) { $panel_page = panels_page_load($name); @@ -384,14 +393,14 @@ function panels_page_edit_advanced($name } /** - * The form to edit the advanced settings of a panel page + * The form to edit the advanced settings of a panel page. */ function panels_page_advanced_form($panel_page, $next = NULL) { drupal_add_css(panels_get_path('css/panels_admin.css')); $form['panel_page'] = array( '#type' => 'value', - '#value' => $panel_page + '#value' => $panel_page, ); $form['right'] = array( @@ -531,9 +540,8 @@ function panels_page_advanced_form($pane return $form; } - /** - * Process submission of the panel page edit form + * Process submission of the panel page edit form. */ function panels_page_advanced_form_submit($form_id, $form_values) { $panel_page = $form_values['panel_page']; @@ -559,7 +567,7 @@ function panels_page_advanced_form_submi } /** - * Edit advanced settings of a panel page + * Edit advanced settings of a panel page. */ function panels_page_edit_context($name, $next = NULL) { if (!empty($_POST)) { @@ -575,7 +583,7 @@ function panels_page_edit_context($name, } /** - * The form to edit the context settings of a panel page + * The form to edit the context settings of a panel page. */ function panels_page_context_form($panel_page, $next = NULL) { drupal_add_css(panels_get_path('css/panels_admin.css')); @@ -583,7 +591,7 @@ function panels_page_context_form($panel $form['panel_page'] = array( '#type' => 'value', - '#value' => $panel_page + '#value' => $panel_page, ); $form['right'] = array( @@ -598,7 +606,7 @@ function panels_page_context_form($panel panels_load_include('common'); - $settings = panels_common_add_argument_form('panel_page', $form, $form['left']['arguments_table'], $panel_page); + $settings = panels_common_add_argument_form('panel_page', $form, $form['left']['arguments_table'], $panel_page); $settings += panels_common_add_context_form('panel_page', $form, $form['right']['contexts_table'], $panel_page); $settings += panels_common_add_relationship_form('panel_page', $form, $form['left']['relationships_table'], $panel_page); panels_common_add_context_js($settings); @@ -612,9 +620,8 @@ function panels_page_context_form($panel return $form; } - /** - * Process submission of the panel page edit form + * Process submission of the panel page edit form. */ function panels_page_context_form_submit($form_id, $form_values) { $panel_page = $form_values['panel_page']; @@ -789,11 +796,12 @@ function panels_page_edit_export($panel_ '#type' => 'textarea', '#title' => $panel_page->title, '#default_value' => $code, - '#rows' => $lines); + '#rows' => $lines, + ); return $form; } -/* +/** * Page callback to import a panel page from PHP code. */ function panels_page_import_page() { @@ -806,7 +814,7 @@ function panels_page_import_page() { return drupal_get_form('panels_page_import_form'); } -/* +/** * Form to for the panel page import */ function panels_page_import_form() { @@ -827,7 +835,7 @@ function panels_page_import_form() { return $form; } -/* +/** * Handle the submit button on importing a panel page. */ function panels_page_import_form_submit($form_id, $form) { @@ -895,11 +903,11 @@ function panels_page_admin_view($panel_p $form['panel_page'] = array( '#type' => 'value', - '#value' => $panel_page + '#value' => $panel_page, ); $form['contexts'] = array( '#type' => 'value', - '#value' => $contexts + '#value' => $contexts, ); return $form; @@ -917,3 +925,4 @@ function panels_page_admin_view_submit($ } return $url; } + Index: panels_page/panels_page.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_page/Attic/panels_page.install,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 panels_page.install --- panels_page/panels_page.install 8 Jan 2008 19:58:37 -0000 1.1.2.1 +++ panels_page/panels_page.install 27 May 2008 16:46:56 -0000 @@ -1,6 +1,7 @@ You may peruse a list of your current panels layouts and edit them, or click add to create a new page.

'); + $output = '

'; + $output .= t('You may peruse a list of your current panels layouts and edit them, or click add to create a new page.'); + $output .= '

'; + break; + case 'admin/panels/panel-page/add': - return t('

Choose a layout for your new page from the list below.

'); + $output = '

'; + $output .= t('Choose a layout for your new page from the list below.'); + $output .= '

'; + break; } + return $output; } /** - * Implementation of hook_perm() + * Implementation of hook_perm(). */ function panels_page_perm() { return array('create panel-pages', 'access all panel-pages'); } /** - * Implementation of hook_menu() + * Implementation of hook_menu(). */ function panels_page_menu($may_cache) { $items = array(); @@ -378,8 +396,8 @@ function panels_page_admin_menu_items(&$ */ function _panels_page_create_menu_item(&$items, $panel_page, $path, $args = array()) { $access = panels_page_access($panel_page); - $title = filter_xss_admin(panels_page_get_title($panel_page, 'menu')); - $type = _panels_page_menu_type($panel_page); + $title = filter_xss_admin(panels_page_get_title($panel_page, 'menu')); + $type = _panels_page_menu_type($panel_page); if ($type == MENU_LOCAL_TASK || $type == MENU_DEFAULT_LOCAL_TASK) { $weight = $panel_page->menu_tab_weight; @@ -391,17 +409,19 @@ function _panels_page_create_menu_item(& case 'tab': $parent_type = MENU_LOCAL_TASK; break; + case 'normal': $parent_type = MENU_NORMAL_ITEM; break; + default: case 'existing': $parent_type = 0; break; } if ($parent_type) { - $title = filter_xss_admin(panels_page_get_title($panel_page, 'menu-parent')); - $weight = $panel_page->menu_parent_tab_weight; + $title = filter_xss_admin(panels_page_get_title($panel_page, 'menu-parent')); + $weight = $panel_page->menu_parent_tab_weight; $items[] = _panels_page_menu_item(dirname($path), $title, $panel_page, $args, $access, $parent_type, $weight); } } @@ -474,7 +494,6 @@ function panels_page_access($panel_page, return array_intersect($panel_page->access, $roles[$account->uid]); } - /** * Get the title for a panel page, given a context. * @@ -569,7 +588,7 @@ function panels_page_get_current($page = // panel page administrative pages /** - * Settings for panel pages + * Settings for panel pages. */ function panels_page_settings() { panels_load_include('common'); @@ -577,7 +596,7 @@ function panels_page_settings() { } /** - * Pass-through to admin.inc + * Pass-through to admin.inc. */ function panels_page_passthru() { $args = func_get_args(); @@ -665,7 +684,7 @@ function panels_page_view_page($panel_pa } // go through switcher types and switch the first one that matches. - foreach($pages as $plugin => $candidates) { + foreach ($pages as $plugin => $candidates) { if ($page = panels_switcher_switch($plugin, 'panel_page', $panel_page->name, $candidates)) { $panel_page = $page; break; @@ -675,8 +694,10 @@ function panels_page_view_page($panel_pa } $args = func_get_args(); - array_shift($args); // remove the name. - array_shift($args); // remove the admin flag. + // remove the name. + array_shift($args); + // remove the admin flag. + array_shift($args); $output = ''; if ($admin) { @@ -722,12 +743,13 @@ function panels_page_view_page($panel_pa // This is the first point at which it is safe to add items to the display // as the argument handling, above, may choose which display is actually // used. - $display->args = $args; - $display->context = $panel_page->context; + $display->args = $args; + $display->context = $panel_page->context; $display->keywords = $panel_page->keywords; - $display->css_id = $panel_page->css_id; - $display->owner = $panel_page; - $display->owner->id = $panel_page->name; // unique id of this display's owner. + $display->css_id = $panel_page->css_id; + $display->owner = $panel_page; + // unique id of this display's owner. + $display->owner->id = $panel_page->name; $display->type = 'panel_page'; // Set this as 'current' so that other stuff can utilize it. @@ -763,15 +785,15 @@ function panels_page_view_page($panel_pa } /** - * Theme function to render our panel as a form. We need to do this so that - * the entire display is inside the form. + * Theme function to render our panel as a form. + * + * We need to do this so that the entire display is inside the form. */ function theme_panels_page_render_form($form) { $form['#children'] = panels_render_display($form['#display']); return theme('form', $form); } - /** * Load a display based upon information from the $displays list. */ @@ -799,7 +821,7 @@ function panels_page_fetch_display(&$pan } /** - * Fetch a display from a panel pages alternative list of displays + * Fetch a display from a panel pages alternative list of displays. */ function _panels_page_fetch_display(&$panel_page, $id) { $info = $panel_page->displays[$id]; @@ -833,8 +855,7 @@ function _panels_page_fetch_display(&$pa } /** - * Get a display based on whether it's already in code or needs to be - * loaded + * Get a display based on whether it's already in code or needs to be loaded. */ function _panels_fetch_display_from_info($info) { // If the 'display' is set it's the result of an export/default @@ -883,7 +904,9 @@ function panels_page_set_display($panel_ // Database functions /** - * Fetch all panel pages in the system. This function does not cache. + * Fetch all panel pages in the system. + * + * This function does not cache. */ function panels_page_load_all($names = array(), $page_size = 0) { $pages = $dids = array(); @@ -931,7 +954,7 @@ function panels_page_load_all($names = a } /** - * Load a panel page + * Load a panel page. */ function panels_page_load($pid, $load_display = FALSE) { static $cache = array(); @@ -1098,8 +1121,9 @@ function panels_page_delete($panel_page) } /** - * Export a panel page into PHP code for use in import. The code returned from - * can be used directly in panels_page_save(). + * Export a panel page into PHP code for use in import. + * + * The code returned from can be used directly in panels_page_save(). */ function panels_page_export($panel_page, $prefix = '') { $output = ''; @@ -1143,7 +1167,7 @@ function panels_page_default_panels() { } /** - * Implementation of hook_panels_exportables() + * Implementation of hook_panels_exportables(). */ function panels_page_panels_exportables($op = 'list', $panels = NULL, $name = 'foo') { static $all_panels = NULL; @@ -1172,3 +1196,4 @@ function panels_page_panels_exportables( return $code; } } + Index: panels_simple_cache/panels_simple_cache.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_simple_cache/Attic/panels_simple_cache.module,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 panels_simple_cache.module --- panels_simple_cache/panels_simple_cache.module 24 May 2008 05:02:36 -0000 1.1.2.5 +++ panels_simple_cache/panels_simple_cache.module 27 May 2008 17:26:19 -0000 @@ -1,5 +1,7 @@ '; @@ -52,7 +54,7 @@ function panels_simple_cache_panels_cach } /** - * Get cached content + * Get cached content. */ function panels_simple_cache_get_cache($conf, $display, $args, $contexts, $pane = NULL) { $cid = panels_simple_cache_get_id($conf, $display, $args, $contexts, $pane); @@ -69,7 +71,7 @@ function panels_simple_cache_get_cache($ } /** - * Set cached content + * Set cached content. */ function panels_simple_cache_set_cache($conf, $content, $display, $args, $contexts, $pane = NULL) { $cid = panels_simple_cache_get_id($conf, $display, $args, $contexts, $pane); @@ -77,8 +79,9 @@ function panels_simple_cache_set_cache($ } /** - * clear cached content. Cache clears are always for an entire display, - * regardless of arguments. + * Clear cached content. + * + * Cache clears are always for an entire display, regardless of arguments. */ function panels_simple_cache_clear_cache($display) { $cid = 'panels_simple_cache'; @@ -118,6 +121,7 @@ function panels_simple_cache_get_id($con $id .= ':' . $arg; } break; + case 'context': if (!is_array($contexts)) { $contexts = array($contexts); Index: panels_views/panels_views.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_views/Attic/panels_views.install,v retrieving revision 1.1.2.7 diff -u -p -r1.1.2.7 panels_views.install --- panels_views/panels_views.install 26 May 2008 21:39:39 -0000 1.1.2.7 +++ panels_views/panels_views.install 27 May 2008 17:26:36 -0000 @@ -1,6 +1,7 @@ title); $item[] = check_plain($panel_view->name); - $item[] = $panel_view->type; // this is safe as it's always programmatic + // this is safe as it's always programmatic + $item[] = $panel_view->type; $item[] = check_plain($panel_view->view); $item[] = implode(' | ', $ops); @@ -144,13 +146,16 @@ function panels_views_list_views() { case 'title': $sorts[] = $item[0]; break; + case 'name': default: $sorts[] = $item[1]; break; + case 'type': $sorts[] = $panel_view->type . $item[0]; break; + case 'view': $sorts[] = $item[2]; break; @@ -176,7 +181,7 @@ function panels_views_list_views() { } /** - * Form to select a view for creating a new panel view + * Form to select a view for creating a new view pane. */ function panels_views_add_view_form() { $form['view'] = array( @@ -212,7 +217,7 @@ function panels_views_add_view($view_nam } /** - * Page callback to add a new view pane from an existing view. + * Page callback to edit a view pane. */ function panels_views_edit_view($view_name) { $pv = panels_views_load($view_name); @@ -311,7 +316,7 @@ function panels_views_edit_view_form($vi foreach ($panel_view->contexts as $id => $info) { $name = $arginfo[$view->argument[$id]['type']]['name']; - $form['contexts'][$id] = array( + $form['contexts'][$id] = array( '#type' => 'fieldset', '#title' => t('Argument: @arg', array('@arg' => $name)), '#tree' => TRUE, @@ -493,7 +498,7 @@ function panels_views_edit_view_form($vi } /** - * Validate the edit form + * Validate the edit form. */ function panels_views_edit_view_form_validate($form_id, $form_values, $form) { // Test uniqueness of name: @@ -515,7 +520,7 @@ function panels_views_edit_view_form_val } /** - * Submit the edit form and save the values + * Submit the edit form and save the values. */ function panels_views_edit_view_form_submit($form_id, $form_values) { $form_values['contexts'] = isset($form_values['contexts']) ? $form_values['contexts'] : array(); @@ -525,7 +530,7 @@ function panels_views_edit_view_form_sub } /** - * Provide a form to confirm deletion of a panel view. + * Provide a form to confirm deletion of a view pane. */ function panels_views_delete_confirm($panel_view) { if (!is_object($panel_view)) { @@ -545,7 +550,7 @@ function panels_views_delete_confirm($pa } /** - * Handle the submit button to delete a panel view. + * Handle the submit button to delete a view pane. */ function panels_views_delete_confirm_submit($form_id, $form) { if ($form['confirm']) { @@ -555,7 +560,7 @@ function panels_views_delete_confirm_sub } /** - * Page callback to edit a view pane + * Page callback to import a view pane. */ function panels_views_import_view() { if ($_POST['form_id'] == 'panels_views_edit_view_form') { @@ -569,7 +574,7 @@ function panels_views_import_view() { } /** - * Form for the panel view import. + * Form for the view pane import. */ function panels_views_import_form() { $form['panel_view'] = array( @@ -590,7 +595,7 @@ function panels_views_import_form() { } /** - * Handle the submit button on importing a panel view. + * Handle the submit button on importing a view pane. */ function panels_views_import_form_submit($form_id, $form) { ob_start(); @@ -616,7 +621,7 @@ function panels_views_import_form_submit } /** - * Page callback to export a panel view. + * Page callback to export a view pane. */ function panels_views_export_view($pv, $prefix = '') { if (!is_object($pv)) { @@ -634,13 +639,13 @@ function panels_views_export_view($pv, $ '#type' => 'textarea', '#title' => $pv->title, '#default_value' => $code, - '#rows' => $lines + '#rows' => $lines, ); return $form; } /** - * Enable a default panel view. + * Enable a default view pane. */ function panels_views_enable_page($name = NULL) { $defaults = panels_views_default_panels(); @@ -654,7 +659,7 @@ function panels_views_enable_page($name } /** - * Disable a default panel. + * Disable a default view pane. */ function panels_views_disable_page($name = NULL) { $defaults = panels_views_default_panels(); @@ -721,7 +726,7 @@ function panels_views_content_types() { } /** - * Render a panel view as a pane. + * Render a view as a pane. */ function panels_views_render($conf, $panel_args, &$contexts) { $pv = panels_views_load($conf['name']); @@ -730,7 +735,8 @@ function panels_views_render($conf, $pan } $v = views_get_view($pv->view); - if (empty($v)) { // no view, we go no further + // no view, we go no further + if (empty($v)) { return; } // Use clone to make sure this is fresh. @@ -749,15 +755,19 @@ function panels_views_render($conf, $pan $c = array_shift($contexts); $args[] = $c->argument; break; + case 'fixed': $args[] = $data['fixed']; break; + case 'panel': $args[] = $panel_args[$data['panel']]; break; + case 'user': $args[] = $conf['arguments'][$id]; break; + case 'none': default: $args[] = $view->argument[$id]['wildcard'] ? $view->argument[$id]['wildcard'] : '*'; @@ -778,7 +788,7 @@ function panels_views_render($conf, $pan $block = new stdClass(); $block->module = 'views'; - $block->delta = $view->name; + $block->delta = $view->name; $view_type = $pv->view_type == 'embed' ? 'page' : $pv->view_type; $block->subject = views_get_title($view, $view_type, $args); @@ -1001,8 +1011,9 @@ function panels_views_title($conf) { // Panels views helpers. /** - * Get a list of all views as an option array. This really should be included - * with views. + * Get a list of all views as an option array. + * + * This really should be included with views. */ function panels_views_get_all_views() { views_load_cache(); @@ -1027,7 +1038,7 @@ function panels_views_get_all_views() { // Database routines /** - * Poor man's schema API + * Poor man's schema API. */ function panels_views_pane_fields() { // Schema version 0 @@ -1129,7 +1140,6 @@ function panels_views_pane_fields() { 'serialize' => TRUE, 'definition' => 'text', ), - // Whether or not array these things are allowed from the pane UI. 'allow_type' => array( 'default' => FALSE, @@ -1233,7 +1243,7 @@ function panels_views_pane_arguments($vi } /** - * Write a panel view to the database. + * Write a view pane to the database. */ function panels_views_save($pv) { $keys = $values = ""; @@ -1289,7 +1299,7 @@ function panels_views_save($pv) { } /** - * Load a panel view from the database. + * Load a view pane from the database. */ function panels_views_load($name) { $pv = db_fetch_object(db_query("SELECT * FROM {panels_views} WHERE name = '%s'", $name)); @@ -1318,12 +1328,12 @@ function panels_views_load($name) { } /** - * Load all panel views. + * Load all view panes. */ function panels_views_load_all() { $panel_views = array(); - $names = panels_views_pane_fields(); - $result = db_query("SELECT * FROM {panels_views}"); + $names = panels_views_pane_fields(); + $result = db_query("SELECT * FROM {panels_views}"); while ($pv = db_fetch_object($result)) { foreach ($names as $name => $data) { @@ -1356,7 +1366,7 @@ function panels_views_load_all() { } /** - * Get all 'default' panel views. + * Get all 'default' view panes. */ function panels_views_default_panels() { $panels = module_invoke_all('default_panel_views'); @@ -1368,7 +1378,7 @@ function panels_views_default_panels() { } /** - * Delete a panel view. + * Delete a view pane. */ function panels_views_delete($pv) { db_query("DELETE FROM {panels_views} WHERE pvid = %d", $pv->pvid); @@ -1376,8 +1386,10 @@ function panels_views_delete($pv) { } /** - * Export a panel view into PHP code; this code is suitable to run through - * eval() and then be used in panels_views_save(). + * Export a view pane into PHP code. + * + * This code is suitable to run through eval() + * and then be used in panels_views_save(). */ function panels_views_export($pv, $prefix = '') { $output = ''; @@ -1422,3 +1434,4 @@ function panels_views_panels_exportables return $code; } } + Index: panels_views_legacy/panels_views_legacy.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_views_legacy/Attic/panels_views_legacy.module,v retrieving revision 1.1.2.7 diff -u -p -r1.1.2.7 panels_views_legacy.module --- panels_views_legacy/panels_views_legacy.module 25 Mar 2008 19:35:09 -0000 1.1.2.7 +++ panels_views_legacy/panels_views_legacy.module 27 May 2008 17:28:17 -0000 @@ -1,8 +1,17 @@ '; @@ -45,8 +54,9 @@ function panels_views_legacy_panels_cont } /** - * Output function for the 'views' content type. Outputs a views - * based on the module and delta supplied in the configuration. + * Output function for the 'views' content type. + * + * Outputs a views based on the module and delta supplied in the configuration. */ function panels_views_legacy_render($conf, $panel_args, $contexts) { if (!is_array($contexts)) { @@ -92,7 +102,7 @@ function panels_views_legacy_render($con $block = new stdClass(); $block->module = 'views'; - $block->delta = $view->name; + $block->delta = $view->name; $view_type = $conf['type'] == 'embed' ? 'page' : $conf['type']; $block->subject = views_get_title($view, $view_type); @@ -130,13 +140,14 @@ function panels_views_legacy_render($con } return $block; } + /** * Return all content types available. */ function panels_views_legacy_content_types() { $types = array(); $views = array(); - $args = array(); + $args = array(); views_load_cache(); $arginfo = _views_get_arguments(); @@ -173,8 +184,8 @@ function panels_views_legacy_content_typ foreach ($default_views as $view) { if (!$views[$view->name] && ($views_status[$view->name] == 'enabled' || (!$views_status[$view->name] && !$view->disabled))) { - $title = views_get_title($view, 'admin'); - $icon = !empty($view->block) ? 'icon_views_block.png' : 'icon_views_page.png'; + $title = views_get_title($view, 'admin'); + $icon = !empty($view->block) ? 'icon_views_block.png' : 'icon_views_page.png'; $contexts = array(); if (!empty($view->argument)) { foreach ($view->argument as $arg) { @@ -210,8 +221,8 @@ function panels_views_legacy_add($id, $p $conf['type'] = 'block'; $conf['nodes_per_page'] = $view->nodes_per_block; } - $conf['type'] = 'embed'; - $conf['pager_id'] = 1; + $conf['type'] = 'embed'; + $conf['pager_id'] = 1; $conf['use_pager'] = 0; return panels_views_legacy_edit($id, $parents, $conf); } Index: relationships/book_parent.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/relationships/Attic/book_parent.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 book_parent.inc --- relationships/book_parent.inc 21 Nov 2007 17:14:39 -0000 1.1.2.4 +++ relationships/book_parent.inc 27 May 2008 17:28:29 -0000 @@ -1,5 +1,7 @@ 'select', '#title' => t('Relationship type'), '#options' => array('parent' => t('Immediate parent'), 'top' => t('Top level book')), - '#default_value' => $conf['type'] + '#default_value' => $conf['type'], ); return $form; } + Index: relationships/term_from_node.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/relationships/Attic/term_from_node.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 term_from_node.inc --- relationships/term_from_node.inc 21 Nov 2007 17:14:39 -0000 1.1.2.4 +++ relationships/term_from_node.inc 27 May 2008 17:28:35 -0000 @@ -1,5 +1,7 @@ 'select', '#title' => t('Relationship type'), '#options' => array('parent' => t('Immediate parent'), 'top' => t('Top level term')), - '#default_value' => $conf['type'] + '#default_value' => $conf['type'], ); return $form; } + Index: relationships/user_from_node.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/relationships/Attic/user_from_node.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 user_from_node.inc --- relationships/user_from_node.inc 23 May 2008 22:17:37 -0000 1.1.2.2 +++ relationships/user_from_node.inc 27 May 2008 16:46:55 -0000 @@ -1,6 +1,7 @@ data->uid; $account = user_load(array('uid' => $uid)); - + // Send it to panels return panels_context_create('user', $account); - } else { + } + else { return panels_context_create_empty('user', NULL); - } + } } Index: styles/default.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/styles/Attic/default.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 default.inc --- styles/default.inc 8 Jan 2008 18:03:08 -0000 1.1.2.4 +++ styles/default.inc 27 May 2008 17:29:30 -0000 @@ -1,5 +1,7 @@
'; } - $output .= $text = theme('panels_pane', $content, $display->content[$pane_id], $display); + $output .= $text = theme('panels_pane', $content, $display->content[$pane_id], $display); // If we displayed a pane, this will become true; if not, it will become // false. Index: styles/list.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/styles/Attic/list.inc,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 list.inc --- styles/list.inc 8 Jan 2008 18:03:08 -0000 1.1.2.6 +++ styles/list.inc 27 May 2008 17:29:41 -0000 @@ -1,5 +1,7 @@ t('List type'), '#options' => array( 'ul' => t('Unordered'), - 'ol' => t('Ordered') + 'ol' => t('Ordered'), ), '#default_value' => (isset($style_settings['list_type'])) ? $style_settings['list_type'] : 'ul', ); return $form; } + Index: styles/rounded_corners.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/panels/styles/Attic/rounded_corners.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 rounded_corners.inc --- styles/rounded_corners.inc 8 Jan 2008 18:03:08 -0000 1.1.2.4 +++ styles/rounded_corners.inc 27 May 2008 17:29:51 -0000 @@ -1,5 +1,7 @@ t('Box around'), '#options' => array( 'pane' => t('Each pane'), - 'panel' => t('Each panel') + 'panel' => t('Each panel'), ), '#default_value' => (isset($style_settings['corner_location'])) ? $style_settings['corner_location'] : 'ul', '#description' => t('Choose whether to include the box around each pane (piece of content) or panel (each column or region)'), @@ -183,6 +185,7 @@ EOF; * * @param $text * The content of this rounded corner box. + * * @return * The created HTML. */ @@ -205,3 +208,4 @@ EOF; /** * @} End of "ingroup themeable". */ +