Index: cod_session/cod-session-calendar.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_session/cod-session-calendar.tpl.php,v
retrieving revision 1.2
diff -u -p -r1.2 cod-session-calendar.tpl.php
--- cod_session/cod-session-calendar.tpl.php	14 Oct 2010 15:25:19 -0000	1.2
+++ cod_session/cod-session-calendar.tpl.php	17 Jan 2011 20:39:08 -0000
@@ -3,8 +3,8 @@
   <table class="session-calendar">
     <tr>
       <th><?php print t('Time'); ?></th>
-    <?php foreach ($rooms as $room_key => $room_title): ?>
-      <th><span class="room-label"><?php print $room_title; ?></th>
+    <?php foreach ($rooms as $room_key => $room): ?>
+      <th><span class="room-label"><?php print $room['title']; ?></span></th>
     <?php endforeach ?>
     </tr>
     <?php foreach ($arranged_slots[$day_key] as $slot): ?>
Index: cod_session/cod_session.features.menu_links.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_session/cod_session.features.menu_links.inc,v
retrieving revision 1.2
diff -u -p -r1.2 cod_session.features.menu_links.inc
--- cod_session/cod_session.features.menu_links.inc	31 Dec 2010 23:08:43 -0000	1.2
+++ cod_session/cod_session.features.menu_links.inc	17 Jan 2011 20:39:08 -0000
@@ -24,24 +24,6 @@ function cod_session_menu_default_menu_l
     'expanded' => '0',
     'weight' => '0',
   );
-  // Exported menu link: primary-links:82568654-06d2-11e0-a3ab-29212d7dea21
-  $menu_links['primary-links:82568654-06d2-11e0-a3ab-29212d7dea21'] = array(
-    'menu_name' => 'primary-links',
-    'router_path' => 'node/%',
-    'link_title' => 'Program',
-    'options' => array(
-      'attributes' => array(
-        'title' => 'Program',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '1',
-    'expanded' => '1',
-    'weight' => '-48',
-    'uuid' => '82568654-06d2-11e0-a3ab-29212d7dea21',
-  );
   // Exported menu link: primary-links:program/session-schedule
   $menu_links['primary-links:program/session-schedule'] = array(
     'menu_name' => 'primary-links',
@@ -54,9 +36,7 @@ function cod_session_menu_default_menu_l
     'external' => '0',
     'has_children' => '0',
     'expanded' => '0',
-    'weight' => '-50',
-    'parent_path' => 'node/1',
-    'parent_uuid' => '82568654-06d2-11e0-a3ab-29212d7dea21',
+    'weight' => '0',
   );
   // Exported menu link: primary-links:program/sessions
   $menu_links['primary-links:program/sessions'] = array(
@@ -70,13 +50,10 @@ function cod_session_menu_default_menu_l
     'external' => '0',
     'has_children' => '0',
     'expanded' => '0',
-    'weight' => '-49',
-    'parent_path' => 'node/1',
-    'parent_uuid' => '82568654-06d2-11e0-a3ab-29212d7dea21',
+    'weight' => '0',
   );
   // Translatables
   // Included for use with string extractors like potx.
-  t('Program');
   t('Session schedule');
   t('Sessions');
   t('Your schedule');
Index: cod_session/cod_session.features.user_permission.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_session/cod_session.features.user_permission.inc,v
retrieving revision 1.7
diff -u -p -r1.7 cod_session.features.user_permission.inc
--- cod_session/cod_session.features.user_permission.inc	5 Jan 2011 20:01:51 -0000	1.7
+++ cod_session/cod_session.features.user_permission.inc	17 Jan 2011 20:39:09 -0000
@@ -6,6 +6,14 @@
 function cod_session_user_default_permissions() {
   $permissions = array();
 
+  // Exported permission: administer nodequeue
+  $permissions['administer nodequeue'] = array(
+    'name' => 'administer nodequeue',
+    'roles' => array(
+      '0' => 'site administrator',
+    ),
+  );
+
   // Exported permission: create room content
   $permissions['create room content'] = array(
     'name' => 'create room content',
@@ -248,6 +256,24 @@ function cod_session_user_default_permis
     ),
   );
 
+  // Exported permission: manipulate all queues
+  $permissions['manipulate all queues'] = array(
+    'name' => 'manipulate all queues',
+    'roles' => array(
+      '0' => 'session organizer',
+      '1' => 'site administrator',
+    ),
+  );
+
+  // Exported permission: manipulate queues
+  $permissions['manipulate queues'] = array(
+    'name' => 'manipulate queues',
+    'roles' => array(
+      '0' => 'session organizer',
+      '1' => 'site administrator',
+    ),
+  );
+
   // Exported permission: view field_accepted
   $permissions['view field_accepted'] = array(
     'name' => 'view field_accepted',
Index: cod_session/cod_session.features.uuid_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_session/cod_session.features.uuid_node.inc,v
retrieving revision 1.2
diff -u -p -r1.2 cod_session.features.uuid_node.inc
--- cod_session/cod_session.features.uuid_node.inc	31 Dec 2010 23:08:43 -0000	1.2
+++ cod_session/cod_session.features.uuid_node.inc	17 Jan 2011 20:39:09 -0000
@@ -12,7 +12,7 @@ function cod_session_uuid_features_defau
     'uid' => '0',
     'status' => '1',
     'created' => '1291934167',
-    'changed' => '1293821493',
+    'changed' => '1295295905',
     'comment' => '0',
     'promote' => '0',
     'moderate' => '0',
@@ -22,63 +22,64 @@ function cod_session_uuid_features_defau
     'revision_uid' => '1',
     'title' => 'Program',
     'body' => '[Tip: You can use this page to describe the overall schedule for your event. For example, "Day 1-2: Sessions. Day 3: Training workshops. Link to content as needed.]
-    
-    Day One - Oct 19, 2011
-    Breakfast and registration
-    Pre-conference training
-    Speakers reception
-    
-    Day Two - Oct 20, 2011
-    Breakfast and registration
-    Sessions
-    Opening night party
-    
-    Day Three - Oct 21, 2011
-    Breakfast and registration
-    Sessions
-    Exhibits and posters
-    
-    Day Four - Oct 22, 2011
-    Breakfast and registration
-    Sessions
-    Wrap party',
+      
+      Day One - Oct 19, 2011
+      Breakfast and registration
+      Pre-conference training
+      Speakers reception
+      
+      Day Two - Oct 20, 2011
+      Breakfast and registration
+      Sessions
+      Opening night party
+      
+      Day Three - Oct 21, 2011
+      Breakfast and registration
+      Sessions
+      Exhibits and posters
+      
+      Day Four - Oct 22, 2011
+      Breakfast and registration
+      Sessions
+      Wrap party',
     'teaser' => '[Tip: You can use this page to describe the overall schedule for your event. For example, "Day 1-2: Sessions. Day 3: Training workshops. Link to content as needed.]
-    
-    Day One - Oct 19, 2011
-    Breakfast and registration
-    Pre-conference training
-    Speakers reception
-    
-    Day Two - Oct 20, 2011
-    Breakfast and registration
-    Sessions
-    Opening night party
-    
-    Day Three - Oct 21, 2011
-    Breakfast and registration
-    Sessions
-    Exhibits and posters
-    
-    Day Four - Oct 22, 2011
-    Breakfast and registration
-    Sessions
-    Wrap party',
+      
+      Day One - Oct 19, 2011
+      Breakfast and registration
+      Pre-conference training
+      Speakers reception
+      
+      Day Two - Oct 20, 2011
+      Breakfast and registration
+      Sessions
+      Opening night party
+      
+      Day Three - Oct 21, 2011
+      Breakfast and registration
+      Sessions
+      Exhibits and posters
+      
+      Day Four - Oct 22, 2011
+      Breakfast and registration
+      Sessions
+      Wrap party',
     'log' => '',
-    'revision_timestamp' => '1293821493',
+    'revision_timestamp' => '1295295905',
     'format' => '1',
     'name' => '',
     'picture' => '',
     'data' => NULL,
     'path' => 'program',
     'signup' => 0,
-    'last_comment_timestamp' => '1293229015',
+    'last_comment_timestamp' => '1295295905',
     'last_comment_name' => NULL,
     'comment_count' => '0',
     'taxonomy' => array(),
     'uuid' => '82568654-06d2-11e0-a3ab-29212d7dea21',
     'revision_uuid' => '8b783c86-0e1c-11e0-98a9-d1fb755a60d4',
+    'loaded_revision_uuid' => '8b783c86-0e1c-11e0-98a9-d1fb755a60d4',
     'pathauto_perform_alias' => FALSE,
-    'date' => '2010-12-09 22:36:07 +0000',
+    'date' => '2010-12-09 17:36:07 -0500',
   );
   return $nodes;
 }
Index: cod_session/cod_session.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_session/cod_session.info,v
retrieving revision 1.18
diff -u -p -r1.18 cod_session.info
--- cod_session/cod_session.info	5 Jan 2011 20:01:51 -0000	1.18
+++ cod_session/cod_session.info	17 Jan 2011 20:39:09 -0000
@@ -13,6 +13,7 @@ dependencies[] = "filefield"
 dependencies[] = "flag"
 dependencies[] = "imagefield"
 dependencies[] = "menu"
+dependencies[] = "nodequeue"
 dependencies[] = "nodereference"
 dependencies[] = "number"
 dependencies[] = "optionwidgets"
@@ -48,7 +49,6 @@ features[fieldgroup][] = "session-group_
 features[flag][] = "session_schedule"
 features[flag][] = "session_vote"
 features[menu_links][] = "menu-quick-links:program/session-schedule/your-schedule"
-features[menu_links][] = "primary-links:82568654-06d2-11e0-a3ab-29212d7dea21"
 features[menu_links][] = "primary-links:program/session-schedule"
 features[menu_links][] = "primary-links:program/sessions"
 features[node][] = "page"
@@ -56,6 +56,7 @@ features[node][] = "room"
 features[node][] = "schedule_item"
 features[node][] = "session"
 features[node][] = "time_slot"
+features[user_permission][] = "administer nodequeue"
 features[user_permission][] = "create room content"
 features[user_permission][] = "create schedule_item content"
 features[user_permission][] = "create session content"
@@ -84,6 +85,8 @@ features[user_permission][] = "edit own 
 features[user_permission][] = "edit own schedule_item content"
 features[user_permission][] = "edit own session content"
 features[user_permission][] = "edit own time_slot content"
+features[user_permission][] = "manipulate all queues"
+features[user_permission][] = "manipulate queues"
 features[user_permission][] = "view field_accepted"
 features[user_permission][] = "view field_experience"
 features[user_permission][] = "view field_presenters"
@@ -141,6 +144,7 @@ features[variable][] = "node_options_sch
 features[variable][] = "node_options_session"
 features[variable][] = "node_options_time_slot"
 features[views][] = "schedule"
+features[views][] = "schedule_room_list"
 features[views][] = "sessions"
 features[views][] = "sessions_admin"
 features[views_api][] = "api:2"
Index: cod_session/cod_session.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_session/cod_session.module,v
retrieving revision 1.5
diff -u -p -r1.5 cod_session.module
--- cod_session/cod_session.module	7 Jan 2011 20:30:33 -0000	1.5
+++ cod_session/cod_session.module	17 Jan 2011 20:39:09 -0000
@@ -144,10 +144,7 @@ function template_preprocess_cod_session
   }
 
   // Get a list of rooms.
-  $result = db_query("SELECT node.nid, node.title FROM {node} node WHERE node.type = 'room' AND node.status = 1 ORDER BY node.title ASC");
-  while ($node = db_fetch_object($result)) {
-    $rooms[$node->nid] = check_plain($node->title);
-  }
+  $rooms = _cod_session_schedule_rooms();
 
   // Create structed grid of sessions.
   $slot_nids = array();
@@ -264,6 +261,41 @@ function template_preprocess_cod_session
 }
 
 /**
+ * Helper function returns a list of rooms to display on the schedule.
+ */
+function _cod_session_schedule_rooms() {
+  $rooms = array();
+  // Try and load the schedule room list view.
+  $view = views_get_view('schedule_room_list');
+  if (!$view) {
+    // It didn't load so default to the list of published rooms.
+    $result = db_query("SELECT node.nid, node.title FROM {node} node WHERE node.type = 'room' AND node.status = 1 ORDER BY node.title ASC");
+    while ($record = db_fetch_object($result)) {
+      $room = node_load($result->nid);
+      $sponsor = '';
+      if (isset($room->field_room_sponsor) && !empty($room->field_room_sponsor[0]['value'])) {
+        $sponsor = check_plain($room->field_room_sponsor[0]['value']);
+      }
+      $rooms[$record->nid] = array(
+        'title' => check_plain($record->title),
+        'sponsor' => $sponsor,
+      );
+    }
+  }
+  else {
+    // Return the results from the view.
+    $view->execute();
+    foreach ($view->result as $record) {
+      $rooms[$record->nid] = array(
+        'title' => check_plain($record->node_title),
+        'sponsor' => check_plain($record->node_data_field_room_sponsor_field_room_sponsor_value),
+      );
+    }
+  }
+  return $rooms;
+}
+
+/**
  * Recursive ksort.
  */
 function cod_session_ksort_recurse(&$array) {
Index: cod_session/cod_session.views_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_session/cod_session.views_default.inc,v
retrieving revision 1.7
diff -u -p -r1.7 cod_session.views_default.inc
--- cod_session/cod_session.views_default.inc	7 Jan 2011 20:09:32 -0000	1.7
+++ cod_session/cod_session.views_default.inc	17 Jan 2011 20:39:09 -0000
@@ -577,6 +577,113 @@ function cod_session_views_default_views
 
   $views[$view->name] = $view;
 
+  // Exported view: schedule_room_list
+  $view = new view;
+  $view->name = 'schedule_room_list';
+  $view->description = 'Order of rooms on the schedule';
+  $view->tag = '';
+  $view->view_php = '';
+  $view->base_table = 'node';
+  $view->is_cacheable = FALSE;
+  $view->api_version = 2;
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $handler = $view->new_display('default', 'Defaults', 'default');
+  $handler->override_option('relationships', array(
+    'nodequeue_rel' => array(
+      'label' => 'queue',
+      'required' => 1,
+      'limit' => 1,
+      'qids' => array(
+        '1' => 1,
+      ),
+      'id' => 'nodequeue_rel',
+      'table' => 'node',
+      'field' => 'nodequeue_rel',
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('fields', array(
+    'title' => array(
+      'label' => '',
+      'alter' => array(
+        'alter_text' => 0,
+        'text' => '',
+        'make_link' => 0,
+        'path' => '',
+        'link_class' => '',
+        'alt' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'target' => '',
+        'help' => '',
+        'trim' => 0,
+        'max_length' => '',
+        'word_boundary' => 1,
+        'ellipsis' => 1,
+        'html' => 0,
+        'strip_tags' => 0,
+      ),
+      'empty' => '',
+      'hide_empty' => 0,
+      'empty_zero' => 0,
+      'link_to_node' => 0,
+      'exclude' => 0,
+      'id' => 'title',
+      'table' => 'node',
+      'field' => 'title',
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('sorts', array(
+    'position' => array(
+      'order' => 'ASC',
+      'id' => 'position',
+      'table' => 'nodequeue_nodes',
+      'field' => 'position',
+      'relationship' => 'nodequeue_rel',
+    ),
+  ));
+  $handler->override_option('filters', array(
+    'status' => array(
+      'operator' => '=',
+      'value' => '1',
+      'group' => '0',
+      'exposed' => FALSE,
+      'expose' => array(
+        'operator' => FALSE,
+        'label' => '',
+      ),
+      'id' => 'status',
+      'table' => 'node',
+      'field' => 'status',
+      'relationship' => 'none',
+    ),
+    'type' => array(
+      'operator' => 'in',
+      'value' => array(
+        'room' => 'room',
+      ),
+      'group' => '0',
+      'exposed' => FALSE,
+      'expose' => array(
+        'operator' => FALSE,
+        'label' => '',
+      ),
+      'id' => 'type',
+      'table' => 'node',
+      'field' => 'type',
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('access', array(
+    'type' => 'none',
+  ));
+  $handler->override_option('cache', array(
+    'type' => 'none',
+  ));
+
+  $views[$view->name] = $view;
+
   // Exported view: sessions
   $view = new view;
   $view->name = 'sessions';