From 21e91ec6b363b284b8f8d073b1295ba9b53bc0e2 Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Fri, 18 Mar 2016 11:57:58 -0400
Subject: [PATCH] daily build
---
profiles/wcm_base/CHANGELOG.txt | 5 +
.../ocio_image_styles.ds.inc | 9 ++
.../ocio_image_styles.features.inc | 17 +++
.../ocio_image_styles/ocio_image_styles.info | 2 +
.../ocio_media.features.field_instance.inc | 39 +++++--
.../ocio_media.file_default_displays.inc | 104 ++++++++++++++++++
.../modules/custom/ocio_media/ocio_media.info | 9 ++
.../ocio_media/ocio_media.strongarm.inc | 13 +++
8 files changed, 191 insertions(+), 7 deletions(-)
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 17fcc2d7..0b7122ce 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,8 @@
+WCM Base 7.x-1.x, 2016-03-18
+----------------------------
+- OCIO Image Styles: Added medium image style.
+- OCIO Media: Added medium image view mode.
+
WCM Base 7.x-1.x, 2016-03-17
----------------------------
- OCIO SimpleSAMLphp Auth: Added patch to fix missing email address when
diff --git a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.ds.inc b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.ds.inc
index 7384b9e8..fd06f536 100644
--- a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.ds.inc
+++ b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.ds.inc
@@ -28,6 +28,15 @@ function ocio_image_styles_ds_view_modes_info() {
);
$export['image_large'] = $ds_view_mode;
+ $ds_view_mode = new stdClass();
+ $ds_view_mode->api_version = 1;
+ $ds_view_mode->view_mode = 'image_medium';
+ $ds_view_mode->label = 'Medium';
+ $ds_view_mode->entities = array(
+ 'file' => 'file',
+ );
+ $export['image_medium'] = $ds_view_mode;
+
$ds_view_mode = new stdClass();
$ds_view_mode->api_version = 1;
$ds_view_mode->view_mode = 'image_small';
diff --git a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc
index d631ac87..4ba91148 100644
--- a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc
+++ b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc
@@ -44,6 +44,22 @@ function ocio_image_styles_image_default_styles() {
),
);
+ // Exported image style: image_style_medium.
+ $styles['image_style_medium'] = array(
+ 'label' => 'Image Style Medium',
+ 'effects' => array(
+ 1 => array(
+ 'name' => 'image_scale',
+ 'data' => array(
+ 'width' => 500,
+ 'height' => '',
+ 'upscale' => 0,
+ ),
+ 'weight' => 1,
+ ),
+ ),
+ );
+
// Exported image style: image_style_small.
$styles['image_style_small'] = array(
'label' => 'Image Style Small',
@@ -90,5 +106,6 @@ function ocio_image_styles_image_default_styles() {
),
),
);
+
return $styles;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info
index 6c977054..73754131 100644
--- a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info
+++ b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info
@@ -13,10 +13,12 @@ features[ctools][] = ds:ds:1
features[ctools][] = file_entity:file_default_displays:1
features[ds_view_modes][] = image_full
features[ds_view_modes][] = image_large
+features[ds_view_modes][] = image_medium
features[ds_view_modes][] = image_small
features[features_api][] = api:2
features[image][] = image_style_full
features[image][] = image_style_large
+features[image][] = image_style_medium
features[image][] = image_style_small
features[image][] = image_style_tiny
features[image][] = teaser_image
diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.field_instance.inc b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.field_instance.inc
index 1c5b6c12..0bd00318 100644
--- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.field_instance.inc
@@ -122,6 +122,13 @@ function ocio_media_field_default_field_instances() {
'type' => 'text_default',
'weight' => 1,
),
+ 'image_medium' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 1,
+ ),
'image_right' => array(
'label' => 'hidden',
'module' => 'text',
@@ -131,9 +138,10 @@ function ocio_media_field_default_field_instances() {
),
'image_small' => array(
'label' => 'above',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 0,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 1,
),
'preview' => array(
'label' => 'hidden',
@@ -214,6 +222,12 @@ function ocio_media_field_default_field_instances() {
'type' => 'hidden',
'weight' => 2,
),
+ 'image_medium' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 3,
+ ),
'image_right' => array(
'label' => 'hidden',
'settings' => array(),
@@ -222,10 +236,9 @@ function ocio_media_field_default_field_instances() {
),
'image_small' => array(
'label' => 'hidden',
- 'module' => 'text',
'settings' => array(),
- 'type' => 'text_default',
- 'weight' => 1,
+ 'type' => 'hidden',
+ 'weight' => 2,
),
'link' => array(
'label' => 'above',
@@ -321,6 +334,12 @@ function ocio_media_field_default_field_instances() {
'type' => 'hidden',
'weight' => 3,
),
+ 'image_medium' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 4,
+ ),
'image_right' => array(
'label' => 'above',
'settings' => array(),
@@ -331,7 +350,7 @@ function ocio_media_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 2,
+ 'weight' => 4,
),
'link' => array(
'label' => 'above',
@@ -420,6 +439,12 @@ function ocio_media_field_default_field_instances() {
'type' => 'hidden',
'weight' => 4,
),
+ 'image_medium' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 5,
+ ),
'image_right' => array(
'label' => 'above',
'settings' => array(),
@@ -430,7 +455,7 @@ function ocio_media_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 3,
+ 'weight' => 5,
),
'link' => array(
'label' => 'above',
diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.file_default_displays.inc b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.file_default_displays.inc
index 06640993..c404364f 100644
--- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.file_default_displays.inc
+++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.file_default_displays.inc
@@ -311,6 +311,110 @@ function ocio_media_file_default_displays() {
$file_display->settings = '';
$export['image__image_max__file_field_media_large_icon'] = $file_display;
+ $file_display = new stdClass();
+ $file_display->api_version = 1;
+ $file_display->name = 'image__image_medium__file_field_colorbox';
+ $file_display->weight = 0;
+ $file_display->status = FALSE;
+ $file_display->settings = array(
+ 'colorbox_node_style' => '',
+ 'colorbox_node_style_first' => '',
+ 'colorbox_image_style' => '',
+ 'colorbox_gallery' => 'post',
+ 'colorbox_gallery_custom' => '',
+ 'colorbox_caption' => 'auto',
+ 'colorbox_caption_custom' => '',
+ );
+ $export['image__image_medium__file_field_colorbox'] = $file_display;
+
+ $file_display = new stdClass();
+ $file_display->api_version = 1;
+ $file_display->name = 'image__image_medium__file_field_colorbox_link';
+ $file_display->weight = 0;
+ $file_display->status = FALSE;
+ $file_display->settings = array(
+ 'colorbox_view_mode' => 'default',
+ 'fixed_width' => '',
+ 'fixed_height' => '',
+ 'colorbox_gallery' => 'post',
+ 'colorbox_gallery_custom' => '',
+ 'colorbox_caption' => 'title',
+ 'audio_playlist' => 0,
+ );
+ $export['image__image_medium__file_field_colorbox_link'] = $file_display;
+
+ $file_display = new stdClass();
+ $file_display->api_version = 1;
+ $file_display->name = 'image__image_medium__file_field_file_default';
+ $file_display->weight = 0;
+ $file_display->status = FALSE;
+ $file_display->settings = '';
+ $export['image__image_medium__file_field_file_default'] = $file_display;
+
+ $file_display = new stdClass();
+ $file_display->api_version = 1;
+ $file_display->name = 'image__image_medium__file_field_file_download_link';
+ $file_display->weight = 0;
+ $file_display->status = FALSE;
+ $file_display->settings = array(
+ 'text' => 'Download [file:name]',
+ );
+ $export['image__image_medium__file_field_file_download_link'] = $file_display;
+
+ $file_display = new stdClass();
+ $file_display->api_version = 1;
+ $file_display->name = 'image__image_medium__file_field_file_table';
+ $file_display->weight = 0;
+ $file_display->status = FALSE;
+ $file_display->settings = '';
+ $export['image__image_medium__file_field_file_table'] = $file_display;
+
+ $file_display = new stdClass();
+ $file_display->api_version = 1;
+ $file_display->name = 'image__image_medium__file_field_file_url_plain';
+ $file_display->weight = 0;
+ $file_display->status = FALSE;
+ $file_display->settings = '';
+ $export['image__image_medium__file_field_file_url_plain'] = $file_display;
+
+ $file_display = new stdClass();
+ $file_display->api_version = 1;
+ $file_display->name = 'image__image_medium__file_field_image';
+ $file_display->weight = 0;
+ $file_display->status = TRUE;
+ $file_display->settings = array(
+ 'image_style' => 'image_style_medium',
+ 'image_link' => '',
+ );
+ $export['image__image_medium__file_field_image'] = $file_display;
+
+ $file_display = new stdClass();
+ $file_display->api_version = 1;
+ $file_display->name = 'image__image_medium__file_field_media_colorbox';
+ $file_display->weight = 0;
+ $file_display->status = FALSE;
+ $file_display->settings = array(
+ 'file_view_mode' => 'default',
+ 'colorbox_view_mode' => 'default',
+ 'fixed_width' => '',
+ 'fixed_height' => '',
+ 'colorbox_gallery' => 'post',
+ 'colorbox_gallery_custom' => '',
+ 'colorbox_caption' => 'title',
+ 'audio_playlist' => 0,
+ );
+ $export['image__image_medium__file_field_media_colorbox'] = $file_display;
+
+ $file_display = new stdClass();
+ $file_display->api_version = 1;
+ $file_display->name = 'image__image_medium__file_field_media_large_icon';
+ $file_display->weight = 0;
+ $file_display->status = FALSE;
+ $file_display->settings = array(
+ 'image_style' => '',
+ );
+ $export['image__image_medium__file_field_media_large_icon'] = $file_display;
+
$file_display = new stdClass();
$file_display->api_version = 1;
$file_display->name = 'image__image_right__file_field_file_default';
diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info
index 675ab38f..5cd47170 100644
--- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info
+++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.info
@@ -125,6 +125,15 @@ features[file_display][] = image__image_max__file_field_file_table
features[file_display][] = image__image_max__file_field_file_url_plain
features[file_display][] = image__image_max__file_field_image
features[file_display][] = image__image_max__file_field_media_large_icon
+features[file_display][] = image__image_medium__file_field_colorbox
+features[file_display][] = image__image_medium__file_field_colorbox_link
+features[file_display][] = image__image_medium__file_field_file_default
+features[file_display][] = image__image_medium__file_field_file_download_link
+features[file_display][] = image__image_medium__file_field_file_table
+features[file_display][] = image__image_medium__file_field_file_url_plain
+features[file_display][] = image__image_medium__file_field_image
+features[file_display][] = image__image_medium__file_field_media_colorbox
+features[file_display][] = image__image_medium__file_field_media_large_icon
features[file_display][] = image__image_right__file_field_file_default
features[file_display][] = image__image_right__file_field_file_download_link
features[file_display][] = image__image_right__file_field_file_table
diff --git a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.strongarm.inc
index d693b95e..743603f4 100644
--- a/profiles/wcm_base/modules/custom/ocio_media/ocio_media.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_media/ocio_media.strongarm.inc
@@ -122,6 +122,15 @@ function ocio_media_strongarm() {
'video_right' => array(
'custom_settings' => FALSE,
),
+ 'colorbox' => array(
+ 'custom_settings' => TRUE,
+ ),
+ 'image_medium' => array(
+ 'custom_settings' => TRUE,
+ ),
+ 'video_center' => array(
+ 'custom_settings' => FALSE,
+ ),
),
'extra_fields' => array(
'form' => array(
@@ -166,6 +175,10 @@ function ocio_media_strongarm() {
'weight' => '0',
'visible' => TRUE,
),
+ 'image_medium' => array(
+ 'weight' => '0',
+ 'visible' => TRUE,
+ ),
),
),
),
--
GitLab