diff --git a/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.ds.inc b/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.ds.inc index fc34ae1c53ecfdc7bba94a5a98e11555f52b4723..2bb293a70901f20135da1f214ea1fab0f9ef5581 100644 --- a/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.ds.inc +++ b/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.ds.inc @@ -25,6 +25,32 @@ function ocio_basic_page_ds_field_settings_info() { ); $export['node|basic_page|full'] = $ds_fieldsetting; + $ds_fieldsetting = new stdClass(); + $ds_fieldsetting->api_version = 1; + $ds_fieldsetting->id = 'node|basic_page|search_index'; + $ds_fieldsetting->entity_type = 'node'; + $ds_fieldsetting->bundle = 'basic_page'; + $ds_fieldsetting->view_mode = 'search_index'; + $ds_fieldsetting->settings = array( + 'title' => array( + 'weight' => '0', + 'label' => 'hidden', + 'format' => 'default', + 'formatter_settings' => array( + 'link' => '0', + 'wrapper' => 'h3', + 'class' => '', + 'ft' => array(), + ), + ), + 'field_ocio_body' => array( + 'formatter_settings' => array( + 'ft' => array(), + ), + ), + ); + $export['node|basic_page|search_index'] = $ds_fieldsetting; + $ds_fieldsetting = new stdClass(); $ds_fieldsetting->api_version = 1; $ds_fieldsetting->id = 'node|basic_page|teaser'; @@ -84,6 +110,37 @@ function ocio_basic_page_ds_layout_settings_info() { ); $export['node|basic_page|full'] = $ds_layout; + $ds_layout = new stdClass(); + $ds_layout->api_version = 1; + $ds_layout->id = 'node|basic_page|search_index'; + $ds_layout->entity_type = 'node'; + $ds_layout->bundle = 'basic_page'; + $ds_layout->view_mode = 'search_index'; + $ds_layout->layout = 'ds_1col'; + $ds_layout->settings = array( + 'regions' => array( + 'ds_content' => array( + 0 => 'title', + 1 => 'field_ocio_body', + ), + ), + 'fields' => array( + 'title' => 'ds_content', + 'field_ocio_body' => 'ds_content', + ), + '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' => '', + ); + $export['node|basic_page|search_index'] = $ds_layout; + $ds_layout = new stdClass(); $ds_layout->api_version = 1; $ds_layout->id = 'node|basic_page|teaser'; diff --git a/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.features.field_instance.inc b/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.features.field_instance.inc index 723d862261886400313ec1c9cd74b25d5dff9441..74da9519a30045b49b154d6a866420e45ac2e419 100644 --- a/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.features.field_instance.inc +++ b/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.features.field_instance.inc @@ -18,7 +18,7 @@ function ocio_basic_page_field_default_field_instances() { 'description' => '', 'display' => array( 'default' => array( - 'label' => 'above', + 'label' => 'hidden', 'module' => 'text', 'settings' => array(), 'type' => 'text_default', @@ -37,6 +37,15 @@ function ocio_basic_page_field_default_field_instances() { 'type' => 'text_default', 'weight' => 1, ), + 'search_index' => array( + 'label' => 'hidden', + 'module' => 'text', + 'settings' => array( + 'trim_length' => 300, + ), + 'type' => 'text_trimmed', + 'weight' => 1, + ), 'teaser' => array( 'label' => 'hidden', 'module' => 'text', diff --git a/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.info b/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.info index 8f1c0068087cd937b125bf16d1b1e84d01d16de2..7ecfb991d07dee01979860a90e8aeb4b856229a8 100644 --- a/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.info +++ b/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.info @@ -14,8 +14,10 @@ dependencies[] = text features[ctools][] = ds:ds:1 features[ctools][] = strongarm:strongarm:1 features[ds_field_settings][] = node|basic_page|full +features[ds_field_settings][] = node|basic_page|search_index features[ds_field_settings][] = node|basic_page|teaser features[ds_layout_settings][] = node|basic_page|full +features[ds_layout_settings][] = node|basic_page|search_index features[ds_layout_settings][] = node|basic_page|teaser features[features_api][] = api:2 features[field_instance][] = node-basic_page-field_ocio_body @@ -28,4 +30,3 @@ features[variable][] = node_options_basic_page features[variable][] = node_preview_basic_page features[variable][] = node_submitted_basic_page features[variable][] = workbench_moderation_default_state_basic_page -mtime = 1422132544 diff --git a/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.strongarm.inc index c391d79f63cecdd4209b17a093a0321613c33f7f..e9dd6c44d268be93c5fa285acd0f642c47522599 100644 --- a/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.strongarm.inc +++ b/profiles/wcm_base/modules/custom/ocio_basic_page/ocio_basic_page.strongarm.inc @@ -33,7 +33,7 @@ function ocio_basic_page_strongarm() { 'custom_settings' => FALSE, ), 'search_index' => array( - 'custom_settings' => FALSE, + 'custom_settings' => TRUE, ), 'search_result' => array( 'custom_settings' => FALSE, @@ -47,6 +47,9 @@ function ocio_basic_page_strongarm() { 'revision' => array( 'custom_settings' => FALSE, ), + 'print' => array( + 'custom_settings' => FALSE, + ), ), 'extra_fields' => array( 'form' => array(), 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 fd391a54b41798f0061b1995b5baf7cabb37668f..4df83f220355cc193101601d2d3b58347ec8b4c6 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 @@ -44,6 +44,27 @@ function ocio_news_ds_field_settings_info() { ); $export['node|article|full'] = $ds_fieldsetting; + $ds_fieldsetting = new stdClass(); + $ds_fieldsetting->api_version = 1; + $ds_fieldsetting->id = 'node|article|search_index'; + $ds_fieldsetting->entity_type = 'node'; + $ds_fieldsetting->bundle = 'article'; + $ds_fieldsetting->view_mode = 'search_index'; + $ds_fieldsetting->settings = array( + 'title' => array( + 'weight' => '0', + 'label' => 'hidden', + 'format' => 'default', + 'formatter_settings' => array( + 'link' => '0', + 'wrapper' => 'h3', + 'class' => '', + 'ft' => array(), + ), + ), + ); + $export['node|article|search_index'] = $ds_fieldsetting; + $ds_fieldsetting = new stdClass(); $ds_fieldsetting->api_version = 1; $ds_fieldsetting->id = 'node|article|teaser'; @@ -150,6 +171,37 @@ function ocio_news_ds_layout_settings_info() { ); $export['node|article|full'] = $ds_layout; + $ds_layout = new stdClass(); + $ds_layout->api_version = 1; + $ds_layout->id = 'node|article|search_index'; + $ds_layout->entity_type = 'node'; + $ds_layout->bundle = 'article'; + $ds_layout->view_mode = 'search_index'; + $ds_layout->layout = 'ds_1col'; + $ds_layout->settings = array( + 'regions' => array( + 'ds_content' => array( + 0 => 'title', + 1 => 'field_ocio_body', + ), + ), + 'fields' => array( + 'title' => 'ds_content', + 'field_ocio_body' => 'ds_content', + ), + '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' => '', + ); + $export['node|article|search_index'] = $ds_layout; + $ds_layout = new stdClass(); $ds_layout->api_version = 1; $ds_layout->id = 'node|article|teaser'; diff --git a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.features.field_instance.inc b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.features.field_instance.inc index 096cc55cb82751cfeb472a182c4ee1ce1090ea36..d80831acba64e77d2eb4b4da26f46dd525011b00 100644 --- a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.features.field_instance.inc +++ b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.features.field_instance.inc @@ -17,14 +17,13 @@ function ocio_news_field_default_field_instances() { 'description' => '', 'display' => array( 'default' => array( - 'label' => 'above', - 'module' => 'image', + 'label' => 'hidden', + 'module' => 'file_entity', 'settings' => array( - 'image_link' => '', - 'image_style' => '', + 'file_view_mode' => 'default', ), - 'type' => 'image', - 'weight' => 4, + 'type' => 'file_rendered', + 'weight' => 2, ), 'full' => array( 'label' => 'hidden', @@ -40,7 +39,7 @@ function ocio_news_field_default_field_instances() { 'label' => 'above', 'settings' => array(), 'type' => 'hidden', - 'weight' => 2, + 'weight' => 10, ), 'search_result' => array( 'label' => 'above', @@ -127,11 +126,11 @@ function ocio_news_field_default_field_instances() { 'description' => '', 'display' => array( 'default' => array( - 'label' => 'above', + 'label' => 'hidden', 'module' => 'text', 'settings' => array(), 'type' => 'text_default', - 'weight' => 2, + 'weight' => 0, ), 'featured' => array( 'label' => 'above', @@ -151,7 +150,7 @@ function ocio_news_field_default_field_instances() { 'module' => 'text', 'settings' => array(), 'type' => 'text_default', - 'weight' => 0, + 'weight' => 1, ), 'search_result' => array( 'label' => 'above', 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 992774ec8a3a5f6e8b8c93857931c5965404b64e..fd997ad992431fc8d1d32c2027d55e38108d23f6 100644 --- a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.info +++ b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.info @@ -10,6 +10,7 @@ dependencies[] = custom_breadcrumbs dependencies[] = custom_breadcrumbs_features dependencies[] = ds dependencies[] = features +dependencies[] = file_entity dependencies[] = image dependencies[] = media dependencies[] = ocio_field_bases @@ -28,9 +29,11 @@ features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 features[custom_breadcrumb][] = news features[ds_field_settings][] = node|article|full +features[ds_field_settings][] = node|article|search_index features[ds_field_settings][] = node|article|teaser 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[features_api][] = api:2 features[field_instance][] = node-article-field_featured_image diff --git a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.strongarm.inc index 961bdb8d1f7f17f23890230f8793dd74d4c79c6a..924d57bb7f464da34e5a7fa6204c1eb42261999f 100644 --- a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.strongarm.inc +++ b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.strongarm.inc @@ -33,7 +33,7 @@ function ocio_news_strongarm() { 'custom_settings' => FALSE, ), 'search_index' => array( - 'custom_settings' => FALSE, + 'custom_settings' => TRUE, ), 'search_result' => array( 'custom_settings' => FALSE, @@ -47,6 +47,9 @@ function ocio_news_strongarm() { 'revision' => array( 'custom_settings' => FALSE, ), + 'print' => array( + 'custom_settings' => FALSE, + ), ), 'extra_fields' => array( 'form' => array(), diff --git a/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.ds.inc b/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.ds.inc index 4aa78f8dbcac5acc0e588623e67018f0a1409b7e..84d4efbe5f2b0ccb673a5fab08219fff88781069 100644 --- a/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.ds.inc +++ b/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.ds.inc @@ -4,6 +4,36 @@ * ocio_web_form.ds.inc */ +/** + * Implements hook_ds_field_settings_info(). + */ +function ocio_web_form_ds_field_settings_info() { + $export = array(); + + $ds_fieldsetting = new stdClass(); + $ds_fieldsetting->api_version = 1; + $ds_fieldsetting->id = 'node|web_form|search_index'; + $ds_fieldsetting->entity_type = 'node'; + $ds_fieldsetting->bundle = 'web_form'; + $ds_fieldsetting->view_mode = 'search_index'; + $ds_fieldsetting->settings = array( + 'title' => array( + 'weight' => '0', + 'label' => 'hidden', + 'format' => 'default', + 'formatter_settings' => array( + 'link' => '0', + 'wrapper' => 'h3', + 'class' => '', + 'ft' => array(), + ), + ), + ); + $export['node|web_form|search_index'] = $ds_fieldsetting; + + return $export; +} + /** * Implements hook_ds_layout_settings_info(). */ @@ -41,5 +71,36 @@ function ocio_web_form_ds_layout_settings_info() { ); $export['node|web_form|full'] = $ds_layout; + $ds_layout = new stdClass(); + $ds_layout->api_version = 1; + $ds_layout->id = 'node|web_form|search_index'; + $ds_layout->entity_type = 'node'; + $ds_layout->bundle = 'web_form'; + $ds_layout->view_mode = 'search_index'; + $ds_layout->layout = 'ds_1col'; + $ds_layout->settings = array( + 'regions' => array( + 'ds_content' => array( + 0 => 'title', + 1 => 'field_ocio_body', + ), + ), + 'fields' => array( + 'title' => 'ds_content', + 'field_ocio_body' => 'ds_content', + ), + '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' => '', + ); + $export['node|web_form|search_index'] = $ds_layout; + return $export; } diff --git a/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.features.field_instance.inc b/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.features.field_instance.inc index 690639c653ab60771ec9babf293794fea983219a..2eff1c04ec7a6f0ff87ab16a73bcfd3bb0df82e7 100644 --- a/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.features.field_instance.inc +++ b/profiles/wcm_base/modules/custom/ocio_web_form/ocio_web_form.features.field_instance.inc @@ -31,6 +31,13 @@ function ocio_web_form_field_default_field_instances() { 'type' => 'text_default', 'weight' => 0, ), + 'search_index' => array( + 'label' => 'hidden', + 'module' => 'text', + 'settings' => array(), + 'type' => 'text_default', + 'weight' => 1, + ), ), 'ds_extras_field_template' => '', 'entity_type' => 'node',