Skip to content
Snippets Groups Projects
Commit b85945e6 authored by Chris Gross's avatar Chris Gross
Browse files

7.x-1.7 Release Candidate 1

parent 672ae628
No related branches found
Tags 7.x-1.7-rc1
No related merge requests found
Showing
with 233 additions and 113 deletions
WCM Base 7.x-1.7-rc1, 2018-04-18
--------------------------------
- WCM Base: Updated Display Suite to 2.15 per SA-CONTRIB-2018-019.
- WCM Omega: Fixed accordions being processed multiple times in Panels IPE.
WCM Base 7.x-1.6, 2018-03-28 WCM Base 7.x-1.6, 2018-03-28
---------------------------- ----------------------------
- WCM Base: Updated Drupal to 7.58 per SA-CORE-2018-002. - WCM Base: Updated Drupal to 7.58 per SA-CORE-2018-002.
......
...@@ -13,9 +13,8 @@ files[] = tests/ds.views.test ...@@ -13,9 +13,8 @@ files[] = tests/ds.views.test
files[] = tests/ds.forms.test files[] = tests/ds.forms.test
configure = admin/structure/ds configure = admin/structure/ds
; Information added by Drupal.org packaging script on 2016-04-26 ; Information added by Drupal.org packaging script on 2018-04-18
version = "7.x-2.14" version = "7.x-2.15"
core = "7.x" core = "7.x"
project = "ds" project = "ds"
datestamp = "1461696967" datestamp = "1524068596"
...@@ -20,6 +20,9 @@ function ds_install() { ...@@ -20,6 +20,9 @@ function ds_install() {
*/ */
function ds_uninstall() { function ds_uninstall() {
variable_del('ds_classes_regions'); variable_del('ds_classes_regions');
variable_del('ds_disable');
variable_del('ds_extras_region_blocks');
variable_del('menu_rebuild_needed');
} }
/** /**
......
...@@ -736,7 +736,7 @@ function ds_entity_variables(&$vars) { ...@@ -736,7 +736,7 @@ function ds_entity_variables(&$vars) {
if (!empty($layout['settings']['layout_attributes_merge'])) { if (!empty($layout['settings']['layout_attributes_merge'])) {
// Handle classes separately. // Handle classes separately.
if (isset($vars['attributes_array']['class'])) { if (isset($vars['attributes_array']['class'])) {
$vars['classes_array'] += $vars['attributes_array']['class']; $vars['classes_array'] = array_unique(array_merge($vars['classes_array'], $vars['attributes_array']['class']));
unset($vars['attributes_array']['class']); unset($vars['attributes_array']['class']);
} }
$vars['layout_attributes'] .= ' ' . drupal_attributes($vars['attributes_array']); $vars['layout_attributes'] .= ' ' . drupal_attributes($vars['attributes_array']);
...@@ -925,91 +925,49 @@ function ds_render_ctools_field($field) { ...@@ -925,91 +925,49 @@ function ds_render_ctools_field($field) {
* Render a block field. * Render a block field.
*/ */
function ds_render_block_field($field) { function ds_render_block_field($field) {
// Invoke the block_view hook of the module. global $theme_key;
list($module, $delta) = explode('|', $field['properties']['block']); list($module, $delta) = explode('|', $field['properties']['block']);
$block = module_invoke($module, 'block_view', $delta);
// Load the block
// Get contextual links. $result = db_select('block', 'b')
$contextual_links = array(); ->fields('b')->condition('b.theme', $theme_key)->condition('b.module', $module)->condition('b.delta', $delta)->addTag('block_load')->addTag('translatable')->execute();
$contextual = module_exists('contextual') && user_access('access contextual links'); $block_info = $result->fetchAllAssoc('bid');
if ($contextual) {
if (isset($block['content']) && is_array($block['content']) && isset($block['content']['#contextual_links'])) { // Enable the block
$contextual_links = $block['content']['#contextual_links']; if ($block_info[key($block_info)]->status == 0) {
} $block_info[key($block_info)]->status = 1;
} }
// Render the block content. // Process the block if it respects visibility settings
if (isset($block['content']) && is_array($block['content'])) { if (isset($field['properties']['block_visibility']) && $field['properties']['block_visibility']) {
$block['content'] = drupal_render($block['content']); drupal_alter('block_list', $block_info);
} }
// Go through in case we have actual content. // Simulate _block_load_blocks() return, containing only our block.
if (!empty($block['content'])) { $block = array_shift($block_info);
// Make sure subject is set. // Render the block field
if (!isset($block['subject'])) { if (isset($block)) {
$block['subject'] = ''; $key = $module . '_' . $delta;
}
global $theme_key;
if (module_exists('block')) { if (module_exists('block')) {
$full_block = db_query("SELECT * FROM {block} WHERE module = :module AND delta = :delta AND theme = :theme", array(':module' => $module, ':delta' => $delta, ':theme' => $theme_key))->fetchObject(); $region_blocks = _block_render_blocks(array($key => $block));
} switch ($field['properties']['block_render']) {
if (!empty($full_block)) { case DS_BLOCK_TEMPLATE:
if ($full_block->title == '<none>') { $renderable_block = _block_get_renderable_array($region_blocks);
$block['subject'] = ''; return drupal_render($renderable_block);
} break;
elseif (!empty($full_block->title)) { case DS_BLOCK_TITLE_CONTENT:
$block['subject'] = $full_block->title; if (isset($block->subject) && isset($block->content['#markup'])) {
} return '<h2 class="block-title">' . $block->subject . '</h2>' . $block->content['#markup'];
} }
break;
// i18n support. case DS_BLOCK_CONTENT:
if (function_exists('i18n_block_block_view_alter')) { if (isset($block->content['#markup'])) {
return $block->content['#markup'];
// Check language visibility. }
global $language; break;
static $block_languages = FALSE;
if (!$block_languages) {
$block_languages = array();
$result = db_query('SELECT module, delta, language FROM {i18n_block_language}');
foreach ($result as $record) {
$block_languages[$record->module][$record->delta][$record->language] = TRUE;
}
}
if (isset($block_languages[$module][$delta]) && !isset($block_languages[$module][$delta][$language->language])) {
return;
}
// Translate.
if (!empty($full_block->i18n_mode)) {
i18n_block_block_view_alter($block, $full_block);
if (!empty($block['title'])) {
$block['subject'] = $block['title'];
}
} }
} }
$block = (object) $block;
switch ($field['properties']['block_render']) {
case DS_BLOCK_TEMPLATE:
$block->region = NULL;
$block->module = $module;
$block->delta = $delta;
$elements = array('elements' => array('#block' => $block, '#children' => $block->content));
// Add contextual links.
if ($contextual) {
$elements['elements'] += array('#contextual_links' => array_merge($contextual_links, array('block' => array('admin/structure/block/manage', array($block->module, $block->delta)))));
}
return theme('block', $elements);
break;
case DS_BLOCK_TITLE_CONTENT:
return '<h2 class="block-title">' . $block->subject . '</h2>' . $block->content;
break;
case DS_BLOCK_CONTENT:
return $block->content;
break;
}
} }
} }
......
...@@ -5,9 +5,8 @@ package = "Display Suite" ...@@ -5,9 +5,8 @@ package = "Display Suite"
dependencies[] = ds dependencies[] = ds
dependencies[] = devel dependencies[] = devel
; Information added by Drupal.org packaging script on 2016-04-26 ; Information added by Drupal.org packaging script on 2018-04-18
version = "7.x-2.14" version = "7.x-2.15"
core = "7.x" core = "7.x"
project = "ds" project = "ds"
datestamp = "1461696967" datestamp = "1524068596"
...@@ -5,9 +5,8 @@ package = "Display Suite" ...@@ -5,9 +5,8 @@ package = "Display Suite"
dependencies[] = ds dependencies[] = ds
configure = admin/structure/ds/list/extras configure = admin/structure/ds/list/extras
; Information added by Drupal.org packaging script on 2016-04-26 ; Information added by Drupal.org packaging script on 2018-04-18
version = "7.x-2.14" version = "7.x-2.15"
core = "7.x" core = "7.x"
project = "ds" project = "ds"
datestamp = "1461696967" datestamp = "1524068596"
...@@ -38,6 +38,11 @@ function ds_extras_node_page_view($node) { ...@@ -38,6 +38,11 @@ function ds_extras_node_page_view($node) {
// It's also possible to use $_GET['v'] to switch view modes. // It's also possible to use $_GET['v'] to switch view modes.
if (isset($_GET['v']) && !empty($_GET['v'])) { if (isset($_GET['v']) && !empty($_GET['v'])) {
$view_mode = $_GET['v']; $view_mode = $_GET['v'];
// Check if this is a valid view mode, switch to default otherwise.
$view_modes = ds_extras_get_bundle_view_modes('node', $node->type);
if (!isset($view_modes[$view_mode])) {
$view_mode = 'full';
}
} }
drupal_static('ds_extras_view_mode', $view_mode); drupal_static('ds_extras_view_mode', $view_mode);
......
...@@ -5,9 +5,8 @@ package = "Display Suite" ...@@ -5,9 +5,8 @@ package = "Display Suite"
dependencies[] = ds dependencies[] = ds
configure = admin/structure/ds/list/extras configure = admin/structure/ds/list/extras
; Information added by Drupal.org packaging script on 2016-04-26 ; Information added by Drupal.org packaging script on 2018-04-18
version = "7.x-2.14" version = "7.x-2.15"
core = "7.x" core = "7.x"
project = "ds" project = "ds"
datestamp = "1461696967" datestamp = "1524068596"
...@@ -4,9 +4,8 @@ core = "7.x" ...@@ -4,9 +4,8 @@ core = "7.x"
package = "Display Suite" package = "Display Suite"
dependencies[] = ds dependencies[] = ds
; Information added by Drupal.org packaging script on 2016-04-26 ; Information added by Drupal.org packaging script on 2018-04-18
version = "7.x-2.14" version = "7.x-2.15"
core = "7.x" core = "7.x"
project = "ds" project = "ds"
datestamp = "1461696967" datestamp = "1524068596"
...@@ -5,9 +5,8 @@ package = "Display Suite" ...@@ -5,9 +5,8 @@ package = "Display Suite"
dependencies[] = ds dependencies[] = ds
configure = admin/structure/ds/list/search configure = admin/structure/ds/list/search
; Information added by Drupal.org packaging script on 2016-04-26 ; Information added by Drupal.org packaging script on 2018-04-18
version = "7.x-2.14" version = "7.x-2.15"
core = "7.x" core = "7.x"
project = "ds" project = "ds"
datestamp = "1461696967" datestamp = "1524068596"
...@@ -4,9 +4,8 @@ core = "7.x" ...@@ -4,9 +4,8 @@ core = "7.x"
package = "Display Suite" package = "Display Suite"
dependencies[] = ds dependencies[] = ds
; Information added by Drupal.org packaging script on 2016-04-26 ; Information added by Drupal.org packaging script on 2018-04-18
version = "7.x-2.14" version = "7.x-2.15"
core = "7.x" core = "7.x"
project = "ds" project = "ds"
datestamp = "1461696967" datestamp = "1524068596"
...@@ -445,6 +445,12 @@ function ds_edit_block_field_form($form, &$form_state, $custom_block = '') { ...@@ -445,6 +445,12 @@ function ds_edit_block_field_form($form, &$form_state, $custom_block = '') {
'#required' => TRUE, '#required' => TRUE,
'#default_value' => isset($custom_block->properties['block']) ? $custom_block->properties['block'] : '', '#default_value' => isset($custom_block->properties['block']) ? $custom_block->properties['block'] : '',
); );
$form['block_identity']['block_visibility'] = array(
'#type' => 'checkbox',
'#title' => t('Respect Block Visibility'),
'#description' => t('Toggle this checkbox if you would like this field to respect the same visibility settings configured for the block.'),
'#default_value' => isset($custom_block->properties['block_visibility']) ? $custom_block->properties['block_visibility'] : FALSE,
);
$form['block_identity']['block_render'] = array( $form['block_identity']['block_render'] = array(
'#type' => 'select', '#type' => 'select',
'#options' => array( '#options' => array(
...@@ -470,6 +476,7 @@ function ds_block_field_form_validate($form, &$form_state) { ...@@ -470,6 +476,7 @@ function ds_block_field_form_validate($form, &$form_state) {
$form_state['field']->properties = array(); $form_state['field']->properties = array();
$form_state['field']->properties['block'] = $form_state['values']['block']; $form_state['field']->properties['block'] = $form_state['values']['block'];
$form_state['field']->properties['block_render'] = $form_state['values']['block_render']; $form_state['field']->properties['block_render'] = $form_state['values']['block_render'];
$form_state['field']->properties['block_visibility'] = $form_state['values']['block_visibility'];
} }
/** /**
......
...@@ -4,9 +4,8 @@ package = "Display Suite" ...@@ -4,9 +4,8 @@ package = "Display Suite"
core = 7.x core = 7.x
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2016-04-26 ; Information added by Drupal.org packaging script on 2018-04-18
version = "7.x-2.14" version = "7.x-2.15"
core = "7.x" core = "7.x"
project = "ds" project = "ds"
datestamp = "1461696967" datestamp = "1524068596"
...@@ -5,9 +5,8 @@ package = "Display Suite" ...@@ -5,9 +5,8 @@ package = "Display Suite"
dependencies[] = ds_extras dependencies[] = ds_extras
hidden = TRUE hidden = TRUE
; Information added by Drupal.org packaging script on 2016-04-26 ; Information added by Drupal.org packaging script on 2018-04-18
version = "7.x-2.14" version = "7.x-2.15"
core = "7.x" core = "7.x"
project = "ds" project = "ds"
datestamp = "1461696967" datestamp = "1524068596"
...@@ -78,6 +78,10 @@ function news_client_permission() { ...@@ -78,6 +78,10 @@ function news_client_permission() {
'title' => t('Purge cached articles.'), 'title' => t('Purge cached articles.'),
'description' => t('Access the purge page in the configuration settings.'), 'description' => t('Access the purge page in the configuration settings.'),
), ),
'news client view future article' => array(
'title' => t('View future cached articles.'),
'description' => t('View cached articles with a publication date in the future.'),
),
); );
} }
...@@ -300,6 +304,40 @@ function news_client_metatag_metatags_view_alter(&$output, $instance) { ...@@ -300,6 +304,40 @@ function news_client_metatag_metatags_view_alter(&$output, $instance) {
} }
} }
/**
* Implements hook_node_view().
*/
function news_client_node_view($node, $view_mode, $langcode) {
$type = $node->type;
switch ($type) {
case 'news_client_cached_article':
$published_timestamp = $node->created;
$can_view_future_article = user_access('news client view future article');
if ($published_timestamp > REQUEST_TIME && !$can_view_future_article) {
// Clear breadcrumbs.
$node->custom_bredcrumb_is_set = TRUE;
drupal_set_breadcrumb(array());
// Deny access.
drupal_access_denied();
drupal_exit();
}
else if ($published_timestamp > REQUEST_TIME && $can_view_future_article) {
$publish_date = format_date($published_timestamp);
$message = t('News Client: Article will not be available until: @publish_date', array('@publish_date' => $publish_date));
drupal_set_message($message, 'warning');
}
break;
default:
break;
}
}
/** /**
* Implements hook_theme(). * Implements hook_theme().
*/ */
......
...@@ -82,6 +82,13 @@ function wcm_news_client_display_views_default_views() { ...@@ -82,6 +82,13 @@ function wcm_news_client_display_views_default_views() {
$handler->display->display_options['filters']['type']['value'] = array( $handler->display->display_options['filters']['type']['value'] = array(
'news_client_cached_article' => 'news_client_cached_article', 'news_client_cached_article' => 'news_client_cached_article',
); );
/* Filter criterion: Content: Post date */
$handler->display->display_options['filters']['created']['id'] = 'created';
$handler->display->display_options['filters']['created']['table'] = 'node';
$handler->display->display_options['filters']['created']['field'] = 'created';
$handler->display->display_options['filters']['created']['operator'] = '<=';
$handler->display->display_options['filters']['created']['value']['value'] = 'now';
$handler->display->display_options['filters']['created']['value']['type'] = 'offset';
/* Display: News Archive Page */ /* Display: News Archive Page */
$handler = $view->new_display('page', 'News Archive Page', 'page'); $handler = $view->new_display('page', 'News Archive Page', 'page');
...@@ -251,6 +258,13 @@ function wcm_news_client_display_views_default_views() { ...@@ -251,6 +258,13 @@ function wcm_news_client_display_views_default_views() {
); );
$handler->display->display_options['filters']['news_client_tags_tid']['type'] = 'select'; $handler->display->display_options['filters']['news_client_tags_tid']['type'] = 'select';
$handler->display->display_options['filters']['news_client_tags_tid']['vocabulary'] = 'news_client_tags'; $handler->display->display_options['filters']['news_client_tags_tid']['vocabulary'] = 'news_client_tags';
/* Filter criterion: Content: Post date */
$handler->display->display_options['filters']['created']['id'] = 'created';
$handler->display->display_options['filters']['created']['table'] = 'node';
$handler->display->display_options['filters']['created']['field'] = 'created';
$handler->display->display_options['filters']['created']['operator'] = '<=';
$handler->display->display_options['filters']['created']['value']['value'] = 'now';
$handler->display->display_options['filters']['created']['value']['type'] = 'offset';
$handler->display->display_options['pane_category']['name'] = 'News Article Listings'; $handler->display->display_options['pane_category']['name'] = 'News Article Listings';
$handler->display->display_options['pane_category']['weight'] = '0'; $handler->display->display_options['pane_category']['weight'] = '0';
$handler->display->display_options['allow']['use_pager'] = 0; $handler->display->display_options['allow']['use_pager'] = 0;
...@@ -307,6 +321,13 @@ function wcm_news_client_display_views_default_views() { ...@@ -307,6 +321,13 @@ function wcm_news_client_display_views_default_views() {
); );
$handler->display->display_options['filters']['news_client_tags_tid']['type'] = 'select'; $handler->display->display_options['filters']['news_client_tags_tid']['type'] = 'select';
$handler->display->display_options['filters']['news_client_tags_tid']['vocabulary'] = 'news_client_tags'; $handler->display->display_options['filters']['news_client_tags_tid']['vocabulary'] = 'news_client_tags';
/* Filter criterion: Content: Post date */
$handler->display->display_options['filters']['created']['id'] = 'created';
$handler->display->display_options['filters']['created']['table'] = 'node';
$handler->display->display_options['filters']['created']['field'] = 'created';
$handler->display->display_options['filters']['created']['operator'] = '<=';
$handler->display->display_options['filters']['created']['value']['value'] = 'now';
$handler->display->display_options['filters']['created']['value']['type'] = 'offset';
$handler->display->display_options['pane_category']['name'] = 'News Article Listings'; $handler->display->display_options['pane_category']['name'] = 'News Article Listings';
$handler->display->display_options['pane_category']['weight'] = '0'; $handler->display->display_options['pane_category']['weight'] = '0';
$handler->display->display_options['allow']['use_pager'] = 0; $handler->display->display_options['allow']['use_pager'] = 0;
...@@ -419,6 +440,13 @@ function wcm_news_client_display_views_default_views() { ...@@ -419,6 +440,13 @@ function wcm_news_client_display_views_default_views() {
); );
$handler->display->display_options['filters']['news_client_tags_tid']['type'] = 'select'; $handler->display->display_options['filters']['news_client_tags_tid']['type'] = 'select';
$handler->display->display_options['filters']['news_client_tags_tid']['vocabulary'] = 'news_client_tags'; $handler->display->display_options['filters']['news_client_tags_tid']['vocabulary'] = 'news_client_tags';
/* Filter criterion: Content: Post date */
$handler->display->display_options['filters']['created']['id'] = 'created';
$handler->display->display_options['filters']['created']['table'] = 'node';
$handler->display->display_options['filters']['created']['field'] = 'created';
$handler->display->display_options['filters']['created']['operator'] = '<=';
$handler->display->display_options['filters']['created']['value']['value'] = 'now';
$handler->display->display_options['filters']['created']['value']['type'] = 'offset';
$handler->display->display_options['pane_category']['name'] = 'News Article Listings'; $handler->display->display_options['pane_category']['name'] = 'News Article Listings';
$handler->display->display_options['pane_category']['weight'] = '0'; $handler->display->display_options['pane_category']['weight'] = '0';
$handler->display->display_options['allow']['use_pager'] = 'use_pager'; $handler->display->display_options['allow']['use_pager'] = 'use_pager';
......
...@@ -13,6 +13,37 @@ function wcm_panels_settings_features_override_default_overrides() { ...@@ -13,6 +13,37 @@ function wcm_panels_settings_features_override_default_overrides() {
// Exported overrides for: field_instance // Exported overrides for: field_instance
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|module"] = 'media'; $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|module"] = 'media';
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|allowed_schemes"] = array(
'private' => 0,
'public' => 0,
'vimeo' => 0,
'youtube' => 0,
);
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|allowed_types"] = array(
'audio' => 0,
'document' => 0,
'image' => 0,
'video' => 0,
);
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|browser_plugins"] = array(
'media_default--media_browser_1' => 0,
'media_default--media_browser_my_files' => 0,
'media_internet' => 0,
'upload' => 0,
);
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_crop_info"] = 1;
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_default_crop_area"] = 1;
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_enable"] = 0;
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_inline_crop"] = 0;
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_instant_crop"] = FALSE;
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_instant_preview"] = 1;
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_keyboard"] = 1;
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_maximize_default_crop_area"] = 0;
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_require_cropping"] = array();
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_styles_list"] = array();
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_styles_mode"] = 'include';
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_thumblist"] = 0;
$overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|type"] = 'media_generic';
$overrides["field_instance.fieldable_panels_pane-image-field_basic_image_image.display|default|settings|image_style"] = 'image_style_full'; $overrides["field_instance.fieldable_panels_pane-image-field_basic_image_image.display|default|settings|image_style"] = 'image_style_full';
$overrides["field_instance.fieldable_panels_pane-image-field_basic_image_image.ds_extras_field_template"] = ''; $overrides["field_instance.fieldable_panels_pane-image-field_basic_image_image.ds_extras_field_template"] = '';
$overrides["field_instance.fieldable_panels_pane-image-field_basic_image_image.settings|file_directory"] = ''; $overrides["field_instance.fieldable_panels_pane-image-field_basic_image_image.settings|file_directory"] = '';
......
...@@ -19,6 +19,37 @@ function wcm_panels_settings_ctools_plugin_api($module = NULL, $api = NULL) { ...@@ -19,6 +19,37 @@ function wcm_panels_settings_ctools_plugin_api($module = NULL, $api = NULL) {
function wcm_panels_settings_field_default_field_instances_alter(&$data) { function wcm_panels_settings_field_default_field_instances_alter(&$data) {
if (isset($data['fieldable_panels_pane-basic_file-field_basic_file_file'])) { if (isset($data['fieldable_panels_pane-basic_file-field_basic_file_file'])) {
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['module'] = 'media'; /* WAS: 'file' */ $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['module'] = 'media'; /* WAS: 'file' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['allowed_schemes'] = array(
'private' => 0,
'public' => 0,
'vimeo' => 0,
'youtube' => 0,
); /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['allowed_types'] = array(
'audio' => 0,
'document' => 0,
'image' => 0,
'video' => 0,
); /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['browser_plugins'] = array(
'media_default--media_browser_1' => 0,
'media_default--media_browser_my_files' => 0,
'media_internet' => 0,
'upload' => 0,
); /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_crop_info'] = 1; /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_default_crop_area'] = 1; /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_enable'] = 0; /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_inline_crop'] = 0; /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_instant_crop'] = FALSE; /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_instant_preview'] = 1; /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_keyboard'] = 1; /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_maximize_default_crop_area'] = 0; /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_require_cropping'] = array(); /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_styles_list'] = array(); /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_styles_mode'] = 'include'; /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_thumblist'] = 0; /* WAS: '' */
$data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['type'] = 'media_generic'; /* WAS: 'file_generic' */
} }
if (isset($data['fieldable_panels_pane-image-field_basic_image_image'])) { if (isset($data['fieldable_panels_pane-image-field_basic_image_image'])) {
$data['fieldable_panels_pane-image-field_basic_image_image']['display']['default']['settings']['image_style'] = 'image_style_full'; /* WAS: 'panopoly_image_full' */ $data['fieldable_panels_pane-image-field_basic_image_image']['display']['default']['settings']['image_style'] = 'image_style_full'; /* WAS: 'panopoly_image_full' */
......
...@@ -17,9 +17,26 @@ dependencies[] = panopoly_widgets ...@@ -17,9 +17,26 @@ dependencies[] = panopoly_widgets
dependencies[] = strongarm dependencies[] = strongarm
features[ctools][] = strongarm:strongarm:1 features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2 features[features_api][] = api:2
features[features_override_items][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file
features[features_override_items][] = field_instance.fieldable_panels_pane-image-field_basic_image_image features[features_override_items][] = field_instance.fieldable_panels_pane-image-field_basic_image_image
features[features_override_items][] = page_manager_handlers.node_edit_panel_context features[features_override_items][] = page_manager_handlers.node_edit_panel_context
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|module features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|module
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|allowed_schemes
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|allowed_types
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|browser_plugins
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_crop_info
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_default_crop_area
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_enable
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_inline_crop
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_instant_crop
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_instant_preview
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_keyboard
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_maximize_default_crop_area
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_require_cropping
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_styles_list
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_styles_mode
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_thumblist
features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|type
features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.display|default|settings|image_style features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.display|default|settings|image_style
features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.ds_extras_field_template features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.ds_extras_field_template
features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.settings|file_directory features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.settings|file_directory
...@@ -64,3 +81,5 @@ features_exclude[dependencies][file_entity] = file_entity ...@@ -64,3 +81,5 @@ features_exclude[dependencies][file_entity] = file_entity
features_exclude[dependencies][link] = link features_exclude[dependencies][link] = link
features_exclude[dependencies][ocio_field_bases] = ocio_field_bases features_exclude[dependencies][ocio_field_bases] = ocio_field_bases
features_exclude[features_overrides][file_display.image__preview__file_field_image.settings|image_style] = file_display.image__preview__file_field_image.settings|image_style features_exclude[features_overrides][file_display.image__preview__file_field_image.settings|image_style] = file_display.image__preview__file_field_image.settings|image_style
features_exclude[features_overrides][field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.ds_extras_field_template] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.ds_extras_field_template
features_exclude[features_overrides][field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|progress_indicator] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|progress_indicator
7.x-1.51, 2018-02-22
-------------------
- No changes since last release.
7.x-1.50, 2018-02-15 7.x-1.50, 2018-02-15
------------------- -------------------
- No changes since last release. - No changes since last release.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment