daily build

profiles/wcm_base/build-wcm_base-dev.make

@@ -36,11 +36,12 @@ projects[ocio_taxonomy][options][working-copy] = TRUE
 projects[ocio_twitter][options][working-copy] = TRUE
 projects[ocio_url_aliases][options][working-copy] = TRUE
 projects[ocio_user_config][options][working-copy] = TRUE
-projects[ocio_user_directory][options][working-copy] = TRUE
 projects[ocio_uuid_settings][options][working-copy] = TRUE
 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_profile][options][working-copy] = TRUE
 
 ;themes
 projects[ocio_omega_base][options][working-copy] = TRUE

profiles/wcm_base/modules/contrib/wysiwyg/editors/js/ckeditor-3.0.js

@@ -2,6 +2,9 @@
 
 CKEDITOR.disableAutoInline = true;
 
+// Exclude every id starting with 'cke_' in ajax_html_ids during AJAX requests.
+Drupal.wysiwyg.excludeIdSelectors.wysiwyg_ckeditor = ['[id^="cke_"]'];
+
 Drupal.wysiwyg.editor.init.ckeditor = function(settings) {
   // Plugins must only be loaded once. Only the settings from the first format
   // will be used but they're identical anyway.

profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info

@@ -6,9 +6,9 @@ hidden = TRUE
 dependencies[] = wysiwyg
 files[] = wysiwyg_test.module
 
-; Information added by Drupal.org packaging script on 2015-06-04
-version = "7.x-2.2+58-dev"
+; Information added by Drupal.org packaging script on 2015-06-20
+version = "7.x-2.2+60-dev"
 core = "7.x"
 project = "wysiwyg"
-datestamp = "1433409487"
+datestamp = "1434841086"
 

profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.api.js

@@ -95,3 +95,25 @@ Drupal.wysiwyg.plugins.awesome = {
     return '<img src="' + settings.path + '/images/spacer.gif" alt="&lt;--break-&gt;" title="&lt;--break--&gt;" class="wysiwyg-break drupal-content" />';
   }
 };
+
+/**
+ * Because some editors add a lot of new elements with the id attribute set,
+ * Wysiwyg provides a way to exclude such ids from the ajax_html_ids[] parameter
+ * sent in AJAX requests. Serverside POST limits such as PHP's max_input_vars
+ * could otherwise cause the request to be rejected.
+ *
+ * The filter gathers a list of jQuery selectors from a global list in
+ * Drupal.wysiwyg.excludeIdSelectors, joins them with a comma separator and
+ * wraps them in "[id]:not[...]", which is then run on the document the same way
+ * Drupal core gathers the ids on every AJAX request.
+ *
+ * To add to the filter, set a unique key to Drupal.wysiwyg.excludeIdSelectors
+ * and set its value to an Array holding one or more selector strings which
+ * would match the element(s) to exclude.
+ *
+ * Beware not to match elements which are not removed before the actual request
+ * is performed, or Drupal may accidentally reuse the same id for new elements.
+ *
+ * Below is a sample from ckeditor.inc matching every id starting with 'cke_'.
+ */
+Drupal.wysiwyg.excludeIdSelectors.wysiwyg_ckeditor = ['[id^="cke_"]'];

profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info

@@ -9,9 +9,9 @@ configure = admin/config/content/wysiwyg
 files[] = wysiwyg.module
 files[] = tests/wysiwyg.test
 
-; Information added by Drupal.org packaging script on 2015-06-04
-version = "7.x-2.2+58-dev"
+; Information added by Drupal.org packaging script on 2015-06-20
+version = "7.x-2.2+60-dev"
 core = "7.x"
 project = "wysiwyg"
-datestamp = "1433409487"
+datestamp = "1434841086"
 

profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.init.js

 
-Drupal.wysiwyg = Drupal.wysiwyg || { 'instances': {} };
+Drupal.wysiwyg = Drupal.wysiwyg || { 'instances': {}, 'excludeIdSelectors': {} };
 
 Drupal.wysiwyg.editor = Drupal.wysiwyg.editor || { 'init': {}, 'attach': {}, 'detach': {}, 'instance': {} };
 

profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.install

@@ -55,7 +55,7 @@ function wysiwyg_schema() {
         'description' => 'The {filter_format}.format of the text format.',
         'type' => 'varchar',
         'length' => 255,
-        'not null' => FALSE,
+        'not null' => TRUE,
       ),
       'status' => array(
         'description' => 'Boolean indicating whether the format is enabled by default.',
@@ -66,9 +66,9 @@ function wysiwyg_schema() {
         'size' => 'tiny',
       ),
     ),
+    'primary key' => array('uid', 'format'),
     'indexes' => array(
       'uid' => array('uid'),
-      'format' => array('format'),
     ),
     'foreign keys' => array(
       'uid' => array(
@@ -352,3 +352,24 @@ function wysiwyg_update_7202() {
     }
   }
 }
+
+/**
+ * Add primary index to {wysiwyg_user}.
+ */
+function wysiwyg_update_7203() {
+  db_drop_index('wysiwyg_user', 'uid');
+  db_drop_index('wysiwyg_user', 'format');
+  db_change_field('wysiwyg_user', 'format', 'format',
+    array(
+      'type' => 'varchar',
+      'length' => 255,
+      'not null' => TRUE,
+    ),
+    array(
+      'primary key' => array('uid', 'format'),
+      'indexes' => array(
+        'uid' => array('uid'),
+      ),
+    )
+  );
+}

profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.js

@@ -608,6 +608,33 @@ function callbackWrapper(name, context) {
   }
 }
 
+var oldBeforeSerialize = (Drupal.ajax ? Drupal.ajax.prototype.beforeSerialize : false);
+if (oldBeforeSerialize) {
+  /**
+   * Filter the ajax_html_ids list sent in AJAX requests.
+   *
+   * This overrides part of the form serializer to not include ids we know will
+   * not collide because editors are removed before those ids are reused.
+   *
+   * This avoids hitting like max_input_vars, which defaults to 1000,
+   * even with just a few active editor instances.
+   */
+  Drupal.ajax.prototype.beforeSerialize = function (element, options) {
+    var ret = oldBeforeSerialize.call(this, element, options);
+    var excludeSelectors = [];
+    $.each(Drupal.wysiwyg.excludeIdSelectors, function () {
+      if ($.isArray(this)) {
+        excludeSelectors = excludeSelectors.concat(this);
+      }
+    });
+    options.data['ajax_html_ids[]'] = [];
+    $('[id]:not(' + excludeSelectors.join(',') + ')').each(function () {
+     options.data['ajax_html_ids[]'].push(this.id);
+    });
+    return ret;
+  }
+}
+
 /**
  * Allow certain editor libraries to initialize before the DOM is loaded.
  */

profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.features.field_base.inc

@@ -58,31 +58,6 @@ function ocio_field_bases_field_default_field_bases() {
     'type' => 'datetime',
   );
 
-  // Exported field_base: 'field_display_in_directory'
-  $field_bases['field_display_in_directory'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_display_in_directory',
-    'indexes' => array(
-      'value' => array(
-        0 => 'value',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'list',
-    'settings' => array(
-      'allowed_values' => array(
-        0 => 'no',
-        1 => 'yes',
-      ),
-      'allowed_values_function' => '',
-    ),
-    'translatable' => 0,
-    'type' => 'list_boolean',
-  );
-
   // Exported field_base: 'field_file_description'
   $field_bases['field_file_description'] = array(
     'active' => 1,
@@ -144,69 +119,6 @@ function ocio_field_bases_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_first_name'
-  $field_bases['field_first_name'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_first_name',
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'max_length' => 50,
-    ),
-    'translatable' => 0,
-    'type' => 'text',
-  );
-
-  // Exported field_base: 'field_job_title'
-  $field_bases['field_job_title'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_job_title',
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'max_length' => 255,
-    ),
-    'translatable' => 0,
-    'type' => 'text',
-  );
-
-  // Exported field_base: 'field_last_name'
-  $field_bases['field_last_name'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_last_name',
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'max_length' => 50,
-    ),
-    'translatable' => 0,
-    'type' => 'text',
-  );
-
   // Exported field_base: 'field_ocio_body'
   $field_bases['field_ocio_body'] = array(
     'active' => 1,
@@ -255,90 +167,5 @@ function ocio_field_bases_field_default_field_bases() {
     'type' => 'link_field',
   );
 
-  // Exported field_base: 'field_phone'
-  $field_bases['field_phone'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_phone',
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'max_length' => 20,
-    ),
-    'translatable' => 0,
-    'type' => 'text',
-  );
-
-  // Exported field_base: 'field_room_and_building'
-  $field_bases['field_room_and_building'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_room_and_building',
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'max_length' => 255,
-    ),
-    'translatable' => 0,
-    'type' => 'text',
-  );
-
-  // Exported field_base: 'field_street_address'
-  $field_bases['field_street_address'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_street_address',
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(
-      'max_length' => 255,
-    ),
-    'translatable' => 0,
-    'type' => 'text',
-  );
-
-  // Exported field_base: 'field_user_photo'
-  $field_bases['field_user_photo'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_user_photo',
-    'indexes' => array(
-      'fid' => array(
-        0 => 'fid',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'image',
-    'settings' => array(
-      'default_image' => 6,
-      'uri_scheme' => 'public',
-    ),
-    'translatable' => 0,
-    'type' => 'image',
-  );
-
   return $field_bases;
 }

profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.info

 name = OCIO Field Bases
-description = Feature for all field bases. Field instances will be stored with each content type.
+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
@@ -16,18 +16,10 @@ features[ctools][] = linkit:linkit_profiles:1
 features[features_api][] = api:2
 features[field_base][] = field_answer
 features[field_base][] = field_date
-features[field_base][] = field_display_in_directory
 features[field_base][] = field_file_description
 features[field_base][] = field_file_image_alt_text
 features[field_base][] = field_file_image_title_text
-features[field_base][] = field_first_name
-features[field_base][] = field_job_title
-features[field_base][] = field_last_name
 features[field_base][] = field_ocio_body
 features[field_base][] = field_ocio_link
-features[field_base][] = field_phone
-features[field_base][] = field_room_and_building
-features[field_base][] = field_street_address
-features[field_base][] = field_user_photo
 features[linkit_profiles][] = ocio_field_linkit
 features_exclude[taxonomy][ocio_tags] = ocio_tags

profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.strongarm.inc

@@ -233,7 +233,7 @@ function ocio_main_menu_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'responsive_menus_mean_menu_media_size';
-  $strongarm->value = '700';
+  $strongarm->value = '760';
   $export['responsive_menus_mean_menu_media_size'] = $strongarm;
 
   $strongarm = new stdClass();

profiles/wcm_base/modules/custom/ocio_search/ocio_search.module

@@ -36,6 +36,7 @@ function ocio_search_solr_post_schema() {
  * Implements hook_form_FORM_ID_alter().
  */
 function ocio_search_form_search_block_form_alter(&$form, &$form_state) {
-  $form['actions']['submit']['#prefix'] = '<button class="search-button" tabindex="-1"><i class="fa fa-search"></i>';
-  $form['actions']['submit']['#suffix'] = '</button>';
+  $form['#prefix'] = '<i id="search-block-toggle" class="fa fa-search" title="Toggle Search" tabindex="0"></i>';
+  $form['search_block_form']['#attributes']['placeholder'] = t('Search');
+  $form['actions']['submit']['#value'] = t('Go');
 }

profiles/wcm_base/modules/custom/ocio_wysiwyg/ocio_wysiwyg.features.wysiwyg.inc

@@ -62,9 +62,9 @@ function ocio_wysiwyg_wysiwyg_default_profiles() {
       'acf_allowed_content' => '',
       'css_setting' => 'none',
       'css_path' => '',
-      'stylesSet' => 'Image Left=span.img-left
-Image Right=span.img-right
-',
+      'stylesSet' => 'Image Left=span.img-left
+Image Right=span.img-right
+Button=a.button',
       'block_formats' => 'p,h2,h3,h4',
       'advanced__active_tab' => 'edit-basic',
       'forcePasteAsPlainText' => 0,

profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.field_instance.inc

@@ -140,7 +140,6 @@ function wcm_tile_panes_field_default_field_instances() {
     ),
   );
 
-
   // Exported field_instance: 'fieldable_panels_pane-tile_pane_plus_text_area-field_tile_background_img'
   $field_instances['fieldable_panels_pane-tile_pane_plus_text_area-field_tile_background_img'] = array(
     'bundle' => 'tile_pane_plus_text_area',

profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.features.inc

@@ -29,8 +29,8 @@ function wcm_tile_panes_image_default_styles() {
       1 => array(
         'name' => 'image_scale_and_crop',
         'data' => array(
-          'width' => 600,
-          'height' => 520,
+          'width' => 800,
+          'height' => 700,
         ),
         'weight' => 1,
       ),
@@ -44,8 +44,8 @@ function wcm_tile_panes_image_default_styles() {
       2 => array(
         'name' => 'image_scale_and_crop',
         'data' => array(
-          'width' => 600,
-          'height' => 400,
+          'width' => 800,
+          'height' => 640,
         ),
         'weight' => 1,
       ),

profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.fieldable_panels_pane_type.inc

@@ -13,18 +13,18 @@ function wcm_tile_panes_default_fieldable_panels_pane_type() {
   $fieldable_panels_pane_type = new stdClass();
   $fieldable_panels_pane_type->disabled = FALSE; /* Edit this to true to make a default fieldable_panels_pane_type disabled initially */
   $fieldable_panels_pane_type->api_version = 1;
-  $fieldable_panels_pane_type->name = 'tile_pane_plus_text_area';
-  $fieldable_panels_pane_type->title = 'Tile Pane Plus Text Area';
+  $fieldable_panels_pane_type->name = 'tile_pane';
+  $fieldable_panels_pane_type->title = 'Tile Pane';
   $fieldable_panels_pane_type->description = '';
-  $export['tile_pane_plus_text_area'] = $fieldable_panels_pane_type;
+  $export['tile_pane'] = $fieldable_panels_pane_type;
 
   $fieldable_panels_pane_type = new stdClass();
   $fieldable_panels_pane_type->disabled = FALSE; /* Edit this to true to make a default fieldable_panels_pane_type disabled initially */
   $fieldable_panels_pane_type->api_version = 1;
-  $fieldable_panels_pane_type->name = 'tile_pane';
-  $fieldable_panels_pane_type->title = 'Tile Pane';
+  $fieldable_panels_pane_type->name = 'tile_pane_plus_text_area';
+  $fieldable_panels_pane_type->title = 'Tile Pane Plus Text Area';
   $fieldable_panels_pane_type->description = '';
-  $export['tile_pane'] = $fieldable_panels_pane_type;
+  $export['tile_pane_plus_text_area'] = $fieldable_panels_pane_type;
 
   return $export;
 }

profiles/wcm_base/modules/custom/wcm_tile_panes/wcm_tile_panes.info

 name = WCM Tile Panes
 description = Contains two types of tile panes to be used via panels on WCM sites.
 core = 7.x
-package = OCIO Features
+package = WCM Features
 version = 7.x-1.0
 project = wcm_tile_panes
 dependencies[] = ctools
@@ -17,15 +17,15 @@ features[features_api][] = api:2
 features[field_base][] = field_tile_background_img
 features[field_base][] = field_tile_link
 features[field_base][] = field_tile_text_area
+features[field_instance][] = fieldable_panels_pane-tile_pane-field_tile_background_img
+features[field_instance][] = fieldable_panels_pane-tile_pane-field_tile_link
 features[field_instance][] = fieldable_panels_pane-tile_pane_plus_text_area-field_tile_background_img
 features[field_instance][] = fieldable_panels_pane-tile_pane_plus_text_area-field_tile_link
 features[field_instance][] = fieldable_panels_pane-tile_pane_plus_text_area-field_tile_text_area
-features[field_instance][] = fieldable_panels_pane-tile_pane-field_tile_background_img
-features[field_instance][] = fieldable_panels_pane-tile_pane-field_tile_link
-features[fieldable_panels_pane_type][] = tile_pane_plus_text_area
 features[fieldable_panels_pane_type][] = tile_pane
+features[fieldable_panels_pane_type][] = tile_pane_plus_text_area
 features[image][] = tile_pane
 features[image][] = tile_pane_plus
-features[variable][] = field_bundle_settings_fieldable_panels_pane__tile_pane_plus_text_area
 features[variable][] = field_bundle_settings_fieldable_panels_pane__tile_pane
+features[variable][] = field_bundle_settings_fieldable_panels_pane__tile_pane_plus_text_area
 features_exclude[dependencies][media] = media

profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_base.inc

+<?php
+/**
+ * @file
+ * wcm_user_directory.features.field_base.inc
+ */
+
+/**
+ * Implements hook_field_default_field_bases().
+ */
+function wcm_user_directory_field_default_field_bases() {
+  $field_bases = array();
+
+  // Exported field_base: 'field_display_in_directory'
+  $field_bases['field_display_in_directory'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_display_in_directory',
+    'indexes' => array(
+      'value' => array(
+        0 => 'value',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'list',
+    'settings' => array(
+      'allowed_values' => array(
+        0 => 'no',
+        1 => 'yes',
+      ),
+      'allowed_values_function' => '',
+    ),
+    'translatable' => 0,
+    'type' => 'list_boolean',
+  );
+
+  return $field_bases;
+}

profiles/wcm_base/modules/custom/wcm_user_directory/wcm_user_directory.features.field_instance.inc

+<?php
+/**
+ * @file
+ * wcm_user_directory.features.field_instance.inc
+ */
+
+/**
+ * Implements hook_field_default_field_instances().
+ */
+function wcm_user_directory_field_default_field_instances() {
+  $field_instances = array();
+
+  // Exported field_instance: 'user-user-field_display_in_directory'
+  $field_instances['user-user-field_display_in_directory'] = 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 "people" directory. ',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 7,
+      ),
+      'directory' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 10,
+      ),
+      'featured' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'full' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 12,
+      ),
+    ),
+    'ds_extras_field_template' => '',
+    'entity_type' => 'user',
+    'field_name' => 'field_display_in_directory',
+    'label' => 'Display in Directory',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => 1,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(
+        'display_label' => 1,
+      ),
+      'type' => 'options_onoff',
+      'weight' => 8,
+    ),
+  );
+
+  // Translatables
+  // Included for use with string extractors like potx.
+  t('Check this box if this person should be included in the departmental "people" directory. ');
+  t('Display in Directory');
+
+  return $field_instances;
+}