Skip to content
Snippets Groups Projects
Commit 90684133 authored by Chris Gross's avatar Chris Gross
Browse files

daily build

parent 597d7f99
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 68 additions and 276 deletions
profiles/wcm_base/CHANGELOG.txt
+ 9
− 1
View file @ 90684133
WCM Base 7.x-1.x, 2015-09-24
----------------------------
- OCIO Omega Base:
- Removed older style panels custom layouts.
- Fixed mobile form field widths.
- Accessibility improvements.
- OCIO Field Bases, OCIO Site Info, OCIO Search: Accessibility improvements.
WCM Base 7.x-1.x, 2015-09-23
----------------------------
- OCIO Landing Page: Improved conditional field functionality for banner fields.
- OCIO Admin Menu: Fixed shortcuts bar access bug for administrators.
- OCIO Omega Base: Added ocio-omega-alx panels layout.
- OCIO Omega Base: Added ocio-omega-alx panels layout.
WCM Base 7.x-1.x, 2015-09-22
----------------------------
......
profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.module
+ 5
− 4
View file @ 90684133
......@@ -39,11 +39,15 @@ function ocio_field_bases_theme() {
/**
* Implements hook_preprocess_page().
*/
function ocio_field_bases_preprocess_page($vars) {
function ocio_field_bases_preprocess_page(&$vars) {
// Make the jQuery UI Accordion plugin available.
drupal_add_library('system', 'ui.accordion');
// Load our JS file that implements jQuery UI Accordion.
drupal_add_js(drupal_get_path('module', 'ocio_field_bases') . '/js/ocio_field_bases_accordion.js', array('scope' => 'footer'));
if (isset($vars['node']) && $vars['node']->field_disable_title['und'][0]['value']) {
$vars['title_attributes_array']['class'][] = 'element-invisible';
}
}
/**
......@@ -120,7 +124,4 @@ function ocio_field_bases_node_view($node, $view_mode, $langcode) {
if ($node->field_disable_breadcrumbs['und'][0]['value']) {
drupal_set_breadcrumb(array());
}
if ($node->field_disable_title['und'][0]['value']) {
drupal_set_title('');
}
}
profiles/wcm_base/modules/custom/ocio_search/ocio_search.module
+ 1
− 1
View file @ 90684133
......@@ -51,7 +51,7 @@ function ocio_search_solr_post_schema($posted, $env = '') {
* Implements hook_form_FORM_ID_alter().
*/
function ocio_search_form_search_block_form_alter(&$form, &$form_state) {
$form['#prefix'] = '<div id="ocio-search"><i id="search-block-toggle" class="fa fa-search" title="Toggle Search" tabindex="0"></i>';
$form['#prefix'] = '<div id="ocio-search"><span id="search-block-toggle" class="fa fa-search" title="Toggle Search" tabindex="0"></span>';
$form['search_block_form']['#attributes']['placeholder'] = t('Search');
$form['actions']['submit']['#value'] = t('Go');
$form['#suffix'] = '</div>';
......
profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.module
+ 1
− 1
View file @ 90684133
......@@ -363,7 +363,7 @@ function ocio_siteinfo_social_content($location = FALSE) {
$fa_title = 'camera';
break;
}
$content .= '<li><a href="' . $url . '" title="'. $title_text .'"target="_blank" class="siteinfo-social-link link-' . $title . '"><i class="fa fa-lg fa-'. $fa_title . '"></i></a></li>';
$content .= '<li><a href="' . $url .'"target="_blank" class="siteinfo-social-link link-' . $title . '"><span class="element-invisible">' . $title_text . '</span><span class="fa fa-lg fa-'. $fa_title . '"></span></a></li>';
}
}
$content = trim($content);
......
profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2-layout.tpl.php
+ 1
− 5
View file @ 90684133
......@@ -33,11 +33,7 @@
<?php endif; ?>
<div class="l-content" role="main">
<?php if (!$is_front && !empty($title)): ?>
<?php if ($landing_page) :?>
<h1 class="title l-constrained max-width" id="page-title"><?php print $title; ?></h1>
<?php else: ?>
<h1 class="title" id="page-title"><?php print $title; ?></h1>
<?php endif; ?>
<h1 class="title" id="page-title"><?php print $title; ?></h1>
<?php endif; ?>
<?php if ($action_links): ?>
......
profiles/wcm_base/themes/ocio_omega_4/layouts/ocio-4/ocio-4-layout.tpl.php
+ 30
− 34
View file @ 90684133
<div<?php print $attributes; ?>>
<header class="l-header" role="banner">
<?php print render($page['osu_navbar']); ?>
<?php print render($page['masthead']); ?>
<?php print render($page['main_menu']); ?>
<?php print render($page['osu_navbar']); ?>
<?php print render($page['masthead']); ?>
<?php print render($page['main_menu']); ?>
</header>
<div class="l-region--hero-wrapper <?php print $main_classes; ?>">
<?php print render($page['hero']); ?>
</div>
<div class="l-region--hero-wrapper <?php print $main_classes; ?>">
<?php print render($page['hero']); ?>
</div>
<?php if (!empty($page['highlighted'])): ?>
<div class="l-highlighted-wrapper">
......@@ -19,11 +19,11 @@
<a id="main-content"></a>
<div class="l-constrained max-width">
<?php print $breadcrumb; ?>
<?php print render($tabs); ?>
<?php print render($page['help']); ?>
<?php print $messages; ?>
<?php print render($page['workbench']); ?>
<?php print $breadcrumb; ?>
<?php print render($tabs); ?>
<?php print render($page['help']); ?>
<?php print $messages; ?>
<?php print render($page['workbench']); ?>
</div>
<?php if (!$landing_page) :?>
......@@ -32,36 +32,32 @@
<div>
<?php endif; ?>
<div class="l-content" role="main">
<?php if (!$is_front && !empty($title)): ?>
<?php if ($landing_page) :?>
<h1 class="title l-constrained max-width" id="page-title"><?php print $title; ?></h1>
<?php else: ?>
<h1 class="title" id="page-title"><?php print $title; ?></h1>
<?php endif; ?>
<?php endif; ?>
<div class="l-content" role="main">
<?php if (!$is_front && !empty($title)): ?>
<h1 <?php print $title_attributes; ?>><?php print $title; ?></h1>
<?php endif; ?>
<?php if ($action_links): ?>
<ul class="action-links"><?php print render($action_links); ?></ul>
<?php endif; ?>
<?php if ($action_links): ?>
<ul class="action-links"><?php print render($action_links); ?></ul>
<?php endif; ?>
<?php print render($page['content']); ?>
<?php print $feed_icons; ?>
</div>
<?php print render($page['content']); ?>
<?php print $feed_icons; ?>
</div>
<?php print render($page['sidebar_1']); ?>
<?php print render($page['sidebar_2']); ?>
<?php print render($page['sidebar_1']); ?>
<?php print render($page['sidebar_2']); ?>
</div>
</div>
<div class="l-region--pre-footer-wrapper <?php print $main_classes; ?>">
<?php print render($page['pre_footer']); ?>
</div>
<?php print render($page['pre_footer']); ?>
</div>
<footer class="l-footer-wrapper" role="contentinfo">
<div class="l-constrained max-width">
<?php print render($page['footer_1']); ?>
<?php print render($page['footer_2']); ?>
<?php print render($page['footer_3']); ?>
</div>
<div class="l-constrained max-width">
<?php print render($page['footer_1']); ?>
<?php print render($page['footer_2']); ?>
<?php print render($page['footer_3']); ?>
</div>
</footer>
</div>
profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
+ 5
− 0
View file @ 90684133
......@@ -155,6 +155,11 @@ input:focus {
max-width: 240px;
}
@media (max-width: 47.5em) {
input, select, textarea {
width: 100%;
}
}
.l-page img {
width: inherit;
}
......
profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
+ 4
− 0
View file @ 90684133
......@@ -155,6 +155,10 @@ input:focus {
max-width: 240px;
}
input, select, textarea {
width: 100%;
}
.l-page img {
width: inherit;
}
......
profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.no-query.css
+ 4
− 0
View file @ 90684133
......@@ -151,6 +151,10 @@ input:focus {
max-width: 240px;
}
input, select, textarea {
width: 100%;
}
.l-page img {
width: inherit;
}
......
profiles/wcm_base/themes/ocio_omega_base/css/ocio-omega-base.styles.css
+ 5
− 0
View file @ 90684133
......@@ -151,6 +151,11 @@ input:focus {
max-width: 240px;
}
@media (max-width: 47.5em) {
input, select, textarea {
width: 100%;
}
}
.l-page img {
width: inherit;
}
......
profiles/wcm_base/themes/ocio_omega_base/layouts/ocio-default/ocio-default-layout.tpl.php
+ 3
− 7
View file @ 90684133
......@@ -32,13 +32,9 @@
<div>
<?php endif; ?>
<div class="l-content" role="main">
<?php if (!$is_front && !empty($title)): ?>
<?php if ($landing_page) :?>
<h1 class="title l-constrained max-width" id="page-title"><?php print $title; ?></h1>
<?php else: ?>
<h1 class="title" id="page-title"><?php print $title; ?></h1>
<?php endif; ?>
<?php endif; ?>
<?php if (!$is_front && !empty($title)): ?>
<h1 <?php print $title_attributes; ?>><?php print $title; ?></h1>
<?php endif; ?>
<?php if ($action_links): ?>
<ul class="action-links"><?php print render($action_links); ?></ul>
......
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-equalcol.css deleted 100644 → 0
+ 0
− 38
View file @ 597d7f99
/**
* @file
* ocio-omega-equalcol panel layout
**/
.ocio-omega-equalcol-container .panel-pane {
margin-bottom: 1em;
}
.ocio-omega-equalcol-column {
width: 51.064%;
float: left;
}
.ocio-omega-equalcol-column-inner {
margin-right: 20px;
}
.ocio-omega-equalcol-column2 {
width: 48.936%;
}
.ocio-omega-equalcol-column2-inner {
margin-right: 0;
}
/* iPhone [portrait + landscape] */
@media only screen and (max-width: 480px) {
.ocio-omega-equalcol-column,
.ocio-omega-equalcol-column2 {
width: 100%;
float: none;
}
.ocio-omega-equalcol-column-inner {
margin-right: 0;
}
}
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-equalcol.inc deleted 100644 → 0
+ 0
− 15
View file @ 597d7f99
<?php
// Plugin definition
$plugin = array(
'title' => t('Equal Columns'),
'icon' => 'ocio-omega-equalcol.png',
'category' => t('WCM Layouts'),
'theme' => 'ocio-omega-equalcol',
'css' => 'ocio-omega-equalcol.css',
'regions' => array(
'header' => t('Header'),
'column1' => t('First Column'),
'column2' => t('Second Column'),
'footer' => t('Footer'),
),
);
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-equalcol.png deleted 100644 → 0
+ 0
− 0
View file @ 597d7f99
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-equalcol.png

1.09 KiB

profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-equalcol.tpl.php deleted 100644 → 0
+ 0
− 40
View file @ 597d7f99
<?php
/**
* @file
* Template for custom ocio-omega-equalcol Panopoly layout.
*
* Variables:
* - $css_id: An optional CSS id to use for the layout.
* - $content: An array of content, each item in the array is keyed to one
* panel of the layout. This layout supports the following sections:
*/
?>
<div class="panel-display ocio-omega-equalcol clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
<div class="ocio-omega-equalcol-container ocio-omega-equalcol-header clearfix panel-panel row-fluid">
<div class="ocio-omega-equalcol-container-inner ocio-omega-equalcol-header-inner panel-panel-inner span12">
<?php print $content['header']; ?>
</div>
</div>
<div class="ocio-omega-equalcol-container ocio-omega-equalcol-column-content clearfix row-fluid">
<div class="ocio-omega-equalcol-column-content-region ocio-omega-equalcol-column1 ocio-omega-equalcol-column panel-panel span6">
<div class="ocio-omega-equalcol-column-content-region-inner ocio-omega-equalcol-column1-inner ocio-omega-equalcol-column-inner panel-panel-inner">
<?php print $content['column1']; ?>
</div>
</div>
<div class="ocio-omega-equalcol-column-content-region ocio-omega-equalcol-column2 ocio-omega-equalcol-column panel-panel span6">
<div class="ocio-omega-equalcol-column-content-region-inner ocio-omega-equalcol-column2-inner ocio-omega-equalcol-column-inner panel-panel-inner">
<?php print $content['column2']; ?>
</div>
</div>
</div>
<div class="ocio-omega-equalcol-container ocio-omega-equalcol-footer clearfix panel-panel row-fluid">
<div class="ocio-omega-equalcol-container-inner ocio-omega-equalcol-footer-inner panel-panel-inner span12">
<?php print $content['footer']; ?>
</div>
</div>
</div><!-- /.sutro -->
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.css deleted 100644 → 0
+ 0
− 39
View file @ 597d7f99
/**
* @file
* ocio-omega-threecol panel layout
**/
.ocio-omega-threecol-container .panel-pane {
margin-bottom: 1em;
}
.ocio-omega-threecol-column-content-region {
min-height: 1px;
width: 33.9%;
float: left;
}
.ocio-omega-threecol-column-content-region-inner {
margin-right: 5%;
}
.ocio-omega-threecol-column3 {
width: 32.2%;
}
.ocio-omega-threecol-column3-inner {
margin-right: 0;
}
/* iPad or less */
@media only screen and (max-width: 760px) {
.ocio-omega-threecol-column-content-region,
.ocio-omega-threecol-column3 {
width: 100%;
float: none;
}
.ocio-omega-threecol-column-content-region-inner {
margin-right: 0;
}
}
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.inc deleted 100644 → 0
+ 0
− 15
View file @ 597d7f99
<?php
// Plugin definition
$plugin = array(
'title' => t('Three Column'),
'icon' => 'ocio-omega-threecol.png',
'category' => t('WCM Layouts'),
'theme' => 'ocio-omega-threecol',
'css' => 'ocio-omega-threecol.css',
'regions' => array(
'header' => t('Header'),
'column1' => t('First Column'),
'column2' => t('Second Column'),
'column3' => t('Third Column'),
),
);
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.png deleted 100644 → 0
+ 0
− 0
View file @ 597d7f99
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.png

1.1 KiB

profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-threecol.tpl.php deleted 100644 → 0
+ 0
− 39
View file @ 597d7f99
<?php
/**
* @file
* Template for custom ocio-omega-threecol Panopoly layout.
*
* Variables:
* - $css_id: An optional CSS id to use for the layout.
* - $content: An array of content, each item in the array is keyed to one
* panel of the layout. This layout supports the following sections:
*/
?>
<div class="panel-display ocio-omega-threecol clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
<div class="ocio-omega-threecol-container ocio-omega-threecol-header clearfix panel-panel row-fluid l-constrained max-width">
<div class="ocio-omega-threecol-container-inner ocio-omega-threecol-header-inner panel-panel-inner span12">
<?php print $content['header']; ?>
</div>
</div>
<div class="ocio-omega-threecol-container ocio-omega-threecol-column-content clearfix row-fluid l-constrained max-width">
<div class="ocio-omega-threecol-column-content-region ocio-omega-threecol-column1 panel-panel span4">
<div class="ocio-omega-threecol-column-content-region-inner ocio-omega-threecol-column1-inner panel-panel-inner">
<?php print $content['column1']; ?>
</div>
</div>
<div class="ocio-omega-threecol-column-content-region ocio-omega-threecol-column2 panel-panel span4">
<div class="ocio-omega-threecol-column-content-region-inner ocio-omega-threecol-column2-inner panel-panel-inner">
<?php print $content['column2']; ?>
</div>
</div>
<div class="ocio-omega-threecol-column-content-region ocio-omega-threecol-column3 panel-panel span4">
<div class="ocio-omega-threecol-column-content-region-inner ocio-omega-threecol-column3-inner panel-panel-inner">
<?php print $content['column3']; ?>
</div>
</div>
</div>
</div><!-- /.ocio-omega-threecol -->
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-twocol-flipped.css deleted 100644 → 0
+ 0
− 37
View file @ 597d7f99
/**
* @file
* Twocol-Flipped panel layout
**/
.ocio-omega-twocol-flipped-container .panel-pane {
margin-bottom: 1em;
}
.ocio-omega-twocol-flipped-sidebar {
min-height: 1px;
width: 34.043%;
float: left;
}
.ocio-omega-twocol-flipped-sidebar-inner {
margin-left: 20px;
}
.ocio-omega-twocol-flipped-content {
min-height: 1px;
width: 65.957%;
float: left;
}
/* iPhone [portrait + landscape] */
@media only screen and (max-width: 480px) {
.ocio-omega-twocol-flipped-content,
.ocio-omega-twocol-flipped-sidebar {
width: 100%;
float: none;
}
.ocio-omega-twocol-flipped-sidebar-inner {
margin-left: 0;
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment