diff --git a/features/ns_article/ns_article.features.field.inc b/features/ns_article/ns_article.features.field.inc index c2fd7ce..59053ab 100644 --- a/features/ns_article/ns_article.features.field.inc +++ b/features/ns_article/ns_article.features.field.inc @@ -97,36 +97,26 @@ function ns_article_defaultconfig_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_ns_article_byline', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'ns_article' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 'ns_contributor', - 'ns_fact' => 0, - 'poll' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_contributor' => 'ns_contributor', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_article', @@ -136,17 +126,21 @@ function ns_article_defaultconfig_field_default_fields() { 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '4', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, ), 'search_index' => array( - 'label' => 'hidden', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '9', + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, ), 'search_result' => array( 'label' => 'hidden', @@ -175,17 +169,16 @@ function ns_article_defaultconfig_field_default_fields() { ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 1, 'references_dialog_edit' => 1, 'references_dialog_search' => 1, - 'references_dialog_search_view' => 'ns_article_reference_search:references_dialog_1', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', + 'type' => 'entityreference_autocomplete', 'weight' => '4', ), ), @@ -463,62 +456,56 @@ function ns_article_defaultconfig_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_ns_article_related', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', - ), + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', + ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'ns_article' => 'ns_article', - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 0, - 'ns_fact' => 0, - 'poll' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_article' => 'ns_article', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_article', 'default_value' => NULL, 'deleted' => '0', - 'description' => 'Any articles entered here will appear in a sidebar list when viewing the current article.', + 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '3', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, ), 'search_index' => array( - 'label' => 'hidden', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '7', + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, ), 'search_result' => array( 'label' => 'hidden', 'settings' => array(), 'type' => 'hidden', - 'weight' => '9', + 'weight' => '8', ), 'teaser' => array( 'label' => 'above', @@ -529,7 +516,7 @@ function ns_article_defaultconfig_field_default_fields() { ), 'entity_type' => 'node', 'field_name' => 'field_ns_article_related', - 'label' => 'Related Articles', + 'label' => 'Related articles', 'required' => 0, 'settings' => array( 'crossclone' => array( @@ -541,18 +528,17 @@ function ns_article_defaultconfig_field_default_fields() { ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 1, 'references_dialog_edit' => 1, 'references_dialog_search' => 1, - 'references_dialog_search_view' => 'ns_article_reference_search:references_dialog_1', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', - 'weight' => '7', + 'type' => 'entityreference_autocomplete', + 'weight' => '4', ), ), ); diff --git a/features/ns_article/ns_article.info b/features/ns_article/ns_article.info index 2ddc349..ec5aac9 100644 --- a/features/ns_article/ns_article.info +++ b/features/ns_article/ns_article.info @@ -2,10 +2,10 @@ core = "7.x" dependencies[] = "features" dependencies[] = "field_group" dependencies[] = "file" +dependencies[] = "entityreference" dependencies[] = "image" dependencies[] = "list" dependencies[] = "media" -dependencies[] = "node_reference" dependencies[] = "ns_contributor" dependencies[] = "ns_core" dependencies[] = "ns_media" diff --git a/features/ns_article/ns_article.install b/features/ns_article/ns_article.install index 7e545da..241ed58 100644 --- a/features/ns_article/ns_article.install +++ b/features/ns_article/ns_article.install @@ -21,3 +21,11 @@ function ns_article_update_7201() { ns_core_update_media_instance('node', 'ns_article', 'field_ns_article_media'); } +/** + * Migrate the byline and related article fields into entity reference fields. + */ +function ns_article_update_7202() { + module_load_include('install', 'ns_core'); + ns_core_migrate_references_field('field_ns_article_byline'); + ns_core_migrate_references_field('field_ns_article_related'); +} \ No newline at end of file diff --git a/features/ns_blog/ns_blog.features.field.inc b/features/ns_blog/ns_blog.features.field.inc index be8fd23..1643d21 100644 --- a/features/ns_blog/ns_blog.features.field.inc +++ b/features/ns_blog/ns_blog.features.field.inc @@ -18,44 +18,26 @@ function ns_blog_defaultconfig_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_ns_blog_blogger', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'form' => 0, - 'ns_ad' => 0, - 'ns_article' => 0, - 'ns_blog' => 0, - 'ns_blog_post' => 0, - 'ns_ch_rss_promo' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 'ns_contributor', - 'ns_fact' => 0, - 'ns_footer_content' => 0, - 'ns_page' => 0, - 'poll' => 0, - 'webform' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_contributor' => 'ns_contributor', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), 'translatable' => '0', - 'type' => 'node_reference', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_blog', @@ -64,24 +46,25 @@ function ns_blog_defaultconfig_field_default_fields() { 'description' => '', 'display' => array( 'default' => array( - 'label' => 'hidden', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '3', + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 3, ), 'search_index' => array( - 'label' => 'hidden', - 'module' => 'node_reference', + 'label' => 'above', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '3', + 'type' => 'hidden', + 'weight' => 0, ), 'search_result' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '2', + 'weight' => 0, ), 'teaser' => array( 'label' => 'above', @@ -104,17 +87,17 @@ function ns_blog_defaultconfig_field_default_fields() { ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 1, 'references_dialog_edit' => 1, 'references_dialog_search' => 1, 'references_dialog_search_view' => '', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', + 'type' => 'entityreference_autocomplete', 'weight' => '4', ), ), @@ -381,38 +364,26 @@ function ns_blog_defaultconfig_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_ns_blog_post_blog', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'ns_article' => 0, - 'ns_blog' => 'ns_blog', - 'ns_blog_post' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 0, - 'ns_fact' => 0, - 'poll' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_blog' => 'ns_blog', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), 'translatable' => '0', - 'type' => 'node_reference', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_blog_post', @@ -422,24 +393,24 @@ function ns_blog_defaultconfig_field_default_fields() { 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '0', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 4, ), 'search_index' => array( - 'label' => 'hidden', - 'module' => 'node_reference', + 'label' => 'above', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '0', + 'type' => 'hidden', + 'weight' => 0, ), 'search_result' => array( - 'label' => 'hidden', - 'module' => 'node_reference', + 'label' => 'above', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '0', + 'type' => 'hidden', + 'weight' => 0, ), 'teaser' => array( 'label' => 'above', @@ -454,96 +425,85 @@ function ns_blog_defaultconfig_field_default_fields() { 'required' => 0, 'settings' => array( 'crossclone' => array( - 'couple_setting' => 0, + 'couple_setting' => '0', 'coupling' => 0, - 'delete_setting' => 0, + 'delete_setting' => '0', ), 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 0, 'references_dialog_edit' => 0, 'references_dialog_search' => 1, 'references_dialog_search_view' => '', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', + 'type' => 'entityreference_autocomplete', 'weight' => '1', ), ), ); - // Exported field: 'node-ns_blog_post-field_ns_blog_post_blogger' - $fields['node-ns_blog_post-field_ns_blog_post_blogger'] = array( + // Exported field: 'node-ns_blog-field_ns_blog_blogger' + $fields['node-ns_blog-field_ns_blog_blogger'] = array( 'field_config' => array( 'active' => '1', 'cardinality' => '-1', 'deleted' => '0', 'entity_types' => array(), - 'field_name' => 'field_ns_blog_post_blogger', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'field_name' => 'field_ns_blog_blogger', + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'ns_article' => 0, - 'ns_blog' => 0, - 'ns_blog_post' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 'ns_contributor', - 'ns_fact' => 0, - 'poll' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_contributor' => 'ns_contributor', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), 'translatable' => '0', - 'type' => 'node_reference', + 'type' => 'entityreference', ), 'field_instance' => array( - 'bundle' => 'ns_blog_post', + 'bundle' => 'ns_blog', 'default_value' => NULL, 'deleted' => '0', 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '1', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 3, ), 'search_index' => array( - 'label' => 'hidden', - 'module' => 'node_reference', + 'label' => 'above', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '3', + 'type' => 'hidden', + 'weight' => 0, ), 'search_result' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '3', + 'weight' => 0, ), 'teaser' => array( 'label' => 'above', @@ -553,30 +513,30 @@ function ns_blog_defaultconfig_field_default_fields() { ), ), 'entity_type' => 'node', - 'field_name' => 'field_ns_blog_post_blogger', + 'field_name' => 'field_ns_blog_blogger', 'label' => 'Bloggers', 'required' => 0, 'settings' => array( 'crossclone' => array( - 'couple_setting' => 0, + 'couple_setting' => '0', 'coupling' => 0, - 'delete_setting' => 0, + 'delete_setting' => '0', ), 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 1, 'references_dialog_edit' => 1, 'references_dialog_search' => 1, 'references_dialog_search_view' => '', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', + 'type' => 'entityreference_autocomplete', 'weight' => '2', ), ), diff --git a/features/ns_blog/ns_blog.info b/features/ns_blog/ns_blog.info index d5fbc78..8302457 100644 --- a/features/ns_blog/ns_blog.info +++ b/features/ns_blog/ns_blog.info @@ -5,12 +5,12 @@ dependencies[] = "file_entity" dependencies[] = "image" dependencies[] = "list" dependencies[] = "media" -dependencies[] = "node_reference" dependencies[] = "ns_contributor" dependencies[] = "ns_core" dependencies[] = "ns_media" dependencies[] = "number" dependencies[] = "options" +dependencies[] = "entityreference" dependencies[] = "references_dialog" dependencies[] = "strongarm" dependencies[] = "views" diff --git a/features/ns_blog/ns_blog.install b/features/ns_blog/ns_blog.install index 2ca46bf..fcb14f4 100644 --- a/features/ns_blog/ns_blog.install +++ b/features/ns_blog/ns_blog.install @@ -13,10 +13,19 @@ function ns_blog_install() { } /** -* Change media field into a file field. -*/ + * Change media field into a file field. + */ function ns_blog_update_7201() { module_load_include('install', 'ns_core'); ns_core_change_media_field('field_ns_blog_post_media'); ns_core_update_media_instance('node', 'ns_blog_post', 'field_ns_blog_post_media'); } + +/** + * Migrate the blogger and blog post fields into entity reference fields. + */ +function ns_blog_update_7202() { + module_load_include('install', 'ns_core'); + ns_core_migrate_references_field('field_ns_blog_blogger'); + ns_core_migrate_references_field('field_ns_blog_post_blog'); +} diff --git a/features/ns_ch_blog/ns_ch_blog.info b/features/ns_ch_blog/ns_ch_blog.info index c463eb0..b32be9a 100644 --- a/features/ns_ch_blog/ns_ch_blog.info +++ b/features/ns_ch_blog/ns_ch_blog.info @@ -22,9 +22,9 @@ features[page_manager_handlers][] = "ns_ch_blog_blog_post" features[page_manager_handlers][] = "ns_ch_blog_site_template" features[page_manager_pages][] = "ns_ch_blog_blog" features[panels_mini][] = "ns_blog_post_blog" +features[panels_mini][] = "ns_ch_blog_contributor" features[rules_config][] = "rules_ns_ch_blog_clear_blog" features[views_view][] = "ns_ch_blog_blog" -features[views_view][] = "ns_ch_blog_contributor" features[views_view][] = "ns_ch_blog_post" features[views_view][] = "ns_ch_blog_post_contributor" features[views_view][] = "ns_ch_blog_post_latest" diff --git a/features/ns_ch_blog/ns_ch_blog.pages_default.inc b/features/ns_ch_blog/ns_ch_blog.pages_default.inc index b7a47ab..b714d55 100644 --- a/features/ns_ch_blog/ns_ch_blog.pages_default.inc +++ b/features/ns_ch_blog/ns_ch_blog.pages_default.inc @@ -64,28 +64,28 @@ function ns_ch_blog_default_page_manager_handlers() { $pane = new stdClass; $pane->pid = 'new-1'; $pane->panel = 'aside_alpha'; - $pane->type = 'views_panes'; - $pane->subtype = 'ns_ch_blog_contributor-panel_pane_1'; + $pane->type = 'entity_field'; + $pane->subtype = 'node:field_ns_blog_blogger'; $pane->shown = TRUE; $pane->access = array(); $pane->configuration = array( - 'override_title' => 1, - 'override_title_text' => '', - ); - $pane->cache = array( - 'method' => 'rules', - 'settings' => array( - 'granularity' => 'context', - 'language' => 1, - 'cache_key' => 'panel_context:node_view:ns_ch_blog_blog', + 'label' => 'hidden', + 'formatter' => 'panels_ref_ref_formatter_mini', + 'formatter_settings' => array( + 'mini_panel' => 'ns_ch_blog_contributor', ), + 'context' => 'argument_entity_id:node_1', + 'override_title' => 0, + 'override_title_text' => '', ); + $pane->cache = array(); $pane->style = array( 'settings' => NULL, ); $pane->css = array(); $pane->extras = array(); $pane->position = 0; + $pane->locks = array(); $display->content['new-1'] = $pane; $display->panels['aside_alpha'][0] = 'new-1'; $pane = new stdClass; @@ -109,6 +109,7 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; + $pane->locks = ''; $display->content['new-2'] = $pane; $display->panels['header_beta'][0] = 'new-2'; $pane = new stdClass; @@ -136,6 +137,7 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; + $pane->locks = ''; $display->content['new-3'] = $pane; $display->panels['header_beta'][1] = 'new-3'; $pane = new stdClass; @@ -160,6 +162,7 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; + $pane->locks = ''; $display->content['new-4'] = $pane; $display->panels['header_beta'][2] = 'new-4'; $pane = new stdClass; @@ -188,6 +191,7 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; + $pane->locks = ''; $display->content['new-5'] = $pane; $display->panels['main'][0] = 'new-5'; $display->hide_title = PANELS_TITLE_FIXED; @@ -212,9 +216,9 @@ function ns_ch_blog_default_page_manager_handlers() { 'contexts' => array(), 'relationships' => array( 0 => array( - 'identifier' => 'Blog', - 'keyword' => 'blog', - 'name' => 'entity_from_field:field_ns_blog_post_blog-node-node', + 'identifier' => 'Node from Node (on Node: Blog)', + 'keyword' => 'node_2', + 'name' => 'entity_from_entityreference_field:field_ns_blog_post_blog:node:node', 'context' => 'argument_entity_id:node_1', 'id' => 1, ), @@ -255,7 +259,7 @@ function ns_ch_blog_default_page_manager_handlers() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-6'; $pane->panel = 'aside_alpha'; $pane->type = 'panels_mini'; $pane->subtype = 'ns_blog_post_blog'; @@ -263,7 +267,7 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->access = array(); $pane->configuration = array( 'context' => array( - 0 => 'relationship_entity_from_field:field_ns_blog_post_blog-node-node_1', + 0 => 'relationship_entity_from_entityreference_field:field_ns_blog_post_blog:node:node_1', ), 'override_title' => 0, 'override_title_text' => '', @@ -282,20 +286,24 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['aside_alpha'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-6'] = $pane; + $display->panels['aside_alpha'][0] = 'new-6'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-7'; $pane->panel = 'aside_alpha'; - $pane->type = 'views_panes'; - $pane->subtype = 'ns_ch_blog_post_contributor-panel_pane_1'; + $pane->type = 'entity_field'; + $pane->subtype = 'node:field_ns_blog_blogger'; $pane->shown = TRUE; $pane->access = array(); $pane->configuration = array( - 'context' => array( - 0 => 'argument_entity_id:node_1', + 'label' => 'hidden', + 'formatter' => 'panels_ref_ref_formatter_mini', + 'formatter_settings' => array( + 'mini_panel' => 'ns_ch_blog_contributor', ), - 'override_title' => 1, + 'context' => 'relationship_entity_from_entityreference_field:field_ns_blog_post_blog:node:node_1', + 'override_title' => 0, 'override_title_text' => '', ); $pane->cache = array(); @@ -305,10 +313,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-2'] = $pane; - $display->panels['aside_alpha'][1] = 'new-2'; + $pane->locks = array(); + $display->content['new-7'] = $pane; + $display->panels['aside_alpha'][1] = 'new-7'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-8'; $pane->panel = 'main'; $pane->type = 'node_date_custom'; $pane->subtype = 'node_date_custom'; @@ -330,10 +339,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-3'] = $pane; - $display->panels['main'][0] = 'new-3'; + $pane->locks = ''; + $display->content['new-8'] = $pane; + $display->panels['main'][0] = 'new-8'; $pane = new stdClass; - $pane->pid = 'new-4'; + $pane->pid = 'new-9'; $pane->panel = 'main'; $pane->type = 'node_date_custom'; $pane->subtype = 'node_date_custom'; @@ -355,10 +365,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-4'] = $pane; - $display->panels['main'][1] = 'new-4'; + $pane->locks = ''; + $display->content['new-9'] = $pane; + $display->panels['main'][1] = 'new-9'; $pane = new stdClass; - $pane->pid = 'new-5'; + $pane->pid = 'new-10'; $pane->panel = 'main'; $pane->type = 'page_title'; $pane->subtype = 'page_title'; @@ -378,10 +389,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-5'] = $pane; - $display->panels['main'][2] = 'new-5'; + $pane->locks = ''; + $display->content['new-10'] = $pane; + $display->panels['main'][2] = 'new-10'; $pane = new stdClass; - $pane->pid = 'new-6'; + $pane->pid = 'new-11'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_blog_post_media'; @@ -404,10 +416,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 3; - $display->content['new-6'] = $pane; - $display->panels['main'][3] = 'new-6'; + $pane->locks = ''; + $display->content['new-11'] = $pane; + $display->panels['main'][3] = 'new-11'; $pane = new stdClass; - $pane->pid = 'new-7'; + $pane->pid = 'new-12'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_blog_post_body'; @@ -428,10 +441,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 4; - $display->content['new-7'] = $pane; - $display->panels['main'][4] = 'new-7'; + $pane->locks = ''; + $display->content['new-12'] = $pane; + $display->panels['main'][4] = 'new-12'; $pane = new stdClass; - $pane->pid = 'new-8'; + $pane->pid = 'new-13'; $pane->panel = 'main'; $pane->type = 'node_comment_form'; $pane->subtype = 'node_comment_form'; @@ -450,10 +464,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 5; - $display->content['new-8'] = $pane; - $display->panels['main'][5] = 'new-8'; + $pane->locks = ''; + $display->content['new-13'] = $pane; + $display->panels['main'][5] = 'new-13'; $pane = new stdClass; - $pane->pid = 'new-9'; + $pane->pid = 'new-14'; $pane->panel = 'main'; $pane->type = 'node_comments'; $pane->subtype = 'node_comments'; @@ -476,8 +491,9 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 6; - $display->content['new-9'] = $pane; - $display->panels['main'][6] = 'new-9'; + $pane->locks = ''; + $display->content['new-14'] = $pane; + $display->panels['main'][6] = 'new-14'; $display->hide_title = PANELS_TITLE_FIXED; $display->title_pane = '0'; $handler->conf['display'] = $display; @@ -517,7 +533,7 @@ function ns_ch_blog_default_page_manager_handlers() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-15'; $pane->panel = 'branding'; $pane->type = 'block'; $pane->subtype = 'locale-language'; @@ -547,10 +563,11 @@ function ns_ch_blog_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['branding'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-15'] = $pane; + $display->panels['branding'][0] = 'new-15'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-16'; $pane->panel = 'branding'; $pane->type = 'pane_header'; $pane->subtype = 'pane_header'; @@ -571,10 +588,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-2'] = $pane; - $display->panels['branding'][1] = 'new-2'; + $pane->locks = ''; + $display->content['new-16'] = $pane; + $display->panels['branding'][1] = 'new-16'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-17'; $pane->panel = 'branding'; $pane->type = 'today_date'; $pane->subtype = 'today_date'; @@ -599,10 +617,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-3'] = $pane; - $display->panels['branding'][2] = 'new-3'; + $pane->locks = ''; + $display->content['new-17'] = $pane; + $display->panels['branding'][2] = 'new-17'; $pane = new stdClass; - $pane->pid = 'new-4'; + $pane->pid = 'new-18'; $pane->panel = 'branding'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_blog_post_latest_header-panel_pane_1'; @@ -636,10 +655,11 @@ function ns_ch_blog_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 3; - $display->content['new-4'] = $pane; - $display->panels['branding'][3] = 'new-4'; + $pane->locks = ''; + $display->content['new-18'] = $pane; + $display->panels['branding'][3] = 'new-18'; $pane = new stdClass; - $pane->pid = 'new-5'; + $pane->pid = 'new-19'; $pane->panel = 'branding'; $pane->type = 'block'; $pane->subtype = 'search-form'; @@ -659,10 +679,11 @@ function ns_ch_blog_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 4; - $display->content['new-5'] = $pane; - $display->panels['branding'][4] = 'new-5'; + $pane->locks = ''; + $display->content['new-19'] = $pane; + $display->panels['branding'][4] = 'new-19'; $pane = new stdClass; - $pane->pid = 'new-6'; + $pane->pid = 'new-20'; $pane->panel = 'footer'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_rss_topic_footer-panel_pane_1'; @@ -686,10 +707,11 @@ function ns_ch_blog_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 0; - $display->content['new-6'] = $pane; - $display->panels['footer'][0] = 'new-6'; + $pane->locks = ''; + $display->content['new-20'] = $pane; + $display->panels['footer'][0] = 'new-20'; $pane = new stdClass; - $pane->pid = 'new-7'; + $pane->pid = 'new-21'; $pane->panel = 'footer'; $pane->type = 'views_panes'; $pane->subtype = 'ns_footer_content-panel_pane_1'; @@ -715,10 +737,11 @@ function ns_ch_blog_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 1; - $display->content['new-7'] = $pane; - $display->panels['footer'][1] = 'new-7'; + $pane->locks = ''; + $display->content['new-21'] = $pane; + $display->panels['footer'][1] = 'new-21'; $pane = new stdClass; - $pane->pid = 'new-8'; + $pane->pid = 'new-22'; $pane->panel = 'main'; $pane->type = 'page_messages'; $pane->subtype = 'page_messages'; @@ -732,10 +755,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-8'] = $pane; - $display->panels['main'][0] = 'new-8'; + $pane->locks = ''; + $display->content['new-22'] = $pane; + $display->panels['main'][0] = 'new-22'; $pane = new stdClass; - $pane->pid = 'new-9'; + $pane->pid = 'new-23'; $pane->panel = 'main'; $pane->type = 'pane_messages'; $pane->subtype = 'pane_messages'; @@ -749,10 +773,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-9'] = $pane; - $display->panels['main'][1] = 'new-9'; + $pane->locks = ''; + $display->content['new-23'] = $pane; + $display->panels['main'][1] = 'new-23'; $pane = new stdClass; - $pane->pid = 'new-10'; + $pane->pid = 'new-24'; $pane->panel = 'main'; $pane->type = 'page_tabs'; $pane->subtype = 'page_tabs'; @@ -774,10 +799,11 @@ function ns_ch_blog_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-10'] = $pane; - $display->panels['main'][2] = 'new-10'; + $pane->locks = ''; + $display->content['new-24'] = $pane; + $display->panels['main'][2] = 'new-24'; $pane = new stdClass; - $pane->pid = 'new-11'; + $pane->pid = 'new-25'; $pane->panel = 'main'; $pane->type = 'page_content'; $pane->subtype = 'page_content'; @@ -809,10 +835,11 @@ function ns_ch_blog_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 3; - $display->content['new-11'] = $pane; - $display->panels['main'][3] = 'new-11'; + $pane->locks = ''; + $display->content['new-25'] = $pane; + $display->panels['main'][3] = 'new-25'; $pane = new stdClass; - $pane->pid = 'new-12'; + $pane->pid = 'new-26'; $pane->panel = 'main'; $pane->type = 'page_content'; $pane->subtype = 'page_content'; @@ -844,10 +871,11 @@ function ns_ch_blog_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 4; - $display->content['new-12'] = $pane; - $display->panels['main'][4] = 'new-12'; + $pane->locks = ''; + $display->content['new-26'] = $pane; + $display->panels['main'][4] = 'new-26'; $pane = new stdClass; - $pane->pid = 'new-13'; + $pane->pid = 'new-27'; $pane->panel = 'nav'; $pane->type = 'menu_tree'; $pane->subtype = 'main-menu'; @@ -879,10 +907,11 @@ function ns_ch_blog_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 0; - $display->content['new-13'] = $pane; - $display->panels['nav'][0] = 'new-13'; + $pane->locks = ''; + $display->content['new-27'] = $pane; + $display->panels['nav'][0] = 'new-27'; $pane = new stdClass; - $pane->pid = 'new-14'; + $pane->pid = 'new-28'; $pane->panel = 'nav'; $pane->type = 'menu_tree'; $pane->subtype = 'main-menu'; @@ -914,10 +943,11 @@ function ns_ch_blog_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 1; - $display->content['new-14'] = $pane; - $display->panels['nav'][1] = 'new-14'; + $pane->locks = ''; + $display->content['new-28'] = $pane; + $display->panels['nav'][1] = 'new-28'; $display->hide_title = PANELS_TITLE_FIXED; - $display->title_pane = 'new-2'; + $display->title_pane = 'new-16'; $handler->conf['display'] = $display; $export['ns_ch_blog_site_template'] = $handler; @@ -991,7 +1021,7 @@ function ns_ch_blog_default_page_manager_pages() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-29'; $pane->panel = 'footer_alpha'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_blog_post_latest-panel_pane_1'; @@ -1016,10 +1046,11 @@ function ns_ch_blog_default_page_manager_pages() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['footer_alpha'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-29'] = $pane; + $display->panels['footer_alpha'][0] = 'new-29'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-30'; $pane->panel = 'main'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_blog_blog-panel_pane_1'; @@ -1039,10 +1070,11 @@ function ns_ch_blog_default_page_manager_pages() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-2'] = $pane; - $display->panels['main'][0] = 'new-2'; + $pane->locks = ''; + $display->content['new-30'] = $pane; + $display->panels['main'][0] = 'new-30'; $display->hide_title = PANELS_TITLE_FIXED; - $display->title_pane = 'new-2'; + $display->title_pane = 'new-30'; $handler->conf['display'] = $display; $page->default_handlers[$handler->name] = $handler; $pages['ns_ch_blog_blog'] = $page; diff --git a/features/ns_ch_blog/ns_ch_blog.panels_default.inc b/features/ns_ch_blog/ns_ch_blog.panels_default.inc index b708d07..ec18537 100644 --- a/features/ns_ch_blog/ns_ch_blog.panels_default.inc +++ b/features/ns_ch_blog/ns_ch_blog.panels_default.inc @@ -41,7 +41,7 @@ function ns_ch_blog_default_panels_mini() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-31'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_blog_image'; @@ -65,10 +65,11 @@ function ns_ch_blog_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['main'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-31'] = $pane; + $display->panels['main'][0] = 'new-31'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-32'; $pane->panel = 'main'; $pane->type = 'node_title'; $pane->subtype = 'node_title'; @@ -87,10 +88,11 @@ function ns_ch_blog_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-2'] = $pane; - $display->panels['main'][1] = 'new-2'; + $pane->locks = ''; + $display->content['new-32'] = $pane; + $display->panels['main'][1] = 'new-32'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-33'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_blog_description_short'; @@ -111,12 +113,152 @@ function ns_ch_blog_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-3'] = $pane; - $display->panels['main'][2] = 'new-3'; + $pane->locks = ''; + $display->content['new-33'] = $pane; + $display->panels['main'][2] = 'new-33'; $display->hide_title = PANELS_TITLE_NONE; - $display->title_pane = 'new-2'; + $display->title_pane = 'new-32'; $mini->display = $display; $export['ns_blog_post_blog'] = $mini; + $mini = new stdClass; + $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */ + $mini->api_version = 1; + $mini->name = 'ns_ch_blog_contributor'; + $mini->category = ''; + $mini->admin_title = 'Blog contributor'; + $mini->admin_description = 'Show a blog contributor.'; + $mini->requiredcontexts = array( + 0 => array( + 'identifier' => 'Node', + 'keyword' => 'node', + 'name' => 'entity:node', + 'id' => 1, + ), + ); + $mini->contexts = array(); + $mini->relationships = array(); + $display = new panels_display; + $display->layout = 'ns_core_naked'; + $display->layout_settings = array(); + $display->panel_settings = array( + 'style_settings' => array( + 'default' => NULL, + 'main' => NULL, + ), + ); + $display->cache = array(); + $display->title = ''; + $display->content = array(); + $display->panels = array(); + $pane = new stdClass; + $pane->pid = 'new-34'; + $pane->panel = 'main'; + $pane->type = 'entity_field'; + $pane->subtype = 'node:field_ns_contributor_photo'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'label' => 'hidden', + 'formatter' => 'image', + 'formatter_settings' => array( + 'image_style' => 'grid-6', + 'image_link' => '', + ), + 'context' => 'requiredcontext_entity:node_1', + 'override_title' => 0, + 'override_title_text' => '', + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + 'style' => 'naked', + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 0; + $pane->locks = array(); + $display->content['new-34'] = $pane; + $display->panels['main'][0] = 'new-34'; + $pane = new stdClass; + $pane->pid = 'new-35'; + $pane->panel = 'main'; + $pane->type = 'node_title'; + $pane->subtype = 'node_title'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'link' => 0, + 'context' => 'requiredcontext_entity:node_1', + 'override_title' => 1, + 'override_title_text' => '', + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + 'style' => 'default', + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 1; + $pane->locks = array(); + $display->content['new-35'] = $pane; + $display->panels['main'][1] = 'new-35'; + $pane = new stdClass; + $pane->pid = 'new-36'; + $pane->panel = 'main'; + $pane->type = 'custom'; + $pane->subtype = 'custom'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'admin_title' => '', + 'title' => '', + 'body' => '
%node:field-ns-contributor-email
', + 'format' => 'full_html', + 'substitute' => 1, + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + 'style' => 'naked', + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 2; + $pane->locks = array(); + $display->content['new-36'] = $pane; + $display->panels['main'][2] = 'new-36'; + $pane = new stdClass; + $pane->pid = 'new-37'; + $pane->panel = 'main'; + $pane->type = 'entity_field'; + $pane->subtype = 'node:field_ns_contributor_about'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'label' => 'hidden', + 'formatter' => 'text_default', + 'formatter_settings' => array(), + 'context' => 'requiredcontext_entity:node_1', + 'override_title' => 1, + 'override_title_text' => '', + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + 'style' => 'naked', + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 3; + $pane->locks = array(); + $display->content['new-37'] = $pane; + $display->panels['main'][3] = 'new-37'; + $display->hide_title = PANELS_TITLE_FIXED; + $display->title_pane = 'new-34'; + $mini->display = $display; + $export['ns_ch_blog_contributor'] = $mini; + return $export; } diff --git a/features/ns_ch_blog/ns_ch_blog.views_default.inc b/features/ns_ch_blog/ns_ch_blog.views_default.inc index bd21568..9b58c24 100644 --- a/features/ns_ch_blog/ns_ch_blog.views_default.inc +++ b/features/ns_ch_blog/ns_ch_blog.views_default.inc @@ -195,228 +195,6 @@ function ns_ch_blog_views_default_views() { $export['ns_ch_blog_blog'] = $view; $view = new view; - $view->name = 'ns_ch_blog_contributor'; - $view->description = ''; - $view->tag = 'default'; - $view->base_table = 'node'; - $view->human_name = 'ns_ch_blog_contributor'; - $view->core = 7; - $view->api_version = '3.0'; - $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */ - - /* Display: Master */ - $handler = $view->new_display('default', 'Master', 'default'); - $handler->display->display_options['title'] = 'Bloggers'; - $handler->display->display_options['access']['type'] = 'perm'; - $handler->display->display_options['cache']['type'] = 'none'; - $handler->display->display_options['query']['type'] = 'views_query'; - $handler->display->display_options['query']['options']['query_comment'] = FALSE; - $handler->display->display_options['exposed_form']['type'] = 'basic'; - $handler->display->display_options['pager']['type'] = 'full'; - $handler->display->display_options['style_plugin'] = 'default'; - $handler->display->display_options['style_options']['row_class'] = 'blog-contributor'; - $handler->display->display_options['row_plugin'] = 'fields'; - $handler->display->display_options['row_options']['hide_empty'] = 0; - $handler->display->display_options['row_options']['default_field_elements'] = 0; - /* Relationship: Content: Bloggers (field_ns_blog_blogger) */ - $handler->display->display_options['relationships']['field_ns_blog_blogger_nid']['id'] = 'field_ns_blog_blogger_nid'; - $handler->display->display_options['relationships']['field_ns_blog_blogger_nid']['table'] = 'field_data_field_ns_blog_blogger'; - $handler->display->display_options['relationships']['field_ns_blog_blogger_nid']['field'] = 'field_ns_blog_blogger_nid'; - $handler->display->display_options['relationships']['field_ns_blog_blogger_nid']['required'] = 0; - $handler->display->display_options['relationships']['field_ns_blog_blogger_nid']['delta'] = '-1'; - /* Field: Content: Photo */ - $handler->display->display_options['fields']['field_ns_contributor_photo']['id'] = 'field_ns_contributor_photo'; - $handler->display->display_options['fields']['field_ns_contributor_photo']['table'] = 'field_data_field_ns_contributor_photo'; - $handler->display->display_options['fields']['field_ns_contributor_photo']['field'] = 'field_ns_contributor_photo'; - $handler->display->display_options['fields']['field_ns_contributor_photo']['relationship'] = 'field_ns_blog_blogger_nid'; - $handler->display->display_options['fields']['field_ns_contributor_photo']['label'] = ''; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['external'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['trim'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['html'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['element_type'] = 'div'; - $handler->display->display_options['fields']['field_ns_contributor_photo']['element_class'] = 'photo'; - $handler->display->display_options['fields']['field_ns_contributor_photo']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_ns_contributor_photo']['element_default_classes'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['hide_empty'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['empty_zero'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['hide_alter_empty'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_photo']['click_sort_column'] = 'fid'; - $handler->display->display_options['fields']['field_ns_contributor_photo']['settings'] = array( - 'image_style' => 'grid-6', - 'image_link' => '', - ); - $handler->display->display_options['fields']['field_ns_contributor_photo']['field_api_classes'] = 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']['relationship'] = 'field_ns_blog_blogger_nid'; - $handler->display->display_options['fields']['title']['label'] = ''; - $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['title']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['title']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['title']['alter']['external'] = 0; - $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0; - $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0; - $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['title']['alter']['trim'] = 0; - $handler->display->display_options['fields']['title']['alter']['html'] = 0; - $handler->display->display_options['fields']['title']['element_type'] = 'div'; - $handler->display->display_options['fields']['title']['element_class'] = 'name'; - $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['title']['element_default_classes'] = 0; - $handler->display->display_options['fields']['title']['hide_empty'] = 0; - $handler->display->display_options['fields']['title']['empty_zero'] = 0; - $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0; - $handler->display->display_options['fields']['title']['link_to_node'] = 0; - /* Field: Content: Email */ - $handler->display->display_options['fields']['field_ns_contributor_email']['id'] = 'field_ns_contributor_email'; - $handler->display->display_options['fields']['field_ns_contributor_email']['table'] = 'field_data_field_ns_contributor_email'; - $handler->display->display_options['fields']['field_ns_contributor_email']['field'] = 'field_ns_contributor_email'; - $handler->display->display_options['fields']['field_ns_contributor_email']['relationship'] = 'field_ns_blog_blogger_nid'; - $handler->display->display_options['fields']['field_ns_contributor_email']['label'] = ''; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['make_link'] = 1; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['path'] = 'mailto:[field_ns_contributor_email-value]'; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['external'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['trim'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['alter']['html'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['element_type'] = 'div'; - $handler->display->display_options['fields']['field_ns_contributor_email']['element_class'] = 'email'; - $handler->display->display_options['fields']['field_ns_contributor_email']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_ns_contributor_email']['element_default_classes'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['hide_empty'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['empty_zero'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['hide_alter_empty'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_email']['type'] = 'text_plain'; - $handler->display->display_options['fields']['field_ns_contributor_email']['field_api_classes'] = 0; - /* Field: Content: About */ - $handler->display->display_options['fields']['field_ns_contributor_about']['id'] = 'field_ns_contributor_about'; - $handler->display->display_options['fields']['field_ns_contributor_about']['table'] = 'field_data_field_ns_contributor_about'; - $handler->display->display_options['fields']['field_ns_contributor_about']['field'] = 'field_ns_contributor_about'; - $handler->display->display_options['fields']['field_ns_contributor_about']['relationship'] = 'field_ns_blog_blogger_nid'; - $handler->display->display_options['fields']['field_ns_contributor_about']['label'] = ''; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['external'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['trim'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['alter']['html'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['element_label_type'] = 'div'; - $handler->display->display_options['fields']['field_ns_contributor_about']['element_label_class'] = 'about'; - $handler->display->display_options['fields']['field_ns_contributor_about']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_ns_contributor_about']['element_default_classes'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['hide_empty'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['empty_zero'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['hide_alter_empty'] = 0; - $handler->display->display_options['fields']['field_ns_contributor_about']['field_api_classes'] = 0; - /* Sort criterion: Content: Title */ - $handler->display->display_options['sorts']['title']['id'] = 'title'; - $handler->display->display_options['sorts']['title']['table'] = 'node'; - $handler->display->display_options['sorts']['title']['field'] = 'title'; - $handler->display->display_options['sorts']['title']['relationship'] = 'field_ns_blog_blogger_nid'; - /* Contextual filter: Content: Nid */ - $handler->display->display_options['arguments']['nid']['id'] = 'nid'; - $handler->display->display_options['arguments']['nid']['table'] = 'node'; - $handler->display->display_options['arguments']['nid']['field'] = 'nid'; - $handler->display->display_options['arguments']['nid']['default_action'] = 'not found'; - $handler->display->display_options['arguments']['nid']['default_argument_type'] = 'fixed'; - $handler->display->display_options['arguments']['nid']['default_argument_skip_url'] = 0; - $handler->display->display_options['arguments']['nid']['summary']['number_of_records'] = '0'; - $handler->display->display_options['arguments']['nid']['summary']['format'] = 'default_summary'; - $handler->display->display_options['arguments']['nid']['summary_options']['items_per_page'] = '25'; - $handler->display->display_options['arguments']['nid']['specify_validation'] = 1; - $handler->display->display_options['arguments']['nid']['validate']['type'] = 'node'; - $handler->display->display_options['arguments']['nid']['validate_options']['types'] = array( - 'ns_blog' => 'ns_blog', - ); - $handler->display->display_options['arguments']['nid']['validate_options']['access'] = 0; - $handler->display->display_options['arguments']['nid']['break_phrase'] = 0; - $handler->display->display_options['arguments']['nid']['not'] = 0; - /* 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']['relationship'] = 'field_ns_blog_blogger_nid'; - $handler->display->display_options['filters']['status']['value'] = '1'; - $handler->display->display_options['filters']['status']['group'] = 0; - $handler->display->display_options['filters']['status']['expose']['operator'] = 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']['relationship'] = 'field_ns_blog_blogger_nid'; - $handler->display->display_options['filters']['type']['value'] = array( - 'ns_contributor' => 'ns_contributor', - ); - - /* Display: Content pane */ - $handler = $view->new_display('panel_pane', 'Content pane', 'panel_pane_1'); - $handler->display->display_options['allow']['use_pager'] = 0; - $handler->display->display_options['allow']['items_per_page'] = 0; - $handler->display->display_options['allow']['offset'] = 0; - $handler->display->display_options['allow']['link_to_view'] = 0; - $handler->display->display_options['allow']['more_link'] = 0; - $handler->display->display_options['allow']['path_override'] = 0; - $handler->display->display_options['allow']['title_override'] = 'title_override'; - $handler->display->display_options['allow']['exposed_form'] = 0; - $handler->display->display_options['allow']['fields_override'] = 0; - $handler->display->display_options['argument_input'] = array( - 'nid' => array( - 'type' => 'context', - 'context' => 'entity:node.nid', - 'context_optional' => 0, - 'panel' => '0', - 'fixed' => '', - 'label' => 'Content: Nid', - ), - ); - $translatables['ns_ch_blog_contributor'] = array( - t('Master'), - t('Bloggers'), - t('more'), - t('Apply'), - t('Reset'), - t('Sort by'), - t('Asc'), - t('Desc'), - t('Items per page'), - t('- All -'), - t('Offset'), - t('field_ns_blog_blogger'), - t('mailto:[field_ns_contributor_email-value]'), - t('All'), - t('Content pane'), - t('View panes'), - ); - $export['ns_ch_blog_contributor'] = $view; - - $view = new view; $view->name = 'ns_ch_blog_post'; $view->description = ''; $view->tag = 'default'; @@ -640,18 +418,17 @@ function ns_ch_blog_views_default_views() { $handler->display->display_options['sorts']['created']['table'] = 'node'; $handler->display->display_options['sorts']['created']['field'] = 'created'; $handler->display->display_options['sorts']['created']['order'] = 'DESC'; - /* Contextual filter: Content: Blog (field_ns_blog_post_blog) */ - $handler->display->display_options['arguments']['field_ns_blog_post_blog_nid']['id'] = 'field_ns_blog_post_blog_nid'; - $handler->display->display_options['arguments']['field_ns_blog_post_blog_nid']['table'] = 'field_data_field_ns_blog_post_blog'; - $handler->display->display_options['arguments']['field_ns_blog_post_blog_nid']['field'] = 'field_ns_blog_post_blog_nid'; - $handler->display->display_options['arguments']['field_ns_blog_post_blog_nid']['default_action'] = 'not found'; - $handler->display->display_options['arguments']['field_ns_blog_post_blog_nid']['default_argument_type'] = 'fixed'; - $handler->display->display_options['arguments']['field_ns_blog_post_blog_nid']['default_argument_skip_url'] = 0; - $handler->display->display_options['arguments']['field_ns_blog_post_blog_nid']['summary']['number_of_records'] = '0'; - $handler->display->display_options['arguments']['field_ns_blog_post_blog_nid']['summary']['format'] = 'default_summary'; - $handler->display->display_options['arguments']['field_ns_blog_post_blog_nid']['summary_options']['items_per_page'] = '25'; - $handler->display->display_options['arguments']['field_ns_blog_post_blog_nid']['break_phrase'] = 0; - $handler->display->display_options['arguments']['field_ns_blog_post_blog_nid']['not'] = 0; + /* Contextual filter: Content: Blog (field_ns_blog_post_blog:target_id) */ + $handler->display->display_options['arguments']['field_ns_blog_post_blog_target_id']['id'] = 'field_ns_blog_post_blog_target_id'; + $handler->display->display_options['arguments']['field_ns_blog_post_blog_target_id']['table'] = 'field_data_field_ns_blog_post_blog'; + $handler->display->display_options['arguments']['field_ns_blog_post_blog_target_id']['field'] = 'field_ns_blog_post_blog_target_id'; + $handler->display->display_options['arguments']['field_ns_blog_post_blog_target_id']['default_argument_type'] = 'fixed'; + $handler->display->display_options['arguments']['field_ns_blog_post_blog_target_id']['default_argument_skip_url'] = 0; + $handler->display->display_options['arguments']['field_ns_blog_post_blog_target_id']['summary']['number_of_records'] = '0'; + $handler->display->display_options['arguments']['field_ns_blog_post_blog_target_id']['summary']['format'] = 'default_summary'; + $handler->display->display_options['arguments']['field_ns_blog_post_blog_target_id']['summary_options']['items_per_page'] = '25'; + $handler->display->display_options['arguments']['field_ns_blog_post_blog_target_id']['break_phrase'] = 0; + $handler->display->display_options['arguments']['field_ns_blog_post_blog_target_id']['not'] = 0; /* Filter criterion: Content: Published */ $handler->display->display_options['filters']['status']['id'] = 'status'; $handler->display->display_options['filters']['status']['table'] = 'node'; @@ -671,13 +448,13 @@ function ns_ch_blog_views_default_views() { $handler = $view->new_display('panel_pane', 'Content pane', 'panel_pane_1'); $handler->display->display_options['pane_title'] = 'Blog posts'; $handler->display->display_options['argument_input'] = array( - 'field_ns_blog_post_blog_nid' => array( + 'field_ns_blog_post_blog_target_id' => array( 'type' => 'context', 'context' => 'entity:node.nid', 'context_optional' => 0, 'panel' => '0', 'fixed' => '', - 'label' => 'Content: Blog (field_ns_blog_post_blog)', + 'label' => 'Content: Blog (field_ns_blog_post_blog:target_id)', ), ); $translatables['ns_ch_blog_post'] = array( @@ -728,12 +505,11 @@ function ns_ch_blog_views_default_views() { $handler->display->display_options['row_plugin'] = 'fields'; $handler->display->display_options['row_options']['hide_empty'] = 0; $handler->display->display_options['row_options']['default_field_elements'] = 0; - /* Relationship: Content: Bloggers (field_ns_blog_post_blogger) */ + /* Relationship: Broken/missing handler */ $handler->display->display_options['relationships']['field_ns_blog_post_blogger_nid']['id'] = 'field_ns_blog_post_blogger_nid'; $handler->display->display_options['relationships']['field_ns_blog_post_blogger_nid']['table'] = 'field_data_field_ns_blog_post_blogger'; $handler->display->display_options['relationships']['field_ns_blog_post_blogger_nid']['field'] = 'field_ns_blog_post_blogger_nid'; $handler->display->display_options['relationships']['field_ns_blog_post_blogger_nid']['required'] = 0; - $handler->display->display_options['relationships']['field_ns_blog_post_blogger_nid']['delta'] = '-1'; /* Field: Content: Photo */ $handler->display->display_options['fields']['field_ns_contributor_photo']['id'] = 'field_ns_contributor_photo'; $handler->display->display_options['fields']['field_ns_contributor_photo']['table'] = 'field_data_field_ns_contributor_photo'; @@ -918,7 +694,7 @@ function ns_ch_blog_views_default_views() { t('Items per page'), t('- All -'), t('Offset'), - t('field_ns_blog_post_blogger'), + t('field_ns_blog_post_blogger_nid'), t('mailto:[field_ns_contributor_email-value]'), t('All'), t('Content pane'), @@ -962,13 +738,12 @@ function ns_ch_blog_views_default_views() { 'view_node' => 'right', 'comment_count' => 'right', ); - /* Relationship: Content: Blog (field_ns_blog_post_blog) */ + /* Relationship: Broken/missing handler */ $handler->display->display_options['relationships']['field_ns_blog_post_blog_nid']['id'] = 'field_ns_blog_post_blog_nid'; $handler->display->display_options['relationships']['field_ns_blog_post_blog_nid']['table'] = 'field_data_field_ns_blog_post_blog'; $handler->display->display_options['relationships']['field_ns_blog_post_blog_nid']['field'] = 'field_ns_blog_post_blog_nid'; $handler->display->display_options['relationships']['field_ns_blog_post_blog_nid']['label'] = 'blog'; $handler->display->display_options['relationships']['field_ns_blog_post_blog_nid']['required'] = 0; - $handler->display->display_options['relationships']['field_ns_blog_post_blog_nid']['delta'] = '0'; /* Field: Content: Nid */ $handler->display->display_options['fields']['nid']['id'] = 'nid'; $handler->display->display_options['fields']['nid']['table'] = 'node'; @@ -1244,18 +1019,16 @@ function ns_ch_blog_views_default_views() { $handler->display->display_options['row_plugin'] = 'fields'; $handler->display->display_options['row_options']['hide_empty'] = 0; $handler->display->display_options['row_options']['default_field_elements'] = 0; - /* Relationship: Content: Bloggers (field_ns_blog_post_blogger) */ - $handler->display->display_options['relationships']['field_ns_blog_post_blogger_nid']['id'] = 'field_ns_blog_post_blogger_nid'; - $handler->display->display_options['relationships']['field_ns_blog_post_blogger_nid']['table'] = 'field_data_field_ns_blog_post_blogger'; - $handler->display->display_options['relationships']['field_ns_blog_post_blogger_nid']['field'] = 'field_ns_blog_post_blogger_nid'; - $handler->display->display_options['relationships']['field_ns_blog_post_blogger_nid']['label'] = 'blogger'; - $handler->display->display_options['relationships']['field_ns_blog_post_blogger_nid']['required'] = 1; - $handler->display->display_options['relationships']['field_ns_blog_post_blogger_nid']['delta'] = '0'; + /* Relationship: Entity Reference: Referenced Entity */ + $handler->display->display_options['relationships']['field_ns_blog_blogger_target_id']['id'] = 'field_ns_blog_blogger_target_id'; + $handler->display->display_options['relationships']['field_ns_blog_blogger_target_id']['table'] = 'field_data_field_ns_blog_blogger'; + $handler->display->display_options['relationships']['field_ns_blog_blogger_target_id']['field'] = 'field_ns_blog_blogger_target_id'; + $handler->display->display_options['relationships']['field_ns_blog_blogger_target_id']['required'] = 1; /* Field: Content: Photo */ $handler->display->display_options['fields']['field_ns_contributor_photo']['id'] = 'field_ns_contributor_photo'; $handler->display->display_options['fields']['field_ns_contributor_photo']['table'] = 'field_data_field_ns_contributor_photo'; $handler->display->display_options['fields']['field_ns_contributor_photo']['field'] = 'field_ns_contributor_photo'; - $handler->display->display_options['fields']['field_ns_contributor_photo']['relationship'] = 'field_ns_blog_post_blogger_nid'; + $handler->display->display_options['fields']['field_ns_contributor_photo']['relationship'] = 'field_ns_blog_blogger_target_id'; $handler->display->display_options['fields']['field_ns_contributor_photo']['label'] = ''; $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['alter_text'] = 0; $handler->display->display_options['fields']['field_ns_contributor_photo']['alter']['make_link'] = 0; @@ -1366,7 +1139,7 @@ function ns_ch_blog_views_default_views() { t('Sort by'), t('Asc'), t('Desc'), - t('blogger'), + t('Content entity referenced from field_ns_blog_blogger'), t('Content pane'), t('Latest blog entry for header'), t('View panes'), diff --git a/features/ns_ch_rss/ns_ch_rss.features.field.inc b/features/ns_ch_rss/ns_ch_rss.features.field.inc index a21abdb..dc0957a 100644 --- a/features/ns_ch_rss/ns_ch_rss.features.field.inc +++ b/features/ns_ch_rss/ns_ch_rss.features.field.inc @@ -100,37 +100,26 @@ function ns_ch_rss_defaultconfig_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_ns_ch_rss_promo_article', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'ns_article' => 'ns_article', - 'ns_blog' => 0, - 'ns_blog_post' => 0, - 'ns_ch_rss_promo' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_article' => 'ns_article', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_ch_rss_promo', @@ -140,10 +129,27 @@ function ns_ch_rss_defaultconfig_field_default_fields() { 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, + ), + 'search_index' => array( + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, + ), + 'search_result' => array( + 'label' => 'hidden', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '1', + 'type' => 'hidden', + 'weight' => '8', ), 'teaser' => array( 'label' => 'above', @@ -158,25 +164,24 @@ function ns_ch_rss_defaultconfig_field_default_fields() { 'required' => 0, 'settings' => array( 'crossclone' => array( - 'couple_setting' => '0', + 'couple_setting' => 0, 'coupling' => 1, - 'delete_setting' => '1', + 'delete_setting' => 1, ), 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 0, 'references_dialog_edit' => 0, 'references_dialog_search' => 0, - 'references_dialog_search_view' => '', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', + 'type' => 'entityreference_autocomplete', 'weight' => '-3', ), ), diff --git a/features/ns_ch_rss/ns_ch_rss.info b/features/ns_ch_rss/ns_ch_rss.info index 4f35a66..b22cd36 100644 --- a/features/ns_ch_rss/ns_ch_rss.info +++ b/features/ns_ch_rss/ns_ch_rss.info @@ -5,7 +5,6 @@ dependencies[] = "defaultconfig" dependencies[] = "draggableviews" dependencies[] = "features" dependencies[] = "media" -dependencies[] = "node_reference" dependencies[] = "ns_article" dependencies[] = "ns_ch_web" dependencies[] = "page_manager" diff --git a/features/ns_ch_rss/ns_ch_rss.install b/features/ns_ch_rss/ns_ch_rss.install index 8829e90..86165dd 100644 --- a/features/ns_ch_rss/ns_ch_rss.install +++ b/features/ns_ch_rss/ns_ch_rss.install @@ -1,3 +1,9 @@ type == 'ns_article' && $entity->type == 'ns_ch_rss_promo') { // Get our langcode. - $entity->field_ns_ch_rss_promo_article[$entity->language][0]['nid'] = $original_entity->nid; + $entity->field_ns_ch_rss_promo_article[$entity->language][0]['target_id'] = $original_entity->nid; + $entity->field_ns_ch_rss_promo_article[$entity->language][0]['target_type'] = 'node'; // Remove workbench properties in order to prevent problems with manipulating the new entity. if (isset($entity->workbench_moderation)) { unset($entity->workbench_moderation_state_current, $entity->workbench_moderation_state_new, $entity->workbench_moderation); diff --git a/features/ns_ch_rss/ns_ch_rss.views_default.inc b/features/ns_ch_rss/ns_ch_rss.views_default.inc index 9717aaf..6888bd4 100644 --- a/features/ns_ch_rss/ns_ch_rss.views_default.inc +++ b/features/ns_ch_rss/ns_ch_rss.views_default.inc @@ -186,19 +186,12 @@ function ns_ch_rss_views_default_views() { $handler->display->display_options['empty']['area']['content'] = 'There was no RSS Promos in this RSS Promo Channel'; $handler->display->display_options['empty']['area']['format'] = 'html_editor'; $handler->display->display_options['empty']['area']['tokenize'] = 0; - /* Relationship: Content: Article (field_ns_ch_rss_promo_article) */ - $handler->display->display_options['relationships']['field_ns_ch_rss_promo_article_nid']['id'] = 'field_ns_ch_rss_promo_article_nid'; - $handler->display->display_options['relationships']['field_ns_ch_rss_promo_article_nid']['table'] = 'field_data_field_ns_ch_rss_promo_article'; - $handler->display->display_options['relationships']['field_ns_ch_rss_promo_article_nid']['field'] = 'field_ns_ch_rss_promo_article_nid'; - $handler->display->display_options['relationships']['field_ns_ch_rss_promo_article_nid']['required'] = 1; - $handler->display->display_options['relationships']['field_ns_ch_rss_promo_article_nid']['delta'] = '0'; - /* Relationship: Content: Byline (field_ns_article_byline) */ - $handler->display->display_options['relationships']['field_ns_article_byline_nid']['id'] = 'field_ns_article_byline_nid'; - $handler->display->display_options['relationships']['field_ns_article_byline_nid']['table'] = 'field_data_field_ns_article_byline'; - $handler->display->display_options['relationships']['field_ns_article_byline_nid']['field'] = 'field_ns_article_byline_nid'; - $handler->display->display_options['relationships']['field_ns_article_byline_nid']['relationship'] = 'field_ns_ch_rss_promo_article_nid'; - $handler->display->display_options['relationships']['field_ns_article_byline_nid']['required'] = 0; - $handler->display->display_options['relationships']['field_ns_article_byline_nid']['delta'] = '0'; + /* Relationship: Entity Reference: Referenced Entity */ + $handler->display->display_options['relationships']['field_ns_ch_rss_promo_article_target_id']['id'] = 'field_ns_ch_rss_promo_article_target_id'; + $handler->display->display_options['relationships']['field_ns_ch_rss_promo_article_target_id']['table'] = 'field_data_field_ns_ch_rss_promo_article'; + $handler->display->display_options['relationships']['field_ns_ch_rss_promo_article_target_id']['field'] = 'field_ns_ch_rss_promo_article_target_id'; + $handler->display->display_options['relationships']['field_ns_ch_rss_promo_article_target_id']['label'] = 'article'; + $handler->display->display_options['relationships']['field_ns_ch_rss_promo_article_target_id']['required'] = 0; /* Field: Content: Nid */ $handler->display->display_options['fields']['nid']['id'] = 'nid'; $handler->display->display_options['fields']['nid']['table'] = 'node'; @@ -389,7 +382,7 @@ function ns_ch_rss_views_default_views() { $handler->display->display_options['filters']['status_1']['id'] = 'status_1'; $handler->display->display_options['filters']['status_1']['table'] = 'node'; $handler->display->display_options['filters']['status_1']['field'] = 'status'; - $handler->display->display_options['filters']['status_1']['relationship'] = 'field_ns_ch_rss_promo_article_nid'; + $handler->display->display_options['filters']['status_1']['relationship'] = 'field_ns_ch_rss_promo_article_target_id'; $handler->display->display_options['filters']['status_1']['value'] = '1'; /* Display: Topic editor */ @@ -899,8 +892,7 @@ function ns_ch_rss_views_default_views() { t('Desc'), t('Rss Topic no result'), t('There was no RSS Promos in this RSS Promo Channel'), - t('field_ns_ch_rss_promo_article'), - t('field_ns_article_byline'), + t('article'), t('node/[nid]'), t('Read more'), t('Post date'), diff --git a/features/ns_ch_web/ns_ch_web.features.field.inc b/features/ns_ch_web/ns_ch_web.features.field.inc index 71f7023..391ef3d 100644 --- a/features/ns_ch_web/ns_ch_web.features.field.inc +++ b/features/ns_ch_web/ns_ch_web.features.field.inc @@ -243,7 +243,7 @@ function ns_ch_web_defaultconfig_field_default_fields() { ), ), ); - + // Exported field: 'node-ns_ch_web_promo-field_ns_ch_web_promo_article' $fields['node-ns_ch_web_promo-field_ns_ch_web_promo_article'] = array( 'field_config' => array( @@ -252,66 +252,62 @@ function ns_ch_web_defaultconfig_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_ns_ch_web_promo_article', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'instance_settings' => array( - 'crossclone_couple_setting' => '0', - 'crossclone_coupling' => 1, - 'crossclone_delete_setting' => '0', - ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'crossclone_couple_setting' => '0', - 'crossclone_coupling' => 1, - 'crossclone_delete_setting' => '0', - 'referenceable_types' => array( - 'ns_article' => 'ns_article', - 'ns_blog' => 0, - 'ns_blog_post' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_article' => 'ns_article', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_ch_web_promo', - 'crossclone_couple_setting' => '0', - 'crossclone_coupling' => 1, - 'crossclone_delete_setting' => '0', 'default_value' => NULL, 'deleted' => '0', 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, + ), + 'search_index' => array( + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, + ), + 'search_result' => array( + 'label' => 'hidden', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '1', + 'type' => 'hidden', + 'weight' => '8', ), 'teaser' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '6', + 'weight' => 0, ), ), 'entity_type' => 'node', @@ -320,25 +316,24 @@ function ns_ch_web_defaultconfig_field_default_fields() { 'required' => 0, 'settings' => array( 'crossclone' => array( - 'couple_setting' => '0', + 'couple_setting' => 0, 'coupling' => 1, - 'delete_setting' => '1', + 'delete_setting' => 0, ), 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 0, 'references_dialog_edit' => 0, 'references_dialog_search' => 0, - 'references_dialog_search_view' => '', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', + 'type' => 'entityreference_autocomplete', 'weight' => '1', ), ), diff --git a/features/ns_ch_web/ns_ch_web.info b/features/ns_ch_web/ns_ch_web.info index ed2814e..e117819 100644 --- a/features/ns_ch_web/ns_ch_web.info +++ b/features/ns_ch_web/ns_ch_web.info @@ -7,11 +7,11 @@ dependencies[] = "ctools" dependencies[] = "defaultconfig" dependencies[] = "draggableviews" dependencies[] = "dynamic_formatters" +dependencies[] = "entityreference" dependencies[] = "features" dependencies[] = "file" dependencies[] = "media" dependencies[] = "menu_block" -dependencies[] = "node_reference" dependencies[] = "ns_article" dependencies[] = "ns_core" dependencies[] = "ns_styles" @@ -48,8 +48,10 @@ features[page_manager_pages][] = "ns_ch_web_promos" features[page_manager_pages][] = "ns_ch_web_topic_editor" features[panels_mini][] = "ns_ch_web_c_l_a_2_col" features[panels_mini][] = "ns_ch_web_c_t_a_2_col" +features[panels_mini][] = "ns_ch_web_contributor" features[panels_mini][] = "ns_ch_web_p_l_a" features[panels_mini][] = "ns_ch_web_p_t_a" +features[panels_mini][] = "ns_ch_web_teaser" features[panels_mini][] = "ns_ch_web_topic_panel" features[rules_config][] = "rules_ns_ch_web_clear_article" features[rules_config][] = "rules_ns_ch_web_clear_article_pub" diff --git a/features/ns_ch_web/ns_ch_web.install b/features/ns_ch_web/ns_ch_web.install index 8d3a459..c4c8aaf 100644 --- a/features/ns_ch_web/ns_ch_web.install +++ b/features/ns_ch_web/ns_ch_web.install @@ -24,3 +24,10 @@ function ns_ch_web_update_7201() { ns_core_update_media_instance('node', 'ns_ch_web_promo', 'field_ns_ch_web_promo_media'); } +/** + * Migrate the promo article field into a references field. + */ +function ns_ch_web_update_7202() { + module_load_include('install', 'ns_core'); + ns_core_migrate_references_field('field_ns_ch_web_promo_article'); +} diff --git a/features/ns_ch_web/ns_ch_web.module b/features/ns_ch_web/ns_ch_web.module index 3b64529..ccf1b73 100644 --- a/features/ns_ch_web/ns_ch_web.module +++ b/features/ns_ch_web/ns_ch_web.module @@ -13,7 +13,8 @@ function ns_ch_web_crossclone_entity_alter($entity_type, &$original_entity, &$en // reference field on the Promo. if ($entity_type == 'node' && $original_entity->type == 'ns_article' && $entity->type == 'ns_ch_web_promo') { // Set the promo article to the right one. - $entity->field_ns_ch_web_promo_article[$entity->language][0]['nid'] = $original_entity->nid; + $entity->field_ns_ch_web_promo_article[$entity->language][0]['target_id'] = $original_entity->nid; + $entity->field_ns_ch_web_promo_article[$entity->language][0]['target_type'] = 'node'; // Remove workbench properties in order to prevent problems with manipulating the new entity. if (isset($entity->workbench_moderation)) { unset($entity->workbench_moderation_state_current, $entity->workbench_moderation_state_new, $entity->workbench_moderation); diff --git a/features/ns_ch_web/ns_ch_web.pages_default.inc b/features/ns_ch_web/ns_ch_web.pages_default.inc index 2580c67..a31cd61 100644 --- a/features/ns_ch_web/ns_ch_web.pages_default.inc +++ b/features/ns_ch_web/ns_ch_web.pages_default.inc @@ -75,40 +75,29 @@ function ns_ch_web_default_page_manager_handlers() { $pane = new stdClass; $pane->pid = 'new-1'; $pane->panel = 'aside_alpha'; - $pane->type = 'views_panes'; - $pane->subtype = 'ns_ch_web_article_facts-panel_pane_1'; + $pane->type = 'entity_field'; + $pane->subtype = 'node:field_ns_fact_ns_article_fact'; $pane->shown = TRUE; - $pane->access = array( - 'plugins' => array( - 0 => array( - 'name' => 'module_exists', - 'settings' => array( - 'module' => 'ns_fact', - ), - 'not' => FALSE, - ), - ), - ); + $pane->access = array(); $pane->configuration = array( - 'context' => array( - 0 => 'argument_entity_id:node_1', - 1 => 'argument_entity_id:node_1', - ), - ); - $pane->cache = array( - 'method' => 'rules', - 'settings' => array( - 'granularity' => 'context', - 'language' => 1, - 'cache_key' => 'panel_context:node_view:ns_ch_web_article', + 'label' => 'hidden', + 'formatter' => 'panels_ref_ref_formatter_mini', + 'formatter_settings' => array( + 'mini_panel' => 'ns_ch_web_teaser', ), + 'context' => 'argument_entity_id:node_1', + 'override_title' => 0, + 'override_title_text' => '', ); + $pane->cache = array(); $pane->style = array( 'settings' => NULL, + 'style' => 'naked', ); $pane->css = array(); $pane->extras = array(); $pane->position = 0; + $pane->locks = ''; $display->content['new-1'] = $pane; $display->panels['aside_alpha'][0] = 'new-1'; $pane = new stdClass; @@ -120,22 +109,23 @@ function ns_ch_web_default_page_manager_handlers() { $pane->access = array(); $pane->configuration = array( 'label' => 'title', - 'formatter' => 'node_reference_default', - 'formatter_settings' => array(), + 'formatter' => 'entityreference_label', + 'formatter_settings' => array( + 'link' => 1, + ), 'context' => 'argument_entity_id:node_1', 'override_title' => 0, 'override_title_text' => '', ); - $pane->cache = array( - 'method' => '0', - 'settings' => array(), - ); + $pane->cache = array(); $pane->style = array( 'settings' => NULL, + 'style' => 'default', ); $pane->css = array(); $pane->extras = array(); $pane->position = 1; + $pane->locks = ''; $display->content['new-2'] = $pane; $display->panels['aside_alpha'][1] = 'new-2'; $pane = new stdClass; @@ -174,6 +164,7 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; + $pane->locks = ''; $display->content['new-3'] = $pane; $display->panels['aside_beta'][0] = 'new-3'; $pane = new stdClass; @@ -204,6 +195,7 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; + $pane->locks = ''; $display->content['new-4'] = $pane; $display->panels['footer_alpha'][0] = 'new-4'; $pane = new stdClass; @@ -230,6 +222,7 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; + $pane->locks = ''; $display->content['new-5'] = $pane; $display->panels['header_beta'][0] = 'new-5'; $pane = new stdClass; @@ -255,6 +248,7 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; + $pane->locks = ''; $display->content['new-6'] = $pane; $display->panels['header_beta'][1] = 'new-6'; $pane = new stdClass; @@ -280,6 +274,7 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; + $pane->locks = ''; $display->content['new-7'] = $pane; $display->panels['header_beta'][2] = 'new-7'; $pane = new stdClass; @@ -303,6 +298,7 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 3; + $pane->locks = ''; $display->content['new-8'] = $pane; $display->panels['header_beta'][3] = 'new-8'; $pane = new stdClass; @@ -327,6 +323,7 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 4; + $pane->locks = ''; $display->content['new-9'] = $pane; $display->panels['header_beta'][4] = 'new-9'; $pane = new stdClass; @@ -351,6 +348,7 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 5; + $pane->locks = ''; $display->content['new-10'] = $pane; $display->panels['header_beta'][5] = 'new-10'; $pane = new stdClass; @@ -378,104 +376,91 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; + $pane->locks = ''; $display->content['new-11'] = $pane; $display->panels['main'][0] = 'new-11'; $pane = new stdClass; $pane->pid = 'new-12'; $pane->panel = 'main'; - $pane->type = 'views_panes'; - $pane->subtype = 'ns_ch_web_byline-panel_pane_1'; + $pane->type = 'entity_field'; + $pane->subtype = 'node:field_ns_article_byline'; $pane->shown = TRUE; $pane->access = array(); $pane->configuration = array( - 'context' => array( - 0 => 'argument_entity_id:node_1', - ), - ); - $pane->cache = array( - 'method' => 'rules', - 'settings' => array( - 'granularity' => 'context', - 'language' => 1, - 'cache_key' => 'panel_context:node_view:ns_ch_web_article', + 'label' => 'hidden', + 'formatter' => 'panels_ref_ref_formatter_mini', + 'formatter_settings' => array( + 'mini_panel' => 'ns_ch_web_contributor', ), + 'context' => 'argument_entity_id:node_1', + 'override_title' => 0, + 'override_title_text' => '', ); + $pane->cache = array(); $pane->style = array( 'settings' => NULL, + 'style' => 'naked', ); $pane->css = array(); $pane->extras = array(); $pane->position = 1; + $pane->locks = ''; $display->content['new-12'] = $pane; $display->panels['main'][1] = 'new-12'; $pane = new stdClass; $pane->pid = 'new-13'; $pane->panel = 'main'; - $pane->type = 'views_panes'; - $pane->subtype = 'ns_ch_web_article_polls-panel_pane_1'; + $pane->type = 'entity_field'; + $pane->subtype = 'node:field_ns_poll_ns_article_poll'; $pane->shown = TRUE; - $pane->access = array( - 'plugins' => array( - 0 => array( - 'name' => 'module_exists', - 'settings' => array( - 'module' => 'ns_poll', - ), - 'not' => FALSE, - ), - ), - ); + $pane->access = array(); $pane->configuration = array( - 'context' => array( - 0 => 'argument_entity_id:node_1', - 1 => 'argument_entity_id:node_1', + 'label' => 'hidden', + 'formatter' => 'panels_ref_ref_formatter_mini', + 'formatter_settings' => array( + 'link' => 0, + 'mini_panel' => 'ns_ch_web_teaser', ), + 'context' => 'argument_entity_id:node_1', + 'override_title' => 1, + 'override_title_text' => '', ); - $pane->cache = array( - 'method' => '0', - 'settings' => array(), - ); + $pane->cache = array(); $pane->style = array( 'settings' => NULL, ); $pane->css = array(); $pane->extras = array(); $pane->position = 2; + $pane->locks = ''; $display->content['new-13'] = $pane; $display->panels['main'][2] = 'new-13'; $pane = new stdClass; $pane->pid = 'new-14'; $pane->panel = 'main'; - $pane->type = 'views_panes'; - $pane->subtype = 'ns_ch_web_article_forms-panel_pane_1'; + $pane->type = 'entity_field'; + $pane->subtype = 'node:field_ns_form_ns_article_form'; $pane->shown = TRUE; - $pane->access = array( - 'plugins' => array( - 0 => array( - 'name' => 'module_exists', - 'settings' => array( - 'module' => 'ns_form', - ), - 'not' => FALSE, - ), - ), - ); + $pane->access = array(); $pane->configuration = array( - 'context' => array( - 0 => 'argument_entity_id:node_1', - 1 => 'argument_entity_id:node_1', + 'label' => 'hidden', + 'formatter' => 'panels_ref_ref_formatter_mini', + 'formatter_settings' => array( + 'mini_panel' => 'ns_ch_web_teaser', ), + 'context' => 'argument_entity_id:node_1', + 'override_title' => 1, + 'override_title_text' => '', ); - $pane->cache = array( - 'method' => '0', - 'settings' => array(), - ); + $pane->cache = array(); $pane->style = array( 'settings' => NULL, + 'style' => 'naked', ); $pane->css = array(); $pane->extras = array(); $pane->position = 3; + $pane->locks = ''; $display->content['new-14'] = $pane; $display->panels['main'][3] = 'new-14'; $pane = new stdClass; @@ -501,10 +486,12 @@ function ns_ch_web_default_page_manager_handlers() { ); $pane->style = array( 'settings' => NULL, + 'style' => 'naked', ); $pane->css = array(); $pane->extras = array(); $pane->position = 4; + $pane->locks = ''; $display->content['new-15'] = $pane; $display->panels['main'][4] = 'new-15'; $pane = new stdClass; @@ -531,6 +518,7 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 5; + $pane->locks = ''; $display->content['new-16'] = $pane; $display->panels['main'][5] = 'new-16'; $display->hide_title = PANELS_TITLE_FIXED; @@ -601,7 +589,7 @@ function ns_ch_web_default_page_manager_handlers() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-17'; $pane->panel = 'aside_alpha'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_article_facts-panel_pane_1'; @@ -630,10 +618,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['aside_alpha'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-17'] = $pane; + $display->panels['aside_alpha'][0] = 'new-17'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-18'; $pane->panel = 'aside_alpha'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_article_related'; @@ -654,10 +643,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-2'] = $pane; - $display->panels['aside_alpha'][1] = 'new-2'; + $pane->locks = ''; + $display->content['new-18'] = $pane; + $display->panels['aside_alpha'][1] = 'new-18'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-19'; $pane->panel = 'aside_beta'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_ad-panel_pane_1'; @@ -685,10 +675,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-3'] = $pane; - $display->panels['aside_beta'][0] = 'new-3'; + $pane->locks = ''; + $display->content['new-19'] = $pane; + $display->panels['aside_beta'][0] = 'new-19'; $pane = new stdClass; - $pane->pid = 'new-4'; + $pane->pid = 'new-20'; $pane->panel = 'footer_alpha'; $pane->type = 'panels_mini'; $pane->subtype = 'ns_ch_web_topic_panel'; @@ -708,10 +699,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-4'] = $pane; - $display->panels['footer_alpha'][0] = 'new-4'; + $pane->locks = ''; + $display->content['new-20'] = $pane; + $display->panels['footer_alpha'][0] = 'new-20'; $pane = new stdClass; - $pane->pid = 'new-5'; + $pane->pid = 'new-21'; $pane->panel = 'header_beta'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_article_media'; @@ -734,10 +726,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-5'] = $pane; - $display->panels['header_beta'][0] = 'new-5'; + $pane->locks = ''; + $display->content['new-21'] = $pane; + $display->panels['header_beta'][0] = 'new-21'; $pane = new stdClass; - $pane->pid = 'new-6'; + $pane->pid = 'new-22'; $pane->panel = 'header_beta'; $pane->type = 'node_date_custom'; $pane->subtype = 'node_date_custom'; @@ -759,10 +752,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-6'] = $pane; - $display->panels['header_beta'][1] = 'new-6'; + $pane->locks = ''; + $display->content['new-22'] = $pane; + $display->panels['header_beta'][1] = 'new-22'; $pane = new stdClass; - $pane->pid = 'new-7'; + $pane->pid = 'new-23'; $pane->panel = 'header_beta'; $pane->type = 'node_date_custom'; $pane->subtype = 'node_date_custom'; @@ -784,10 +778,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-7'] = $pane; - $display->panels['header_beta'][2] = 'new-7'; + $pane->locks = ''; + $display->content['new-23'] = $pane; + $display->panels['header_beta'][2] = 'new-23'; $pane = new stdClass; - $pane->pid = 'new-8'; + $pane->pid = 'new-24'; $pane->panel = 'header_beta'; $pane->type = 'page_title'; $pane->subtype = 'page_title'; @@ -807,10 +802,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 3; - $display->content['new-8'] = $pane; - $display->panels['header_beta'][3] = 'new-8'; + $pane->locks = ''; + $display->content['new-24'] = $pane; + $display->panels['header_beta'][3] = 'new-24'; $pane = new stdClass; - $pane->pid = 'new-9'; + $pane->pid = 'new-25'; $pane->panel = 'header_beta'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_article_kicker'; @@ -831,10 +827,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 4; - $display->content['new-9'] = $pane; - $display->panels['header_beta'][4] = 'new-9'; + $pane->locks = ''; + $display->content['new-25'] = $pane; + $display->panels['header_beta'][4] = 'new-25'; $pane = new stdClass; - $pane->pid = 'new-10'; + $pane->pid = 'new-26'; $pane->panel = 'header_beta'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_article_lead'; @@ -855,10 +852,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 5; - $display->content['new-10'] = $pane; - $display->panels['header_beta'][5] = 'new-10'; + $pane->locks = ''; + $display->content['new-26'] = $pane; + $display->panels['header_beta'][5] = 'new-26'; $pane = new stdClass; - $pane->pid = 'new-11'; + $pane->pid = 'new-27'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_article_body'; @@ -879,10 +877,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-11'] = $pane; - $display->panels['main'][0] = 'new-11'; + $pane->locks = ''; + $display->content['new-27'] = $pane; + $display->panels['main'][0] = 'new-27'; $pane = new stdClass; - $pane->pid = 'new-12'; + $pane->pid = 'new-28'; $pane->panel = 'main'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_article_forms-panel_pane_1'; @@ -911,10 +910,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-12'] = $pane; - $display->panels['main'][1] = 'new-12'; + $pane->locks = ''; + $display->content['new-28'] = $pane; + $display->panels['main'][1] = 'new-28'; $pane = new stdClass; - $pane->pid = 'new-13'; + $pane->pid = 'new-29'; $pane->panel = 'main'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_byline-panel_pane_1'; @@ -932,10 +932,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-13'] = $pane; - $display->panels['main'][2] = 'new-13'; + $pane->locks = ''; + $display->content['new-29'] = $pane; + $display->panels['main'][2] = 'new-29'; $pane = new stdClass; - $pane->pid = 'new-14'; + $pane->pid = 'new-30'; $pane->panel = 'main'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_article_polls-panel_pane_1'; @@ -964,10 +965,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 3; - $display->content['new-14'] = $pane; - $display->panels['main'][3] = 'new-14'; + $pane->locks = ''; + $display->content['new-30'] = $pane; + $display->panels['main'][3] = 'new-30'; $pane = new stdClass; - $pane->pid = 'new-15'; + $pane->pid = 'new-31'; $pane->panel = 'main'; $pane->type = 'node_comment_form'; $pane->subtype = 'node_comment_form'; @@ -986,10 +988,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 4; - $display->content['new-15'] = $pane; - $display->panels['main'][4] = 'new-15'; + $pane->locks = ''; + $display->content['new-31'] = $pane; + $display->panels['main'][4] = 'new-31'; $pane = new stdClass; - $pane->pid = 'new-16'; + $pane->pid = 'new-32'; $pane->panel = 'main'; $pane->type = 'node_comments'; $pane->subtype = 'node_comments'; @@ -1009,8 +1012,9 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 5; - $display->content['new-16'] = $pane; - $display->panels['main'][5] = 'new-16'; + $pane->locks = ''; + $display->content['new-32'] = $pane; + $display->panels['main'][5] = 'new-32'; $display->hide_title = PANELS_TITLE_FIXED; $display->title_pane = '0'; $handler->conf['display'] = $display; @@ -1079,7 +1083,7 @@ function ns_ch_web_default_page_manager_handlers() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-33'; $pane->panel = 'aside_alpha'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_article_facts-panel_pane_1'; @@ -1108,10 +1112,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['aside_alpha'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-33'] = $pane; + $display->panels['aside_alpha'][0] = 'new-33'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-34'; $pane->panel = 'aside_alpha'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_article_related'; @@ -1132,10 +1137,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-2'] = $pane; - $display->panels['aside_alpha'][1] = 'new-2'; + $pane->locks = ''; + $display->content['new-34'] = $pane; + $display->panels['aside_alpha'][1] = 'new-34'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-35'; $pane->panel = 'aside_beta'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_ad-panel_pane_1'; @@ -1163,10 +1169,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-3'] = $pane; - $display->panels['aside_beta'][0] = 'new-3'; + $pane->locks = ''; + $display->content['new-35'] = $pane; + $display->panels['aside_beta'][0] = 'new-35'; $pane = new stdClass; - $pane->pid = 'new-4'; + $pane->pid = 'new-36'; $pane->panel = 'footer_alpha'; $pane->type = 'panels_mini'; $pane->subtype = 'ns_ch_web_topic_panel'; @@ -1186,10 +1193,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-4'] = $pane; - $display->panels['footer_alpha'][0] = 'new-4'; + $pane->locks = ''; + $display->content['new-36'] = $pane; + $display->panels['footer_alpha'][0] = 'new-36'; $pane = new stdClass; - $pane->pid = 'new-5'; + $pane->pid = 'new-37'; $pane->panel = 'header_beta'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_article_media'; @@ -1212,10 +1220,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-5'] = $pane; - $display->panels['header_beta'][0] = 'new-5'; + $pane->locks = ''; + $display->content['new-37'] = $pane; + $display->panels['header_beta'][0] = 'new-37'; $pane = new stdClass; - $pane->pid = 'new-6'; + $pane->pid = 'new-38'; $pane->panel = 'header_beta'; $pane->type = 'node_date_custom'; $pane->subtype = 'node_date_custom'; @@ -1237,10 +1246,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-6'] = $pane; - $display->panels['header_beta'][1] = 'new-6'; + $pane->locks = ''; + $display->content['new-38'] = $pane; + $display->panels['header_beta'][1] = 'new-38'; $pane = new stdClass; - $pane->pid = 'new-7'; + $pane->pid = 'new-39'; $pane->panel = 'header_beta'; $pane->type = 'node_date_custom'; $pane->subtype = 'node_date_custom'; @@ -1262,10 +1272,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-7'] = $pane; - $display->panels['header_beta'][2] = 'new-7'; + $pane->locks = ''; + $display->content['new-39'] = $pane; + $display->panels['header_beta'][2] = 'new-39'; $pane = new stdClass; - $pane->pid = 'new-8'; + $pane->pid = 'new-40'; $pane->panel = 'header_beta'; $pane->type = 'page_title'; $pane->subtype = 'page_title'; @@ -1285,10 +1296,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 3; - $display->content['new-8'] = $pane; - $display->panels['header_beta'][3] = 'new-8'; + $pane->locks = ''; + $display->content['new-40'] = $pane; + $display->panels['header_beta'][3] = 'new-40'; $pane = new stdClass; - $pane->pid = 'new-9'; + $pane->pid = 'new-41'; $pane->panel = 'header_beta'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_article_kicker'; @@ -1309,10 +1321,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 4; - $display->content['new-9'] = $pane; - $display->panels['header_beta'][4] = 'new-9'; + $pane->locks = ''; + $display->content['new-41'] = $pane; + $display->panels['header_beta'][4] = 'new-41'; $pane = new stdClass; - $pane->pid = 'new-10'; + $pane->pid = 'new-42'; $pane->panel = 'header_beta'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_article_lead'; @@ -1333,10 +1346,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 5; - $display->content['new-10'] = $pane; - $display->panels['header_beta'][5] = 'new-10'; + $pane->locks = ''; + $display->content['new-42'] = $pane; + $display->panels['header_beta'][5] = 'new-42'; $pane = new stdClass; - $pane->pid = 'new-11'; + $pane->pid = 'new-43'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_article_body'; @@ -1357,10 +1371,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-11'] = $pane; - $display->panels['main'][0] = 'new-11'; + $pane->locks = ''; + $display->content['new-43'] = $pane; + $display->panels['main'][0] = 'new-43'; $pane = new stdClass; - $pane->pid = 'new-12'; + $pane->pid = 'new-44'; $pane->panel = 'main'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_article_forms-panel_pane_1'; @@ -1389,10 +1404,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-12'] = $pane; - $display->panels['main'][1] = 'new-12'; + $pane->locks = ''; + $display->content['new-44'] = $pane; + $display->panels['main'][1] = 'new-44'; $pane = new stdClass; - $pane->pid = 'new-13'; + $pane->pid = 'new-45'; $pane->panel = 'main'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_byline-panel_pane_1'; @@ -1410,10 +1426,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-13'] = $pane; - $display->panels['main'][2] = 'new-13'; + $pane->locks = ''; + $display->content['new-45'] = $pane; + $display->panels['main'][2] = 'new-45'; $pane = new stdClass; - $pane->pid = 'new-14'; + $pane->pid = 'new-46'; $pane->panel = 'main'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_article_polls-panel_pane_1'; @@ -1442,10 +1459,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 3; - $display->content['new-14'] = $pane; - $display->panels['main'][3] = 'new-14'; + $pane->locks = ''; + $display->content['new-46'] = $pane; + $display->panels['main'][3] = 'new-46'; $pane = new stdClass; - $pane->pid = 'new-15'; + $pane->pid = 'new-47'; $pane->panel = 'main'; $pane->type = 'node_comment_form'; $pane->subtype = 'node_comment_form'; @@ -1464,10 +1482,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 4; - $display->content['new-15'] = $pane; - $display->panels['main'][4] = 'new-15'; + $pane->locks = ''; + $display->content['new-47'] = $pane; + $display->panels['main'][4] = 'new-47'; $pane = new stdClass; - $pane->pid = 'new-16'; + $pane->pid = 'new-48'; $pane->panel = 'main'; $pane->type = 'node_comments'; $pane->subtype = 'node_comments'; @@ -1487,8 +1506,9 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 5; - $display->content['new-16'] = $pane; - $display->panels['main'][5] = 'new-16'; + $pane->locks = ''; + $display->content['new-48'] = $pane; + $display->panels['main'][5] = 'new-48'; $display->hide_title = PANELS_TITLE_FIXED; $display->title_pane = '0'; $handler->conf['display'] = $display; @@ -1531,7 +1551,7 @@ function ns_ch_web_default_page_manager_handlers() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-49'; $pane->panel = 'header_beta'; $pane->type = 'node_content'; $pane->subtype = 'node_content'; @@ -1555,10 +1575,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['header_beta'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-49'] = $pane; + $display->panels['header_beta'][0] = 'new-49'; $display->hide_title = PANELS_TITLE_FIXED; - $display->title_pane = 'new-1'; + $display->title_pane = 'new-49'; $handler->conf['display'] = $display; $export['ns_ch_web_default'] = $handler; @@ -1596,7 +1617,7 @@ function ns_ch_web_default_page_manager_handlers() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-50'; $pane->panel = 'branding'; $pane->type = 'block'; $pane->subtype = 'locale-language'; @@ -1626,10 +1647,11 @@ function ns_ch_web_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['branding'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-50'] = $pane; + $display->panels['branding'][0] = 'new-50'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-51'; $pane->panel = 'branding'; $pane->type = 'pane_header'; $pane->subtype = 'pane_header'; @@ -1650,10 +1672,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-2'] = $pane; - $display->panels['branding'][1] = 'new-2'; + $pane->locks = ''; + $display->content['new-51'] = $pane; + $display->panels['branding'][1] = 'new-51'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-52'; $pane->panel = 'branding'; $pane->type = 'today_date'; $pane->subtype = 'today_date'; @@ -1678,10 +1701,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-3'] = $pane; - $display->panels['branding'][2] = 'new-3'; + $pane->locks = ''; + $display->content['new-52'] = $pane; + $display->panels['branding'][2] = 'new-52'; $pane = new stdClass; - $pane->pid = 'new-4'; + $pane->pid = 'new-53'; $pane->panel = 'branding'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_blog_post_latest_header-panel_pane_1'; @@ -1715,10 +1739,11 @@ function ns_ch_web_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 3; - $display->content['new-4'] = $pane; - $display->panels['branding'][3] = 'new-4'; + $pane->locks = ''; + $display->content['new-53'] = $pane; + $display->panels['branding'][3] = 'new-53'; $pane = new stdClass; - $pane->pid = 'new-5'; + $pane->pid = 'new-54'; $pane->panel = 'branding'; $pane->type = 'block'; $pane->subtype = 'search-form'; @@ -1738,10 +1763,11 @@ function ns_ch_web_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 4; - $display->content['new-5'] = $pane; - $display->panels['branding'][4] = 'new-5'; + $pane->locks = ''; + $display->content['new-54'] = $pane; + $display->panels['branding'][4] = 'new-54'; $pane = new stdClass; - $pane->pid = 'new-6'; + $pane->pid = 'new-55'; $pane->panel = 'footer'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_rss_topic_footer-panel_pane_1'; @@ -1765,10 +1791,11 @@ function ns_ch_web_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 0; - $display->content['new-6'] = $pane; - $display->panels['footer'][0] = 'new-6'; + $pane->locks = ''; + $display->content['new-55'] = $pane; + $display->panels['footer'][0] = 'new-55'; $pane = new stdClass; - $pane->pid = 'new-7'; + $pane->pid = 'new-56'; $pane->panel = 'footer'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_footer_content-panel_pane_1'; @@ -1794,10 +1821,11 @@ function ns_ch_web_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 1; - $display->content['new-7'] = $pane; - $display->panels['footer'][1] = 'new-7'; + $pane->locks = ''; + $display->content['new-56'] = $pane; + $display->panels['footer'][1] = 'new-56'; $pane = new stdClass; - $pane->pid = 'new-8'; + $pane->pid = 'new-57'; $pane->panel = 'main'; $pane->type = 'page_messages'; $pane->subtype = 'page_messages'; @@ -1811,10 +1839,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-8'] = $pane; - $display->panels['main'][0] = 'new-8'; + $pane->locks = ''; + $display->content['new-57'] = $pane; + $display->panels['main'][0] = 'new-57'; $pane = new stdClass; - $pane->pid = 'new-9'; + $pane->pid = 'new-58'; $pane->panel = 'main'; $pane->type = 'pane_messages'; $pane->subtype = 'pane_messages'; @@ -1828,10 +1857,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-9'] = $pane; - $display->panels['main'][1] = 'new-9'; + $pane->locks = ''; + $display->content['new-58'] = $pane; + $display->panels['main'][1] = 'new-58'; $pane = new stdClass; - $pane->pid = 'new-10'; + $pane->pid = 'new-59'; $pane->panel = 'main'; $pane->type = 'page_tabs'; $pane->subtype = 'page_tabs'; @@ -1853,10 +1883,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-10'] = $pane; - $display->panels['main'][2] = 'new-10'; + $pane->locks = ''; + $display->content['new-59'] = $pane; + $display->panels['main'][2] = 'new-59'; $pane = new stdClass; - $pane->pid = 'new-11'; + $pane->pid = 'new-60'; $pane->panel = 'main'; $pane->type = 'page_content'; $pane->subtype = 'page_content'; @@ -1888,10 +1919,11 @@ function ns_ch_web_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 3; - $display->content['new-11'] = $pane; - $display->panels['main'][3] = 'new-11'; + $pane->locks = ''; + $display->content['new-60'] = $pane; + $display->panels['main'][3] = 'new-60'; $pane = new stdClass; - $pane->pid = 'new-12'; + $pane->pid = 'new-61'; $pane->panel = 'main'; $pane->type = 'page_content'; $pane->subtype = 'page_content'; @@ -1923,10 +1955,11 @@ function ns_ch_web_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 4; - $display->content['new-12'] = $pane; - $display->panels['main'][4] = 'new-12'; + $pane->locks = ''; + $display->content['new-61'] = $pane; + $display->panels['main'][4] = 'new-61'; $pane = new stdClass; - $pane->pid = 'new-13'; + $pane->pid = 'new-62'; $pane->panel = 'nav'; $pane->type = 'menu_tree'; $pane->subtype = 'main-menu'; @@ -1958,10 +1991,11 @@ function ns_ch_web_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 0; - $display->content['new-13'] = $pane; - $display->panels['nav'][0] = 'new-13'; + $pane->locks = ''; + $display->content['new-62'] = $pane; + $display->panels['nav'][0] = 'new-62'; $pane = new stdClass; - $pane->pid = 'new-14'; + $pane->pid = 'new-63'; $pane->panel = 'nav'; $pane->type = 'menu_tree'; $pane->subtype = 'main-menu'; @@ -1993,10 +2027,11 @@ function ns_ch_web_default_page_manager_handlers() { ); $pane->extras = array(); $pane->position = 1; - $display->content['new-14'] = $pane; - $display->panels['nav'][1] = 'new-14'; + $pane->locks = ''; + $display->content['new-63'] = $pane; + $display->panels['nav'][1] = 'new-63'; $display->hide_title = PANELS_TITLE_FIXED; - $display->title_pane = 'new-2'; + $display->title_pane = 'new-51'; $handler->conf['display'] = $display; $export['ns_ch_web_site_template'] = $handler; @@ -2037,7 +2072,7 @@ function ns_ch_web_default_page_manager_handlers() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-64'; $pane->panel = 'aside_alpha'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_topic-panel_pane_1'; @@ -2077,10 +2112,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['aside_alpha'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-64'] = $pane; + $display->panels['aside_alpha'][0] = 'new-64'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-65'; $pane->panel = 'aside_beta'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_ad-panel_pane_1'; @@ -2105,10 +2141,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-2'] = $pane; - $display->panels['aside_beta'][0] = 'new-2'; + $pane->locks = ''; + $display->content['new-65'] = $pane; + $display->panels['aside_beta'][0] = 'new-65'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-66'; $pane->panel = 'header_alpha'; $pane->type = 'rss_topic_add_topic'; $pane->subtype = 'rss_topic_add_topic'; @@ -2138,10 +2175,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-3'] = $pane; - $display->panels['header_alpha'][0] = 'new-3'; + $pane->locks = ''; + $display->content['new-66'] = $pane; + $display->panels['header_alpha'][0] = 'new-66'; $pane = new stdClass; - $pane->pid = 'new-4'; + $pane->pid = 'new-67'; $pane->panel = 'header_alpha'; $pane->type = 'rss_topic_add_all_topics'; $pane->subtype = 'rss_topic_add_all_topics'; @@ -2170,10 +2208,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-4'] = $pane; - $display->panels['header_alpha'][1] = 'new-4'; + $pane->locks = ''; + $display->content['new-67'] = $pane; + $display->panels['header_alpha'][1] = 'new-67'; $pane = new stdClass; - $pane->pid = 'new-5'; + $pane->pid = 'new-68'; $pane->panel = 'header_alpha'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_topic-panel_pane_1'; @@ -2213,10 +2252,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-5'] = $pane; - $display->panels['header_alpha'][2] = 'new-5'; + $pane->locks = ''; + $display->content['new-68'] = $pane; + $display->panels['header_alpha'][2] = 'new-68'; $pane = new stdClass; - $pane->pid = 'new-6'; + $pane->pid = 'new-69'; $pane->panel = 'header_beta'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_topic-panel_pane_1'; @@ -2256,10 +2296,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-6'] = $pane; - $display->panels['header_beta'][0] = 'new-6'; + $pane->locks = ''; + $display->content['new-69'] = $pane; + $display->panels['header_beta'][0] = 'new-69'; $pane = new stdClass; - $pane->pid = 'new-7'; + $pane->pid = 'new-70'; $pane->panel = 'main'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_topic-panel_pane_1'; @@ -2299,10 +2340,11 @@ function ns_ch_web_default_page_manager_handlers() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-7'] = $pane; - $display->panels['main'][0] = 'new-7'; + $pane->locks = ''; + $display->content['new-70'] = $pane; + $display->panels['main'][0] = 'new-70'; $display->hide_title = PANELS_TITLE_FIXED; - $display->title_pane = 'new-7'; + $display->title_pane = 'new-70'; $handler->conf['display'] = $display; $export['ns_ch_web_topic'] = $handler; @@ -2426,7 +2468,7 @@ function ns_ch_web_default_page_manager_pages() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-71'; $pane->panel = 'middle'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_article_promos-panel_pane_1'; @@ -2440,10 +2482,11 @@ function ns_ch_web_default_page_manager_pages() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['middle'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-71'] = $pane; + $display->panels['middle'][0] = 'new-71'; $display->hide_title = PANELS_TITLE_FIXED; - $display->title_pane = 'new-1'; + $display->title_pane = 'new-71'; $handler->conf['display'] = $display; $page->default_handlers[$handler->name] = $handler; $pages['ns_ch_web_promos'] = $page; @@ -2537,7 +2580,7 @@ function ns_ch_web_default_page_manager_pages() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-72'; $pane->panel = 'middle'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_topic-panel_pane_2'; @@ -2556,10 +2599,11 @@ function ns_ch_web_default_page_manager_pages() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['middle'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-72'] = $pane; + $display->panels['middle'][0] = 'new-72'; $display->hide_title = PANELS_TITLE_FIXED; - $display->title_pane = 'new-1'; + $display->title_pane = 'new-72'; $handler->conf['display'] = $display; $page->default_handlers[$handler->name] = $handler; $pages['ns_ch_web_topic_editor'] = $page; diff --git a/features/ns_ch_web/ns_ch_web.panels_default.inc b/features/ns_ch_web/ns_ch_web.panels_default.inc index b48229a..e8c1475 100644 --- a/features/ns_ch_web/ns_ch_web.panels_default.inc +++ b/features/ns_ch_web/ns_ch_web.panels_default.inc @@ -55,7 +55,7 @@ function ns_ch_web_default_panels_mini() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-73'; $pane->panel = 'left'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -92,10 +92,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['left'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-73'] = $pane; + $display->panels['left'][0] = 'new-73'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-74'; $pane->panel = 'left'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -131,10 +132,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-2'] = $pane; - $display->panels['left'][1] = 'new-2'; + $pane->locks = ''; + $display->content['new-74'] = $pane; + $display->panels['left'][1] = 'new-74'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-75'; $pane->panel = 'left'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -180,10 +182,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-3'] = $pane; - $display->panels['left'][2] = 'new-3'; + $pane->locks = ''; + $display->content['new-75'] = $pane; + $display->panels['left'][2] = 'new-75'; $pane = new stdClass; - $pane->pid = 'new-4'; + $pane->pid = 'new-76'; $pane->panel = 'right'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_article'; @@ -191,8 +194,10 @@ function ns_ch_web_default_panels_mini() { $pane->access = array(); $pane->configuration = array( 'label' => 'hidden', - 'formatter' => 'node_reference_default', - 'formatter_settings' => array(), + 'formatter' => 'entityreference_label', + 'formatter_settings' => array( + 'link' => 1, + ), 'context' => 'requiredcontext_entity:node_1', 'override_title' => 1, 'override_title_text' => '', @@ -205,10 +210,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-4'] = $pane; - $display->panels['right'][0] = 'new-4'; + $pane->locks = ''; + $display->content['new-76'] = $pane; + $display->panels['right'][0] = 'new-76'; $pane = new stdClass; - $pane->pid = 'new-5'; + $pane->pid = 'new-77'; $pane->panel = 'right'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_kicker'; @@ -230,10 +236,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-5'] = $pane; - $display->panels['right'][1] = 'new-5'; + $pane->locks = ''; + $display->content['new-77'] = $pane; + $display->panels['right'][1] = 'new-77'; $pane = new stdClass; - $pane->pid = 'new-6'; + $pane->pid = 'new-78'; $pane->panel = 'right'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_lead'; @@ -255,10 +262,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-6'] = $pane; - $display->panels['right'][2] = 'new-6'; + $pane->locks = ''; + $display->content['new-78'] = $pane; + $display->panels['right'][2] = 'new-78'; $display->hide_title = PANELS_TITLE_FIXED; - $display->title_pane = 'new-1'; + $display->title_pane = 'new-73'; $mini->display = $display; $export['ns_ch_web_c_l_a_2_col'] = $mini; @@ -313,7 +321,7 @@ function ns_ch_web_default_panels_mini() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-79'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -349,10 +357,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['main'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-79'] = $pane; + $display->panels['main'][0] = 'new-79'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-80'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -389,10 +398,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-2'] = $pane; - $display->panels['main'][1] = 'new-2'; + $pane->locks = ''; + $display->content['new-80'] = $pane; + $display->panels['main'][1] = 'new-80'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-81'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -428,10 +438,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-3'] = $pane; - $display->panels['main'][2] = 'new-3'; + $pane->locks = ''; + $display->content['new-81'] = $pane; + $display->panels['main'][2] = 'new-81'; $pane = new stdClass; - $pane->pid = 'new-4'; + $pane->pid = 'new-82'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -468,10 +479,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 3; - $display->content['new-4'] = $pane; - $display->panels['main'][3] = 'new-4'; + $pane->locks = ''; + $display->content['new-82'] = $pane; + $display->panels['main'][3] = 'new-82'; $pane = new stdClass; - $pane->pid = 'new-5'; + $pane->pid = 'new-83'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_article'; @@ -479,8 +491,10 @@ function ns_ch_web_default_panels_mini() { $pane->access = array(); $pane->configuration = array( 'label' => 'hidden', - 'formatter' => 'node_reference_default', - 'formatter_settings' => array(), + 'formatter' => 'entityreference_label', + 'formatter_settings' => array( + 'link' => 1, + ), 'context' => 'requiredcontext_entity:node_1', 'override_title' => 1, 'override_title_text' => '', @@ -493,10 +507,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 4; - $display->content['new-5'] = $pane; - $display->panels['main'][4] = 'new-5'; + $pane->locks = ''; + $display->content['new-83'] = $pane; + $display->panels['main'][4] = 'new-83'; $pane = new stdClass; - $pane->pid = 'new-6'; + $pane->pid = 'new-84'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_kicker'; @@ -518,10 +533,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 5; - $display->content['new-6'] = $pane; - $display->panels['main'][5] = 'new-6'; + $pane->locks = ''; + $display->content['new-84'] = $pane; + $display->panels['main'][5] = 'new-84'; $pane = new stdClass; - $pane->pid = 'new-7'; + $pane->pid = 'new-85'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_lead'; @@ -543,8 +559,9 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 6; - $display->content['new-7'] = $pane; - $display->panels['main'][6] = 'new-7'; + $pane->locks = ''; + $display->content['new-85'] = $pane; + $display->panels['main'][6] = 'new-85'; $display->hide_title = PANELS_TITLE_FIXED; $display->title_pane = '0'; $mini->display = $display; @@ -553,6 +570,120 @@ function ns_ch_web_default_panels_mini() { $mini = new stdClass; $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */ $mini->api_version = 1; + $mini->name = 'ns_ch_web_contributor'; + $mini->category = ''; + $mini->admin_title = 'Contributor'; + $mini->admin_description = 'Contributor'; + $mini->requiredcontexts = array( + 0 => array( + 'identifier' => 'Node', + 'keyword' => 'node', + 'name' => 'entity:node', + 'id' => 1, + ), + ); + $mini->contexts = array(); + $mini->relationships = array(); + $display = new panels_display; + $display->layout = 'ns_core_naked'; + $display->layout_settings = array(); + $display->panel_settings = array( + 'style_settings' => array( + 'default' => NULL, + 'main' => NULL, + 'left' => NULL, + 'right' => NULL, + ), + ); + $display->cache = array(); + $display->title = ''; + $display->content = array(); + $display->panels = array(); + $pane = new stdClass; + $pane->pid = 'new-86'; + $pane->panel = 'main'; + $pane->type = 'entity_field'; + $pane->subtype = 'node:field_ns_contributor_photo'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'label' => 'hidden', + 'formatter' => 'image', + 'formatter_settings' => array( + 'image_style' => 'grid-4', + 'image_link' => '', + ), + 'context' => 'requiredcontext_entity:node_1', + 'override_title' => 1, + 'override_title_text' => '', + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + 'style' => 'naked', + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 0; + $pane->locks = ''; + $display->content['new-86'] = $pane; + $display->panels['main'][0] = 'new-86'; + $pane = new stdClass; + $pane->pid = 'new-87'; + $pane->panel = 'main'; + $pane->type = 'node_title'; + $pane->subtype = 'node_title'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'link' => 0, + 'context' => 'requiredcontext_entity:node_1', + 'override_title' => 1, + 'override_title_text' => '', + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + 'style' => 'naked', + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 1; + $pane->locks = ''; + $display->content['new-87'] = $pane; + $display->panels['main'][1] = 'new-87'; + $pane = new stdClass; + $pane->pid = 'new-88'; + $pane->panel = 'main'; + $pane->type = 'custom'; + $pane->subtype = 'custom'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'admin_title' => '', + 'title' => '', + 'body' => '
%node:field-ns-contributor-email', + 'format' => 'full_html', + 'substitute' => 1, + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 2; + $pane->locks = array(); + $display->content['new-88'] = $pane; + $display->panels['main'][2] = 'new-88'; + $display->hide_title = PANELS_TITLE_FIXED; + $display->title_pane = 'new-87'; + $mini->display = $display; + $export['ns_ch_web_contributor'] = $mini; + + $mini = new stdClass; + $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */ + $mini->api_version = 1; $mini->name = 'ns_ch_web_p_l_a'; $mini->category = ''; $mini->admin_title = 'Parent style: Left attachment'; @@ -600,7 +731,7 @@ function ns_ch_web_default_panels_mini() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-89'; $pane->panel = 'left'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -637,10 +768,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['left'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-89'] = $pane; + $display->panels['left'][0] = 'new-89'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-90'; $pane->panel = 'left'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -677,10 +809,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-2'] = $pane; - $display->panels['left'][1] = 'new-2'; + $pane->locks = ''; + $display->content['new-90'] = $pane; + $display->panels['left'][1] = 'new-90'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-91'; $pane->panel = 'right'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_article'; @@ -688,8 +821,10 @@ function ns_ch_web_default_panels_mini() { $pane->access = array(); $pane->configuration = array( 'label' => 'hidden', - 'formatter' => 'node_reference_default', - 'formatter_settings' => array(), + 'formatter' => 'entityreference_label', + 'formatter_settings' => array( + 'link' => 1, + ), 'context' => 'requiredcontext_entity:node_1', 'override_title' => 1, 'override_title_text' => '', @@ -702,10 +837,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-3'] = $pane; - $display->panels['right'][0] = 'new-3'; + $pane->locks = ''; + $display->content['new-91'] = $pane; + $display->panels['right'][0] = 'new-91'; $pane = new stdClass; - $pane->pid = 'new-4'; + $pane->pid = 'new-92'; $pane->panel = 'right'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_kicker'; @@ -727,10 +863,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-4'] = $pane; - $display->panels['right'][1] = 'new-4'; + $pane->locks = ''; + $display->content['new-92'] = $pane; + $display->panels['right'][1] = 'new-92'; $pane = new stdClass; - $pane->pid = 'new-5'; + $pane->pid = 'new-93'; $pane->panel = 'right'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_lead'; @@ -752,10 +889,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-5'] = $pane; - $display->panels['right'][2] = 'new-5'; + $pane->locks = ''; + $display->content['new-93'] = $pane; + $display->panels['right'][2] = 'new-93'; $display->hide_title = PANELS_TITLE_FIXED; - $display->title_pane = 'new-1'; + $display->title_pane = 'new-89'; $mini->display = $display; $export['ns_ch_web_p_l_a'] = $mini; @@ -810,7 +948,7 @@ function ns_ch_web_default_panels_mini() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-94'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -846,10 +984,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['main'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-94'] = $pane; + $display->panels['main'][0] = 'new-94'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-95'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -886,10 +1025,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 1; - $display->content['new-2'] = $pane; - $display->panels['main'][1] = 'new-2'; + $pane->locks = ''; + $display->content['new-95'] = $pane; + $display->panels['main'][1] = 'new-95'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-96'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -925,10 +1065,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 2; - $display->content['new-3'] = $pane; - $display->panels['main'][2] = 'new-3'; + $pane->locks = ''; + $display->content['new-96'] = $pane; + $display->panels['main'][2] = 'new-96'; $pane = new stdClass; - $pane->pid = 'new-4'; + $pane->pid = 'new-97'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_media'; @@ -965,10 +1106,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 3; - $display->content['new-4'] = $pane; - $display->panels['main'][3] = 'new-4'; + $pane->locks = ''; + $display->content['new-97'] = $pane; + $display->panels['main'][3] = 'new-97'; $pane = new stdClass; - $pane->pid = 'new-5'; + $pane->pid = 'new-98'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_article'; @@ -976,8 +1118,10 @@ function ns_ch_web_default_panels_mini() { $pane->access = array(); $pane->configuration = array( 'label' => 'hidden', - 'formatter' => 'node_reference_default', - 'formatter_settings' => array(), + 'formatter' => 'entityreference_label', + 'formatter_settings' => array( + 'link' => 1, + ), 'context' => 'requiredcontext_entity:node_1', 'override_title' => 1, 'override_title_text' => '', @@ -990,10 +1134,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 4; - $display->content['new-5'] = $pane; - $display->panels['main'][4] = 'new-5'; + $pane->locks = ''; + $display->content['new-98'] = $pane; + $display->panels['main'][4] = 'new-98'; $pane = new stdClass; - $pane->pid = 'new-6'; + $pane->pid = 'new-99'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_kicker'; @@ -1015,10 +1160,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 5; - $display->content['new-6'] = $pane; - $display->panels['main'][5] = 'new-6'; + $pane->locks = ''; + $display->content['new-99'] = $pane; + $display->panels['main'][5] = 'new-99'; $pane = new stdClass; - $pane->pid = 'new-7'; + $pane->pid = 'new-100'; $pane->panel = 'main'; $pane->type = 'entity_field'; $pane->subtype = 'node:field_ns_ch_web_promo_lead'; @@ -1040,8 +1186,9 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 6; - $display->content['new-7'] = $pane; - $display->panels['main'][6] = 'new-7'; + $pane->locks = ''; + $display->content['new-100'] = $pane; + $display->panels['main'][6] = 'new-100'; $display->hide_title = PANELS_TITLE_FIXED; $display->title_pane = '0'; $mini->display = $display; @@ -1050,6 +1197,73 @@ function ns_ch_web_default_panels_mini() { $mini = new stdClass; $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */ $mini->api_version = 1; + $mini->name = 'ns_ch_web_teaser'; + $mini->category = ''; + $mini->admin_title = 'Web Teaser'; + $mini->admin_description = 'This is a teaser panel pan that can be used for various teasers'; + $mini->requiredcontexts = array( + 0 => array( + 'identifier' => 'Node', + 'keyword' => 'node', + 'name' => 'entity:node', + 'id' => 1, + ), + ); + $mini->contexts = array(); + $mini->relationships = array(); + $display = new panels_display; + $display->layout = 'precision_naked'; + $display->layout_settings = array(); + $display->panel_settings = array( + 'style_settings' => array( + 'default' => NULL, + 'main' => NULL, + ), + 'style' => 'naked', + 'main' => array( + 'style' => 'naked', + ), + ); + $display->cache = array(); + $display->title = ''; + $display->content = array(); + $display->panels = array(); + $pane = new stdClass; + $pane->pid = 'new-101'; + $pane->panel = 'main'; + $pane->type = 'node_content'; + $pane->subtype = 'node_content'; + $pane->shown = TRUE; + $pane->access = array(); + $pane->configuration = array( + 'links' => 0, + 'no_extras' => 1, + 'override_title' => 0, + 'override_title_text' => '', + 'identifier' => '', + 'link' => 0, + 'leave_node_title' => 0, + 'build_mode' => 'teaser', + 'context' => 'requiredcontext_entity:node_1', + ); + $pane->cache = array(); + $pane->style = array( + 'settings' => NULL, + ); + $pane->css = array(); + $pane->extras = array(); + $pane->position = 0; + $pane->locks = ''; + $display->content['new-101'] = $pane; + $display->panels['main'][0] = 'new-101'; + $display->hide_title = PANELS_TITLE_FIXED; + $display->title_pane = 'new-101'; + $mini->display = $display; + $export['ns_ch_web_teaser'] = $mini; + + $mini = new stdClass; + $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */ + $mini->api_version = 1; $mini->name = 'ns_ch_web_topic_panel'; $mini->category = ''; $mini->admin_title = 'Topic Panel'; @@ -1093,7 +1307,7 @@ function ns_ch_web_default_panels_mini() { $display->content = array(); $display->panels = array(); $pane = new stdClass; - $pane->pid = 'new-1'; + $pane->pid = 'new-102'; $pane->panel = 'aside_alpha'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_topic-panel_pane_1'; @@ -1116,10 +1330,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-1'] = $pane; - $display->panels['aside_alpha'][0] = 'new-1'; + $pane->locks = ''; + $display->content['new-102'] = $pane; + $display->panels['aside_alpha'][0] = 'new-102'; $pane = new stdClass; - $pane->pid = 'new-2'; + $pane->pid = 'new-103'; $pane->panel = 'header_alpha'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_topic-panel_pane_1'; @@ -1142,10 +1357,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-2'] = $pane; - $display->panels['header_alpha'][0] = 'new-2'; + $pane->locks = ''; + $display->content['new-103'] = $pane; + $display->panels['header_alpha'][0] = 'new-103'; $pane = new stdClass; - $pane->pid = 'new-3'; + $pane->pid = 'new-104'; $pane->panel = 'header_beta'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_topic-panel_pane_1'; @@ -1168,10 +1384,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-3'] = $pane; - $display->panels['header_beta'][0] = 'new-3'; + $pane->locks = ''; + $display->content['new-104'] = $pane; + $display->panels['header_beta'][0] = 'new-104'; $pane = new stdClass; - $pane->pid = 'new-4'; + $pane->pid = 'new-105'; $pane->panel = 'main'; $pane->type = 'views_panes'; $pane->subtype = 'ns_ch_web_topic-panel_pane_1'; @@ -1194,10 +1411,11 @@ function ns_ch_web_default_panels_mini() { $pane->css = array(); $pane->extras = array(); $pane->position = 0; - $display->content['new-4'] = $pane; - $display->panels['main'][0] = 'new-4'; + $pane->locks = ''; + $display->content['new-105'] = $pane; + $display->panels['main'][0] = 'new-105'; $display->hide_title = PANELS_TITLE_FIXED; - $display->title_pane = 'new-3'; + $display->title_pane = 'new-104'; $mini->display = $display; $export['ns_ch_web_topic_panel'] = $mini; diff --git a/features/ns_ch_web/ns_ch_web.views_default.inc b/features/ns_ch_web/ns_ch_web.views_default.inc index 7acde39..7bccd2d 100644 --- a/features/ns_ch_web/ns_ch_web.views_default.inc +++ b/features/ns_ch_web/ns_ch_web.views_default.inc @@ -208,13 +208,12 @@ function ns_ch_web_views_default_views() { $handler->display->display_options['row_plugin'] = 'fields'; $handler->display->display_options['row_options']['hide_empty'] = 0; $handler->display->display_options['row_options']['default_field_elements'] = 0; - /* Relationship: Content (historical data): Facts (field_ns_fact_ns_article_fact) */ + /* Relationship: Broken/missing handler */ $handler->display->display_options['relationships']['field_ns_fact_ns_article_fact_nid']['id'] = 'field_ns_fact_ns_article_fact_nid'; $handler->display->display_options['relationships']['field_ns_fact_ns_article_fact_nid']['table'] = 'field_revision_field_ns_fact_ns_article_fact'; $handler->display->display_options['relationships']['field_ns_fact_ns_article_fact_nid']['field'] = 'field_ns_fact_ns_article_fact_nid'; $handler->display->display_options['relationships']['field_ns_fact_ns_article_fact_nid']['label'] = 'facts'; $handler->display->display_options['relationships']['field_ns_fact_ns_article_fact_nid']['required'] = 1; - $handler->display->display_options['relationships']['field_ns_fact_ns_article_fact_nid']['delta'] = '-1'; /* Field: Content: Title */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; @@ -359,13 +358,12 @@ function ns_ch_web_views_default_views() { $handler->display->display_options['row_options']['view_mode'] = 'full'; $handler->display->display_options['row_options']['links'] = 0; $handler->display->display_options['row_options']['comments'] = 0; - /* Relationship: Content (historical data): Forms (field_ns_form_ns_article_form) */ + /* Relationship: Broken/missing handler */ $handler->display->display_options['relationships']['field_ns_form_ns_article_form_nid']['id'] = 'field_ns_form_ns_article_form_nid'; $handler->display->display_options['relationships']['field_ns_form_ns_article_form_nid']['table'] = 'field_revision_field_ns_form_ns_article_form'; $handler->display->display_options['relationships']['field_ns_form_ns_article_form_nid']['field'] = 'field_ns_form_ns_article_form_nid'; $handler->display->display_options['relationships']['field_ns_form_ns_article_form_nid']['label'] = 'forms'; $handler->display->display_options['relationships']['field_ns_form_ns_article_form_nid']['required'] = 1; - $handler->display->display_options['relationships']['field_ns_form_ns_article_form_nid']['delta'] = '-1'; /* Contextual filter: Content: Nid */ $handler->display->display_options['arguments']['nid']['id'] = 'nid'; $handler->display->display_options['arguments']['nid']['table'] = 'node'; @@ -458,13 +456,12 @@ function ns_ch_web_views_default_views() { $handler->display->display_options['row_options']['view_mode'] = 'full'; $handler->display->display_options['row_options']['links'] = 0; $handler->display->display_options['row_options']['comments'] = 0; - /* Relationship: Content (historical data): Polls (field_ns_poll_ns_article_poll) */ + /* Relationship: Broken/missing handler */ $handler->display->display_options['relationships']['field_ns_poll_ns_article_poll_nid']['id'] = 'field_ns_poll_ns_article_poll_nid'; $handler->display->display_options['relationships']['field_ns_poll_ns_article_poll_nid']['table'] = 'field_revision_field_ns_poll_ns_article_poll'; $handler->display->display_options['relationships']['field_ns_poll_ns_article_poll_nid']['field'] = 'field_ns_poll_ns_article_poll_nid'; $handler->display->display_options['relationships']['field_ns_poll_ns_article_poll_nid']['label'] = 'polls'; $handler->display->display_options['relationships']['field_ns_poll_ns_article_poll_nid']['required'] = 1; - $handler->display->display_options['relationships']['field_ns_poll_ns_article_poll_nid']['delta'] = '-1'; /* Contextual filter: Content: Nid */ $handler->display->display_options['arguments']['nid']['id'] = 'nid'; $handler->display->display_options['arguments']['nid']['table'] = 'node'; @@ -689,7 +686,7 @@ function ns_ch_web_views_default_views() { $handler->display->display_options['sorts']['created']['table'] = 'node'; $handler->display->display_options['sorts']['created']['field'] = 'created'; $handler->display->display_options['sorts']['created']['order'] = 'DESC'; - /* Contextual filter: Content: Article (field_ns_ch_web_promo_article) */ + /* Contextual filter: Broken/missing handler */ $handler->display->display_options['arguments']['field_ns_ch_web_promo_article_nid']['id'] = 'field_ns_ch_web_promo_article_nid'; $handler->display->display_options['arguments']['field_ns_ch_web_promo_article_nid']['table'] = 'field_data_field_ns_ch_web_promo_article'; $handler->display->display_options['arguments']['field_ns_ch_web_promo_article_nid']['field'] = 'field_ns_ch_web_promo_article_nid'; @@ -704,8 +701,6 @@ function ns_ch_web_views_default_views() { 'ns_article' => 'ns_article', ); $handler->display->display_options['arguments']['field_ns_ch_web_promo_article_nid']['validate_options']['access'] = 0; - $handler->display->display_options['arguments']['field_ns_ch_web_promo_article_nid']['break_phrase'] = 0; - $handler->display->display_options['arguments']['field_ns_ch_web_promo_article_nid']['not'] = 0; /* Filter criterion: Content: Type */ $handler->display->display_options['filters']['type']['id'] = 'type'; $handler->display->display_options['filters']['type']['table'] = 'node'; @@ -771,12 +766,11 @@ function ns_ch_web_views_default_views() { $handler->display->display_options['row_plugin'] = 'fields'; $handler->display->display_options['row_options']['hide_empty'] = 0; $handler->display->display_options['row_options']['default_field_elements'] = 0; - /* Relationship: Content: Byline (field_ns_article_byline) */ + /* Relationship: Broken/missing handler */ $handler->display->display_options['relationships']['field_ns_article_byline_nid']['id'] = 'field_ns_article_byline_nid'; $handler->display->display_options['relationships']['field_ns_article_byline_nid']['table'] = 'field_data_field_ns_article_byline'; $handler->display->display_options['relationships']['field_ns_article_byline_nid']['field'] = 'field_ns_article_byline_nid'; $handler->display->display_options['relationships']['field_ns_article_byline_nid']['required'] = 1; - $handler->display->display_options['relationships']['field_ns_article_byline_nid']['delta'] = '-1'; /* Field: Content: Photo */ $handler->display->display_options['fields']['field_ns_contributor_photo']['id'] = 'field_ns_contributor_photo'; $handler->display->display_options['fields']['field_ns_contributor_photo']['table'] = 'field_data_field_ns_contributor_photo'; @@ -912,7 +906,7 @@ function ns_ch_web_views_default_views() { t('Items per page'), t('- All -'), t('Offset'), - t('field_ns_article_byline'), + t('field_ns_article_byline_nid'), t('mailto:[field_ns_contributor_email]'), t('All'), t('Article Byline'), @@ -1058,12 +1052,12 @@ function ns_ch_web_views_default_views() { ), ), ); - /* Relationship: Content: Article (field_ns_ch_web_promo_article) */ - $handler->display->display_options['relationships']['field_ns_ch_web_promo_article_nid']['id'] = 'field_ns_ch_web_promo_article_nid'; - $handler->display->display_options['relationships']['field_ns_ch_web_promo_article_nid']['table'] = 'field_data_field_ns_ch_web_promo_article'; - $handler->display->display_options['relationships']['field_ns_ch_web_promo_article_nid']['field'] = 'field_ns_ch_web_promo_article_nid'; - $handler->display->display_options['relationships']['field_ns_ch_web_promo_article_nid']['required'] = 1; - $handler->display->display_options['relationships']['field_ns_ch_web_promo_article_nid']['delta'] = '0'; + /* Relationship: Entity Reference: Referenced Entity */ + $handler->display->display_options['relationships']['field_ns_ch_web_promo_article_target_id']['id'] = 'field_ns_ch_web_promo_article_target_id'; + $handler->display->display_options['relationships']['field_ns_ch_web_promo_article_target_id']['table'] = 'field_data_field_ns_ch_web_promo_article'; + $handler->display->display_options['relationships']['field_ns_ch_web_promo_article_target_id']['field'] = 'field_ns_ch_web_promo_article_target_id'; + $handler->display->display_options['relationships']['field_ns_ch_web_promo_article_target_id']['label'] = 'article'; + $handler->display->display_options['relationships']['field_ns_ch_web_promo_article_target_id']['required'] = 0; /* Field: Content: Nid */ $handler->display->display_options['fields']['nid']['id'] = 'nid'; $handler->display->display_options['fields']['nid']['table'] = 'node'; @@ -1308,7 +1302,7 @@ function ns_ch_web_views_default_views() { $handler->display->display_options['filters']['status_1']['id'] = 'status_1'; $handler->display->display_options['filters']['status_1']['table'] = 'node'; $handler->display->display_options['filters']['status_1']['field'] = 'status'; - $handler->display->display_options['filters']['status_1']['relationship'] = 'field_ns_ch_web_promo_article_nid'; + $handler->display->display_options['filters']['status_1']['relationship'] = 'field_ns_ch_web_promo_article_target_id'; $handler->display->display_options['filters']['status_1']['value'] = '1'; /* Display: Topic Listing */ @@ -1698,7 +1692,7 @@ function ns_ch_web_views_default_views() { t('Items per page'), t('- All -'), t('Offset'), - t('field_ns_ch_web_promo_article'), + t('article'), t('Parent'), t('node/[nid]'), t('Read more'), diff --git a/features/ns_contributor/ns_contributor.features.field.inc b/features/ns_contributor/ns_contributor.features.field.inc index 9b1e382..cdf9e1d 100644 --- a/features/ns_contributor/ns_contributor.features.field.inc +++ b/features/ns_contributor/ns_contributor.features.field.inc @@ -275,36 +275,26 @@ function ns_contributor_defaultconfig_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_ns_contributor_user', - 'foreign keys' => array( - 'uid' => array( - 'columns' => array( - 'uid' => 'uid', - ), - 'table' => 'users', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'uid' => array( - 0 => 'uid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'user_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_roles' => array( - 2 => 0, - ), - 'referenceable_status' => array( - 0 => 0, - 1 => '1', - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'user' => 'user', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'user', ), - 'translatable' => '1', - 'type' => 'user_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_contributor', @@ -314,23 +304,27 @@ function ns_contributor_defaultconfig_field_default_fields() { 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'user_reference', - 'settings' => array(), - 'type' => 'user_reference_plain', - 'weight' => '3', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, ), 'search_index' => array( - 'label' => 'hidden', - 'module' => 'user_reference', - 'settings' => array(), - 'type' => 'user_reference_default', - 'weight' => '3', + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, ), 'search_result' => array( - 'label' => 'above', + 'label' => 'hidden', 'settings' => array(), 'type' => 'hidden', - 'weight' => '2', + 'weight' => '8', ), 'teaser' => array( 'label' => 'above', @@ -344,22 +338,26 @@ function ns_contributor_defaultconfig_field_default_fields() { 'label' => 'User', 'required' => 0, 'settings' => array( + 'crossclone' => array( + 'couple_setting' => 0, + 'coupling' => 0, + 'delete_setting' => 0, + ), 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, - 'module' => 'user_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'user_reference/autocomplete', - 'references_dialog_add' => 0, - 'references_dialog_edit' => 0, - 'references_dialog_search' => 0, - 'references_dialog_search_view' => '', + 'match_operator' => 'CONTAINS', + 'path' => '', + 'references_dialog_add' => 1, + 'references_dialog_edit' => 1, + 'references_dialog_search' => 1, 'size' => '60', ), - 'type' => 'user_reference_autocomplete', - 'weight' => '5', + 'type' => 'entityreference_autocomplete', + 'weight' => '4', ), ), ); diff --git a/features/ns_contributor/ns_contributor.info b/features/ns_contributor/ns_contributor.info index 6428bca..bc57671 100644 --- a/features/ns_contributor/ns_contributor.info +++ b/features/ns_contributor/ns_contributor.info @@ -8,7 +8,7 @@ dependencies[] = "number" dependencies[] = "options" dependencies[] = "strongarm" dependencies[] = "defaultconfig" -dependencies[] = "user_reference" +dependencies[] = "entityreference" description = "Adds a contributor content type that lets you describe different contributors on the site" features[ctools][] = "strongarm:strongarm:1" features[node][] = "ns_contributor" diff --git a/features/ns_contributor/ns_contributor.install b/features/ns_contributor/ns_contributor.install index 6591054..c8c11d4 100644 --- a/features/ns_contributor/ns_contributor.install +++ b/features/ns_contributor/ns_contributor.install @@ -4,3 +4,11 @@ function ns_contributor_install() { drupal_flush_all_caches(); ns_core_set_bundle_enabled_view_modes('node', 'ns_contributor', array('search_index', 'search_result')); } + +/** + * Migrate contributor user field into an entity reference field. + */ +function ns_contributor_update_7201() { + module_load_include('install', 'ns_core'); + ns_core_migrate_references_field('ns_contributor_user'); +} \ No newline at end of file diff --git a/features/ns_fact/ns_fact.features.field.inc b/features/ns_fact/ns_fact.features.field.inc index 6e9b625..ebdf5db 100644 --- a/features/ns_fact/ns_fact.features.field.inc +++ b/features/ns_fact/ns_fact.features.field.inc @@ -18,62 +18,56 @@ function ns_fact_defaultconfig_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_ns_fact_ns_article_fact', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'ns_article' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 0, - 'ns_fact' => 'ns_fact', - 'poll' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_fact' => 'ns_fact', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_article', 'default_value' => NULL, 'deleted' => '0', - 'description' => 'Facts is fact boxes that are displayed along with the article. Fact boxes contains a title and a body text, but no images of their own.', + 'description' => '', 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '7', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, ), 'search_index' => array( - 'label' => 'hidden', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '5', + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, ), 'search_result' => array( - 'label' => 'above', + 'label' => 'hidden', 'settings' => array(), 'type' => 'hidden', - 'weight' => '2', + 'weight' => '8', ), 'teaser' => array( 'label' => 'above', @@ -96,18 +90,17 @@ function ns_fact_defaultconfig_field_default_fields() { ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 1, 'references_dialog_edit' => 1, 'references_dialog_search' => 1, - 'references_dialog_search_view' => 'ns_article_reference_search:references_dialog_1', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', - 'weight' => '8', + 'type' => 'entityreference_autocomplete', + 'weight' => '4', ), ), ); @@ -152,10 +145,11 @@ function ns_fact_defaultconfig_field_default_fields() { 'weight' => '0', ), 'teaser' => array( - 'label' => 'above', + 'label' => 'hidden', + 'module' => 'text', 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, + 'type' => 'text_default', + 'weight' => '0', ), ), 'entity_type' => 'node', diff --git a/features/ns_fact/ns_fact.info b/features/ns_fact/ns_fact.info index 3328e4a..a47b298 100644 --- a/features/ns_fact/ns_fact.info +++ b/features/ns_fact/ns_fact.info @@ -1,7 +1,7 @@ core = "7.x" dependencies[] = "features" dependencies[] = "field_group" -dependencies[] = "node_reference" +dependencies[] = "entityreference" dependencies[] = "ns_article" dependencies[] = "strongarm" dependencies[] = "defaultconfig" diff --git a/features/ns_fact/ns_fact.install b/features/ns_fact/ns_fact.install new file mode 100644 index 0000000..50ab763 --- /dev/null +++ b/features/ns_fact/ns_fact.install @@ -0,0 +1,10 @@ + '0', 'entity_types' => array(), 'field_name' => 'field_ns_form_ns_article_form', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'ns_article' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 0, - 'ns_fact' => 0, - 'ns_form' => 'ns_form', - 'poll' => 0, - 'webform' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_form' => 'ns_form', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_article', @@ -59,29 +47,30 @@ function ns_form_defaultconfig_field_default_fields() { 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '11', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, ), 'search_index' => array( - 'label' => 'hidden', - 'module' => 'node_reference', + 'label' => 'above', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '8', + 'type' => 'hidden', + 'weight' => 0, ), 'search_result' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '4', + 'weight' => 0, ), 'teaser' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => 0, + 'weight' => '0', ), ), 'entity_type' => 'node', @@ -89,27 +78,22 @@ function ns_form_defaultconfig_field_default_fields() { 'label' => 'Forms', 'required' => 0, 'settings' => array( - 'crossclone' => array( - 'couple_setting' => 0, - 'coupling' => 0, - 'delete_setting' => 0, - ), 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 1, 'references_dialog_edit' => 1, 'references_dialog_search' => 1, 'references_dialog_search_view' => '', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', - 'weight' => '10', + 'type' => 'entityreference_autocomplete', + 'weight' => '12', ), ), ); diff --git a/features/ns_form/ns_form.info b/features/ns_form/ns_form.info index 9d8d85d..80d7fb2 100644 --- a/features/ns_form/ns_form.info +++ b/features/ns_form/ns_form.info @@ -1,7 +1,7 @@ core = "7.x" dependencies[] = "features" dependencies[] = "field_group" -dependencies[] = "node_reference" +dependencies[] = "entityreference" dependencies[] = "ns_article" dependencies[] = "strongarm" dependencies[] = "webform" diff --git a/features/ns_form/ns_form.install b/features/ns_form/ns_form.install index c1a1b37..3798786 100644 --- a/features/ns_form/ns_form.install +++ b/features/ns_form/ns_form.install @@ -10,4 +10,12 @@ function ns_form_install() { node_type_delete('webform'); // Add our content type to the webform settings. variable_set('webform_node_types', array('ns_form')); +} + +/** + * Migrate the form field into an entity reference field. + */ +function ns_form_update_7201() { + module_load_include('install', 'ns_core'); + ns_core_migrate_references_field('field_ns_form_ns_article_form'); } \ No newline at end of file diff --git a/features/ns_media/ns_media.features.field.inc b/features/ns_media/ns_media.features.field.inc index 88afac1..5a31cf5 100644 --- a/features/ns_media/ns_media.features.field.inc +++ b/features/ns_media/ns_media.features.field.inc @@ -355,43 +355,26 @@ function ns_media_defaultconfig_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_ns_media_credit', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'form' => 0, - 'ns_ad' => 0, - 'ns_article' => 0, - 'ns_blog' => 0, - 'ns_blog_post' => 0, - 'ns_ch_rss_promo' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 'ns_contributor', - 'ns_fact' => 0, - 'ns_footer_content' => 0, - 'poll' => 0, - 'webform' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_contributor' => 'ns_contributor', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'image', @@ -401,40 +384,12 @@ function ns_media_defaultconfig_field_default_fields() { 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => 2, - ), - 'file_large' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'file_link' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'file_original' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'file_preview' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'file_small' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 5, ), 'media_large' => array( 'label' => 'above', @@ -458,7 +413,7 @@ function ns_media_defaultconfig_field_default_fields() { 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '0', + 'weight' => 0, ), 'media_small' => array( 'label' => 'above', @@ -541,17 +496,17 @@ function ns_media_defaultconfig_field_default_fields() { ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 1, 'references_dialog_edit' => 1, 'references_dialog_search' => 1, 'references_dialog_search_view' => '', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', + 'type' => 'entityreference_autocomplete', 'weight' => '1', ), ), @@ -1028,43 +983,26 @@ function ns_media_defaultconfig_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_ns_media_credit', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'form' => 0, - 'ns_ad' => 0, - 'ns_article' => 0, - 'ns_blog' => 0, - 'ns_blog_post' => 0, - 'ns_ch_rss_promo' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 'ns_contributor', - 'ns_fact' => 0, - 'ns_footer_content' => 0, - 'poll' => 0, - 'webform' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_contributor' => 'ns_contributor', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'video', @@ -1074,10 +1012,12 @@ function ns_media_defaultconfig_field_default_fields() { 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => 0, + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 4, ), 'media_large' => array( 'label' => 'above', @@ -1184,17 +1124,17 @@ function ns_media_defaultconfig_field_default_fields() { ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 1, 'references_dialog_edit' => 1, 'references_dialog_search' => 1, 'references_dialog_search_view' => '', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', + 'type' => 'entityreference_autocomplete', 'weight' => '1', ), ), diff --git a/features/ns_media/ns_media.info b/features/ns_media/ns_media.info index 39d54c5..c49c096 100644 --- a/features/ns_media/ns_media.info +++ b/features/ns_media/ns_media.info @@ -5,7 +5,7 @@ dependencies[] = "file" dependencies[] = "file_entity" dependencies[] = "media" dependencies[] = "media_internet" -dependencies[] = "node_reference" +dependencies[] = "entityreference" dependencies[] = "ns_styles" dependencies[] = "references_dialog" dependencies[] = "strongarm" diff --git a/features/ns_media/ns_media.install b/features/ns_media/ns_media.install new file mode 100644 index 0000000..e8c32d1 --- /dev/null +++ b/features/ns_media/ns_media.install @@ -0,0 +1,9 @@ + '0', 'entity_types' => array(), 'field_name' => 'field_ns_page_byline', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'ns_ad' => 0, - 'ns_article' => 0, - 'ns_blog' => 0, - 'ns_blog_post' => 0, - 'ns_ch_rss_promo' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 'ns_contributor', - 'ns_fact' => 0, - 'ns_footer_content' => 0, - 'ns_form' => 0, - 'ns_page' => 0, - 'poll' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_contributor' => 'ns_contributor', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_page', @@ -146,10 +129,12 @@ function ns_page_defaultconfig_field_default_fields() { 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => 5, + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 8, ), 'search_index' => array( 'label' => 'above', @@ -184,17 +169,17 @@ function ns_page_defaultconfig_field_default_fields() { ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 1, 'references_dialog_edit' => 1, 'references_dialog_search' => 1, 'references_dialog_search_view' => '', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', + 'type' => 'entityreference_autocomplete', 'weight' => '3', ), ), diff --git a/features/ns_page/ns_page.info b/features/ns_page/ns_page.info index d06bbe1..b86f3c4 100644 --- a/features/ns_page/ns_page.info +++ b/features/ns_page/ns_page.info @@ -4,11 +4,11 @@ dependencies[] = "field_group" dependencies[] = "file" dependencies[] = "link" dependencies[] = "media" -dependencies[] = "node_reference" dependencies[] = "ns_contributor" dependencies[] = "ns_core" dependencies[] = "ns_media" dependencies[] = "references_dialog" +dependencies[] = "entityreference" dependencies[] = "strongarm" dependencies[] = "views" dependencies[] = "defaultconfig" diff --git a/features/ns_page/ns_page.install b/features/ns_page/ns_page.install index 01312d6..50ff83b 100644 --- a/features/ns_page/ns_page.install +++ b/features/ns_page/ns_page.install @@ -17,5 +17,12 @@ function ns_page_install() { function ns_page_update_7201() { module_load_include('install', 'ns_core'); ns_core_change_media_field('field_ns_page_media'); -ns_core_update_media_instance('node', 'ns_page', 'field_ns_page_media'); +} + +/** + * Migrate the byline field into an entity reference. + */ +function ns_page_update_7202() { + module_load_include('install', 'ns_core'); + ns_core_migrate_references_field('field_ns_page_byline'); } diff --git a/features/ns_page_fact/ns_page_fact.features.field.inc b/features/ns_page_fact/ns_page_fact.features.field.inc index 9914a85..7f92c19 100644 --- a/features/ns_page_fact/ns_page_fact.features.field.inc +++ b/features/ns_page_fact/ns_page_fact.features.field.inc @@ -18,38 +18,26 @@ function ns_page_fact_defaultconfig_field_default_fields() { 'deleted' => '0', 'entity_types' => array(), 'field_name' => 'field_ns_page_facts', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'ns_ad' => 0, - 'ns_article' => 0, - 'ns_contributor' => 0, - 'ns_fact' => 0, - 'ns_page' => 0, - 'ns_page_fact' => 'ns_page_fact', - 'ns_promo_promo' => 0, - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'ns_page_fact' => 'ns_page_fact', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_page', @@ -59,10 +47,12 @@ function ns_page_fact_defaultconfig_field_default_fields() { 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => 7, + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 9, ), 'search_index' => array( 'label' => 'above', @@ -89,25 +79,25 @@ function ns_page_fact_defaultconfig_field_default_fields() { 'required' => 0, 'settings' => array( 'crossclone' => array( - 'couple_setting' => 0, + 'couple_setting' => '0', 'coupling' => 0, - 'delete_setting' => 0, + 'delete_setting' => '0', ), 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 1, 'references_dialog_edit' => 1, 'references_dialog_search' => 1, 'references_dialog_search_view' => '', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', + 'type' => 'entityreference_autocomplete', 'weight' => '8', ), ), diff --git a/features/ns_page_fact/ns_page_fact.info b/features/ns_page_fact/ns_page_fact.info index 50b6e0a..1b0bb74 100644 --- a/features/ns_page_fact/ns_page_fact.info +++ b/features/ns_page_fact/ns_page_fact.info @@ -1,9 +1,10 @@ core = "7.x" dependencies[] = "features" -dependencies[] = "node_reference" dependencies[] = "ns_page" dependencies[] = "strongarm" dependencies[] = "defaultconfig" +dependencies[] = "entityreference" +dependencies[] = "references_dialog" description = "Adds the option to attach fact boxes to pages." features[ctools][] = "strongarm:strongarm:1" features[node][] = "ns_page_fact" diff --git a/features/ns_page_fact/ns_page_fact.install b/features/ns_page_fact/ns_page_fact.install new file mode 100644 index 0000000..7191fe1 --- /dev/null +++ b/features/ns_page_fact/ns_page_fact.install @@ -0,0 +1,9 @@ + '0', 'entity_types' => array(), 'field_name' => 'field_ns_poll_ns_article_poll', - 'foreign keys' => array( - 'nid' => array( - 'columns' => array( - 'nid' => 'nid', - ), - 'table' => 'node', - ), - ), + 'foreign keys' => array(), 'indexes' => array( - 'nid' => array( - 0 => 'nid', + 'target_entity' => array( + 0 => 'target_type', + 1 => 'target_id', ), ), - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'referenceable_types' => array( - 'ns_article' => 0, - 'ns_ch_web_promo' => 0, - 'ns_contributor' => 0, - 'ns_fact' => 0, - 'poll' => 'poll', - ), - 'view' => array( - 'args' => array(), - 'display_name' => '', - 'view_name' => '', + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => array( + 'poll' => 'poll', + ), ), + 'handler_submit' => 'Change handler', + 'target_type' => 'node', ), - 'translatable' => '1', - 'type' => 'node_reference', + 'translatable' => '0', + 'type' => 'entityreference', ), 'field_instance' => array( 'bundle' => 'ns_article', @@ -57,29 +47,30 @@ function ns_poll_defaultconfig_field_default_fields() { 'display' => array( 'default' => array( 'label' => 'above', - 'module' => 'node_reference', - 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '8', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 16, ), 'search_index' => array( - 'label' => 'hidden', - 'module' => 'node_reference', + 'label' => 'above', 'settings' => array(), - 'type' => 'node_reference_default', - 'weight' => '6', + 'type' => 'hidden', + 'weight' => 0, ), 'search_result' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => '3', + 'weight' => 0, ), 'teaser' => array( 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => 0, + 'weight' => '0', ), ), 'entity_type' => 'node', @@ -87,27 +78,22 @@ function ns_poll_defaultconfig_field_default_fields() { 'label' => 'Polls', 'required' => 0, 'settings' => array( - 'crossclone' => array( - 'couple_setting' => 0, - 'coupling' => 0, - 'delete_setting' => 0, - ), 'user_register_form' => FALSE, ), 'widget' => array( 'active' => 1, - 'module' => 'node_reference', + 'module' => 'entityreference', 'settings' => array( - 'autocomplete_match' => 'contains', - 'autocomplete_path' => 'node_reference/autocomplete', + 'match_operator' => 'CONTAINS', + 'path' => '', 'references_dialog_add' => 1, 'references_dialog_edit' => 1, 'references_dialog_search' => 1, - 'references_dialog_search_view' => 'ns_article_reference_search:references_dialog_1', + 'references_dialog_search_view' => '', 'size' => '60', ), - 'type' => 'node_reference_autocomplete', - 'weight' => '9', + 'type' => 'entityreference_autocomplete', + 'weight' => '12', ), ), ); diff --git a/features/ns_poll/ns_poll.field_group.inc b/features/ns_poll/ns_poll.field_group.inc index be705e4..845116b 100644 --- a/features/ns_poll/ns_poll.field_group.inc +++ b/features/ns_poll/ns_poll.field_group.inc @@ -21,7 +21,7 @@ function ns_poll_field_group_info() { $field_group->parent_name = ''; $field_group->data = array( 'label' => 'Polls', - 'weight' => '8', + 'weight' => '9', 'children' => array( 0 => 'field_ns_poll_ns_article_poll', ), diff --git a/features/ns_poll/ns_poll.info b/features/ns_poll/ns_poll.info index d66b6d7..30f25a5 100644 --- a/features/ns_poll/ns_poll.info +++ b/features/ns_poll/ns_poll.info @@ -1,11 +1,11 @@ core = "7.x" +dependencies[] = "defaultconfig" +dependencies[] = "entityreference" dependencies[] = "features" dependencies[] = "field_group" -dependencies[] = "node_reference" dependencies[] = "ns_article" dependencies[] = "poll" dependencies[] = "strongarm" -dependencies[] = "defaultconfig" description = "Adds the option to attach polls to articles." features[ctools][] = "field_group:field_group:1" features[ctools][] = "strongarm:strongarm:1" diff --git a/features/ns_poll/ns_poll.install b/features/ns_poll/ns_poll.install new file mode 100644 index 0000000..eef64e0 --- /dev/null +++ b/features/ns_poll/ns_poll.install @@ -0,0 +1,9 @@ +databasePrefix = 'simpletest' . mt_rand(1000, 1000000); + db_update('simpletest_test_id') + ->fields(array('last_prefix' => $this->databasePrefix)) + ->condition('test_id', $this->testId) + ->execute(); + + // Clone the current connection and replace the current prefix. + $connection_info = Database::getConnectionInfo('default'); + Database::renameConnection('default', 'simpletest_original_default'); + foreach ($connection_info as $target => $value) { + $connection_info[$target]['prefix'] = array( + 'default' => $value['prefix']['default'] . $this->databasePrefix, + ); + } + Database::addConnectionInfo('default', 'default', $connection_info['default']); + + // Store necessary current values before switching to prefixed database. + $this->originalLanguage = $language; + $this->originalLanguageDefault = variable_get('language_default'); + $this->originalFileDirectory = variable_get('file_public_path', conf_path() . '/files'); + $this->originalProfile = drupal_get_profile(); + $clean_url_original = variable_get('clean_url', 0); + + // Set to English to prevent exceptions from utf8_truncate() from t() + // during install if the current language is not 'en'. + // The following array/object conversion is copied from language_default(). + $language = (object) array('language' => 'en', 'name' => 'English', 'native' => 'English', 'direction' => 0, 'enabled' => 1, 'plurals' => 0, 'formula' => '', 'domain' => '', 'prefix' => '', 'weight' => 0, 'javascript' => ''); + + // Save and clean shutdown callbacks array because it static cached and + // will be changed by the test run. If we don't, then it will contain + // callbacks from both environments. So testing environment will try + // to call handlers from original environment. + $callbacks = &drupal_register_shutdown_function(); + $this->originalShutdownCallbacks = $callbacks; + $callbacks = array(); + + // Create test directory ahead of installation so fatal errors and debug + // information can be logged during installation process. + // Use temporary files directory with the same prefix as the database. + $public_files_directory = $this->originalFileDirectory . '/simpletest/' . substr($this->databasePrefix, 10); + $private_files_directory = $public_files_directory . '/private'; + $temp_files_directory = $private_files_directory . '/temp'; + + // Create the directories + file_prepare_directory($public_files_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); + file_prepare_directory($private_files_directory, FILE_CREATE_DIRECTORY); + file_prepare_directory($temp_files_directory, FILE_CREATE_DIRECTORY); + $this->generatedTestFiles = FALSE; + + // Log fatal errors. + ini_set('log_errors', 1); + ini_set('error_log', $public_files_directory . '/error.log'); + + // Reset all statics and variables to perform tests in a clean environment. + $conf = array(); + drupal_static_reset(); + + // Set the test information for use in other parts of Drupal. + $test_info = &$GLOBALS['drupal_test_info']; + $test_info['test_run_id'] = $this->databasePrefix; + $test_info['in_child_site'] = FALSE; + + include_once DRUPAL_ROOT . '/includes/install.inc'; + // Populate our install state array with information about our current profile. + // This is needed in order to make sure all modules are inserted into the + // system table. + $install_state = array( + 'parameters' => array('profile' => $this->profile), + ); + drupal_install_system(); + + $this->preloadRegistry(); + + // Set path variables. + variable_set('file_public_path', $public_files_directory); + variable_set('file_private_path', $private_files_directory); + variable_set('file_temporary_path', $temp_files_directory); + + // Include the testing profile. + variable_set('install_profile', $this->profile); + $profile_details = install_profile_info($this->profile, 'en'); + + // Install the modules specified by the testing profile. + module_enable($profile_details['dependencies'], FALSE); + + // Install modules needed for this test. This could have been passed in as + // either a single array argument or a variable number of string arguments. + // @todo Remove this compatibility layer in Drupal 8, and only accept + // $modules as a single array argument. + $modules = func_get_args(); + if (isset($modules[0]) && is_array($modules[0])) { + $modules = $modules[0]; + } + if ($modules) { + $success = module_enable($modules, TRUE); + $this->assertTrue($success, t('Enabled modules: %modules', array('%modules' => implode(', ', $modules)))); + } + + // Run the profile tasks. + $install_profile_module_exists = db_query("SELECT 1 FROM {system} WHERE type = 'module' AND name = :name", array( + ':name' => $this->profile, + ))->fetchField(); + if ($install_profile_module_exists) { + module_enable(array($this->profile), FALSE); + } + + // Reset/rebuild all data structures after enabling the modules. + $this->resetAll(); + + // Run cron once in that environment, as install.php does at the end of + // the installation process. + drupal_cron_run(); + + // Log in with a clean $user. + $this->originalUser = $user; + drupal_save_session(FALSE); + $user = user_load(1); + + // Restore necessary variables. + variable_set('install_task', 'done'); + variable_set('clean_url', $clean_url_original); + variable_set('site_mail', 'simpletest@example.com'); + variable_set('date_default_timezone', date_default_timezone_get()); + // Set up English language. + unset($GLOBALS['conf']['language_default']); + $language = language_default(); + + // Use the test mail class instead of the default mail handler class. + variable_set('mail_system', array('default-system' => 'TestingMailSystem')); + + drupal_set_time_limit($this->timeLimit); + } +} diff --git a/ns_core.info b/ns_core.info index e81e758..2e3f4a0 100644 --- a/ns_core.info +++ b/ns_core.info @@ -2,4 +2,6 @@ name = "NodeStream Core" description = "A module that wrapps customizations necessary for NodeStream to function properly." core = "7.x" package = "NodeStream" +files[] = ns_core.test +files[] = includes/NodeStreamWebTestCase.inc files[] = theme/theme.inc diff --git a/ns_core.install b/ns_core.install index 4630d4f..5b036c4 100644 --- a/ns_core.install +++ b/ns_core.install @@ -36,5 +36,94 @@ function ns_core_update_media_instance($entity_type, $bundle, $field) { $display['module'] = 'file'; $display['type'] = 'file_default'; } + +} + +/** + * Migrate node reference field into an entity reference field. + */ +function ns_core_migrate_references_field($name) { + // Enable the entity reference field if it is not enabled. + if (!module_exists('entityreference')) { + module_enable(array('entity_reference')); + } + // We need to modify the data directly in the field_instance table, since the field api normally don't let us + // change type. + $field = field_info_field($name); + if (empty($field)) { + return FALSE; + } + + $bundles = array(); + foreach ($field['settings']['referenceable_types'] as $type => $value) { + if ($value) { + $bundles[$type] = $type; + } + } + $type = $field['type'] == 'node_reference' ? 'node' : 'user'; + $entity_id_col = $field['type'] == 'node_reference' ? 'nid' : 'uid'; + $field['type'] = 'entityreference'; + $field['module'] = 'entityreference'; + $field['foreign_keys'] = array(); + $field['indexes'] = array( + 'target_entity' => array('target_type', 'target_id'), + ); + $field['settings'] = array( + 'handler' => 'base', + 'handler_settings' => array( + 'target_bundles' => $bundles, + ), + 'handler_submit' => 'Change handler', + 'target_type' => $type, + ); + db_update('field_config') + ->fields(array('data' => serialize($field), 'type' => 'entityreference', 'module' => 'entityreference')) + ->condition('field_name', $name) + ->execute(); + // Change the field definition table. + module_load_include('install', 'entityreference'); + $schema = entityreference_field_schema(array('type' => 'entityreference')); + + foreach (array('field_data_', 'field_revision_') as $prefix) { + $table = $prefix . $name; + $schema['columns']['target_type']['default'] = $type; + db_add_field($table, $name . '_target_type', $schema['columns']['target_type']); + db_drop_index($table, $name . '_' . $entity_id_col); + db_change_field($table, $name . '_' . $entity_id_col, $name . '_' . 'target_id', $schema['columns']['target_id']); + $index = array(); + foreach ($schema['indexes']['target_entity'] as $col) { + $index[] = $name . '_' . $col; + } + db_add_index($table, $name . '_target_entity', $index); + } + _field_info_collate_fields(TRUE); + foreach ($field['bundles'] as $entity_type => $bundles) { + foreach ($bundles as $bundle) { + $instance = field_info_instance($entity_type, $name, $bundle); + ns_core_migrate_references_instance($entity_type, $field, $instance); + } + } + _field_info_collate_fields(TRUE); +} + +function ns_core_migrate_references_instance($entity_type, $field, $instance) { + $instance['widget']['module'] = 'entityreference'; + $instance['widget']['type'] = 'entityreference_autocomplete'; + $instance['widget']['settings'] = array( + 'match_operator' => 'CONTAINS', + 'path' => '', + 'references_dialog_add' => 1, + 'references_dialog_edit' => 1, + 'references_dialog_search' => 1, + 'size' => '60', + ); + foreach ($instance['display'] as &$display) { + // Change the module for each display. + $display['module'] = 'entityreference'; + $display['type'] = 'entityreference_label'; + $display['settings'] = array( + 'link' => FALSE, + ); + } field_update_instance($instance); -} \ No newline at end of file +} diff --git a/ns_core.test b/ns_core.test new file mode 100644 index 0000000..ea47105 --- /dev/null +++ b/ns_core.test @@ -0,0 +1,227 @@ + 'Migrate to entity reference', + 'description' => 'Test migration to entity references', + 'group' => 'NodeStream' + ); + } + + function setUp() { + $this->profile = 'nodestream'; + parent::setUp( + 'ns_core', + 'node_reference', + 'user_reference', + 'entityreference', + 'ns_core_test' + ); + $this->testUser = $this->drupalCreateUser(array('access content')); + } + + /** + * Create a node reference field and migrate it to an entity reference field. + */ + function testEntityReferenceMigration() { + module_load_include('ns_core', 'install'); + // Save some stuff. + $node_ref_field = $this->getTestField('field_node_reference_test', 'node_reference'); + $user_ref_field = $this->getTestField('field_user_reference_test', 'user_reference'); + field_create_field($node_ref_field['field_config']); + field_create_instance($node_ref_field['field_instance']); + field_create_field($user_ref_field['field_config']); + field_create_instance($user_ref_field['field_instance']); + + // Save a test node + $first_node = $this->getTestNode(); + node_save($first_node); + $second_node = $this->getTestNode($first_node->nid); + node_save($second_node); + ns_core_migrate_references_field('field_node_reference_test'); + ns_core_migrate_references_field('field_user_reference_test'); + $node_ref_field_info = field_info_field('field_node_reference_test'); + $user_ref_field_info = field_info_field('field_user_reference_test'); + $this->_testField($node_ref_field_info); + $this->_testField($user_ref_field_info); + // Check our node. + $updated_node = node_load($second_node->nid, NULL, TRUE); + $this->assertEqual($updated_node->field_node_reference_test['und'][0]['target_id'], $first_node->nid); + $this->assertEqual($updated_node->field_node_reference_test['und'][0]['target_type'], 'node'); + $this->assertEqual($updated_node->field_user_reference_test['und'][0]['target_id'], $this->testUser->uid); + $this->assertEqual($updated_node->field_user_reference_test['und'][0]['target_type'], 'user'); + + // Create a new node and update an existing node and see if something fails. + $new_node = $this->getNewTestNode($second_node->nid); + node_save($new_node); + $updated_node->field_node_reference_test['und'][0]['target_id'] = $new_node->nid; + node_save($updated_node); + } + + function _testField($field_info) { + $this->assertEqual($field_info['type'], 'entityreference'); + $this->assertEqual($field_info['module'], 'entityreference'); + foreach ($field_info['bundles'] as $entity_type => $bundles) { + foreach ($bundles as $bundle) { + $instance = field_info_instance($entity_type, $field_info['field_name'], $bundle); + $this->assertEqual($instance['widget']['module'], 'entityreference'); + } + } + } + + private function getTestNode($refer_to = 0) { + $node = new stdClass(); + $node->uid = 0; + $node->type = 'ns_core_test'; + $node->title = $this->randomName(); + $node->status = 1; + $node->field_user_reference_test = array( + 'und' => array( + array( + 'uid' => $this->testUser->uid, + ), + ), + ); + if ($refer_to) { + $node->field_node_reference_test = array( + 'und' => array( + array( + 'nid' => $refer_to, + ), + ), + ); + } + return $node; + } + + private function getNewTestNode($refer_to = 0) { + $node = new stdClass(); + $node->uid = 0; + $node->type = 'ns_core_test'; + $node->title = $this->randomName(); + $node->status = 1; + $node->field_user_reference_test = array( + 'und' => array( + array( + 'target_id' => $this->testUser->uid, + 'target_type' => 'user', + ), + ), + ); + if ($refer_to) { + $node->field_node_reference_test = array( + 'und' => array( + array( + 'target_id' => $refer_to, + 'target_type' => 'node', + ), + ), + ); + } + return $node; + } + + private function getTestField($name, $type) { + if ($type == 'node_reference') { + $col = 'nid'; + $entity_type = 'node'; + } + else { + $col = 'uid'; + $entity_type = 'user'; + } + return array( + 'field_config' => array( + 'active' => '1', + 'cardinality' => '-1', + 'deleted' => '0', + 'entity_types' => array(), + 'field_name' => $name, + 'foreign keys' => array( + 'nid' => array( + 'columns' => array( + $col => $col, + ), + 'table' => $entity_type, + ), + ), + 'indexes' => array( + $col => array( + 0 => $col, + ), + ), + 'module' => $type, + 'settings' => array( + 'referenceable_types' => array( + 'ns_core_test' => 'ns_core_test', + ), + 'view' => array( + 'args' => array(), + 'display_name' => '', + 'view_name' => '', + ), + ), + 'translatable' => '1', + 'type' => $type, + ), + 'field_instance' => array( + 'bundle' => 'ns_core_test', + 'default_value' => NULL, + 'deleted' => '0', + 'description' => '', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => $type, + 'settings' => array(), + 'type' => $type . '_default', + 'weight' => '4', + ), + 'search_index' => array( + 'label' => 'hidden', + 'module' => 'node_reference', + 'settings' => array(), + 'type' => $type . '_default', + 'weight' => '9', + ), + 'search_result' => array( + 'label' => 'hidden', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => '8', + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'entity_type' => 'node', + 'field_name' => $name, + 'label' => 'Test', + 'required' => 0, + 'settings' => array( + 'crossclone' => array( + 'couple_setting' => 0, + 'coupling' => 0, + 'delete_setting' => 0, + ), + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => $type, + 'settings' => array( + 'autocomplete_match' => 'contains', + 'autocomplete_path' => $type . '/autocomplete', + 'size' => '60', + ), + 'type' => $type . '_autocomplete', + 'weight' => '4', + ), + ), + ); + } +} \ No newline at end of file diff --git a/tests/ns_core_test.info b/tests/ns_core_test.info new file mode 100644 index 0000000..95b0582 --- /dev/null +++ b/tests/ns_core_test.info @@ -0,0 +1,5 @@ +name = "NS Core tests" +description = "Support module for NS core testing." +package = Testing +core = 7.x +hidden = TRUE diff --git a/tests/ns_core_test.module b/tests/ns_core_test.module new file mode 100644 index 0000000..b91156e --- /dev/null +++ b/tests/ns_core_test.module @@ -0,0 +1,21 @@ + array( + 'name' => t('NS Core test'), + 'base' => 'node_content', + 'description' => t('NodeStream test content type.'), + 'has_title' => '1', + 'title_label' => t('Title'), + 'help' => '', + ), + ); + return $items; +}