diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 48c94d70e4ae97dafec4c4324979d834359f5e6a..a81b53d822edbbcd0ca0cdba0b06e915c92f6036 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,7 +1,11 @@
+WCM Base 7.x-1.x, 2017-05-15-2
+----------------------------
+- OCIO News and OCIO Taxonomy: fix features conflict of Taxonomy page layout. Layout will reside in Taxonomy feature.
+
WCM Base 7.x-1.x, 2017-05-15
----------------------------
- OCIO WYSIWYG: Added 'Intro Text Legacy' style to aid with migration to new theme.
-- OCIO Main Menu: Fix second-level menu context.
+- OCIO Main Menu: Fix second-level menu context.
- OCIO SimpleSAMLphp Auth: Fixed variable name for require login path.
- WCM Omega:
- Added three new panels layouts.
diff --git a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.ds.inc b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.ds.inc
index 9031bc138b1e0232a5b53a1186e23798c3d5d659..5f6b9da0dd2f540210822d94e776b8dfa3425d33 100644
--- a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.ds.inc
+++ b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.ds.inc
@@ -289,37 +289,5 @@ function ocio_news_ds_layout_settings_info() {
);
$export['node|article|teaser'] = $ds_layout;
- $ds_layout = new stdClass();
- $ds_layout->api_version = 1;
- $ds_layout->id = 'taxonomy_term|ocio_tags|full';
- $ds_layout->entity_type = 'taxonomy_term';
- $ds_layout->bundle = 'ocio_tags';
- $ds_layout->view_mode = 'full';
- $ds_layout->layout = 'ds_1col';
- $ds_layout->settings = array(
- 'regions' => array(
- 'ds_hidden' => array(
- 0 => 'description',
- ),
- ),
- 'fields' => array(
- 'description' => 'ds_hidden',
- ),
- 'classes' => array(),
- 'wrappers' => array(
- 'ds_content' => 'div',
- 'ds_hidden' => 'div',
- ),
- 'layout_wrapper' => 'div',
- 'layout_attributes' => '',
- 'layout_attributes_merge' => 1,
- 'layout_link_attribute' => '',
- 'layout_link_custom' => '',
- 'layout_disable_css' => FALSE,
- 'hide_page_title' => '2',
- 'page_option_title' => 'Articles Tagged: %taxonomy_term:name',
- );
- $export['taxonomy_term|ocio_tags|full'] = $ds_layout;
-
return $export;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.info b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.info
index 41c8f2f7f552ecee08c90735477b12f8bee976f3..2265b688c7446c5818453c8f7b7ad7ed714ef01e 100644
--- a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.info
+++ b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.info
@@ -5,18 +5,13 @@ package = OCIO Features
version = 7.x-1.0
project = ocio_news
dependencies[] = context
-dependencies[] = custom_breadcrumbs_features
-dependencies[] = custom_breadcrumbs_paths
-dependencies[] = ds
dependencies[] = media
dependencies[] = ocio_field_bases
dependencies[] = ocio_taxonomy
dependencies[] = override_node_options
dependencies[] = panopoly_core
dependencies[] = smart_trim
-dependencies[] = views
dependencies[] = views_nested_accordion
-dependencies[] = wcm_url_aliases
features[context][] = news-archive-page
features[ctools][] = context:context:3
features[ctools][] = ds:ds:1
@@ -31,7 +26,6 @@ features[ds_fields][] = byline
features[ds_layout_settings][] = node|article|full
features[ds_layout_settings][] = node|article|search_index
features[ds_layout_settings][] = node|article|teaser
-features[ds_layout_settings][] = taxonomy_term|ocio_tags|full
features[features_api][] = api:2
features[field_base][] = field_byline
features[field_base][] = field_display_in_view_panes
@@ -60,6 +54,7 @@ features[variable][] = private_article
features[variable][] = workbench_moderation_default_state_article
features[views_view][] = ocio_news_archive
features_exclude[dependencies][views_content] = views_content
+features_exclude[dependencies][views] = views
features_exclude[field_base][field_news_service_sites] = field_news_service_sites
features_exclude[field_instance][node-article-field_tags] = node-article-field_tags
features_exclude[field_instance][node-article-field_news_service_sites] = node-article-field_news_service_sites
diff --git a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.ds.inc b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.ds.inc
index f4795f6b57ea7b2f5fb34d46d540339f8bbbc400..2a336c4863dfd3a5ceb2ebbff097bd0200417e4c 100644
--- a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.ds.inc
+++ b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.ds.inc
@@ -78,7 +78,7 @@ function ocio_taxonomy_ds_layout_settings_info() {
'layout_link_custom' => '',
'layout_disable_css' => FALSE,
'hide_page_title' => '2',
- 'page_option_title' => 'Articles Tagged: %taxonomy_term:name',
+ 'page_option_title' => 'Items Tagged: %taxonomy_term:name',
);
$export['taxonomy_term|ocio_tags|full'] = $ds_layout;