diff --git a/cod_base/cod_base.features.field.inc b/cod_base/cod_base.features.field.inc index ebe0743..491aa80 100644 --- a/cod_base/cod_base.features.field.inc +++ b/cod_base/cod_base.features.field.inc @@ -10,7 +10,7 @@ function cod_base_field_default_fields() { $fields = array(); - // Exported field: 'user-user-field_profile_first' + // Exported field: 'user-user-field_profile_first'. $fields['user-user-field_profile_first'] = array( 'field_config' => array( 'active' => '1', @@ -31,6 +31,7 @@ function cod_base_field_default_fields() { 0 => 'format', ), ), + 'locked' => '0', 'module' => 'text', 'settings' => array( 'max_length' => '255', @@ -72,7 +73,7 @@ function cod_base_field_default_fields() { ), ); - // Exported field: 'user-user-field_profile_interests' + // Exported field: 'user-user-field_profile_interests'. $fields['user-user-field_profile_interests'] = array( 'field_config' => array( 'active' => '1', @@ -93,6 +94,7 @@ function cod_base_field_default_fields() { 0 => 'format', ), ), + 'locked' => '0', 'module' => 'text', 'settings' => array(), 'translatable' => '1', @@ -132,7 +134,7 @@ function cod_base_field_default_fields() { ), ); - // Exported field: 'user-user-field_profile_job_title' + // Exported field: 'user-user-field_profile_job_title'. $fields['user-user-field_profile_job_title'] = array( 'field_config' => array( 'active' => '1', @@ -153,6 +155,7 @@ function cod_base_field_default_fields() { 0 => 'format', ), ), + 'locked' => '0', 'module' => 'text', 'settings' => array( 'max_length' => '255', @@ -194,7 +197,7 @@ function cod_base_field_default_fields() { ), ); - // Exported field: 'user-user-field_profile_last' + // Exported field: 'user-user-field_profile_last'. $fields['user-user-field_profile_last'] = array( 'field_config' => array( 'active' => '1', @@ -215,6 +218,7 @@ function cod_base_field_default_fields() { 0 => 'format', ), ), + 'locked' => '0', 'module' => 'text', 'settings' => array( 'max_length' => '255', @@ -256,7 +260,7 @@ function cod_base_field_default_fields() { ), ); - // Exported field: 'user-user-field_profile_org' + // Exported field: 'user-user-field_profile_org'. $fields['user-user-field_profile_org'] = array( 'field_config' => array( 'active' => '1', @@ -277,6 +281,7 @@ function cod_base_field_default_fields() { 0 => 'format', ), ), + 'locked' => '0', 'module' => 'text', 'settings' => array( 'max_length' => '255', diff --git a/cod_base/cod_base.features.user_permission.inc b/cod_base/cod_base.features.user_permission.inc index f4b0219..5ada9dd 100644 --- a/cod_base/cod_base.features.user_permission.inc +++ b/cod_base/cod_base.features.user_permission.inc @@ -10,17 +10,111 @@ function cod_base_user_default_permissions() { $permissions = array(); + // Exported permission: access administration menu. + $permissions['access administration menu'] = array( + 'name' => 'access administration menu', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'admin_menu', + ); + // Exported permission: access administration pages. $permissions['access administration pages'] = array( 'name' => 'access administration pages', - 'roles' => array(), + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'system', + ); + + // Exported permission: access all webform results. + $permissions['access all webform results'] = array( + 'name' => 'access all webform results', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'webform', + ); + + // Exported permission: access content. + $permissions['access content'] = array( + 'name' => 'access content', + 'roles' => array( + 0 => 'anonymous user', + 1 => 'authenticated user', + ), + 'module' => 'node', + ); + + // Exported permission: access content overview. + $permissions['access content overview'] = array( + 'name' => 'access content overview', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'node', + ); + + // Exported permission: access dashboard. + $permissions['access dashboard'] = array( + 'name' => 'access dashboard', + 'roles' => array( + 0 => 'administrator', + ), + 'module' => 'dashboard', + ); + + // Exported permission: access own webform results. + $permissions['access own webform results'] = array( + 'name' => 'access own webform results', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'webform', + ); + + // Exported permission: access own webform submissions. + $permissions['access own webform submissions'] = array( + 'name' => 'access own webform submissions', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'webform', + ); + + // Exported permission: access private fields. + $permissions['access private fields'] = array( + 'name' => 'access private fields', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'field_permissions', + ); + + // Exported permission: access site in maintenance mode. + $permissions['access site in maintenance mode'] = array( + 'name' => 'access site in maintenance mode', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), 'module' => 'system', ); // Exported permission: access site reports. $permissions['access site reports'] = array( 'name' => 'access site reports', - 'roles' => array(), + 'roles' => array( + 0 => 'administrator', + ), 'module' => 'system', ); @@ -34,6 +128,65 @@ function cod_base_user_default_permissions() { 'module' => 'user', ); + // Exported permission: administer comments. + $permissions['administer comments'] = array( + 'name' => 'administer comments', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'comment', + ); + + // Exported permission: administer content types. + $permissions['administer content types'] = array( + 'name' => 'administer content types', + 'roles' => array( + 0 => 'administrator', + ), + 'module' => 'node', + ); + + // Exported permission: administer field permissions. + $permissions['administer field permissions'] = array( + 'name' => 'administer field permissions', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'field_permissions', + ); + + // Exported permission: administer menu. + $permissions['administer menu'] = array( + 'name' => 'administer menu', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'menu', + ); + + // Exported permission: administer nodes. + $permissions['administer nodes'] = array( + 'name' => 'administer nodes', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'node', + ); + + // Exported permission: administer pathauto. + $permissions['administer pathauto'] = array( + 'name' => 'administer pathauto', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'pathauto', + ); + // Exported permission: administer permissions. $permissions['administer permissions'] = array( 'name' => 'administer permissions', @@ -46,10 +199,32 @@ function cod_base_user_default_permissions() { // Exported permission: administer site configuration. $permissions['administer site configuration'] = array( 'name' => 'administer site configuration', - 'roles' => array(), + 'roles' => array( + 0 => 'administrator', + ), 'module' => 'system', ); + // Exported permission: administer taxonomy. + $permissions['administer taxonomy'] = array( + 'name' => 'administer taxonomy', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'taxonomy', + ); + + // Exported permission: administer url aliases. + $permissions['administer url aliases'] = array( + 'name' => 'administer url aliases', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'path', + ); + // Exported permission: administer users. $permissions['administer users'] = array( 'name' => 'administer users', @@ -68,14 +243,135 @@ function cod_base_user_default_permissions() { 'module' => 'views', ); + // Exported permission: bypass node access. + $permissions['bypass node access'] = array( + 'name' => 'bypass node access', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'node', + ); + + // Exported permission: create url aliases. + $permissions['create url aliases'] = array( + 'name' => 'create url aliases', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'path', + ); + + // Exported permission: delete all webform submissions. + $permissions['delete all webform submissions'] = array( + 'name' => 'delete all webform submissions', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'webform', + ); + + // Exported permission: delete own webform submissions. + $permissions['delete own webform submissions'] = array( + 'name' => 'delete own webform submissions', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'webform', + ); + + // Exported permission: edit all webform submissions. + $permissions['edit all webform submissions'] = array( + 'name' => 'edit all webform submissions', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'webform', + ); + + // Exported permission: edit own webform submissions. + $permissions['edit own webform submissions'] = array( + 'name' => 'edit own webform submissions', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'webform', + ); + + // Exported permission: flush caches. + $permissions['flush caches'] = array( + 'name' => 'flush caches', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'admin_menu', + ); + + // Exported permission: notify of path changes. + $permissions['notify of path changes'] = array( + 'name' => 'notify of path changes', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'pathauto', + ); + // Exported permission: use admin toolbar. $permissions['use admin toolbar'] = array( 'name' => 'use admin toolbar', 'roles' => array( 0 => 'administrator', + 1 => 'content editor', ), 'module' => 'admin', ); + // Exported permission: view advanced help index. + $permissions['view advanced help index'] = array( + 'name' => 'view advanced help index', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'advanced_help', + ); + + // Exported permission: view advanced help popup. + $permissions['view advanced help popup'] = array( + 'name' => 'view advanced help popup', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'advanced_help', + ); + + // Exported permission: view advanced help topic. + $permissions['view advanced help topic'] = array( + 'name' => 'view advanced help topic', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'advanced_help', + ); + + // Exported permission: view the administration theme. + $permissions['view the administration theme'] = array( + 'name' => 'view the administration theme', + 'roles' => array( + 0 => 'administrator', + 1 => 'content editor', + ), + 'module' => 'system', + ); + return $permissions; } diff --git a/cod_base/cod_base.features.user_role.inc b/cod_base/cod_base.features.user_role.inc index 23c571f..39eb7fe 100644 --- a/cod_base/cod_base.features.user_role.inc +++ b/cod_base/cod_base.features.user_role.inc @@ -16,5 +16,11 @@ function cod_base_user_default_roles() { 'weight' => '2', ); + // Exported role: content editor. + $roles['content editor'] = array( + 'name' => 'content editor', + 'weight' => '3', + ); + return $roles; } diff --git a/cod_base/cod_base.info b/cod_base/cod_base.info index d02cf66..09f3990 100644 --- a/cod_base/cod_base.info +++ b/cod_base/cod_base.info @@ -5,11 +5,19 @@ package = COD php = 5.2.4 project = cod_base dependencies[] = admin +dependencies[] = admin_menu +dependencies[] = advanced_help +dependencies[] = comment +dependencies[] = dashboard dependencies[] = features +dependencies[] = field_permissions dependencies[] = menu +dependencies[] = pathauto dependencies[] = strongarm +dependencies[] = taxonomy dependencies[] = token dependencies[] = views +dependencies[] = webform features[ctools][] = strongarm:strongarm:1 features[features_api][] = api:1 features[field][] = user-user-field_profile_first @@ -17,14 +25,45 @@ features[field][] = user-user-field_profile_interests features[field][] = user-user-field_profile_job_title features[field][] = user-user-field_profile_last features[field][] = user-user-field_profile_org +features[user_permission][] = access administration menu features[user_permission][] = access administration pages +features[user_permission][] = access all webform results +features[user_permission][] = access content +features[user_permission][] = access content overview +features[user_permission][] = access dashboard +features[user_permission][] = access own webform results +features[user_permission][] = access own webform submissions +features[user_permission][] = access private fields +features[user_permission][] = access site in maintenance mode features[user_permission][] = access site reports features[user_permission][] = access user profiles +features[user_permission][] = administer comments +features[user_permission][] = administer content types +features[user_permission][] = administer field permissions +features[user_permission][] = administer menu +features[user_permission][] = administer nodes +features[user_permission][] = administer pathauto features[user_permission][] = administer permissions features[user_permission][] = administer site configuration +features[user_permission][] = administer taxonomy +features[user_permission][] = administer url aliases features[user_permission][] = administer users features[user_permission][] = administer views +features[user_permission][] = bypass node access +features[user_permission][] = create url aliases +features[user_permission][] = delete all webform submissions +features[user_permission][] = delete own webform submissions +features[user_permission][] = edit all webform submissions +features[user_permission][] = edit own webform submissions +features[user_permission][] = flush caches +features[user_permission][] = notify of path changes features[user_permission][] = use admin toolbar +features[user_permission][] = view advanced help index +features[user_permission][] = view advanced help popup +features[user_permission][] = view advanced help topic +features[user_permission][] = view the administration theme features[user_role][] = administrator +features[user_role][] = content editor features[variable][] = admin_toolbar +features[variable][] = date_format_date_no_time_ files[] = cod_base.module diff --git a/cod_base/cod_base.module b/cod_base/cod_base.module index 9db0272..6dfff92 100644 --- a/cod_base/cod_base.module +++ b/cod_base/cod_base.module @@ -75,3 +75,13 @@ function cod_base_field_formatter_view($entity_type, $entity, $field, $instance, } return $elements; } + +/** +* Implements hook_entity_info_alter(). +*/ +function cod_base_entity_info_alter(&$entity_info) { + $entity_info['node']['view modes']['listing'] = array( + 'label' => t('Listing'), + 'custom settings' => TRUE, + ); +} diff --git a/cod_base/cod_base.strongarm.inc b/cod_base/cod_base.strongarm.inc index 3fc0ab8..c0bbb7c 100644 --- a/cod_base/cod_base.strongarm.inc +++ b/cod_base/cod_base.strongarm.inc @@ -27,5 +27,12 @@ function cod_base_strongarm() { ); $export['admin_toolbar'] = $strongarm; + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'date_format_date_no_time_'; + $strongarm->value = 'D, j M Y'; + $export['date_format_date_no_time_'] = $strongarm; + return $export; } diff --git a/cod_session/cod-session-schedule.tpl.php b/cod_session/cod-session-schedule.tpl.php index b13856f..0250203 100644 --- a/cod_session/cod-session-schedule.tpl.php +++ b/cod_session/cod-session-schedule.tpl.php @@ -1,66 +1,104 @@ - - - $day_title): ?> +

- - - - $room): ?> - - - - - - - + +
+ + - - - - + + + +
- + +
+ + +
+ + + + +
 -
 - -
- nid]; ?> -
- - -
- - -
- - - 		  - -
- - -
- + 		+ $schedule_room): ?> + +
+ +
+ nid]; ?> +
+ + +
+ + +
- - -
+ + + + + + $room): ?> + + + - - -
+ + + + +  -
+ + + + + + +
+ nid]; ?> +
+ + +
+ + +
+ + +   + +
+ + +
+ + + + + + + + + + + +
diff --git a/cod_session/cod_session.features.field.inc b/cod_session/cod_session.features.field.inc index afa53f6..3d1bd2f 100644 --- a/cod_session/cod_session.features.field.inc +++ b/cod_session/cod_session.features.field.inc @@ -10,7 +10,7 @@ function cod_session_field_default_fields() { $fields = array(); - // Exported field: 'node-page-body' + // Exported field: 'node-page-body'. $fields['node-page-body'] = array( 'field_config' => array( 'active' => '1', @@ -36,6 +36,7 @@ function cod_session_field_default_fields() { 0 => 'format', ), ), + 'locked' => '0', 'module' => 'text', 'settings' => array( 'field_permissions' => array( @@ -62,6 +63,12 @@ function cod_session_field_default_fields() { 'type' => 'text_default', 'weight' => 0, ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'hidden', 'module' => 'text', @@ -93,7 +100,7 @@ function cod_session_field_default_fields() { ), ); - // Exported field: 'node-room-body' + // Exported field: 'node-room-body'. $fields['node-room-body'] = array( 'field_config' => array( 'active' => '1', @@ -119,6 +126,7 @@ function cod_session_field_default_fields() { 0 => 'format', ), ), + 'locked' => '0', 'module' => 'text', 'settings' => array( 'field_permissions' => array( @@ -145,6 +153,12 @@ function cod_session_field_default_fields() { 'type' => 'text_default', 'weight' => '3', ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'hidden', 'module' => 'text', @@ -178,7 +192,7 @@ function cod_session_field_default_fields() { ), ); - // Exported field: 'node-room-field_room_capacity' + // Exported field: 'node-room-field_room_capacity'. $fields['node-room-field_room_capacity'] = array( 'field_config' => array( 'active' => '1', @@ -186,38 +200,40 @@ function cod_session_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_room_capacity', - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), - 'indexes' => array( - 'format' => array( - 0 => 'format', - ), - ), - 'module' => 'text', - 'settings' => array( - 'max_length' => '60', + 'field_permissions' => array( + 'type' => '0', ), - 'translatable' => '1', - 'type' => 'text', + 'foreign keys' => array(), + 'indexes' => array(), + 'locked' => '0', + 'module' => 'number', + 'settings' => array(), + 'translatable' => '0', + 'type' => 'number_integer', ), 'field_instance' => array( 'bundle' => 'room', 'default_value' => NULL, 'deleted' => '0', - 'description' => 'How many people does this space hold?', + 'description' => 'Total capacity of the room, in persons.', 'display' => array( 'default' => array( - 'label' => 'inline', - 'module' => 'text', + 'label' => 'above', + 'module' => 'number', + 'settings' => array( + 'decimal_separator' => '.', + 'prefix_suffix' => TRUE, + 'scale' => 0, + 'thousand_separator' => ' ', + ), + 'type' => 'number_integer', + 'weight' => '1', + ), + 'listing' => array( + 'label' => 'above', 'settings' => array(), - 'type' => 'text_default', - 'weight' => '0', + 'type' => 'hidden', + 'weight' => 0, ), 'teaser' => array( 'label' => 'above', @@ -228,25 +244,26 @@ function cod_session_field_default_fields() { ), 'entity_type' => 'node', 'field_name' => 'field_room_capacity', - 'label' => 'Capacity', + 'label' => 'Total room capacity', 'required' => 0, 'settings' => array( - 'text_processing' => '0', + 'max' => '', + 'min' => '', + 'prefix' => '', + 'suffix' => '', 'user_register_form' => FALSE, ), 'widget' => array( - 'active' => 1, - 'module' => 'text', - 'settings' => array( - 'size' => '60', - ), - 'type' => 'text_textfield', - 'weight' => '1', + 'active' => 0, + 'module' => 'number', + 'settings' => array(), + 'type' => 'number', + 'weight' => '2', ), ), ); - // Exported field: 'node-room-field_room_photo' + // Exported field: 'node-room-field_room_photo'. $fields['node-room-field_room_photo'] = array( 'field_config' => array( 'active' => '1', @@ -267,6 +284,7 @@ function cod_session_field_default_fields() { 0 => 'fid', ), ), + 'locked' => '0', 'module' => 'image', 'settings' => array( 'default_image' => 0, @@ -290,6 +308,12 @@ function cod_session_field_default_fields() { 'type' => 'image', 'weight' => '2', ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'above', 'settings' => array(), @@ -303,6 +327,7 @@ function cod_session_field_default_fields() { 'required' => 0, 'settings' => array( 'alt_field' => 0, + 'default_image' => 0, 'file_directory' => '', 'file_extensions' => 'png gif jpg jpeg', 'max_filesize' => '', @@ -324,7 +349,7 @@ function cod_session_field_default_fields() { ), ); - // Exported field: 'node-room-field_room_session_capacity' + // Exported field: 'node-room-field_room_session_capacity'. $fields['node-room-field_room_session_capacity'] = array( 'field_config' => array( 'active' => '1', @@ -337,6 +362,7 @@ function cod_session_field_default_fields() { ), 'foreign keys' => array(), 'indexes' => array(), + 'locked' => '0', 'module' => 'number', 'settings' => array(), 'translatable' => '0', @@ -360,6 +386,12 @@ function cod_session_field_default_fields() { 'type' => 'number_integer', 'weight' => '1', ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'above', 'settings' => array(), @@ -388,7 +420,7 @@ function cod_session_field_default_fields() { ), ); - // Exported field: 'node-schedule_item-body' + // Exported field: 'node-schedule_item-body'. $fields['node-schedule_item-body'] = array( 'field_config' => array( 'active' => '1', @@ -414,6 +446,7 @@ function cod_session_field_default_fields() { 0 => 'format', ), ), + 'locked' => '0', 'module' => 'text', 'settings' => array( 'field_permissions' => array( @@ -440,6 +473,12 @@ function cod_session_field_default_fields() { 'type' => 'text_default', 'weight' => '0', ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'hidden', 'module' => 'text', @@ -472,7 +511,7 @@ function cod_session_field_default_fields() { ), ); - // Exported field: 'node-schedule_item-field_accepted' + // Exported field: 'node-schedule_item-field_accepted'. $fields['node-schedule_item-field_accepted'] = array( 'field_config' => array( 'active' => '1', @@ -489,6 +528,7 @@ function cod_session_field_default_fields() { 0 => 'value', ), ), + 'locked' => '0', 'module' => 'list', 'settings' => array( 'allowed_values' => array( @@ -521,6 +561,12 @@ function cod_session_field_default_fields() { 'type' => 'list_default', 'weight' => '2', ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'above', 'settings' => array(), @@ -545,11 +591,11 @@ function cod_session_field_default_fields() { ), ); - // Exported field: 'node-schedule_item-field_session_room' + // Exported field: 'node-schedule_item-field_session_room'. $fields['node-schedule_item-field_session_room'] = array( 'field_config' => array( 'active' => '1', - 'cardinality' => '-1', + 'cardinality' => '1', 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_session_room', @@ -557,57 +603,64 @@ function cod_session_field_default_fields() { 'type' => '2', ), 'foreign keys' => array( - 'nid' => array( + 'node' => array( 'columns' => array( - 'nid' => 'nid', + 'target_id' => 'nid', ), 'table' => 'node', ), ), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_id' => array( + 0 => 'target_id', ), ), - 'module' => 'node_reference', + 'locked' => '0', + 'module' => 'entityreference', 'settings' => array( - 'field_permissions' => array( - 'create' => 0, - 'edit' => 'edit', - 'edit own' => 0, - 'view' => 'view', - 'view own' => 0, - ), - 'referenceable_types' => array( - 'article' => 0, - 'bof_session' => 0, - 'page' => 0, - 'room' => 'room', - 'schedule_item' => 0, - 'session' => 0, - 'time_slot' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'behaviors' => array( + 'views-select-list' => array( + 'status' => 0, + ), + ), + 'sort' => array( + 'direction' => 'ASC', + 'field' => 'body:value', + 'property' => 'title', + 'type' => 'property', + ), + 'target_bundles' => array( + 'room' => 'room', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'schedule_item', 'default_value' => NULL, 'deleted' => '0', - 'description' => 'Select room(s) in which the session occurs.', + 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 8, + ), + 'listing' => array( + 'label' => 'above', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '4', + 'type' => 'hidden', + 'weight' => 0, ), 'teaser' => array( 'label' => 'above', @@ -628,12 +681,12 @@ function cod_session_field_default_fields() { 'module' => 'options', 'settings' => array(), 'type' => 'options_buttons', - 'weight' => '5', + 'weight' => '9', ), ), ); - // Exported field: 'node-schedule_item-field_session_slot' + // Exported field: 'node-schedule_item-field_session_slot'. $fields['node-schedule_item-field_session_slot'] = array( 'field_config' => array( 'active' => '1', @@ -645,44 +698,43 @@ function cod_session_field_default_fields() { 'type' => '2', ), 'foreign keys' => array( - 'nid' => array( + 'node' => array( 'columns' => array( - 'nid' => 'nid', + 'target_id' => 'nid', ), 'table' => 'node', ), ), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_id' => array( + 0 => 'target_id', ), ), - 'module' => 'node_reference', + 'locked' => '0', + 'module' => 'entityreference', 'settings' => array( - 'field_permissions' => array( - 'create' => 0, - 'edit' => 'edit', - 'edit own' => 0, - 'view' => 'view', - 'view own' => 0, - ), - 'referenceable_types' => array( - 'article' => 0, - 'bof_session' => 0, - 'page' => 0, - 'room' => 0, - 'schedule_item' => 0, - 'session' => 0, - 'time_slot' => 'time_slot', - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'behaviors' => array( + 'views-select-list' => array( + 'status' => 0, + ), + ), + 'sort' => array( + 'direction' => 'ASC', + 'field' => 'body:value', + 'property' => 'title', + 'type' => 'property', + ), + 'target_bundles' => array( + 'time_slot' => 'time_slot', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'schedule_item', @@ -691,11 +743,19 @@ function cod_session_field_default_fields() { 'description' => '', 'display' => array( 'default' => array( - 'label' => 'inline', - 'module' => 'node_reference', + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 7, + ), + 'listing' => array( + 'label' => 'above', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '3', + 'type' => 'hidden', + 'weight' => 0, ), 'teaser' => array( 'label' => 'above', @@ -706,7 +766,7 @@ function cod_session_field_default_fields() { ), 'entity_type' => 'node', 'field_name' => 'field_session_slot', - 'label' => 'Time slot', + 'label' => 'Time Slot', 'required' => 0, 'settings' => array( 'user_register_form' => FALSE, @@ -716,12 +776,12 @@ function cod_session_field_default_fields() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => '4', + 'weight' => '8', ), ), ); - // Exported field: 'node-session-body' + // Exported field: 'node-session-body'. $fields['node-session-body'] = array( 'field_config' => array( 'active' => '1', @@ -747,6 +807,7 @@ function cod_session_field_default_fields() { 0 => 'format', ), ), + 'locked' => '0', 'module' => 'text', 'settings' => array( 'field_permissions' => array( @@ -773,6 +834,12 @@ function cod_session_field_default_fields() { 'type' => 'text_default', 'weight' => '0', ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'hidden', 'module' => 'text', @@ -806,7 +873,7 @@ function cod_session_field_default_fields() { ), ); - // Exported field: 'node-session-field_accepted' + // Exported field: 'node-session-field_accepted'. $fields['node-session-field_accepted'] = array( 'field_config' => array( 'active' => '1', @@ -823,6 +890,7 @@ function cod_session_field_default_fields() { 0 => 'value', ), ), + 'locked' => '0', 'module' => 'list', 'settings' => array( 'allowed_values' => array( @@ -859,6 +927,12 @@ function cod_session_field_default_fields() { 'type' => 'list_default', 'weight' => '8', ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'above', 'settings' => array(), @@ -878,12 +952,12 @@ function cod_session_field_default_fields() { 'module' => 'options', 'settings' => array(), 'type' => 'options_buttons', - 'weight' => '8', + 'weight' => '11', ), ), ); - // Exported field: 'node-session-field_experience' + // Exported field: 'node-session-field_experience'. $fields['node-session-field_experience'] = array( 'field_config' => array( 'active' => '1', @@ -900,6 +974,7 @@ function cod_session_field_default_fields() { 0 => 'value', ), ), + 'locked' => '0', 'module' => 'list', 'settings' => array( 'allowed_values' => array( @@ -932,6 +1007,12 @@ function cod_session_field_default_fields() { 'type' => 'list_default', 'weight' => '6', ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'above', 'settings' => array(), @@ -956,11 +1037,11 @@ function cod_session_field_default_fields() { ), ); - // Exported field: 'node-session-field_session_room' + // Exported field: 'node-session-field_session_room'. $fields['node-session-field_session_room'] = array( 'field_config' => array( 'active' => '1', - 'cardinality' => '-1', + 'cardinality' => '1', 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_session_room', @@ -968,44 +1049,43 @@ function cod_session_field_default_fields() { 'type' => '2', ), 'foreign keys' => array( - 'nid' => array( + 'node' => array( 'columns' => array( - 'nid' => 'nid', + 'target_id' => 'nid', ), 'table' => 'node', ), ), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_id' => array( + 0 => 'target_id', ), ), - 'module' => 'node_reference', + 'locked' => '0', + 'module' => 'entityreference', 'settings' => array( - 'field_permissions' => array( - 'create' => 0, - 'edit' => 'edit', - 'edit own' => 0, - 'view' => 'view', - 'view own' => 0, - ), - 'referenceable_types' => array( - 'article' => 0, - 'bof_session' => 0, - 'page' => 0, - 'room' => 'room', - 'schedule_item' => 0, - 'session' => 0, - 'time_slot' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'behaviors' => array( + 'views-select-list' => array( + 'status' => 0, + ), + ), + 'sort' => array( + 'direction' => 'ASC', + 'field' => 'body:value', + 'property' => 'title', + 'type' => 'property', + ), + 'target_bundles' => array( + 'room' => 'room', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'session', @@ -1014,11 +1094,19 @@ function cod_session_field_default_fields() { 'description' => 'Select room(s) in which the session occurs.', 'display' => array( 'default' => array( - 'label' => 'inline', - 'module' => 'node_reference', + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 11, + ), + 'listing' => array( + 'label' => 'above', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '7', + 'type' => 'hidden', + 'weight' => 0, ), 'teaser' => array( 'label' => 'above', @@ -1039,12 +1127,12 @@ function cod_session_field_default_fields() { 'module' => 'options', 'settings' => array(), 'type' => 'options_buttons', - 'weight' => '7', + 'weight' => '10', ), ), ); - // Exported field: 'node-session-field_session_slot' + // Exported field: 'node-session-field_session_slot'. $fields['node-session-field_session_slot'] = array( 'field_config' => array( 'active' => '1', @@ -1056,44 +1144,43 @@ function cod_session_field_default_fields() { 'type' => '2', ), 'foreign keys' => array( - 'nid' => array( + 'node' => array( 'columns' => array( - 'nid' => 'nid', + 'target_id' => 'nid', ), 'table' => 'node', ), ), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_id' => array( + 0 => 'target_id', ), ), - 'module' => 'node_reference', + 'locked' => '0', + 'module' => 'entityreference', 'settings' => array( - 'field_permissions' => array( - 'create' => 0, - 'edit' => 'edit', - 'edit own' => 0, - 'view' => 'view', - 'view own' => 0, - ), - 'referenceable_types' => array( - 'article' => 0, - 'bof_session' => 0, - 'page' => 0, - 'room' => 0, - 'schedule_item' => 0, - 'session' => 0, - 'time_slot' => 'time_slot', - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'behaviors' => array( + 'views-select-list' => array( + 'status' => 0, + ), + ), + 'sort' => array( + 'direction' => 'ASC', + 'field' => 'body:value', + 'property' => 'title', + 'type' => 'property', + ), + 'target_bundles' => array( + 'time_slot' => 'time_slot', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'session', @@ -1102,11 +1189,19 @@ function cod_session_field_default_fields() { 'description' => '', 'display' => array( 'default' => array( - 'label' => 'inline', - 'module' => 'node_reference', + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 10, + ), + 'listing' => array( + 'label' => 'above', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '6', + 'type' => 'hidden', + 'weight' => 0, ), 'teaser' => array( 'label' => 'above', @@ -1127,12 +1222,12 @@ function cod_session_field_default_fields() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => '6', + 'weight' => '9', ), ), ); - // Exported field: 'node-session-field_slides' + // Exported field: 'node-session-field_slides'. $fields['node-session-field_slides'] = array( 'field_config' => array( 'active' => '1', @@ -1153,6 +1248,7 @@ function cod_session_field_default_fields() { 0 => 'fid', ), ), + 'locked' => '0', 'module' => 'file', 'settings' => array( 'display_default' => 1, @@ -1181,6 +1277,12 @@ function cod_session_field_default_fields() { 'type' => 'file_default', 'weight' => '2', ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'above', 'settings' => array(), @@ -1211,7 +1313,7 @@ function cod_session_field_default_fields() { ), ); - // Exported field: 'node-session-field_speakers' + // Exported field: 'node-session-field_speakers'. $fields['node-session-field_speakers'] = array( 'field_config' => array( 'active' => '1', @@ -1219,59 +1321,66 @@ function cod_session_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_speakers', + 'field_permissions' => array( + 'type' => '0', + ), 'foreign keys' => array( - 'uid' => array( + 'users' => array( 'columns' => array( - 'uid' => 'uid', + 'target_id' => 'uid', ), 'table' => 'users', ), ), 'indexes' => array( - 'uid' => array( - 0 => 'uid', + 'target_id' => array( + 0 => 'target_id', ), ), - 'module' => 'user_reference', + 'locked' => '0', + 'module' => 'entityreference', 'settings' => array( - 'field_permissions' => array( - 'create' => 'create', - 'edit' => 0, - 'edit own' => 'edit own', - 'view' => 'view', - 'view own' => 0, - ), - 'referenceable_roles' => array( - 2 => 0, - 3 => 0, - 4 => 0, - 5 => 0, - ), - 'referenceable_status' => array( - 0 => 0, - 1 => '1', - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'behaviors' => array( + 'views-select-list' => array( + 'status' => 0, + ), + ), + 'sort' => array( + 'direction' => 'ASC', + 'field' => 'field_profile_first:value', + 'property' => 'uid', + 'type' => 'none', + ), + 'target_bundles' => array(), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'user', ), - 'translatable' => '1', - 'type' => 'user_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'session', 'default_value' => NULL, 'deleted' => '0', - 'description' => 'Add your username and optionally 1-5 additional speaker usernames.', + 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'user_reference', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 9, + ), + 'listing' => array( + 'label' => 'above', 'settings' => array(), - 'type' => 'user_reference_default', - 'weight' => '1', + 'type' => 'hidden', + 'weight' => 0, ), 'teaser' => array( 'label' => 'above', @@ -1283,25 +1392,25 @@ function cod_session_field_default_fields() { 'entity_type' => 'node', 'field_name' => 'field_speakers', 'label' => 'Speaker(s)', - 'required' => 0, + 'required' => 1, 'settings' => array( 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, - 'module' => 'user_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'user_reference/autocomplete', - 'size' => '40', + 'match_operator' => 'CONTAINS', + 'path' => '', + 'size' => '60', ), - 'type' => 'user_reference_autocomplete', + 'type' => 'entityreference_autocomplete_tags', 'weight' => '1', ), ), ); - // Exported field: 'node-session-field_track' + // Exported field: 'node-session-field_track'. $fields['node-session-field_track'] = array( 'field_config' => array( 'active' => '1', @@ -1315,6 +1424,7 @@ function cod_session_field_default_fields() { 0 => 'value', ), ), + 'locked' => '0', 'module' => 'list', 'settings' => array( 'allowed_values' => array( @@ -1347,6 +1457,12 @@ function cod_session_field_default_fields() { 'type' => 'list_default', 'weight' => '5', ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'above', 'settings' => array(), @@ -1371,7 +1487,7 @@ function cod_session_field_default_fields() { ), ); - // Exported field: 'node-time_slot-field_slot_datetime' + // Exported field: 'node-time_slot-field_slot_datetime'. $fields['node-time_slot-field_slot_datetime'] = array( 'field_config' => array( 'active' => '1', @@ -1381,6 +1497,7 @@ function cod_session_field_default_fields() { 'field_name' => 'field_slot_datetime', 'foreign keys' => array(), 'indexes' => array(), + 'locked' => '0', 'module' => 'date', 'settings' => array( 'field_permissions' => array( @@ -1438,6 +1555,12 @@ function cod_session_field_default_fields() { 'type' => 'date_default', 'weight' => '0', ), + 'listing' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'teaser' => array( 'label' => 'above', 'module' => 'date', @@ -1486,13 +1609,10 @@ function cod_session_field_default_fields() { // Translatables // Included for use with string extractors like potx. - t('Add your username and optionally 1-5 additional speaker usernames.'); t('Body'); - t('Capacity'); t('Date and time'); t('Description'); t('Experience level'); - t('How many people does this space hold?'); t('Number of sessions or BoFs that this room can hold in a time slot. Used to allow multiple BoFs in the same room at the same time slot.'); t('Photo'); t('Room'); @@ -1501,7 +1621,10 @@ function cod_session_field_default_fields() { t('Slides'); t('Speaker(s)'); t('Status'); + t('Time Slot'); t('Time slot'); + t('Total capacity of the room, in persons.'); + t('Total room capacity'); t('Track'); t('Upload your slides here as a PDF, or link to them from the description. (This is typically done after your session.)'); diff --git a/cod_session/cod_session.features.inc b/cod_session/cod_session.features.inc index 0b2b934..d71cbc4 100644 --- a/cod_session/cod_session.features.inc +++ b/cod_session/cod_session.features.inc @@ -84,8 +84,8 @@ function cod_session_flag_default_flags() { 'flag' => array(), 'unflag' => array(), ), - 'show_on_page' => 0, - 'show_on_teaser' => 1, + 'show_on_page' => 1, + 'show_on_teaser' => 0, 'show_on_form' => 0, 'access_author' => '', 'i18n' => 0, @@ -113,10 +113,10 @@ function cod_session_flag_default_flags() { 'link_type' => 'toggle', 'roles' => array( 'flag' => array( - 0 => 3, + 0 => '4', ), 'unflag' => array( - 0 => 3, + 0 => '4', ), ), 'show_on_page' => 1, diff --git a/cod_session/cod_session.features.menu_custom.inc b/cod_session/cod_session.features.menu_custom.inc index 4dc41ba..26dece4 100644 --- a/cod_session/cod_session.features.menu_custom.inc +++ b/cod_session/cod_session.features.menu_custom.inc @@ -10,13 +10,13 @@ function cod_session_menu_default_menu_custom() { $menus = array(); - // Exported menu: main-menu + // Exported menu: main-menu. $menus['main-menu'] = array( 'menu_name' => 'main-menu', 'title' => 'Main menu', 'description' => 'The Main menu is used on many sites to show the major sections of the site, often in a top navigation bar.', ); - // Exported menu: menu-menu-quick-links + // Exported menu: menu-menu-quick-links. $menus['menu-menu-quick-links'] = array( 'menu_name' => 'menu-menu-quick-links', 'title' => 'Quick links - Authenticated', diff --git a/cod_session/cod_session.features.menu_links.inc b/cod_session/cod_session.features.menu_links.inc index b5b5c27..b774cb3 100644 --- a/cod_session/cod_session.features.menu_links.inc +++ b/cod_session/cod_session.features.menu_links.inc @@ -10,20 +10,6 @@ function cod_session_menu_default_menu_links() { $menu_links = array(); - // Exported menu link: main-menu:program - $menu_links['main-menu:program'] = array( - 'menu_name' => 'main-menu', - 'link_path' => 'program', - 'router_path' => 'program', - 'link_title' => 'Session schedule', - 'options' => array(), - 'module' => 'system', - 'hidden' => '0', - 'external' => '0', - 'has_children' => '1', - 'expanded' => '0', - 'weight' => '0', - ); // Exported menu link: main-menu:program/sessions $menu_links['main-menu:program/sessions'] = array( 'menu_name' => 'main-menu', @@ -37,31 +23,10 @@ function cod_session_menu_default_menu_links() { 'has_children' => '0', 'expanded' => '0', 'weight' => '0', - 'parent_path' => 'program', - ); - // Exported menu link: menu-menu-quick-links:program/session-schedule/your-schedule - $menu_links['menu-menu-quick-links:program/session-schedule/your-schedule'] = array( - 'menu_name' => 'menu-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', ); // Translatables // Included for use with string extractors like potx. - t('Session schedule'); t('Sessions'); - t('Your schedule'); return $menu_links; diff --git a/cod_session/cod_session.features.user_permission.inc b/cod_session/cod_session.features.user_permission.inc index d5d7869..7a09ca5 100644 --- a/cod_session/cod_session.features.user_permission.inc +++ b/cod_session/cod_session.features.user_permission.inc @@ -10,7 +10,7 @@ function cod_session_user_default_permissions() { $permissions = array(); - // Exported permission: create field_accepted + // Exported permission: create field_accepted. $permissions['create field_accepted'] = array( 'name' => 'create field_accepted', 'roles' => array( @@ -19,7 +19,7 @@ function cod_session_user_default_permissions() { 'module' => 'field_permissions', ); - // Exported permission: create room content + // Exported permission: create room content. $permissions['create room content'] = array( 'name' => 'create room content', 'roles' => array( @@ -28,7 +28,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: create schedule_item content + // Exported permission: create schedule_item content. $permissions['create schedule_item content'] = array( 'name' => 'create schedule_item content', 'roles' => array( @@ -37,7 +37,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: create session content + // Exported permission: create session content. $permissions['create session content'] = array( 'name' => 'create session content', 'roles' => array( @@ -46,7 +46,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: create time_slot content + // Exported permission: create time_slot content. $permissions['create time_slot content'] = array( 'name' => 'create time_slot content', 'roles' => array( @@ -55,7 +55,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete any room content + // Exported permission: delete any room content. $permissions['delete any room content'] = array( 'name' => 'delete any room content', 'roles' => array( @@ -64,7 +64,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete any schedule_item content + // Exported permission: delete any schedule_item content. $permissions['delete any schedule_item content'] = array( 'name' => 'delete any schedule_item content', 'roles' => array( @@ -73,7 +73,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete any session content + // Exported permission: delete any session content. $permissions['delete any session content'] = array( 'name' => 'delete any session content', 'roles' => array( @@ -82,7 +82,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete any time_slot content + // Exported permission: delete any time_slot content. $permissions['delete any time_slot content'] = array( 'name' => 'delete any time_slot content', 'roles' => array( @@ -91,7 +91,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: delete own session content + // Exported permission: delete own session content. $permissions['delete own session content'] = array( 'name' => 'delete own session content', 'roles' => array( @@ -100,7 +100,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit any room content + // Exported permission: edit any room content. $permissions['edit any room content'] = array( 'name' => 'edit any room content', 'roles' => array( @@ -109,7 +109,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit any schedule_item content + // Exported permission: edit any schedule_item content. $permissions['edit any schedule_item content'] = array( 'name' => 'edit any schedule_item content', 'roles' => array( @@ -118,7 +118,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit any session content + // Exported permission: edit any session content. $permissions['edit any session content'] = array( 'name' => 'edit any session content', 'roles' => array( @@ -127,7 +127,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit any time_slot content + // Exported permission: edit any time_slot content. $permissions['edit any time_slot content'] = array( 'name' => 'edit any time_slot content', 'roles' => array( @@ -136,7 +136,7 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: edit field_accepted + // Exported permission: edit field_accepted. $permissions['edit field_accepted'] = array( 'name' => 'edit field_accepted', 'roles' => array( @@ -145,7 +145,7 @@ function cod_session_user_default_permissions() { 'module' => 'field_permissions', ); - // Exported permission: edit own field_accepted + // Exported permission: edit own field_accepted. $permissions['edit own field_accepted'] = array( 'name' => 'edit own field_accepted', 'roles' => array( @@ -154,7 +154,7 @@ function cod_session_user_default_permissions() { 'module' => 'field_permissions', ); - // Exported permission: edit own session content + // Exported permission: edit own session content. $permissions['edit own session content'] = array( 'name' => 'edit own session content', 'roles' => array( @@ -163,7 +163,25 @@ function cod_session_user_default_permissions() { 'module' => 'node', ); - // Exported permission: view field_accepted + // Exported permission: schedule schedule_item. + $permissions['schedule schedule_item'] = array( + 'name' => 'schedule schedule_item', + 'roles' => array( + 0 => 'administrator', + ), + 'module' => 'cod_session', + ); + + // Exported permission: schedule session. + $permissions['schedule session'] = array( + 'name' => 'schedule session', + 'roles' => array( + 0 => 'administrator', + ), + 'module' => 'cod_session', + ); + + // Exported permission: view field_accepted. $permissions['view field_accepted'] = array( 'name' => 'view field_accepted', 'roles' => array( diff --git a/cod_session/cod_session.features.user_role.inc b/cod_session/cod_session.features.user_role.inc index 187327d..2a7f1ad 100644 --- a/cod_session/cod_session.features.user_role.inc +++ b/cod_session/cod_session.features.user_role.inc @@ -10,7 +10,7 @@ function cod_session_user_default_roles() { $roles = array(); - // Exported role: session organizer + // Exported role: session organizer. $roles['session organizer'] = array( 'name' => 'session organizer', 'weight' => '3', diff --git a/cod_session/cod_session.field_group.inc b/cod_session/cod_session.field_group.inc index c05392c..c311b83 100644 --- a/cod_session/cod_session.field_group.inc +++ b/cod_session/cod_session.field_group.inc @@ -10,7 +10,7 @@ function cod_session_field_group_info() { $export = array(); - $field_group = new stdClass; + $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; $field_group->identifier = 'group_audience|node|session|default'; @@ -37,7 +37,7 @@ function cod_session_field_group_info() { ); $export['group_audience|node|session|default'] = $field_group; - $field_group = new stdClass; + $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; $field_group->identifier = 'group_audience|node|session|form'; @@ -50,8 +50,8 @@ function cod_session_field_group_info() { 'label' => 'Audience', 'weight' => '5', 'children' => array( - 0 => 'field_track', - 1 => 'field_experience', + 0 => 'field_experience', + 1 => 'field_track', ), 'format_type' => 'fieldset', 'format_settings' => array( @@ -64,7 +64,7 @@ function cod_session_field_group_info() { ); $export['group_audience|node|session|form'] = $field_group; - $field_group = new stdClass; + $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; $field_group->identifier = 'group_schedule_info|node|schedule_item|default'; @@ -92,7 +92,7 @@ function cod_session_field_group_info() { ); $export['group_schedule_info|node|schedule_item|default'] = $field_group; - $field_group = new stdClass; + $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; $field_group->identifier = 'group_schedule_info|node|session|default'; @@ -120,7 +120,7 @@ function cod_session_field_group_info() { ); $export['group_schedule_info|node|session|default'] = $field_group; - $field_group = new stdClass; + $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; $field_group->identifier = 'group_schedule|node|schedule_item|form'; @@ -150,7 +150,7 @@ function cod_session_field_group_info() { ); $export['group_schedule|node|schedule_item|form'] = $field_group; - $field_group = new stdClass; + $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; $field_group->identifier = 'group_schedule|node|session|form'; @@ -163,9 +163,9 @@ function cod_session_field_group_info() { 'label' => 'Schedule Info', 'weight' => '4', 'children' => array( - 0 => 'field_session_slot', - 1 => 'field_session_room', - 2 => 'field_accepted', + 0 => 'field_accepted', + 1 => 'field_session_slot', + 2 => 'field_session_room', ), 'format_type' => 'fieldset', 'format_settings' => array( diff --git a/cod_session/cod_session.info b/cod_session/cod_session.info index c86744a..03bf809 100644 --- a/cod_session/cod_session.info +++ b/cod_session/cod_session.info @@ -1,135 +1,139 @@ -name = "COD Session" -description = "COD Session Scheduling & Voting" -core = "7.x" -package = "COD" -php = "5.2.4" -project = "cod_session" -dependencies[] = "auto_nodetitle" -dependencies[] = "cod_base" -dependencies[] = "date" -dependencies[] = "date_popup" -dependencies[] = "features" -dependencies[] = "field_group" -dependencies[] = "field_permissions" -dependencies[] = "flag" -dependencies[] = "image" -dependencies[] = "list" -dependencies[] = "menu" -dependencies[] = "node_reference" -dependencies[] = "number" -dependencies[] = "search" -dependencies[] = "strongarm" -dependencies[] = "user_reference" -dependencies[] = "views" -dependencies[] = "views_bulk_operations" -dependencies[] = "views_content" -dependencies[] = "views_ui" -datestamp = "1312320179" -features[ctools][] = "field_group:field_group:1" -features[ctools][] = "strongarm:strongarm:1" -features[ctools][] = "views:views_default:3.0" -features[field][] = "node-page-body" -features[field][] = "node-room-body" -features[field][] = "node-room-field_room_capacity" -features[field][] = "node-room-field_room_photo" -features[field][] = "node-room-field_room_session_capacity" -features[field][] = "node-schedule_item-body" -features[field][] = "node-schedule_item-field_accepted" -features[field][] = "node-schedule_item-field_session_room" -features[field][] = "node-schedule_item-field_session_slot" -features[field][] = "node-session-body" -features[field][] = "node-session-field_accepted" -features[field][] = "node-session-field_experience" -features[field][] = "node-session-field_session_room" -features[field][] = "node-session-field_session_slot" -features[field][] = "node-session-field_slides" -features[field][] = "node-session-field_speakers" -features[field][] = "node-session-field_track" -features[field][] = "node-time_slot-field_slot_datetime" -features[field_group][] = "group_audience|node|session|default" -features[field_group][] = "group_audience|node|session|form" -features[field_group][] = "group_schedule_info|node|schedule_item|default" -features[field_group][] = "group_schedule_info|node|session|default" -features[field_group][] = "group_schedule|node|schedule_item|form" -features[field_group][] = "group_schedule|node|session|form" -features[flag][] = "session_confirm" -features[flag][] = "session_schedule" -features[flag][] = "session_vote" -features[menu_custom][] = "main-menu" -features[menu_custom][] = "menu-menu-quick-links" -features[menu_links][] = "main-menu:program" -features[menu_links][] = "main-menu:program/sessions" -features[menu_links][] = "menu-menu-quick-links:program/session-schedule/your-schedule" -features[node][] = "page" -features[node][] = "room" -features[node][] = "schedule_item" -features[node][] = "session" -features[node][] = "time_slot" -features[user_permission][] = "create field_accepted" -features[user_permission][] = "create room content" -features[user_permission][] = "create schedule_item content" -features[user_permission][] = "create session content" -features[user_permission][] = "create time_slot content" -features[user_permission][] = "delete any room content" -features[user_permission][] = "delete any schedule_item content" -features[user_permission][] = "delete any session content" -features[user_permission][] = "delete any time_slot content" -features[user_permission][] = "delete own session content" -features[user_permission][] = "edit any room content" -features[user_permission][] = "edit any schedule_item content" -features[user_permission][] = "edit any session content" -features[user_permission][] = "edit any time_slot content" -features[user_permission][] = "edit field_accepted" -features[user_permission][] = "edit own field_accepted" -features[user_permission][] = "edit own session content" -features[user_permission][] = "view field_accepted" -features[user_role][] = "session organizer" -features[variable][] = "ant_pattern_time_slot" -features[variable][] = "ant_time_slot" -features[variable][] = "comment_anonymous_room" -features[variable][] = "comment_anonymous_schedule_item" -features[variable][] = "comment_anonymous_session" -features[variable][] = "comment_anonymous_time_slot" -features[variable][] = "comment_default_mode_room" -features[variable][] = "comment_default_mode_schedule_item" -features[variable][] = "comment_default_mode_session" -features[variable][] = "comment_default_mode_time_slot" -features[variable][] = "comment_default_per_page_room" -features[variable][] = "comment_default_per_page_schedule_item" -features[variable][] = "comment_default_per_page_session" -features[variable][] = "comment_default_per_page_time_slot" -features[variable][] = "comment_form_location_room" -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" -features[variable][] = "comment_preview_time_slot" -features[variable][] = "comment_room" -features[variable][] = "comment_schedule_item" -features[variable][] = "comment_session" -features[variable][] = "comment_subject_field_room" -features[variable][] = "comment_subject_field_schedule_item" -features[variable][] = "comment_subject_field_session" -features[variable][] = "comment_subject_field_time_slot" -features[variable][] = "comment_time_slot" -features[variable][] = "menu_options_time_slot" -features[variable][] = "menu_parent_time_slot" -features[variable][] = "node_options_page" -features[variable][] = "node_options_room" -features[variable][] = "node_options_schedule_item" -features[variable][] = "node_options_session" -features[variable][] = "node_options_time_slot" -features[variable][] = "node_preview_time_slot" -features[variable][] = "node_submitted_page" -features[variable][] = "node_submitted_time_slot" -features[views_view][] = "cod_schedule" -features[views_view][] = "cod_time_slots" -features[views_view][] = "schedule_room_list" -features[views_view][] = "sessions" -features[views_view][] = "sessions_admin" -features[views_view][] = "sessions_admin_contact" -features[views_view][] = "sessions_speaker_confirmation" -files[] = "cod_session_views_style_plugin_schedule.inc" +name = COD Session +description = COD Session Scheduling & Voting +core = 7.x +package = COD +php = 5.2.4 +project = cod_session +dependencies[] = auto_nodetitle +dependencies[] = cod_base +dependencies[] = date +dependencies[] = date_popup +dependencies[] = entityreference +dependencies[] = features +dependencies[] = field_group +dependencies[] = field_permissions +dependencies[] = flag +dependencies[] = image +dependencies[] = list +dependencies[] = menu +dependencies[] = number +dependencies[] = quicktabs +dependencies[] = quicktabs_tabstyles +dependencies[] = search +dependencies[] = strongarm +dependencies[] = views +dependencies[] = views_bulk_operations +dependencies[] = views_content +dependencies[] = views_ui +datestamp = 1312320179 +features[ctools][] = field_group:field_group:1 +features[ctools][] = strongarm:strongarm:1 +features[ctools][] = views:views_default:3.0 +features[features_api][] = api:1 +features[field][] = node-page-body +features[field][] = node-room-body +features[field][] = node-room-field_room_capacity +features[field][] = node-room-field_room_photo +features[field][] = node-room-field_room_session_capacity +features[field][] = node-schedule_item-body +features[field][] = node-schedule_item-field_accepted +features[field][] = node-schedule_item-field_session_room +features[field][] = node-schedule_item-field_session_slot +features[field][] = node-session-body +features[field][] = node-session-field_accepted +features[field][] = node-session-field_experience +features[field][] = node-session-field_session_room +features[field][] = node-session-field_session_slot +features[field][] = node-session-field_slides +features[field][] = node-session-field_speakers +features[field][] = node-session-field_track +features[field][] = node-time_slot-field_slot_datetime +features[field_group][] = group_audience|node|session|default +features[field_group][] = group_audience|node|session|form +features[field_group][] = group_schedule_info|node|schedule_item|default +features[field_group][] = group_schedule_info|node|session|default +features[field_group][] = group_schedule|node|schedule_item|form +features[field_group][] = group_schedule|node|session|form +features[flag][] = session_confirm +features[flag][] = session_schedule +features[flag][] = session_vote +features[menu_custom][] = main-menu +features[menu_custom][] = menu-menu-quick-links +features[menu_links][] = main-menu:program/sessions +features[node][] = page +features[node][] = room +features[node][] = schedule_item +features[node][] = session +features[node][] = time_slot +features[user_permission][] = create field_accepted +features[user_permission][] = create room content +features[user_permission][] = create schedule_item content +features[user_permission][] = create session content +features[user_permission][] = create time_slot content +features[user_permission][] = delete any room content +features[user_permission][] = delete any schedule_item content +features[user_permission][] = delete any session content +features[user_permission][] = delete any time_slot content +features[user_permission][] = delete own session content +features[user_permission][] = edit any room content +features[user_permission][] = edit any schedule_item content +features[user_permission][] = edit any session content +features[user_permission][] = edit any time_slot content +features[user_permission][] = edit field_accepted +features[user_permission][] = edit own field_accepted +features[user_permission][] = edit own session content +features[user_permission][] = schedule schedule_item +features[user_permission][] = schedule session +features[user_permission][] = view field_accepted +features[user_role][] = session organizer +features[variable][] = ant_pattern_time_slot +features[variable][] = ant_time_slot +features[variable][] = comment_anonymous_room +features[variable][] = comment_anonymous_schedule_item +features[variable][] = comment_anonymous_session +features[variable][] = comment_anonymous_time_slot +features[variable][] = comment_default_mode_room +features[variable][] = comment_default_mode_schedule_item +features[variable][] = comment_default_mode_session +features[variable][] = comment_default_mode_time_slot +features[variable][] = comment_default_per_page_room +features[variable][] = comment_default_per_page_schedule_item +features[variable][] = comment_default_per_page_session +features[variable][] = comment_default_per_page_time_slot +features[variable][] = comment_form_location_room +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 +features[variable][] = comment_preview_time_slot +features[variable][] = comment_room +features[variable][] = comment_schedule_item +features[variable][] = comment_session +features[variable][] = comment_subject_field_room +features[variable][] = comment_subject_field_schedule_item +features[variable][] = comment_subject_field_session +features[variable][] = comment_subject_field_time_slot +features[variable][] = comment_time_slot +features[variable][] = field_bundle_settings_node__schedule_item +features[variable][] = field_bundle_settings_node__session +features[variable][] = menu_options_time_slot +features[variable][] = menu_parent_time_slot +features[variable][] = node_options_page +features[variable][] = node_options_room +features[variable][] = node_options_schedule_item +features[variable][] = node_options_session +features[variable][] = node_options_time_slot +features[variable][] = node_preview_time_slot +features[variable][] = node_submitted_page +features[variable][] = node_submitted_time_slot +features[views_view][] = cod_schedule +features[views_view][] = cod_time_slots +features[views_view][] = schedule_room_list +features[views_view][] = sessions +features[views_view][] = sessions_admin +features[views_view][] = sessions_admin_contact +features[views_view][] = sessions_speaker_confirmation +files[] = cod_session_views_style_plugin_schedule.inc diff --git a/cod_session/cod_session.module b/cod_session/cod_session.module index 22ce9df..9bc0680 100644 --- a/cod_session/cod_session.module +++ b/cod_session/cod_session.module @@ -108,10 +108,19 @@ function cod_session_menu() { 'access arguments' => array(1), 'type' => MENU_CALLBACK, ); - return $items; } + +/** + * Helper function for matching day to URL arguments + */ +function cod_session_day_url($day) { + $day = str_replace(' ','-',$day); + $day = str_replace(',','',$day); + return strtolower($day); +} + /** * Implements hook_form_FORM_ID_alter(). */ @@ -121,7 +130,7 @@ function cod_session_form_node_type_form_alter(&$form, &$form_state, $form_id) { $form['cod_session'] = array( '#type' => 'fieldset', '#title' => t('Scheduling settings'), - '#description' => t('Scheduling is only available to content types that have room and time slot nodereference fields'), + '#description' => t('Scheduling is only available to content types that have room and time slot entityreference fields'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#group' => 'additional_settings', @@ -195,9 +204,9 @@ function cod_session_form_alter(&$form, &$form_state, $form_id) { if (in_array($form['#node']->type, array_keys($types))) { // If this is content-type is not unique make the widget a select list. if (variable_get('cod_unique_' . $form['#node']->type, COD_SCHEDULE_SINGLE) == COD_SCHEDULE_MULTIPLE) { - $form['field_session_room']['#type'] = 'nodereference_select'; // Keep the widget from allowing multiple values. - $form['#field_info']['field_session_room']['multiple'] = FALSE; + $form['field_session_room']['und']['#multiple'] = FALSE; + $form['field_session_room']['und']['#type'] = 'select'; } // Use $_GET for room and slot. @@ -208,8 +217,8 @@ function cod_session_form_alter(&$form, &$form_state, $form_id) { } elseif (!empty($form['#node']->nid) && !empty($form['#node']->field_session_room) && !empty($form['#node']->field_session_slot)) { // Get room and slot from node during node edit. - $room_nid = $form['#node']->field_session_room[LANGUAGE_NONE][0]['nid']; - $slot_nid = $form['#node']->field_session_slot[LANGUAGE_NONE][0]['nid']; + $room_nid = $form['#node']->field_session_room['und'][0]['target_id']; + $slot_nid = $form['#node']->field_session_slot['und'][0]['target_id']; } else { return; @@ -220,7 +229,7 @@ function cod_session_form_alter(&$form, &$form_state, $form_id) { $slot = node_load($slot_nid); } // Sanity check that bad data (or none) didn't get through. - if (!isset($slot) && !isset($slot) && ($slot->type != 'time_slot' || $slot->status != 1 || $room->type != 'room' || $room->status != 1)) { + if (!isset($slot) && !isset($room) && ($slot->type != 'time_slot' || $slot->status != 1 || $room->type != 'room' || $room->status != 1)) { return; } $form['cod_session'] = array( @@ -249,16 +258,15 @@ function cod_session_form_alter(&$form, &$form_state, $form_id) { '#value' => '
' . t("Need to change the room or time? Click 'Unschedule from this slot', then reshedule from the main schedule grid.") . '
', ); } - // Set Room and Time-slot fields. Prepopulate is not used to accomplish // this because as of 2.2 Prepopulate doesn't support hidden or access // FALSE fields. - $form['field_session_room'][LANGUAGE_NONE]['#default_value'][$room_nid] = $room_nid; - $form['field_session_slot'][LANGUAGE_NONE]['#default_value'] = $slot_nid; + $form['field_session_room']['und']['#default_value'] = $room_nid; + $form['field_session_slot']['und']['#default_value'] = $slot_nid; // Disable editing and hide the room and slot fields wuth after_build, FAPI!!! if (!user_access('edit any ' . $form['#node']->type . ' content')) { - $form['field_session_room'][LANGUAGE_NONE]['#access'] = FALSE; - $form['field_session_slot'][LANGUAGE_NONE]['#access'] = FALSE; + $form['field_session_room']['und']['#access'] = FALSE; + $form['field_session_slot']['und']['#access'] = FALSE; } // Disable node preview because of Prepopulate bug http://drupal.org/node/661842 unset($form['actions']['preview']); @@ -272,8 +280,8 @@ function cod_session_form_alter(&$form, &$form_state, $form_id) { function _cod_session_unschedule(&$form, &$form_state) { if ($form_state['values']['op'] == $form_state['values']['cod_unschedule']) { // Unset scheduled room and time slot. - $form_state['values']['field_session_room'][LANGUAGE_NONE][0]['nid'] = NULL; - $form_state['values']['field_session_slot'][LANGUAGE_NONE][0]['nid'] = NULL; + $form_state['values']['field_session_room']['und'][0]['target_id'] = NULL; + $form_state['values']['field_session_slot']['und'][0]['target_id'] = NULL; drupal_set_message(t('%name has been unscheduled. To reshedule, click "Schedule a session" on any available time slot.', array('%name' => $form_state['values']['title']))); // @todo set redirect? } @@ -411,8 +419,8 @@ function cod_session_schedule_form_submit($form, $form_state) { // @todo consider whether there should be a // cod_session_schedule_form_validate() with node_validate(). $item = node_load($form_state['values']['session'], NULL, TRUE); - $item->field_session_slot[LANGUAGE_NONE][0]['nid'] = $form_state['values']['schedule']['slot']->nid; - $item->field_session_room[LANGUAGE_NONE][0]['nid'] = $form_state['values']['schedule']['room']->nid; + $item->field_session_slot['und'][0]['target_id'] = $form_state['values']['schedule']['slot']->nid; + $item->field_session_room['und'][0]['target_id'] = $form_state['values']['schedule']['room']->nid; $item = node_submit($item); node_save($item); } @@ -426,7 +434,7 @@ function cod_session_node_view_alter(&$build) { $node = $build['#node']; // Display a message indicating when a session has been declined. - if ($build['#view_mode'] == 'full' && cod_session_is_declined($node)) { + if ($node->type == 'session' && $build['#view_mode'] == 'full' && cod_session_is_declined($node)) { $msg = check_plain(variable_get('cod_declined_msg_' . $build['#bundle'], t('This session has been declined by the session moderation team.'))); if ($output = theme('cod_session_declined_msg', array('msg' => $msg))) { if (isset($build['body'][0]['#markup'])) { @@ -477,7 +485,7 @@ function cod_session_user_is_speaker($uid, $node) { return FALSE; } foreach($node->field_speakers[LANGUAGE_NONE] as $speaker) { - if ($speaker['uid'] == $uid) { + if ($speaker['target_id'] == $uid) { return TRUE; } } @@ -499,18 +507,18 @@ function cod_session_node_presave($node) { function cod_session_node_validate($node, $form, &$form_state) { // If the node has a room and slot field, make sure there are no existing nodes that have the same room/slot combination. // Unless the node is not unique check room capacity. - if (!empty($node->field_session_slot[LANGUAGE_NONE][0]['nid']) && !empty($node->field_session_room[LANGUAGE_NONE][0]['nid'])) { + if (!empty($node->field_session_slot['und'][0]['target_id']) && !empty($node->field_session_room['und'][0]['target_id'])) { $slots = $rooms = array(); foreach ($node->field_session_slot as $slot) { - if (!empty($slot[0]['nid'])) { - $slots[] = $slot[0]['nid']; + if (!empty($slot[0]['target_id'])) { + $slots[] = $slot[0]['target_id']; } } // Get rooms. foreach ($node->field_session_room as $room) { - if (!empty($room[0]['nid'])) { - $rooms[$room[0]['nid']] = node_load($room[0]['nid']); + if (!empty($room[0]['target_id'])) { + $rooms[$room[0]['target_id']] = node_load($room[0]['target_id']); } } @@ -530,8 +538,8 @@ function cod_session_node_validate($node, $form, &$form_state) { $query = new EntityFieldQuery(); $query->entityCondition('entity_type', 'node') ->propertyCondition('status', 1) - ->fieldCondition('field_session_room', 'nid', $room_nids, 'IN') - ->fieldCondition('field_session_slot', 'nid', $slots, 'IN'); + ->fieldCondition('field_session_room', 'target_id', $room_nids, 'IN') + ->fieldCondition('field_session_slot', 'target_id', $slots, 'IN'); if (isset($node->nid)) { // Don't let this node block unscheduling. $query->propertyCondition('nid', $node->nid, '!='); @@ -546,9 +554,9 @@ function cod_session_node_validate($node, $form, &$form_state) { if (!empty($content)) { foreach ($content as $scheduled) { $capacity--; - if ($capacity <= 0 || (variable_get('cod_unique_' . $scheduled->type, COD_SCHEDULE_SINGLE) == COD_SCHEDULE_SINGLE)) { + if ($capacity <= 0 || (variable_get('cod_unique_' . $scheduled->type, COD_SCHEDULE_SINGLE) == COD_SCHEDULE_SINGLE) || (variable_get('cod_unique_' . $node->type, COD_SCHEDULE_SINGLE) == COD_SCHEDULE_SINGLE)) { // @todo handle this scheduled item being in multiple rooms? - $room = $rooms[$scheduled->field_session_room[LANGUAGE_NONE][0]['nid']]; + $room = $rooms[$scheduled->field_session_room['und'][0]['target_id']]; $errors[] = t('!session in !room', array('!session' => l($scheduled->title, 'node/' . $scheduled->nid), '!room' => l($room->title, 'node/' . $room->nid))); } } @@ -623,6 +631,19 @@ function template_preprocess_cod_session_schedule(&$vars) { } } + // There is no contextual argument filter, but if a valid day + // argument is present, we modify the cod_schedule_days + // to only display that day overriden by the URL. + if(isset($view->args[0])) { + foreach ($view->cod_schedule_days as $day_key => $day_value) { + if(cod_session_day_url($day_value) == $view->args[0]) { + $view->cod_schedule_days[$day_key] = $day_value; + } elseif($view->args[0] != 'all') { + unset($view->cod_schedule_days[$day_key]); + } + } + } + // Get days of the schedule from the View style setting. This will be used // when depicting day links and for determining time slots to appear on this // day's grid. @@ -755,7 +776,10 @@ function template_preprocess_cod_session_schedule(&$vars) { if (!empty($scheduled_items)) { foreach ($scheduled_items as $item) { - if (!empty($item->field_session_slot[LANGUAGE_NONE][0]['nid']) && !empty($item->field_session_room[LANGUAGE_NONE][0]['nid'])) { + if (!empty($item->field_session_slot['und'][0]['target_id'])) { + $target_slot = $item->field_session_slot['und'][0]['target_id']; + } + if (isset($target_slot) && !empty($item->field_session_room['und'][0]['target_id'])) { if (!empty($item->cod_session_classes)) { $class = ' ' . implode(' ', array_keys($item->cod_session_classes)); } @@ -764,16 +788,16 @@ function template_preprocess_cod_session_schedule(&$vars) { } // Handle sessions in multiple rooms. - foreach ($item->field_session_room[LANGUAGE_NONE] as $room_instance) { - $item_grid[$item->field_session_slot[LANGUAGE_NONE][0]['nid']][$room_instance['nid']][$item->nid]['session'] = $item; - $item_grid[$item->field_session_slot[LANGUAGE_NONE][0]['nid']][$room_instance['nid']][$item->nid]['class'] = $class; + foreach ($item->field_session_room['und'] as $room_instance) { + $item_grid[$target_slot][$room_instance['target_id']][$item->nid]['session'] = $item; + $item_grid[$target_slot][$room_instance['target_id']][$item->nid]['class'] = $class; // Record rooms and used slots. - $used_rooms[$room_instance['nid']][] = $item->field_session_slot[LANGUAGE_NONE][0]['nid']; + $used_rooms[$room_instance['target_id']][] = $target_slot; } // Create array of populated slots. - if (!in_array($item->field_session_slot[LANGUAGE_NONE][0]['nid'], $used_slots)) { - $used_slots[] = $item->field_session_slot[LANGUAGE_NONE][0]['nid']; + if (!in_array($target_slot, $used_slots)) { + $used_slots[] = $target_slot; } } // Record sessions for this user, their call-to-action can use it. @@ -854,6 +878,8 @@ function template_preprocess_cod_session_schedule(&$vars) { } } + $single_node_types = cod_session_single_schedulable_types(); + // @todo get rooms for each day? // Build schedule grid array. This is the final processing before handing over // to the tpl file. @@ -933,6 +959,22 @@ function template_preprocess_cod_session_schedule(&$vars) { } } + // Check if there are any nodes with COD_SCHEDULE_SINGLE assigned to this room and time + // It is already by default that the room is not available if the session is COD_SCHEDULE_SINGLE + if ($view->cod_schedule_interactive && $available) { + $query = new EntityFieldQuery(); + $entities = $query->entityCondition('entity_type', 'node') + ->propertyCondition('type', $single_node_types, 'IN') + ->fieldCondition('field_session_room', 'target_id', $room_nid) + ->fieldCondition('field_session_slot', 'target_id', $slot['nid']) + ->propertyCondition('status', 1) + ->range(0,1) + ->execute(); + if (count($entities) > 0) { + $available = 0; + } + } + // Include room availability and call-to-action if this is an interactive // schedule and user is allowed to create and schedule. if ($view->cod_schedule_interactive && cod_session_schedule_access($view->cod_interactive_type, $user)) { @@ -983,6 +1025,7 @@ function template_preprocess_cod_session_schedule(&$vars) { $vars['rooms'] = $rooms; $vars['room_nids'] = $room_nids; $vars['show_rooms'] = $show_rooms; + $vars['schedule_display'] = $view->cod_schedule_display; } /** @@ -1176,3 +1219,19 @@ function _cod_session_scheduler_title($type) { $type_info = node_type_get_type($type); return t('Schedule a @name', array('@name' => $type_info->name)); } + +/** + * Helper function to determine content types with single schedule types. + */ +function cod_session_single_schedulable_types() { + $single_types = array(); + $types = node_type_get_types(); + foreach ($types as $type => $content_type) { + $bundle = field_info_instances('node', $type); + if (isset($bundle['field_session_room']) && isset($bundle['field_session_slot']) && variable_get('cod_unique_' . $type, COD_SCHEDULE_SINGLE) == COD_SCHEDULE_SINGLE) { + $single_types[] = $type; + } + } + + return $single_types; +} diff --git a/cod_session/cod_session.strongarm.inc b/cod_session/cod_session.strongarm.inc index e429724..a07812f 100644 --- a/cod_session/cod_session.strongarm.inc +++ b/cod_session/cod_session.strongarm.inc @@ -10,224 +10,258 @@ function cod_session_strongarm() { $export = array(); - $strongarm = new stdClass; + $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 = '[node:field_slot_datetime]'; $export['ant_pattern_time_slot'] = $strongarm; - $strongarm = new stdClass; + $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 = 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 = 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 = 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 = 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 = 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 = 1; $export['comment_default_mode_room'] = $strongarm; - $strongarm = new stdClass; + $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 = 1; $export['comment_default_mode_schedule_item'] = $strongarm; - $strongarm = new stdClass; + $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 = 1; $export['comment_default_mode_session'] = $strongarm; - $strongarm = new stdClass; + $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 = 1; $export['comment_default_mode_time_slot'] = $strongarm; - $strongarm = new stdClass; + $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 = 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 = 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 = 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 = 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 = 1; $export['comment_form_location_room'] = $strongarm; - $strongarm = new stdClass; + $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 = 1; $export['comment_form_location_schedule_item'] = $strongarm; - $strongarm = new stdClass; + $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 = 1; $export['comment_form_location_session'] = $strongarm; - $strongarm = new stdClass; + $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 = 1; $export['comment_form_location_time_slot'] = $strongarm; - $strongarm = new stdClass; + $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 = 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 = 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 = 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 = 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 = 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 = '1'; $export['comment_room'] = $strongarm; - $strongarm = new stdClass; + $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 = '1'; $export['comment_schedule_item'] = $strongarm; - $strongarm = new stdClass; + $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 = 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 = 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 = 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 = 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 = 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 = '1'; $export['comment_time_slot'] = $strongarm; - $strongarm = new stdClass; + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'field_bundle_settings_node__schedule_item'; + $strongarm->value = array( + 'view_modes' => array(), + 'extra_fields' => array( + 'form' => array( + 'title' => array( + 'weight' => '-5', + ), + ), + 'display' => array(), + ), + ); + $export['field_bundle_settings_node__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 = 'field_bundle_settings_node__session'; + $strongarm->value = array( + 'view_modes' => array(), + 'extra_fields' => array( + 'form' => array( + 'title' => array( + 'weight' => '0', + ), + ), + 'display' => array(), + ), + ); + $export['field_bundle_settings_node__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 = 'menu_options_time_slot'; @@ -236,14 +270,14 @@ function cod_session_strongarm() { ); $export['menu_options_time_slot'] = $strongarm; - $strongarm = new stdClass; + $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'menu_parent_time_slot'; $strongarm->value = 'main-menu:0'; $export['menu_parent_time_slot'] = $strongarm; - $strongarm = new stdClass; + $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'; @@ -252,7 +286,7 @@ function cod_session_strongarm() { ); $export['node_options_page'] = $strongarm; - $strongarm = new stdClass; + $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_room'; @@ -262,7 +296,7 @@ function cod_session_strongarm() { ); $export['node_options_room'] = $strongarm; - $strongarm = new stdClass; + $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_schedule_item'; @@ -272,7 +306,7 @@ function cod_session_strongarm() { ); $export['node_options_schedule_item'] = $strongarm; - $strongarm = new stdClass; + $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_session'; @@ -282,7 +316,7 @@ function cod_session_strongarm() { ); $export['node_options_session'] = $strongarm; - $strongarm = new stdClass; + $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_time_slot'; @@ -292,21 +326,21 @@ function cod_session_strongarm() { ); $export['node_options_time_slot'] = $strongarm; - $strongarm = new stdClass; + $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'node_preview_time_slot'; $strongarm->value = '1'; $export['node_preview_time_slot'] = $strongarm; - $strongarm = new stdClass; + $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'node_submitted_page'; $strongarm->value = FALSE; $export['node_submitted_page'] = $strongarm; - $strongarm = new stdClass; + $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'node_submitted_time_slot'; diff --git a/cod_session/cod_session.views.inc b/cod_session/cod_session.views.inc index 4e532a4..573a376 100644 --- a/cod_session/cod_session.views.inc +++ b/cod_session/cod_session.views.inc @@ -12,7 +12,7 @@ function cod_session_views_plugins() { 'module' => 'cod_session', 'style' => array( 'cod_session_schedule' => array( - 'title' => t('Session schedule'), + 'title' => t('Session schedule grid'), 'help' => t('Display view as a table with room columns and time slot rows'), 'handler' => 'cod_session_views_plugin_style_schedule', 'theme' => 'cod_session_schedule', diff --git a/cod_session/cod_session.views_default.inc b/cod_session/cod_session.views_default.inc index dcb35e8..8642160 100644 --- a/cod_session/cod_session.views_default.inc +++ b/cod_session/cod_session.views_default.inc @@ -33,12 +33,16 @@ function cod_session_views_default_views() { $handler->display->display_options['exposed_form']['type'] = 'basic'; $handler->display->display_options['pager']['type'] = 'none'; $handler->display->display_options['pager']['options']['offset'] = '0'; - $handler->display->display_options['style_plugin'] = 'cod_session_schedule'; - $handler->display->display_options['style_options']['schedule_interactive'] = '0'; - $handler->display->display_options['style_options']['schedule_days'] = array( - 'Sunday February, 26 2012' => 0, + $handler->display->display_options['style_plugin'] = 'quicktabs'; + $handler->display->display_options['style_options']['grouping'] = array( + 0 => array( + 'field' => 'field_slot_datetime', + 'rendered' => 1, + 'rendered_strip' => 1, + ), ); - $handler->display->display_options['style_options']['interactive_type'] = 'session'; + $handler->display->display_options['style_options']['tab_style'] = 'Basic'; + $handler->display->display_options['style_options']['tab_title_field'] = 'field_slot_datetime'; $handler->display->display_options['row_plugin'] = 'fields'; /* No results behavior: Global: Text area */ $handler->display->display_options['empty']['area']['id'] = 'area'; @@ -49,35 +53,12 @@ function cod_session_views_default_views() { $handler->display->display_options['empty']['area']['content'] = 'Please create one or more rooms and time slots, and assign a session or schedule item to them. For help with scheduling, please see the COD Documentation.'; $handler->display->display_options['empty']['area']['format'] = 'filtered_html'; $handler->display->display_options['empty']['area']['tokenize'] = 0; - /* Relationship: Flags: session_schedule */ - $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel'; - $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node'; - $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel'; - $handler->display->display_options['relationships']['flag_content_rel']['label'] = 'flag: session_schedule'; - $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0; - $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'session_schedule'; - /* Field: Content: Track */ - $handler->display->display_options['fields']['field_track']['id'] = 'field_track'; - $handler->display->display_options['fields']['field_track']['table'] = 'field_data_field_track'; - $handler->display->display_options['fields']['field_track']['field'] = 'field_track'; - $handler->display->display_options['fields']['field_track']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['field_track']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['field_track']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['field_track']['alter']['external'] = 0; - $handler->display->display_options['fields']['field_track']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['field_track']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['field_track']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['field_track']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['field_track']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['field_track']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['field_track']['alter']['trim'] = 0; - $handler->display->display_options['fields']['field_track']['alter']['html'] = 0; - $handler->display->display_options['fields']['field_track']['element_label_colon'] = 1; - $handler->display->display_options['fields']['field_track']['element_default_classes'] = 1; - $handler->display->display_options['fields']['field_track']['hide_empty'] = 0; - $handler->display->display_options['fields']['field_track']['empty_zero'] = 0; - $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = 1; - $handler->display->display_options['fields']['field_track']['field_api_classes'] = 0; + /* Relationship: Entity Reference: Referenced Entity */ + $handler->display->display_options['relationships']['field_session_slot_target_id']['id'] = 'field_session_slot_target_id'; + $handler->display->display_options['relationships']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot'; + $handler->display->display_options['relationships']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id'; + $handler->display->display_options['relationships']['field_session_slot_target_id']['label'] = 'Time slot'; + $handler->display->display_options['relationships']['field_session_slot_target_id']['required'] = 1; /* Field: Content: Title */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; @@ -102,36 +83,35 @@ function cod_session_views_default_views() { $handler->display->display_options['fields']['title']['empty_zero'] = 0; $handler->display->display_options['fields']['title']['hide_alter_empty'] = 1; $handler->display->display_options['fields']['title']['link_to_node'] = 1; - /* Field: Content: Speaker(s) */ - $handler->display->display_options['fields']['field_speakers']['id'] = 'field_speakers'; - $handler->display->display_options['fields']['field_speakers']['table'] = 'field_data_field_speakers'; - $handler->display->display_options['fields']['field_speakers']['field'] = 'field_speakers'; - $handler->display->display_options['fields']['field_speakers']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['field_speakers']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['field_speakers']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['field_speakers']['alter']['external'] = 0; - $handler->display->display_options['fields']['field_speakers']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['field_speakers']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['field_speakers']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['field_speakers']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['field_speakers']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['field_speakers']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['field_speakers']['alter']['trim'] = 0; - $handler->display->display_options['fields']['field_speakers']['alter']['html'] = 0; - $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = 0; - $handler->display->display_options['fields']['field_speakers']['element_default_classes'] = 1; - $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 1; - $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0; - $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 1; - $handler->display->display_options['fields']['field_speakers']['group_rows'] = 1; - $handler->display->display_options['fields']['field_speakers']['delta_offset'] = '0'; - $handler->display->display_options['fields']['field_speakers']['delta_reversed'] = 0; - $handler->display->display_options['fields']['field_speakers']['delta_first_last'] = 0; - $handler->display->display_options['fields']['field_speakers']['field_api_classes'] = 0; + /* Field: Content: Track */ + $handler->display->display_options['fields']['field_track']['id'] = 'field_track'; + $handler->display->display_options['fields']['field_track']['table'] = 'field_data_field_track'; + $handler->display->display_options['fields']['field_track']['field'] = 'field_track'; + $handler->display->display_options['fields']['field_track']['label'] = ''; + $handler->display->display_options['fields']['field_track']['alter']['alter_text'] = 0; + $handler->display->display_options['fields']['field_track']['alter']['make_link'] = 0; + $handler->display->display_options['fields']['field_track']['alter']['absolute'] = 0; + $handler->display->display_options['fields']['field_track']['alter']['external'] = 0; + $handler->display->display_options['fields']['field_track']['alter']['replace_spaces'] = 0; + $handler->display->display_options['fields']['field_track']['alter']['trim_whitespace'] = 0; + $handler->display->display_options['fields']['field_track']['alter']['nl2br'] = 0; + $handler->display->display_options['fields']['field_track']['alter']['word_boundary'] = 1; + $handler->display->display_options['fields']['field_track']['alter']['ellipsis'] = 1; + $handler->display->display_options['fields']['field_track']['alter']['more_link'] = 0; + $handler->display->display_options['fields']['field_track']['alter']['strip_tags'] = 0; + $handler->display->display_options['fields']['field_track']['alter']['trim'] = 0; + $handler->display->display_options['fields']['field_track']['alter']['html'] = 0; + $handler->display->display_options['fields']['field_track']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['field_track']['element_default_classes'] = 1; + $handler->display->display_options['fields']['field_track']['hide_empty'] = 0; + $handler->display->display_options['fields']['field_track']['empty_zero'] = 0; + $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = 1; + $handler->display->display_options['fields']['field_track']['field_api_classes'] = 0; /* Field: Content: Experience level */ $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience'; $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience'; $handler->display->display_options['fields']['field_experience']['field'] = 'field_experience'; + $handler->display->display_options['fields']['field_experience']['label'] = ''; $handler->display->display_options['fields']['field_experience']['alter']['alter_text'] = 0; $handler->display->display_options['fields']['field_experience']['alter']['make_link'] = 0; $handler->display->display_options['fields']['field_experience']['alter']['absolute'] = 0; @@ -141,38 +121,54 @@ function cod_session_views_default_views() { $handler->display->display_options['fields']['field_experience']['alter']['nl2br'] = 0; $handler->display->display_options['fields']['field_experience']['alter']['word_boundary'] = 1; $handler->display->display_options['fields']['field_experience']['alter']['ellipsis'] = 1; + $handler->display->display_options['fields']['field_experience']['alter']['more_link'] = 0; $handler->display->display_options['fields']['field_experience']['alter']['strip_tags'] = 0; $handler->display->display_options['fields']['field_experience']['alter']['trim'] = 0; $handler->display->display_options['fields']['field_experience']['alter']['html'] = 0; - $handler->display->display_options['fields']['field_experience']['element_label_colon'] = 0; + $handler->display->display_options['fields']['field_experience']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['field_experience']['element_default_classes'] = 1; $handler->display->display_options['fields']['field_experience']['hide_empty'] = 1; $handler->display->display_options['fields']['field_experience']['empty_zero'] = 0; $handler->display->display_options['fields']['field_experience']['hide_alter_empty'] = 1; $handler->display->display_options['fields']['field_experience']['field_api_classes'] = 0; - /* Field: Flags: Flag link */ - $handler->display->display_options['fields']['ops']['id'] = 'ops'; - $handler->display->display_options['fields']['ops']['table'] = 'flag_content'; - $handler->display->display_options['fields']['ops']['field'] = 'ops'; - $handler->display->display_options['fields']['ops']['relationship'] = 'flag_content_rel'; - $handler->display->display_options['fields']['ops']['label'] = ''; - $handler->display->display_options['fields']['ops']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['ops']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['ops']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['ops']['alter']['external'] = 0; - $handler->display->display_options['fields']['ops']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['ops']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['ops']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['ops']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['ops']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['ops']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['ops']['alter']['trim'] = 0; - $handler->display->display_options['fields']['ops']['alter']['html'] = 0; - $handler->display->display_options['fields']['ops']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['ops']['element_default_classes'] = 1; - $handler->display->display_options['fields']['ops']['hide_empty'] = 0; - $handler->display->display_options['fields']['ops']['empty_zero'] = 0; - $handler->display->display_options['fields']['ops']['hide_alter_empty'] = 1; + /* Field: Content: Date and time */ + $handler->display->display_options['fields']['field_slot_datetime']['id'] = 'field_slot_datetime'; + $handler->display->display_options['fields']['field_slot_datetime']['table'] = 'field_data_field_slot_datetime'; + $handler->display->display_options['fields']['field_slot_datetime']['field'] = 'field_slot_datetime'; + $handler->display->display_options['fields']['field_slot_datetime']['relationship'] = 'field_session_slot_target_id'; + $handler->display->display_options['fields']['field_slot_datetime']['label'] = ''; + $handler->display->display_options['fields']['field_slot_datetime']['exclude'] = TRUE; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['alter_text'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['make_link'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['absolute'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['external'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['replace_spaces'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['trim_whitespace'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['nl2br'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['word_boundary'] = 1; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['ellipsis'] = 1; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['more_link'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['strip_tags'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['trim'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['alter']['html'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['field_slot_datetime']['element_default_classes'] = 1; + $handler->display->display_options['fields']['field_slot_datetime']['hide_empty'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['empty_zero'] = 0; + $handler->display->display_options['fields']['field_slot_datetime']['hide_alter_empty'] = 1; + $handler->display->display_options['fields']['field_slot_datetime']['settings'] = array( + 'format_type' => 'date_no_time_', + 'fromto' => 'value', + 'multiple_number' => '', + 'multiple_from' => '', + 'multiple_to' => '', + ); + $handler->display->display_options['fields']['field_slot_datetime']['field_api_classes'] = 0; + /* Sort criterion: Content: Date and time (field_slot_datetime) */ + $handler->display->display_options['sorts']['field_slot_datetime_value']['id'] = 'field_slot_datetime_value'; + $handler->display->display_options['sorts']['field_slot_datetime_value']['table'] = 'field_data_field_slot_datetime'; + $handler->display->display_options['sorts']['field_slot_datetime_value']['field'] = 'field_slot_datetime_value'; + $handler->display->display_options['sorts']['field_slot_datetime_value']['relationship'] = 'field_session_slot_target_id'; $handler->display->display_options['filter_groups']['groups'] = array( 1 => 'AND', 2 => 'AND', @@ -202,22 +198,25 @@ function cod_session_views_default_views() { ); $handler->display->display_options['filters']['field_accepted_value']['group'] = 1; /* Filter criterion: Content: Room (field_session_room) */ - $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid'; - $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room'; - $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid'; - $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty'; - $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1; + $handler->display->display_options['filters']['field_session_room_target_id']['id'] = 'field_session_room_target_id'; + $handler->display->display_options['filters']['field_session_room_target_id']['table'] = 'field_data_field_session_room'; + $handler->display->display_options['filters']['field_session_room_target_id']['field'] = 'field_session_room_target_id'; + $handler->display->display_options['filters']['field_session_room_target_id']['operator'] = 'not empty'; /* Filter criterion: Content: Time slot (field_session_slot) */ - $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid'; - $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot'; - $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid'; - $handler->display->display_options['filters']['field_session_slot_nid']['operator'] = 'not empty'; - $handler->display->display_options['filters']['field_session_slot_nid']['group'] = 1; + $handler->display->display_options['filters']['field_session_slot_target_id']['id'] = 'field_session_slot_target_id'; + $handler->display->display_options['filters']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot'; + $handler->display->display_options['filters']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id'; + $handler->display->display_options['filters']['field_session_slot_target_id']['operator'] = 'not empty'; /* Display: Schedule */ $handler = $view->new_display('page', 'Schedule', 'page_1'); - $handler->display->display_options['path'] = 'program/session-schedule'; - $handler->display->display_options['menu']['type'] = 'default tab'; + $handler->display->display_options['defaults']['relationships'] = FALSE; + /* Relationship: Entity Reference: Referenced Entity */ + $handler->display->display_options['relationships']['field_session_slot_target_id']['id'] = 'field_session_slot_target_id'; + $handler->display->display_options['relationships']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot'; + $handler->display->display_options['relationships']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id'; + $handler->display->display_options['relationships']['field_session_slot_target_id']['required'] = 1; + $handler->display->display_options['path'] = 'program/session-schedule/%'; $handler->display->display_options['menu']['title'] = 'Session Schedule'; $handler->display->display_options['menu']['weight'] = '-50'; $handler->display->display_options['menu']['name'] = 'main-menu'; @@ -245,6 +244,18 @@ function cod_session_views_default_views() { $handler->display->display_options['empty']['area']['content'] = 'You can add sessions to your personal schedule from the main schedule.'; $handler->display->display_options['empty']['area']['format'] = 'filtered_html'; $handler->display->display_options['empty']['area']['tokenize'] = 0; + $handler->display->display_options['defaults']['relationships'] = FALSE; + /* Relationship: Broken/missing handler */ + $handler->display->display_options['relationships']['field_session_speakers_target_id']['id'] = 'field_session_speakers_target_id'; + $handler->display->display_options['relationships']['field_session_speakers_target_id']['table'] = 'field_data_field_session_speakers'; + $handler->display->display_options['relationships']['field_session_speakers_target_id']['field'] = 'field_session_speakers_target_id'; + $handler->display->display_options['relationships']['field_session_speakers_target_id']['required'] = 1; + /* Relationship: Flags: session_schedule */ + $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel'; + $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node'; + $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel'; + $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0; + $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'session_schedule'; $handler->display->display_options['defaults']['filters'] = FALSE; /* Filter criterion: Content: Published */ $handler->display->display_options['filters']['status']['id'] = 'status'; @@ -271,24 +282,21 @@ function cod_session_views_default_views() { ); $handler->display->display_options['filters']['field_accepted_value']['group'] = 1; /* Filter criterion: Content: Room (field_session_room) */ - $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid'; - $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room'; - $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid'; - $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty'; - $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1; + $handler->display->display_options['filters']['field_session_room_target_id']['id'] = 'field_session_room_target_id'; + $handler->display->display_options['filters']['field_session_room_target_id']['table'] = 'field_data_field_session_room'; + $handler->display->display_options['filters']['field_session_room_target_id']['field'] = 'field_session_room_target_id'; + $handler->display->display_options['filters']['field_session_room_target_id']['operator'] = 'not empty'; /* Filter criterion: Content: Time slot (field_session_slot) */ - $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid'; - $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot'; - $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid'; - $handler->display->display_options['filters']['field_session_slot_nid']['operator'] = 'not empty'; - $handler->display->display_options['filters']['field_session_slot_nid']['group'] = 1; + $handler->display->display_options['filters']['field_session_slot_target_id']['id'] = 'field_session_slot_target_id'; + $handler->display->display_options['filters']['field_session_slot_target_id']['table'] = 'field_data_field_session_slot'; + $handler->display->display_options['filters']['field_session_slot_target_id']['field'] = 'field_session_slot_target_id'; + $handler->display->display_options['filters']['field_session_slot_target_id']['operator'] = 'not empty'; /* Filter criterion: Flags: Flagged */ $handler->display->display_options['filters']['flagged']['id'] = 'flagged'; $handler->display->display_options['filters']['flagged']['table'] = 'flag_content'; $handler->display->display_options['filters']['flagged']['field'] = 'flagged'; $handler->display->display_options['filters']['flagged']['relationship'] = 'flag_content_rel'; $handler->display->display_options['filters']['flagged']['value'] = '1'; - $handler->display->display_options['filters']['flagged']['group'] = 1; $handler->display->display_options['path'] = 'program/session-schedule/your-schedule'; $handler->display->display_options['menu']['type'] = 'tab'; $handler->display->display_options['menu']['title'] = 'Your schedule'; @@ -296,6 +304,16 @@ function cod_session_views_default_views() { $handler->display->display_options['menu']['name'] = 'main-menu'; $handler->display->display_options['menu']['context'] = 0; $handler->display->display_options['tab_options']['weight'] = '0'; + + /* Display: Session schedule */ + $handler = $view->new_display('page', 'Session schedule', 'page_3'); + $handler->display->display_options['path'] = 'program/session-schedule'; + $handler->display->display_options['menu']['type'] = 'normal'; + $handler->display->display_options['menu']['title'] = 'Session schedule'; + $handler->display->display_options['menu']['description'] = 'Session schedule'; + $handler->display->display_options['menu']['weight'] = '0'; + $handler->display->display_options['menu']['name'] = 'main-menu'; + $handler->display->display_options['menu']['context'] = 0; $export['cod_schedule'] = $view; $view = new view; @@ -582,11 +600,7 @@ function cod_session_views_default_views() { $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 0; $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0; $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 0; - $handler->display->display_options['fields']['field_speakers']['group_rows'] = 1; - $handler->display->display_options['fields']['field_speakers']['delta_offset'] = '0'; - $handler->display->display_options['fields']['field_speakers']['delta_reversed'] = 0; - $handler->display->display_options['fields']['field_speakers']['field_api_classes'] = 0; - /* Field: Content: Description */ + /* Field: Content: Body */ $handler->display->display_options['fields']['body']['id'] = 'body'; $handler->display->display_options['fields']['body']['table'] = 'field_data_body'; $handler->display->display_options['fields']['body']['field'] = 'body'; @@ -963,12 +977,11 @@ function cod_session_views_default_views() { $handler->display->display_options['pager']['options']['id'] = '0'; $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all'] = 0; $handler->display->display_options['defaults']['relationships'] = FALSE; - /* Relationship: Content: Time slot (field_session_slot) */ + /* Relationship: Broken/missing handler */ $handler->display->display_options['relationships']['field_session_slot_nid']['id'] = 'field_session_slot_nid'; $handler->display->display_options['relationships']['field_session_slot_nid']['table'] = 'field_data_field_session_slot'; $handler->display->display_options['relationships']['field_session_slot_nid']['field'] = 'field_session_slot_nid'; $handler->display->display_options['relationships']['field_session_slot_nid']['required'] = 0; - $handler->display->display_options['relationships']['field_session_slot_nid']['delta'] = '-1'; $handler->display->display_options['defaults']['fields'] = FALSE; /* Field: Content: Status */ $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted'; @@ -1103,12 +1116,11 @@ function cod_session_views_default_views() { $handler->display->display_options['row_options']['default_field_elements'] = 1; $handler->display->display_options['defaults']['row_options'] = FALSE; $handler->display->display_options['defaults']['relationships'] = FALSE; - /* Relationship: Content: Speaker(s) (field_speakers) */ + /* Relationship: Broken/missing handler */ $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid'; $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers'; $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid'; $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 0; - $handler->display->display_options['relationships']['field_speakers_uid']['delta'] = '-1'; $handler->display->display_options['defaults']['fields'] = FALSE; /* Field: User: Picture */ $handler->display->display_options['fields']['picture']['id'] = 'picture'; @@ -1407,10 +1419,6 @@ function cod_session_views_default_views() { $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 0; $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0; $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 0; - $handler->display->display_options['fields']['field_speakers']['group_rows'] = 1; - $handler->display->display_options['fields']['field_speakers']['delta_offset'] = '0'; - $handler->display->display_options['fields']['field_speakers']['delta_reversed'] = 0; - $handler->display->display_options['fields']['field_speakers']['field_api_classes'] = 0; /* Field: Content: Experience level */ $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience'; $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience'; @@ -1572,13 +1580,13 @@ function cod_session_views_default_views() { 1 => '1', ); $handler->display->display_options['filters']['field_accepted_value']['group'] = 1; - /* Filter criterion: Content: Room (field_session_room) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid'; $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room'; $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid'; $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'empty'; $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1; - /* Filter criterion: Content: Time slot (field_session_slot) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid'; $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot'; $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid'; @@ -1813,7 +1821,7 @@ function cod_session_views_default_views() { $handler->display->display_options['filters']['status']['field'] = 'status'; $handler->display->display_options['filters']['status']['value'] = '1'; $handler->display->display_options['filters']['status']['group'] = 0; - /* Filter criterion: Content: Room (field_session_room) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid'; $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room'; $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid'; @@ -1823,8 +1831,7 @@ function cod_session_views_default_views() { $handler->display->display_options['filters']['field_session_room_nid']['expose']['label'] = 'Room'; $handler->display->display_options['filters']['field_session_room_nid']['expose']['operator'] = 'field_session_room_nid_op'; $handler->display->display_options['filters']['field_session_room_nid']['expose']['identifier'] = 'room'; - $handler->display->display_options['filters']['field_session_room_nid']['expose']['reduce'] = 0; - /* Filter criterion: Content: Time slot (field_session_slot) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid'; $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot'; $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid'; @@ -1989,13 +1996,12 @@ function cod_session_views_default_views() { $handler->display->display_options['empty']['area']['content'] = 'There are no speakers in this category.'; $handler->display->display_options['empty']['area']['format'] = 'filtered_html'; $handler->display->display_options['empty']['area']['tokenize'] = 0; - /* Relationship: Content: Speaker(s) (field_speakers) */ + /* Relationship: Broken/missing handler */ $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid'; $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers'; $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid'; $handler->display->display_options['relationships']['field_speakers_uid']['label'] = 'Speaker(s)'; $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 1; - $handler->display->display_options['relationships']['field_speakers_uid']['delta'] = '-1'; /* Field: Bulk operations: Content */ $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations'; $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node'; @@ -2303,12 +2309,6 @@ function cod_session_views_default_views() { $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 0; $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0; $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 1; - $handler->display->display_options['fields']['field_speakers']['group_rows'] = 1; - $handler->display->display_options['fields']['field_speakers']['delta_limit'] = '5'; - $handler->display->display_options['fields']['field_speakers']['delta_offset'] = '0'; - $handler->display->display_options['fields']['field_speakers']['delta_reversed'] = 0; - $handler->display->display_options['fields']['field_speakers']['delta_first_last'] = 0; - $handler->display->display_options['fields']['field_speakers']['field_api_classes'] = 0; /* Filter criterion: Content: Published */ $handler->display->display_options['filters']['status']['id'] = 'status'; $handler->display->display_options['filters']['status']['table'] = 'node'; @@ -2492,7 +2492,7 @@ function cod_session_views_default_views() { $handler->display->display_options['filters']['field_accepted_value']['value'] = array( 1 => '1', ); - /* Filter criterion: Content: Room (field_session_room) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid'; $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room'; $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid'; @@ -2550,12 +2550,12 @@ function cod_session_views_default_views() { $handler->display->display_options['filters']['field_accepted_value']['value'] = array( 1 => '1', ); - /* Filter criterion: Content: Room (field_session_room) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid'; $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room'; $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid'; $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty'; - /* Filter criterion: Content: Time slot (field_session_slot) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid'; $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot'; $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid'; @@ -2582,21 +2582,18 @@ function cod_session_views_default_views() { $handler->display->display_options['header']['area']['format'] = 'full_html'; $handler->display->display_options['header']['area']['tokenize'] = 0; $handler->display->display_options['defaults']['relationships'] = FALSE; - /* Relationship: Content: Speaker(s) (field_speakers) */ + /* Relationship: Broken/missing handler */ $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid'; $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers'; $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid'; $handler->display->display_options['relationships']['field_speakers_uid']['label'] = 'Speaker(s)'; $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 1; - $handler->display->display_options['relationships']['field_speakers_uid']['delta'] = '-1'; - /* Relationship: Flags: session_confirm */ + /* Relationship: Flags: (Please select a flag) */ $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel'; $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node'; $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel'; $handler->display->display_options['relationships']['flag_content_rel']['label'] = 'session_confirm'; $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0; - $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'session_confirm'; - $handler->display->display_options['relationships']['flag_content_rel']['user_scope'] = 'any'; $handler->display->display_options['defaults']['filters'] = FALSE; /* Filter criterion: Content: Published */ $handler->display->display_options['filters']['status']['id'] = 'status'; @@ -2619,7 +2616,7 @@ function cod_session_views_default_views() { $handler->display->display_options['filters']['field_accepted_value']['value'] = array( 1 => '1', ); - /* Filter criterion: Content: Room (field_session_room) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid'; $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room'; $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid'; @@ -2631,7 +2628,7 @@ function cod_session_views_default_views() { $handler->display->display_options['filters']['flagged']['field'] = 'flagged'; $handler->display->display_options['filters']['flagged']['relationship'] = 'flag_content_rel'; $handler->display->display_options['filters']['flagged']['value'] = '0'; - /* Filter criterion: Content: Time slot (field_session_slot) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid'; $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot'; $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid'; @@ -2668,20 +2665,17 @@ function cod_session_views_default_views() { $handler->display->display_options['empty']['area']['format'] = 'filtered_html'; $handler->display->display_options['empty']['area']['tokenize'] = 0; $handler->display->display_options['defaults']['relationships'] = FALSE; - /* Relationship: Content: Speaker(s) (field_speakers) */ + /* Relationship: Broken/missing handler */ $handler->display->display_options['relationships']['field_speakers_uid']['id'] = 'field_speakers_uid'; $handler->display->display_options['relationships']['field_speakers_uid']['table'] = 'field_data_field_speakers'; $handler->display->display_options['relationships']['field_speakers_uid']['field'] = 'field_speakers_uid'; $handler->display->display_options['relationships']['field_speakers_uid']['label'] = 'Speaker(s)'; $handler->display->display_options['relationships']['field_speakers_uid']['required'] = 1; - $handler->display->display_options['relationships']['field_speakers_uid']['delta'] = '-1'; - /* Relationship: Flags: session_confirm */ + /* Relationship: Flags: (Please select a flag) */ $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel'; $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node'; $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel'; $handler->display->display_options['relationships']['flag_content_rel']['label'] = 'session_confirm'; - $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'session_confirm'; - $handler->display->display_options['relationships']['flag_content_rel']['user_scope'] = 'any'; $handler->display->display_options['defaults']['filters'] = FALSE; /* Filter criterion: Content: Published */ $handler->display->display_options['filters']['status']['id'] = 'status'; @@ -2706,12 +2700,12 @@ function cod_session_views_default_views() { 1 => '1', ); $handler->display->display_options['filters']['field_accepted_value']['group'] = 0; - /* Filter criterion: Content: Room (field_session_room) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid'; $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room'; $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid'; $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty'; - /* Filter criterion: Content: Time slot (field_session_slot) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid'; $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot'; $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid'; @@ -2777,12 +2771,11 @@ function cod_session_views_default_views() { $handler->display->display_options['style_options']['override'] = 1; $handler->display->display_options['style_options']['sticky'] = 0; $handler->display->display_options['style_options']['empty_table'] = 0; - /* Relationship: Flags: session_confirm */ + /* Relationship: Flags: (Please select a flag) */ $handler->display->display_options['relationships']['flag_content_rel']['id'] = 'flag_content_rel'; $handler->display->display_options['relationships']['flag_content_rel']['table'] = 'node'; $handler->display->display_options['relationships']['flag_content_rel']['field'] = 'flag_content_rel'; $handler->display->display_options['relationships']['flag_content_rel']['required'] = 0; - $handler->display->display_options['relationships']['flag_content_rel']['flag'] = 'session_confirm'; /* Field: Content: Title */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; @@ -2846,7 +2839,7 @@ function cod_session_views_default_views() { $handler->display->display_options['fields']['ops']['hide_empty'] = 0; $handler->display->display_options['fields']['ops']['empty_zero'] = 0; $handler->display->display_options['fields']['ops']['hide_alter_empty'] = 0; - /* Contextual filter: Content: Speaker(s) (field_speakers) */ + /* Contextual filter: Broken/missing handler */ $handler->display->display_options['arguments']['field_speakers_uid']['id'] = 'field_speakers_uid'; $handler->display->display_options['arguments']['field_speakers_uid']['table'] = 'field_data_field_speakers'; $handler->display->display_options['arguments']['field_speakers_uid']['field'] = 'field_speakers_uid'; @@ -2860,8 +2853,6 @@ function cod_session_views_default_views() { $handler->display->display_options['arguments']['field_speakers_uid']['validate']['type'] = 'user'; $handler->display->display_options['arguments']['field_speakers_uid']['validate_options']['type'] = 'either'; $handler->display->display_options['arguments']['field_speakers_uid']['validate_options']['restrict_roles'] = 0; - $handler->display->display_options['arguments']['field_speakers_uid']['break_phrase'] = 0; - $handler->display->display_options['arguments']['field_speakers_uid']['not'] = 0; $handler->display->display_options['filter_groups']['groups'] = array( 1 => 'AND', 2 => 'AND', @@ -2874,13 +2865,13 @@ function cod_session_views_default_views() { 1 => '1', ); $handler->display->display_options['filters']['field_accepted_value']['group'] = 1; - /* Filter criterion: Content: Room (field_session_room) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_room_nid']['id'] = 'field_session_room_nid'; $handler->display->display_options['filters']['field_session_room_nid']['table'] = 'field_data_field_session_room'; $handler->display->display_options['filters']['field_session_room_nid']['field'] = 'field_session_room_nid'; $handler->display->display_options['filters']['field_session_room_nid']['operator'] = 'not empty'; $handler->display->display_options['filters']['field_session_room_nid']['group'] = 1; - /* Filter criterion: Content: Time slot (field_session_slot) */ + /* Filter criterion: Broken/missing handler */ $handler->display->display_options['filters']['field_session_slot_nid']['id'] = 'field_session_slot_nid'; $handler->display->display_options['filters']['field_session_slot_nid']['table'] = 'field_data_field_session_slot'; $handler->display->display_options['filters']['field_session_slot_nid']['field'] = 'field_session_slot_nid'; diff --git a/cod_session/cod_session_views_style_plugin_schedule.inc b/cod_session/cod_session_views_style_plugin_schedule.inc index 879d8cb..371f228 100644 --- a/cod_session/cod_session_views_style_plugin_schedule.inc +++ b/cod_session/cod_session_views_style_plugin_schedule.inc @@ -1,10 +1,7 @@ options['interactive_type']; $view->cod_interactive_type = !empty($view->cod_schedule_interactive) ? $interactive_type : FALSE; - $view->cod_room_queue = $this->options['room_queue']; $view->cod_time_queue = $this->options['time_queue']; @@ -57,16 +53,6 @@ class cod_session_views_plugin_style_schedule extends views_plugin_style { * Style options. */ function options_form(&$form, &$form_state) { - $schedule_days = cod_session_days(); - if (!empty($schedule_days)) { - $form['schedule_days'] = array( - '#title' => t('Schedule days'), - '#default_value' => !empty($this->options['schedule_days']) ? $this->options['schedule_days'] : array(), - '#type' => 'checkboxes', - '#options' => $schedule_days, - '#description' => t('Select which days to show on this display. Defaults to all event days.'), - ); - } // "interactive" is an internal name, in the UI it's referred to as the // scheduling mode. @@ -99,7 +85,6 @@ class cod_session_views_plugin_style_schedule extends views_plugin_style { foreach ($queues as $queue) { $options[$queue->qid] = $queue->title; } - $form['room_queue'] = array( '#type' => 'radios', '#title' => t('Room queue'),