diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index fd6957a97b96cbadb46dd11f9216390e4a0536ef..638d6efab470d986e362f69198808873cb5dbe9f 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,11 @@
+WCM Base 7.x-1.x, 2016-04-27
+----------------------------
+- WCM Base: Updated DisplaySuite to 2.14
+- OCIO Omega Base:
+ - Fixed displaying of all tile pane links as blocks.
+ - Allow blocks to be inserted in footer_2 and footer_3 regions, and for
+ blocks to coexist with prerendered content from ocio_siteinfo module.
+
WCM Base 7.x-1.x, 2016-04-21
----------------------------
- WCM Base: Updated Panopoly to 1.34 and Features to 2.10.
diff --git a/profiles/wcm_base/modules/contrib/ds/ds.info b/profiles/wcm_base/modules/contrib/ds/ds.info
index 8ad3bfdab85c849dee9e903ea3c27124dbaf54dd..cf0e73d06b3091c0aa6b51d167841d59931eeac6 100644
--- a/profiles/wcm_base/modules/contrib/ds/ds.info
+++ b/profiles/wcm_base/modules/contrib/ds/ds.info
@@ -13,9 +13,9 @@ files[] = tests/ds.views.test
files[] = tests/ds.forms.test
configure = admin/structure/ds
-; Information added by Drupal.org packaging script on 2016-02-11
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2016-04-26
+version = "7.x-2.14"
core = "7.x"
project = "ds"
-datestamp = "1455211441"
+datestamp = "1461696967"
diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_devel/ds_devel.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_devel/ds_devel.info
index 7b59e714ea46d251c8e38e79b324df9861d2ea13..dcb6cb05403de263399063374fcff3a7e5878864 100644
--- a/profiles/wcm_base/modules/contrib/ds/modules/ds_devel/ds_devel.info
+++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_devel/ds_devel.info
@@ -5,9 +5,9 @@ package = "Display Suite"
dependencies[] = ds
dependencies[] = devel
-; Information added by Drupal.org packaging script on 2016-02-11
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2016-04-26
+version = "7.x-2.14"
core = "7.x"
project = "ds"
-datestamp = "1455211441"
+datestamp = "1461696967"
diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/ds_extras.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/ds_extras.info
index 94f87778831604c642e3856635b2e01a743cd4c9..aa2af95c00437f1650e0e40f74b08abe15e8065c 100644
--- a/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/ds_extras.info
+++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/ds_extras.info
@@ -5,9 +5,9 @@ package = "Display Suite"
dependencies[] = ds
configure = admin/structure/ds/list/extras
-; Information added by Drupal.org packaging script on 2016-02-11
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2016-04-26
+version = "7.x-2.14"
core = "7.x"
project = "ds"
-datestamp = "1455211441"
+datestamp = "1461696967"
diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_format/ds_format.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_format/ds_format.info
index 05900077b60b5589a3e58fe4d6252507b4c38faf..949067b5c607535fd7ad8a18b2579e3186090639 100644
--- a/profiles/wcm_base/modules/contrib/ds/modules/ds_format/ds_format.info
+++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_format/ds_format.info
@@ -5,9 +5,9 @@ package = "Display Suite"
dependencies[] = ds
configure = admin/structure/ds/list/extras
-; Information added by Drupal.org packaging script on 2016-02-11
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2016-04-26
+version = "7.x-2.14"
core = "7.x"
project = "ds"
-datestamp = "1455211441"
+datestamp = "1461696967"
diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_forms/ds_forms.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_forms/ds_forms.info
index daa25617d1e9f011bd5dce4b6cb56f0f5393dd31..2153a1c6c61b90ae6dfb802070179455a2c9dcfd 100644
--- a/profiles/wcm_base/modules/contrib/ds/modules/ds_forms/ds_forms.info
+++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_forms/ds_forms.info
@@ -4,9 +4,9 @@ core = "7.x"
package = "Display Suite"
dependencies[] = ds
-; Information added by Drupal.org packaging script on 2016-02-11
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2016-04-26
+version = "7.x-2.14"
core = "7.x"
project = "ds"
-datestamp = "1455211441"
+datestamp = "1461696967"
diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_search/ds_search.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_search/ds_search.info
index 788c4b4b82e80843b01faa453905a632345cdaa3..ed7141af96730e66181aa018d8cf5b575ebd758a 100644
--- a/profiles/wcm_base/modules/contrib/ds/modules/ds_search/ds_search.info
+++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_search/ds_search.info
@@ -5,9 +5,9 @@ package = "Display Suite"
dependencies[] = ds
configure = admin/structure/ds/list/search
-; Information added by Drupal.org packaging script on 2016-02-11
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2016-04-26
+version = "7.x-2.14"
core = "7.x"
project = "ds"
-datestamp = "1455211441"
+datestamp = "1461696967"
diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/ds_ui.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/ds_ui.info
index 73988402551a5fade4188a96ea3b4f4829e3faec..9883a530c57858eea2840bd57748734f279da665 100644
--- a/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/ds_ui.info
+++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/ds_ui.info
@@ -4,9 +4,9 @@ core = "7.x"
package = "Display Suite"
dependencies[] = ds
-; Information added by Drupal.org packaging script on 2016-02-11
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2016-04-26
+version = "7.x-2.14"
core = "7.x"
project = "ds"
-datestamp = "1455211441"
+datestamp = "1461696967"
diff --git a/profiles/wcm_base/modules/contrib/ds/tests/ds_exportables_test/ds_exportables_test.info b/profiles/wcm_base/modules/contrib/ds/tests/ds_exportables_test/ds_exportables_test.info
index 20dca2f41e260863bb922d2f2c3e506a38e226d6..a0c8b42b2b0205aab873d5718ec9293104c2995b 100644
--- a/profiles/wcm_base/modules/contrib/ds/tests/ds_exportables_test/ds_exportables_test.info
+++ b/profiles/wcm_base/modules/contrib/ds/tests/ds_exportables_test/ds_exportables_test.info
@@ -4,9 +4,9 @@ package = "Display Suite"
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2016-02-11
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2016-04-26
+version = "7.x-2.14"
core = "7.x"
project = "ds"
-datestamp = "1455211441"
+datestamp = "1461696967"
diff --git a/profiles/wcm_base/modules/contrib/ds/tests/ds_test.info b/profiles/wcm_base/modules/contrib/ds/tests/ds_test.info
index 79b345f4f21dbad1f06ae8787ee23130994ce5f4..813346a7438eaa53c0604bc2523c7addee0ab36c 100644
--- a/profiles/wcm_base/modules/contrib/ds/tests/ds_test.info
+++ b/profiles/wcm_base/modules/contrib/ds/tests/ds_test.info
@@ -5,9 +5,9 @@ package = "Display Suite"
dependencies[] = ds_extras
hidden = TRUE
-; Information added by Drupal.org packaging script on 2016-02-11
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2016-04-26
+version = "7.x-2.14"
core = "7.x"
project = "ds"
-datestamp = "1455211441"
+datestamp = "1461696967"
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 ecef3250e29bd66c6d5e20def303778fe25dbb02..34cea294def7334f940e0ca65778747dda57399b 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
@@ -2810,6 +2810,9 @@ For some reason the field class in the live and local environments were differen
color: #fff;
font-weight: 400;
}
+.l-footer-wrapper .l-region--footer-2 {
+ text-align: right;
+}
.l-footer-wrapper #osu-wordmark {
margin-bottom: 20px;
}
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 7ec0eca8267d356327232e477683f249342aeb47..0a812044d03945af1ac45a7c6993e942b8670999 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
@@ -2854,6 +2854,9 @@ For some reason the field class in the live and local environments were differen
color: #fff;
font-weight: 400;
}
+.l-footer-wrapper .l-region--footer-2 {
+ text-align: right;
+}
.l-footer-wrapper #osu-wordmark {
margin-bottom: 20px;
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/preprocess/region.preprocess.inc b/profiles/wcm_base/themes/ocio_omega_base/preprocess/region.preprocess.inc
index 557f81f37d7af9862280b87b4e5a93a455e022eb..ccd59b6d0ccb20ef3151a33f39c7b793215d08a4 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/preprocess/region.preprocess.inc
+++ b/profiles/wcm_base/themes/ocio_omega_base/preprocess/region.preprocess.inc
@@ -31,15 +31,14 @@ function ocio_omega_base_preprocess_region(&$vars) {
case 'footer_1':
/* Variables for footer_1 region */
$vars['logo'] = $theme_path . '/images/osu-logos/osu-footer-wordmark.svg';
- $vars['rendered_content'] = $siteinfo_module ? ocio_siteinfo_address_content() : '';
+ $vars['content'] = $siteinfo_module ? ocio_siteinfo_address_content() : '';
break;
case 'footer_2':
- /* Variables for footer_2 region */
- $vars['rendered_content'] = $siteinfo_module ? ocio_siteinfo_social_content() : '';
+ $vars['content'] = ($siteinfo_module ? ocio_siteinfo_social_content() : '') . $vars['content'] ;
break;
case 'footer_3':
/* Variables for footer_2 region */
- $vars['rendered_content'] = $siteinfo_module ? ocio_siteinfo_footer_block() : '';
+ $vars['content'] = ($siteinfo_module ? ocio_siteinfo_footer_block() : '') . $vars['content'];
break;
}
/* Variables for all regions */
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 dcd900e1eb7fd49e990fec6a11b3a0861a35ff4b..59c0d494700b07f6f81c714de30148c9d80b8978 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
@@ -21,6 +21,10 @@
}
}
+ .l-region--footer-2 {
+ text-align: right;
+ }
+
#osu-wordmark {
margin-bottom: $vert-spacing-unit;
}
@@ -78,7 +82,7 @@
background-color: $youtube;
}
}
-
+
&.link-googleplus {
&:hover, &:focus {
background-color: $googleplus;
@@ -90,7 +94,7 @@
background-color: $flickr;
}
}
-
+
&.link-instagram {
&:hover, &:focus {
background-color: $instagram;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/template.php b/profiles/wcm_base/themes/ocio_omega_base/template.php
index 4ea8fcdcd0e342d61d9bd6c5766d462df9c58117..c76ce31d323346e14e9c144fbf51e768f702ea96 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/template.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/template.php
@@ -8,48 +8,47 @@
/*** force regions to display without blocks - as necessary ***/
function ocio_omega_base_page_alter(&$page) {
- foreach (system_region_list($GLOBALS['theme'], REGIONS_ALL) as $region => $name) {
-
- if (in_array($region, array('osu_navbar'))) {
- $page['osu_navbar'] = array(
- '#region' => 'osu_navbar',
- '#weight' => '-10',
- '#theme_wrappers' => array('region'),
- );
- }
-
- if (in_array($region, array('masthead'))) {
- $page['masthead'] = array(
- '#region' => 'masthead',
- '#weight' => '-9',
- '#theme_wrappers' => array('region'),
- );
- }
-
- if (in_array($region, array('footer_1'))) {
- $page['footer_1'] = array(
- '#region' => 'footer_1',
- '#weight' => '-7',
- '#theme_wrappers' => array('region'),
- );
- }
-
- if (in_array($region, array('footer_2'))) {
- $page['footer_2'] = array(
- '#region' => 'footer_2',
- '#weight' => '-6',
- '#theme_wrappers' => array('region'),
- );
- }
-
- if (in_array($region, array('footer_3'))) {
- $page['footer_3'] = array(
- '#region' => 'footer_3',
- '#weight' => '-5',
- '#theme_wrappers' => array('region'),
- );
- }
+ $regions = system_region_list($GLOBALS['theme'], REGIONS_ALL);
+
+ if (array_key_exists('osu_navbar', $regions)) {
+ $page['osu_navbar'] = array(
+ '#region' => 'osu_navbar',
+ '#weight' => '-10',
+ '#theme_wrappers' => array('region'),
+ );
}
+
+ if (array_key_exists('masthead', $regions)) {
+ $page['masthead'] = array(
+ '#region' => 'masthead',
+ '#weight' => '-9',
+ '#theme_wrappers' => array('region'),
+ );
+ }
+
+ if (array_key_exists('footer_1', $regions)) {
+ $page['footer_1'] = array(
+ '#region' => 'footer_1',
+ '#weight' => '-7',
+ '#theme_wrappers' => array('region'),
+ );
+ }
+
+ if (empty($page['footer_2']) && array_key_exists('footer_2', $regions)) {
+ $page['footer_2'] = array(
+ '#region' => 'footer_2',
+ '#weight' => '-7',
+ '#theme_wrappers' => array('region'),
+ );
+ }
+
+ if (empty($page['footer_3']) && array_key_exists('footer_3', $regions)) {
+ $page['footer_3'] = array(
+ '#region' => 'footer_3',
+ '#weight' => '-7',
+ '#theme_wrappers' => array('region'),
+ );
+ }
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane-plus-text-area.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane-plus-text-area.tpl.php
index 746690f1a2390bc69d0ddac2a2112cbb48dca737..76fdb345b688f73e9841b97eee5b8d726fc20d43 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane-plus-text-area.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane-plus-text-area.tpl.php
@@ -1,7 +1,7 @@
<div<?php print $attributes; ?>>
<?php if ($tile_url): ?><a href="<?php print $tile_url; ?>"><?php endif; ?>
<?php print render($content['field_tile_background_img']); ?>
- <?php if ($tile_icon): ?>
+ <?php if ($tile_title): ?>
<h2><?php print $tile_title; ?></h2>
<?php endif; ?>
<div class="text-areas">
diff --git a/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
index ecfbd244c0f956fd7c9ad56f4adc52e221d15522..ae53c75bbb08926d7cf05515f5580ffbef80dc9e 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
@@ -1,9 +1,11 @@
<div<?php print $attributes; ?>>
<?php if ($tile_url): ?><a href="<?php print $tile_url; ?>"><?php endif; ?>
<?php print render($content['field_tile_background_img']); ?>
- <div class="title-box">
- <div class="title-text"><h2><?php print $tile_title; ?></h2></div>
- <?php if ($tile_url): ?><div class="title-icon"><i class="fa fa-angle-right"></i></div><?php endif; ?>
- </div>
+ <?php if ($tile_title): ?>
+ <div class="title-box">
+ <div class="title-text"><h2><?php print $tile_title; ?></h2></div>
+ <?php if ($tile_url): ?><div class="title-icon"><i class="fa fa-angle-right"></i></div><?php endif; ?>
+ </div>
+ <?php endif; ?>
<?php if ($tile_url): ?></a><?php endif; ?>
</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/templates/regions/region--footer-1.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/templates/regions/region--footer-1.tpl.php
index 6d6fd1cb3a089c1eab99901accc3aa6e5fa453e9..e7f43e522831e91a938fdd229a45b2d5d9c2773a 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/templates/regions/region--footer-1.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/templates/regions/region--footer-1.tpl.php
@@ -37,5 +37,5 @@
<img src="<?php print $logo; ?>" alt="">
</a>
</div><!--/osu-logo -->
- <?php print $rendered_content; ?>
+ <?php print $content; ?>
</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/templates/regions/region--footer-2.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/templates/regions/region--footer-2.tpl.php
deleted file mode 100644
index 5438fbef46d3045d11ca8acaf32c4019984879fa..0000000000000000000000000000000000000000
--- a/profiles/wcm_base/themes/ocio_omega_base/templates/regions/region--footer-2.tpl.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * @file
- * Default theme implementation to display a region.
- *
- * Available variables:
- * - $classes: String of classes that can be used to style contextually through
- * CSS. It can be manipulated through the variable $classes_array from
- * preprocess functions.
- * - $attributes: array of HTML attributes populated by modules, intended to
- * be added to the main container tag of this template. It can be manipulated
- * through the variable $attributes_array from preprocess functions.
- * - $region: The name of the region variable as defined in the theme's .info
- * file.
- * - $rendered_content: content pre-rendered by external modules.
- *
- * Helper variables:
- * - $is_admin: Flags true when the current user is an administrator.
- * - $is_front: Flags true when presented in the front page.
- * - $logged_in: Flags true when the current user is a logged-in member.
- *
- * * Site identity:
- * - $front_page: The URL of the front page. Use this instead of $base_path,
- * when linking to the front page. This includes the language domain or
- * prefix.
- * - $logo: The path to the logo image, as defined in theme configuration.
- *
- * @see template_preprocess()
- * @see template_preprocess_region()
- * @see template_process()
- */
-?>
-<div<?php print $attributes; ?>>
- <?php print $rendered_content; ?>
-</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/templates/regions/region--footer-3.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/templates/regions/region--footer-3.tpl.php
deleted file mode 100644
index 5438fbef46d3045d11ca8acaf32c4019984879fa..0000000000000000000000000000000000000000
--- a/profiles/wcm_base/themes/ocio_omega_base/templates/regions/region--footer-3.tpl.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * @file
- * Default theme implementation to display a region.
- *
- * Available variables:
- * - $classes: String of classes that can be used to style contextually through
- * CSS. It can be manipulated through the variable $classes_array from
- * preprocess functions.
- * - $attributes: array of HTML attributes populated by modules, intended to
- * be added to the main container tag of this template. It can be manipulated
- * through the variable $attributes_array from preprocess functions.
- * - $region: The name of the region variable as defined in the theme's .info
- * file.
- * - $rendered_content: content pre-rendered by external modules.
- *
- * Helper variables:
- * - $is_admin: Flags true when the current user is an administrator.
- * - $is_front: Flags true when presented in the front page.
- * - $logged_in: Flags true when the current user is a logged-in member.
- *
- * * Site identity:
- * - $front_page: The URL of the front page. Use this instead of $base_path,
- * when linking to the front page. This includes the language domain or
- * prefix.
- * - $logo: The path to the logo image, as defined in theme configuration.
- *
- * @see template_preprocess()
- * @see template_preprocess_region()
- * @see template_process()
- */
-?>
-<div<?php print $attributes; ?>>
- <?php print $rendered_content; ?>
-</div>
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index 2157973fd29a418b60a3a52c1cb903ac47b5d8f3..cb66fa1931c9cf77567dd495baa3e610ad71ba82 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -36,7 +36,7 @@ projects[defaultconfig][patch][1900574] = http://drupal.org/files/issues/1900574
projects[draggableviews][version] = 2.x-dev
projects[draggableviews][subdir] = contrib
-projects[ds][version] = 2.13
+projects[ds][version] = 2.14
projects[ds][subdir] = contrib
projects[features][version] = 2.10