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

daily build

parent 2e687a0d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
profiles/wcm_base/CHANGELOG.txt
+ 5
− 0
View file @ 257a6827
WCM Base 7.x-1.x, 2016-05-04
----------------------------
- WCM Panels Settings: Added link field to image panels panes
- OCIO Omega Base: Render link field on image panels panes
WCM Base 7.x-1.x, 2016-04-28
----------------------------
- OCIO Omega Base: Fixed regression where tile pane title appears twice.
......
profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.field_instance.inc 0 → 100644
+ 74
− 0
View file @ 257a6827
<?php
/**
* @file
* wcm_panels_settings.features.field_instance.inc
*/
/**
* Implements hook_field_default_field_instances().
*/
function wcm_panels_settings_field_default_field_instances() {
$field_instances = array();
// Exported field_instance: 'fieldable_panels_pane-image-field_ocio_link'.
$field_instances['fieldable_panels_pane-image-field_ocio_link'] = array(
'bundle' => 'image',
'default_value' => NULL,
'deleted' => 0,
'description' => '',
'display' => array(
'default' => array(
'label' => 'hidden',
'settings' => array(),
'type' => 'hidden',
'weight' => 2,
),
),
'ds_extras_field_template' => '',
'entity_type' => 'fieldable_panels_pane',
'field_name' => 'field_ocio_link',
'label' => 'Link',
'required' => 0,
'settings' => array(
'absolute_url' => 1,
'attributes' => array(
'class' => '',
'configurable_class' => 0,
'configurable_title' => 0,
'rel' => '',
'target' => 'default',
'title' => '',
),
'display' => array(
'url_cutoff' => 80,
),
'enable_tokens' => 1,
'linkit' => array(
'button_text' => 'Search',
'enable' => 1,
'profile' => 'ocio_field_linkit',
),
'rel_remove' => 'default',
'title' => 'none',
'title_label_use_field_label' => 0,
'title_maxlength' => 128,
'title_value' => '',
'url' => 0,
'user_register_form' => FALSE,
'validate_url' => 1,
),
'widget' => array(
'active' => 0,
'module' => 'link',
'settings' => array(),
'type' => 'link_field',
'weight' => 2,
),
);
// Translatables
// Included for use with string extractors like potx.
t('Link');
return $field_instances;
}
profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.info
+ 3
− 0
View file @ 257a6827
......@@ -57,9 +57,12 @@ features[features_overrides][] = page_manager_handlers.node_edit_panel_context.c
features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|5
features[features_overrides][] = page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|6
features[features_overrides][] = page_manager_handlers.node_edit_panel_context.weight
features[field_instance][] = fieldable_panels_pane-image-field_ocio_link
features[variable][] = panels_page_allowed_layouts
features[variable][] = panels_page_allowed_types
features[variable][] = panels_page_default
features[variable][] = panopoly_admin_front_page_and_sticky
features_exclude[dependencies][file_entity] = file_entity
features_exclude[dependencies][link] = link
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
profiles/wcm_base/themes/ocio_omega_base/template.php
+ 33
− 22
View file @ 257a6827
......@@ -105,30 +105,42 @@ function ocio_omega_base_omega_theme_libraries_info() {
*/
function ocio_omega_base_preprocess_fieldable_panels_pane(&$vars) {
if (!empty($vars['content']['title'])) {
$vars['tile_title'] = $vars['content']['title']['#value'];
}
$vars['tile_url'] = NULL;
if (!empty($vars['content']['field_tile_link'])) {
$link = $vars['content']['field_tile_link']['#items'][0];
$vars['tile_url'] = url($link['url'], array('absolute' => TRUE, 'fragment' => $link['fragment'], 'query' => $link['query']));
}
if (!empty($vars['content']['field_background_color'])) {
$vars['classes_array'][] = $vars['content']['field_background_color']['#items'][0]['value'];
}
if (!empty($vars['content']['field_background_color_2'])) {
$vars['classes_array'][] = $vars['content']['field_background_color_2']['#items'][0]['value'];
}
if (!empty($vars['content']['field_tile_image_style'])) {
$style = $vars['content']['field_tile_image_style']['#items'][0]['value'];
$vars['tile_icon'] = ($style == 'icon');
$type = $vars['elements']['#bundle'];
if (!empty($style)) {
$vars['classes_array'][] = 'tile-image-style-' . $style;
// Tile panes
if (in_array($type, array('tile_pane', 'tile_pane_plus_text_area'))) {
if (!empty($vars['content']['title'])) {
$vars['tile_title'] = $vars['content']['title']['#value'];
}
$vars['tile_url'] = NULL;
if (!empty($vars['content']['field_tile_link'])) {
$link = $vars['content']['field_tile_link']['#items'][0];
$vars['tile_url'] = url($link['url'], array('absolute' => TRUE, 'fragment' => $link['fragment'], 'query' => $link['query']));
}
if (!empty($vars['content']['field_background_color'])) {
$vars['classes_array'][] = $vars['content']['field_background_color']['#items'][0]['value'];
}
if (!empty($vars['content']['field_background_color_2'])) {
$vars['classes_array'][] = $vars['content']['field_background_color_2']['#items'][0]['value'];
}
if (!empty($vars['content']['field_tile_image_style'])) {
$style = $vars['content']['field_tile_image_style']['#items'][0]['value'];
$vars['tile_icon'] = ($style == 'icon');
if (!empty($style)) {
$vars['classes_array'][] = 'tile-image-style-' . $style;
}
}
if (!empty($vars['tile_url'])) {
$vars['classes_array'][] = 'tile-pane-linked';
}
}
if (!empty($vars['tile_url'])) {
$vars['classes_array'][] = 'tile-pane-linked';
// Image panes
elseif ($type == 'image') {
if (!empty($vars['content']['field_basic_image_image'])) {
$vars['content']['field_basic_image_image'][0]['#path']['path'] = !empty($vars['elements']['#fieldable_panels_pane']->field_ocio_link) ? $vars['elements']['#fieldable_panels_pane']->field_ocio_link['und'][0]['display_url'] : NULL;
}
}
}
......@@ -152,7 +164,6 @@ function ocio_omega_base_preprocess_field(&$vars) {
if (isset($vars['element']['#object']->field_banner_image_text_bkground['und'][0]['value'])) {
$vars['classes_array'][] = $vars['element']['#object']->field_banner_image_text_bkground['und'][0]['value'];
}
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment