From e619c53ad951c9758a681bf3a3eea4e1e1e06260 Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Wed, 12 Aug 2015 16:44:27 -0400
Subject: [PATCH] daily build 2
---
.../panes/fieldable-panels-pane--tile-pane.tpl.php | 8 ++++++++
.../ocio_omega_base/js/ocio-omega-base.behaviors.js | 3 ++-
...ieldable-panels-pane--tile-pane-plus-text-area.tpl.php | 1 -
3 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 profiles/wcm_base/themes/ocio_omega_4/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
diff --git a/profiles/wcm_base/themes/ocio_omega_4/templates/panes/fieldable-panels-pane--tile-pane.tpl.php b/profiles/wcm_base/themes/ocio_omega_4/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
new file mode 100644
index 00000000..0d3db8c6
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_4/templates/panes/fieldable-panels-pane--tile-pane.tpl.php
@@ -0,0 +1,8 @@
+<div<?php print $attributes; ?>>
+ <a href="<?php print $tile_url; ?>">
+ <?php print render($content['field_tile_background_img']); ?>
+ <div class="title-box">
+ <div class="title-text"><h2><?php print $tile_title; ?></h2></div>
+ </div>
+ </a>
+</div>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js b/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js
index 178e5d5b..0833596c 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js
+++ b/profiles/wcm_base/themes/ocio_omega_base/js/ocio-omega-base.behaviors.js
@@ -51,7 +51,7 @@
});
/* Match tile panes to equal height */
- $('.node-type-ocio-landing-page .row-tiles .tile-panel .fieldable-panels-pane').matchHeight({byRow: false});
+ $('.node-type-ocio-landing-page .row-tiles .tile-panel .fieldable-panels-pane').matchHeight();
var toggleButton = $('#search-block-toggle').eq(0);
var searchBox = $('#search-block-form').eq(0);
@@ -66,6 +66,7 @@
toggleSearchBox(event);
});
+ /* Move Media Magnet channel icon to title area if only one channel is selected */
$(document).ajaxSuccess(function( event, request, settings ) {
if (settings.url.indexOf("mediamagnet.osu.edu/api") >= 0 ) {
$('.pane-mm-widgets-live-pane.mm-channel-type-undefined').each(function() {
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 8d811755..9e77459d 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,6 @@
<div<?php print $attributes; ?>>
<a href="<?php print $tile_url; ?>">
<?php print render($content['field_tile_background_img']); ?>
-
<div class="text-areas">
<h2><?php print $tile_title; ?></h2>
<?php print render($content['field_tile_text_area']); ?>
--
GitLab