From 2f1093cca9e02ef66ee846b2116ff04223f5af98 Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Mon, 12 Oct 2015 17:52:19 -0400
Subject: [PATCH] daily buil
---
profiles/wcm_base/CHANGELOG.txt | 9 +++
.../ocio_news/ocio_news.views_default.inc | 12 ++++
...s_settings.features.features_overrides.inc | 24 ++++----
.../ocio_panels_settings.features.inc | 24 ++++----
.../ocio_panels_settings.info | 1 +
.../ocio_panels_settings.module | 2 +-
.../ocio_panels_settings.strongarm.inc | 7 +++
...o_permissions.features.user_permission.inc | 8 +++
.../wcm_user_profile/wcm_user_profile.ds.inc | 14 +++--
...m_user_profile.features.field_instance.inc | 49 +++++++++-------
.../wcm_user_profile.strongarm.inc | 12 ++--
.../ocio-full/ocio-full-layout.tpl.php | 2 +
.../layouts/ocio-2/ocio-2-layout.tpl.php | 2 +
.../layouts/ocio-3/ocio-3-layout.tpl.php | 2 +
.../layouts/ocio-4/ocio-4-layout.tpl.php | 4 +-
.../ocio-default/ocio-default.layout.css | 1 +
.../ocio-default.layout.no-query.css | 1 +
.../css/ocio-omega-base.no-query.css | 1 +
.../css/ocio-omega-base.styles.css | 1 +
.../ocio-default/ocio-default-layout.tpl.php | 3 +
.../preprocess/page.preprocess.inc | 10 +++-
.../sass/base/_breadcrumbs.scss | 57 ++++++++++---------
22 files changed, 158 insertions(+), 88 deletions(-)
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 9bc5a609..4f717a05 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,12 @@
+WCM Base 7.x-1.x, 2015-10-12
+----------------------------
+- OCIO Panels Settings: Enable front page and sticky on all nodes.
+- OCIO Permissions:
+ - Enable sticky option on only news articles.
+ - Allow Site Managers to delete webform submissions.
+- OCIO Omega Base: Fixed title margins when breadcrumbs are disabled.
+- WCM User Profile: Fixed user profile field display settings.
+
WCM Base 7.x-1.x, 2015-10-08
----------------------------
- WCM Base Profile: Added Better Exposed Filters module.
diff --git a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc
index 293a5795..1f8a8087 100644
--- a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc
+++ b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc
@@ -47,6 +47,11 @@ function ocio_news_views_default_views() {
$handler->display->display_options['sorts']['created']['field'] = 'created';
$handler->display->display_options['sorts']['created']['order'] = 'DESC';
$handler->display->display_options['sorts']['created']['granularity'] = 'minute';
+ /* Sort criterion: Content: Sticky */
+ $handler->display->display_options['sorts']['sticky']['id'] = 'sticky';
+ $handler->display->display_options['sorts']['sticky']['table'] = 'node';
+ $handler->display->display_options['sorts']['sticky']['field'] = 'sticky';
+ $handler->display->display_options['sorts']['sticky']['order'] = 'DESC';
/* Filter criterion: Content: Published */
$handler->display->display_options['filters']['status']['id'] = 'status';
$handler->display->display_options['filters']['status']['table'] = 'node';
@@ -177,6 +182,13 @@ function ocio_news_views_default_views() {
$handler->display->display_options['pager']['type'] = 'some';
$handler->display->display_options['style_plugin'] = 'rss';
$handler->display->display_options['row_plugin'] = 'node_rss';
+ $handler->display->display_options['defaults']['sorts'] = FALSE;
+ /* Sort criterion: Content: Post date */
+ $handler->display->display_options['sorts']['created']['id'] = 'created';
+ $handler->display->display_options['sorts']['created']['table'] = 'node';
+ $handler->display->display_options['sorts']['created']['field'] = 'created';
+ $handler->display->display_options['sorts']['created']['order'] = 'DESC';
+ $handler->display->display_options['sorts']['created']['granularity'] = 'minute';
$handler->display->display_options['defaults']['filter_groups'] = FALSE;
$handler->display->display_options['defaults']['filters'] = FALSE;
/* Filter criterion: Content: Published */
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.features_overrides.inc b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.features_overrides.inc
index 88fe9eff..195b75ad 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.features_overrides.inc
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.features_overrides.inc
@@ -106,7 +106,7 @@ function ocio_panels_settings_features_override_default_overrides() {
),
'css' => array(),
'extras' => array(),
- 'position' => 3,
+ 'position' => 2,
'locks' => array(),
'uuid' => '3dbe9a87-780b-4039-bb07-723f5c8bca58',
);
@@ -130,7 +130,7 @@ function ocio_panels_settings_features_override_default_overrides() {
),
'css' => array(),
'extras' => array(),
- 'position' => 2,
+ 'position' => 1,
'locks' => array(),
'uuid' => '5d180289-633a-4162-b192-a1314cce1e4c',
);
@@ -154,7 +154,7 @@ function ocio_panels_settings_features_override_default_overrides() {
),
'css' => array(),
'extras' => array(),
- 'position' => 0,
+ 'position' => 3,
'locks' => array(),
'uuid' => '71e8c64f-55c3-40b6-ab0d-a93547057e44',
);
@@ -181,7 +181,7 @@ function ocio_panels_settings_features_override_default_overrides() {
),
'css' => array(),
'extras' => array(),
- 'position' => 4,
+ 'position' => 3,
'locks' => array(),
'uuid' => '9f9a4a74-598e-4f4e-b924-0e5a20ec6637',
);
@@ -207,7 +207,7 @@ function ocio_panels_settings_features_override_default_overrides() {
),
'css' => array(),
'extras' => array(),
- 'position' => 3,
+ 'position' => 4,
'locks' => array(),
'uuid' => 'd5114956-1a65-4500-9616-d9e7a386974c',
);
@@ -225,19 +225,19 @@ function ocio_panels_settings_features_override_default_overrides() {
),
'css' => array(),
'extras' => array(),
- 'position' => 1,
+ 'position' => 0,
'locks' => array(),
'uuid' => 'da419228-f10f-48ea-9972-7398d723c22c',
);
$overrides["page_manager_handlers.node_edit_panel_context.conf|display|content|new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c"]["DELETED"] = TRUE;
$overrides["page_manager_handlers.node_edit_panel_context.conf|display|panel_settings|style_settings|footer"] = NULL;
$overrides["page_manager_handlers.node_edit_panel_context.conf|display|panel_settings|style_settings|header"] = NULL;
- $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|contentmain|3"] = 'new-d5114956-1a65-4500-9616-d9e7a386974c';
- $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|contentmain|4"] = 'new-9f9a4a74-598e-4f4e-b924-0e5a20ec6637';
- $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|0"] = 'new-71e8c64f-55c3-40b6-ab0d-a93547057e44';
- $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|1"] = 'new-da419228-f10f-48ea-9972-7398d723c22c';
- $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|2"] = 'new-5d180289-633a-4162-b192-a1314cce1e4c';
- $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|3"] = 'new-3dbe9a87-780b-4039-bb07-723f5c8bca58';
+ $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|contentmain|3"] = 'new-9f9a4a74-598e-4f4e-b924-0e5a20ec6637';
+ $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|contentmain|4"] = 'new-d5114956-1a65-4500-9616-d9e7a386974c';
+ $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|0"] = 'new-da419228-f10f-48ea-9972-7398d723c22c';
+ $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|1"] = 'new-5d180289-633a-4162-b192-a1314cce1e4c';
+ $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|2"] = 'new-3dbe9a87-780b-4039-bb07-723f5c8bca58';
+ $overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|3"] = 'new-71e8c64f-55c3-40b6-ab0d-a93547057e44';
$overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|4"] = 'new-08dde41f-c835-4e3a-b0ef-28191ff0275d';
$overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|5"] = 'new-13dff848-cce9-4135-9dcc-dab92cb83895';
$overrides["page_manager_handlers.node_edit_panel_context.conf|display|panels|sidebar|6"]["DELETED"] = TRUE;
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc
index aa706211..ed9a62ff 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.features.inc
@@ -117,7 +117,7 @@ function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
),
'css' => array(),
'extras' => array(),
- 'position' => 3,
+ 'position' => 2,
'locks' => array(),
'uuid' => '3dbe9a87-780b-4039-bb07-723f5c8bca58',
); /* WAS: '' */
@@ -140,7 +140,7 @@ function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
),
'css' => array(),
'extras' => array(),
- 'position' => 2,
+ 'position' => 1,
'locks' => array(),
'uuid' => '5d180289-633a-4162-b192-a1314cce1e4c',
); /* WAS: '' */
@@ -163,7 +163,7 @@ function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
),
'css' => array(),
'extras' => array(),
- 'position' => 0,
+ 'position' => 3,
'locks' => array(),
'uuid' => '71e8c64f-55c3-40b6-ab0d-a93547057e44',
); /* WAS: '' */
@@ -188,7 +188,7 @@ function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
),
'css' => array(),
'extras' => array(),
- 'position' => 4,
+ 'position' => 3,
'locks' => array(),
'uuid' => '9f9a4a74-598e-4f4e-b924-0e5a20ec6637',
); /* WAS: '' */
@@ -213,7 +213,7 @@ function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
),
'css' => array(),
'extras' => array(),
- 'position' => 3,
+ 'position' => 4,
'locks' => array(),
'uuid' => 'd5114956-1a65-4500-9616-d9e7a386974c',
); /* WAS: '' */
@@ -231,18 +231,18 @@ function ocio_panels_settings_default_page_manager_handlers_alter(&$data) {
),
'css' => array(),
'extras' => array(),
- 'position' => 1,
+ 'position' => 0,
'locks' => array(),
'uuid' => 'da419228-f10f-48ea-9972-7398d723c22c',
); /* WAS: '' */
$data['node_edit_panel_context']->conf['display']->panel_settings['style_settings']['footer'] = NULL; /* WAS: '' */
$data['node_edit_panel_context']->conf['display']->panel_settings['style_settings']['header'] = NULL; /* WAS: '' */
- $data['node_edit_panel_context']->conf['display']->panels['contentmain'][3] = 'new-d5114956-1a65-4500-9616-d9e7a386974c'; /* WAS: '' */
- $data['node_edit_panel_context']->conf['display']->panels['contentmain'][4] = 'new-9f9a4a74-598e-4f4e-b924-0e5a20ec6637'; /* WAS: '' */
- $data['node_edit_panel_context']->conf['display']->panels['sidebar'][0] = 'new-71e8c64f-55c3-40b6-ab0d-a93547057e44'; /* WAS: 'new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd' */
- $data['node_edit_panel_context']->conf['display']->panels['sidebar'][1] = 'new-da419228-f10f-48ea-9972-7398d723c22c'; /* WAS: 'new-51126c95-cf51-4ad6-a27a-11e4260d8023' */
- $data['node_edit_panel_context']->conf['display']->panels['sidebar'][2] = 'new-5d180289-633a-4162-b192-a1314cce1e4c'; /* WAS: 'new-99f6c0bd-36fd-411b-9833-c0be0fab7548' */
- $data['node_edit_panel_context']->conf['display']->panels['sidebar'][3] = 'new-3dbe9a87-780b-4039-bb07-723f5c8bca58'; /* WAS: 'new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c' */
+ $data['node_edit_panel_context']->conf['display']->panels['contentmain'][3] = 'new-9f9a4a74-598e-4f4e-b924-0e5a20ec6637'; /* WAS: '' */
+ $data['node_edit_panel_context']->conf['display']->panels['contentmain'][4] = 'new-d5114956-1a65-4500-9616-d9e7a386974c'; /* WAS: '' */
+ $data['node_edit_panel_context']->conf['display']->panels['sidebar'][0] = 'new-da419228-f10f-48ea-9972-7398d723c22c'; /* WAS: 'new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd' */
+ $data['node_edit_panel_context']->conf['display']->panels['sidebar'][1] = 'new-5d180289-633a-4162-b192-a1314cce1e4c'; /* WAS: 'new-51126c95-cf51-4ad6-a27a-11e4260d8023' */
+ $data['node_edit_panel_context']->conf['display']->panels['sidebar'][2] = 'new-3dbe9a87-780b-4039-bb07-723f5c8bca58'; /* WAS: 'new-99f6c0bd-36fd-411b-9833-c0be0fab7548' */
+ $data['node_edit_panel_context']->conf['display']->panels['sidebar'][3] = 'new-71e8c64f-55c3-40b6-ab0d-a93547057e44'; /* WAS: 'new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c' */
$data['node_edit_panel_context']->conf['display']->panels['sidebar'][4] = 'new-08dde41f-c835-4e3a-b0ef-28191ff0275d'; /* WAS: 'new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d' */
$data['node_edit_panel_context']->conf['display']->panels['sidebar'][5] = 'new-13dff848-cce9-4135-9dcc-dab92cb83895'; /* WAS: 'new-6e4a98d8-3738-41b9-8c33-4b4c905c6834' */
$data['node_edit_panel_context']->weight = -29; /* WAS: 0 */
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info
index 4643452a..6aba8a79 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.info
@@ -60,5 +60,6 @@ features[features_overrides][] = page_manager_handlers.node_edit_panel_context.w
features[variable][] = panels_page_allowed_layouts
features[variable][] = panels_page_allowed_types
features[variable][] = panels_page_default
+features[variable][] = panopoly_admin_front_page_and_sticky
features_exclude[dependencies][file_entity] = file_entity
features_exclude[features_overrides][file_display.image__preview__file_field_image.settings|image_style] = file_display.image__preview__file_field_image.settings|image_style
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.module b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.module
index 5accef0f..d2eee3e4 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.module
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.module
@@ -155,7 +155,7 @@ function ocio_panels_settings_form_node_form_alter(&$form, &$form_state) {
if ($access) {
$form['options']['#access'] = $access;
$form['options']['private'] = $form['private'];
- unset($form['options']['private']['#weight']);
+ $form['options']['private']['#weight'] = 0;
unset($form['private']);
}
}
diff --git a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc
index 682e5fd3..535b05ce 100644
--- a/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_panels_settings/ocio_panels_settings.strongarm.inc
@@ -470,5 +470,12 @@ function ocio_panels_settings_strongarm() {
);
$export['panels_page_default'] = $strongarm;
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'panopoly_admin_front_page_and_sticky';
+ $strongarm->value = '1';
+ $export['panopoly_admin_front_page_and_sticky'] = $strongarm;
+
return $export;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc b/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
index f3482719..c37ed733 100644
--- a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
+++ b/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
@@ -1444,6 +1444,8 @@ function ocio_permissions_user_default_permissions() {
'name' => 'delete all webform submissions',
'roles' => array(
'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'webform',
);
@@ -1850,6 +1852,8 @@ function ocio_permissions_user_default_permissions() {
'name' => 'delete own webform submissions',
'roles' => array(
'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'webform',
);
@@ -2808,6 +2812,10 @@ function ocio_permissions_user_default_permissions() {
'name' => 'override article sticky option',
'roles' => array(
'administrator' => 'administrator',
+ 'contributor' => 'contributor',
+ 'editor' => 'editor',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'override_node_options',
);
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.ds.inc b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.ds.inc
index f9a6367e..e2855286 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.ds.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.ds.inc
@@ -84,15 +84,16 @@ function wcm_user_profile_ds_layout_settings_info() {
8 => 'field_display_on_contact_page',
9 => 'field_contact_group',
10 => 'field_display_in_leadership_list',
- 12 => 'field_leadership_group',
+ 11 => 'field_leadership_group',
+ 12 => 'field_display_on_diversity_page',
),
'footer' => array(
- 11 => 'wysiwyg',
- 13 => 'timezone',
- 14 => 'field_bio',
+ 13 => 'wysiwyg',
+ 14 => 'timezone',
+ 15 => 'field_bio',
),
'hidden' => array(
- 15 => '_add_existing_field',
+ 16 => '_add_existing_field',
),
),
'fields' => array(
@@ -107,8 +108,9 @@ function wcm_user_profile_ds_layout_settings_info() {
'field_display_on_contact_page' => 'right',
'field_contact_group' => 'right',
'field_display_in_leadership_list' => 'right',
- 'wysiwyg' => 'footer',
'field_leadership_group' => 'right',
+ 'field_display_on_diversity_page' => 'right',
+ 'wysiwyg' => 'footer',
'timezone' => 'footer',
'field_bio' => 'footer',
'_add_existing_field' => 'hidden',
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_instance.inc b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_instance.inc
index b14e637e..81ba7d09 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.field_instance.inc
@@ -19,9 +19,10 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 4,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 2,
),
'directory' => array(
'label' => 'above',
@@ -78,7 +79,7 @@ function wcm_user_profile_field_default_field_instances() {
'rows' => 5,
),
'type' => 'text_textarea',
- 'weight' => 14,
+ 'weight' => 15,
),
);
@@ -91,9 +92,10 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 1,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 9,
),
'directory' => array(
'label' => 'hidden',
@@ -111,7 +113,7 @@ function wcm_user_profile_field_default_field_instances() {
'label' => 'hidden',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 13,
+ 'weight' => 14,
),
'leadership_listing' => array(
'label' => 'hidden',
@@ -156,9 +158,10 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
+ 'module' => 'text',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 2,
+ 'type' => 'text_default',
+ 'weight' => 1,
),
'directory' => array(
'label' => 'hidden',
@@ -229,9 +232,10 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 6,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 10,
),
'directory' => array(
'label' => 'hidden',
@@ -249,7 +253,7 @@ function wcm_user_profile_field_default_field_instances() {
'label' => 'hidden',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 14,
+ 'weight' => 15,
),
'leadership_listing' => array(
'label' => 'hidden',
@@ -294,9 +298,12 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
- 'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 5,
+ 'module' => 'telephone',
+ 'settings' => array(
+ 'title' => '',
+ ),
+ 'type' => 'telephone_link',
+ 'weight' => 3,
),
'directory' => array(
'label' => 'hidden',
@@ -367,9 +374,10 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 11,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 5,
),
'directory' => array(
'label' => 'hidden',
@@ -388,7 +396,7 @@ function wcm_user_profile_field_default_field_instances() {
'label' => 'hidden',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 7,
+ 'weight' => 4,
),
'leadership_listing' => array(
'label' => 'hidden',
@@ -438,9 +446,10 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 3,
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 6,
),
'directory' => array(
'label' => 'hidden',
@@ -459,7 +468,7 @@ function wcm_user_profile_field_default_field_instances() {
'label' => 'hidden',
'settings' => array(),
'type' => 'hidden',
- 'weight' => 6,
+ 'weight' => 9,
),
'leadership_listing' => array(
'label' => 'hidden',
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.strongarm.inc b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.strongarm.inc
index 78057619..d4d97a50 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.strongarm.inc
@@ -26,7 +26,7 @@ function wcm_user_profile_strongarm() {
'custom_settings' => FALSE,
),
'leadership_listing' => array(
- 'custom_settings' => FALSE,
+ 'custom_settings' => TRUE,
),
),
'extra_fields' => array(
@@ -35,10 +35,10 @@ function wcm_user_profile_strongarm() {
'weight' => '0',
),
'timezone' => array(
- 'weight' => '13',
+ 'weight' => '14',
),
'wysiwyg' => array(
- 'weight' => '12',
+ 'weight' => '13',
),
'picture' => array(
'weight' => '1',
@@ -47,15 +47,15 @@ function wcm_user_profile_strongarm() {
'display' => array(
'summary' => array(
'default' => array(
- 'weight' => '12',
- 'visible' => FALSE,
+ 'weight' => '4',
+ 'visible' => TRUE,
),
'featured' => array(
'weight' => '5',
'visible' => TRUE,
),
'full' => array(
- 'weight' => '12',
+ 'weight' => '13',
'visible' => FALSE,
),
'leadership_listing' => array(
diff --git a/profiles/wcm_base/themes/ocio_omega_1/layouts/ocio-full/ocio-full-layout.tpl.php b/profiles/wcm_base/themes/ocio_omega_1/layouts/ocio-full/ocio-full-layout.tpl.php
index 4b298b4d..d21c4a90 100755
--- a/profiles/wcm_base/themes/ocio_omega_1/layouts/ocio-full/ocio-full-layout.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_1/layouts/ocio-full/ocio-full-layout.tpl.php
@@ -37,7 +37,9 @@
<?php print render($page['help']); ?>
<?php print render($page['workbench']); ?>
<?php if (!$is_front && !empty($title)): ?>
+ <?php print render($title_prefix); ?>
<h1 class="title" id="page-title"><?php print $title; ?></h1>
+ <?php print render($title_suffix); ?>
<?php endif; ?>
<?php if ($action_links): ?>
diff --git a/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2-layout.tpl.php b/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2-layout.tpl.php
index 1c14dc73..a26050fb 100644
--- a/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2-layout.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_2/layouts/ocio-2/ocio-2-layout.tpl.php
@@ -33,7 +33,9 @@
<?php endif; ?>
<div class="l-content" role="main">
<?php if (!$is_front && !empty($title)): ?>
+ <?php print render($title_prefix); ?>
<h1 class="title" id="page-title"><?php print $title; ?></h1>
+ <?php print render($title_suffix); ?>
<?php endif; ?>
<?php if ($action_links): ?>
diff --git a/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php b/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php
index 5086b977..2e483363 100644
--- a/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_3/layouts/ocio-3/ocio-3-layout.tpl.php
@@ -31,7 +31,9 @@
<div class="l-content" role="main">
<?php if (!$is_front && !empty($title)): ?>
+ <?php print render($title_prefix); ?>
<h1 class="title" id="page-title"><?php print $title; ?></h1>
+ <?php print render($title_suffix); ?>
<?php endif; ?>
<?php if ($action_links): ?>
diff --git a/profiles/wcm_base/themes/ocio_omega_4/layouts/ocio-4/ocio-4-layout.tpl.php b/profiles/wcm_base/themes/ocio_omega_4/layouts/ocio-4/ocio-4-layout.tpl.php
index be36da8e..0ad99efc 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/layouts/ocio-4/ocio-4-layout.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_4/layouts/ocio-4/ocio-4-layout.tpl.php
@@ -34,7 +34,9 @@
<div class="l-content" role="main">
<?php if (!$is_front && !empty($title)): ?>
- <h1 <?php print $title_attributes; ?>><?php print $title; ?></h1>
+ <?php print render($title_prefix); ?>
+ <h1 <?php print $title_attributes; ?>><?php print $title; ?></h1>
+ <?php print render($title_suffix); ?>
<?php endif; ?>
<?php if ($action_links): ?>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
index 4dc2de05..52b931ff 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.css
@@ -5,6 +5,7 @@
******************************************************************************/
ul.breadcrumb {
padding: 0;
+ margin-bottom: 0;
}
ul.breadcrumb li {
display: inline-block;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
index d5a2c614..811dc48e 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
+++ b/profiles/wcm_base/themes/ocio_omega_base/css/layouts/ocio-default/ocio-default.layout.no-query.css
@@ -5,6 +5,7 @@
******************************************************************************/
ul.breadcrumb {
padding: 0;
+ margin-bottom: 0;
}
ul.breadcrumb li {
display: inline-block;
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 bd1b7e19..fa8f0dc2 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
@@ -1,6 +1,7 @@
/* No files to import found in abstractions/**\/* */
ul.breadcrumb {
padding: 0;
+ margin-bottom: 0;
}
ul.breadcrumb li {
display: inline-block;
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 7bcf1b4b..37b8e9ba 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
@@ -1,6 +1,7 @@
/* No files to import found in abstractions/**\/* */
ul.breadcrumb {
padding: 0;
+ margin-bottom: 0;
}
ul.breadcrumb li {
display: inline-block;
diff --git a/profiles/wcm_base/themes/ocio_omega_base/layouts/ocio-default/ocio-default-layout.tpl.php b/profiles/wcm_base/themes/ocio_omega_base/layouts/ocio-default/ocio-default-layout.tpl.php
index 409ecbff..51dc3745 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/layouts/ocio-default/ocio-default-layout.tpl.php
+++ b/profiles/wcm_base/themes/ocio_omega_base/layouts/ocio-default/ocio-default-layout.tpl.php
@@ -31,9 +31,12 @@
<?php else: ?>
<div>
<?php endif; ?>
+
<div class="l-content" role="main">
<?php if (!$is_front && !empty($title)): ?>
+ <?php print render($title_prefix); ?>
<h1 <?php print $title_attributes; ?>><?php print $title; ?></h1>
+ <?php print render($title_suffix); ?>
<?php endif; ?>
<?php if ($action_links): ?>
diff --git a/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc b/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc
index cb2d5e13..15863e8e 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc
+++ b/profiles/wcm_base/themes/ocio_omega_base/preprocess/page.preprocess.inc
@@ -15,7 +15,13 @@ function ocio_omega_base_preprocess_page(&$vars) {
$vars['landing_page'] = isset($vars['node']) && $vars['node']->type == 'ocio_landing_page';
if ($vars['landing_page']) {
- $vars['title_attributes_array']['class'][] = 'l-constrained';
- $vars['title_attributes_array']['class'][] = 'max-width';
+ $vars['title_prefix']['ocio_omega_base'] = array(
+ 'type' => 'markup',
+ '#markup' => '<div class="l-constrained max-width">',
+ );
+ $vars['title_suffix']['ocio_omega_base'] = array(
+ 'type' => 'markup',
+ '#markup' => '</div>',
+ );
}
}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_breadcrumbs.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_breadcrumbs.scss
index 31695a2c..4691ee92 100644
--- a/profiles/wcm_base/themes/ocio_omega_base/sass/base/_breadcrumbs.scss
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/base/_breadcrumbs.scss
@@ -1,36 +1,37 @@
// basic breadcrumb style -- override as needed in subtheme
ul.breadcrumb {
- padding: 0;
- @extend .no-list-style;
+ padding: 0;
+ @extend .no-list-style;
+ margin-bottom: 0;
- li {
- display: inline-block;
- margin-right: 0.3 * $horz-spacing-unit;
- font-weight: 600;
+ li {
+ display: inline-block;
+ margin-right: 0.3 * $horz-spacing-unit;
+ font-weight: 600;
- &:after {
- content: "|";
- color: $red;
- font-weight: 700;
- margin-left: 0.3 * $horz-spacing-unit;
- }
+ &:after {
+ content: "|";
+ color: $red;
+ font-weight: 700;
+ margin-left: 0.3 * $horz-spacing-unit;
+ }
- a {
- @include link-colors($md-gray, $md-gray, $blue, $md-gray, $yellow);
- text-decoration: none;
-
- &:hover {
- text-decoration: underline;
- }
- }
+ a {
+ @include link-colors($md-gray, $md-gray, $blue, $md-gray, $yellow);
+ text-decoration: none;
- }
+ &:hover {
+ text-decoration: underline;
+ }
+ }
+ }
- //remove separator and margin for last item
- li:last-child {
- margin-right: 0;
- &:after {
- content: " ";
- }
- }
+ //remove separator and margin for last item
+ li:last-child {
+ margin-right: 0;
+
+ &:after {
+ content: " ";
+ }
+ }
}
--
GitLab