? .DS_Store
? cod_session_improvements-2.patch
? cod_session_improvements_3.patch
? latest-codsessionmaddness.patch
? session-hottness.diff
Index: cod_base/cod_base.features.menu_custom.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_base/cod_base.features.menu_custom.inc,v
retrieving revision 1.1
diff -u -p -r1.1 cod_base.features.menu_custom.inc
--- cod_base/cod_base.features.menu_custom.inc 2 Dec 2010 18:45:11 -0000 1.1
+++ cod_base/cod_base.features.menu_custom.inc 24 Dec 2010 22:33:38 -0000
@@ -12,9 +12,17 @@ function cod_base_menu_default_menu_cust
'title' => 'Conference Management',
'description' => '',
);
+ // Exported menu: menu-quick-links
+ $menus['menu-quick-links'] = array(
+ 'menu_name' => 'menu-quick-links',
+ 'title' => 'Quick links - Authenticated',
+ 'description' => 'Utility links that display on every page of the site, such as "Your account" and "Your schedule"',
+ );
// Translatables
// Included for use with string extractors like potx.
t('Conference Management');
+ t('Quick links - Authenticated');
+ t('Utility links that display on every page of the site, such as "Your account" and "Your schedule"');
return $menus;
Index: cod_base/cod_base.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_base/cod_base.info,v
retrieving revision 1.4
diff -u -p -r1.4 cod_base.info
--- cod_base/cod_base.info 7 Dec 2010 21:03:40 -0000 1.4
+++ cod_base/cod_base.info 24 Dec 2010 22:33:38 -0000
@@ -5,6 +5,7 @@ dependencies[] = "strongarm"
description = "Contains dependencies shared by other COD feature modules."
features[ctools][] = "strongarm:strongarm:1"
features[menu_custom][] = "menu-conference-admin"
+features[menu_custom][] = "menu-quick-links"
features[variable][] = "configurable_timezones"
name = "COD Base"
package = "Features"
Index: cod_base/cod_base.strongarm.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_base/cod_base.strongarm.inc,v
retrieving revision 1.3
diff -u -p -r1.3 cod_base.strongarm.inc
--- cod_base/cod_base.strongarm.inc 7 Dec 2010 21:03:40 -0000 1.3
+++ cod_base/cod_base.strongarm.inc 24 Dec 2010 22:33:38 -0000
@@ -5,12 +5,13 @@
*/
function cod_base_strongarm() {
$export = array();
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'configurable_timezones';
$strongarm->value = '0';
-
$export['configurable_timezones'] = $strongarm;
+
return $export;
}
Index: cod_session/cod_session.features.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_session/cod_session.features.inc,v
retrieving revision 1.12
diff -u -p -r1.12 cod_session.features.inc
--- cod_session/cod_session.features.inc 1 Dec 2010 19:26:49 -0000 1.12
+++ cod_session/cod_session.features.inc 24 Dec 2010 22:33:38 -0000
@@ -108,6 +108,17 @@ return $flags;
*/
function cod_session_node_info() {
$items = array(
+ 'page' => array(
+ 'name' => t('Page'),
+ 'module' => 'features',
+ 'description' => t('Use the Page content type for mostly static content like the "About us" section of a website. By default, a page entry does not allow comments and is not featured on the site\'s home page.'),
+ 'has_title' => '1',
+ 'title_label' => t('Title'),
+ 'has_body' => '1',
+ 'body_label' => t('Body'),
+ 'min_word_count' => '0',
+ 'help' => '',
+ ),
'room' => array(
'name' => t('Room'),
'module' => 'features',
Index: cod_session/cod_session.features.menu_links.inc
===================================================================
RCS file: cod_session/cod_session.features.menu_links.inc
diff -N cod_session/cod_session.features.menu_links.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ cod_session/cod_session.features.menu_links.inc 24 Dec 2010 22:33:38 -0000
@@ -0,0 +1,69 @@
+ 'menu-quick-links',
+ 'link_path' => 'program/session-schedule/your-schedule',
+ 'router_path' => 'program/session-schedule/your-schedule',
+ 'link_title' => 'Your schedule',
+ 'options' => array(
+ 'attributes' => array(
+ 'title' => 'Your personal conference schedule',
+ ),
+ ),
+ 'module' => 'menu',
+ 'hidden' => '0',
+ 'external' => '0',
+ 'has_children' => '0',
+ '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' => '0',
+ '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',
+ 'link_path' => 'program/session-schedule',
+ 'router_path' => 'program/session-schedule',
+ 'link_title' => 'Session Schedule',
+ 'options' => array(),
+ 'module' => 'system',
+ 'hidden' => '0',
+ 'external' => '0',
+ 'has_children' => '0',
+ 'expanded' => '0',
+ 'weight' => '-49',
+ 'parent_path' => 'node/1',
+ 'parent_uuid' => '82568654-06d2-11e0-a3ab-29212d7dea21',
+ );
+ // Translatables
+ // Included for use with string extractors like potx.
+ t('Program');
+ t('Session Schedule');
+ t('Your schedule');
+
+
+ return $menu_links;
+}
Index: cod_session/cod_session.features.uuid_node.inc
===================================================================
RCS file: cod_session/cod_session.features.uuid_node.inc
diff -N cod_session/cod_session.features.uuid_node.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ cod_session/cod_session.features.uuid_node.inc 24 Dec 2010 22:33:38 -0000
@@ -0,0 +1,44 @@
+ 'page',
+ 'language' => '',
+ 'uid' => '0',
+ 'status' => '1',
+ 'created' => '1291934167',
+ 'changed' => '1293222470',
+ 'comment' => '0',
+ 'promote' => '0',
+ 'moderate' => '0',
+ 'sticky' => '0',
+ 'tnid' => '0',
+ 'translate' => '0',
+ 'revision_uid' => '1',
+ 'title' => 'Program',
+ 'body' => 'You can use this page to describe the overall schedule for your event. For example, "Day 1-2: Sessions. Day 3: Training workshops.',
+ 'teaser' => 'You can use this page to describe the overall schedule for your event. For example, "Day 1-2: Sessions. Day 3: Training workshops.',
+ 'log' => '',
+ 'revision_timestamp' => '1293222470',
+ 'format' => '1',
+ 'name' => '',
+ 'picture' => '',
+ 'data' => NULL,
+ 'path' => 'program',
+ 'signup' => 0,
+ 'last_comment_timestamp' => '1293222470',
+ 'last_comment_name' => NULL,
+ 'comment_count' => '0',
+ 'taxonomy' => array(),
+ 'uuid' => '82568654-06d2-11e0-a3ab-29212d7dea21',
+ 'revision_uuid' => '8b783c86-0e1c-11e0-98a9-d1fb755a60d4',
+ 'pathauto_perform_alias' => FALSE,
+ '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.15
diff -u -p -r1.15 cod_session.info
--- cod_session/cod_session.info 3 Dec 2010 00:13:47 -0000 1.15
+++ cod_session/cod_session.info 24 Dec 2010 22:33:38 -0000
@@ -11,6 +11,7 @@ dependencies[] = "features"
dependencies[] = "fieldgroup"
dependencies[] = "filefield"
dependencies[] = "flag"
+dependencies[] = "menu"
dependencies[] = "nodereference"
dependencies[] = "number"
dependencies[] = "optionwidgets"
@@ -19,6 +20,7 @@ dependencies[] = "strongarm"
dependencies[] = "text"
dependencies[] = "token"
dependencies[] = "userreference"
+dependencies[] = "uuid_features"
dependencies[] = "views"
dependencies[] = "views_ui"
description = "COD Session Scheduling & Voting"
@@ -40,6 +42,10 @@ features[fieldgroup][] = "session-group_
features[fieldgroup][] = "session-group_schedule"
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[node][] = "page"
features[node][] = "room"
features[node][] = "schedule_item"
features[node][] = "session"
@@ -80,6 +86,7 @@ features[user_permission][] = "view fiel
features[user_permission][] = "view field_slot_datetime"
features[user_permission][] = "view field_track"
features[user_role][] = "session organizer"
+features[uuid_node][] = "82568654-06d2-11e0-a3ab-29212d7dea21"
features[variable][] = "ant_pattern_time_slot"
features[variable][] = "ant_time_slot"
features[variable][] = "comment_anonymous_room"
@@ -106,6 +113,7 @@ features[variable][] = "comment_form_loc
features[variable][] = "comment_form_location_schedule_item"
features[variable][] = "comment_form_location_session"
features[variable][] = "comment_form_location_time_slot"
+features[variable][] = "comment_page"
features[variable][] = "comment_preview_room"
features[variable][] = "comment_preview_schedule_item"
features[variable][] = "comment_preview_session"
@@ -119,6 +127,7 @@ features[variable][] = "comment_subject_
features[variable][] = "comment_subject_field_time_slot"
features[variable][] = "comment_time_slot"
features[variable][] = "content_extra_weights_session"
+features[variable][] = "node_options_page"
features[variable][] = "node_options_room"
features[variable][] = "node_options_schedule_item"
features[variable][] = "node_options_session"
Index: cod_session/cod_session.strongarm.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cod_support/cod_session/cod_session.strongarm.inc,v
retrieving revision 1.5
diff -u -p -r1.5 cod_session.strongarm.inc
--- cod_session/cod_session.strongarm.inc 1 Dec 2010 19:26:49 -0000 1.5
+++ cod_session/cod_session.strongarm.inc 24 Dec 2010 22:33:38 -0000
@@ -5,272 +5,280 @@
*/
function cod_session_strongarm() {
$export = array();
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'ant_pattern_time_slot';
$strongarm->value = '[field_slot_datetime-d] [field_slot_datetime-month] [field_slot_datetime-time] - [field_slot_datetime-to-time]';
-
$export['ant_pattern_time_slot'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'ant_time_slot';
$strongarm->value = '1';
-
$export['ant_time_slot'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_anonymous_room';
$strongarm->value = 0;
-
$export['comment_anonymous_room'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_anonymous_schedule_item';
$strongarm->value = 0;
-
$export['comment_anonymous_schedule_item'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_anonymous_session';
$strongarm->value = 0;
-
$export['comment_anonymous_session'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_anonymous_time_slot';
$strongarm->value = 0;
-
$export['comment_anonymous_time_slot'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_controls_room';
$strongarm->value = '3';
-
$export['comment_controls_room'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_controls_schedule_item';
$strongarm->value = '3';
-
$export['comment_controls_schedule_item'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_controls_session';
$strongarm->value = '3';
-
$export['comment_controls_session'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_controls_time_slot';
$strongarm->value = '3';
-
$export['comment_controls_time_slot'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_mode_room';
$strongarm->value = '4';
-
$export['comment_default_mode_room'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_mode_schedule_item';
$strongarm->value = '4';
-
$export['comment_default_mode_schedule_item'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_mode_session';
$strongarm->value = '4';
-
$export['comment_default_mode_session'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_mode_time_slot';
$strongarm->value = '4';
-
$export['comment_default_mode_time_slot'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_order_room';
$strongarm->value = '1';
-
$export['comment_default_order_room'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_order_schedule_item';
$strongarm->value = '1';
-
$export['comment_default_order_schedule_item'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_order_session';
$strongarm->value = '1';
-
$export['comment_default_order_session'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_order_time_slot';
$strongarm->value = '1';
-
$export['comment_default_order_time_slot'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_per_page_room';
$strongarm->value = '50';
-
$export['comment_default_per_page_room'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_per_page_schedule_item';
$strongarm->value = '50';
-
$export['comment_default_per_page_schedule_item'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_per_page_session';
$strongarm->value = '50';
-
$export['comment_default_per_page_session'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_default_per_page_time_slot';
$strongarm->value = '50';
-
$export['comment_default_per_page_time_slot'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_form_location_room';
$strongarm->value = '0';
-
$export['comment_form_location_room'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_form_location_schedule_item';
$strongarm->value = '0';
-
$export['comment_form_location_schedule_item'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_form_location_session';
$strongarm->value = '0';
-
$export['comment_form_location_session'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_form_location_time_slot';
$strongarm->value = '0';
-
$export['comment_form_location_time_slot'] = $strongarm;
+
+ $strongarm = new stdClass;
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'comment_page';
+ $strongarm->value = 0;
+ $export['comment_page'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_preview_room';
$strongarm->value = '1';
-
$export['comment_preview_room'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_preview_schedule_item';
$strongarm->value = '1';
-
$export['comment_preview_schedule_item'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_preview_session';
$strongarm->value = '1';
-
$export['comment_preview_session'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_preview_time_slot';
$strongarm->value = '1';
-
$export['comment_preview_time_slot'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_room';
$strongarm->value = '0';
-
$export['comment_room'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_schedule_item';
$strongarm->value = '0';
-
$export['comment_schedule_item'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_session';
$strongarm->value = '2';
-
$export['comment_session'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_subject_field_room';
$strongarm->value = '1';
-
$export['comment_subject_field_room'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_subject_field_schedule_item';
$strongarm->value = '1';
-
$export['comment_subject_field_schedule_item'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_subject_field_session';
$strongarm->value = '1';
-
$export['comment_subject_field_session'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_subject_field_time_slot';
$strongarm->value = '1';
-
$export['comment_subject_field_time_slot'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'comment_time_slot';
$strongarm->value = '0';
-
$export['comment_time_slot'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
@@ -286,8 +294,17 @@ function cod_session_strongarm() {
'path' => '7',
'path_redirect' => '5',
);
-
$export['content_extra_weights_session'] = $strongarm;
+
+ $strongarm = new stdClass;
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'node_options_page';
+ $strongarm->value = array(
+ 0 => 'status',
+ );
+ $export['node_options_page'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
@@ -296,8 +313,8 @@ function cod_session_strongarm() {
0 => 'status',
1 => 'promote',
);
-
$export['node_options_room'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
@@ -306,8 +323,8 @@ function cod_session_strongarm() {
0 => 'status',
1 => 'promote',
);
-
$export['node_options_schedule_item'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
@@ -316,8 +333,8 @@ function cod_session_strongarm() {
0 => 'status',
1 => 'promote',
);
-
$export['node_options_session'] = $strongarm;
+
$strongarm = new stdClass;
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
@@ -326,7 +343,7 @@ function cod_session_strongarm() {
0 => 'status',
1 => 'promote',
);
-
$export['node_options_time_slot'] = $strongarm;
+
return $export;
}
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.3
diff -u -p -r1.3 cod_session.views_default.inc
--- cod_session/cod_session.views_default.inc 3 Dec 2010 00:13:47 -0000 1.3
+++ cod_session/cod_session.views_default.inc 24 Dec 2010 22:33:38 -0000
@@ -17,6 +17,21 @@ function cod_session_views_default_views
$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(
+ 'flag_content_rel' => array(
+ 'label' => 'flag: session_schedule',
+ 'required' => 0,
+ 'flag' => 'session_schedule',
+ 'user_scope' => 'current',
+ 'id' => 'flag_content_rel',
+ 'table' => 'node',
+ 'field' => 'flag_content_rel',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Override',
+ ),
+ ),
+ ));
$handler->override_option('fields', array(
'field_track_value' => array(
'label' => '',
@@ -133,6 +148,80 @@ function cod_session_views_default_views
),
'relationship' => 'none',
),
+ 'field_experience_value' => array(
+ 'label' => 'Experience',
+ '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' => 1,
+ 'empty_zero' => 0,
+ 'link_to_node' => 0,
+ 'label_type' => 'widget',
+ 'format' => 'default',
+ 'multiple' => array(
+ 'group' => 1,
+ 'multiple_number' => '',
+ 'multiple_from' => '',
+ 'multiple_reversed' => 0,
+ ),
+ 'exclude' => 0,
+ 'id' => 'field_experience_value',
+ 'table' => 'node_data_field_experience',
+ 'field' => 'field_experience_value',
+ 'override' => array(
+ 'button' => 'Override',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'ops' => 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_type' => '',
+ 'exclude' => 0,
+ 'id' => 'ops',
+ 'table' => 'flag_content',
+ 'field' => 'ops',
+ 'relationship' => 'flag_content_rel',
+ 'override' => array(
+ 'button' => 'Override',
+ ),
+ ),
));
$handler->override_option('filters', array(
'type' => array(
@@ -228,316 +317,142 @@ function cod_session_views_default_views
),
));
$handler->override_option('access', array(
- 'type' => 'none',
+ 'type' => 'role',
+ 'role' => array(
+ '3' => 3,
+ ),
));
$handler->override_option('cache', array(
'type' => 'none',
));
- $handler->override_option('title', 'Schedule');
- $handler->override_option('header', 'Note: The below schedule is a work in progress and is subject to changes until officially announced. ');
+ $handler->override_option('title', 'Schedule (Access Restricted)');
$handler->override_option('header_format', '1');
$handler->override_option('header_empty', 0);
- $handler->override_option('empty', '');
- $handler->override_option('empty_format', '3');
+ $handler->override_option('empty', 'The schedule is empty. Please create one or more rooms and timeslots, and assign a session or schedule item to them. For help with scheduling, please see the COD Documentation.');
+ $handler->override_option('empty_format', '1');
$handler->override_option('items_per_page', 0);
$handler->override_option('link_display', 'page_1');
$handler->override_option('style_plugin', 'cod_session_calendar');
$handler->override_option('style_options', NULL);
- $handler = $view->new_display('page', 'Page: Session Schedule', 'page_1');
- $handler->override_option('path', 'program/schedule');
- $handler->override_option('menu', array(
- 'type' => 'normal',
- 'title' => 'Session Schedule',
- 'description' => '',
- 'weight' => '0',
- 'name' => 'primary-links',
- ));
- $handler->override_option('tab_options', array(
- 'type' => 'none',
- 'title' => '',
- 'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
- ));
- $handler = $view->new_display('block', 'Primary Sessions Block', 'block_1');
- $handler->override_option('block_description', 'Primary Sessions');
- $handler->override_option('block_caching', -1);
- $handler = $view->new_display('page', 'Admin list', 'page_2');
- $handler->override_option('relationships', array(
- 'field_session_slot_nid' => array(
- 'label' => 'Time slot',
- 'required' => 0,
- 'delta' => -1,
- 'id' => 'field_session_slot_nid',
- 'table' => 'node_data_field_session_slot',
- 'field' => 'field_session_slot_nid',
- 'override' => array(
- 'button' => 'Use default',
- ),
- 'relationship' => 'none',
- ),
- ));
- $handler->override_option('fields', array(
- 'field_session_slot_nid' => array(
- 'label' => 'Time slot',
- '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,
- 'label_type' => 'widget',
- 'format' => 'default',
- 'multiple' => array(
- 'group' => TRUE,
- 'multiple_number' => '',
- 'multiple_from' => '',
- 'multiple_reversed' => FALSE,
+ $handler = $view->new_display('page', 'Schedule', 'page_1');
+ $handler->override_option('filters', array(
+ 'type' => array(
+ 'operator' => 'in',
+ 'value' => array(
+ 'schedule_item' => 'schedule_item',
+ 'session' => 'session',
),
- 'exclude' => 0,
- 'id' => 'field_session_slot_nid',
- 'table' => 'node_data_field_session_slot',
- 'field' => 'field_session_slot_nid',
- 'override' => array(
- 'button' => 'Use default',
+ 'group' => '0',
+ 'exposed' => FALSE,
+ 'expose' => array(
+ 'operator' => FALSE,
+ 'label' => '',
),
+ 'id' => 'type',
+ 'table' => 'node',
+ 'field' => 'type',
'relationship' => 'none',
- ),
- 'field_room_value' => array(
- 'label' => 'Room',
- '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,
- 'label_type' => 'widget',
- 'format' => 'default',
- 'multiple' => array(
- 'group' => TRUE,
- 'multiple_number' => '',
- 'multiple_from' => '',
- 'multiple_reversed' => FALSE,
- ),
- 'exclude' => 0,
- 'id' => 'field_room_value',
- 'table' => 'node_data_field_room',
- 'field' => 'field_room_value',
'override' => array(
'button' => 'Use default',
),
- 'relationship' => 'none',
),
- 'title' => array(
- 'label' => 'Title',
- 'alter' => array(
- 'alter_text' => 0,
- 'text' => '[title]',
- '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,
+ 'status' => array(
+ 'operator' => '=',
+ 'value' => '1',
+ 'group' => '0',
+ 'exposed' => FALSE,
+ 'expose' => array(
+ 'operator' => FALSE,
+ 'label' => '',
),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 1,
- 'exclude' => 0,
- 'id' => 'title',
+ 'id' => 'status',
'table' => 'node',
- 'field' => 'title',
+ 'field' => 'status',
'relationship' => 'none',
- 'override' => array(
- 'button' => 'Use default',
- ),
),
- 'field_track_value' => 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,
+ 'field_accepted_value' => array(
+ 'operator' => '=',
+ 'value' => array(
+ 'value' => '1',
+ 'min' => '',
+ 'max' => '',
),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'link_to_node' => 0,
- 'label_type' => 'none',
- 'format' => 'default',
- 'multiple' => array(
- 'group' => TRUE,
- 'multiple_number' => '',
- 'multiple_from' => '',
- 'multiple_reversed' => FALSE,
+ 'group' => '0',
+ 'exposed' => FALSE,
+ 'expose' => array(
+ 'operator' => FALSE,
+ 'label' => '',
),
- 'exclude' => 0,
- 'id' => 'field_track_value',
- 'table' => 'node_data_field_track',
- 'field' => 'field_track_value',
+ 'id' => 'field_accepted_value',
+ 'table' => 'node_data_field_accepted',
+ 'field' => 'field_accepted_value',
'override' => array(
'button' => 'Override',
),
'relationship' => 'none',
),
- 'field_presenters_uid' => array(
- 'label' => 'Presenter(s)',
- '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,
- 'label_type' => 'widget',
- 'format' => 'default',
- 'multiple' => array(
- 'group' => 1,
- 'multiple_number' => '',
- 'multiple_from' => '',
- 'multiple_reversed' => 0,
+ 'field_session_slot_nid' => array(
+ 'operator' => 'not empty',
+ 'value' => array(),
+ 'group' => '0',
+ 'exposed' => FALSE,
+ 'expose' => array(
+ 'operator' => FALSE,
+ 'label' => '',
),
- 'exclude' => 0,
- 'id' => 'field_presenters_uid',
- 'table' => 'node_data_field_presenters',
- 'field' => 'field_presenters_uid',
+ 'id' => 'field_session_slot_nid',
+ 'table' => 'node_data_field_session_slot',
+ 'field' => 'field_session_slot_nid',
'override' => array(
- 'button' => 'Use default',
+ 'button' => 'Override',
),
'relationship' => 'none',
+ 'reduce_duplicates' => 0,
),
- 'edit_node' => array(
- 'label' => 'Edit link',
- '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,
+ 'field_session_room_nid' => array(
+ 'operator' => 'not empty',
+ 'value' => array(),
+ 'group' => '0',
+ 'exposed' => FALSE,
+ 'expose' => array(
+ 'operator' => FALSE,
+ 'label' => '',
),
- 'empty' => '',
- 'hide_empty' => 0,
- 'empty_zero' => 0,
- 'text' => '',
- 'exclude' => 0,
- 'id' => 'edit_node',
- 'table' => 'node',
- 'field' => 'edit_node',
+ 'id' => 'field_session_room_nid',
+ 'table' => 'node_data_field_session_room',
+ 'field' => 'field_session_room_nid',
'override' => array(
- 'button' => 'Use default',
+ 'button' => 'Override',
),
'relationship' => 'none',
+ 'reduce_duplicates' => 0,
),
));
- $handler->override_option('sorts', array(
- 'field_slot_datetime_value' => array(
- 'order' => 'ASC',
- 'delta' => -1,
- 'id' => 'field_slot_datetime_value',
- 'table' => 'node_data_field_slot_datetime',
- 'field' => 'field_slot_datetime_value',
- 'override' => array(
- 'button' => 'Use default',
- ),
- 'relationship' => 'field_session_slot_nid',
- ),
- 'field_room_value' => array(
- 'order' => 'ASC',
- 'delta' => -1,
- 'id' => 'field_room_value',
- 'table' => 'node_data_field_room',
- 'field' => 'field_room_value',
- 'override' => array(
- 'button' => 'Use default',
- ),
- 'relationship' => 'none',
- ),
+ $handler->override_option('path', 'program/session-schedule/all');
+ $handler->override_option('menu', array(
+ 'type' => 'default tab',
+ 'title' => 'Session Schedule',
+ 'description' => '',
+ 'weight' => '0',
+ 'name' => 'primary-links',
+ ));
+ $handler->override_option('tab_options', array(
+ 'type' => 'normal',
+ 'title' => 'Session schedule',
+ 'description' => '',
+ 'weight' => '0',
+ 'name' => 'primary-links',
));
+ $handler = $view->new_display('block', 'Primary Sessions Block', 'block_1');
+ $handler->override_option('block_description', 'Primary Sessions');
+ $handler->override_option('block_caching', -1);
+ $handler = $view->new_display('page', 'Your schedule', 'page_4');
$handler->override_option('filters', array(
'type' => array(
'operator' => 'in',
'value' => array(
'session' => 'session',
+ 'schedule_item' => 'schedule_item',
),
'group' => '0',
'exposed' => FALSE,
@@ -549,6 +464,9 @@ function cod_session_views_default_views
'table' => 'node',
'field' => 'type',
'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Override',
+ ),
),
'status' => array(
'operator' => '=',
@@ -572,88 +490,88 @@ function cod_session_views_default_views
'max' => '',
),
'group' => '0',
- 'exposed' => TRUE,
+ 'exposed' => FALSE,
'expose' => array(
- 'use_operator' => 0,
- 'operator' => 'field_accepted_value_op',
- 'identifier' => 'field_accepted_value',
- 'label' => 'Status',
- 'optional' => 1,
- 'remember' => 0,
+ 'operator' => FALSE,
+ 'label' => '',
),
'id' => 'field_accepted_value',
'table' => 'node_data_field_accepted',
'field' => 'field_accepted_value',
'override' => array(
- 'button' => 'Use default',
+ 'button' => 'Override',
),
'relationship' => 'none',
),
- 'field_track_value_many_to_one' => array(
- 'operator' => 'or',
+ 'field_session_slot_nid' => array(
+ 'operator' => 'not empty',
'value' => array(),
'group' => '0',
- 'exposed' => TRUE,
+ 'exposed' => FALSE,
'expose' => array(
- 'use_operator' => 0,
- 'operator' => 'field_track_value_many_to_one_op',
- 'identifier' => 'field_track_value_many_to_one',
- 'label' => 'Track',
- 'optional' => 1,
- 'single' => 0,
- 'remember' => 0,
- 'reduce' => 0,
+ 'operator' => FALSE,
+ 'label' => '',
),
- 'id' => 'field_track_value_many_to_one',
- 'table' => 'node_data_field_track',
- 'field' => 'field_track_value_many_to_one',
+ 'id' => 'field_session_slot_nid',
+ 'table' => 'node_data_field_session_slot',
+ 'field' => 'field_session_slot_nid',
'override' => array(
'button' => 'Override',
),
'relationship' => 'none',
'reduce_duplicates' => 0,
),
- ));
- $handler->override_option('empty', 'No sessions listed.');
- $handler->override_option('style_plugin', 'table');
- $handler->override_option('style_options', array(
- 'grouping' => '',
- 'override' => 1,
- 'sticky' => 0,
- 'order' => 'asc',
- 'columns' => array(
- 'title' => 'title',
- 'field_track_value' => 'field_track_value',
- 'field_presenters_uid' => 'field_presenters_uid',
- ),
- 'info' => array(
- 'title' => array(
- 'sortable' => 0,
- 'separator' => '',
+ 'field_session_room_nid' => array(
+ 'operator' => 'not empty',
+ 'value' => array(),
+ 'group' => '0',
+ 'exposed' => FALSE,
+ 'expose' => array(
+ 'operator' => FALSE,
+ 'label' => '',
),
- 'field_track_value' => array(
- 'sortable' => 0,
- 'separator' => '',
+ 'id' => 'field_session_room_nid',
+ 'table' => 'node_data_field_session_room',
+ 'field' => 'field_session_room_nid',
+ 'override' => array(
+ 'button' => 'Override',
),
- 'field_presenters_uid' => array(
- 'separator' => '',
+ 'relationship' => 'none',
+ 'reduce_duplicates' => 0,
+ ),
+ 'flagged' => array(
+ 'operator' => '=',
+ 'value' => '1',
+ 'group' => '0',
+ 'exposed' => FALSE,
+ 'expose' => array(
+ 'operator' => FALSE,
+ 'label' => '',
+ ),
+ 'id' => 'flagged',
+ 'table' => 'flag_content',
+ 'field' => 'flagged',
+ 'relationship' => 'flag_content_rel',
+ 'override' => array(
+ 'button' => 'Use default',
),
),
- 'default' => '-1',
));
- $handler->override_option('path', 'sessions-admin');
+ $handler->override_option('title', 'Your schedule');
+ $handler->override_option('empty', 'Your schedule is empty. You can add sessions to your personal schedule from the main schedule.');
+ $handler->override_option('path', 'program/session-schedule/your-schedule');
$handler->override_option('menu', array(
- 'type' => 'none',
- 'title' => '',
+ 'type' => 'tab',
+ 'title' => 'Your schedule',
'description' => '',
- 'weight' => 0,
- 'name' => 'navigation',
+ 'weight' => '0',
+ 'name' => 'primary-links',
));
$handler->override_option('tab_options', array(
'type' => 'none',
'title' => '',
'description' => '',
- 'weight' => 0,
+ 'weight' => '0',
'name' => 'navigation',
));