Index: location.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/location.module,v
retrieving revision 1.222
diff -u -p -r1.222 location.module
--- location.module	10 Dec 2008 21:55:02 -0000	1.222
+++ location.module	15 Dec 2008 00:12:16 -0000
@@ -482,26 +482,36 @@ function theme_location_settings($elemen
     $element[$key]['weight']['#attributes']['class'] = 'location-settings-weight';
     unset($element[$key]['default']['#title']);
     $row = array();
-    $row[] = array('data' => '', 'class' => 'location-settings-drag');
+    $row[] = '';
     $row[] = drupal_render($element[$key]['name']);
     $row[] = drupal_render($element[$key]['collect']);
     $row[] = drupal_render($element[$key]['default']);
-    $row[] = array('data' => drupal_render($element[$key]['weight']), 'class' => 'delta-order');
-
+    $row[] = drupal_render($element[$key]['weight']);
     $rows[] = array(
-      '#weight' => (int)$element[$key]['weight']['#value'],
+//      '#weight' => (int)$element[$key]['weight']['#value'],
       'data' => $row,
       'class' => 'draggable',
     );
   }
+/*
+    $form[$key]['weight']['#attributes']['class'] = 'track-weight';
+    $row[] = drupal_render($form[$key]['weight']);
+    $rows[] = array('data' => $row, 'class' => 'draggable');
+  }
 
-  uasort($rows, 'element_sort');
-  foreach ($rows as $k => $v) {
-    unset($rows[$k]['#weight']);
+  $output = '';
+  if (count($rows)) {
+    drupal_add_tabledrag('station-playlist-tracks', 'order', 'sibling', 'track-weight');
+    $output .= theme('table', $header, $rows, array('id' => 'station-playlist-tracks'));
   }
+ *
+ */
+//  uasort($rows, 'element_sort');
+//  foreach ($rows as $k => $v) {
+//    unset($rows[$k]['#weight']);
+//  }
 
   drupal_add_tabledrag('location-settings-table', 'order', 'sibling', 'location-settings-weight');
-
   $output = theme('table', $header, $rows, array('id' => 'location-settings-table'));
   //return theme('form_element', $element, $element['#children']);
   return $output;
Index: contrib/location_cck/location_cck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/contrib/location_cck/location_cck.module,v
retrieving revision 1.5
diff -u -p -r1.5 location_cck.module
--- contrib/location_cck/location_cck.module	20 Nov 2008 19:46:21 -0000	1.5
+++ contrib/location_cck/location_cck.module	15 Dec 2008 00:12:16 -0000
@@ -59,8 +59,22 @@ function location_cck_field_settings($op
         ),
       );
 
+    case 'views data':
+      $data = content_views_field_views_data($field);
+      $table_alias = content_views_tablename($field);
+
+      // Add a relation to the taxonomy term table.
+      $data[$table_alias][$field['field_name'] .'_lid']['relationship'] = array(
+        'base' => 'location',
+        'handler' => 'content_handler_relationship',
+        'field' => 'lid',
+        'label' => t('@field-title location', array('@field-title' => t($field['widget']['label']))),
+        'content_field_name' => $field['field_name'],
+      );
+      return $data;
+/*
     case 'arguments':
-/*      $arguments = content_views_field_arguments($field);
+      $arguments = content_views_field_arguments($field);
       $alias = "content: $field[field_name]";
       $argument = array(
         'handler' => 'text_views_argument_handler',
@@ -68,10 +82,9 @@ function location_cck_field_settings($op
         'help' => t('Set the option to the number of initial characters to filter by. Leave empty for full term; use 1 for an A/B/C style glossary.'),
       );
       $arguments[$alias] = array_merge($arguments[$alias], $argument);
-      return $arguments;*/return;
+      return $arguments;
 
     case 'filters':
-      /*
       $allowed_values = text_allowed_values($field);
        if (count($allowed_values)) {
          return array(
@@ -90,8 +103,9 @@ function location_cck_field_settings($op
             'handler' => 'views_handler_filter_like',
           ),
         );
-      }*/
+      }
       break;
+*/
   }
 }