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

daily build

parent dd4a5806
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1219 additions and 950 deletions
profiles/wcm_base/CHANGELOG.txt
+ 7
− 2
View file @ 3801fe35
WCM Base 7.x-1.x, 2016-05-20
----------------------------
- OCIO Omega Base: Add new "ocio-omega-ehs" layout.
- OCIO Featured Slideshow: Fixed bug where weights would not save.
WCM Base 7.x-1.x, 2016-05-18
----------------------------
- OCIO Omega Base: Update "omega-sidebar-tiles" layout.
- OCIO Omega Base: Update "ocio-omega-sidebar-tiles" layout.
WCM Base 7.x-1.x, 2016-05-17
----------------------------
- OCIO Omega Base: Add new "omega-sidebar-tiles" layout.
- OCIO Omega Base: Add new "ocio-omega-sidebar-tiles" layout.
WCM Base 7.x-1.x, 2016-05-06
----------------------------
......
profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.views_default.inc
+ 6
− 6
View file @ 3801fe35
......@@ -51,7 +51,7 @@ function ocio_featured_slideshow_views_default_views() {
$handler->display->display_options['fields']['field_featured_summary']['label'] = '';
$handler->display->display_options['fields']['field_featured_summary']['exclude'] = TRUE;
$handler->display->display_options['fields']['field_featured_summary']['element_label_colon'] = FALSE;
/* Field: Content: Link */
/* Field: Field: Link */
$handler->display->display_options['fields']['field_ocio_link']['id'] = 'field_ocio_link';
$handler->display->display_options['fields']['field_ocio_link']['table'] = 'field_data_field_ocio_link';
$handler->display->display_options['fields']['field_ocio_link']['field'] = 'field_ocio_link';
......@@ -85,7 +85,7 @@ function ocio_featured_slideshow_views_default_views() {
$handler->display->display_options['sorts']['weight']['table'] = 'draggableviews_structure';
$handler->display->display_options['sorts']['weight']['field'] = 'weight';
$handler->display->display_options['sorts']['weight']['draggableviews_setting_view'] = 'featured_slideshow:page_1';
$handler->display->display_options['sorts']['weight']['draggableviews_setting_new_items_bottom_list'] = 0;
$handler->display->display_options['sorts']['weight']['draggableviews_setting_new_items_bottom_list'] = 1;
/* Sort criterion: Content: Post date */
$handler->display->display_options['sorts']['created']['id'] = 'created';
$handler->display->display_options['sorts']['created']['table'] = 'node';
......@@ -112,7 +112,7 @@ function ocio_featured_slideshow_views_default_views() {
$handler->display->display_options['defaults']['access'] = FALSE;
$handler->display->display_options['access']['type'] = 'perm';
$handler->display->display_options['defaults']['fields'] = FALSE;
/* Field: Content: Banner Image Text Color */
/* Field: Content: Slide Text Color */
$handler->display->display_options['fields']['field_banner_image_text_color']['id'] = 'field_banner_image_text_color';
$handler->display->display_options['fields']['field_banner_image_text_color']['table'] = 'field_data_field_banner_image_text_color';
$handler->display->display_options['fields']['field_banner_image_text_color']['field'] = 'field_banner_image_text_color';
......@@ -120,7 +120,7 @@ function ocio_featured_slideshow_views_default_views() {
$handler->display->display_options['fields']['field_banner_image_text_color']['exclude'] = TRUE;
$handler->display->display_options['fields']['field_banner_image_text_color']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['field_banner_image_text_color']['type'] = 'list_key';
/* Field: Content: Banner Image Text Background */
/* Field: Content: Slide Text Background */
$handler->display->display_options['fields']['field_banner_image_text_bkground']['id'] = 'field_banner_image_text_bkground';
$handler->display->display_options['fields']['field_banner_image_text_bkground']['table'] = 'field_data_field_banner_image_text_bkground';
$handler->display->display_options['fields']['field_banner_image_text_bkground']['field'] = 'field_banner_image_text_bkground';
......@@ -146,7 +146,7 @@ function ocio_featured_slideshow_views_default_views() {
$handler->display->display_options['fields']['field_featured_summary']['label'] = '';
$handler->display->display_options['fields']['field_featured_summary']['exclude'] = TRUE;
$handler->display->display_options['fields']['field_featured_summary']['element_label_colon'] = FALSE;
/* Field: Content: Link */
/* Field: Field: Link */
$handler->display->display_options['fields']['field_ocio_link']['id'] = 'field_ocio_link';
$handler->display->display_options['fields']['field_ocio_link']['table'] = 'field_data_field_ocio_link';
$handler->display->display_options['fields']['field_ocio_link']['field'] = 'field_ocio_link';
......@@ -288,7 +288,7 @@ function ocio_featured_slideshow_views_default_views() {
$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_label_colon'] = FALSE;
/* Field: Content: Link */
/* Field: Field: Link */
$handler->display->display_options['fields']['field_ocio_link']['id'] = 'field_ocio_link';
$handler->display->display_options['fields']['field_ocio_link']['table'] = 'field_data_field_ocio_link';
$handler->display->display_options['fields']['field_ocio_link']['field'] = 'field_ocio_link';
......
profiles/wcm_base/themes/ocio_omega_base/panels/assets/panels-layout-template.ai
+ 953
− 942
View file @ 3801fe35
No preview for this file type
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-ehs/ocio-omega-ehs.css 0 → 100644
+ 64
− 0
View file @ 3801fe35
/**
* @file
* ocio-omega-ehs panel layout
**/
/*
3 col tile rows
*/
.ocio-omega-ehs-tile-content-region3 {
min-height: 1px;
width: 31.5%;
float: left;
margin-right: 2.75%;
}
.ocio-omega-ehs-tile3a,
.ocio-omega-ehs-tile3c {
margin-right: 0;
}
/*
5 col tile rows
*/
.ocio-omega-ehs-tile-content-region5 {
min-height: 1px;
width: 18.3%;
float: left;
}
.ocio-omega-ehs-tile-content-region5 {
margin-right: 2.125%;
}
.ocio-omega-ehs-tile9a {
margin-right: 0;
}
/*
bands
*/
.ocio-omega-ehs-band1a,
.ocio-omega-ehs-band1c {
margin-bottom: 2em;
}
/* iPad or less */
@media only screen and (max-width: 760px) {
.ocio-omega-ehs-tile-content-region5,
.ocio-omega-ehs-tile-content-region4,
.ocio-omega-ehs-tile-content-region3 {
width: 100%;
float: none;
margin-right: 0;
}
}
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-ehs/ocio-omega-ehs.inc 0 → 100644
+ 41
− 0
View file @ 3801fe35
<?php
// Plugin definition
$plugin = array(
'title' => t('EHS'),
'icon' => 'ocio-omega-ehs.png',
'category' => t('WCM Layouts'),
'theme' => 'ocio_omega_ehs',
'css' => 'ocio-omega-ehs.css',
'regions' => array(
'tile1a' => t('Tile 1a'),
'tile2a' => t('Tile 2a'),
'tile3a' => t('Tile 3a'),
'band1a' => t('Band 1a'),
'tile5a' => t('Tile 5a'),
'tile6a' => t('Tile 6a'),
'tile7a' => t('Tile 7a'),
'tile8a' => t('Tile 8a'),
'tile9a' => t('Tile 9a'),
'band1b' => t('Band 1b'),
'band1c' => t('Band 1c'),
'tile1c' => t('Tile 1c'),
'tile2c' => t('Tile 2c'),
'tile3c' => t('Tile 3c'),
'footer' => t('Footer'),
),
);
/**
* Implements hook_preprocess_ocio_omega_ehs().
*/
function template_preprocess_ocio_omega_ehs(&$vars) {
$rows = array(
'row_a' => array('tile1a','tile2a','tile3a','tile4a','band1a','tile5a','tile6a','tile7a','tile8a','tile9a'),
'row_b' => array('band1b'),
'row_c' => array('band1c','tile1c','tile2c','tile3c'),
'footer' => array('footer'),
);
$vars['panels_row'] = ocio_omega_settings_panel_rows($rows, $vars);
$vars['panels_row_classes'] = ocio_omega_settings_panel_row_classes();
}
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-ehs/ocio-omega-ehs.png 0 → 100644
+ 0
− 0
View file @ 3801fe35
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-ehs/ocio-omega-ehs.png

476 B

profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-ehs/ocio-omega-ehs.tpl.php 0 → 100644
+ 148
− 0
View file @ 3801fe35
<?php
/**
* @file
* Template for custom ocio-omega-ehs 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-ehs clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
<!-- row_a -->
<div class="row-a panels-row <?php print $panels_row['row_a']; ?>">
<!-- tiles 1-3a -->
<div class="ocio-omega-ehs-container ocio-omega-ehs-tile-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-ehs-tile-content-region3 ocio-omega-ehs-tile1a panel-panel tile-panel clearfix">
<div class="ocio-omega-ehs-tile-content-region3-inner ocio-omega-ehs-tile1a-inner panel-panel-inner">
<?php print $content['tile1a']; ?>
</div>
</div>
<div class="ocio-omega-ehs-tile-content-region3 ocio-omega-ehs-tile2a panel-panel tile-panel clearfix">
<div class="ocio-omega-ehs-tile-content-region3-inner ocio-omega-ehs-tile2a-inner panel-panel-inner">
<?php print $content['tile2a']; ?>
</div>
</div>
<div class="ocio-omega-ehs-tile-content-region3 ocio-omega-ehs-tile3a panel-panel tile-panel clearfix">
<div class="ocio-omega-ehs-tile-content-region3-inner ocio-omega-ehs-tile3a-inner panel-panel-inner">
<?php print $content['tile3a']; ?>
</div>
</div>
</div>
<!-- band 1a -->
<div class="ocio-omega-ehs-container ocio-omega-ehs-band-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-ehs-band-content-region ocio-omega-ehs-band1a panel-panel band-panel clearfix">
<div class="ocio-omega-ehs-band-inner panel-panel-inner">
<?php print $content['band1a']; ?>
</div>
</div>
</div>
<!-- tiles 5-9a -->
<div class="ocio-omega-ehs-container ocio-omega-ehs-tile-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-ehs-tile-content-region5 ocio-omega-ehs-tile5a panel-panel tile-panel clearfix">
<div class="ocio-omega-ehs-tile-content-region5-inner ocio-omega-ehs-tile5a-inner panel-panel-inner">
<?php print $content['tile5a']; ?>
</div>
</div>
<div class="ocio-omega-ehs-tile-content-region5 ocio-omega-ehs-tile6a panel-panel tile-panel clearfix">
<div class="ocio-omega-ehs-tile-content-region5-inner ocio-omega-ehs-tile6a-inner panel-panel-inner">
<?php print $content['tile6a']; ?>
</div>
</div>
<div class="ocio-omega-ehs-tile-content-region5 ocio-omega-ehs-tile7a panel-panel tile-panel clearfix">
<div class="ocio-omega-ehs-tile-content-region5-inner ocio-omega-ehs-tile7a-inner panel-panel-inner">
<?php print $content['tile7a']; ?>
</div>
</div>
<div class="ocio-omega-ehs-tile-content-region5 ocio-omega-ehs-tile8a panel-panel tile-panel clearfix">
<div class="ocio-omega-ehs-tile-content-region5-inner ocio-omega-ehs-tile8a-inner panel-panel-inner">
<?php print $content['tile8a']; ?>
</div>
</div>
<div class="ocio-omega-ehs-tile-content-region5 ocio-omega-ehs-tile9a panel-panel tile-panel clearfix">
<div class="ocio-omega-ehs-tile-content-region5-inner ocio-omega-ehs-tile9a-inner panel-panel-inner">
<?php print $content['tile9a']; ?>
</div>
</div>
</div>
</div><!-- /row_a -->
<!-- row_b -->
<div class="row-band panels-row <?php print $panels_row['row_b']; ?>">
<!-- band 1b -->
<div class="ocio-omega-ehs-container ocio-omega-ehs-band-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-ehs-band-content-region ocio-omega-ehs-band1b panel-panel band-panel clearfix">
<div class="ocio-omega-ehs-band-inner panel-panel-inner">
<?php print $content['band1b']; ?>
</div>
</div>
</div>
</div><!-- /row_b -->
<!-- row_c -->
<div class="row-band panels-row <?php print $panels_row['row_c']; ?>">
<!-- band 1c -->
<div class="ocio-omega-ehs-container ocio-omega-ehs-band-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-ehs-band-content-region ocio-omega-ehs-band1c panel-panel band-panel clearfix">
<div class="ocio-omega-ehs-band-inner panel-panel-inner">
<?php print $content['band1c']; ?>
</div>
</div>
</div>
<!-- tiles 1-3c -->
<div class="ocio-omega-ehs-container ocio-omega-ehs-tile-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-ehs-tile-content-region3 ocio-omega-ehs-tile1c panel-panel tile-panel clearfix span4">
<div class="ocio-omega-ehs-tile-content-region3-inner ocio-omega-ehs-tile1c-inner panel-panel-inner">
<?php print $content['tile1c']; ?>
</div>
</div>
<div class="ocio-omega-ehs-tile-content-region3 ocio-omega-ehs-tile2c panel-panel tile-panel clearfix span4">
<div class="ocio-omega-ehs-tile-content-region3-inner ocio-omega-ehs-tile2c-inner panel-panel-inner">
<?php print $content['tile2c']; ?>
</div>
</div>
<div class="ocio-omega-ehs-tile-content-region3 ocio-omega-ehs-tile3c panel-panel tile-panel clearfix span4">
<div class="ocio-omega-ehs-tile-content-region3-inner ocio-omega-ehs-tile3c-inner panel-panel-inner">
<?php print $content['tile3c']; ?>
</div>
</div>
</div>
</div><!-- /row_c -->
<!-- footer row -->
<div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
<div class="ocio-omega-ehs-container ocio-omega-ehs-footer clearfix panel-panel row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-ehs-container-inner ocio-omega-ehs-footer-inner panel-panel-inner span12">
<?php print $content['footer']; ?>
</div>
</div>
</div><!-- /footer row -->
</div><!-- /.ocio-omega-ehs -->
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