Index: modules/og_panels/og_panels.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og/modules/og_panels/Attic/og_panels.install,v retrieving revision 1.4.4.3 diff -u -p -r1.4.4.3 og_panels.install --- modules/og_panels/og_panels.install 15 Jul 2009 03:59:26 -0000 1.4.4.3 +++ modules/og_panels/og_panels.install 18 Jul 2009 10:17:40 -0000 @@ -122,6 +122,14 @@ function og_panels_update_5001() { function og_panels_update_6000() { $ret = array(); + // Only want to perform this update if it's an upgrade, not a clean install + $fields = drupal_schema_fields_sql('og_panels'); + // If there's already a tab_num field, no need to perform this update + if (in_array('tab_num', $fields)) { + return $ret; + // Otherwise it's an upgrade, and continue with the changes to the database... + } + // Add the tab_num field $new_field = array( 'description' => 'Tab number for this node_tab.', Index: modules/og_panels/og_panels.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og/modules/og_panels/Attic/og_panels.module,v retrieving revision 1.41.4.3 diff -u -p -r1.41.4.3 og_panels.module --- modules/og_panels/og_panels.module 15 Jul 2009 03:59:26 -0000 1.41.4.3 +++ modules/og_panels/og_panels.module 18 Jul 2009 10:17:40 -0000 @@ -138,7 +138,6 @@ function og_panels_default_page_manager_ 'title' => 'OG Panels', ); - $handlers[$handler->name] = $handler; return $handlers; @@ -381,14 +380,14 @@ function og_panels_table(&$form_state, $ '#options' => $options, '#default_value' => $default_page, ); - $form['reset'] = array( - '#type' => 'submit', - '#value' => t('Reset Homepage'), - ); $form['submit'] = array( '#type' => 'submit', '#value' => t('Save settings'), ); + $form['reset'] = array( + '#type' => 'submit', + '#value' => t('Reset Homepage'), + ); $form['group_node'] = array('#type' => 'value', '#value' => $group_node); return $form; @@ -415,25 +414,29 @@ function og_panels_theme($existing, $typ * @return void **/ function theme_og_panels_table($form) { + drupal_add_tabledrag('og-panels-table-table', 'order', 'sibiling', 'weightorder'); foreach (element_children($form['displays']) as $did) { if (is_numeric($did)) { + $form['displays'][$did]['weight']['#attributes']['class'] = 'weightorder'; $rows[] = array( - drupal_render($form['default_page'][$did]), - drupal_render($form['displays'][$did]['page_title']), - drupal_render($form['displays'][$did]['weight']), - drupal_render($form['displays'][$did]['edit content']), - drupal_render($form['displays'][$did]['change layout']), - drupal_render($form['displays'][$did]['edit layout settings']), - drupal_render($form['displays'][$did]['edit page']), - drupal_render($form['displays'][$did]['delete page']), + 'class' => 'draggable', + 'data' => array( + drupal_render($form['default_page'][$did]), + drupal_render($form['displays'][$did]['page_title']), + drupal_render($form['displays'][$did]['weight']), + drupal_render($form['displays'][$did]['edit content']), + drupal_render($form['displays'][$did]['change layout']), + drupal_render($form['displays'][$did]['edit layout settings']), + drupal_render($form['displays'][$did]['edit page']), + drupal_render($form['displays'][$did]['delete page']), + ), ); } } - $output = drupal_render($form); $header = array(t('Home page'), t('Title'), t('Weight'), array('align' => 'center', 'colspan' => 5, 'data' => t('Operations'))); - return theme('table', $header, $rows). $output; + return theme('table', $header, $rows, array('id' => 'og-panels-table-table')). $output; } function og_panels_table_submit($form, &$form_state) {