diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index da4e3ecd07ee90ce623a7cd3d8ec7f96b10d879d..50711c6ae676b81e7a787a5cdeb12458299355a3 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,7 @@
+WCM Base 7.x-1.x, 2015-08-03
+----------------------------
+- OCIO News: Added Trio news views pane.
+
WCM Base 7.x-1.x, 2015-07-28
----------------------------
- Media: updated to 7.x-2.0-beta1, removed obviated patches.
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 bd506d7fd3b823ef3007eadd2dfee8b48dcc6fd5..28c24c63fef23c3a84befbb6f99d7a6e0ae753d5 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
@@ -3,4 +3,11 @@ description = "Provides a datepicker for the 'Authored on' field on node forms."
core = 7.x
files[] = date_popup_authored.test
package = Date/Time
-dependencies[] = date_popup
\ No newline at end of file
+dependencies[] = date_popup
+
+; Information added by drush on 2015-08-03
+version = "7.x-1.1+2-dev"
+core = "7.x"
+project = "date_popup_authored"
+datestamp = "1438625149"
+
diff --git a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
index f0defad2c46c26897cbd8859c768016a84fb8416..2c24ba1254f70d39002393f5bac39159ca0a8832 100644
--- a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
+++ b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
@@ -7,3 +7,11 @@ dependencies[] = image (>=7.8)
dependencies[] = libraries (>=2.1)
files[] = includes/views/manualcrop.views.inc
+
+
+; Information added by drush on 2015-08-03
+version = "7.x-1.4+109-dev"
+core = "7.x"
+project = "manualcrop"
+datestamp = "1438624973"
+
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc
index a7cf13963422c5d5d08702521f6423de673cdbf4..5bf953eeb028c3c848090e3943c81f0d6e12b303 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc
+++ b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc
@@ -75,7 +75,12 @@ function uuid_user_features_export_render($module, $data) {
// Use date instead of created - same format used by node_object_prepare.
$export->date = format_date($export->created, 'custom', 'Y-m-d H:i:s O');
- unset($export->uid, $export->pass);
+ unset(
+ $export->uid,
+ $export->pass,
+ $export->access,
+ $export->login
+ );
$entity_type = 'user';
drupal_alter('uuid_entity_features_export_render', $entity_type, $export, $account, $module);
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info
index f11b90e0563fe61e4ad1c6a9a43a90cb78aed533..9fb096e1bfc938d6246c524697d5a9e5e3961303 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info
+++ b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info
@@ -8,9 +8,9 @@ package = Features
configure = admin/structure/features/uuid_features
-; Information added by Drupal.org packaging script on 2015-07-23
-version = "7.x-1.0-alpha4+71-dev"
+; Information added by Drupal.org packaging script on 2015-07-30
+version = "7.x-1.0-alpha4+72-dev"
core = "7.x"
project = "uuid_features"
-datestamp = "1437627840"
+datestamp = "1438243740"
diff --git a/profiles/wcm_base/modules/contrib/workbench/workbench.info b/profiles/wcm_base/modules/contrib/workbench/workbench.info
index d7cbf84f6369778823ff812cc8a73b4f01b89ced..1407dc1365c5506e05c4bc8744b07ef77f37f4cb 100644
--- a/profiles/wcm_base/modules/contrib/workbench/workbench.info
+++ b/profiles/wcm_base/modules/contrib/workbench/workbench.info
@@ -4,3 +4,11 @@ package = Workbench
core = 7.x
configure = admin/config/workbench/settings
dependencies[] = views
+
+
+; Information added by drush on 2015-08-03
+version = "7.x-1.2"
+core = "7.x"
+project = "workbench"
+datestamp = "1438625063"
+
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 9eed11b0890ef272579ddb4f41cb6ca4aaae667e..50d3c989a0682fed3234914ce6b74d5103e631a1 100644
--- a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
+++ b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
@@ -4,3 +4,11 @@ package = Workbench
core = 7.x
dependencies[] = workbench
dependencies[] = media
+
+
+; Information added by drush on 2015-08-03
+version = "7.x-2.1"
+core = "7.x"
+project = "workbench_media"
+datestamp = "1438625063"
+
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 0f9e0139939f90f05138f37fdc695d018263dee7..8ee25c64c7dd8be0ea7bb30a64c51e1894eede12 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
@@ -3,3 +3,11 @@ description = Test module for Workbench Moderation.
package = Workbench
core = 7.x
hidden = TRUE
+
+
+; Information added by drush on 2015-08-03
+version = "7.x-1.4+6-dev"
+core = "7.x"
+project = "workbench_moderation"
+datestamp = "1438625064"
+
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 3f9939f1b620392b86995547bbcbb4b94258075d..9649a9cd3f0b05596e5d5002abfa599b08f024f6 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
@@ -16,3 +16,11 @@ files[] = workbench_moderation.migrate.inc
files[] = tests/external_node_update.test
files[] = tests/workbench_moderation.test
files[] = tests/workbench_moderation.files.test
+
+
+; Information added by drush on 2015-08-03
+version = "7.x-1.4+6-dev"
+core = "7.x"
+project = "workbench_moderation"
+datestamp = "1438625064"
+
diff --git a/profiles/wcm_base/modules/custom/mm/mm.module b/profiles/wcm_base/modules/custom/mm/mm.module
index 07f2fcf6197ca3981da5a331d260fd3e292f2aea..5bd70ed07db315cb6467a983bc20dfe9e212ba9f 100644
--- a/profiles/wcm_base/modules/custom/mm/mm.module
+++ b/profiles/wcm_base/modules/custom/mm/mm.module
@@ -78,7 +78,7 @@ function _mm_add_query_params($url, $params=array()) {
$has_query = parse_url($url, PHP_URL_QUERY);
$separator = $has_query ? '&' : '?';
- $add_query = http_build_query($params);
+ $add_query = http_build_query($params, '', '&');
return $url . $separator . $add_query;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.features.menu_links.inc b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.features.menu_links.inc
deleted file mode 100644
index 1b03d997789779237be03c82405d76d5a040d8a6..0000000000000000000000000000000000000000
--- a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.features.menu_links.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * @file
- * ocio_faqs.features.menu_links.inc
- */
-
-/**
- * Implements hook_menu_default_menu_links().
- */
-function ocio_faqs_menu_default_menu_links() {
- $menu_links = array();
-
- // Exported menu link: main-menu_faqs:faq
- $menu_links['main-menu_faqs:faq'] = array(
- 'menu_name' => 'main-menu',
- 'link_path' => 'faq',
- 'router_path' => 'faq',
- 'link_title' => 'FAQs',
- 'options' => array(
- 'attributes' => array(
- 'title' => '',
- ),
- 'identifier' => 'main-menu_faqs:faq',
- ),
- 'module' => 'menu',
- 'hidden' => 1,
- 'external' => 0,
- 'has_children' => 0,
- 'expanded' => 0,
- 'weight' => -48,
- 'customized' => 1,
- );
- // Translatables
- // Included for use with string extractors like potx.
- t('FAQs');
-
-
- return $menu_links;
-}
diff --git a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.info b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.info
index 7c3041753bab5cb7b45a6bc82f6173af81df9217..062fd456a753ca9f4dd0ea6d2eb153da405a7108 100644
--- a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.info
+++ b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.info
@@ -20,7 +20,6 @@ features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
features[field_instance][] = node-faq-field_answer
-features[menu_links][] = main-menu_faqs:faq
features[node][] = faq
features[variable][] = date_popup_authored_format_faq
features[variable][] = menu_options_faq
diff --git a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.features.field_instance.inc b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.features.field_instance.inc
index d80831acba64e77d2eb4b4da26f46dd525011b00..bbf38f7b7e27fcab35266cb074914e21ec73a0a0 100644
--- a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.features.field_instance.inc
@@ -25,6 +25,15 @@ function ocio_news_field_default_field_instances() {
'type' => 'file_rendered',
'weight' => 2,
),
+ 'featured' => array(
+ 'label' => 'hidden',
+ 'module' => 'file_entity',
+ 'settings' => array(
+ 'file_view_mode' => 'default',
+ ),
+ 'type' => 'file_rendered',
+ 'weight' => 3,
+ ),
'full' => array(
'label' => 'hidden',
'module' => 'image',
@@ -133,10 +142,13 @@ function ocio_news_field_default_field_instances() {
'weight' => 0,
),
'featured' => array(
- 'label' => 'above',
- 'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 0,
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(
+ 'trim_length' => 200,
+ ),
+ 'type' => 'text_summary_or_trimmed',
+ 'weight' => 2,
),
'full' => array(
'label' => 'hidden',
diff --git a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.strongarm.inc
index 924d57bb7f464da34e5a7fa6204c1eb42261999f..429ebd411bab7174d59f09ed91b3b7385fe17ec2 100644
--- a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.strongarm.inc
@@ -77,8 +77,9 @@ function ocio_news_strongarm() {
$strongarm->api_version = 1;
$strongarm->name = 'node_options_article';
$strongarm->value = array(
- 0 => 'moderation',
- 1 => 'revision',
+ 0 => 'promote',
+ 1 => 'moderation',
+ 2 => 'revision',
);
$export['node_options_article'] = $strongarm;
diff --git a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc
index 52e0ce4075f5dda5a2ff412aac8f2e6082918ccf..d4e280fc4b8a4e59f595af2d2f98979940da5a8e 100644
--- a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc
+++ b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc
@@ -195,6 +195,95 @@ function ocio_news_views_default_views() {
$handler->display->display_options['allow']['title_override'] = 'title_override';
$handler->display->display_options['allow']['exposed_form'] = 0;
$handler->display->display_options['allow']['fields_override'] = 0;
+
+ /* Display: Trio Pane */
+ $handler = $view->new_display('panel_pane', 'Trio Pane', 'trio_pane');
+ $handler->display->display_options['display_description'] = 'three news stories to be used in a block on landing pages';
+ $handler->display->display_options['defaults']['pager'] = FALSE;
+ $handler->display->display_options['pager']['type'] = 'some';
+ $handler->display->display_options['pager']['options']['items_per_page'] = '3';
+ $handler->display->display_options['pager']['options']['offset'] = '0';
+ $handler->display->display_options['defaults']['style_plugin'] = FALSE;
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['defaults']['style_options'] = FALSE;
+ $handler->display->display_options['defaults']['row_plugin'] = FALSE;
+ $handler->display->display_options['row_plugin'] = 'fields';
+ $handler->display->display_options['defaults']['row_options'] = FALSE;
+ $handler->display->display_options['defaults']['header'] = FALSE;
+ /* Header: Global: Text area */
+ $handler->display->display_options['header']['area']['id'] = 'area';
+ $handler->display->display_options['header']['area']['table'] = 'views';
+ $handler->display->display_options['header']['area']['field'] = 'area';
+ $handler->display->display_options['header']['area']['label'] = 'See All Link';
+ $handler->display->display_options['header']['area']['content'] = '<a href="/news" class="more-link">See all News</a>';
+ $handler->display->display_options['header']['area']['format'] = 'raw';
+ $handler->display->display_options['defaults']['fields'] = FALSE;
+ /* Field: Content: Path */
+ $handler->display->display_options['fields']['path']['id'] = 'path';
+ $handler->display->display_options['fields']['path']['table'] = 'node';
+ $handler->display->display_options['fields']['path']['field'] = 'path';
+ $handler->display->display_options['fields']['path']['label'] = '';
+ $handler->display->display_options['fields']['path']['exclude'] = TRUE;
+ $handler->display->display_options['fields']['path']['element_label_colon'] = FALSE;
+ /* Field: Content: Post date */
+ $handler->display->display_options['fields']['created']['id'] = 'created';
+ $handler->display->display_options['fields']['created']['table'] = 'node';
+ $handler->display->display_options['fields']['created']['field'] = 'created';
+ $handler->display->display_options['fields']['created']['label'] = '';
+ $handler->display->display_options['fields']['created']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['created']['date_format'] = 'panopoly_day';
+ $handler->display->display_options['fields']['created']['second_date_format'] = 'panopoly_time';
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ $handler->display->display_options['fields']['title']['element_type'] = 'h3';
+ $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
+ /* Field: Content: Body */
+ $handler->display->display_options['fields']['field_ocio_body']['id'] = 'field_ocio_body';
+ $handler->display->display_options['fields']['field_ocio_body']['table'] = 'field_data_field_ocio_body';
+ $handler->display->display_options['fields']['field_ocio_body']['field'] = 'field_ocio_body';
+ $handler->display->display_options['fields']['field_ocio_body']['label'] = '';
+ $handler->display->display_options['fields']['field_ocio_body']['alter']['make_link'] = TRUE;
+ $handler->display->display_options['fields']['field_ocio_body']['alter']['path'] = '[path]';
+ $handler->display->display_options['fields']['field_ocio_body']['alter']['max_length'] = '200';
+ $handler->display->display_options['fields']['field_ocio_body']['alter']['trim'] = TRUE;
+ $handler->display->display_options['fields']['field_ocio_body']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['field_ocio_body']['settings'] = array(
+ 'trim_length' => '600',
+ );
+ $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+ $handler->display->display_options['defaults']['filters'] = FALSE;
+ /* Filter criterion: Content: Published */
+ $handler->display->display_options['filters']['status']['id'] = 'status';
+ $handler->display->display_options['filters']['status']['table'] = 'node';
+ $handler->display->display_options['filters']['status']['field'] = 'status';
+ $handler->display->display_options['filters']['status']['value'] = 1;
+ $handler->display->display_options['filters']['status']['group'] = 1;
+ $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+ /* Filter criterion: Content: Type */
+ $handler->display->display_options['filters']['type']['id'] = 'type';
+ $handler->display->display_options['filters']['type']['table'] = 'node';
+ $handler->display->display_options['filters']['type']['field'] = 'type';
+ $handler->display->display_options['filters']['type']['value'] = array(
+ 'article' => 'article',
+ );
+ $handler->display->display_options['pane_category']['name'] = 'News Article Listings';
+ $handler->display->display_options['pane_category']['weight'] = '0';
+ $handler->display->display_options['allow']['use_pager'] = 0;
+ $handler->display->display_options['allow']['items_per_page'] = 0;
+ $handler->display->display_options['allow']['offset'] = 0;
+ $handler->display->display_options['allow']['link_to_view'] = 0;
+ $handler->display->display_options['allow']['more_link'] = 0;
+ $handler->display->display_options['allow']['path_override'] = 0;
+ $handler->display->display_options['allow']['title_override'] = 'title_override';
+ $handler->display->display_options['allow']['exposed_form'] = 0;
+ $handler->display->display_options['allow']['fields_override'] = 0;
+ $handler->display->display_options['allow']['panopoly_magic_display_type'] = 0;
+ $handler->display->display_options['link_to_view'] = '0';
$export['ocio_news_archive'] = $view;
return $export;
diff --git a/profiles/wcm_base/themes/ocio_omega_4/css/layouts/ocio-4/ocio-4.layout.css b/profiles/wcm_base/themes/ocio_omega_4/css/layouts/ocio-4/ocio-4.layout.css
index 912b48df62b310a42d5c38126ce461285e9b2b0b..fba061ef7cbb733b3942a91519d48edb250d8498 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/css/layouts/ocio-4/ocio-4.layout.css
+++ b/profiles/wcm_base/themes/ocio_omega_4/css/layouts/ocio-4/ocio-4.layout.css
@@ -296,14 +296,10 @@ h6 a:hover, .zeta a:hover {
color: #b00;
}
-h2.pane-title, h2.block__title {
- text-transform: uppercase;
- font-size: 20px;
- font-size: 2rem;
- color: #666666;
- letter-spacing: 1px;
- font-weight: 500;
- margin: 3em 0 0 0;
+h2.block__title {
+ font-size: 30px;
+ font-size: 3rem;
+ color: #2d2d2d;
}
.more-link-button {
diff --git a/profiles/wcm_base/themes/ocio_omega_4/css/layouts/ocio-4/ocio-4.layout.no-query.css b/profiles/wcm_base/themes/ocio_omega_4/css/layouts/ocio-4/ocio-4.layout.no-query.css
index fd6e2bd9807759e8c7ce3e3652b25931ce729bd3..bb63aa9deea7dbddc74e878594df6958ab803078 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/css/layouts/ocio-4/ocio-4.layout.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_4/css/layouts/ocio-4/ocio-4.layout.no-query.css
@@ -285,14 +285,10 @@ h6 a:hover, .zeta a:hover {
color: #b00;
}
-h2.pane-title, h2.block__title {
- text-transform: uppercase;
- font-size: 20px;
- font-size: 2rem;
- color: #666666;
- letter-spacing: 1px;
- font-weight: 500;
- margin: 3em 0 0 0;
+h2.block__title {
+ font-size: 30px;
+ font-size: 3rem;
+ color: #2d2d2d;
}
.more-link-button {
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 e961076bb928012e25da4c9dfea65d0c7103d318..ef21910afe0ff340da7b3d8e7ad217ab3b02b600 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
@@ -281,14 +281,10 @@ h6 a:hover, .zeta a:hover {
color: #b00;
}
-h2.pane-title, h2.block__title {
- text-transform: uppercase;
- font-size: 20px;
- font-size: 2rem;
- color: #666666;
- letter-spacing: 1px;
- font-weight: 500;
- margin: 3em 0 0 0;
+h2.block__title {
+ font-size: 30px;
+ font-size: 3rem;
+ color: #2d2d2d;
}
.more-link-button {
@@ -391,10 +387,18 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
background: #ededed;
}
+h2.pane-title {
+ font-size: 30px;
+ font-size: 3rem;
+ margin-bottom: 1em;
+ text-transform: none;
+ color: #2d2d2d;
+}
+
.panel-pane.pane-bundle-tile-pane {
- -moz-box-shadow: 0px 0px 7px #bbb;
- -webkit-box-shadow: 0px 0px 7px #bbb;
- box-shadow: 0px 0px 7px #bbb;
+ -moz-box-shadow: 0px 0px 2px 1px #ddd;
+ -webkit-box-shadow: 0px 0px 2px 1px #ddd;
+ box-shadow: 0px 0px 2px 1px #ddd;
}
.panel-pane.pane-bundle-tile-pane .title-text {
display: block;
@@ -403,15 +407,34 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
}
.panel-pane.pane-bundle-tile-pane-plus-text-area {
- -moz-box-shadow: 0px 0px 7px #bbb;
- -webkit-box-shadow: 0px 0px 7px #bbb;
- box-shadow: 0px 0px 7px #bbb;
+ -moz-box-shadow: 0px 0px 2px 1px #ddd;
+ -webkit-box-shadow: 0px 0px 2px 1px #ddd;
+ box-shadow: 0px 0px 2px 1px #ddd;
+}
+
+.node-type-ocio-landing-page .l-main {
+ padding-top: 0 !important;
+}
+.node-type-ocio-landing-page .l-region--content {
+ padding-bottom: 0;
+}
+.node-type-ocio-landing-page .tabs--primary {
+ padding-top: 2em;
}
.l-content {
padding: 0;
}
+.l-region--content {
+ padding-bottom: 3em;
+}
+
+a.feed-icon {
+ margin-bottom: 2em;
+ display: block;
+}
+
.l-region--hero-wrapper.lt-gray {
background: #ededed;
}
@@ -481,3 +504,59 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.l-region--pre-footer-wrapper .white {
background: white;
}
+
+.l-region--sidebar-1 h2.block__title,
+.l-region--sidebar-2 h2.block__title {
+ font-size: 25px;
+ font-size: 2.5rem;
+ text-transform: uppercase;
+ margin-top: 0.35em;
+}
+
+.l-region--sidebar-1,
+.l-region--sidebar-2 {
+ padding-top: 0 !important;
+}
+
+.l-region--sidebar-2 {
+ padding-left: 5em !important;
+}
+
+.view-ocio-news-archive .node--article--teaser h2 {
+ font-size: 27px;
+ font-size: 2.7rem;
+}
+
+.pane-ocio-news-archive-titles-pane .views-field-title {
+ margin-bottom: 1em;
+}
+.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 {
+ text-decoration: underline;
+ color: #666666;
+}
+
+.view-display-id-archive_listing_block h3 {
+ font-size: 19px;
+ font-size: 1.9rem;
+ text-transform: uppercase;
+ color: #666666;
+ margin-top: 1.2em;
+ padding-bottom: 0.2em;
+ border-bottom: 2px solid #ededed;
+}
+.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 {
+ 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 9ab13811622723bd5955595fded81ed07dab2d5e..6bb7ba228815c884d2102ee0c734a113bccf1864 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
@@ -292,14 +292,10 @@ h6 a:hover, .zeta a:hover {
color: #b00;
}
-h2.pane-title, h2.block__title {
- text-transform: uppercase;
- font-size: 20px;
- font-size: 2rem;
- color: #666666;
- letter-spacing: 1px;
- font-weight: 500;
- margin: 3em 0 0 0;
+h2.block__title {
+ font-size: 30px;
+ font-size: 3rem;
+ color: #2d2d2d;
}
.more-link-button {
@@ -414,10 +410,18 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
background: #ededed;
}
+h2.pane-title {
+ font-size: 30px;
+ font-size: 3rem;
+ margin-bottom: 1em;
+ text-transform: none;
+ color: #2d2d2d;
+}
+
.panel-pane.pane-bundle-tile-pane {
- -moz-box-shadow: 0px 0px 7px #bbb;
- -webkit-box-shadow: 0px 0px 7px #bbb;
- box-shadow: 0px 0px 7px #bbb;
+ -moz-box-shadow: 0px 0px 2px 1px #ddd;
+ -webkit-box-shadow: 0px 0px 2px 1px #ddd;
+ box-shadow: 0px 0px 2px 1px #ddd;
}
.panel-pane.pane-bundle-tile-pane .title-text {
display: block;
@@ -426,9 +430,9 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
}
.panel-pane.pane-bundle-tile-pane-plus-text-area {
- -moz-box-shadow: 0px 0px 7px #bbb;
- -webkit-box-shadow: 0px 0px 7px #bbb;
- box-shadow: 0px 0px 7px #bbb;
+ -moz-box-shadow: 0px 0px 2px 1px #ddd;
+ -webkit-box-shadow: 0px 0px 2px 1px #ddd;
+ box-shadow: 0px 0px 2px 1px #ddd;
}
@media (min-width: 85.375em) {
@@ -438,10 +442,29 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
padding: 0;
}
}
+.node-type-ocio-landing-page .l-main {
+ padding-top: 0 !important;
+}
+.node-type-ocio-landing-page .l-region--content {
+ padding-bottom: 0;
+}
+.node-type-ocio-landing-page .tabs--primary {
+ padding-top: 2em;
+}
+
.l-content {
padding: 0;
}
+.l-region--content {
+ padding-bottom: 3em;
+}
+
+a.feed-icon {
+ margin-bottom: 2em;
+ display: block;
+}
+
.l-region--hero-wrapper.lt-gray {
background: #ededed;
}
@@ -511,3 +534,60 @@ ul.flex-direction-nav, ul.flex-direction-nav:hover {
.l-region--pre-footer-wrapper .white {
background: white;
}
+
+.l-region--sidebar-1 h2.block__title,
+.l-region--sidebar-2 h2.block__title {
+ font-size: 25px;
+ font-size: 2.5rem;
+ text-transform: uppercase;
+ margin-top: 0.35em;
+}
+
+@media (min-width: 47.5em) {
+ .l-region--sidebar-1,
+ .l-region--sidebar-2 {
+ padding-top: 0 !important;
+ }
+
+ .l-region--sidebar-2 {
+ padding-left: 5em !important;
+ }
+}
+.view-ocio-news-archive .node--article--teaser h2 {
+ font-size: 27px;
+ font-size: 2.7rem;
+}
+
+.pane-ocio-news-archive-titles-pane .views-field-title {
+ margin-bottom: 1em;
+}
+.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 {
+ text-decoration: underline;
+ color: #666666;
+}
+
+.view-display-id-archive_listing_block h3 {
+ font-size: 19px;
+ font-size: 1.9rem;
+ text-transform: uppercase;
+ color: #666666;
+ margin-top: 1.2em;
+ padding-bottom: 0.2em;
+ border-bottom: 2px solid #ededed;
+}
+.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 {
+ border-bottom: 2px solid #dbdbdb;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/base/_typography.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/base/_typography.scss
index adeffbc035f0115f6f188d130864b09b59780da4..61bf85ee11ec39df7741bab5bda1977cc7f5e075 100755
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/base/_typography.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/base/_typography.scss
@@ -101,17 +101,12 @@ a {
color:$red;
}
-h2.pane-title, h2.block__title {
- text-transform: uppercase;
- @include font-size(2.0);
- color:$md-gray;
- letter-spacing:1px;
- font-weight:500;
- margin: 3em 0 0 0;
+h2.block__title {
+ @include font-size(3.0);
+ color:$dk-gray;
}
.more-link-button {
color:$white;
-
@extend .red-button;
}
blockquote p {
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/components/_panes.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/components/_panes.scss
new file mode 100644
index 0000000000000000000000000000000000000000..f6cb23cf840a598b8807a165d73e274b89342ac2
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/components/_panes.scss
@@ -0,0 +1,7 @@
+h2.pane-title {
+// font-family: $capita;
+ @include font-size(3.0);
+ margin-bottom: 1em;
+ text-transform: none;
+ color: $dk-gray;
+}
\ No newline at end of file
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 ad565c73193b87c99438c680bcfa2741d07602b6..eb478ec2cf94dfe160c02bf0aa6b9f68046296eb 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
@@ -6,4 +6,17 @@
padding: 0;
}
}
+}
+
+
+.node-type-ocio-landing-page {
+ .l-main {
+ padding-top: 0 !important;
+ }
+ .l-region--content {
+ padding-bottom: 0;
+ }
+ .tabs--primary {
+ padding-top: 2em;
+ }
}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_content.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_content.scss
index 8ad70f216c523f81a9f9c0a0e61495a3b0024657..e7ad5e402844dceb626e0746bc994182fbc436bd 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_content.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_content.scss
@@ -1,3 +1,12 @@
.l-content {
padding: 0;
+}
+
+.l-region--content {
+ padding-bottom: 3em;
+}
+
+a.feed-icon {
+ margin-bottom: 2em;
+ display: block;
}
\ No newline at end of file
diff --git a/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_sidebars.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_sidebars.scss
new file mode 100644
index 0000000000000000000000000000000000000000..f50438503f40026e71dada4d49398d8845c17653
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/components/regions/_sidebars.scss
@@ -0,0 +1,24 @@
+.l-region--sidebar-1,
+.l-region--sidebar-2 {
+
+ h2.block__title {
+ @include font-size(2.5);
+ text-transform: uppercase;
+ margin-top: 0.35em;
+ }
+}
+
+@include breakpoint($tab, true) {
+
+ .l-region--sidebar-1,
+ .l-region--sidebar-2 {
+ padding-top: 0 !important;
+ }
+
+ .l-region--sidebar-2 {
+ padding-left: 5em !important;
+ }
+
+}
+
+
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
new file mode 100644
index 0000000000000000000000000000000000000000..57b9a778da592ec9fa9e5744aa61bec911ba581c
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/components/views/_news.scss
@@ -0,0 +1,59 @@
+.view-ocio-news-archive {
+
+ //teasers pane
+ .node--article--teaser {
+ h2 {
+ @include font-size(2.7);
+ }
+ }
+}
+
+
+//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 {
+ .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/_shadows.scss b/profiles/wcm_base/themes/ocio_omega_4/sass/variables/_shadows.scss
index 5455f61bb0aa904587db35920a161b3c864dd9ee..136e4624ae29e12c595f2801c1fa8fda829d3713 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/sass/variables/_shadows.scss
+++ b/profiles/wcm_base/themes/ocio_omega_4/sass/variables/_shadows.scss
@@ -1,2 +1,5 @@
-$default-box-shadow-color: #bbb;
-$default-box-shadow-blur: 7px;
\ No newline at end of file
+$default-box-shadow-color: #ddd;
+$default-box-shadow-blur: 2px;
+$default-box-shadow-h-offset: 0px;
+$default-box-shadow-v-offset: 0px;
+$default-box-shadow-spread: 1px;
\ No newline at end of file
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 dcb6305b0bd6c038852e3c36af1a6a9199bba3aa..3be461836f01cc904b1d814e20fa04e69c8767f7 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
@@ -1526,12 +1526,64 @@ body .ui-accordion .ui-accordion-content {
margin-bottom: 0.2em;
}
+.pane-ocio-news-archive-trio-pane h2.pane-title {
+ border-bottom: 1px solid #b00;
+ padding-bottom: 0.1em;
+ margin-bottom: 0;
+}
+.pane-ocio-news-archive-trio-pane .view-header {
+ margin-top: -1.8em;
+}
+.pane-ocio-news-archive-trio-pane a.more-link, .pane-ocio-news-archive-trio-pane a.field--name-node-link {
+ margin-top: 0.2em;
+ font-weight: 400;
+ color: #2d2d2d;
+ font-size: 14px;
+}
+.pane-ocio-news-archive-trio-pane a.more-link:hover, .pane-ocio-news-archive-trio-pane a.field--name-node-link:hover {
+ text-decoration: none;
+ color: #028da9;
+}
+.pane-ocio-news-archive-trio-pane .views-field-title h3 {
+ font-size: 22px;
+ font-size: 2.2rem;
+ margin-top: 0.4em;
+ line-height: 120%;
+ margin-bottom: 0.5em;
+}
+.pane-ocio-news-archive-trio-pane .field--name-post-date {
+ font-weight: 400;
+ color: #666666;
+ font-size: 15px;
+ font-size: 1.5rem;
+}
+.pane-ocio-news-archive-trio-pane .views-field-field-ocio-body a, .pane-ocio-news-archive-trio-pane .views-field-field-ocio-body:hover {
+ color: #2d2d2d;
+ text-decoration: none;
+}
+.pane-ocio-news-archive-trio-pane .views-row-1 {
+ width: 33.9%;
+ float: left;
+ padding-right: 4%;
+}
+.pane-ocio-news-archive-trio-pane .views-row-2 {
+ width: 33.9%;
+ float: left;
+ padding-left: 2%;
+ padding-right: 2%;
+}
+.pane-ocio-news-archive-trio-pane .views-row-3 {
+ width: 32.2%;
+ float: right;
+ padding-left: 4%;
+}
+
.view-display-id-archive_listing_block h3 {
- font-size: 20px;
- font-size: 2rem;
+ font-size: 18px;
+ font-size: 1.8rem;
text-transform: uppercase;
color: #666666;
- margin-top: 1.6em;
+ margin-top: 1.2em;
}
.view-display-id-archive_listing_block .views-field-title h4 {
font-size: 16px;
@@ -1837,7 +1889,7 @@ p.search-result__snippet {
font-size: 2.4rem;
}
.panel-pane.pane-bundle-tile-pane .field--name-field-tile-background-img img {
- margin-bottom: -0.4em;
+ margin-bottom: -0.5em;
}
.panel-pane.pane-bundle-tile-pane .title-text h2 {
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 ae18174be1a6fb9867baa06d95e324ddfaecdb7d..54ebe76da9cca4f8aad0a844a7ed7d8c3548dcde 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
@@ -1547,12 +1547,66 @@ body .ui-accordion .ui-accordion-content {
margin-bottom: 0.2em;
}
+.pane-ocio-news-archive-trio-pane h2.pane-title {
+ border-bottom: 1px solid #b00;
+ padding-bottom: 0.1em;
+ margin-bottom: 0;
+}
+.pane-ocio-news-archive-trio-pane .view-header {
+ margin-top: -1.8em;
+}
+.pane-ocio-news-archive-trio-pane a.more-link, .pane-ocio-news-archive-trio-pane a.field--name-node-link {
+ margin-top: 0.2em;
+ font-weight: 400;
+ color: #2d2d2d;
+ font-size: 14px;
+}
+.pane-ocio-news-archive-trio-pane a.more-link:hover, .pane-ocio-news-archive-trio-pane a.field--name-node-link:hover {
+ text-decoration: none;
+ color: #028da9;
+}
+.pane-ocio-news-archive-trio-pane .views-field-title h3 {
+ font-size: 22px;
+ font-size: 2.2rem;
+ margin-top: 0.4em;
+ line-height: 120%;
+ margin-bottom: 0.5em;
+}
+.pane-ocio-news-archive-trio-pane .field--name-post-date {
+ font-weight: 400;
+ color: #666666;
+ font-size: 15px;
+ font-size: 1.5rem;
+}
+.pane-ocio-news-archive-trio-pane .views-field-field-ocio-body a, .pane-ocio-news-archive-trio-pane .views-field-field-ocio-body:hover {
+ color: #2d2d2d;
+ text-decoration: none;
+}
+@media (min-width: 47.5em) {
+ .pane-ocio-news-archive-trio-pane .views-row-1 {
+ width: 33.9%;
+ float: left;
+ padding-right: 4%;
+ }
+ .pane-ocio-news-archive-trio-pane .views-row-2 {
+ width: 33.9%;
+ float: left;
+ padding-left: 2%;
+ padding-right: 2%;
+ }
+ .pane-ocio-news-archive-trio-pane .views-row-3 {
+ width: 32.2%;
+ float: right;
+ padding-left: 4%;
+ }
+}
+
.view-display-id-archive_listing_block h3 {
- font-size: 20px;
- font-size: 2rem;
+ font-size: 18px;
+ font-size: 1.8rem;
text-transform: uppercase;
color: #666666;
- margin-top: 1.6em;
+ margin-top: 1.2em;
}
.view-display-id-archive_listing_block .views-field-title h4 {
font-size: 16px;
@@ -1859,7 +1913,7 @@ p.search-result__snippet {
font-size: 2.4rem;
}
.panel-pane.pane-bundle-tile-pane .field--name-field-tile-background-img img {
- margin-bottom: -0.4em;
+ margin-bottom: -0.5em;
}
@media (max-width: 47.5em) {
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_news.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_news.scss
index d4468dc5d7b1ee6c4aaad89cd42f22b53b032e75..2803c91cc8bf4c0e0eced8070ead5bccd703e405 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_news.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_news.scss
@@ -97,16 +97,81 @@
}
}
+//news pane trio view
+.pane-ocio-news-archive-trio-pane {
+
+ h2.pane-title {
+ border-bottom: 1px solid $red;
+ padding-bottom: 0.1em;
+ margin-bottom: 0;
+ }
+
+ .view-header {
+ margin-top: -1.8em;
+ }
+
+ a.more-link {
+ margin-top: 0.2em;
+ font-weight: 400;
+ color: $dk-gray;
+ font-size: 14px;
+
+ &:hover {
+ text-decoration: none;
+ color: $blue;
+ }
+ }
+
+ .views-field-title h3 {
+ @include font-size(2.2);
+ margin-top: 0.4em;
+ line-height: 120%;
+ margin-bottom: 0.5em;
+ }
+ .field--name-post-date {
+ font-weight: 400;
+ color: $md-gray;
+ @include font-size(1.5);
+ }
+ .views-field-field-ocio-body {
+ a, &:hover {
+ color: $dk-gray;
+ text-decoration: none;
+ }
+ }
+
+
+ @include breakpoint($tab, true){
+ .views-row-1 {
+ width: 33.9%;
+ float: left;
+ padding-right: 4%;
+ }
+ .views-row-2 {
+ width: 33.9%;
+ float: left;
+ padding-left: 2%;
+ padding-right: 2%;
+ }
+ .views-row-3 {
+ width: 32.2%;
+ float: right;
+ padding-left: 4%;
+ }
+ }
+}
+
+
//archive block on news-archive page
.view-display-id-archive_listing_block {
//monthly date headers
h3 {
- @include font-size(2.0);
+ @include font-size(1.8);
text-transform: uppercase;
color: $md-gray;
- margin-top: 1.6em;
+ margin-top: 1.2em;
}
//individual titles
.views-field-title {
@@ -120,4 +185,3 @@
-
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
index 67afd213a26d11bd17cfee8c84c8987417278b4d..903bd00731760bc571ae7f2371a9a3643cb07d55 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/_tiles.scss
@@ -75,7 +75,7 @@
}
.field--name-field-tile-background-img img {
- margin-bottom: -0.4em;
+ margin-bottom: -0.5em;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/template.php b/profiles/wcm_base/themes/ocio_omega_base/template.php
index 7fb55b627dfac5e1060dcebd271aa2db793f2aa4..c8c0dff0f29687b917907e66bd7e1e94cbe7f886 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/template.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/template.php
@@ -119,22 +119,23 @@ function ocio_omega_base_panel_rows($row_assignment, $vars) {
$node = $vars['display']->context['panelizer']->data;
- if (isset($node->field_alternate_panel_rows) && $node->field_alternate_panel_rows['und'][0]['value']) {
- $active_rows = array();
- $active_panes = $vars['display']->panels;
-
- foreach ($row_assignment as $row => $regions) {
- $row_classes[$row] = 'empty';
- foreach ($regions as $region) {
- if (isset($active_panes[$region])) {
- $active_rows[] = $row;
- break;
- }
+ $active_rows = array();
+ $active_panes = $vars['display']->panels;
+
+ foreach ($row_assignment as $row => $regions) {
+ $row_classes[$row] = 'empty';
+ foreach ($regions as $region) {
+ if (isset($active_panes[$region])) {
+ $active_rows[] = $row;
+ $row_classes[$row] = 'active';
+ break;
}
}
+ }
+ if (isset($node->field_alternate_panel_rows) && $node->field_alternate_panel_rows['und'][0]['value']) {
foreach ($active_rows as $key => $value) {
- $row_classes[$value] = ($key & 1) ? 'odd' : 'even';
+ $row_classes[$value] = join(' ', array($row_classes[$value], $key & 1 ? 'odd' : 'even'));
}
}