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

daily build

parent 7b660fe4
No related branches found
No related tags found
No related merge requests found
Showing
with 1406 additions and 882 deletions
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.
WCM Base 7.x-1.x, 2015-09-22
----------------------------
- WCM User Profile: Telephone field bugfix for new sites.
......
......@@ -91,7 +91,7 @@ function ocio_admin_menu_menu_alter(&$items) {
function ocio_admin_menu_navbar_alter(&$items) {
// Change the label to view an account from view profile to view account.
$items['user']['tray']['user_links']['#links']['account']['title'] = t('View account');
$items['shortcuts']['#access'] = user_access('access ocio advanced admin menu');
$items['shortcuts']['#access'] = user_access('access ocio advanced menu');
// Set target oon navbar links to match original link target
foreach ($items['administration']['tray']['navbar_administration']['administration_menu'] as &$link){
......
......@@ -13,7 +13,128 @@ function ocio_landing_page_conditional_fields_default_fields() {
$items[] = array(
'entity' => 'node',
'bundle' => 'ocio_landing_page',
'dependent' => 'field_banner_image_text_location',
'dependent' => 'field_banner_image_text',
'dependee' => 'field_banner_image',
'options' => array(
'state' => 'visible',
'condition' => 'value',
'grouping' => 'OR',
'effect' => 'show',
'effect_options' => array(),
'element_view' => array(
1 => 1,
2 => 2,
5 => 5,
3 => 0,
4 => 0,
),
'element_view_per_role' => 0,
'element_view_roles' => array(
1 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
2 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
5 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
4 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
7 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
6 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
3 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
),
'element_edit' => array(
1 => 1,
3 => 3,
),
'element_edit_per_role' => 0,
'element_edit_roles' => array(
1 => array(
1 => 1,
3 => 0,
),
2 => array(
1 => 1,
3 => 0,
),
5 => array(
1 => 1,
3 => 0,
),
4 => array(
1 => 1,
3 => 0,
),
7 => array(
1 => 1,
3 => 0,
),
6 => array(
1 => 1,
3 => 0,
),
3 => array(
1 => 1,
3 => 0,
),
),
'selector' => '.field-name-field-banner-image .fid',
'values_set' => 5,
'value_form' => array(
0 => array(
'fid' => 0,
'display' => 1,
'upload' => NULL,
),
),
'values' => array(
0 => 0,
),
'value' => array(),
),
);
$items[] = array(
'entity' => 'node',
'bundle' => 'ocio_landing_page',
'dependent' => 'field_banner_image_text_color',
'dependee' => 'field_banner_image_text',
'options' => array(
'state' => 'visible',
......@@ -82,7 +203,7 @@ function ocio_landing_page_conditional_fields_default_fields() {
),
'element_edit' => array(
1 => 1,
3 => 0,
3 => 3,
),
'element_edit_per_role' => 0,
'element_edit_roles' => array(
......@@ -127,6 +248,127 @@ function ocio_landing_page_conditional_fields_default_fields() {
'entity' => 'node',
'bundle' => 'ocio_landing_page',
'dependent' => 'field_banner_image_text_color',
'dependee' => 'field_banner_image',
'options' => array(
'state' => 'visible',
'condition' => 'value',
'grouping' => 'AND',
'effect' => 'show',
'effect_options' => array(),
'element_view' => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
'element_view_per_role' => 0,
'element_view_roles' => array(
1 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
2 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
5 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
4 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
7 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
6 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
3 => array(
1 => 1,
2 => 2,
5 => 0,
3 => 0,
4 => 0,
),
),
'element_edit' => array(
1 => 1,
3 => 0,
),
'element_edit_per_role' => 0,
'element_edit_roles' => array(
1 => array(
1 => 1,
3 => 0,
),
2 => array(
1 => 1,
3 => 0,
),
5 => array(
1 => 1,
3 => 0,
),
4 => array(
1 => 1,
3 => 0,
),
7 => array(
1 => 1,
3 => 0,
),
6 => array(
1 => 1,
3 => 0,
),
3 => array(
1 => 1,
3 => 0,
),
),
'selector' => '.field-name-field-banner-image .fid',
'values_set' => 5,
'value_form' => array(
0 => array(
'fid' => 0,
'display' => 1,
'upload' => NULL,
),
),
'values' => array(
0 => 0,
),
'value' => array(),
),
);
$items[] = array(
'entity' => 'node',
'bundle' => 'ocio_landing_page',
'dependent' => 'field_banner_image_text_location',
'dependee' => 'field_banner_image_text',
'options' => array(
'state' => 'visible',
......@@ -137,7 +379,7 @@ function ocio_landing_page_conditional_fields_default_fields() {
'element_view' => array(
1 => 1,
2 => 2,
5 => 0,
5 => 5,
3 => 0,
4 => 0,
),
......@@ -239,11 +481,11 @@ function ocio_landing_page_conditional_fields_default_fields() {
$items[] = array(
'entity' => 'node',
'bundle' => 'ocio_landing_page',
'dependent' => 'field_banner_image_text',
'dependent' => 'field_banner_image_text_location',
'dependee' => 'field_banner_image',
'options' => array(
'state' => 'visible',
'condition' => '!empty',
'condition' => 'value',
'grouping' => 'AND',
'effect' => 'show',
'effect_options' => array(),
......@@ -341,11 +583,19 @@ function ocio_landing_page_conditional_fields_default_fields() {
3 => 0,
),
),
'selector' => '',
'values_set' => 1,
'selector' => '.field-name-field-banner-image .fid',
'values_set' => 5,
'value_form' => array(
0 => array(
'fid' => 0,
'display' => 1,
'upload' => NULL,
),
),
'values' => array(
0 => 0,
),
'value' => array(),
'values' => array(),
'value_form' => array(),
),
);
......
......@@ -14,7 +14,7 @@ function ocio_panels_settings_strongarm() {
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'panels_page_allowed_layouts';
$strongarm->value = 'O:22:"panels_allowed_layouts":4:{s:9:"allow_new";b:1;s:11:"module_name";s:11:"panels_page";s:23:"allowed_layout_settings";a:95:{s:8:"flexible";b:0;s:14:"twocol_stacked";b:0;s:13:"twocol_bricks";b:0;s:6:"twocol";b:0;s:25:"threecol_33_34_33_stacked";b:0;s:17:"threecol_33_34_33";b:0;s:25:"threecol_25_50_25_stacked";b:0;s:17:"threecol_25_50_25";b:0;s:6:"onecol";b:0;s:6:"whelan";b:0;s:12:"webb_flipped";b:0;s:5:"sutro";b:0;s:13:"selby_flipped";b:0;s:5:"selby";b:0;s:4:"pond";b:0;s:15:"moscone_flipped";b:0;s:7:"moscone";b:0;s:8:"mccoppin";b:0;s:15:"hewston_flipped";b:0;s:7:"hewston";b:0;s:6:"harris";b:0;s:5:"geary";b:0;s:12:"burr_flipped";b:0;s:4:"burr";b:0;s:5:"brown";b:0;s:15:"brenham_flipped";b:0;s:7:"brenham";b:0;s:16:"bartlett_flipped";b:0;s:8:"bartlett";b:0;s:17:"sanderson_flipped";b:0;s:9:"sanderson";b:0;s:6:"boxton";b:0;s:22:"bryant_flipped_flipped";b:0;s:6:"bryant";b:0;s:6:"phelan";b:0;s:14:"taylor_flipped";b:0;s:6:"taylor";b:0;s:12:"sutro_double";b:0;s:5:"rolph";b:0;s:4:"webb";b:0;s:15:"omega:ocio-full";b:0;s:18:"omega:ocio-default";b:0;s:10:"omega:hero";b:0;s:12:"omega:simple";b:0;s:16:"omega:off-canvas";b:0;s:12:"omega:divine";b:0;s:5:"naked";b:0;s:8:"mondrian";b:0;s:6:"grid-3";b:0;s:6:"grid-2";b:0;s:6:"golden";b:0;s:19:"ocio-omega-equalcol";b:0;s:19:"ocio-omega-threecol";b:0;s:25:"ocio-omega-twocol-flipped";b:0;s:17:"ocio-omega-twocol";b:0;s:12:"radix_whelan";b:0;s:18:"radix_webb_flipped";b:0;s:10:"radix_webb";b:0;s:20:"radix_taylor_flipped";b:0;s:12:"radix_taylor";b:0;s:18:"radix_sutro_double";b:0;s:11:"radix_sutro";b:0;s:19:"radix_selby_flipped";b:0;s:11:"radix_selby";b:0;s:23:"radix_sanderson_flipped";b:0;s:15:"radix_sanderson";b:0;s:11:"radix_rolph";b:0;s:10:"radix_pond";b:0;s:12:"radix_phelan";b:0;s:21:"radix_moscone_flipped";b:0;s:13:"radix_moscone";b:0;s:14:"radix_mccoppin";b:0;s:21:"radix_hewston_flipped";b:0;s:13:"radix_hewston";b:0;s:12:"radix_harris";b:0;s:11:"radix_geary";b:0;s:18:"radix_burr_flipped";b:0;s:10:"radix_burr";b:0;s:20:"radix_bryant_flipped";b:0;s:12:"radix_bryant";b:0;s:11:"radix_brown";b:0;s:21:"radix_brenham_flipped";b:0;s:13:"radix_brenham";b:0;s:12:"radix_boxton";b:0;s:22:"radix_bartlett_flipped";b:0;s:14:"radix_bartlett";b:0;s:23:"ocio-omega-tiles-twocol";b:1;s:25:"ocio-omega-tiles-equalcol";b:1;s:12:"omega:ocio-3";b:0;s:12:"omega:ocio-4";b:1;s:31:"ocio-omega-tiles-twocol-flipped";b:1;s:20:"ocio-omega-fourtiles";b:1;s:20:"ocio-omega-flip-flop";b:1;s:12:"omega:ocio-2";b:1;s:14:"ocio-omega-dps";b:1;}s:10:"form_state";N;}';
$strongarm->value = 'O:22:"panels_allowed_layouts":4:{s:9:"allow_new";b:1;s:11:"module_name";s:11:"panels_page";s:23:"allowed_layout_settings";a:96:{s:8:"flexible";b:0;s:14:"twocol_stacked";b:0;s:13:"twocol_bricks";b:0;s:6:"twocol";b:0;s:25:"threecol_33_34_33_stacked";b:0;s:17:"threecol_33_34_33";b:0;s:25:"threecol_25_50_25_stacked";b:0;s:17:"threecol_25_50_25";b:0;s:6:"onecol";b:0;s:6:"whelan";b:0;s:12:"webb_flipped";b:0;s:5:"sutro";b:0;s:13:"selby_flipped";b:0;s:5:"selby";b:0;s:4:"pond";b:0;s:15:"moscone_flipped";b:0;s:7:"moscone";b:0;s:8:"mccoppin";b:0;s:15:"hewston_flipped";b:0;s:7:"hewston";b:0;s:6:"harris";b:0;s:5:"geary";b:0;s:12:"burr_flipped";b:0;s:4:"burr";b:0;s:5:"brown";b:0;s:15:"brenham_flipped";b:0;s:7:"brenham";b:0;s:16:"bartlett_flipped";b:0;s:8:"bartlett";b:0;s:17:"sanderson_flipped";b:0;s:9:"sanderson";b:0;s:6:"boxton";b:0;s:22:"bryant_flipped_flipped";b:0;s:6:"bryant";b:0;s:6:"phelan";b:0;s:14:"taylor_flipped";b:0;s:6:"taylor";b:0;s:12:"sutro_double";b:0;s:5:"rolph";b:0;s:4:"webb";b:0;s:15:"omega:ocio-full";b:0;s:18:"omega:ocio-default";b:0;s:10:"omega:hero";b:0;s:12:"omega:simple";b:0;s:16:"omega:off-canvas";b:0;s:12:"omega:divine";b:0;s:5:"naked";b:0;s:8:"mondrian";b:0;s:6:"grid-3";b:0;s:6:"grid-2";b:0;s:6:"golden";b:0;s:19:"ocio-omega-equalcol";b:0;s:19:"ocio-omega-threecol";b:0;s:25:"ocio-omega-twocol-flipped";b:0;s:17:"ocio-omega-twocol";b:0;s:12:"radix_whelan";b:0;s:18:"radix_webb_flipped";b:0;s:10:"radix_webb";b:0;s:20:"radix_taylor_flipped";b:0;s:12:"radix_taylor";b:0;s:18:"radix_sutro_double";b:0;s:11:"radix_sutro";b:0;s:19:"radix_selby_flipped";b:0;s:11:"radix_selby";b:0;s:23:"radix_sanderson_flipped";b:0;s:15:"radix_sanderson";b:0;s:11:"radix_rolph";b:0;s:10:"radix_pond";b:0;s:12:"radix_phelan";b:0;s:21:"radix_moscone_flipped";b:0;s:13:"radix_moscone";b:0;s:14:"radix_mccoppin";b:0;s:21:"radix_hewston_flipped";b:0;s:13:"radix_hewston";b:0;s:12:"radix_harris";b:0;s:11:"radix_geary";b:0;s:18:"radix_burr_flipped";b:0;s:10:"radix_burr";b:0;s:20:"radix_bryant_flipped";b:0;s:12:"radix_bryant";b:0;s:11:"radix_brown";b:0;s:21:"radix_brenham_flipped";b:0;s:13:"radix_brenham";b:0;s:12:"radix_boxton";b:0;s:22:"radix_bartlett_flipped";b:0;s:14:"radix_bartlett";b:0;s:23:"ocio-omega-tiles-twocol";b:1;s:25:"ocio-omega-tiles-equalcol";b:1;s:12:"omega:ocio-3";b:0;s:12:"omega:ocio-4";b:1;s:31:"ocio-omega-tiles-twocol-flipped";b:1;s:20:"ocio-omega-fourtiles";b:1;s:20:"ocio-omega-flip-flop";b:1;s:12:"omega:ocio-2";b:1;s:14:"ocio-omega-dps";b:1;s:14:"ocio-omega-alx";b:1;}s:10:"form_state";N;}';
$export['panels_page_allowed_layouts'] = $strongarm;
$strongarm = new stdClass();
......
No preview for this file type
/**
* @file
* ocio-omega-alx panel layout
**/
/*
2 col tile rows
*/
.ocio-omega-alx-tile-content-region2 {
min-height: 1px;
width: 48.5%;
float: left;
margin-right: 3%;
}
.ocio-omega-alx-tile2,
.ocio-omega-alx-tile4 {
margin-right: 0;
}
/*
flip-flop rows
*/
.ocio-omega-alx-column-left {
float: left;
min-height: 1px;
.ocio-omega-alx-column-left-inner {
margin-right: 3%;
}
}
.ocio-omega-alx-column-right {
float: right;
min-height: 1px;
.ocio-omega-alx-column-right-inner {
margin-right: 0;
}
}
.ocio-omega-alx-column.span4 {
width: 32.2%;
}
.ocio-omega-alx-column.span8 {
width: 64.8%;
}
/* iPad or less */
@media only screen and (max-width: 760px) {
.ocio-omega-alx-tile-content-region4,
.ocio-omega-alx-column.span4,
.ocio-omega-alx-column.span8 {
width: 100%;
float: none;
margin-right: 0;
}
.ocio-omega-alx-column-left {
margin-bottom: 2em;
}
}
<?php
// Plugin definition
$plugin = array(
'title' => t('ALX'),
'icon' => 'ocio-omega-alx.png',
'category' => t('WCM Layouts'),
'theme' => 'ocio_omega_alx',
'css' => 'ocio-omega-alx.css',
'regions' => array(
'header' => t('Header'),
'tiles_header' => t('Tiles Header'),
'tile1' => t('Tile 1'),
'tile2' => t('Tile 2'),
'tile3' => t('Tile 3'),
'tile4' => t('Tile 4'),
'row_1_col_1' =>t('Row 1, Column 1'),
'row_1_col_2' =>t('Row 1, Column 2'),
'row_2_col_1' =>t('Row 2, Column 1'),
'row_2_col_2' =>t('Row 2, Column 2'),
'footer' => t('Footer'),
),
);
/**
* Implements hook_preprocess_ocio_omega_alx().
*/
function template_preprocess_ocio_omega_alx(&$vars) {
$rows = array(
'header' => array('header'),
'tiles' => array('tiles_header','tile1', 'tile2', 'tile3', 'tile4'),
'row_1' => array('row_1_col_1', 'row_1_col_2'),
'row_2' => array('row_2_col_1', 'row_2_col_2'),
'footer' => array('footer'),
);
$vars['panels_row'] = ocio_omega_base_panel_rows($rows, $vars);
$vars['panels_row_classes'] = ocio_omega_base_panel_row_classes();
}
profiles/wcm_base/themes/ocio_omega_base/panels/ocio-omega-alx/ocio-omega-alx.png

457 B

<?php
/**
* @file
* Template for custom ocio-omega-alx 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-alx clearfix <?php if (!empty($class)) { print $class; } ?>" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
<!-- header row -->
<div class="row-header panels-row <?php print $panels_row['header']; ?>">
<div class="ocio-omega-alx-container ocio-omega-alx-header clearfix panel-panel row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-alx-container-inner ocio-omega-alx-header-inner panel-panel-inner span12">
<?php print $content['header']; ?>
</div>
</div>
</div>
<!-- tiles row -->
<div class="row-tiles panels-row <?php print $panels_row['tiles']; ?>">
<!-- tiles header row -->
<div class="ocio-omega-alx-container ocio-omega-alx-tiles-header-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-alx-tiles-header-content-region ocio-omega-alx-tiles-header panel-panel tiles-header-panel clearfix">
<div class="ocio-omega-alx-tiles-header-inner panel-panel-inner">
<?php print $content['tiles_header']; ?>
</div>
</div>
</div>
<!-- first row of tiles -->
<div class="ocio-omega-alx-container ocio-omega-alx-tile-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-alx-tile-content-region2 ocio-omega-alx-tile1 panel-panel tile-panel clearfix span6">
<div class="ocio-omega-alx-tile-content-region2-inner ocio-omega-alx-tile1-inner panel-panel-inner">
<?php print $content['tile1']; ?>
</div>
</div>
<div class="ocio-omega-alx-tile-content-region2 ocio-omega-alx-tile2 panel-panel tile-panel clearfix span6">
<div class="ocio-omega-alx-tile-content-region2-inner ocio-omega-alx-tile2-inner panel-panel-inner">
<?php print $content['tile2']; ?>
</div>
</div>
</div>
<!-- second row of tiles -->
<div class="ocio-omega-alx-container ocio-omega-alx-tile-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-alx-tile-content-region2 ocio-omega-alx-tile3 panel-panel tile-panel clearfix span6">
<div class="ocio-omega-alx-tile-content-region2-inner ocio-omega-alx-tile3-inner panel-panel-inner">
<?php print $content['tile3']; ?>
</div>
</div>
<div class="ocio-omega-alx-tile-content-region2 ocio-omega-alx-tile4 panel-panel tile-panel clearfix span6">
<div class="ocio-omega-alx-tile-content-region2-inner ocio-omega-alx-tile4-inner panel-panel-inner">
<?php print $content['tile4']; ?>
</div>
</div>
</div>
</div>
<!-- Row 1 -->
<div class="row-1 panels-row <?php print $panels_row['row_1']; ?>">
<div class="ocio-omega-alx-container ocio-omega-alx-column-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-alx-column-content-region ocio-omega-alx-column-left ocio-omega-alx-column panel-panel span8">
<div class="ocio-omega-alx-column-content-region-inner ocio-omega-alx-column-left-inner ocio-omega-alx-column-inner panel-panel-inner">
<?php print $content['row_1_col_1']; ?>
</div>
</div>
<div class="ocio-omega-alx-column-content-region ocio-omega-alx-column-right ocio-omega-alx-column panel-panel span4">
<div class="ocio-omega-alx-column-content-region-inner ocio-omega-alx-column-right-inner ocio-omega-alx-column-inner panel-panel-inner">
<?php print $content['row_1_col_2']; ?>
</div>
</div>
</div>
</div>
<!-- Row 2 -->
<div class="row-2 panels-row <?php print $panels_row['row_2']; ?>">
<div class="ocio-omega-alx-container ocio-omega-alx-column-content clearfix row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-alx-column-content-region ocio-omega-alx-column-left ocio-omega-alx-column panel-panel span4">
<div class="ocio-omega-alx-column-content-region-inner ocio-omega-alx-column-left-inner ocio-omega-alx-column-inner panel-panel-inner">
<?php print $content['row_2_col_1']; ?>
</div>
</div>
<div class="ocio-omega-alx-column-content-region ocio-omega-alx-column-right ocio-omega-alx-column panel-panel span8">
<div class="ocio-omega-alx-column-content-region-inner ocio-omega-alx-column-right-inner ocio-omega-alx-column-inner panel-panel-inner">
<?php print $content['row_2_col_2']; ?>
</div>
</div>
</div>
</div>
<!-- footer row -->
<div class="row-footer panels-row <?php print $panels_row['footer']; ?>">
<div class="ocio-omega-alx-container ocio-omega-alx-footer clearfix panel-panel row-fluid <?php print $panels_row_classes; ?>">
<div class="ocio-omega-alx-container-inner ocio-omega-alx-footer-inner panel-panel-inner span12">
<?php print $content['footer']; ?>
</div>
</div>
</div>
</div><!-- /.ocio-omega-alx -->
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment