diff --git a/profiles/wcm_base/build-wcm_base-dev.make b/profiles/wcm_base/build-wcm_base-dev.make
index 1bd2b7179d0bad7d8252ea5b0fe951e882687220..95ae78818f395c7be13e3897beebeceac69fda3f 100644
--- a/profiles/wcm_base/build-wcm_base-dev.make
+++ b/profiles/wcm_base/build-wcm_base-dev.make
@@ -41,6 +41,7 @@ projects[ocio_workbench][options][working-copy] = TRUE
projects[ocio_wysiwyg][options][working-copy] = TRUE
projects[wcm_tile_panes][options][working-copy] = TRUE
projects[wcm_user_directory][options][working-copy] = TRUE
+projects[wcm_user_leadership][options][working-copy] = TRUE
projects[wcm_user_profile][options][working-copy] = TRUE
;themes
diff --git a/profiles/wcm_base/modules/custom/ocio_field_bases/js/ocio_field_bases_accordion.js b/profiles/wcm_base/modules/custom/ocio_field_bases/js/ocio_field_bases_accordion.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5d03b1850cb91a7b43eeb06e78b9ba8818ad130
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/ocio_field_bases/js/ocio_field_bases_accordion.js
@@ -0,0 +1,17 @@
+(function($) {
+/*
+ * Custom behavior
+ */
+Drupal.behaviors.ocioFieldBasesAccordion = {
+ attach: function(context, settings) {
+ $('.field .ui-accordion, .views-field .ui-accordion').accordion({
+ header: "> .accordion-item > .ui-accordion-header",
+ collapsible: true,
+ active: false,
+ animate: true,
+ autoHeight: false,
+ });
+ }
+};
+
+})(jQuery);
diff --git a/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.field.inc b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.field.inc
new file mode 100644
index 0000000000000000000000000000000000000000..27d095a0b2e39423b0ad3e3017c6d0e1bc1d9ab7
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.field.inc
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * @file
+ * Implements Field module hooks for jqueryui formatters.
+ */
+
+/**
+ * Implements hook_field_formatter_info().
+ */
+function ocio_field_bases_field_formatter_info() {
+ return array(
+ 'ocio_field_bases_accordion' => array(
+ 'label' => t('Accordion'),
+ 'field types' => array('text', 'text_long', 'text_with_summary'),
+ ),
+ );
+}
+
+/**
+ * Implements hook_field_formatter_view().
+ */
+function ocio_field_bases_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
+
+ $element = array();
+ $settings = $display['settings'];
+ $entity_id = (entity_id($entity_type, $entity));
+ $field_id = $field['id'];
+ $instance_id = $instance['id'];
+ $unique_instance_id = $entity_id . '-' . $field_id . '-' . $instance_id;
+
+ switch ($display['type']) {
+ case 'ocio_field_bases_accordion':
+
+ if (!empty($items)) {
+
+ $element[] = array(
+ '#theme' => 'ocio_field_bases_accordion',
+ '#header' => $settings['header'],
+ '#instance' => $instance,
+ '#langcode' => $langcode,
+ '#items' => $items,
+ '#unique_instance_id' => $unique_instance_id,
+ );
+ }
+ break;
+ default:
+ break;
+ }
+
+ return $element;
+}
+
+
+/**
+ * Returns HTML for an dialog field formatter.
+ *
+ * @param array $variables
+ * An associative array containing:
+ * - header: header html tag to build the element,
+ * - instance: Associative array of instance field data,
+ * - langcode: field langcode,
+ * - items: Associative array containing the multiple
+ * values of an instance to be rendered,
+ * - unique_instance_id: unique id for instance,
+ *
+ * @ingroup themeable
+ */
+function theme_ocio_field_bases_accordion($vars) {
+ $items = $vars['items'];
+ $instance = $vars['instance'];
+
+ $output = '<div class="ui-accordion"><div class="accordion-item"><div class="ui-accordion-header">'. $instance['label'] . '</div><div class="ui-accordion-content">';
+
+ if (count($items) > 1) {
+ $output .= '<div class="ui-accordion">';
+ foreach ($items as $delta => $item) {
+ $output .= '<div class="accordion-item"><div class="ui-accordion-header">' . $instance['label'] . ' ' . $delta . '</div><div class="ui-accordion-content">' . $items[$delta]['safe_value'] . '</div></div>';
+ }
+ $output .= '</div>';
+ }
+ else {
+ $output .= $items[0]['safe_value'];
+ }
+
+ $output .= '</div></div></div>';
+
+ return $output;
+}
diff --git a/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.info b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.info
index ece7bb852d53cb5d8d3d75d3c882d9f65b598575..6794a15a5a4d0e64e56dc48fc428b3472e6e9942 100644
--- a/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.info
+++ b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.info
@@ -1,5 +1,5 @@
name = OCIO Field Bases
-description = Field bases for all content types. Field instances will be stored with each content type. User field bases are not included.
+description = Field bases for all content types. Field instances will be stored with each content type. User field bases are not included.
core = 7.x
package = OCIO Features
version = 7.x-1.0
diff --git a/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.module b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.module
index 48c8cc35fac8019d4e134985538865efc47926f5..eb75a6da57354e5e66cebce095a0f421112422a6 100644
--- a/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.module
+++ b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.module
@@ -5,3 +5,31 @@
*/
include_once 'ocio_field_bases.features.inc';
+require_once 'ocio_field_bases.field.inc';
+
+/**
+ * Implements hook_theme().
+ */
+function ocio_field_bases_theme() {
+ return array(
+ 'ocio_field_bases_accordion' => array(
+ 'variables' => array(
+ 'header' => NULL,
+ 'instance' => NULL,
+ 'langcode' => NULL,
+ 'items' => NULL,
+ 'unique_instance_id' => NULL,
+ ),
+ ),
+ );
+}
+
+/**
+ * Implements hook_preprocess_page().
+ */
+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'));
+}
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 92308375604cd017174c2ebdc4182783bfbc9f33..f9453dc8359ae0aa37f292bffc9e3d89258d745c 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
@@ -46,6 +46,20 @@ function _ocio_panels_settings_region_style_settings($form) {
return $form;
}
+/**
+ * Implements hook_form_alter().
+ *
+ * Simplify form for fpp. Remove the option for title as a link.
+ */
+function ocio_panels_settings_form_alter(&$form, &$form_state, $form_id) {
+
+ if ($form_id == 'fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form') {
+ $form['link']['#access'] = FALSE;
+ }
+}
+
+
+
/*
* Implements hook_settings_preprocess_panels_add_content_modal().
*/
diff --git a/profiles/wcm_base/modules/custom/ocio_wysiwyg/js/ocio_wysiwyg.js b/profiles/wcm_base/modules/custom/ocio_wysiwyg/js/ocio_wysiwyg.js
index 04f7ce3788b0125f46afc50069b32f35d91dcd08..38dbbaf184679915322c75020b29c72738960155 100644
--- a/profiles/wcm_base/modules/custom/ocio_wysiwyg/js/ocio_wysiwyg.js
+++ b/profiles/wcm_base/modules/custom/ocio_wysiwyg/js/ocio_wysiwyg.js
@@ -1,29 +1,27 @@
(function($) {
- $(document).ready(function(){
- // Apply jQuery UI Accordion behaviors to specifically classed elements.
+/*
+ * Accordion
+ */
+Drupal.behaviors.ocioWysiwygAccordion = {
+ // Apply jQuery UI Accordion behaviors to specifically classed elements.
+ attach: function(context, settings) {
+ var collection = [];
+ $('.content-accordion').each(function() {
+ var nextBox = $(this).next().hasClass('ui-accordion');
+ collection.push($(this));
+ $(this).removeClass('ui-accordion').addClass('accordion-item');
- var collection = [];
- $('.node .ui-accordion').each(function() {
- var nextBox = $(this).next().hasClass('ui-accordion');
- collection.push($(this));
- $(this).removeClass('ui-accordion').addClass('accordion-item');
+ if (!nextBox) {
+ var container = $('<div class="ui-accordion"></div>');
+ container.insertBefore(collection[0]);
+ for (i = 0; i < collection.length; i++) {
+ collection[i].appendTo(container);
+ }
+ collection = [];
- if(!nextBox) {
- var container = $('<div class="ui-accordion"></div>');
- container.insertBefore(collection[0]);
- for(i=0;i<collection.length;i++) {
- collection[i].appendTo(container);
}
- collection = [];
- }
- });
-
- $('.node .ui-accordion').accordion({
- header: ".ui-accordion-header",
- collapsible: true,
- active: false,
- animate: true,
- autoHeight: false,
});
- });
+ }
+};
+
}(jQuery));
diff --git a/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.info b/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.info
index a14098494576d2b67830d714ff516fb4a8fecf9d..de1ee5c383584c04635748e2d72fc0f95fa1a181 100644
--- a/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.info
+++ b/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.info
@@ -24,3 +24,5 @@ features[variable][] = pasteformat_cleanup_format
features[variable][] = pasteformat_message_success
features[variable][] = simplify_nodes_global
features[wysiwyg][] = filtered_html
+scripts[] = js/ocio_wysiwyg.js
+stylesheets[all][] = css/ocio_wysiwyg.css
diff --git a/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.module b/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.module
index 8e5a00f0b9f536db766eba27224b19f2b07ea217..556a4d0ed8a2e67538320c7a9e61e711e3d98015 100644
--- a/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.module
+++ b/profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.module
@@ -35,18 +35,6 @@ function ocio_wysiwyg_form_linkit_dashboard_form_alter(&$form, &$form_state) {
$form['profile']['#access'] = FALSE;
}
-/**
- * Implements hook_preprocess_node().
- */
-function ocio_wysiwyg_preprocess_node($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_wysiwyg') . '/js/ocio_wysiwyg.js');
- // Load custom CSS for styling callout widgets.
- drupal_add_css(drupal_get_path('module', 'ocio_wysiwyg') . '/css/ocio_wysiwyg.css');
-}
-
/**
* Implements hook_wysiwyg_plugin().
*/
diff --git a/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/accordion/plugin.js b/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/accordion/plugin.js
index 14b36a479c81368ade0cc0ef001afeae8768d8b7..2d02de606ee2dab869804e8ab8081391956c4d28 100644
--- a/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/accordion/plugin.js
+++ b/profiles/wcm_base/modules/custom/ocio_wysiwyg/plugins/accordion/plugin.js
@@ -17,7 +17,7 @@ CKEDITOR.plugins.add('accordion', {
// Register the widget.
editor.widgets.add('accordion', {
template:
- '<div class="ui-accordion">' +
+ '<div class="ui-accordion content-accordion">' +
'<div class="ui-accordion-header">Header</div>' +
'<div class="ui-accordion-content"><p>Content</p></div>' +
'</div>',
diff --git a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_instance.inc b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_instance.inc
index d316ced0c78d0c773b9a2ce703d8f5ac7ba2a0aa..4d38ee9d3f82846832dd5272f814c57185fedb6f 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_instance.inc
@@ -45,6 +45,18 @@ function wcm_user_directory_field_default_field_instances() {
'type' => 'hidden',
'weight' => 12,
),
+ 'leadership_listing' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 5,
+ ),
+ 'leadership_profile' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 8,
+ ),
),
'ds_extras_field_template' => '',
'entity_type' => 'user',
diff --git a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.views_default.inc b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.views_default.inc
index 44c1d07f9a51538db84bc45e1c94669dd773ae1b..88c678b7a3c56360da522d0b340cc5523eec2c91 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.views_default.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.views_default.inc
@@ -22,6 +22,7 @@ function wcm_user_directory_views_default_views() {
/* Display: Master */
$handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['title'] = 'Directory';
$handler->display->display_options['use_more_always'] = FALSE;
$handler->display->display_options['access']['type'] = 'none';
$handler->display->display_options['cache']['type'] = 'none';
@@ -42,13 +43,34 @@ function wcm_user_directory_views_default_views() {
'empty_column' => 0,
),
);
- /* Field: User: Name */
- $handler->display->display_options['fields']['name']['id'] = 'name';
- $handler->display->display_options['fields']['name']['table'] = 'users';
- $handler->display->display_options['fields']['name']['field'] = 'name';
- $handler->display->display_options['fields']['name']['label'] = '';
- $handler->display->display_options['fields']['name']['alter']['word_boundary'] = FALSE;
- $handler->display->display_options['fields']['name']['alter']['ellipsis'] = FALSE;
+ /* Field: User: Last Name */
+ $handler->display->display_options['fields']['field_last_name']['id'] = 'field_last_name';
+ $handler->display->display_options['fields']['field_last_name']['table'] = 'field_data_field_last_name';
+ $handler->display->display_options['fields']['field_last_name']['field'] = 'field_last_name';
+ /* Field: User: First Name */
+ $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
+ $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
+ $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
+ /* Field: User: Title */
+ $handler->display->display_options['fields']['field_job_title']['id'] = 'field_job_title';
+ $handler->display->display_options['fields']['field_job_title']['table'] = 'field_data_field_job_title';
+ $handler->display->display_options['fields']['field_job_title']['field'] = 'field_job_title';
+ /* Field: User: E-mail */
+ $handler->display->display_options['fields']['mail']['id'] = 'mail';
+ $handler->display->display_options['fields']['mail']['table'] = 'users';
+ $handler->display->display_options['fields']['mail']['field'] = 'mail';
+ /* Field: User: Phone */
+ $handler->display->display_options['fields']['field_phone']['id'] = 'field_phone';
+ $handler->display->display_options['fields']['field_phone']['table'] = 'field_data_field_phone';
+ $handler->display->display_options['fields']['field_phone']['field'] = 'field_phone';
+ /* Sort criterion: User: Last Name (field_last_name) */
+ $handler->display->display_options['sorts']['field_last_name_value']['id'] = 'field_last_name_value';
+ $handler->display->display_options['sorts']['field_last_name_value']['table'] = 'field_data_field_last_name';
+ $handler->display->display_options['sorts']['field_last_name_value']['field'] = 'field_last_name_value';
+ /* Sort criterion: User: First Name (field_first_name) */
+ $handler->display->display_options['sorts']['field_first_name_value']['id'] = 'field_first_name_value';
+ $handler->display->display_options['sorts']['field_first_name_value']['table'] = 'field_data_field_first_name';
+ $handler->display->display_options['sorts']['field_first_name_value']['field'] = 'field_first_name_value';
/* Filter criterion: User: Active */
$handler->display->display_options['filters']['status']['id'] = 'status';
$handler->display->display_options['filters']['status']['table'] = 'users';
@@ -66,7 +88,7 @@ function wcm_user_directory_views_default_views() {
/* Display: Page */
$handler = $view->new_display('page', 'Page', 'page');
- $handler->display->display_options['path'] = 'people';
+ $handler->display->display_options['path'] = 'directory';
$handler->display->display_options['menu']['title'] = 'People';
$handler->display->display_options['menu']['weight'] = '20';
$handler->display->display_options['menu']['name'] = 'main-menu';
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/README.md b/profiles/wcm_base/modules/custom/wcm_user_leadership/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.ds.inc b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.ds.inc
new file mode 100644
index 0000000000000000000000000000000000000000..0aba20a4b782ce46e0367fe1a48444fd9666290f
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.ds.inc
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @file
+ * wcm_user_leadership.ds.inc
+ */
+
+/**
+ * Implements hook_ds_field_settings_info().
+ */
+function wcm_user_leadership_ds_field_settings_info() {
+ $export = array();
+
+ $ds_fieldsetting = new stdClass();
+ $ds_fieldsetting->api_version = 1;
+ $ds_fieldsetting->id = 'user|user|leadership_listing';
+ $ds_fieldsetting->entity_type = 'user';
+ $ds_fieldsetting->bundle = 'user';
+ $ds_fieldsetting->view_mode = 'leadership_listing';
+ $ds_fieldsetting->settings = array(
+ 'email' => array(
+ 'weight' => '3',
+ 'label' => 'hidden',
+ 'format' => 'default',
+ 'formatter_settings' => array(
+ 'show_title' => 0,
+ 'title_wrapper' => '',
+ 'ctools' => '',
+ 'load_terms' => 0,
+ 'ft' => array(),
+ ),
+ ),
+ 'name' => array(
+ 'weight' => '1',
+ 'label' => 'hidden',
+ 'format' => 'default',
+ ),
+ );
+ $export['user|user|leadership_listing'] = $ds_fieldsetting;
+
+ return $export;
+}
+
+/**
+ * Implements hook_ds_layout_settings_info().
+ */
+function wcm_user_leadership_ds_layout_settings_info() {
+ $export = array();
+
+ $ds_layout = new stdClass();
+ $ds_layout->api_version = 1;
+ $ds_layout->id = 'user|user|leadership_listing';
+ $ds_layout->entity_type = 'user';
+ $ds_layout->bundle = 'user';
+ $ds_layout->view_mode = 'leadership_listing';
+ $ds_layout->layout = 'ds_1col';
+ $ds_layout->settings = array(
+ 'regions' => array(
+ 'ds_content' => array(
+ 0 => 'field_user_photo',
+ 1 => 'name',
+ 2 => 'field_job_title',
+ 3 => 'email',
+ 4 => 'field_bio',
+ ),
+ ),
+ 'fields' => array(
+ 'field_user_photo' => 'ds_content',
+ 'name' => 'ds_content',
+ 'field_job_title' => 'ds_content',
+ 'email' => 'ds_content',
+ 'field_bio' => 'ds_content',
+ ),
+ 'classes' => array(),
+ 'wrappers' => array(
+ 'ds_content' => 'div',
+ 'ds_hidden' => 'div',
+ ),
+ 'layout_wrapper' => 'div',
+ 'layout_attributes' => '',
+ 'layout_attributes_merge' => 1,
+ 'layout_link_attribute' => '',
+ 'layout_link_custom' => '',
+ );
+ $export['user|user|leadership_listing'] = $ds_layout;
+
+ return $export;
+}
+
+/**
+ * Implements hook_ds_view_modes_info().
+ */
+function wcm_user_leadership_ds_view_modes_info() {
+ $export = array();
+
+ $ds_view_mode = new stdClass();
+ $ds_view_mode->api_version = 1;
+ $ds_view_mode->view_mode = 'leadership_listing';
+ $ds_view_mode->label = 'Leadership Listing';
+ $ds_view_mode->entities = array(
+ 'user' => 'user',
+ );
+ $export['leadership_listing'] = $ds_view_mode;
+
+ return $export;
+}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_base.inc b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_base.inc
new file mode 100644
index 0000000000000000000000000000000000000000..f04fcd456a0392243de7f0b231975757f95f1f55
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_base.inc
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @file
+ * wcm_user_leadership.features.field_base.inc
+ */
+
+/**
+ * Implements hook_field_default_field_bases().
+ */
+function wcm_user_leadership_field_default_field_bases() {
+ $field_bases = array();
+
+ // Exported field_base: 'field_display_in_leadership_list'
+ $field_bases['field_display_in_leadership_list'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_display_in_leadership_list',
+ 'indexes' => array(
+ 'value' => array(
+ 0 => 'value',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'list',
+ 'settings' => array(
+ 'allowed_values' => array(
+ 0 => '',
+ 1 => '',
+ ),
+ 'allowed_values_function' => '',
+ ),
+ 'translatable' => 0,
+ 'type' => 'list_boolean',
+ );
+
+ return $field_bases;
+}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_instance.inc b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_instance.inc
new file mode 100644
index 0000000000000000000000000000000000000000..23706c72a0838dfb7cb5e1c33f3905740c8a25f5
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.field_instance.inc
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @file
+ * wcm_user_leadership.features.field_instance.inc
+ */
+
+/**
+ * Implements hook_field_default_field_instances().
+ */
+function wcm_user_leadership_field_default_field_instances() {
+ $field_instances = array();
+
+ // Exported field_instance: 'user-user-field_display_in_leadership_list'
+ $field_instances['user-user-field_display_in_leadership_list'] = array(
+ 'bundle' => 'user',
+ 'default_value' => array(
+ 0 => array(
+ 'value' => 0,
+ ),
+ ),
+ 'deleted' => 0,
+ 'description' => 'Check this box if this person should be included in the departmental Leadership Listing. ',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 8,
+ ),
+ 'featured' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ 'leadership_listing' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 10,
+ ),
+ 'leadership_profile' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 9,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'user',
+ 'field_name' => 'field_display_in_leadership_list',
+ 'label' => 'Display in Leadership Listing',
+ 'required' => 0,
+ 'settings' => array(
+ 'user_register_form' => 1,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'options',
+ 'settings' => array(
+ 'display_label' => 1,
+ ),
+ 'type' => 'options_onoff',
+ 'weight' => 9,
+ ),
+ );
+
+ // Translatables
+ // Included for use with string extractors like potx.
+ t('Check this box if this person should be included in the departmental Leadership Listing. ');
+ t('Display in Leadership Listing');
+
+ return $field_instances;
+}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.inc b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.inc
new file mode 100644
index 0000000000000000000000000000000000000000..9770d4b6a765d1748cc00e8a64b7fe79a835a2df
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.features.inc
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @file
+ * wcm_user_leadership.features.inc
+ */
+
+/**
+ * Implements hook_ctools_plugin_api().
+ */
+function wcm_user_leadership_ctools_plugin_api($module = NULL, $api = NULL) {
+ if ($module == "ds" && $api == "ds") {
+ return array("version" => "1");
+ }
+}
+
+/**
+ * Implements hook_views_api().
+ */
+function wcm_user_leadership_views_api($module = NULL, $api = NULL) {
+ return array("api" => "3.0");
+}
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.info b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.info
new file mode 100644
index 0000000000000000000000000000000000000000..0f29c4177fd805ffe86b5d579c69aa5c4e1f9c61
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.info
@@ -0,0 +1,21 @@
+name = WCM User Leadership
+description = Creates a leadership listing page from selected user profiles.
+core = 7.x
+package = WCM Features
+version = 7.x-1.0
+project = wcm_user_leadership
+dependencies[] = ds
+dependencies[] = features
+dependencies[] = list
+dependencies[] = options
+dependencies[] = views
+features[ctools][] = ds:ds:1
+features[ctools][] = views:views_default:3.0
+features[ds_field_settings][] = user|user|leadership_listing
+features[ds_layout_settings][] = user|user|leadership_listing
+features[ds_view_modes][] = leadership_listing
+features[features_api][] = api:2
+features[field_base][] = field_display_in_leadership_list
+features[field_instance][] = user-user-field_display_in_leadership_list
+features[views_view][] = leadership_listing
+features_exclude[dependencies][ctools] = ctools
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.module b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.module
new file mode 100644
index 0000000000000000000000000000000000000000..62888e562a1050e84569b16487b3803863d5dcd1
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.module
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @file
+ * Code for the WCM User Leadership feature.
+ */
+
+include_once 'wcm_user_leadership.features.inc';
diff --git a/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.views_default.inc b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.views_default.inc
new file mode 100644
index 0000000000000000000000000000000000000000..d6993a23853abc3ce3376a45dd6de0add7017b55
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_leadership/wcm_user_leadership.views_default.inc
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @file
+ * wcm_user_leadership.views_default.inc
+ */
+
+/**
+ * Implements hook_views_default_views().
+ */
+function wcm_user_leadership_views_default_views() {
+ $export = array();
+
+ $view = new view();
+ $view->name = 'leadership_listing';
+ $view->description = '';
+ $view->tag = 'default';
+ $view->base_table = 'users';
+ $view->human_name = 'Leadership Listing';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['title'] = 'Leadership';
+ $handler->display->display_options['use_more_always'] = FALSE;
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['access']['perm'] = 'access user profiles';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'none';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'user';
+ $handler->display->display_options['row_options']['view_mode'] = 'leadership_listing';
+ /* Field: User: User Photo */
+ $handler->display->display_options['fields']['field_user_photo']['id'] = 'field_user_photo';
+ $handler->display->display_options['fields']['field_user_photo']['table'] = 'field_data_field_user_photo';
+ $handler->display->display_options['fields']['field_user_photo']['field'] = 'field_user_photo';
+ $handler->display->display_options['fields']['field_user_photo']['label'] = '';
+ $handler->display->display_options['fields']['field_user_photo']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['field_user_photo']['click_sort_column'] = 'fid';
+ $handler->display->display_options['fields']['field_user_photo']['settings'] = array(
+ 'image_style' => 'user_picture',
+ 'image_link' => '',
+ );
+ /* Field: Realname: Real name */
+ $handler->display->display_options['fields']['realname']['id'] = 'realname';
+ $handler->display->display_options['fields']['realname']['table'] = 'realname';
+ $handler->display->display_options['fields']['realname']['field'] = 'realname';
+ $handler->display->display_options['fields']['realname']['label'] = '';
+ $handler->display->display_options['fields']['realname']['element_type'] = 'h2';
+ $handler->display->display_options['fields']['realname']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['realname']['link_to_user'] = FALSE;
+ /* Field: User: Title */
+ $handler->display->display_options['fields']['field_job_title']['id'] = 'field_job_title';
+ $handler->display->display_options['fields']['field_job_title']['table'] = 'field_data_field_job_title';
+ $handler->display->display_options['fields']['field_job_title']['field'] = 'field_job_title';
+ $handler->display->display_options['fields']['field_job_title']['label'] = '';
+ $handler->display->display_options['fields']['field_job_title']['element_type'] = 'h3';
+ $handler->display->display_options['fields']['field_job_title']['element_label_colon'] = FALSE;
+ /* Field: User: E-mail */
+ $handler->display->display_options['fields']['mail']['id'] = 'mail';
+ $handler->display->display_options['fields']['mail']['table'] = 'users';
+ $handler->display->display_options['fields']['mail']['field'] = 'mail';
+ $handler->display->display_options['fields']['mail']['label'] = '';
+ $handler->display->display_options['fields']['mail']['element_label_colon'] = FALSE;
+ /* Field: User: Bio */
+ $handler->display->display_options['fields']['field_bio']['id'] = 'field_bio';
+ $handler->display->display_options['fields']['field_bio']['table'] = 'field_data_field_bio';
+ $handler->display->display_options['fields']['field_bio']['field'] = 'field_bio';
+ $handler->display->display_options['fields']['field_bio']['label'] = '';
+ $handler->display->display_options['fields']['field_bio']['alter']['text'] = '[field_bio]';
+ $handler->display->display_options['fields']['field_bio']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['field_bio']['type'] = 'ocio_field_bases_accordion';
+
+ /* Filter criterion: User: Active */
+ $handler->display->display_options['filters']['status']['id'] = 'status';
+ $handler->display->display_options['filters']['status']['table'] = 'users';
+ $handler->display->display_options['filters']['status']['field'] = 'status';
+ $handler->display->display_options['filters']['status']['value'] = '1';
+ $handler->display->display_options['filters']['status']['group'] = 1;
+ $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+ /* Filter criterion: User: Display in Leadership Listing (field_display_in_leadership_list) */
+ $handler->display->display_options['filters']['field_display_in_leadership_list_value']['id'] = 'field_display_in_leadership_list_value';
+ $handler->display->display_options['filters']['field_display_in_leadership_list_value']['table'] = 'field_data_field_display_in_leadership_list';
+ $handler->display->display_options['filters']['field_display_in_leadership_list_value']['field'] = 'field_display_in_leadership_list_value';
+ $handler->display->display_options['filters']['field_display_in_leadership_list_value']['value'] = array(
+ 1 => '1',
+ );
+
+ /* Display: Page */
+ $handler = $view->new_display('page', 'Page', 'page');
+ $handler->display->display_options['path'] = 'leadership';
+ $export['leadership_listing'] = $view;
+
+ return $export;
+}
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 ab46a5ed3ffc14081c67fa42ec96d9aff316f3f4..c7852ddeb493918e6f8f8e69328952652d68db41 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
@@ -4,6 +4,33 @@
* wcm_user_profile.ds.inc
*/
+/**
+ * Implements hook_ds_custom_fields_info().
+ */
+function wcm_user_profile_ds_custom_fields_info() {
+ $export = array();
+
+ $ds_field = new stdClass();
+ $ds_field->api_version = 1;
+ $ds_field->field = 'email';
+ $ds_field->label = 'Email';
+ $ds_field->field_type = 5;
+ $ds_field->entities = array(
+ 'user' => 'user',
+ );
+ $ds_field->ui_limit = '';
+ $ds_field->properties = array(
+ 'code' => array(
+ 'value' => '<a href="mailto:[user:mail]">[user:mail]</a>',
+ 'format' => 'ds_code',
+ ),
+ 'use_token' => 1,
+ );
+ $export['email'] = $ds_field;
+
+ return $export;
+}
+
/**
* Implements hook_ds_layout_settings_info().
*/
@@ -31,14 +58,15 @@ function wcm_user_profile_ds_layout_settings_info() {
6 => 'field_street_address',
7 => 'field_user_photo',
8 => 'field_display_in_directory',
+ 9 => 'field_display_in_leadership_list',
),
'footer' => array(
- 9 => 'field_bio',
10 => 'wysiwyg',
11 => 'timezone',
+ 12 => 'field_bio',
),
'hidden' => array(
- 12 => '_add_existing_field',
+ 13 => '_add_existing_field',
),
),
'fields' => array(
@@ -51,9 +79,10 @@ function wcm_user_profile_ds_layout_settings_info() {
'field_street_address' => 'right',
'field_user_photo' => 'right',
'field_display_in_directory' => 'right',
- 'field_bio' => 'footer',
+ 'field_display_in_leadership_list' => 'right',
'wysiwyg' => 'footer',
'timezone' => 'footer',
+ 'field_bio' => 'footer',
'_add_existing_field' => 'hidden',
),
'classes' => array(),
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 a91c6cd70b9ca8460ff801992de6d3b98233c448..c8afa07c08f2e35332e9a6567fcc864fb2918643 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,9 @@ function wcm_user_profile_field_default_field_instances() {
'display' => array(
'default' => array(
'label' => 'hidden',
- 'module' => 'text',
+ 'module' => 'ocio_field_bases',
'settings' => array(),
- 'type' => 'text_default',
+ 'type' => 'ocio_field_bases_accordion',
'weight' => 6,
),
'directory' => array(
@@ -43,6 +43,20 @@ function wcm_user_profile_field_default_field_instances() {
'type' => 'text_default',
'weight' => 6,
),
+ 'leadership_listing' => array(
+ 'label' => 'hidden',
+ 'module' => 'ocio_field_bases',
+ 'settings' => array(),
+ 'type' => 'ocio_field_bases_accordion',
+ 'weight' => 4,
+ ),
+ 'leadership_profile' => array(
+ 'label' => 'above',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 4,
+ ),
),
'ds_extras_field_template' => '',
'entity_type' => 'user',
@@ -65,7 +79,7 @@ function wcm_user_profile_field_default_field_instances() {
'rows' => 5,
),
'type' => 'text_textarea',
- 'weight' => 9,
+ 'weight' => 12,
),
);
@@ -100,6 +114,19 @@ function wcm_user_profile_field_default_field_instances() {
'type' => 'hidden',
'weight' => 10,
),
+ 'leadership_listing' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 11,
+ ),
+ 'leadership_profile' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 1,
+ ),
),
'ds_extras_field_template' => '',
'entity_type' => 'user',
@@ -155,6 +182,20 @@ function wcm_user_profile_field_default_field_instances() {
'type' => 'text_default',
'weight' => 1,
),
+ 'leadership_listing' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 2,
+ ),
+ 'leadership_profile' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 3,
+ ),
),
'ds_extras_field_template' => '',
'entity_type' => 'user',
@@ -212,6 +253,19 @@ function wcm_user_profile_field_default_field_instances() {
'type' => 'hidden',
'weight' => 11,
),
+ 'leadership_listing' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 12,
+ ),
+ 'leadership_profile' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 2,
+ ),
),
'ds_extras_field_template' => '',
'entity_type' => 'user',
@@ -267,6 +321,18 @@ function wcm_user_profile_field_default_field_instances() {
'type' => 'text_default',
'weight' => 3,
),
+ 'leadership_listing' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 8,
+ ),
+ 'leadership_profile' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 6,
+ ),
),
'ds_extras_field_template' => '',
'entity_type' => 'user',
@@ -327,6 +393,18 @@ function wcm_user_profile_field_default_field_instances() {
'type' => 'text_default',
'weight' => 4,
),
+ 'leadership_listing' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 9,
+ ),
+ 'leadership_profile' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 11,
+ ),
),
'ds_extras_field_template' => '',
'entity_type' => 'user',
@@ -387,6 +465,18 @@ function wcm_user_profile_field_default_field_instances() {
'type' => 'text_default',
'weight' => 5,
),
+ 'leadership_listing' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 7,
+ ),
+ 'leadership_profile' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 7,
+ ),
),
'ds_extras_field_template' => '',
'entity_type' => 'user',
@@ -455,6 +545,26 @@ function wcm_user_profile_field_default_field_instances() {
'type' => 'image',
'weight' => 0,
),
+ 'leadership_listing' => array(
+ 'label' => 'hidden',
+ 'module' => 'image',
+ 'settings' => array(
+ 'image_link' => '',
+ 'image_style' => 'user_picture',
+ ),
+ 'type' => 'image',
+ 'weight' => 0,
+ ),
+ 'leadership_profile' => array(
+ 'label' => 'hidden',
+ 'module' => 'image',
+ 'settings' => array(
+ 'image_link' => '',
+ 'image_style' => 'user_picture',
+ ),
+ 'type' => 'image',
+ 'weight' => 0,
+ ),
),
'ds_extras_field_template' => '',
'entity_type' => 'user',
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc
index 36778696176ae4c49da32605921938d73206b087..62e87b8b23b49ccf552b183e9953da9c6c0d2c09 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc
@@ -26,11 +26,11 @@ function wcm_user_profile_image_default_styles() {
$styles['user_picture'] = array(
'label' => 'User Picture',
'effects' => array(
- 4 => array(
+ 1 => array(
'name' => 'manualcrop_crop_and_scale',
'data' => array(
- 'width' => 200,
- 'height' => 286,
+ 'width' => 340,
+ 'height' => 400,
'upscale' => 0,
'respectminimum' => 1,
'onlyscaleifcrop' => 0,
@@ -38,6 +38,14 @@ function wcm_user_profile_image_default_styles() {
),
'weight' => 1,
),
+ 2 => array(
+ 'name' => 'image_scale_and_crop',
+ 'data' => array(
+ 'width' => 170,
+ 'height' => 200,
+ ),
+ 'weight' => 2,
+ ),
),
);
@@ -48,8 +56,8 @@ function wcm_user_profile_image_default_styles() {
3 => array(
'name' => 'image_scale_and_crop',
'data' => array(
- 'width' => 120,
- 'height' => 172,
+ 'width' => 102,
+ 'height' => 120,
),
'weight' => 2,
),
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info
index 3bc20d4ea749f92dcf1a3fab651568e00e6ad4cc..1d3a6adaa43e9491e13875f65e3b62a30020a2f4 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info
@@ -13,6 +13,7 @@ dependencies[] = strongarm
dependencies[] = text
features[ctools][] = ds:ds:1
features[ctools][] = strongarm:strongarm:1
+features[ds_fields][] = email
features[ds_layout_settings][] = user|user|form
features[features_api][] = api:2
features[field_base][] = field_bio
@@ -33,3 +34,4 @@ features[field_instance][] = user-user-field_street_address
features[field_instance][] = user-user-field_user_photo
features[image][] = user_picture
features[image][] = user_picture_thumbnail
+features[variable][] = realname_pattern
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
new file mode 100644
index 0000000000000000000000000000000000000000..53986e601c0aa4c24032d1e07404eb255010ff58
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.strongarm.inc
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @file
+ * wcm_user_profile.strongarm.inc
+ */
+
+/**
+ * Implements hook_strongarm().
+ */
+function wcm_user_profile_strongarm() {
+ $export = array();
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'realname_pattern';
+ $strongarm->value = '[user:field_first_name] [user:field_last_name]';
+ $export['realname_pattern'] = $strongarm;
+
+ return $export;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_1/ocio_1.info b/profiles/wcm_base/themes/ocio_omega_1/ocio_1.info
index 33f325589602b81f1aa9582dee7a7db1796fa2ca..d070946379ecb9a02234010dee422cb03681633c 100755
--- a/profiles/wcm_base/themes/ocio_omega_1/ocio_1.info
+++ b/profiles/wcm_base/themes/ocio_omega_1/ocio_1.info
@@ -1,4 +1,4 @@
-name = OCIO 1 (Real Name TBD)
+name = OCIO 1 (in progress)
description = Please provide a description for your theme.
base theme = ocio_omega_base
screenshot = screenshot.png
diff --git a/profiles/wcm_base/themes/ocio_omega_2/ocio_2.info b/profiles/wcm_base/themes/ocio_omega_2/ocio_2.info
index 26faa5f07c9b55856e2c46c5b07fc4ec0ee44896..b4393d6b722ad7e718ded202b5c333278839c1f9 100644
--- a/profiles/wcm_base/themes/ocio_omega_2/ocio_2.info
+++ b/profiles/wcm_base/themes/ocio_omega_2/ocio_2.info
@@ -1,4 +1,4 @@
-name = OCIO 2 (Name TBD)
+name = OCIO 2 (in progress)
description = Please provide a description for your theme.
base theme = ocio_omega_base
screenshot = screenshot.png
diff --git a/profiles/wcm_base/themes/ocio_omega_4/ocio_4.info b/profiles/wcm_base/themes/ocio_omega_4/ocio_4.info
index bcf25ad307bb6d78981e03828f874d70a8e2bd75..d6ee3ba022e51edb6d28f07385b12bb9efe078ce 100644
--- a/profiles/wcm_base/themes/ocio_omega_4/ocio_4.info
+++ b/profiles/wcm_base/themes/ocio_omega_4/ocio_4.info
@@ -1,4 +1,4 @@
-name = OCIO Omega 4
+name = Modern (OCIO 4)
description = Please provide a description for your theme.
base theme = ocio_omega_base
screenshot = screenshot.png
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 81bda46079b7418e2e0568701847fbd2f1299809..34e9b0d435c9441e18bf91cf0a6ae10e70431e8c 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
@@ -2527,3 +2527,33 @@ a#skip:active:hover, a#skip:focus:hover {
.front .view-featured-slideshow {
margin-bottom: 1em;
}
+
+.view-id-leadership_listing .views-row-1 {
+ margin-top: 2.4em;
+}
+
+.view-mode-leadership_listing .field--name-field-user-photo {
+ float: left;
+ margin-right: 1.4em;
+ margin-bottom: 0.6em;
+}
+.view-mode-leadership_listing .field--name-name {
+ margin-bottom: 0.2em;
+}
+.view-mode-leadership_listing .field--name-name h2 {
+ font-size: 32px;
+ font-size: 3.2rem;
+ padding-top: 10px;
+}
+.view-mode-leadership_listing .field--name-field-job-title {
+ font-size: 22px;
+ font-size: 2.2rem;
+ margin-bottom: 0.3em;
+}
+.view-mode-leadership_listing .field--name-email {
+ font-size: 18px;
+ font-size: 1.8rem;
+}
+.view-mode-leadership_listing .field--name-field-bio {
+ clear: both;
+}
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 6bf2d04fa532decad37eca387647ec7c1e39541e..30341b99bb1352756929cb2bc25c7a11f29a5110 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
@@ -2647,3 +2647,33 @@ a#skip:active:hover, a#skip:focus:hover {
.front .view-featured-slideshow {
margin-bottom: 1em;
}
+
+.view-id-leadership_listing .views-row-1 {
+ margin-top: 2.4em;
+}
+
+.view-mode-leadership_listing .field--name-field-user-photo {
+ float: left;
+ margin-right: 1.4em;
+ margin-bottom: 0.6em;
+}
+.view-mode-leadership_listing .field--name-name {
+ margin-bottom: 0.2em;
+}
+.view-mode-leadership_listing .field--name-name h2 {
+ font-size: 32px;
+ font-size: 3.2rem;
+ padding-top: 10px;
+}
+.view-mode-leadership_listing .field--name-field-job-title {
+ font-size: 22px;
+ font-size: 2.2rem;
+ margin-bottom: 0.3em;
+}
+.view-mode-leadership_listing .field--name-email {
+ font-size: 18px;
+ font-size: 1.8rem;
+}
+.view-mode-leadership_listing .field--name-field-bio {
+ clear: both;
+}
diff --git a/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_leadership.scss b/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_leadership.scss
new file mode 100644
index 0000000000000000000000000000000000000000..91ac0813fab983b597375c566d3931605cf6a7d2
--- /dev/null
+++ b/profiles/wcm_base/themes/ocio_omega_base/sass/components/specific-pages/_leadership.scss
@@ -0,0 +1,37 @@
+.view-id-leadership_listing {
+ .views-row-1 {
+ margin-top: 2.4em;
+ }
+}
+
+
+.view-mode-leadership_listing {
+
+ .field--name-field-user-photo {
+ float: left;
+ margin-right: 1.4em;
+ margin-bottom: 0.6em;
+ }
+
+ .field--name-name {
+ h2 {
+ @include font-size(3.2);
+ padding-top: 10px;
+ }
+ margin-bottom: 0.2em;
+ }
+
+ .field--name-field-job-title {
+ @include font-size(2.2);
+ margin-bottom: 0.3em;
+ }
+
+ .field--name-email {
+ @include font-size(1.8);
+ }
+
+ .field--name-field-bio {
+ clear: both;
+ }
+
+}
\ No newline at end of file
diff --git a/profiles/wcm_base/wcm_base.info b/profiles/wcm_base/wcm_base.info
index e83eb4e75d20f6520945f68bdc19a20a2ca563fe..ea33a22ba11e316651bf1cfabf81e16301df12c0 100644
--- a/profiles/wcm_base/wcm_base.info
+++ b/profiles/wcm_base/wcm_base.info
@@ -113,5 +113,6 @@ dependencies[] = ocio_workbench
dependencies[] = ocio_wysiwyg
dependencies[] = wcm_tile_panes
dependencies[] = wcm_user_directory
+dependencies[] = wcm_user_leadership
dependencies[] = wcm_user_profile
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index 59949c00a7b5134dc78aba490efccb2e5675f893..ab8343fae832efc0411da29ea7f9133052a5e2f4 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -285,6 +285,12 @@ projects[wcm_user_directory][download][type] = "git"
projects[wcm_user_directory][download][url] = git@code.osu.edu:ocio_odee_web/wcm_user_directory.git
projects[wcm_user_directory][download][branch] = 7.x-1.x
+projects[wcm_user_leadership][type] = module
+projects[wcm_user_leadership][subdir] = custom
+projects[wcm_user_leadership][download][type] = "git"
+projects[wcm_user_leadership][download][url] = git@code.osu.edu:ocio_odee_web/wcm_user_leadership.git
+projects[wcm_user_leadership][download][branch] = 7.x-1.x
+
projects[wcm_user_profile][type] = module
projects[wcm_user_profile][subdir] = custom
projects[wcm_user_profile][download][type] = "git"