diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index c35c192cb03f7bc69a4e5aef650af1a90acda9cb..93135a0a3c48bfc4ca0fa7a2ba6f47e3d51efe78 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,9 @@
+WCM Base 7.x-1.x, 2015-12-30
+----------------------------
+- OCIO Landing Page:
+ - Add option to give banner text a translucent background.
+ - Add option to add a link to banner text.
+
WCM Base 7.x-1.x, 2015-12-16
----------------------------
- OCIO Omega: Update to version 4.4.
diff --git a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
index 8afd56cf612097c1cf863b75e4a461ca4409cc8f..7a070331dbcd26fde7d5e2568210d2aa05ef7ba8 100644
--- a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
+++ b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
@@ -5,9 +5,9 @@ files[] = date_popup_authored.test
package = Date/Time
dependencies[] = date_popup
-; Information added by drush on 2015-12-16
+; Information added by drush on 2015-12-30
version = "7.x-1.1+2-dev"
core = "7.x"
project = "date_popup_authored"
-datestamp = "1450283415"
+datestamp = "1451456414"
diff --git a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
index 35b9d565d6d2d5ac13c260f55dd9bcff108fd3f9..dec3c0617bb20a2f2fd2ca4641d12d4ada1b2580 100644
--- a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
+++ b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
@@ -9,9 +9,9 @@ dependencies[] = libraries (>=2.1)
files[] = includes/views/manualcrop.views.inc
-; Information added by drush on 2015-12-16
+; Information added by drush on 2015-12-30
version = "7.x-1.4+109-dev"
core = "7.x"
project = "manualcrop"
-datestamp = "1450283320"
+datestamp = "1451456311"
diff --git a/profiles/wcm_base/modules/contrib/workbench/workbench.info b/profiles/wcm_base/modules/contrib/workbench/workbench.info
index 9c48143a0c1e39402f36f3d7b33809ce2adbfa7c..5de5925e17a996d529efc483ceb346896775b121 100644
--- a/profiles/wcm_base/modules/contrib/workbench/workbench.info
+++ b/profiles/wcm_base/modules/contrib/workbench/workbench.info
@@ -6,9 +6,9 @@ configure = admin/config/workbench/settings
dependencies[] = views
-; Information added by drush on 2015-12-16
+; Information added by drush on 2015-12-30
version = "7.x-1.2"
core = "7.x"
project = "workbench"
-datestamp = "1450283356"
+datestamp = "1451456360"
diff --git a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
index c8f69a0278da3ce05560b86d35de34760379635b..a87dc113a9b71e9e40c559db017cf6063c168260 100644
--- a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
+++ b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
@@ -6,9 +6,9 @@ dependencies[] = workbench
dependencies[] = media
-; Information added by drush on 2015-12-16
+; Information added by drush on 2015-12-30
version = "7.x-2.1"
core = "7.x"
project = "workbench_media"
-datestamp = "1450283356"
+datestamp = "1451456361"
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
index 1b12c8ba480f30b1ec71f72ce07612eae0f3785e..0263047a1ce67dd80cbe27703af8897bc3d55208 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
@@ -5,9 +5,9 @@ core = 7.x
hidden = TRUE
-; Information added by drush on 2015-12-16
+; Information added by drush on 2015-12-30
version = "7.x-1.4+8-dev"
core = "7.x"
project = "workbench_moderation"
-datestamp = "1450283358"
+datestamp = "1451456362"
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
index b6795ecc5ced429e2fb974bb9a8521cf9b428951..65e5e59133b197a8f26c05598f740ec21ce580e4 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
@@ -18,9 +18,9 @@ files[] = tests/workbench_moderation.test
files[] = tests/workbench_moderation.files.test
-; Information added by drush on 2015-12-16
+; Information added by drush on 2015-12-30
version = "7.x-1.4+8-dev"
core = "7.x"
project = "workbench_moderation"
-datestamp = "1450283358"
+datestamp = "1451456362"
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.context.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.context.inc
deleted file mode 100644
index bbf891bbcfa98565afcf1a0327bc7f57e9ea73e0..0000000000000000000000000000000000000000
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.context.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * @file
- * ocio_landing_page.context.inc
- */
-
-/**
- * Implements hook_context_default_contexts().
- */
-function ocio_landing_page_context_default_contexts() {
- $export = array();
-
- $context = new stdClass();
- $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
- $context->api_version = 3;
- $context->name = 'landing-page-layout';
- $context->description = '';
- $context->tag = 'OCIO Landing Page';
- $context->conditions = array(
- 'node' => array(
- 'values' => array(
- 'ocio_landing_page' => 'ocio_landing_page',
- ),
- 'options' => array(
- 'node_form' => '1',
- ),
- ),
- );
- $context->reactions = array(
- 'block' => array(
- 'blocks' => array(
- 'ds_extras-ds_hero' => array(
- 'module' => 'ds_extras',
- 'delta' => 'ds_hero',
- 'region' => 'hero',
- 'weight' => '-10',
- ),
- 'ds_extras-ds_footer' => array(
- 'module' => 'ds_extras',
- 'delta' => 'ds_footer',
- 'region' => 'pre_footer',
- 'weight' => '-10',
- ),
- ),
- ),
- );
- $context->condition_mode = 0;
-
- // Translatables
- // Included for use with string extractors like potx.
- t('OCIO Landing Page');
- $export['landing-page-layout'] = $context;
-
- return $export;
-}
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.ds.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.ds.inc
deleted file mode 100644
index 9c130a017c97ec252197819adfb755e98d89bc12..0000000000000000000000000000000000000000
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.ds.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * @file
- * ocio_landing_page.ds.inc
- */
-
-/**
- * Implements hook_ds_layout_settings_info().
- */
-function ocio_landing_page_ds_layout_settings_info() {
- $export = array();
-
- $ds_layout = new stdClass();
- $ds_layout->api_version = 1;
- $ds_layout->id = 'node|ocio_landing_page|full';
- $ds_layout->entity_type = 'node';
- $ds_layout->bundle = 'ocio_landing_page';
- $ds_layout->view_mode = 'full';
- $ds_layout->layout = 'ds_1col';
- $ds_layout->settings = array(
- 'regions' => array(
- 'ds_hidden' => array(
- 0 => 'field_banner_image',
- 1 => 'field_banner_image_text',
- 2 => 'field_pre_footer_banner_image',
- ),
- ),
- 'fields' => array(
- 'field_banner_image' => 'ds_hidden',
- 'field_banner_image_text' => 'ds_hidden',
- 'field_pre_footer_banner_image' => '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' => '',
- 'hide_page_title' => '0',
- 'page_option_title' => '',
- );
- $export['node|ocio_landing_page|full'] = $ds_layout;
-
- return $export;
-}
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.conditional_fields.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.conditional_fields.inc
index f0efa077b721a1a7f4566377a4c01bdd560b2f85..d5dc72951223f49e3a7dc1484c0f5f012faa366b 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.conditional_fields.inc
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.conditional_fields.inc
@@ -406,5 +406,269 @@ function ocio_landing_page_conditional_fields_default_fields() {
),
);
+ $items[] = array(
+ 'entity' => 'node',
+ 'bundle' => 'ocio_landing_page',
+ 'dependent' => 'field_banner_image_text_bkground',
+ 'dependee' => 'field_banner_image',
+ 'options' => array(
+ 'state' => 'visible',
+ 'condition' => 'value',
+ 'grouping' => 'AND',
+ 'effect' => 'show',
+ 'effect_options' => array(),
+ 'element_view' => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 'element_view_per_role' => 0,
+ 'element_view_roles' => array(
+ 1 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 2 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 6 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 5 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 4 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 8 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 7 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 3 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ ),
+ 'element_edit' => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 'element_edit_per_role' => 0,
+ 'element_edit_roles' => array(
+ 1 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 2 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 6 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 5 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 4 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 8 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 7 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 3 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ ),
+ 'selector' => '.field-name-field-banner-image .fid',
+ 'values_set' => 5,
+ 'value_form' => array(
+ 0 => array(
+ 'fid' => 0,
+ 'display' => 1,
+ 'upload' => NULL,
+ ),
+ ),
+ 'values' => array(
+ 0 => 0,
+ ),
+ 'value' => array(),
+ ),
+ );
+
+ $items[] = array(
+ 'entity' => 'node',
+ 'bundle' => 'ocio_landing_page',
+ 'dependent' => 'field_banner_image_text_link',
+ 'dependee' => 'field_banner_image',
+ 'options' => array(
+ 'state' => 'visible',
+ 'condition' => 'value',
+ 'grouping' => 'AND',
+ 'effect' => 'show',
+ 'effect_options' => array(),
+ 'element_view' => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 'element_view_per_role' => 0,
+ 'element_view_roles' => array(
+ 1 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 2 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 6 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 5 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 4 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 8 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 7 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ 3 => array(
+ 1 => 1,
+ 2 => 2,
+ 5 => 0,
+ 3 => 0,
+ 4 => 0,
+ ),
+ ),
+ 'element_edit' => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 'element_edit_per_role' => 0,
+ 'element_edit_roles' => array(
+ 1 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 2 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 6 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 5 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 4 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 8 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 7 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ 3 => array(
+ 1 => 1,
+ 3 => 0,
+ ),
+ ),
+ 'selector' => '.field-name-field-banner-image .fid',
+ 'values_set' => 5,
+ 'value_form' => array(
+ 0 => array(
+ 'fid' => 0,
+ 'display' => 1,
+ 'upload' => NULL,
+ ),
+ ),
+ 'values' => array(
+ 0 => 0,
+ ),
+ 'value' => array(),
+ ),
+ );
+
return $items;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.fe_block_settings.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.fe_block_settings.inc
index b34ac653774070640d87a4675aeece744251d13d..a588f5c341b8023ff34cdc4515edc414dc4ff9ef 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.fe_block_settings.inc
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.fe_block_settings.inc
@@ -45,12 +45,6 @@ function ocio_landing_page_default_fe_block_settings() {
'theme' => 'ocio_4',
'weight' => 0,
),
- 'ohm' => array(
- 'region' => '',
- 'status' => 0,
- 'theme' => 'ohm',
- 'weight' => 0,
- ),
),
'title' => '<none>',
'visibility' => 0,
@@ -89,12 +83,6 @@ function ocio_landing_page_default_fe_block_settings() {
'theme' => 'ocio_4',
'weight' => 0,
),
- 'ohm' => array(
- 'region' => '',
- 'status' => 0,
- 'theme' => 'ohm',
- 'weight' => 0,
- ),
),
'title' => '<none>',
'visibility' => 0,
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.field_base.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.field_base.inc
index 5fbd3d1586f565b8260240aa90a7428d06fb272d..bffd45ca01b6d925b03c27e484755c0f1b102864 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.field_base.inc
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.field_base.inc
@@ -78,6 +78,30 @@ function ocio_landing_page_field_default_field_bases() {
'type' => 'text',
);
+ // Exported field_base: 'field_banner_image_text_bkground'
+ $field_bases['field_banner_image_text_bkground'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_banner_image_text_bkground',
+ 'indexes' => array(
+ 'value' => array(
+ 0 => 'value',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'list',
+ 'settings' => array(
+ 'allowed_values' => array(
+ 'translucent' => 'Translucent',
+ ),
+ 'allowed_values_function' => '',
+ ),
+ 'translatable' => 0,
+ 'type' => 'list_text',
+ );
+
// Exported field_base: 'field_banner_image_text_color'
$field_bases['field_banner_image_text_color'] = array(
'active' => 1,
@@ -104,6 +128,35 @@ function ocio_landing_page_field_default_field_bases() {
'type' => 'list_text',
);
+ // Exported field_base: 'field_banner_image_text_link'
+ $field_bases['field_banner_image_text_link'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_banner_image_text_link',
+ 'indexes' => array(),
+ 'locked' => 0,
+ 'module' => 'link',
+ 'settings' => array(
+ 'attributes' => array(
+ 'class' => '',
+ 'rel' => '',
+ 'target' => 'default',
+ ),
+ 'display' => array(
+ 'url_cutoff' => 80,
+ ),
+ 'enable_tokens' => 1,
+ 'title' => 'optional',
+ 'title_maxlength' => 128,
+ 'title_value' => '',
+ 'url' => 0,
+ ),
+ 'translatable' => 0,
+ 'type' => 'link_field',
+ );
+
// Exported field_base: 'field_banner_image_text_location'
$field_bases['field_banner_image_text_location'] = array(
'active' => 1,
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.field_instance.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.field_instance.inc
index f3a965bd170a3a3c317f89de3297b687ef5585b3..4d059a5155800d1208b891be80f298338715dff0 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.field_instance.inc
@@ -25,7 +25,7 @@ function ocio_landing_page_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 1,
+ 'weight' => 6,
),
'full' => array(
'label' => 'above',
@@ -68,7 +68,7 @@ function ocio_landing_page_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 4,
+ 'weight' => 9,
),
'full' => array(
'label' => 'above',
@@ -106,7 +106,7 @@ function ocio_landing_page_field_default_field_instances() {
'label' => 'hidden',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 0,
+ 'weight' => 1,
),
'full' => array(
'label' => 'hidden',
@@ -183,10 +183,9 @@ function ocio_landing_page_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'above',
- 'module' => 'text',
'settings' => array(),
- 'type' => 'text_default',
- 'weight' => 10,
+ 'type' => 'hidden',
+ 'weight' => 2,
),
'full' => array(
'label' => 'hidden',
@@ -221,6 +220,37 @@ function ocio_landing_page_field_default_field_instances() {
),
);
+ // Exported field_instance: 'node-ocio_landing_page-field_banner_image_text_bkground'
+ $field_instances['node-ocio_landing_page-field_banner_image_text_bkground'] = array(
+ 'bundle' => 'ocio_landing_page',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 5,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'node',
+ 'field_name' => 'field_banner_image_text_bkground',
+ 'label' => 'Banner Image Text Background',
+ 'required' => 0,
+ 'settings' => array(
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'options',
+ 'settings' => array(),
+ 'type' => 'options_select',
+ 'weight' => 7,
+ ),
+ );
+
// Exported field_instance: 'node-ocio_landing_page-field_banner_image_text_color'
$field_instances['node-ocio_landing_page-field_banner_image_text_color'] = array(
'bundle' => 'ocio_landing_page',
@@ -236,7 +266,7 @@ function ocio_landing_page_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 9,
+ 'weight' => 3,
),
'full' => array(
'label' => 'above',
@@ -262,6 +292,63 @@ function ocio_landing_page_field_default_field_instances() {
),
);
+ // Exported field_instance: 'node-ocio_landing_page-field_banner_image_text_link'
+ $field_instances['node-ocio_landing_page-field_banner_image_text_link'] = array(
+ 'bundle' => 'ocio_landing_page',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => 'Leave blank if you do not wish to use this text as a link. ',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'link',
+ 'settings' => array(),
+ 'type' => 'link_plain',
+ 'weight' => 0,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'node',
+ 'field_name' => 'field_banner_image_text_link',
+ 'label' => 'Banner Image Text Link',
+ 'required' => 0,
+ 'settings' => array(
+ 'absolute_url' => 0,
+ 'attributes' => array(
+ 'class' => '',
+ 'configurable_class' => 0,
+ 'configurable_title' => 0,
+ 'rel' => '',
+ 'target' => 'default',
+ 'title' => '',
+ ),
+ 'display' => array(
+ 'url_cutoff' => '',
+ ),
+ 'enable_tokens' => 0,
+ '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' => 8,
+ ),
+ );
+
// Exported field_instance: 'node-ocio_landing_page-field_banner_image_text_location'
$field_instances['node-ocio_landing_page-field_banner_image_text_location'] = array(
'bundle' => 'ocio_landing_page',
@@ -277,7 +364,7 @@ function ocio_landing_page_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 8,
+ 'weight' => 4,
),
'full' => array(
'label' => 'above',
@@ -318,7 +405,7 @@ function ocio_landing_page_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 2,
+ 'weight' => 7,
),
'full' => array(
'label' => 'above',
@@ -361,7 +448,7 @@ function ocio_landing_page_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 3,
+ 'weight' => 8,
),
'full' => array(
'label' => 'above',
@@ -399,7 +486,7 @@ function ocio_landing_page_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 6,
+ 'weight' => 10,
),
'full' => array(
'label' => 'hidden',
@@ -473,7 +560,9 @@ function ocio_landing_page_field_default_field_instances() {
t('Alternate Panel Rows');
t('Banner Image');
t('Banner Image Text');
+ t('Banner Image Text Background');
t('Banner Image Text Color');
+ t('Banner Image Text Link');
t('Banner Image Text Location');
t('Choose the best position for the text based on your photo choice. ');
t('Choose the color that will be the most readable. ');
@@ -481,6 +570,7 @@ function ocio_landing_page_field_default_field_instances() {
t('Disable Title');
t('Full width banner image for top of page. Photos must be at least 2000px wide. Height can be anything 320px or taller. Crop to desired proportions before uploading the image. ');
t('Full width banner image to be placed at the bottom of the content region, just above the footer. Photos must be at least 2000px wide. Height can be anything 320px or taller. Crop to desired proportions before uploading the image. ');
+ t('Leave blank if you do not wish to use this text as a link. ');
t('OPTIONAL text that may be placed atop a banner image. ');
t('Pre-Footer Banner Image');
t('Prevent users from changing metadata or deleting node.');
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.field_group.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.field_group.inc
index 67c0679236e370e1cefaa9cb2cb573e3a2c20d3c..b244fb3e5eefa8552b2fcdb20b483690fde6c19e 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.field_group.inc
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.field_group.inc
@@ -80,9 +80,11 @@ function ocio_landing_page_field_group_info() {
'weight' => '3',
'children' => array(
0 => 'field_banner_image',
- 1 => 'field_banner_image_text_location',
+ 1 => 'field_banner_image_text',
2 => 'field_banner_image_text_color',
- 3 => 'field_banner_image_text',
+ 3 => 'field_banner_image_text_location',
+ 4 => 'field_banner_image_text_bkground',
+ 5 => 'field_banner_image_text_link',
),
'format_type' => 'fieldset',
'format_settings' => array(
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info
index b861aa8ae7052ab37607acfbbf91b034c9227c02..0710d70178f3896edfcc872583b0421bcf610653 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info
@@ -5,38 +5,32 @@ package = OCIO Features
version = 7.x-1.0
project = ocio_landing_page
dependencies[] = conditional_fields
-dependencies[] = context
dependencies[] = ctools
dependencies[] = defaultconfig
-dependencies[] = ds
-dependencies[] = ds_extras
-dependencies[] = fe_block
dependencies[] = features
dependencies[] = field_group
dependencies[] = image
+dependencies[] = link
dependencies[] = list
dependencies[] = media
-dependencies[] = ocio_field_bases
dependencies[] = options
dependencies[] = panelizer
dependencies[] = strongarm
dependencies[] = text
dependencies[] = uuid_features
features[conditional_fields][] = node:ocio_landing_page
-features[context][] = landing-page-layout
features[ctools][] = context:context:3
features[ctools][] = ds:ds:1
features[ctools][] = field_group:field_group:1
features[ctools][] = panelizer:panelizer:1
features[ctools][] = strongarm:strongarm:1
-features[ds_layout_settings][] = node|ocio_landing_page|full
-features[fe_block_settings][] = ds_extras-ds_footer
-features[fe_block_settings][] = ds_extras-ds_hero
features[features_api][] = api:2
features[field_base][] = field_alternate_panel_rows
features[field_base][] = field_banner_image
features[field_base][] = field_banner_image_text
+features[field_base][] = field_banner_image_text_bkground
features[field_base][] = field_banner_image_text_color
+features[field_base][] = field_banner_image_text_link
features[field_base][] = field_banner_image_text_location
features[field_base][] = field_pre_footer_banner_image
features[field_group][] = group_bottom_banner_image|node|ocio_landing_page|form
@@ -46,7 +40,9 @@ features[field_instance][] = node-ocio_landing_page-field_admin_lock
features[field_instance][] = node-ocio_landing_page-field_alternate_panel_rows
features[field_instance][] = node-ocio_landing_page-field_banner_image
features[field_instance][] = node-ocio_landing_page-field_banner_image_text
+features[field_instance][] = node-ocio_landing_page-field_banner_image_text_bkground
features[field_instance][] = node-ocio_landing_page-field_banner_image_text_color
+features[field_instance][] = node-ocio_landing_page-field_banner_image_text_link
features[field_instance][] = node-ocio_landing_page-field_banner_image_text_location
features[field_instance][] = node-ocio_landing_page-field_disable_breadcrumbs
features[field_instance][] = node-ocio_landing_page-field_disable_title
@@ -57,7 +53,6 @@ features[panelizer_defaults][] = node:ocio_landing_page:default:default
features[panelizer_defaults][] = node:ocio_landing_page:default:full
features[variable][] = additional_settings__active_tab_ocio_landing_page
features[variable][] = custom_breadcrumbs_show_form_table_ocio_landing_page
-features[variable][] = ds_extras_region_blocks
features[variable][] = field_bundle_settings_node__ocio_landing_page
features[variable][] = menu_options_ocio_landing_page
features[variable][] = menu_parent_ocio_landing_page
@@ -78,3 +73,4 @@ features[variable][] = webform_node_ocio_landing_page
features[variable][] = workbench_moderation_default_state_ocio_landing_page
features_exclude[field_base][field_disable_title] = field_disable_title
features_exclude[uuid_node][40a11d9a-247e-4445-8243-d581155c3e74] = 40a11d9a-247e-4445-8243-d581155c3e74
+features_exclude[dependencies][ocio_field_bases] = ocio_field_bases
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
index 3ab7807662eeadacaf98580b21d64a30674ee878..f697c0cce334897d5542dabbbb65b1b5ed1897a7 100644
--- a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
@@ -24,22 +24,6 @@ function ocio_landing_page_strongarm() {
$strongarm->value = 1;
$export['custom_breadcrumbs_show_form_table_ocio_landing_page'] = $strongarm;
- $strongarm = new stdClass();
- $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
- $strongarm->api_version = 1;
- $strongarm->name = 'ds_extras_region_blocks';
- $strongarm->value = array(
- 'ds_hero' => array(
- 'title' => 'DS Hero',
- 'info' => 'node_ocio_landing_page_full',
- ),
- 'ds_footer' => array(
- 'title' => 'DS Footer',
- 'info' => 'node_ocio_landing_page_full',
- ),
- );
- $export['ds_extras_region_blocks'] = $strongarm;
-
$strongarm = new stdClass();
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
@@ -47,7 +31,7 @@ function ocio_landing_page_strongarm() {
$strongarm->value = array(
'view_modes' => array(
'full' => array(
- 'custom_settings' => TRUE,
+ 'custom_settings' => FALSE,
),
'teaser' => array(
'custom_settings' => FALSE,
@@ -82,6 +66,9 @@ function ocio_landing_page_strongarm() {
'path' => array(
'weight' => '1',
),
+ 'redirect' => array(
+ 'weight' => '30',
+ ),
),
'display' => array(),
),
@@ -184,7 +171,7 @@ function ocio_landing_page_strongarm() {
$strongarm->api_version = 1;
$strongarm->name = 'panelizer_defaults_user_user';
$strongarm->value = array(
- 'status' => 1,
+ 'status' => 0,
'view modes' => array(
'page_manager' => array(
'status' => 1,
diff --git a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
index 6c4651f845ceaef4714ab91a64ceb63a74a6478a..99cac64c07095a8893b2c59a381551513895eaf6 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.no-query.css
@@ -119,8 +119,8 @@ img, media {
}
h1, .alpha {
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 36px;
+ font-size: 3.6rem;
margin: .8em 0 0 0;
color: #b00;
}
@@ -422,6 +422,16 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.node-type-ocio-landing-page .tabs--primary {
padding-top: 2em;
}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text {
+ padding-left: 10%;
+ padding-right: 10%;
+ padding-left: 15%;
+ padding-right: 15%;
+ padding-left: 22%;
+ padding-right: 22%;
+ padding-left: 30%;
+ padding-right: 30%;
+}
.l-content {
padding: 0;
@@ -525,20 +535,19 @@ a.feed-icon {
padding-left: 5em !important;
}
-.pane-ocio-news-archive-titles-pane .views-field-title {
+.view-ocio-news-archive .pane-ocio-news-archive-titles-pane .views-field-title {
margin-bottom: 1em;
}
-.pane-ocio-news-archive-titles-pane .views-field-title a {
+.view-ocio-news-archive .pane-ocio-news-archive-titles-pane .views-field-title a {
font-size: 20px;
font-size: 2rem;
text-decoration: none;
}
-.pane-ocio-news-archive-titles-pane .views-field-title a:hover {
+.view-ocio-news-archive .pane-ocio-news-archive-titles-pane .views-field-title a:hover {
text-decoration: underline;
color: #666666;
}
-
-.view-display-id-archive_listing_block h3 {
+.view-ocio-news-archive .view-display-id-archive_listing_block h3 {
font-size: 19px;
font-size: 1.9rem;
text-transform: uppercase;
@@ -547,14 +556,13 @@ a.feed-icon {
padding-bottom: 0.2em;
border-bottom: 2px solid #ededed;
}
-.view-display-id-archive_listing_block .views-field-title h4 {
+.view-ocio-news-archive .view-display-id-archive_listing_block .views-field-title h4 {
font-size: 17px;
font-size: 1.7rem;
margin-top: 0.8em;
font-weight: 400;
line-height: 120%;
}
-
-.l-main.lt-gray .view-display-id-archive_listing_block h3 {
+.view-ocio-news-archive .l-main.lt-gray .view-display-id-archive_listing_block h3 {
border-bottom: 2px solid #dbdbdb;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
index 365eec0719b859f3334729c24be566adfed3072e..e9e0eed33414c622ddde173715284f0be5c0c2c4 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_4/css/ocio-4.styles.css
@@ -130,8 +130,8 @@ img, media {
}
h1, .alpha {
- font-size: 34px;
- font-size: 3.4rem;
+ font-size: 36px;
+ font-size: 3.6rem;
margin: .8em 0 0 0;
color: #b00;
}
@@ -452,6 +452,30 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.node-type-ocio-landing-page .tabs--primary {
padding-top: 2em;
}
+@media (min-width: 47.5em) {
+ .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text {
+ padding-left: 10%;
+ padding-right: 10%;
+ }
+}
+@media (min-width: 85.375em) {
+ .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text {
+ padding-left: 15%;
+ padding-right: 15%;
+ }
+}
+@media (min-width: 1600px) {
+ .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text {
+ padding-left: 22%;
+ padding-right: 22%;
+ }
+}
+@media (min-width: 2000px) {
+ .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text {
+ padding-left: 30%;
+ padding-right: 30%;
+ }
+}
.l-content {
padding: 0;
@@ -556,20 +580,19 @@ a.feed-icon {
padding-left: 5em !important;
}
}
-.pane-ocio-news-archive-titles-pane .views-field-title {
+.view-ocio-news-archive .pane-ocio-news-archive-titles-pane .views-field-title {
margin-bottom: 1em;
}
-.pane-ocio-news-archive-titles-pane .views-field-title a {
+.view-ocio-news-archive .pane-ocio-news-archive-titles-pane .views-field-title a {
font-size: 20px;
font-size: 2rem;
text-decoration: none;
}
-.pane-ocio-news-archive-titles-pane .views-field-title a:hover {
+.view-ocio-news-archive .pane-ocio-news-archive-titles-pane .views-field-title a:hover {
text-decoration: underline;
color: #666666;
}
-
-.view-display-id-archive_listing_block h3 {
+.view-ocio-news-archive .view-display-id-archive_listing_block h3 {
font-size: 19px;
font-size: 1.9rem;
text-transform: uppercase;
@@ -578,14 +601,13 @@ a.feed-icon {
padding-bottom: 0.2em;
border-bottom: 2px solid #ededed;
}
-.view-display-id-archive_listing_block .views-field-title h4 {
+.view-ocio-news-archive .view-display-id-archive_listing_block .views-field-title h4 {
font-size: 17px;
font-size: 1.7rem;
margin-top: 0.8em;
font-weight: 400;
line-height: 120%;
}
-
-.l-main.lt-gray .view-display-id-archive_listing_block h3 {
+.view-ocio-news-archive .l-main.lt-gray .view-display-id-archive_listing_block h3 {
border-bottom: 2px solid #dbdbdb;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/components/nodes/_landing-page.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/components/nodes/_landing-page.scss
index eb478ec2cf94dfe160c02bf0aa6b9f68046296eb..9c0f92dafe25fbcedc34f4b437640d2b8fe4562b 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/components/nodes/_landing-page.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/components/nodes/_landing-page.scss
@@ -19,4 +19,29 @@
.tabs--primary {
padding-top: 2em;
}
+
+
+ .l-region--hero-wrapper {
+ .field--name-field-banner-image-text {
+
+ //vary side padding by breakpoint
+ @include breakpoint($tab, true) {
+ padding-left: 10%;
+ padding-right: 10%;
+ }
+ @include breakpoint($x-wide, true) {
+ padding-left: 15%;
+ padding-right: 15%;
+ }
+ @include breakpoint($xx-wide, true) {
+ padding-left: 22%;
+ padding-right: 22%;
+ }
+ @include breakpoint($xxx-wide, true) {
+ padding-left: 30%;
+ padding-right: 30%;
+ }
+
+ }
+ }
}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/components/views/_news.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/components/views/_news.scss
index 16d3cb62ce97d1b822a4011bd5a0ed3b619f3dda..998825b0c138c0bc0d2247d45236c3b82dedd653 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/components/views/_news.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/components/views/_news.scss
@@ -1,51 +1,51 @@
.view-ocio-news-archive {
-
-//titles pane
-.pane-ocio-news-archive-titles-pane {
- .views-field-title {
- margin-bottom: 1em;
-
- a {
- @include font-size(2.0);
- text-decoration: none;
- &:hover {
- text-decoration: underline;
- color: $md-gray;
+ //titles pane
+ .pane-ocio-news-archive-titles-pane {
+ .views-field-title {
+ margin-bottom: 1em;
+
+ a {
+ @include font-size(2.0);
+ text-decoration: none;
+ &:hover {
+ text-decoration: underline;
+ color: $md-gray;
+ }
}
}
}
-}
-
-
-//archive block on news-archive page
-.view-display-id-archive_listing_block {
-
- //monthly date headers
- h3 {
- @include font-size(1.9);
- text-transform: uppercase;
- color: $md-gray;
- margin-top: 1.2em;
- padding-bottom: 0.2em;
- border-bottom: 2px solid $lt-gray;
- }
- //individual titles
- .views-field-title {
- h4 {
- @include font-size(1.7);
- margin-top: 0.8em;
- font-weight: 400;
- line-height: 120%;
- }
- }
-}
-
-//if lt-gray body color
-.l-main.lt-gray {
+
+ //archive block on news-archive page
.view-display-id-archive_listing_block {
- h3 {
- border-bottom: 2px solid darken($lt-gray,7%);
- }
+
+ //monthly date headers
+ h3 {
+ @include font-size(1.9);
+ text-transform: uppercase;
+ color: $md-gray;
+ margin-top: 1.2em;
+ padding-bottom: 0.2em;
+ border-bottom: 2px solid $lt-gray;
+ }
+ //individual titles
+ .views-field-title {
+ h4 {
+ @include font-size(1.7);
+ margin-top: 0.8em;
+ font-weight: 400;
+ line-height: 120%;
+ }
+ }
}
+
+ //if lt-gray body color
+ .l-main.lt-gray {
+ .view-display-id-archive_listing_block {
+ h3 {
+ border-bottom: 2px solid darken($lt-gray,7%);
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/variables/_grid.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/variables/_grid.scss
index fc0219df4ded96fa32daf97a480594ab68715c8b..51ed27f32124751a30172f707aaa9ce9a0763626 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/variables/_grid.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/variables/_grid.scss
@@ -9,6 +9,8 @@ $tab: 47.5em; //760px
$desk: 60em; //960px
$wide: 75em; //1200px
$x-wide: 85.375em; //1366px
+$xx-wide: 1600px;
+$xxx-wide: 2000px;
$max-width: 68.25em; //1092px
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
index 6e6237ce58ffa34c0d908383541ec8e5daa0f334..ece3d5e6839752dc3443cf55cd28101f50dccb09 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
@@ -2200,12 +2200,10 @@ div.workbench-info-block #edit-submit {
padding-bottom: 0.6em;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero,
.node-type-ocio-landing-page .l-region--hero-wrapper {
position: relative;
max-height: 500px;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image,
.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image {
position: relative;
top: 0;
@@ -2213,47 +2211,73 @@ div.workbench-info-block #edit-submit {
max-height: 500px;
overflow: hidden;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text,
.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text {
position: absolute;
width: 100%;
padding-left: 1em;
padding-right: 1em;
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
text-align: center;
z-index: 99;
- font-size: 30px;
- font-size: 3rem;
+ font-size: 28px;
+ font-size: 2.8rem;
line-height: 120%;
- padding-left: 4em;
- padding-right: 4em;
- padding-left: 6em;
- padding-right: 6em;
- padding-left: 10em;
- padding-right: 10em;
-}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.white,
-.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white {
+ font-size: 36px;
+ font-size: 3.6rem;
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text a:hover {
+ text-decoration: none;
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text span.ext {
+ display: none;
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white a {
+ color: white;
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white.translucent, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white a.translucent {
+ background-color: rgba(20, 20, 20, 0.6);
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white.translucent:hover, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white a.translucent:hover {
+ background-color: rgba(46, 46, 46, 0.6);
color: white;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.dk-gray,
-.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray {
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray a {
color: #2d2d2d;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.black,
-.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black {
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray.translucent, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray a.translucent {
+ background-color: rgba(220, 220, 220, 0.7);
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray.translucent:hover, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray a.translucent:hover {
+ background-color: rgba(200, 200, 200, 0.7);
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black a {
color: black;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.center-top,
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black.translucent, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black a.translucent {
+ background-color: rgba(220, 220, 220, 0.7);
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black.translucent:hover, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black a.translucent:hover {
+ background-color: rgba(200, 200, 200, 0.7);
+}
.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-top {
- top: 1em;
+ top: 0;
+ padding-top: 1em;
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-top.translucent {
+ padding-top: 0.5em;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.center-middle,
.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-middle {
- bottom: 45%;
+ top: 22%;
+ top: 30%;
+ top: 36%;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.center-bottom,
.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-bottom {
- bottom: 1.2em;
+ bottom: 0;
+ padding-bottom: 1em;
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-bottom.translucent {
+ padding-bottom: 0.5em;
}
.l-content {
@@ -2311,7 +2335,7 @@ div.workbench-info-block #edit-submit {
background-color: #666666;
margin: 0 0 1em 1em;
width: 2.55em;
- padding: 0.55em 0 0.4em;
+ padding: 0.62em 0 0.46em;
text-align: center;
display: block;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
index c682aa3531c5cd79604a43b92b84ae5ff987080c..d29f49c08842587edcd234bd04fe39ee46f248c2 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
@@ -2219,12 +2219,10 @@ div.workbench-info-block #edit-submit {
padding-bottom: 0.6em;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero,
.node-type-ocio-landing-page .l-region--hero-wrapper {
position: relative;
max-height: 500px;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image,
.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image {
position: relative;
top: 0;
@@ -2232,62 +2230,85 @@ div.workbench-info-block #edit-submit {
max-height: 500px;
overflow: hidden;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text,
.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text {
position: absolute;
width: 100%;
padding-left: 1em;
padding-right: 1em;
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
text-align: center;
z-index: 99;
- font-size: 30px;
- font-size: 3rem;
+ font-size: 28px;
+ font-size: 2.8rem;
line-height: 120%;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.white,
-.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white {
+@media (min-width: 60em) {
+ .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text {
+ font-size: 36px;
+ font-size: 3.6rem;
+ }
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text a:hover {
+ text-decoration: none;
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text span.ext {
+ display: none;
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white a {
+ color: white;
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white.translucent, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white a.translucent {
+ background-color: rgba(20, 20, 20, 0.6);
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white.translucent:hover, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.white a.translucent:hover {
+ background-color: rgba(46, 46, 46, 0.6);
color: white;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.dk-gray,
-.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray {
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray a {
color: #2d2d2d;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.black,
-.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black {
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray.translucent, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray a.translucent {
+ background-color: rgba(220, 220, 220, 0.7);
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray.translucent:hover, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.dk-gray a.translucent:hover {
+ background-color: rgba(200, 200, 200, 0.7);
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black a {
color: black;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.center-top,
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black.translucent, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black a.translucent {
+ background-color: rgba(220, 220, 220, 0.7);
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black.translucent:hover, .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.black a.translucent:hover {
+ background-color: rgba(200, 200, 200, 0.7);
+}
.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-top {
- top: 1em;
+ top: 0;
+ padding-top: 1em;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.center-middle,
-.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-middle {
- bottom: 45%;
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-top.translucent {
+ padding-top: 0.5em;
}
-.node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text.center-bottom,
-.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-bottom {
- bottom: 1.2em;
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-middle {
+ top: 22%;
}
@media (min-width: 47.5em) {
- .node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text,
- .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text {
- padding-left: 4em;
- padding-right: 4em;
+ .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-middle {
+ top: 30%;
}
}
-@media (min-width: 75em) {
- .node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text,
- .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text {
- padding-left: 6em;
- padding-right: 6em;
+@media (min-width: 60em) {
+ .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-middle {
+ top: 36%;
}
}
-@media (min-width: 85.375em) {
- .node-type-ocio-landing-page .block--ds-extras-ds-hero .field--name-field-banner-image-text,
- .node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text {
- padding-left: 10em;
- padding-right: 10em;
- }
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-bottom {
+ bottom: 0;
+ padding-bottom: 1em;
+}
+.node-type-ocio-landing-page .l-region--hero-wrapper .field--name-field-banner-image-text.center-bottom.translucent {
+ padding-bottom: 0.5em;
}
.l-content {
@@ -2345,7 +2366,7 @@ div.workbench-info-block #edit-submit {
background-color: #666666;
margin: 0 0 1em 1em;
width: 2.55em;
- padding: 0.55em 0 0.4em;
+ padding: 0.62em 0 0.46em;
text-align: center;
display: block;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc b/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc
index 6da4135108ea52286d98e25482e783ea55a7497d..c51355a91f29918222fa45edae309374c7eec411 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc
+++ b/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc
@@ -12,6 +12,9 @@ function ocio_omega_base_preprocess_page(&$vars) {
$classes = array();
$vars['main_classes'] = join(' ', $classes);
+
+ //render landing page top and bottom banner images in regions outside of 'content'
+
$vars['landing_page'] = isset($vars['node']) && $vars['node']->type == 'ocio_landing_page';
if ($vars['landing_page']) {
@@ -34,7 +37,12 @@ function ocio_omega_base_preprocess_page(&$vars) {
$top_banner_text = field_view_field('node', $vars['node'], 'field_banner_image_text');
if (!empty($top_banner_text) && !empty($vars['node']->field_banner_image_text_color) && !empty($vars['node']->field_banner_image_text_location)) {
$top_banner_text['#label_display'] = 'hidden';
-
+
+ $top_banner_url = field_view_field('node', $vars['node'], 'field_banner_image_text_link');
+ if (!empty($top_banner_url)) {
+ $top_banner_text[0]['#markup'] = l($top_banner_text['#items'][0]['value'], $top_banner_url['#items'][0]['url']);
+ }
+
$vars['page']['hero']['top_banner']['#markup'] .= drupal_render($top_banner_text);
}
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/nodes/_landing-page.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/nodes/_landing-page.scss
index 40e5d4932fe8171c44d7602e9b5aa92e3c1f8658..6c6eb1ba26373f7b98c8f1b19c4acc1a0a2fbd7c 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/nodes/_landing-page.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/nodes/_landing-page.scss
@@ -12,7 +12,6 @@
//attributes for banner images and banner image text
.node-type-ocio-landing-page {
- .block--ds-extras-ds-hero,
.l-region--hero-wrapper {
position: relative;
max-height: 500px;
@@ -30,51 +29,85 @@
width: 100%;
padding-left: 1em;
padding-right: 1em;
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
text-align: center;
z-index: 99;
- @include font-size(3);
+ @include font-size(2.8);
line-height: 120%;
+
+ @include breakpoint($desk,true) {
+ @include font-size(3.6);
+ }
+
+ a:hover {
+ text-decoration: none;
+ }
+ span.ext {
+ display: none;
+ }
//color and position options
- &.white {
+ &.white,
+ &.white a {
color: white;
+ &.translucent {
+ background-color: $dark-translucent;
+ &:hover {
+ background-color: lighten($dark-translucent, 10%);
+ color: white;
+ }
+ }
}
- &.dk-gray {
+ &.dk-gray,
+ &.dk-gray a {
color: $dk-gray;
+ &.translucent {
+ background-color: $light-translucent;
+ &:hover {
+ background-color: darken($light-translucent, 8%);
+ }
+ }
}
- &.black {
+ &.black,
+ &.black a {
color: black;
+ &.translucent {
+ background-color: $light-translucent;
+ &:hover {
+ background-color: darken($light-translucent, 8%);
+ }
+ }
}
&.center-top {
- top: 1em;
+ top: 0;
+ padding-top: 1em;
+ &.translucent {
+ padding-top: 0.5em;
+ }
}
&.center-middle {
- bottom: 45%;
+ top: 22%;
+ @include breakpoint($tab,true) {
+ top: 30%;
+ }
+ @include breakpoint($desk,true) {
+ top: 36%;
+ }
}
&.center-bottom {
- bottom: 1.2em;
- }
-
- //vary side padding by breakpoint
- @include breakpoint($tab, true) {
- padding-left: 4em;
- padding-right: 4em;
- }
-
- @include breakpoint($wide, true) {
- padding-left: 6em;
- padding-right: 6em;
- }
-
- @include breakpoint($x-wide, true) {
- padding-left: 10em;
- padding-right: 10em;
+ bottom: 0;
+ padding-bottom: 1em;
+ &.translucent {
+ padding-bottom: 0.5em;
+ }
}
+
}
}
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_footer.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_footer.scss
index ad2b2da5c60b3bd9b1bd8bbb4e309ca6b544a634..dcd900e1eb7fd49e990fec6a11b3a0861a35ff4b 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_footer.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/regions/_footer.scss
@@ -53,7 +53,7 @@
background-color: $md-gray;
margin: 0 0 1em 1em;
width: 2.55em;
- padding: 0.55em 0 0.4em;
+ padding: 0.62em 0 0.46em;
text-align: center;
display: block;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_colors.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_colors.scss
index fb6a34ffbbea1b44c6c56d045d7a5d9fbcf93093..0db977fa7cc8f208bf49a78d0f54285b81ce8e22 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_colors.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/variables/_colors.scss
@@ -5,6 +5,8 @@ $md-gray: #666666;
$dk-gray: #2d2d2d;
$black: #000;
$white: #fff;
+$light-translucent: rgba(220,220,220,0.7);
+$dark-translucent: rgba(20,20,20,0.6);
// accent colors
$blue: #028da9;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/template.php b/profiles/wcm_base/themes/ocio_omega_base/template.php
index c3728cc9800e8cb763ab9aabca30ed255892725d..ccb8e3a2453e5fb096ef049151ded1fb8a3b59e2 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/template.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/template.php
@@ -132,19 +132,26 @@ function ocio_omega_base_preprocess_fieldable_panels_pane(&$vars) {
}
/**
- * Add classes to field_banner_image_text_color
+ * Add classes to field_banner_image_text
**
* Implements hook_preprocess_field().
*/
function ocio_omega_base_preprocess_field(&$vars) {
+
if ($vars['element']['#field_name'] == 'field_banner_image_text') {
+
+ //print classes based on selected options from field
if (isset($vars['element']['#object']->field_banner_image_text_color['und'][0]['value'])) {
$vars['classes_array'][] = $vars['element']['#object']->field_banner_image_text_color['und'][0]['value'];
}
if (isset($vars['element']['#object']->field_banner_image_text_location['und'][0]['value'])) {
$vars['classes_array'][] = $vars['element']['#object']->field_banner_image_text_location['und'][0]['value'];
}
+ 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'];
+ }
+
}
}