Index: skinr.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/skinr/skinr.install,v retrieving revision 1.3.2.2 diff -u -p -F '^f' -r1.3.2.2 skinr.install --- skinr.install 17 Jan 2010 21:36:36 -0000 1.3.2.2 +++ skinr.install 21 Oct 2010 21:38:25 -0000 @@ -15,3 +15,29 @@ function skinr_uninstall() { variable_del($variable->name); } } + +/** + * Update old Skinr variables per http://drupal.org/node/922136. + */ +function skinr_update_6100() { + $ret = array(); + $result = db_query("SELECT name FROM {variable} WHERE name LIKE 'skinr_%'"); + while ($variable = db_fetch_object($result)) { + $skinr = variable_get($variable->name, array()); + + if (!empty($skinr['panels'])) { + $keys = array_keys($skinr['panels']); + foreach ($keys as $key) { + if (strpos($key, '-panel-') !== FALSE) { + $value = $skinr['panels'][$key]; + unset($skinr['panels'][$key]); + $new_key = str_replace('-panel-', '-region-', $key); + $skinr['panels'][$new_key] = $value; + } + } + + variable_set($variable->name, $skinr); + } + } + return $ret; +} \ No newline at end of file Index: modules/panels.skinr.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/skinr/modules/panels.skinr.inc,v retrieving revision 1.8.2.8 diff -u -p -F '^f' -r1.8.2.8 panels.skinr.inc --- modules/panels.skinr.inc 4 Sep 2010 05:32:51 -0000 1.8.2.8 +++ modules/panels.skinr.inc 21 Oct 2010 21:38:25 -0000 @@ -69,9 +69,8 @@ function panels_skinr_form_index_handler switch ($form['#parameters'][1]['type']) { case 'display': return 'display-'. $form['#parameters'][1]['display']->did; - case 'panel': // Deprecated in Panels 3.7 case 'region': - return 'display-'. $form['#parameters'][1]['display']->did .'-panel-'. $form['#parameters'][1]['pid']; + return 'display-'. $form['#parameters'][1]['display']->did .'-region-'. $form['#parameters'][1]['pid']; case 'pane': return 'display-'. $form['#parameters'][1]['display']->did .'-pane-'. $form['#parameters'][1]['pid']; } @@ -333,9 +332,8 @@ function panels_skinr_preprocess_hook_ca switch ($form['#parameters'][1]['type']) { case 'display': return 'panels_display'; - case 'panel': // Deprecated as of Panels 3.7 case 'region': - return 'panels_panel'; + return 'panels_region'; case 'pane': return 'panels_pane'; } Index: modules/panels/skinr.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/skinr/modules/panels/skinr.inc,v retrieving revision 1.1.4.3 diff -u -p -F '^f' -r1.1.4.3 skinr.inc --- modules/panels/skinr.inc 4 Sep 2010 05:32:51 -0000 1.1.4.3 +++ modules/panels/skinr.inc 21 Oct 2010 21:38:25 -0000 @@ -16,10 +16,6 @@ function skinr_skinr_panels_styles() { 'skinr' => array( 'title' => t('Skinr'), 'description' => t('Allows you to apply Skinr skins.'), - // Render panel is deprecated as of Panels 3.7, but is left for backward - // compatibility. - 'render panel' => 'panels_skinr_style_render_region', - // Introduced in Panels 3.7. 'render region' => 'panels_skinr_style_render_region', 'render pane' => 'panels_skinr_style_render_pane', 'settings form' => 'panels_skinr_style_settings_form', @@ -40,9 +36,10 @@ function skinr_skinr_panels_styles() { function theme_panels_skinr_style_render_region($display, $region_id, $panes, $settings) { // Workaround for missing/invalid $region_id. if (empty($region_id)) { - // We grab the first pane that we know exists in this panel and extract the region_id from it. + // Grab the first pane that we know exists in this panel and extract the + // region_id from it. $panes_keys = array_keys($panes); - $panel_id = $display->content[$panes_keys[0]]->panel; + $region_id = $display->content[$panes_keys[0]]->panel; } $output = ''; @@ -50,10 +47,9 @@ function theme_panels_skinr_style_render foreach ($panes as $pane_id => $content) { // Add the separator if we've already displayed a pane. if ($print_separator) { - $output .= '
'; + $output .= '
'; } $output .= $text = $content; - // If we displayed a pane, this will become true; if not, it will become // false. $print_separator = (bool) $text; @@ -63,17 +59,20 @@ function theme_panels_skinr_style_render $hook = 'panels'; if (isset($display->panel_settings[$region_id]['style']) && isset($display->panel_settings[$region_id]['style']) == 'skinr') { // Specific style set for this panel. - $sid = 'display-'. $display->did .'-panel-'. $region_id; + $sid = 'display-'. $display->did .'-region-'. $region_id; } else { // No specific style set, so use the display's style. $sid = 'display-'. $display->did; } $style = array(); - if($skinr = skinr_get(NULL, $hook, $sid)) { - $style = implode(' ', skinr_flatten_skins_array($skinr->skins)); + // Get the Skinr classes for the current panel or display. + if ($skinr = skinr_get(NULL, $hook, $sid)) { + // Convert the array to a string fit for printing in the class attribute. + $style = skinr_style_array_to_string($skinr); } + // Wrap the output in a DIV containing the Skinr class. if (!empty($style)) { $output = '
'. $output .'
'; } @@ -87,6 +86,23 @@ function theme_panels_skinr_style_render * @ingroup themeable */ function theme_panels_skinr_style_render_pane($content, $pane, $display, $plugin = NULL) { + if (isset($pane->style['style']) && isset($pane->style['style']) == 'skinr') { + $hook = 'panels'; + $sid = 'display-'. $display->did .'-pane-'. $pane->pid; + + $style = array(); + // Get the Skinr classes for the current panel or display. + if ($skinr = skinr_get(NULL, $hook, $sid)) { + // Convert the array to a string fit for printing in the class attribute. + $style = skinr_style_array_to_string($skinr); + } + if (!empty($content->css_class)) { + $content->css_class .= ' '. $style; + } + else { + $content->css_class = $style; + } + } return theme('panels_pane', $content, $pane, $display); }