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

daily build

parent 81f1e501
No related branches found
No related tags found
No related merge requests found
Showing
with 581 additions and 45 deletions
......@@ -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
......
(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);
<?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;
}
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
......
......@@ -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'));
}
......@@ -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().
*/
......
(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));
......@@ -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
......@@ -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().
*/
......
......@@ -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>',
......
......@@ -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',
......
......@@ -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';
......
<?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;
}
<?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;
}
<?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;
}
<?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");
}
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
<?php
/**
* @file
* Code for the WCM User Leadership feature.
*/
include_once 'wcm_user_leadership.features.inc';
<?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;
}
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