From 37dfe1415b666c596955aa1eedbda490b8bf53d2 Mon Sep 17 00:00:00 2001 From: Jamie Giberti Date: Thu, 4 Apr 2019 12:15:55 +0100 Subject: [PATCH] Updated Event feature to version 2.0 with new fields and a new past events page view for the included view in the module. Added a changelog. --- CHANGELOG.md | 15 + LICENSE.txt | 0 README.md | 0 ...idge_events.features.fe_block_settings.inc | 10 +- cambridge_events.features.field_base.inc | 110 +++- cambridge_events.features.field_instance.inc | 579 +++++++++++++++++- cambridge_events.features.inc | 3 +- cambridge_events.field_group.inc | 110 ++++ cambridge_events.info | 21 +- cambridge_events.install | 0 cambridge_events.module | 0 cambridge_events.strongarm.inc | 33 +- cambridge_events.views_default.inc | 107 +++- 13 files changed, 963 insertions(+), 25 deletions(-) create mode 100644 CHANGELOG.md mode change 100644 => 100755 LICENSE.txt mode change 100644 => 100755 README.md mode change 100644 => 100755 cambridge_events.features.fe_block_settings.inc mode change 100644 => 100755 cambridge_events.features.field_base.inc mode change 100644 => 100755 cambridge_events.features.field_instance.inc mode change 100644 => 100755 cambridge_events.features.inc create mode 100755 cambridge_events.field_group.inc mode change 100644 => 100755 cambridge_events.info mode change 100644 => 100755 cambridge_events.install mode change 100644 => 100755 cambridge_events.module mode change 100644 => 100755 cambridge_events.strongarm.inc mode change 100644 => 100755 cambridge_events.views_default.inc diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..7777318 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,15 @@ +Changelog +========= + +2.0 + +4 April 2019 + +The event content type feature has been revamped as part of the Falcon-to-Drupal migration project. +The content type now contains additional useful fields. +The view also now contains a "past events" page view in addition to the main "upcoming events" page view. + + +1.0 + +Initial commit. diff --git a/LICENSE.txt b/LICENSE.txt old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/cambridge_events.features.fe_block_settings.inc b/cambridge_events.features.fe_block_settings.inc old mode 100644 new mode 100755 index d0650f1..787b359 --- a/cambridge_events.features.fe_block_settings.inc +++ b/cambridge_events.features.fe_block_settings.inc @@ -1,4 +1,5 @@ 'events-block', 'module' => 'views', 'node_types' => array(), - 'pages' => 'events -events/*', + 'pages' => '', 'roles' => array(), 'themes' => array( 'cambridge_theme' => array( - 'region' => 'sidebar', - 'status' => 1, + 'region' => '', + 'status' => 0, 'theme' => 'cambridge_theme', - 'weight' => 0, + 'weight' => -26, ), 'seven' => array( 'region' => '', diff --git a/cambridge_events.features.field_base.inc b/cambridge_events.features.field_base.inc old mode 100644 new mode 100755 index 384fd3c..39e5ca4 --- a/cambridge_events.features.field_base.inc +++ b/cambridge_events.features.field_base.inc @@ -1,4 +1,5 @@ 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_contact_email', + 'indexes' => array(), + 'locked' => 0, + 'module' => 'email', + 'settings' => array(), + 'translatable' => 0, + 'type' => 'email', + ); + + // Exported field_base: 'field_contact_name'. + $field_bases['field_contact_name'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_contact_name', + 'indexes' => array( + 'format' => array( + 0 => 'format', + ), + ), + 'locked' => 0, + 'module' => 'text', + 'settings' => array( + 'max_length' => 255, + ), + 'translatable' => 0, + 'type' => 'text', + ); + + // Exported field_base: 'field_contact_phone'. + $field_bases['field_contact_phone'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_contact_phone', + 'indexes' => array( + 'format' => array( + 0 => 'format', + ), + ), + 'locked' => 0, + 'module' => 'text', + 'settings' => array( + 'max_length' => 255, + ), + 'translatable' => 0, + 'type' => 'text', + ); + + // Exported field_base: 'field_event_date'. $field_bases['field_event_date'] = array( 'active' => 1, 'cardinality' => -1, @@ -40,5 +98,55 @@ function cambridge_events_field_default_field_bases() { 'type' => 'datetime', ); + // Exported field_base: 'field_event_location'. + $field_bases['field_event_location'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_event_location', + 'indexes' => array( + 'format' => array( + 0 => 'format', + ), + ), + 'locked' => 0, + 'module' => 'text', + 'settings' => array( + 'max_length' => 255, + ), + 'translatable' => 0, + 'type' => 'text', + ); + + // Exported field_base: 'field_event_url'. + $field_bases['field_event_url'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_event_url', + 'indexes' => array(), + 'locked' => 0, + 'module' => 'link', + 'settings' => array( + 'attributes' => array( + 'class' => '', + 'rel' => '', + 'target' => 'default', + ), + 'display' => array( + 'url_cutoff' => 80, + ), + 'enable_tokens' => 1, + 'title' => 'optional', + 'title_maxlength' => 128, + 'title_value' => '', + 'url' => 0, + ), + 'translatable' => 0, + 'type' => 'link_field', + ); + return $field_bases; } diff --git a/cambridge_events.features.field_instance.inc b/cambridge_events.features.field_instance.inc old mode 100644 new mode 100755 index c9dd0cd..6aa3c20 --- a/cambridge_events.features.field_instance.inc +++ b/cambridge_events.features.field_instance.inc @@ -1,4 +1,5 @@ 'event', 'default_value' => NULL, @@ -44,9 +45,11 @@ function cambridge_events_field_default_field_instances() { 'more_text' => 'Read more', 'summary_handler' => 'full', 'trim_length' => 325, + 'trim_link' => FALSE, 'trim_options' => array( 'text' => 'text', ), + 'trim_preserve_tags' => '', 'trim_suffix' => '...', 'trim_type' => 'chars', ), @@ -61,9 +64,11 @@ function cambridge_events_field_default_field_instances() { 'more_text' => 'Read more', 'summary_handler' => 'full', 'trim_length' => 325, + 'trim_link' => FALSE, 'trim_options' => array( 'text' => 'text', ), + 'trim_preserve_tags' => '', 'trim_suffix' => '...', 'trim_type' => 'chars', ), @@ -78,9 +83,11 @@ function cambridge_events_field_default_field_instances() { 'more_text' => 'Read more', 'summary_handler' => 'full', 'trim_length' => 325, + 'trim_link' => FALSE, 'trim_options' => array( 'text' => 'text', ), + 'trim_preserve_tags' => '', 'trim_suffix' => '...', 'trim_type' => 'chars', ), @@ -95,9 +102,11 @@ function cambridge_events_field_default_field_instances() { 'more_text' => 'Read more', 'summary_handler' => 'full', 'trim_length' => 325, + 'trim_link' => FALSE, 'trim_options' => array( 'text' => 'text', ), + 'trim_preserve_tags' => '', 'trim_suffix' => '...', 'trim_type' => 'chars', ), @@ -105,27 +114,307 @@ function cambridge_events_field_default_field_instances() { 'weight' => 5, ), ), + 'ds_extras_field_template' => '', 'entity_type' => 'node', 'field_name' => 'body', 'label' => 'Body', - 'required' => FALSE, + 'required' => 0, 'settings' => array( - 'display_summary' => TRUE, + 'better_formats' => array( + 'allowed_formats' => array( + 'filtered_html' => 'filtered_html', + 'full_html' => 'full_html', + 'plain_text' => 'plain_text', + ), + 'allowed_formats_toggle' => 1, + 'default_order_toggle' => 1, + 'default_order_wrapper' => array( + 'formats' => array( + 'filtered_html' => array( + 'weight' => -50, + ), + 'full_html' => array( + 'weight' => -49, + ), + 'plain_text' => array( + 'weight' => -48, + ), + ), + ), + ), + 'display_summary' => 1, 'text_processing' => 1, 'user_register_form' => FALSE, ), 'widget' => array( + 'active' => 1, 'module' => 'text', 'settings' => array( 'rows' => 20, 'summary_rows' => 5, ), 'type' => 'text_textarea_with_summary', + 'weight' => 2, + ), + ); + + // Exported field_instance: 'node-event-field_contact_email'. + $field_instances['node-event-field_contact_email'] = array( + 'bundle' => 'event', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'carousel_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'default' => array( + 'label' => 'above', + 'module' => 'email', + 'settings' => array(), + 'type' => 'email_default', + 'weight' => 12, + ), + 'focus_on_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'news_listing_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'sidebar_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'vertical_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'ds_extras_field_template' => '', + 'entity_type' => 'node', + 'field_name' => 'field_contact_email', + 'label' => 'Contact email', + 'required' => 0, + 'settings' => array( + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'email', + 'settings' => array( + 'size' => 60, + ), + 'type' => 'email_textfield', + 'weight' => 6, + ), + ); + + // Exported field_instance: 'node-event-field_contact_name'. + $field_instances['node-event-field_contact_name'] = array( + 'bundle' => 'event', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'carousel_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'default' => array( + 'label' => 'above', + 'module' => 'text', + 'settings' => array(), + 'type' => 'text_default', + 'weight' => 11, + ), + 'focus_on_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'news_listing_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'sidebar_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'vertical_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'ds_extras_field_template' => '', + 'entity_type' => 'node', + 'field_name' => 'field_contact_name', + 'label' => 'Contact name', + 'required' => 0, + 'settings' => array( + 'better_formats' => array( + 'allowed_formats' => array( + 'filtered_html' => 'filtered_html', + 'full_html' => 'full_html', + 'plain_text' => 'plain_text', + ), + 'allowed_formats_toggle' => 0, + 'default_order_toggle' => 0, + 'default_order_wrapper' => array( + 'formats' => array( + 'filtered_html' => array( + 'weight' => -10, + ), + 'full_html' => array( + 'weight' => -9, + ), + 'plain_text' => array( + 'weight' => -8, + ), + ), + ), + ), + 'text_processing' => 0, + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'text', + 'settings' => array( + 'size' => 60, + ), + 'type' => 'text_textfield', 'weight' => 5, ), ); - // Exported field_instance: 'node-event-field_event_date' + // Exported field_instance: 'node-event-field_contact_phone'. + $field_instances['node-event-field_contact_phone'] = array( + 'bundle' => 'event', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'carousel_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'default' => array( + 'label' => 'above', + 'module' => 'text', + 'settings' => array(), + 'type' => 'text_default', + 'weight' => 13, + ), + 'focus_on_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'news_listing_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'sidebar_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'vertical_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'ds_extras_field_template' => '', + 'entity_type' => 'node', + 'field_name' => 'field_contact_phone', + 'label' => 'Contact phone', + 'required' => 0, + 'settings' => array( + 'better_formats' => array( + 'allowed_formats' => array( + 'filtered_html' => 'filtered_html', + 'full_html' => 'full_html', + 'plain_text' => 'plain_text', + ), + 'allowed_formats_toggle' => 0, + 'default_order_toggle' => 0, + 'default_order_wrapper' => array( + 'formats' => array( + 'filtered_html' => array( + 'weight' => -10, + ), + 'full_html' => array( + 'weight' => -9, + ), + 'plain_text' => array( + 'weight' => -8, + ), + ), + ), + ), + 'text_processing' => 0, + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'text', + 'settings' => array( + 'size' => 60, + ), + 'type' => 'text_textfield', + 'weight' => 7, + ), + ); + + // Exported field_instance: 'node-event-field_event_date'. $field_instances['node-event-field_event_date'] = array( 'bundle' => 'event', 'deleted' => 0, @@ -146,7 +435,8 @@ function cambridge_events_field_default_field_instances() { 'multiple_from' => '', 'multiple_number' => '', 'multiple_to' => '', - 'show_repeat_rule' => 'show', + 'show_remaining_days' => 0, + 'show_repeat_rule' => 'hide', ), 'type' => 'date_default', 'weight' => 10, @@ -172,6 +462,7 @@ function cambridge_events_field_default_field_instances() { 'multiple_from' => '', 'multiple_number' => '', 'multiple_to' => '', + 'show_remaining_days' => FALSE, 'show_repeat_rule' => 'hide', ), 'type' => 'date_default', @@ -186,6 +477,7 @@ function cambridge_events_field_default_field_instances() { 'multiple_from' => '', 'multiple_number' => 1, 'multiple_to' => '', + 'show_remaining_days' => FALSE, 'show_repeat_rule' => 'hide', ), 'type' => 'date_default', @@ -222,11 +514,192 @@ function cambridge_events_field_default_field_instances() { 'year_range' => '-3:+3', ), 'type' => 'date_popup', - 'weight' => 15, + 'weight' => 4, + ), + ); + + // Exported field_instance: 'node-event-field_event_location'. + $field_instances['node-event-field_event_location'] = array( + 'bundle' => 'event', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'carousel_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'default' => array( + 'label' => 'above', + 'module' => 'text', + 'settings' => array(), + 'type' => 'text_default', + 'weight' => 16, + ), + 'focus_on_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'news_listing_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'sidebar_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'vertical_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'ds_extras_field_template' => '', + 'entity_type' => 'node', + 'field_name' => 'field_event_location', + 'label' => 'Event location', + 'required' => 0, + 'settings' => array( + 'better_formats' => array( + 'allowed_formats' => array( + 'filtered_html' => 'filtered_html', + 'full_html' => 'full_html', + 'plain_text' => 'plain_text', + ), + 'allowed_formats_toggle' => 0, + 'default_order_toggle' => 0, + 'default_order_wrapper' => array( + 'formats' => array( + 'filtered_html' => array( + 'weight' => -10, + ), + 'full_html' => array( + 'weight' => -9, + ), + 'plain_text' => array( + 'weight' => -8, + ), + ), + ), + ), + 'text_processing' => 0, + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'text', + 'settings' => array( + 'size' => 60, + ), + 'type' => 'text_textfield', + 'weight' => 5, + ), + ); + + // Exported field_instance: 'node-event-field_event_url'. + $field_instances['node-event-field_event_url'] = array( + 'bundle' => 'event', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'carousel_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'default' => array( + 'label' => 'above', + 'module' => 'link', + 'settings' => array(), + 'type' => 'link_default', + 'weight' => 14, + ), + 'focus_on_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'news_listing_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'sidebar_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'vertical_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'ds_extras_field_template' => '', + 'entity_type' => 'node', + 'field_name' => 'field_event_url', + 'label' => 'Event url', + 'required' => 0, + 'settings' => array( + 'absolute_url' => 1, + 'attributes' => array( + 'class' => '', + 'configurable_class' => 0, + 'configurable_title' => 0, + 'rel' => '', + 'target' => 'default', + 'title' => '', + ), + 'display' => array( + 'url_cutoff' => 80, + ), + 'enable_tokens' => 1, + 'rel_remove' => 'default', + 'title' => 'optional', + 'title_label_use_field_label' => 0, + 'title_maxlength' => 128, + 'title_value' => '', + 'url' => 0, + 'user_register_form' => FALSE, + 'validate_url' => 1, + ), + 'widget' => array( + 'active' => 0, + 'module' => 'link', + 'settings' => array(), + 'type' => 'link_field', + 'weight' => 8, ), ); - // Exported field_instance: 'node-event-field_image' + // Exported field_instance: 'node-event-field_image'. $field_instances['node-event-field_image'] = array( 'bundle' => 'event', 'deleted' => 0, @@ -299,6 +772,7 @@ function cambridge_events_field_default_field_instances() { 'weight' => -5, ), ), + 'ds_extras_field_template' => '', 'entity_type' => 'node', 'field_name' => 'field_image', 'label' => 'Image', @@ -309,7 +783,8 @@ function cambridge_events_field_default_field_instances() { 'file_directory' => '', 'file_extensions' => 'png gif jpg jpeg', 'imagecrop' => array( - 'carousel' => 'carousel', + 'carousel' => 0, + 'focus-on-153x137' => 0, 'inline' => 'inline', 'leading' => 'leading', 'sidebar_teaser' => 'sidebar_teaser', @@ -320,32 +795,114 @@ function cambridge_events_field_default_field_instances() { 'min_resolution' => '885x432', 'title_field' => 0, 'user_register_form' => FALSE, + 'wysiwyg_insert' => 0, ), 'widget' => array( 'active' => 1, 'module' => 'media', 'settings' => array( 'allowed_schemes' => array( + 'oembed' => 0, + 'private' => 0, 'public' => 'public', ), 'allowed_types' => array( 'audio' => 0, - 'default' => 0, + 'document' => 0, 'image' => 'image', 'video' => 0, ), - 'progress_indicator' => 'throbber', + 'browser_plugins' => array( + 'media_default--media_browser_1' => 'media_default--media_browser_1', + 'media_default--media_browser_my_files' => 'media_default--media_browser_my_files', + 'media_internet' => 0, + 'upload' => 'upload', + ), ), 'type' => 'media_generic', - 'weight' => 10, + 'weight' => 3, + ), + ); + + // Exported field_instance: 'node-event-field_subject_ref'. + $field_instances['node-event-field_subject_ref'] = array( + 'bundle' => 'event', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'carousel_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'default' => array( + 'label' => 'above', + 'module' => 'taxonomy', + 'settings' => array(), + 'type' => 'taxonomy_term_reference_link', + 'weight' => 15, + ), + 'focus_on_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'news_listing_item' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'sidebar_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'vertical_teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'ds_extras_field_template' => '', + 'entity_type' => 'node', + 'field_name' => 'field_subject_ref', + 'label' => 'Subject', + 'required' => 0, + 'settings' => array( + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'options', + 'settings' => array(), + 'type' => 'options_buttons', + 'weight' => 9, ), ); // Translatables // Included for use with string extractors like potx. t('Body'); + t('Contact email'); + t('Contact name'); + t('Contact phone'); t('Date'); + t('Event location'); + t('Event url'); t('Image'); + t('Subject'); return $field_instances; } diff --git a/cambridge_events.features.inc b/cambridge_events.features.inc old mode 100644 new mode 100755 index 7f24f68..2d944de --- a/cambridge_events.features.inc +++ b/cambridge_events.features.inc @@ -1,4 +1,5 @@ array( 'name' => t('Event'), 'base' => 'node_content', - 'description' => 'Use event to add events to your site.', + 'description' => t('Use event to add events to your site.'), 'has_title' => '1', 'title_label' => t('Title'), 'help' => '', diff --git a/cambridge_events.field_group.inc b/cambridge_events.field_group.inc new file mode 100755 index 0000000..2d6baea --- /dev/null +++ b/cambridge_events.field_group.inc @@ -0,0 +1,110 @@ +disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ + $field_group->api_version = 1; + $field_group->identifier = 'group_contact_details|node|event|form'; + $field_group->group_name = 'group_contact_details'; + $field_group->entity_type = 'node'; + $field_group->bundle = 'event'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Contact details', + 'weight' => '1', + 'children' => array( + 0 => 'field_contact_name', + 1 => 'field_contact_email', + 2 => 'field_contact_phone', + 3 => 'field_event_url', + ), + 'format_type' => 'tab', + 'format_settings' => array( + 'formatter' => 'closed', + 'instance_settings' => array( + 'description' => '', + 'classes' => 'group-contact-details field-group-tab', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_contact_details|node|event|form'] = $field_group; + + $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_content|node|event|form'; + $field_group->group_name = 'group_content'; + $field_group->entity_type = 'node'; + $field_group->bundle = 'event'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Content', + 'weight' => '0', + 'children' => array( + 0 => 'body', + 1 => 'field_event_date', + 2 => 'field_image', + 3 => 'field_event_location', + 4 => 'title', + ), + 'format_type' => 'tab', + 'format_settings' => array( + 'label' => 'Content', + 'instance_settings' => array( + 'required_fields' => 1, + 'classes' => 'group-content field-group-tab', + 'description' => '', + ), + 'formatter' => 'closed', + ), + ); + $field_groups['group_content|node|event|form'] = $field_group; + + $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_tags|node|event|form'; + $field_group->group_name = 'group_tags'; + $field_group->entity_type = 'node'; + $field_group->bundle = 'event'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Tags', + 'weight' => '2', + 'children' => array( + 0 => 'field_subject_ref', + ), + 'format_type' => 'tab', + 'format_settings' => array( + 'formatter' => 'closed', + 'instance_settings' => array( + 'description' => '', + 'classes' => 'group-tags field-group-tab', + 'required_fields' => 1, + ), + ), + ); + $field_groups['group_tags|node|event|form'] = $field_group; + + // Translatables + // Included for use with string extractors like potx. + t('Contact details'); + t('Content'); + t('Tags'); + + return $field_groups; +} diff --git a/cambridge_events.info b/cambridge_events.info old mode 100644 new mode 100755 index e06ac9a..8494f8f --- a/cambridge_events.info +++ b/cambridge_events.info @@ -2,7 +2,7 @@ name = Events description = Adds an event content type and views. core = 7.x package = University of Cambridge -version = 7.x-1.0-dev +version = 7.x-2.0 project = cambridge_events dependencies[] = body_field_definition dependencies[] = cambridge_image_styles @@ -12,6 +12,7 @@ dependencies[] = date_popup dependencies[] = date_repeat_field dependencies[] = fe_block dependencies[] = features +dependencies[] = field_group dependencies[] = image dependencies[] = media dependencies[] = smart_trim @@ -22,11 +23,28 @@ features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 features[fe_block_settings][] = views-events-block features[features_api][] = api:2 +features[field_base][] = field_contact_email +features[field_base][] = field_contact_name +features[field_base][] = field_contact_phone features[field_base][] = field_event_date +features[field_base][] = field_event_location +features[field_base][] = field_event_url +features[field_group][] = group_contact_details|node|event|form +features[field_group][] = group_content|node|event|form +features[field_group][] = group_tags|node|event|form features[field_instance][] = node-event-body +features[field_instance][] = node-event-field_contact_email +features[field_instance][] = node-event-field_contact_name +features[field_instance][] = node-event-field_contact_phone features[field_instance][] = node-event-field_event_date +features[field_instance][] = node-event-field_event_location +features[field_instance][] = node-event-field_event_url features[field_instance][] = node-event-field_image +features[field_instance][] = node-event-field_subject_ref features[node][] = event +features[variable][] = diff_enable_revisions_page_node_event +features[variable][] = diff_show_preview_changes_node_event +features[variable][] = diff_view_mode_preview_node_event features[variable][] = field_bundle_settings_node__event features[variable][] = menu_options_event features[variable][] = menu_parent_event @@ -35,3 +53,4 @@ features[variable][] = node_preview_event features[variable][] = node_submitted_event features[variable][] = pathauto_node_event_pattern features[views_view][] = events +features_exclude[dependencies][cambridge_staff] = cambridge_staff diff --git a/cambridge_events.install b/cambridge_events.install old mode 100644 new mode 100755 diff --git a/cambridge_events.module b/cambridge_events.module old mode 100644 new mode 100755 diff --git a/cambridge_events.strongarm.inc b/cambridge_events.strongarm.inc old mode 100644 new mode 100755 index e8a7928..0d2e86c --- a/cambridge_events.strongarm.inc +++ b/cambridge_events.strongarm.inc @@ -1,4 +1,5 @@ disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'diff_enable_revisions_page_node_event'; + $strongarm->value = 1; + $export['diff_enable_revisions_page_node_event'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'diff_show_preview_changes_node_event'; + $strongarm->value = 1; + $export['diff_show_preview_changes_node_event'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'diff_view_mode_preview_node_event'; + $strongarm->value = 'full'; + $export['diff_view_mode_preview_node_event'] = $strongarm; + $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; @@ -52,20 +74,23 @@ function cambridge_events_strongarm() { 'diff_standard' => array( 'custom_settings' => FALSE, ), + 'revision' => array( + 'custom_settings' => FALSE, + ), ), 'extra_fields' => array( 'form' => array( 'title' => array( - 'weight' => '-5', + 'weight' => '1', ), 'path' => array( - 'weight' => '21', + 'weight' => '4', ), 'redirect' => array( - 'weight' => '20', + 'weight' => '3', ), 'metatags' => array( - 'weight' => '22', + 'weight' => '5', ), ), 'display' => array(), diff --git a/cambridge_events.views_default.inc b/cambridge_events.views_default.inc old mode 100644 new mode 100755 index 4821c44..2d79f88 --- a/cambridge_events.views_default.inc +++ b/cambridge_events.views_default.inc @@ -1,4 +1,5 @@ display->display_options['fields']['title']['element_wrapper_type'] = 'div'; $handler->display->display_options['fields']['title']['element_wrapper_class'] = 'campl-highlight-event-details'; $handler->display->display_options['fields']['title']['element_default_classes'] = FALSE; - /* Sort criterion: Content: Date (field_event_date) */ + /* Sort criterion: Content: Date - start date (field_event_date) */ $handler->display->display_options['sorts']['field_event_date_value']['id'] = 'field_event_date_value'; $handler->display->display_options['sorts']['field_event_date_value']['table'] = 'field_data_field_event_date'; $handler->display->display_options['sorts']['field_event_date_value']['field'] = 'field_event_date_value'; @@ -115,12 +116,13 @@ function cambridge_events_views_default_views() { 'event' => 'event', ); $handler->display->display_options['filters']['type']['group'] = 1; - /* Filter criterion: Content: Date (field_event_date) */ + /* Filter criterion: Content: Date - start date (field_event_date) */ $handler->display->display_options['filters']['field_event_date_value']['id'] = 'field_event_date_value'; $handler->display->display_options['filters']['field_event_date_value']['table'] = 'field_data_field_event_date'; $handler->display->display_options['filters']['field_event_date_value']['field'] = 'field_event_date_value'; $handler->display->display_options['filters']['field_event_date_value']['operator'] = '>='; $handler->display->display_options['filters']['field_event_date_value']['group'] = 1; + $handler->display->display_options['filters']['field_event_date_value']['default_date'] = 'now'; /* Filter criterion: Content: Published */ $handler->display->display_options['filters']['status']['id'] = 'status'; $handler->display->display_options['filters']['status']['table'] = 'node'; @@ -221,6 +223,107 @@ function cambridge_events_views_default_views() { $handler->display->display_options['pager']['options']['offset'] = '0'; $handler->display->display_options['defaults']['empty'] = FALSE; $handler->display->display_options['block_description'] = 'Events'; + + /* Display: Past Events Page */ + $handler = $view->new_display('page', 'Past Events Page', 'page_2'); + $handler->display->display_options['defaults']['title'] = FALSE; + $handler->display->display_options['title'] = 'Past Events'; + $handler->display->display_options['defaults']['fields'] = FALSE; + /* Field: Day */ + $handler->display->display_options['fields']['field_event_date']['id'] = 'field_event_date'; + $handler->display->display_options['fields']['field_event_date']['table'] = 'field_data_field_event_date'; + $handler->display->display_options['fields']['field_event_date']['field'] = 'field_event_date'; + $handler->display->display_options['fields']['field_event_date']['ui_name'] = 'Day'; + $handler->display->display_options['fields']['field_event_date']['label'] = ''; + $handler->display->display_options['fields']['field_event_date']['exclude'] = TRUE; + $handler->display->display_options['fields']['field_event_date']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['field_event_date']['settings'] = array( + 'format_type' => 'cambridge_events_day_only', + 'fromto' => 'value', + 'multiple_number' => '', + 'multiple_from' => '', + 'multiple_to' => '', + 'show_repeat_rule' => 'hide', + ); + $handler->display->display_options['fields']['field_event_date']['group_rows'] = FALSE; + $handler->display->display_options['fields']['field_event_date']['delta_offset'] = '0'; + /* Field: Month */ + $handler->display->display_options['fields']['field_event_date_1']['id'] = 'field_event_date_1'; + $handler->display->display_options['fields']['field_event_date_1']['table'] = 'field_data_field_event_date'; + $handler->display->display_options['fields']['field_event_date_1']['field'] = 'field_event_date'; + $handler->display->display_options['fields']['field_event_date_1']['ui_name'] = 'Month'; + $handler->display->display_options['fields']['field_event_date_1']['label'] = ''; + $handler->display->display_options['fields']['field_event_date_1']['alter']['alter_text'] = TRUE; + $handler->display->display_options['fields']['field_event_date_1']['alter']['text'] = '[field_event_date][field_event_date_1]'; + $handler->display->display_options['fields']['field_event_date_1']['element_type'] = 'span'; + $handler->display->display_options['fields']['field_event_date_1']['element_class'] = 'campl-highlight-date'; + $handler->display->display_options['fields']['field_event_date_1']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['field_event_date_1']['element_wrapper_type'] = 'div'; + $handler->display->display_options['fields']['field_event_date_1']['element_wrapper_class'] = 'campl-highlight-date-container'; + $handler->display->display_options['fields']['field_event_date_1']['element_default_classes'] = FALSE; + $handler->display->display_options['fields']['field_event_date_1']['settings'] = array( + 'format_type' => 'cambridge_events_short_month_only', + 'fromto' => 'value', + 'multiple_number' => '', + 'multiple_from' => '', + 'multiple_to' => '', + 'show_repeat_rule' => 'hide', + ); + $handler->display->display_options['fields']['field_event_date_1']['group_rows'] = FALSE; + $handler->display->display_options['fields']['field_event_date_1']['delta_offset'] = '0'; + /* Field: Content: Title */ + $handler->display->display_options['fields']['title']['id'] = 'title'; + $handler->display->display_options['fields']['title']['table'] = 'node'; + $handler->display->display_options['fields']['title']['field'] = 'title'; + $handler->display->display_options['fields']['title']['label'] = ''; + $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE; + $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE; + $handler->display->display_options['fields']['title']['element_type'] = 'span'; + $handler->display->display_options['fields']['title']['element_class'] = 'campl-highlight-event-link'; + $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['title']['element_wrapper_type'] = 'div'; + $handler->display->display_options['fields']['title']['element_wrapper_class'] = 'campl-highlight-event-details'; + $handler->display->display_options['fields']['title']['element_default_classes'] = FALSE; + /* 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'; + $handler->display->display_options['fields']['body']['label'] = ''; + $handler->display->display_options['fields']['body']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['body']['type'] = 'text_summary_or_trimmed'; + $handler->display->display_options['fields']['body']['settings'] = array( + 'trim_length' => '350', + ); + $handler->display->display_options['defaults']['filter_groups'] = FALSE; + $handler->display->display_options['defaults']['filters'] = FALSE; + /* Filter criterion: Content: Type */ + $handler->display->display_options['filters']['type']['id'] = 'type'; + $handler->display->display_options['filters']['type']['table'] = 'node'; + $handler->display->display_options['filters']['type']['field'] = 'type'; + $handler->display->display_options['filters']['type']['value'] = array( + 'event' => 'event', + ); + $handler->display->display_options['filters']['type']['group'] = 1; + /* Filter criterion: Content: Date - start date (field_event_date) */ + $handler->display->display_options['filters']['field_event_date_value']['id'] = 'field_event_date_value'; + $handler->display->display_options['filters']['field_event_date_value']['table'] = 'field_data_field_event_date'; + $handler->display->display_options['filters']['field_event_date_value']['field'] = 'field_event_date_value'; + $handler->display->display_options['filters']['field_event_date_value']['operator'] = '<'; + $handler->display->display_options['filters']['field_event_date_value']['group'] = 1; + $handler->display->display_options['filters']['field_event_date_value']['default_date'] = 'now'; + /* Filter criterion: Content: Published */ + $handler->display->display_options['filters']['status']['id'] = 'status'; + $handler->display->display_options['filters']['status']['table'] = 'node'; + $handler->display->display_options['filters']['status']['field'] = 'status'; + $handler->display->display_options['filters']['status']['value'] = '1'; + $handler->display->display_options['filters']['status']['group'] = 1; + $handler->display->display_options['path'] = 'events/past-events'; + $handler->display->display_options['menu']['type'] = 'normal'; + $handler->display->display_options['menu']['title'] = 'Past Events'; + $handler->display->display_options['menu']['weight'] = '0'; + $handler->display->display_options['menu']['name'] = 'main-menu'; + $handler->display->display_options['menu']['context'] = 0; + $handler->display->display_options['menu']['context_only_inline'] = 0; $export['events'] = $view; return $export;