From b73637610e5cc3fc84d985e4a563f96edc3f6d4f Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Mon, 1 Jun 2015 11:23:12 -0400
Subject: [PATCH] daily build
---
profiles/wcm_base/build-wcm_base-dev.make | 1 +
.../date_popup_authored.info | 9 +-
.../draggableviews/draggableviews.info | 6 +-
.../draggableviews/draggableviews.module | 16 +-
.../draggableviews_book.info | 6 +-
.../draggableviews_test.info | 6 +-
...draggableviews_handler_field_draggable.inc | 6 +-
.../contrib/file_entity/file_entity.info | 8 -
.../file_entity/tests/file_entity_test.info | 8 -
.../contrib/manualcrop/manualcrop.info | 8 -
.../wcm_base/modules/contrib/media/media.info | 8 -
.../media_bulk_upload/media_bulk_upload.info | 8 -
.../media_internet/media_internet.info | 8 -
.../media_migrate_file_types.info | 8 -
.../modules/media_wysiwyg/media_wysiwyg.info | 8 -
.../media_wysiwyg_view_mode.info | 8 -
.../media/modules/mediafield/mediafield.info | 8 -
.../media/tests/media_module_test.info | 8 -
.../contrib/media_youtube/media_youtube.info | 8 -
.../includes/uuid_bean.features.inc | 10 +-
.../includes/uuid_file_entity.features.inc | 6 +-
.../includes/uuid_node.features.inc | 8 +-
.../includes/uuid_term.features.inc | 57 +-
.../contrib/uuid_features/uuid_features.info | 6 +-
.../uuid_features/uuid_features.install | 20 +
.../uuid_features/uuid_features.module | 81 ++-
.../modules/contrib/workbench/workbench.info | 8 -
.../workbench_media/workbench_media.info | 8 -
.../tests/workbench_moderation_test.info | 8 -
.../workbench_moderation.info | 8 -
.../contrib/wysiwyg/editors/js/epiceditor.js | 2 +-
.../contrib/wysiwyg/editors/js/tinymce-2.js | 2 +-
.../contrib/wysiwyg/editors/js/tinymce-3.js | 2 +-
.../wysiwyg/editors/js/whizzywig-56.js | 5 +-
.../wysiwyg/editors/js/whizzywig-60.js | 5 +-
.../contrib/wysiwyg/editors/js/whizzywig.js | 2 +-
.../contrib/wysiwyg/tests/wysiwyg_test.info | 6 +-
.../modules/contrib/wysiwyg/wysiwyg.info | 6 +-
.../ocio_admin_menu/ocio_admin_menu.module | 7 +
...featured_slideshow.features.field_base.inc | 8 -
.../ocio_featured_slideshow.features.inc | 24 +
.../ocio_featured_slideshow.info | 2 +-
.../ocio_featured_slideshow.views_default.inc | 48 ++
.../ocio_field_bases.features.field_base.inc | 99 ----
.../ocio_field_bases/ocio_field_bases.info | 1 -
.../ocio_image_styles.features.inc | 74 ---
.../ocio_image_styles/ocio_image_styles.info | 4 +-
.../modules/custom/ocio_landing_page/README | 0
...io_landing_page.features.defaultconfig.inc | 91 +++
.../ocio_landing_page.features.inc | 35 ++
.../ocio_landing_page/ocio_landing_page.info | 31 +
.../ocio_landing_page.module | 7 +
.../ocio_landing_page.panelizer.inc | 73 +++
.../ocio_landing_page.strongarm.inc | 549 ++++++++++++++++++
.../ocio_main_menu/ocio_main_menu.module | 11 +
...o_permissions.features.user_permission.inc | 181 ++++++
.../ocio_permissions/ocio_permissions.info | 21 +-
.../ocio_user_directory.features.inc | 43 ++
.../ocio_user_directory.info | 2 +
profiles/wcm_base/wcm_base.info | 1 +
profiles/wcm_base/wcm_base.make | 6 +
61 files changed, 1313 insertions(+), 401 deletions(-)
create mode 100644 profiles/wcm_base/modules/custom/ocio_landing_page/README
create mode 100644 profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.defaultconfig.inc
create mode 100644 profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.inc
create mode 100644 profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info
create mode 100644 profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.module
create mode 100644 profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.panelizer.inc
create mode 100644 profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
diff --git a/profiles/wcm_base/build-wcm_base-dev.make b/profiles/wcm_base/build-wcm_base-dev.make
index dd966fed..9a4fa7c8 100644
--- a/profiles/wcm_base/build-wcm_base-dev.make
+++ b/profiles/wcm_base/build-wcm_base-dev.make
@@ -21,6 +21,7 @@ projects[ocio_featured_slideshow][options][working-copy] = TRUE
projects[ocio_field_bases][options][working-copy] = TRUE
projects[ocio_front_page][options][working-copy] = TRUE
projects[ocio_image_styles][options][working-copy] = TRUE
+projects[ocio_landing_page][options][working-copy] = TRUE
projects[ocio_main_menu][options][working-copy] = TRUE
projects[ocio_media][options][working-copy] = TRUE
projects[ocio_news][options][working-copy] = TRUE
diff --git a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
index 80b8a4b4..bd506d7f 100644
--- a/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
+++ b/profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info
@@ -3,11 +3,4 @@ description = "Provides a datepicker for the 'Authored on' field on node forms."
core = 7.x
files[] = date_popup_authored.test
package = Date/Time
-dependencies[] = date_popup
-
-; Information added by drush on 2015-05-21
-version = "7.x-1.1+2-dev"
-core = "7.x"
-project = "date_popup_authored"
-datestamp = "1432234212"
-
+dependencies[] = date_popup
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/draggableviews/draggableviews.info b/profiles/wcm_base/modules/contrib/draggableviews/draggableviews.info
index 554f67ec..d767bd17 100644
--- a/profiles/wcm_base/modules/contrib/draggableviews/draggableviews.info
+++ b/profiles/wcm_base/modules/contrib/draggableviews/draggableviews.info
@@ -18,9 +18,9 @@ files[] = handlers/draggableviews_hierarchy_handler_native.inc
dependencies[] = entity
-; Information added by Drupal.org packaging script on 2015-05-06
-version = "7.x-2.1+4-dev"
+; Information added by Drupal.org packaging script on 2015-05-27
+version = "7.x-2.1+6-dev"
core = "7.x"
project = "draggableviews"
-datestamp = "1430914992"
+datestamp = "1432749489"
diff --git a/profiles/wcm_base/modules/contrib/draggableviews/draggableviews.module b/profiles/wcm_base/modules/contrib/draggableviews/draggableviews.module
index b182e243..22aeeba3 100644
--- a/profiles/wcm_base/modules/contrib/draggableviews/draggableviews.module
+++ b/profiles/wcm_base/modules/contrib/draggableviews/draggableviews.module
@@ -26,6 +26,20 @@ function _draggableviews_get_field($view) {
}
return FALSE;
}
+
+/**
+ * Implements hook_views_pre_view().
+ */
+function draggableviews_views_pre_view(&$view, &$display_id, &$args) {
+ // User has Views UI access however they do not have access to draggableviews.
+ // To prevent confusion, display a warning message when they are previewing the
+ // current display when it has a draggableviews field.
+ if (isset($view->preview) && isset($view->display_handler->handlers['field']['draggableviews']) && !user_access('access draggableviews')) {
+ drupal_set_message(t("Current display has a draggableviews field, however you cannot see it in the preview because you do not have
+ '@permission' permission.", array('@permission' => 'access draggableviews')), 'warning');
+ }
+}
+
/**
* Implements hook_form_alter().
*
@@ -82,7 +96,7 @@ function draggableviews_form_alter(&$form, &$form_state, $form_id) {
return;
}
- // Do not show "Submit" button on preview.
+ // Do not show "Submit" button on preview and warn user they cannot save in Preview mode.
$current_path = current_path();
if (strpos($current_path, 'admin/structure/views/nojs/preview') !== FALSE) {
$form['actions']['message'] = array('#markup' => '<div class="messages warning">' . t('It is not possible to save order in Preview mode.') . '</div>');
diff --git a/profiles/wcm_base/modules/contrib/draggableviews/draggableviews_book/draggableviews_book.info b/profiles/wcm_base/modules/contrib/draggableviews/draggableviews_book/draggableviews_book.info
index 776a0864..fcf29f84 100644
--- a/profiles/wcm_base/modules/contrib/draggableviews/draggableviews_book/draggableviews_book.info
+++ b/profiles/wcm_base/modules/contrib/draggableviews/draggableviews_book/draggableviews_book.info
@@ -7,9 +7,9 @@ files[] = draggableviews_book_views_handler_argument.inc
dependencies[] = draggableviews
dependencies[] = book
-; Information added by Drupal.org packaging script on 2015-05-06
-version = "7.x-2.1+4-dev"
+; Information added by Drupal.org packaging script on 2015-05-27
+version = "7.x-2.1+6-dev"
core = "7.x"
project = "draggableviews"
-datestamp = "1430914992"
+datestamp = "1432749489"
diff --git a/profiles/wcm_base/modules/contrib/draggableviews/test/draggableviews_test/draggableviews_test.info b/profiles/wcm_base/modules/contrib/draggableviews/test/draggableviews_test/draggableviews_test.info
index dd3c7613..18004988 100644
--- a/profiles/wcm_base/modules/contrib/draggableviews/test/draggableviews_test/draggableviews_test.info
+++ b/profiles/wcm_base/modules/contrib/draggableviews/test/draggableviews_test/draggableviews_test.info
@@ -4,9 +4,9 @@ dependencies[] = draggableviews
package = Views
core = 7.x
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-05-06
-version = "7.x-2.1+4-dev"
+; Information added by Drupal.org packaging script on 2015-05-27
+version = "7.x-2.1+6-dev"
core = "7.x"
project = "draggableviews"
-datestamp = "1430914992"
+datestamp = "1432749489"
diff --git a/profiles/wcm_base/modules/contrib/draggableviews/views/draggableviews_handler_field_draggable.inc b/profiles/wcm_base/modules/contrib/draggableviews/views/draggableviews_handler_field_draggable.inc
index a9537105..26edba4f 100644
--- a/profiles/wcm_base/modules/contrib/draggableviews/views/draggableviews_handler_field_draggable.inc
+++ b/profiles/wcm_base/modules/contrib/draggableviews/views/draggableviews_handler_field_draggable.inc
@@ -140,10 +140,12 @@ class draggableviews_handler_field_draggable extends views_handler_field {
);
}
+ function access() {
+ return user_access('access draggableviews');
+ }
+
function render($values) {
- if (user_access('access draggableviews')) {
return '<!--form-item-' . $this->options['id'] . '--' . $this->view->row_index . '-->';
- }
}
/**
diff --git a/profiles/wcm_base/modules/contrib/file_entity/file_entity.info b/profiles/wcm_base/modules/contrib/file_entity/file_entity.info
index e93370c1..62f966f0 100644
--- a/profiles/wcm_base/modules/contrib/file_entity/file_entity.info
+++ b/profiles/wcm_base/modules/contrib/file_entity/file_entity.info
@@ -24,11 +24,3 @@ configure = admin/config/media/file-settings
; We have to add a fake version so Git checkouts do not fail Media dependencies
version = 7.x-2.x-dev
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.0-alpha3+29-dev"
-core = "7.x"
-project = "file_entity"
-datestamp = "1432234208"
-
diff --git a/profiles/wcm_base/modules/contrib/file_entity/tests/file_entity_test.info b/profiles/wcm_base/modules/contrib/file_entity/tests/file_entity_test.info
index ecd79c27..35eaf29c 100644
--- a/profiles/wcm_base/modules/contrib/file_entity/tests/file_entity_test.info
+++ b/profiles/wcm_base/modules/contrib/file_entity/tests/file_entity_test.info
@@ -4,11 +4,3 @@ package = Testing
core = 7.x
dependencies[] = file_entity
hidden = TRUE
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.0-alpha3+29-dev"
-core = "7.x"
-project = "file_entity"
-datestamp = "1432234208"
-
diff --git a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
index 2e00ec9e..f0defad2 100644
--- a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
+++ b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
@@ -7,11 +7,3 @@ dependencies[] = image (>=7.8)
dependencies[] = libraries (>=2.1)
files[] = includes/views/manualcrop.views.inc
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-1.4+109-dev"
-core = "7.x"
-project = "manualcrop"
-datestamp = "1432234112"
-
diff --git a/profiles/wcm_base/modules/contrib/media/media.info b/profiles/wcm_base/modules/contrib/media/media.info
index 15696bfb..41db0918 100644
--- a/profiles/wcm_base/modules/contrib/media/media.info
+++ b/profiles/wcm_base/modules/contrib/media/media.info
@@ -23,11 +23,3 @@ configure = admin/config/media/browser
; We have to add a fake version so Git checkouts do not fail Media dependencies
version = 7.x-2.x-dev
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1432234069"
-
diff --git a/profiles/wcm_base/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info b/profiles/wcm_base/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info
index 758179b8..f930dbc0 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info
@@ -8,11 +8,3 @@ dependencies[] = multiform
dependencies[] = plupload
files[] = includes/MediaBrowserBulkUpload.inc
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1432234069"
-
diff --git a/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.info b/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.info
index 37585b79..3ec8936c 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/media_internet/media_internet.info
@@ -10,11 +10,3 @@ files[] = includes/MediaInternetBaseHandler.inc
files[] = includes/MediaInternetFileHandler.inc
files[] = includes/MediaInternetNoHandlerException.inc
files[] = includes/MediaInternetValidationException.inc
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1432234069"
-
diff --git a/profiles/wcm_base/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info b/profiles/wcm_base/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info
index b664d698..32c98d11 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info
@@ -7,11 +7,3 @@ hidden = TRUE
dependencies[] = media
configure = admin/structure/file-types/upgrade
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1432234069"
-
diff --git a/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info b/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info
index 6846bb5b..93b8a3aa 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info
@@ -14,11 +14,3 @@ files[] = tests/media_wysiwyg.file_usage.test
files[] = tests/media_wysiwyg.macro.test
configure = admin/config/media/browser
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1432234069"
-
diff --git a/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info b/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
index e7bfcd86..8fbbdbbd 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
@@ -8,11 +8,3 @@ dependencies[] = media_wysiwyg
configure = admin/config/media/wysiwyg-view-mode
files[] = media_wysiwyg_view_mode.test
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1432234069"
-
diff --git a/profiles/wcm_base/modules/contrib/media/modules/mediafield/mediafield.info b/profiles/wcm_base/modules/contrib/media/modules/mediafield/mediafield.info
index 0b916864..24022ad7 100644
--- a/profiles/wcm_base/modules/contrib/media/modules/mediafield/mediafield.info
+++ b/profiles/wcm_base/modules/contrib/media/modules/mediafield/mediafield.info
@@ -3,11 +3,3 @@ description = "Provides a field type that stores media-specific data. <em>Deprec
package = Media
core = 7.x
dependencies[] = media
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1432234069"
-
diff --git a/profiles/wcm_base/modules/contrib/media/tests/media_module_test.info b/profiles/wcm_base/modules/contrib/media/tests/media_module_test.info
index 9cd3f363..de618c2e 100644
--- a/profiles/wcm_base/modules/contrib/media/tests/media_module_test.info
+++ b/profiles/wcm_base/modules/contrib/media/tests/media_module_test.info
@@ -3,11 +3,3 @@ description = Provides hooks for testing Media module functionality.
package = Media
core = 7.x
hidden = TRUE
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1432234069"
-
diff --git a/profiles/wcm_base/modules/contrib/media_youtube/media_youtube.info b/profiles/wcm_base/modules/contrib/media_youtube/media_youtube.info
index 00212151..49fd9edf 100644
--- a/profiles/wcm_base/modules/contrib/media_youtube/media_youtube.info
+++ b/profiles/wcm_base/modules/contrib/media_youtube/media_youtube.info
@@ -8,11 +8,3 @@ dependencies[] = media_internet
files[] = includes/MediaYouTubeStreamWrapper.inc
files[] = includes/MediaInternetYouTubeHandler.inc
files[] = includes/MediaYouTubeBrowser.inc
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.0-rc4+9-dev"
-core = "7.x"
-project = "media_youtube"
-datestamp = "1432234209"
-
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_bean.features.inc b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_bean.features.inc
index 53c22c4c..189309e8 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_bean.features.inc
+++ b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_bean.features.inc
@@ -9,7 +9,15 @@
*/
function uuid_bean_features_export_options() {
$options = array();
- $types = variable_get('uuid_features_entity_bean', FALSE);
+
+ // Check what bean types are enabled for uuid features export.
+ $types = array();
+ $entity_info = entity_get_info('bean');
+ foreach ($entity_info['bundles'] as $key => $value) {
+ if (variable_get("uuid_features_entity_bean_${key}", FALSE)) {
+ $types[$key] = $key;
+ }
+ }
if (module_exists("bean_uuid") && !empty($types)) {
$query = db_select('bean', 'n');
$query->fields('n', array('bid', 'delta', 'type', 'uuid'))
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_file_entity.features.inc b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_file_entity.features.inc
index b1b8f4c2..a26500d6 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_file_entity.features.inc
+++ b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_file_entity.features.inc
@@ -80,6 +80,10 @@ function uuid_file_entity_features_export_render($module, $data) {
$export_var = 'uuid_features_file_url';
break;
+ case 'packaged':
+ $export_var = 'uuid_features_packaged_file_path';
+ break;
+
default:
case 'inline':
$export_var = 'uuid_features_file_data';
@@ -205,7 +209,7 @@ function uuid_file_entity_features_rebuild_files($files, $module, $max_nesting =
drupal_alter('uuid_file_entity_features_rebuild', $file, $module);
// Already calls file_save().
- _uuid_features_file_field_import_file($file, 'file');
+ _uuid_features_file_field_import_file($file, $module);
}
catch (Exception $e) {
$second_run_files[] = $data;
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_node.features.inc b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_node.features.inc
index 61d5928e..ac18131c 100755
--- a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_node.features.inc
+++ b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_node.features.inc
@@ -11,7 +11,13 @@ function uuid_node_features_export_options() {
$options = array();
// Check what content types are enabled for uuid features export.
- $enabled_types = variable_get('uuid_features_entity_node', FALSE);
+ $enabled_types = array();
+ $entity_info = entity_get_info('node');
+ foreach ($entity_info['bundles'] as $key => $value) {
+ if (variable_get("uuid_features_entity_node_${key}", FALSE)) {
+ $enabled_types[$key] = $key;
+ }
+ }
if (!empty($enabled_types)) {
$types = node_type_get_names();
$query = db_select('node', 'n');
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_term.features.inc b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_term.features.inc
index 185fb3a0..486b4a97 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_term.features.inc
+++ b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_term.features.inc
@@ -9,25 +9,28 @@
*/
function uuid_term_features_export_options() {
$options = array();
- // Could just leave this empty.
- $vocabs = variable_get('uuid_features_entity_taxonomy_term', array_fill_keys(array_keys(taxonomy_vocabulary_get_names()), 0));
- // Only include vocabs that user has selected (ie. set a non zero value).
- $vocabs = array_filter($vocabs);
- if (empty($vocabs)) {
- return $options;
- }
- $query = db_select('taxonomy_term_data', 't');
- $query->innerJoin('taxonomy_vocabulary', 'v', 't.vid = v.vid');
- $query->condition('v.machine_name', array_keys($vocabs))
- ->fields('t', array('tid', 'name', 'uuid'))
- ->addField('v', 'name', 'vname');
- $query->orderBy('v.name', 'ASC');
- $query->orderBy('t.name', 'ASC');
- $results = $query->execute()->fetchAll();
-
- foreach ($results as $term) {
- $options[$term->uuid] = $term->vname . ' - ' . $term->name;
+ // Check what vocabularies are enabled for uuid features export.
+ $vocabs = array();
+ $entity_info = entity_get_info('taxonomy_term');
+ foreach ($entity_info['bundles'] as $key => $value) {
+ if (variable_get("uuid_features_entity_taxonomy_term_${key}", FALSE)) {
+ $vocabs[$key] = $key;
+ }
+ }
+ if (!empty($vocabs)) {
+ $query = db_select('taxonomy_term_data', 't');
+ $query->innerJoin('taxonomy_vocabulary', 'v', 't.vid = v.vid');
+ $query->condition('v.machine_name', array_keys($vocabs))
+ ->fields('t', array('tid', 'name', 'uuid'))
+ ->addField('v', 'name', 'vname');
+ $query->orderBy('v.name', 'ASC');
+ $query->orderBy('t.name', 'ASC');
+ $results = $query->execute()->fetchAll();
+
+ foreach ($results as $term) {
+ $options[$term->uuid] = $term->vname . ' - ' . $term->name;
+ }
}
drupal_alter('uuid_term_features_export_options', $options);
@@ -143,12 +146,19 @@ function uuid_term_features_export_render($module, $data) {
unset($export->tid);
// No need to export the rdf mapping.
unset($export->rdf_mapping);
- uuid_features_file_field_export($export, 'taxonomy_term');
+ $files = uuid_features_file_field_export($export, 'taxonomy_term');
$entity_type = 'taxonomy_term';
drupal_alter('uuid_entity_features_export_render', $entity_type, $export, $first_term, $module);
- $code[] = ' $terms[] = ' . features_var_export($export, ' ') . ';';
+ $code[] = ' $terms[] = ' . features_var_export(get_object_vars($export), ' ') . ';';
+
+ // Add packaged files, if any.
+ if (!empty($files)) {
+ foreach ($files as $filename => $src_path) {
+ $return[$filename] = $src_path;
+ }
+ }
}
if (!empty($translatables)) {
@@ -156,7 +166,10 @@ function uuid_term_features_export_render($module, $data) {
}
$code[] = ' return $terms;';
$code = implode("\n", $code);
- return array('uuid_features_default_terms' => $code);
+
+ $return['uuid_features_default_terms'] = $code;
+
+ return $return;
}
/**
@@ -206,7 +219,7 @@ function uuid_term_features_rebuild($module) {
drupal_alter('uuid_entity_features_rebuild', $entity_type, $term, $data, $module);
- uuid_features_file_field_import($term, 'taxonomy_term');
+ uuid_features_file_field_import($term, 'taxonomy_term', $module);
entity_uuid_save('taxonomy_term', $term);
}
}
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info
index 5b545139..f76b1acf 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info
+++ b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info
@@ -8,9 +8,9 @@ package = Features
configure = admin/structure/features/uuid_features
-; Information added by Drupal.org packaging script on 2015-04-16
-version = "7.x-1.0-alpha4+60-dev"
+; Information added by Drupal.org packaging script on 2015-05-31
+version = "7.x-1.0-alpha4+64-dev"
core = "7.x"
project = "uuid_features"
-datestamp = "1429166585"
+datestamp = "1433064182"
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.install b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.install
index 399e3a21..abe39d4a 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.install
+++ b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.install
@@ -16,3 +16,23 @@ function uuid_features_enable() {
->condition('type', 'module')
->execute();
}
+
+/**
+ * Convert uuid_features_(entity|file)_* as entity type specific.
+ */
+function uuid_features_update_7000() {
+ $entity_info = entity_get_info();
+ foreach ($entity_info as $type => $info) {
+ if (isset($info['uuid features']) && $info['uuid features']) {
+ foreach (variable_get('uuid_features_entity_' . $type, array()) as $key => $value) {
+ variable_set('uuid_features_entity_' . $type . '_' . $key, $value);
+ }
+ variable_del('uuid_features_entity_' . $type);
+
+ foreach (variable_get('uuid_features_file_' . $type, array()) as $key => $value) {
+ variable_set('uuid_features_file_' . $type . '_' . $key, $value);
+ }
+ variable_del('uuid_features_file_' . $type);
+ }
+ }
+}
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module
index 6ac96d8c..02a2cf90 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module
+++ b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module
@@ -63,7 +63,7 @@ function uuid_features_entity_info_alter(&$entity_info) {
'fieldable_panels_pane',
'commerce_product',
'field_collection_item',
- 'paragraphs',
+ 'paragraphs_item',
);
if (module_exists('file_entity')) {
$entity_types[] = 'file';
@@ -320,25 +320,31 @@ function uuid_features_settings($form, &$form_state) {
$entity_info = entity_get_info();
foreach ($entity_info as $type => $info) {
- foreach ($info['bundles'] as $bundle => $bundle_info) {
- if (isset($bundle_info['label'])) {
- $bundles[$type][$bundle] = $bundle_info['label'];
- }
+ if (!isset($info['uuid features']) || !$info['uuid features']) {
+ unset($entity_info[$type]);
}
- if (isset($info['uuid features']) && $info['uuid features'] === TRUE) {
- $form['entity']['uuid_features_entity_' . $type] = array(
- '#type' => 'checkboxes',
- '#title' => t('Exportable @label bundles', array('@label' => $info['label'])),
- '#default_value' => variable_get('uuid_features_entity_' . $type, array()),
- '#options' => isset($bundles[$type]) ? $bundles[$type] : array(),
- );
- $form['file']['uuid_features_file_' . $type] = array(
- '#type' => 'checkboxes',
- '#title' => t('Files exported for @label bundles', array('@label' => $info['label'])),
- '#default_value' => variable_get('uuid_features_file_' . $type, array()),
- '#options' => isset($bundles[$type]) ? $bundles[$type] : array(),
- );
+ }
+ foreach ($entity_info as $type => $info) {
+ $options = array();
+ $entities = array();
+ $files = array();
+ foreach ($info['bundles'] as $key => $value) {
+ $options[$key] = $value['label'];
+ $entities[$key] = variable_get("uuid_features_entity_${type}_${key}", FALSE);
+ $files[$key] = variable_get("uuid_features_file_${type}_${key}", FALSE);
}
+ $form['entity']["uuid_features_entity_${type}"] = array(
+ '#type' => 'checkboxes',
+ '#title' => t('Exportable @label bundles', array('@label' => $info['label'])),
+ '#default_value' => $entities,
+ '#options' => $options,
+ );
+ $form['file']["uuid_features_file_${type}"] = array(
+ '#type' => 'checkboxes',
+ '#title' => t('Files exported for @label bundles', array('@label' => $info['label'])),
+ '#default_value' => $files,
+ '#options' => $options,
+ );
}
$form['file']['uuid_features_file_mode'] = array(
@@ -410,9 +416,25 @@ function uuid_features_settings($form, &$form_state) {
'#default_value' => variable_get('uuid_features_vocabulary_terms', FALSE),
);
+ $form['#submit'][] = 'uuid_features_settings_submit';
+
return system_settings_form($form);
}
+/**
+ * Submit function for uuid_features_settings().
+ */
+function uuid_features_settings_submit($form, &$form_state) {
+ foreach ($form_state['values'] as $key => $value) {
+ if (preg_match('/^uuid_features_(entity|file)_/', $key) && is_array($value)) {
+ foreach ($value as $type => $state) {
+ variable_set("${key}_${type}", $state);
+ }
+ unset($form_state['values'][$key]);
+ }
+ }
+}
+
/**
* Handle exporting file fields.
*/
@@ -421,9 +443,13 @@ function uuid_features_file_field_export(&$export, $entity_type) {
$fields = field_info_instances($entity_type, $export_bundle);
$supported_fields = array_map('trim', explode(',', variable_get('uuid_features_file_supported_fields', 'file, image')));
- $bundles = variable_get('uuid_features_file_' . $entity_type);
- if ($bundles == '') {
- $bundles = array();
+ // Check what entity types are enabled for uuid features file export.
+ $bundles = array();
+ $entity_info = entity_get_info($entity_type);
+ foreach ($entity_info['bundles'] as $key => $value) {
+ if (variable_get("uuid_features_file_${entity_type}_${key}", FALSE)) {
+ $bundles[$key] = $key;
+ }
}
if (!in_array($export_bundle, $bundles)) {
foreach ($fields as $field_instance) {
@@ -576,7 +602,7 @@ function uuid_features_file_export($file, $export_mode) {
}
elseif ($export_mode == 'packaged') {
$assets_path = variable_get('uuid_features_packaged_file_assets_path', 'assets');
- $export_data = $assets_path . '/' . $file->filename;
+ $export_data = $assets_path . '/' . drupal_basename($file->uri);
}
// Default is 'inline' export mode.
else {
@@ -643,12 +669,19 @@ function uuid_features_file_field_import(&$import, $entity_type, $module = NULL)
function _uuid_features_file_field_import_file(&$file, $module = NULL) {
// This is here for historical reasons to support older exports. It can be
// removed in the next major version.
- $file->uri = strtr($file->uri, array('#FILES_DIRECTORY_PATH#' => 'public:/'));
+ if (isset($file->uri)) {
+ $file->uri = strtr($file->uri, array('#FILES_DIRECTORY_PATH#' => 'public:/'));
+ }
+ // The file is referenced but not defined because it's already
+ // contained in a file_entity include.
+ if (!isset($file->uri) && module_exists('file_entity')) {
+ return FALSE;
+ }
// The file is already in the right location AND either the
// uuid_features_file_path is not set or the uuid_features_file_path and
// filepath contain the same file.
- if (is_file($file->uri) &&
+ elseif (isset($file->uri) && isset($file->uri) && is_file($file->uri) &&
(
(!isset($file->uuid_features_file_path) || !is_file($file->uuid_features_file_path)) ||
(
diff --git a/profiles/wcm_base/modules/contrib/workbench/workbench.info b/profiles/wcm_base/modules/contrib/workbench/workbench.info
index b19c2585..d7cbf84f 100644
--- a/profiles/wcm_base/modules/contrib/workbench/workbench.info
+++ b/profiles/wcm_base/modules/contrib/workbench/workbench.info
@@ -4,11 +4,3 @@ package = Workbench
core = 7.x
configure = admin/config/workbench/settings
dependencies[] = views
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-1.2"
-core = "7.x"
-project = "workbench"
-datestamp = "1432234166"
-
diff --git a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
index a9ca3690..9eed11b0 100644
--- a/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
+++ b/profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info
@@ -4,11 +4,3 @@ package = Workbench
core = 7.x
dependencies[] = workbench
dependencies[] = media
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-2.1"
-core = "7.x"
-project = "workbench_media"
-datestamp = "1432234167"
-
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
index 2786c6f2..0f9e0139 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info
@@ -3,11 +3,3 @@ description = Test module for Workbench Moderation.
package = Workbench
core = 7.x
hidden = TRUE
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-1.4+6-dev"
-core = "7.x"
-project = "workbench_moderation"
-datestamp = "1432234168"
-
diff --git a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
index 8d7b746b..3f9939f1 100644
--- a/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
+++ b/profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info
@@ -16,11 +16,3 @@ files[] = workbench_moderation.migrate.inc
files[] = tests/external_node_update.test
files[] = tests/workbench_moderation.test
files[] = tests/workbench_moderation.files.test
-
-
-; Information added by drush on 2015-05-21
-version = "7.x-1.4+6-dev"
-core = "7.x"
-project = "workbench_moderation"
-datestamp = "1432234168"
-
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/epiceditor.js b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/epiceditor.js
index 4e561e79..3f2c43dc 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/epiceditor.js
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/epiceditor.js
@@ -56,8 +56,8 @@ Drupal.wysiwyg.editor.detach.epiceditor = function (context, params, trigger) {
$target.show();
$('#' + $target.attr('id') + '-epiceditor').remove();
});
+ $target.removeData('epiceditor');
}
- $target.removeData('epiceditor');
});
};
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/tinymce-2.js b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/tinymce-2.js
index 61a60ade..d63b6927 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/tinymce-2.js
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/tinymce-2.js
@@ -45,7 +45,7 @@ Drupal.wysiwyg.editor.attach.tinymce = function(context, params, settings) {
// it prior to attaching the editor. This is done on the client-side instead
// of the server-side, as Wysiwyg has no way to figure out where content is
// stored, and the class only affects editing.
- $field = $('#' + params.field);
+ var $field = $('#' + params.field);
$field.val($field.val().replace(/(<.+?\s+class=['"][\w\s]*?)\bmceItem\b([\w\s]*?['"].*?>)/ig, '$1$2'));
// Attach editor.
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/tinymce-3.js b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/tinymce-3.js
index 53d9bede..e1ec9670 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/tinymce-3.js
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/tinymce-3.js
@@ -71,7 +71,7 @@ Drupal.wysiwyg.editor.attach.tinymce = function(context, params, settings) {
// it prior to attaching the editor. This is done on the client-side instead
// of the server-side, as Wysiwyg has no way to figure out where content is
// stored, and the class only affects editing.
- $field = $('#' + params.field);
+ var $field = $('#' + params.field);
$field.val($field.val().replace(/(<.+?\s+class=['"][\w\s]*?)\bmceItem\b([\w\s]*?['"].*?>)/ig, '$1$2'));
// Attach editor.
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig-56.js b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig-56.js
index 3fc2fe57..5916a99b 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig-56.js
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig-56.js
@@ -72,7 +72,7 @@ Drupal.wysiwyg.editor.attach.whizzywig = function(context, params, settings) {
wysiwygWhizzywig.currentField = params.field;
wysiwygWhizzywig.fields[wysiwygWhizzywig.currentField] = '';
// Whizzywig needs to have the width set 'inline'.
- $field = $('#' + params.field);
+ var $field = $('#' + params.field);
var originalValues = Drupal.wysiwyg.instances[params.field];
originalValues.originalStyle = $field.attr('style');
$field.css('width', $field.width() + 'px');
@@ -142,12 +142,13 @@ Drupal.wysiwyg.editor.instance.whizzywig = {
},
getContent: function () {
+ var $field = $('#' + this.field);
// Whizzywig's tidyH() expects a document node. Clone the editing iframe's
// document so tidyH() won't mess with it if this gets called while editing.
var clone = $($('#whizzy' + this.field).contents()[0].documentElement).clone()[0].ownerDocument;
// Whizzywig shows the original textarea in source mode so update the body.
if ($field.css('display') == 'block') {
- clone.body.innerHTML = $('#' + this.field).val();
+ clone.body.innerHTML = $field.val();
}
return tidyH(clone);
}
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig-60.js b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig-60.js
index bbc6e649..dfe32e36 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig-60.js
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig-60.js
@@ -21,7 +21,7 @@ Drupal.wysiwyg.editor.attach.whizzywig = function(context, params, settings) {
window.buttonPath = 'textbuttons';
}
// Whizzywig needs to have the width set 'inline'.
- $field = $('#' + params.field);
+ var $field = $('#' + params.field);
var originalValues = Drupal.wysiwyg.instances[params.field];
originalValues.originalStyle = $field.attr('style');
$field.css('width', $field.width() + 'px');
@@ -94,12 +94,13 @@ Drupal.wysiwyg.editor.instance.whizzywig = {
},
getContent: function () {
+ var $field = $('#' + this.field);
// Whizzywig's tidyH() expects a document node. Clone the editing iframe's
// document so tidyH() won't mess with it if this gets called while editing.
var clone = $($('#whizzy' + this.field).contents()[0].documentElement).clone()[0].ownerDocument;
// Whizzywig shows the original textarea in source mode so update the body.
if ($field.css('display') == 'block') {
- clone.body.innerHTML = $('#' + this.field).val();
+ clone.body.innerHTML = $field.val();
}
return tidyH(clone);
}
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig.js b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig.js
index e89ac5f0..5cce0b2f 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig.js
+++ b/profiles/wcm_base/modules/contrib/wysiwyg/editors/js/whizzywig.js
@@ -63,7 +63,7 @@ Drupal.wysiwyg.editor.attach.whizzywig = function(context, params, settings) {
wysiwygWhizzywig.currentField = params.field;
wysiwygWhizzywig.fields[wysiwygWhizzywig.currentField] = '';
// Whizzywig needs to have the width set 'inline'.
- $field = $('#' + params.field);
+ var $field = $('#' + params.field);
var originalValues = Drupal.wysiwyg.instances[params.field];
originalValues.originalStyle = $field.attr('style');
$field.css('width', $field.width() + 'px');
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info b/profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info
index f9e68bc2..c3ba476d 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/tests/wysiwyg_test.info
+++ b/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 2014-10-18
-version = "7.x-2.2+54-dev"
+; Information added by Drupal.org packaging script on 2015-05-26
+version = "7.x-2.2+57-dev"
core = "7.x"
project = "wysiwyg"
-datestamp = "1413622431"
+datestamp = "1432677186"
diff --git a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info b/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info
index 0c65313b..5de2bc5e 100644
--- a/profiles/wcm_base/modules/contrib/wysiwyg/wysiwyg.info
+++ b/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 2014-10-18
-version = "7.x-2.2+54-dev"
+; Information added by Drupal.org packaging script on 2015-05-26
+version = "7.x-2.2+57-dev"
core = "7.x"
project = "wysiwyg"
-datestamp = "1413622431"
+datestamp = "1432677186"
diff --git a/profiles/wcm_base/modules/custom/ocio_admin_menu/ocio_admin_menu.module b/profiles/wcm_base/modules/custom/ocio_admin_menu/ocio_admin_menu.module
index 65233da6..acadb416 100644
--- a/profiles/wcm_base/modules/custom/ocio_admin_menu/ocio_admin_menu.module
+++ b/profiles/wcm_base/modules/custom/ocio_admin_menu/ocio_admin_menu.module
@@ -81,6 +81,13 @@ function ocio_admin_menu_navbar_alter(&$items) {
// Change the label to view an account from view profile to view account.
$items['user']['tray']['user_links']['#links']['account']['title'] = t('View account');
$items['shortcuts']['#access'] = user_access('access ocio advanced admin menu');
+
+ // Set target oon navbar links to match original link target
+ foreach ($items['administration']['tray']['navbar_administration']['administration_menu'] as &$link){
+ if (isset($link['#original_link']['options']['attributes']['target'])) {
+ $link['#localized_options']['attributes']['target'] = $link['#original_link']['options']['attributes']['target'];
+ }
+ }
}
/**
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_base.inc b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_base.inc
index 8bf9fd04..af522396 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_base.inc
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.field_base.inc
@@ -17,14 +17,6 @@ function ocio_featured_slideshow_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_featured_summary',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.inc b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.inc
index 03cf3ba9..f728b9be 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.inc
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.features.inc
@@ -26,6 +26,30 @@ function ocio_featured_slideshow_views_api($module = NULL, $api = NULL) {
return array("api" => "3.0");
}
+/**
+ * Implements hook_image_default_styles().
+ */
+function ocio_featured_slideshow_image_default_styles() {
+ $styles = array();
+
+ // Exported image style: ocio_slideshow_image.
+ $styles['ocio_slideshow_image'] = array(
+ 'label' => 'Slideshow Image',
+ 'effects' => array(
+ 1 => array(
+ 'name' => 'image_scale_and_crop',
+ 'data' => array(
+ 'width' => 1800,
+ 'height' => 500,
+ ),
+ 'weight' => 1,
+ ),
+ ),
+ );
+
+ return $styles;
+}
+
/**
* Implements hook_node_info().
*/
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.info b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.info
index d976ebb4..0ac45ba4 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.info
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.info
@@ -29,6 +29,7 @@ features[field_instance][] = node-featured_slide-field_basic_image_image
features[field_instance][] = node-featured_slide-field_featured_summary
features[field_instance][] = node-featured_slide-field_ocio_link
features[flexslider_optionset][] = ocio_flexslider
+features[image][] = ocio_slideshow_image
features[node][] = featured_slide
features[variable][] = date_popup_authored_format_featured_slide
features[variable][] = field_bundle_settings_node__featured_slide
@@ -39,4 +40,3 @@ features[variable][] = node_preview_featured_slide
features[variable][] = node_submitted_featured_slide
features[variable][] = workbench_moderation_default_state_featured_slide
features[views_view][] = featured_slideshow
-mtime = 1423013856
diff --git a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.views_default.inc b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.views_default.inc
index a6aaa270..ac598eda 100644
--- a/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.views_default.inc
+++ b/profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.views_default.inc
@@ -111,6 +111,54 @@ function ocio_featured_slideshow_views_default_views() {
$handler->display->display_options['defaults']['title'] = FALSE;
$handler->display->display_options['defaults']['access'] = FALSE;
$handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['defaults']['fields'] = FALSE;
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['exclude'] = TRUE;
+ $handler->display->display_options['fields']['title']['alter']['text'] = '<span>';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['title']['link_to_node'] = FALSE;
+ /* Field: Content: Summary */
+ $handler->display->display_options['fields']['field_featured_summary']['id'] = 'field_featured_summary';
+ $handler->display->display_options['fields']['field_featured_summary']['table'] = 'field_data_field_featured_summary';
+ $handler->display->display_options['fields']['field_featured_summary']['field'] = 'field_featured_summary';
+ $handler->display->display_options['fields']['field_featured_summary']['label'] = '';
+ $handler->display->display_options['fields']['field_featured_summary']['exclude'] = TRUE;
+ $handler->display->display_options['fields']['field_featured_summary']['element_label_colon'] = FALSE;
+ /* Field: Content: Link */
+ $handler->display->display_options['fields']['field_ocio_link']['id'] = 'field_ocio_link';
+ $handler->display->display_options['fields']['field_ocio_link']['table'] = 'field_data_field_ocio_link';
+ $handler->display->display_options['fields']['field_ocio_link']['field'] = 'field_ocio_link';
+ $handler->display->display_options['fields']['field_ocio_link']['label'] = '';
+ $handler->display->display_options['fields']['field_ocio_link']['exclude'] = TRUE;
+ $handler->display->display_options['fields']['field_ocio_link']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['field_ocio_link']['click_sort_column'] = 'url';
+ $handler->display->display_options['fields']['field_ocio_link']['type'] = 'link_plain';
+ /* Field: Field: Image */
+ $handler->display->display_options['fields']['field_basic_image_image']['id'] = 'field_basic_image_image';
+ $handler->display->display_options['fields']['field_basic_image_image']['table'] = 'field_data_field_basic_image_image';
+ $handler->display->display_options['fields']['field_basic_image_image']['field'] = 'field_basic_image_image';
+ $handler->display->display_options['fields']['field_basic_image_image']['label'] = '';
+ $handler->display->display_options['fields']['field_basic_image_image']['alter']['alter_text'] = TRUE;
+ $handler->display->display_options['fields']['field_basic_image_image']['alter']['text'] = '[field_basic_image_image]
+<span class="flex-meta">
+<span class="flex-title">[title]</span>
+<span class="flex-summary">[field_featured_summary]</span>
+</span>
+';
+ $handler->display->display_options['fields']['field_basic_image_image']['alter']['make_link'] = TRUE;
+ $handler->display->display_options['fields']['field_basic_image_image']['alter']['path'] = '[field_ocio_link]';
+ $handler->display->display_options['fields']['field_basic_image_image']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['field_basic_image_image']['click_sort_column'] = 'fid';
+ $handler->display->display_options['fields']['field_basic_image_image']['settings'] = array(
+ 'image_style' => 'ocio_slideshow_image',
+ 'image_link' => '',
+ );
/* Display: Slideshow Workbench Tab Page */
$handler = $view->new_display('page', 'Slideshow Workbench Tab Page', 'page_1');
diff --git a/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.features.field_base.inc b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.features.field_base.inc
index 903ab94b..382a3511 100644
--- a/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.features.field_base.inc
+++ b/profiles/wcm_base/modules/custom/ocio_field_bases/ocio_field_bases.features.field_base.inc
@@ -17,14 +17,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_answer',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -44,7 +36,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_date',
- 'foreign keys' => array(),
'indexes' => array(),
'locked' => 0,
'module' => 'date',
@@ -74,7 +65,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_display_in_directory',
- 'foreign keys' => array(),
'indexes' => array(
'value' => array(
0 => 'value',
@@ -100,14 +90,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_file_description',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -127,14 +109,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_file_image_alt_text',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -156,14 +130,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_file_image_title_text',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -185,14 +151,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_first_name',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -214,14 +172,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_job_title',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -243,14 +193,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_last_name',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -272,14 +214,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_ocio_body',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -299,7 +233,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_ocio_link',
- 'foreign keys' => array(),
'indexes' => array(),
'locked' => 0,
'module' => 'link',
@@ -329,14 +262,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_phone',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -358,14 +283,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_room_and_building',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -387,14 +304,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_street_address',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -416,14 +325,6 @@ function ocio_field_bases_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_user_photo',
- 'foreign keys' => array(
- 'fid' => array(
- 'columns' => array(
- 'fid' => 'fid',
- ),
- 'table' => 'file_managed',
- ),
- ),
'indexes' => array(
'fid' => array(
0 => 'fid',
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 cb955ca5..d86da6c7 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
@@ -27,4 +27,3 @@ features[field_base][] = field_room_and_building
features[field_base][] = field_street_address
features[field_base][] = field_user_photo
features_exclude[taxonomy][ocio_tags] = ocio_tags
-mtime = 1421952408
diff --git a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc
index 03cd381b..b5d47a90 100644
--- a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc
+++ b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.features.inc
@@ -24,24 +24,15 @@ function ocio_image_styles_image_default_styles() {
// Exported image style: image_style_full.
$styles['image_style_full'] = array(
- 'name' => 'image_style_full',
'label' => 'Image Style Full',
'effects' => array(),
);
// Exported image style: image_style_large.
$styles['image_style_large'] = array(
- 'name' => 'image_style_large',
'label' => 'Image Style Large',
'effects' => array(
1 => array(
- 'label' => 'Scale',
- 'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
- 'effect callback' => 'image_scale_effect',
- 'dimensions callback' => 'image_scale_dimensions',
- 'form callback' => 'image_scale_form',
- 'summary theme' => 'image_scale_summary',
- 'module' => 'image',
'name' => 'image_scale',
'data' => array(
'width' => 600,
@@ -55,17 +46,9 @@ function ocio_image_styles_image_default_styles() {
// Exported image style: image_style_small.
$styles['image_style_small'] = array(
- 'name' => 'image_style_small',
'label' => 'Image Style Small',
'effects' => array(
4 => array(
- 'label' => 'Scale',
- 'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
- 'effect callback' => 'image_scale_effect',
- 'dimensions callback' => 'image_scale_dimensions',
- 'form callback' => 'image_scale_form',
- 'summary theme' => 'image_scale_summary',
- 'module' => 'image',
'name' => 'image_scale',
'data' => array(
'width' => 400,
@@ -79,17 +62,9 @@ function ocio_image_styles_image_default_styles() {
// Exported image style: teaser_image.
$styles['teaser_image'] = array(
- 'name' => 'teaser_image',
'label' => 'Teaser Image',
'effects' => array(
4 => array(
- 'label' => 'Scale',
- 'help' => 'Scaling will maintain the aspect-ratio of the original image. If only a single dimension is specified, the other dimension will be calculated.',
- 'effect callback' => 'image_scale_effect',
- 'dimensions callback' => 'image_scale_dimensions',
- 'form callback' => 'image_scale_form',
- 'summary theme' => 'image_scale_summary',
- 'module' => 'image',
'name' => 'image_scale',
'data' => array(
'width' => 220,
@@ -101,54 +76,5 @@ function ocio_image_styles_image_default_styles() {
),
);
- // Exported image style: user_picture.
- $styles['user_picture'] = array(
- 'name' => 'user_picture',
- 'label' => 'User Picture',
- 'effects' => array(
- 4 => array(
- 'label' => 'Manual Crop: Crop and scale',
- 'help' => 'Crop and scale a user-selected area, respecting the ratio of the destination width and height.',
- 'effect callback' => 'manualcrop_crop_and_scale_effect',
- 'form callback' => 'manualcrop_crop_and_scale_form',
- 'summary theme' => 'manualcrop_crop_and_scale_summary',
- 'module' => 'manualcrop',
- 'name' => 'manualcrop_crop_and_scale',
- 'data' => array(
- 'width' => 200,
- 'height' => 286,
- 'upscale' => 0,
- 'respectminimum' => 1,
- 'onlyscaleifcrop' => 0,
- 'style_name' => 'user_picture',
- ),
- 'weight' => 1,
- ),
- ),
- );
-
- // Exported image style: user_picture_thumbnail.
- $styles['user_picture_thumbnail'] = array(
- 'name' => 'user_picture_thumbnail',
- 'label' => 'User Picture Thumbnail',
- 'effects' => array(
- 3 => array(
- 'label' => 'Scale and crop',
- 'help' => 'Scale and crop will maintain the aspect-ratio of the original image, then crop the larger dimension. This is most useful for creating perfectly square thumbnails without stretching the image.',
- 'effect callback' => 'image_scale_and_crop_effect',
- 'dimensions callback' => 'image_resize_dimensions',
- 'form callback' => 'image_resize_form',
- 'summary theme' => 'image_resize_summary',
- 'module' => 'image',
- 'name' => 'image_scale_and_crop',
- 'data' => array(
- 'width' => 120,
- 'height' => 172,
- ),
- 'weight' => 2,
- ),
- ),
- );
-
return $styles;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info
index a3f2ea6a..57b6f64d 100644
--- a/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info
+++ b/profiles/wcm_base/modules/custom/ocio_image_styles/ocio_image_styles.info
@@ -1,4 +1,5 @@
name = OCIO Image Styles
+description = Image styles that are shared with various content types. Does not include slideshow, tiles, or user photos.
core = 7.x
package = OCIO Features
version = 7.x-1.0
@@ -18,6 +19,3 @@ features[image][] = image_style_full
features[image][] = image_style_large
features[image][] = image_style_small
features[image][] = teaser_image
-features[image][] = user_picture
-features[image][] = user_picture_thumbnail
-mtime = 1423001802
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/README b/profiles/wcm_base/modules/custom/ocio_landing_page/README
new file mode 100644
index 00000000..e69de29b
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.defaultconfig.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.defaultconfig.inc
new file mode 100644
index 00000000..af62487b
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.defaultconfig.inc
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @file
+ * ocio_landing_page.features.defaultconfig.inc
+ */
+
+/**
+ * Implements hook_defaultconfig_features().
+ */
+function ocio_landing_page_defaultconfig_features() {
+ return array(
+ 'ocio_landing_page' => array(
+ 'strongarm' => 'strongarm',
+ ),
+ );
+}
+
+/**
+ * Implements hook_defaultconfig_strongarm().
+ */
+function ocio_landing_page_defaultconfig_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 = 'additional_settings__active_tab_ocio_landing_page';
+ $strongarm->value = 'edit-submission';
+ $export['additional_settings__active_tab_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'date_popup_authored_enabled_ocio_landing_page';
+ $strongarm->value = 0;
+ $export['date_popup_authored_enabled_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'date_popup_authored_format_ocio_landing_page';
+ $strongarm->value = 'm/d/Y - H:i';
+ $export['date_popup_authored_format_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'date_popup_authored_year_range_ocio_landing_page';
+ $strongarm->value = '3';
+ $export['date_popup_authored_year_range_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'panelizer_defaults_node_ocio_landing_page';
+ $strongarm->value = array(
+ 'status' => 1,
+ 'view modes' => array(
+ 'page_manager' => array(
+ 'status' => 1,
+ 'default' => 1,
+ 'choice' => 1,
+ ),
+ 'default' => array(
+ 'status' => 0,
+ 'default' => 0,
+ 'choice' => 0,
+ ),
+ 'teaser' => array(
+ 'status' => 0,
+ 'default' => 0,
+ 'choice' => 0,
+ ),
+ 'featured' => array(
+ 'status' => 0,
+ 'default' => 0,
+ 'choice' => 0,
+ ),
+ ),
+ );
+ $export['panelizer_defaults_node_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'webform_node_ocio_landing_page';
+ $strongarm->value = 0;
+ $export['webform_node_ocio_landing_page'] = $strongarm;
+
+ return $export;
+}
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.inc
new file mode 100644
index 00000000..26ce4472
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.features.inc
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @file
+ * ocio_landing_page.features.inc
+ */
+
+/**
+ * Implements hook_ctools_plugin_api().
+ */
+function ocio_landing_page_ctools_plugin_api($module = NULL, $api = NULL) {
+ if ($module == "panelizer" && $api == "panelizer") {
+ return array("version" => "1");
+ }
+ if ($module == "strongarm" && $api == "strongarm") {
+ return array("version" => "1");
+ }
+}
+
+/**
+ * Implements hook_node_info().
+ */
+function ocio_landing_page_node_info() {
+ $items = array(
+ 'ocio_landing_page' => array(
+ 'name' => t('Landing Page'),
+ 'base' => 'node_content',
+ 'description' => t('Panelized Landing page content type to be used for section fronts and other special pages. '),
+ 'has_title' => '1',
+ 'title_label' => t('Title'),
+ 'help' => '',
+ ),
+ );
+ drupal_alter('node_info', $items);
+ return $items;
+}
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info
new file mode 100644
index 00000000..a91a4ee4
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.info
@@ -0,0 +1,31 @@
+name = OCIO Landing Page
+description = Panelized Landing page content type to be used for section fronts and other special pages.
+core = 7.x
+package = OCIO Features
+version = 7.x-1.0
+project = ocio_landing_page
+dependencies[] = ctools
+dependencies[] = defaultconfig
+dependencies[] = features
+dependencies[] = panelizer
+dependencies[] = strongarm
+features[ctools][] = panelizer:panelizer:1
+features[ctools][] = strongarm:strongarm:1
+features[features_api][] = api:2
+features[node][] = ocio_landing_page
+features[panelizer_defaults][] = node:ocio_landing_page:default
+features[variable][] = additional_settings__active_tab_ocio_landing_page
+features[variable][] = field_bundle_settings_node__ocio_landing_page
+features[variable][] = menu_options_ocio_landing_page
+features[variable][] = menu_parent_ocio_landing_page
+features[variable][] = node_options_ocio_landing_page
+features[variable][] = node_preview_ocio_landing_page
+features[variable][] = node_submitted_ocio_landing_page
+features[variable][] = panelizer_defaults_node_ocio_landing_page
+features[variable][] = panelizer_defaults_taxonomy_term_panopoly_categories
+features[variable][] = panelizer_defaults_user_user
+features[variable][] = panelizer_node:ocio_landing_page_allowed_layouts
+features[variable][] = panelizer_node:ocio_landing_page_allowed_layouts_default
+features[variable][] = panelizer_node:ocio_landing_page_allowed_types
+features[variable][] = panelizer_node:ocio_landing_page_allowed_types_default
+features[variable][] = panelizer_node:ocio_landing_page_default
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.module b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.module
new file mode 100644
index 00000000..2abe4e3e
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.module
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @file
+ * Code for the OCIO Landing Page feature.
+ */
+
+include_once 'ocio_landing_page.features.inc';
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.panelizer.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.panelizer.inc
new file mode 100644
index 00000000..808e6ead
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.panelizer.inc
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @file
+ * ocio_landing_page.panelizer.inc
+ */
+
+/**
+ * Implements hook_panelizer_defaults().
+ */
+function ocio_landing_page_panelizer_defaults() {
+ $export = array();
+
+ $panelizer = new stdClass();
+ $panelizer->disabled = FALSE; /* Edit this to true to make a default panelizer disabled initially */
+ $panelizer->api_version = 1;
+ $panelizer->name = 'node:ocio_landing_page:default';
+ $panelizer->title = 'Default';
+ $panelizer->panelizer_type = 'node';
+ $panelizer->panelizer_key = 'ocio_landing_page';
+ $panelizer->no_blocks = FALSE;
+ $panelizer->css_id = '';
+ $panelizer->css = '';
+ $panelizer->pipeline = 'standard';
+ $panelizer->contexts = array();
+ $panelizer->relationships = array();
+ $panelizer->access = array();
+ $panelizer->view_mode = 'page_manager';
+ $panelizer->css_class = '';
+ $panelizer->title_element = 'H2';
+ $panelizer->link_to_entity = TRUE;
+ $panelizer->extra = array();
+ $display = new panels_display();
+ $display->layout = 'flexible';
+ $display->layout_settings = array();
+ $display->panel_settings = array();
+ $display->cache = array();
+ $display->title = '%node:title';
+ $display->uuid = '5f1d4a97-2411-4294-b34a-c0b05050b5b8';
+ $display->content = array();
+ $display->panels = array();
+ $pane = new stdClass();
+ $pane->pid = 'new-f7df6737-5c6d-442e-aca2-5cac0c96df3e';
+ $pane->panel = 'center';
+ $pane->type = 'node_links';
+ $pane->subtype = 'node_links';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'override_title' => FALSE,
+ 'override_title_text' => '',
+ 'build_mode' => 'page_manager',
+ 'identifier' => '',
+ 'link' => TRUE,
+ 'context' => 'panelizer',
+ );
+ $pane->cache = array();
+ $pane->style = array();
+ $pane->css = array(
+ 'css_class' => 'link-wrapper',
+ );
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'f7df6737-5c6d-442e-aca2-5cac0c96df3e';
+ $display->content['new-f7df6737-5c6d-442e-aca2-5cac0c96df3e'] = $pane;
+ $display->panels['center'][0] = 'new-f7df6737-5c6d-442e-aca2-5cac0c96df3e';
+ $display->hide_title = PANELS_TITLE_FIXED;
+ $display->title_pane = 'new-f7df6737-5c6d-442e-aca2-5cac0c96df3e';
+ $panelizer->display = $display;
+ $export['node:ocio_landing_page:default'] = $panelizer;
+
+ return $export;
+}
diff --git a/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
new file mode 100644
index 00000000..01478992
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/ocio_landing_page/ocio_landing_page.strongarm.inc
@@ -0,0 +1,549 @@
+<?php
+/**
+ * @file
+ * ocio_landing_page.strongarm.inc
+ */
+
+/**
+ * Implements hook_strongarm().
+ */
+function ocio_landing_page_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 = 'additional_settings__active_tab_ocio_landing_page';
+ $strongarm->value = 'edit-custom-breadcrumbs';
+ $export['additional_settings__active_tab_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'field_bundle_settings_node__ocio_landing_page';
+ $strongarm->value = array(
+ 'view_modes' => array(),
+ 'extra_fields' => array(
+ 'form' => array(
+ 'title' => array(
+ 'weight' => '-5',
+ ),
+ 'path' => array(
+ 'weight' => '30',
+ ),
+ ),
+ 'display' => array(),
+ ),
+ );
+ $export['field_bundle_settings_node__ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'menu_options_ocio_landing_page';
+ $strongarm->value = array(
+ 0 => 'main-menu',
+ );
+ $export['menu_options_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'menu_parent_ocio_landing_page';
+ $strongarm->value = 'main-menu:0';
+ $export['menu_parent_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'node_options_ocio_landing_page';
+ $strongarm->value = array(
+ 0 => 'status',
+ );
+ $export['node_options_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'node_preview_ocio_landing_page';
+ $strongarm->value = '1';
+ $export['node_preview_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'node_submitted_ocio_landing_page';
+ $strongarm->value = 0;
+ $export['node_submitted_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'panelizer_defaults_node_ocio_landing_page';
+ $strongarm->value = array(
+ 'status' => 1,
+ 'view modes' => array(
+ 'page_manager' => array(
+ 'status' => 1,
+ 'default' => 1,
+ 'choice' => 1,
+ ),
+ 'default' => array(
+ 'status' => 0,
+ 'default' => 0,
+ 'choice' => 0,
+ ),
+ 'teaser' => array(
+ 'status' => 0,
+ 'default' => 0,
+ 'choice' => 0,
+ ),
+ 'featured' => array(
+ 'status' => 0,
+ 'default' => 0,
+ 'choice' => 0,
+ ),
+ ),
+ );
+ $export['panelizer_defaults_node_ocio_landing_page'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'panelizer_defaults_taxonomy_term_panopoly_categories';
+ $strongarm->value = array(
+ 'status' => 1,
+ 'view modes' => array(
+ 'page_manager' => array(
+ 'status' => 1,
+ 'default' => 1,
+ 'choice' => 0,
+ ),
+ 'default' => array(
+ 'status' => 1,
+ 'default' => 1,
+ 'choice' => 0,
+ ),
+ 'featured' => array(
+ 'status' => 1,
+ 'default' => 1,
+ 'choice' => 0,
+ ),
+ ),
+ );
+ $export['panelizer_defaults_taxonomy_term_panopoly_categories'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'panelizer_defaults_user_user';
+ $strongarm->value = array(
+ 'status' => 1,
+ 'view modes' => array(
+ 'page_manager' => array(
+ 'status' => 1,
+ 'default' => 1,
+ 'choice' => 0,
+ ),
+ 'default' => array(
+ 'status' => 1,
+ 'default' => 1,
+ 'choice' => 0,
+ ),
+ 'featured' => array(
+ 'status' => 1,
+ 'default' => 1,
+ 'choice' => 0,
+ ),
+ ),
+ );
+ $export['panelizer_defaults_user_user'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'panelizer_node:ocio_landing_page_allowed_layouts';
+ $strongarm->value = 'O:22:"panels_allowed_layouts":4:{s:9:"allow_new";b:1;s:11:"module_name";s:32:"panelizer_node:ocio_landing_page";s:23:"allowed_layout_settings";a:56:{s:15:"omega:ocio-full";b:0;s:16:"omega:ocio-front";b:0;s:18:"omega:ocio-default";b:0;s:10:"omega:hero";b:0;s:12:"omega:simple";b:0;s:16:"omega:off-canvas";b:0;s:12:"omega:divine";b:0;s:8:"flexible";b:0;s:14:"twocol_stacked";b:0;s:13:"twocol_bricks";b:0;s:6:"twocol";b:0;s:25:"threecol_33_34_33_stacked";b:0;s:17:"threecol_33_34_33";b:0;s:25:"threecol_25_50_25_stacked";b:0;s:17:"threecol_25_50_25";b:0;s:6:"onecol";b:0;s:6:"whelan";b:0;s:12:"webb_flipped";b:0;s:4:"webb";b:0;s:14:"taylor_flipped";b:0;s:6:"taylor";b:0;s:12:"sutro_double";b:0;s:5:"sutro";b:0;s:13:"selby_flipped";b:0;s:5:"selby";b:0;s:17:"sanderson_flipped";b:0;s:9:"sanderson";b:0;s:5:"rolph";b:0;s:4:"pond";b:0;s:6:"phelan";b:0;s:15:"moscone_flipped";b:0;s:7:"moscone";b:0;s:8:"mccoppin";b:0;s:15:"hewston_flipped";b:0;s:7:"hewston";b:0;s:6:"harris";b:0;s:5:"geary";b:0;s:12:"burr_flipped";b:0;s:4:"burr";b:0;s:22:"bryant_flipped_flipped";b:0;s:6:"bryant";b:0;s:5:"brown";b:0;s:15:"brenham_flipped";b:0;s:7:"brenham";b:0;s:6:"boxton";b:0;s:16:"bartlett_flipped";b:0;s:8:"bartlett";b:0;s:5:"naked";b:0;s:8:"mondrian";b:0;s:6:"grid-3";b:0;s:6:"grid-2";b:0;s:6:"golden";b:0;s:19:"ocio-omega-equalcol";b:1;s:19:"ocio-omega-threecol";b:1;s:25:"ocio-omega-twocol-flipped";b:1;s:17:"ocio-omega-twocol";b:1;}s:10:"form_state";N;}';
+ $export['panelizer_node:ocio_landing_page_allowed_layouts'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'panelizer_node:ocio_landing_page_allowed_layouts_default';
+ $strongarm->value = 0;
+ $export['panelizer_node:ocio_landing_page_allowed_layouts_default'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'panelizer_node:ocio_landing_page_allowed_types';
+ $strongarm->value = array(
+ 'page_breadcrumb-page_breadcrumb' => 'page_breadcrumb-page_breadcrumb',
+ 'page_title-page_title' => 'page_title-page_title',
+ 'node_body-node_body' => 'node_body-node_body',
+ 'node_title-node_title' => 'node_title-node_title',
+ 'vocabulary_terms-vocabulary_terms' => 0,
+ 'user_picture-user_picture' => 0,
+ 'user_profile-user_profile' => 0,
+ 'user_signature-user_signature' => 0,
+ 'term_description-term_description' => 0,
+ 'term_list-term_list' => 0,
+ 'search_form-search_form' => 0,
+ 'search_result-search_result' => 0,
+ 'page_actions-page_actions' => 0,
+ 'page_feed_icons-page_feed_icons' => 0,
+ 'page_help-page_help' => 0,
+ 'page_logo-page_logo' => 0,
+ 'page_messages-page_messages' => 0,
+ 'page_primary_links-page_primary_links' => 0,
+ 'page_secondary_links-page_secondary_links' => 0,
+ 'page_site_name-page_site_name' => 0,
+ 'page_slogan-page_slogan' => 0,
+ 'page_tabs-page_tabs' => 0,
+ 'node_form_author-node_form_author' => 0,
+ 'node_form_buttons-node_form_buttons' => 0,
+ 'node_form_language-node_form_language' => 0,
+ 'node_form_log-node_form_log' => 0,
+ 'node_form_menu-node_form_menu' => 0,
+ 'node_form_path-node_form_path' => 0,
+ 'node_form_publishing-node_form_publishing' => 0,
+ 'node_form_title-node_form_title' => 0,
+ 'node_attachments-node_attachments' => 0,
+ 'node_author-node_author' => 0,
+ 'node_content-node_content' => 0,
+ 'node_created-node_created' => 0,
+ 'node_links-node_links' => 0,
+ 'node_terms-node_terms' => 0,
+ 'node_type_desc-node_type_desc' => 0,
+ 'node_updated-node_updated' => 0,
+ 'node-node' => 0,
+ 'form-form' => 0,
+ 'file_content-file_content' => 0,
+ 'file_display-file_display' => 0,
+ 'content-content' => 0,
+ 'general_panes-general_panes' => 0,
+ 'general_widgets-general_widgets' => 0,
+ 'landing_pages-landing_pages' => 0,
+ 'menus-menus' => 0,
+ 'overridden_page_templates-overridden_page_templates' => 0,
+ 'panels_layouts-panels_layouts' => 0,
+ 'reusable_widgets-reusable_widgets' => 0,
+ 'taxonomy-taxonomy' => 0,
+ 'theme-theme' => 0,
+ 'users-users' => 0,
+ 'search_current-search_current' => 0,
+ 'search_box-search_box' => 0,
+ 'facet-facet' => 0,
+ 'pm_existing_pages-pm_existing_pages' => 0,
+ 'views_attachments-views_attachments' => 0,
+ 'views_empty-views_empty' => 0,
+ 'views_exposed-views_exposed' => 0,
+ 'views_feed-views_feed' => 0,
+ 'views_footer-views_footer' => 0,
+ 'views_header-views_header' => 0,
+ 'views_pager-views_pager' => 0,
+ 'views_row-views_row' => 0,
+ 'views_view-views_view' => 0,
+ 'dsc-dsc' => 0,
+ 'panelizer_form_default-panelizer_form_default' => 0,
+ 'token-node:source' => 'token-node:source',
+ 'token-node:log' => 'token-node:log',
+ 'token-node:content-type' => 'token-node:content-type',
+ 'token-node:menu-link' => 'token-node:menu-link',
+ 'token-node:nid' => 'token-node:nid',
+ 'token-node:vid' => 'token-node:vid',
+ 'token-node:title' => 'token-node:title',
+ 'token-node:body' => 'token-node:body',
+ 'token-node:summary' => 'token-node:summary',
+ 'token-node:language' => 'token-node:language',
+ 'token-node:url' => 'token-node:url',
+ 'token-node:edit-url' => 'token-node:edit-url',
+ 'token-node:created' => 'token-node:created',
+ 'token-node:changed' => 'token-node:changed',
+ 'token-node:author' => 'token-node:author',
+ 'token-node:uuid' => 'token-node:uuid',
+ 'token-node:vuuid' => 'token-node:vuuid',
+ 'token-node:original' => 'token-node:original',
+ 'token-node:field_ocio_body' => 'token-node:field_ocio_body',
+ 'token-node:field_tags' => 'token-node:field_tags',
+ 'token-content-type:name' => 'token-content-type:name',
+ 'token-content-type:machine-name' => 'token-content-type:machine-name',
+ 'token-content-type:description' => 'token-content-type:description',
+ 'token-content-type:node-count' => 'token-content-type:node-count',
+ 'token-content-type:edit-url' => 'token-content-type:edit-url',
+ 'token-term:edit-url' => 'token-term:edit-url',
+ 'token-term:parents' => 'token-term:parents',
+ 'token-term:root' => 'token-term:root',
+ 'token-term:tid' => 'token-term:tid',
+ 'token-term:name' => 'token-term:name',
+ 'token-term:description' => 'token-term:description',
+ 'token-term:node-count' => 'token-term:node-count',
+ 'token-term:url' => 'token-term:url',
+ 'token-term:vocabulary' => 'token-term:vocabulary',
+ 'token-term:parent' => 'token-term:parent',
+ 'token-term:uuid' => 'token-term:uuid',
+ 'token-term:original' => 'token-term:original',
+ 'token-term:field_featured_image' => 'token-term:field_featured_image',
+ 'token-vocabulary:machine-name' => 'token-vocabulary:machine-name',
+ 'token-vocabulary:edit-url' => 'token-vocabulary:edit-url',
+ 'token-vocabulary:vid' => 'token-vocabulary:vid',
+ 'token-vocabulary:name' => 'token-vocabulary:name',
+ 'token-vocabulary:description' => 'token-vocabulary:description',
+ 'token-vocabulary:node-count' => 'token-vocabulary:node-count',
+ 'token-vocabulary:term-count' => 'token-vocabulary:term-count',
+ 'token-vocabulary:original' => 'token-vocabulary:original',
+ 'token-file:basename' => 'token-file:basename',
+ 'token-file:extension' => 'token-file:extension',
+ 'token-file:size-raw' => 'token-file:size-raw',
+ 'token-file:type' => 'token-file:type',
+ 'token-file:download-url' => 'token-file:download-url',
+ 'token-file:fid' => 'token-file:fid',
+ 'token-file:name' => 'token-file:name',
+ 'token-file:path' => 'token-file:path',
+ 'token-file:mime' => 'token-file:mime',
+ 'token-file:size' => 'token-file:size',
+ 'token-file:url' => 'token-file:url',
+ 'token-file:timestamp' => 'token-file:timestamp',
+ 'token-file:owner' => 'token-file:owner',
+ 'token-file:uuid' => 'token-file:uuid',
+ 'token-file:original' => 'token-file:original',
+ 'token-file:field_file_image_alt_text' => 'token-file:field_file_image_alt_text',
+ 'token-file:field_file_image_title_text' => 'token-file:field_file_image_title_text',
+ 'token-user:cancel-url' => 'token-user:cancel-url',
+ 'token-user:one-time-login-url' => 'token-user:one-time-login-url',
+ 'token-user:picture' => 'token-user:picture',
+ 'token-user:roles' => 'token-user:roles',
+ 'token-user:uid' => 'token-user:uid',
+ 'token-user:name' => 'token-user:name',
+ 'token-user:mail' => 'token-user:mail',
+ 'token-user:url' => 'token-user:url',
+ 'token-user:edit-url' => 'token-user:edit-url',
+ 'token-user:last-login' => 'token-user:last-login',
+ 'token-user:created' => 'token-user:created',
+ 'token-user:uuid' => 'token-user:uuid',
+ 'token-user:original' => 'token-user:original',
+ 'token-user:field_user_about' => 'token-user:field_user_about',
+ 'token-user:field_user_picture' => 'token-user:field_user_picture',
+ 'token-current-user:ip-address' => 'token-current-user:ip-address',
+ 'token-menu-link:mlid' => 'token-menu-link:mlid',
+ 'token-menu-link:title' => 'token-menu-link:title',
+ 'token-menu-link:url' => 'token-menu-link:url',
+ 'token-menu-link:parent' => 'token-menu-link:parent',
+ 'token-menu-link:parents' => 'token-menu-link:parents',
+ 'token-menu-link:root' => 'token-menu-link:root',
+ 'token-menu-link:menu' => 'token-menu-link:menu',
+ 'token-menu-link:edit-url' => 'token-menu-link:edit-url',
+ 'token-current-page:title' => 'token-current-page:title',
+ 'token-current-page:url' => 'token-current-page:url',
+ 'token-current-page:page-number' => 'token-current-page:page-number',
+ 'token-current-page:query' => 'token-current-page:query',
+ 'token-url:path' => 'token-url:path',
+ 'token-url:relative' => 'token-url:relative',
+ 'token-url:absolute' => 'token-url:absolute',
+ 'token-url:brief' => 'token-url:brief',
+ 'token-url:unaliased' => 'token-url:unaliased',
+ 'token-url:args' => 'token-url:args',
+ 'token-array:first' => 'token-array:first',
+ 'token-array:last' => 'token-array:last',
+ 'token-array:count' => 'token-array:count',
+ 'token-array:reversed' => 'token-array:reversed',
+ 'token-array:keys' => 'token-array:keys',
+ 'token-array:join' => 'token-array:join',
+ 'token-array:value' => 'token-array:value',
+ 'token-array:join-path' => 'token-array:join-path',
+ 'token-random:number' => 'token-random:number',
+ 'token-random:hash' => 'token-random:hash',
+ 'token-submission:serial' => 'token-submission:serial',
+ 'token-submission:sid' => 'token-submission:sid',
+ 'token-submission:date' => 'token-submission:date',
+ 'token-submission:ip-address' => 'token-submission:ip-address',
+ 'token-submission:user' => 'token-submission:user',
+ 'token-submission:url' => 'token-submission:url',
+ 'token-submission:values' => 'token-submission:values',
+ 'token-date-field-value:date' => 'token-date-field-value:date',
+ 'token-date-field-value:to-date' => 'token-date-field-value:to-date',
+ 'token-facetapi_results:keys' => 'token-facetapi_results:keys',
+ 'token-facetapi_results:page-number' => 'token-facetapi_results:page-number',
+ 'token-facetapi_results:page-limit' => 'token-facetapi_results:page-limit',
+ 'token-facetapi_results:page-total' => 'token-facetapi_results:page-total',
+ 'token-facetapi_results:offset' => 'token-facetapi_results:offset',
+ 'token-facetapi_results:start-count' => 'token-facetapi_results:start-count',
+ 'token-facetapi_results:end-count' => 'token-facetapi_results:end-count',
+ 'token-facetapi_results:result-count' => 'token-facetapi_results:result-count',
+ 'token-facetapi_active:active-value' => 'token-facetapi_active:active-value',
+ 'token-facetapi_active:active-value-raw' => 'token-facetapi_active:active-value-raw',
+ 'token-facetapi_active:active-pos' => 'token-facetapi_active:active-pos',
+ 'token-facetapi_active:facet-label' => 'token-facetapi_active:facet-label',
+ 'token-facetapi_active:facet-name' => 'token-facetapi_active:facet-name',
+ 'token-facetapi_facet:facet-label' => 'token-facetapi_facet:facet-label',
+ 'token-facetapi_facet:facet-name' => 'token-facetapi_facet:facet-name',
+ 'token-file-type:name' => 'token-file-type:name',
+ 'token-file-type:machine-name' => 'token-file-type:machine-name',
+ 'token-file-type:count' => 'token-file-type:count',
+ 'token-file-type:edit-url' => 'token-file-type:edit-url',
+ 'token-menu:name' => 'token-menu:name',
+ 'token-menu:machine-name' => 'token-menu:machine-name',
+ 'token-menu:description' => 'token-menu:description',
+ 'token-menu:menu-link-count' => 'token-menu:menu-link-count',
+ 'token-menu:edit-url' => 'token-menu:edit-url',
+ 'token-site:name-block' => 'token-site:name-block',
+ 'token-site:name-prefix' => 'token-site:name-prefix',
+ 'token-site:copyright' => 'token-site:copyright',
+ 'token-site:name' => 'token-site:name',
+ 'token-site:slogan' => 'token-site:slogan',
+ 'token-site:mail' => 'token-site:mail',
+ 'token-site:url' => 'token-site:url',
+ 'token-site:url-brief' => 'token-site:url-brief',
+ 'token-site:login-url' => 'token-site:login-url',
+ 'token-address:full' => 'token-address:full',
+ 'token-address:street' => 'token-address:street',
+ 'token-address:street2' => 'token-address:street2',
+ 'token-address:city' => 'token-address:city',
+ 'token-address:state' => 'token-address:state',
+ 'token-address:zip' => 'token-address:zip',
+ 'token-address:phone' => 'token-address:phone',
+ 'token-address:fax' => 'token-address:fax',
+ 'token-address:email' => 'token-address:email',
+ 'token-social:facebook' => 'token-social:facebook',
+ 'token-social:twitter' => 'token-social:twitter',
+ 'token-social:youtube' => 'token-social:youtube',
+ 'token-social:linkedin' => 'token-social:linkedin',
+ 'token-date:short' => 'token-date:short',
+ 'token-date:medium' => 'token-date:medium',
+ 'token-date:long' => 'token-date:long',
+ 'token-date:custom' => 'token-date:custom',
+ 'token-date:since' => 'token-date:since',
+ 'token-date:raw' => 'token-date:raw',
+ 'token-date:panopoly_time' => 'token-date:panopoly_time',
+ 'token-date:panopoly_day' => 'token-date:panopoly_day',
+ 'token-view:name' => 'token-view:name',
+ 'token-view:description' => 'token-view:description',
+ 'token-view:machine-name' => 'token-view:machine-name',
+ 'token-view:title' => 'token-view:title',
+ 'token-view:url' => 'token-view:url',
+ 'entity_form_field-fieldable_panels_pane:field_quick_links_links' => 0,
+ 'entity_form_field-fieldable_panels_pane:field_basic_file_file' => 0,
+ 'entity_form_field-fieldable_panels_pane:field_basic_file_text' => 0,
+ 'entity_form_field-fieldable_panels_pane:field_basic_image_caption' => 0,
+ 'entity_form_field-fieldable_panels_pane:field_basic_image_image' => 0,
+ 'entity_form_field-fieldable_panels_pane:field_basic_text_text' => 0,
+ 'entity_form_field-fieldable_panels_pane:field_map_address' => 0,
+ 'entity_form_field-fieldable_panels_pane:field_map_information' => 0,
+ 'entity_form_field-fieldable_panels_pane:field_basic_table_table' => 0,
+ 'entity_form_field-fieldable_panels_pane:field_video_file' => 0,
+ 'entity_form_field-fieldable_panels_pane:field_basic_spotlight_duration' => 0,
+ 'entity_form_field-fieldable_panels_pane:field_basic_spotlight_items' => 0,
+ 'entity_form_field-node:field_ocio_body' => 0,
+ 'entity_form_field-node:field_tags' => 0,
+ 'entity_form_field-file:field_file_image_alt_text' => 0,
+ 'entity_form_field-file:field_file_image_title_text' => 0,
+ 'entity_form_field-taxonomy_term:field_featured_image' => 0,
+ 'entity_form_field-user:field_user_about' => 0,
+ 'entity_form_field-user:field_user_picture' => 0,
+ 'entity_field-fieldable_panels_pane:field_quick_links_links' => 0,
+ 'entity_field-fieldable_panels_pane:field_basic_file_file' => 0,
+ 'entity_field-fieldable_panels_pane:field_basic_file_text' => 0,
+ 'entity_field-fieldable_panels_pane:field_basic_image_caption' => 0,
+ 'entity_field-fieldable_panels_pane:field_basic_image_image' => 0,
+ 'entity_field-fieldable_panels_pane:field_basic_text_text' => 0,
+ 'entity_field-fieldable_panels_pane:field_map_address' => 0,
+ 'entity_field-fieldable_panels_pane:field_map_information' => 0,
+ 'entity_field-fieldable_panels_pane:field_basic_table_table' => 0,
+ 'entity_field-fieldable_panels_pane:field_video_file' => 0,
+ 'entity_field-fieldable_panels_pane:field_basic_spotlight_duration' => 0,
+ 'entity_field-fieldable_panels_pane:field_basic_spotlight_items' => 0,
+ 'entity_field-node:field_ocio_body' => 0,
+ 'entity_field-node:field_tags' => 0,
+ 'entity_field-file:field_file_image_alt_text' => 0,
+ 'entity_field-file:field_file_image_title_text' => 0,
+ 'entity_field-taxonomy_term:field_featured_image' => 0,
+ 'entity_field-user:field_user_about' => 0,
+ 'entity_field-user:field_user_picture' => 0,
+ 'entity_field_extra-fieldable_panels_pane:title' => 'entity_field_extra-fieldable_panels_pane:title',
+ 'entity_field_extra-node:webform' => 'entity_field_extra-node:webform',
+ 'entity_field_extra-file:file' => 'entity_field_extra-file:file',
+ 'entity_field_extra-taxonomy_term:description' => 'entity_field_extra-taxonomy_term:description',
+ 'entity_field_extra-user:summary' => 0,
+ 'custom-custom' => 'custom-custom',
+ 'block-apps-manage_apps__panopoly' => 0,
+ 'block-context_ui-editor' => 0,
+ 'block-context_ui-devel' => 0,
+ 'block-facetapi-1Cpx6naJU4Y3YvKVc0vcLK7Yo0ahaN0l' => 0,
+ 'block-facetapi-fA1pg0Ubd1zgx1mvzHkFUGaNoMb4Gs0s' => 0,
+ 'block-menu-devel' => 0,
+ 'block-node-syndicate' => 0,
+ 'block-node-recent' => 0,
+ 'block-search-form' => 0,
+ 'block-shortcut-shortcuts' => 0,
+ 'block-system-powered-by' => 0,
+ 'block-system-help' => 0,
+ 'block-system-navigation' => 0,
+ 'block-system-management' => 0,
+ 'block-system-user-menu' => 0,
+ 'block-system-main-menu' => 0,
+ 'block-user-login' => 0,
+ 'block-user-new' => 0,
+ 'block-user-online' => 0,
+ 'block-devel-execute_php' => 0,
+ 'block-devel-switch_user' => 0,
+ 'entity_view-node' => 'entity_view-node',
+ 'entity_view-file' => 'entity_view-file',
+ 'entity_view-fieldable_panels_pane' => 0,
+ 'entity_view-search_api_server' => 0,
+ 'entity_view-search_api_index' => 0,
+ 'entity_view-taxonomy_term' => 0,
+ 'entity_view-user' => 0,
+ 'fieldable_panels_pane-quick_links' => 'fieldable_panels_pane-quick_links',
+ 'fieldable_panels_pane-basic_file' => 'fieldable_panels_pane-basic_file',
+ 'fieldable_panels_pane-image' => 'fieldable_panels_pane-image',
+ 'fieldable_panels_pane-text' => 'fieldable_panels_pane-text',
+ 'fieldable_panels_pane-map' => 'fieldable_panels_pane-map',
+ 'fieldable_panels_pane-table' => 'fieldable_panels_pane-table',
+ 'fieldable_panels_pane-video' => 'fieldable_panels_pane-video',
+ 'fieldable_panels_pane-uuid:1e760ac9-aa55-41a3-8283-1adf2624e5a7' => 'fieldable_panels_pane-uuid:1e760ac9-aa55-41a3-8283-1adf2624e5a7',
+ 'fieldable_panels_pane-fieldable_panels_pane' => 0,
+ 'fieldable_panels_pane-spotlight' => 0,
+ 'menu_tree-_active' => 'menu_tree-_active',
+ 'menu_tree-main-menu' => 'menu_tree-main-menu',
+ 'menu_tree-management' => 'menu_tree-management',
+ 'menu_tree-navigation' => 'menu_tree-navigation',
+ 'menu_tree-user-menu' => 'menu_tree-user-menu',
+ 'menu_tree-devel' => 0,
+ 'views_panes-ocio_news_archive-titles_pane' => 'views_panes-ocio_news_archive-titles_pane',
+ 'views_panes-ocio_news_archive-teasers_pane' => 'views_panes-ocio_news_archive-teasers_pane',
+ 'views_panes-panopoly_database_search-search_database_results' => 0,
+ 'views_panes-panopoly_search-search_solr_results' => 0,
+ 'views_panes-panopoly_taxonomy-taxonomy_content' => 0,
+ 'views_panes-panopoly_widgets_general_content-list_of_content' => 0,
+ 'views_panes-panopoly_widgets_general_content-piece_of_content' => 0,
+ );
+ $export['panelizer_node:ocio_landing_page_allowed_types'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'panelizer_node:ocio_landing_page_allowed_types_default';
+ $strongarm->value = 0;
+ $export['panelizer_node:ocio_landing_page_allowed_types_default'] = $strongarm;
+
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'panelizer_node:ocio_landing_page_default';
+ $strongarm->value = array(
+ 'entity_field_extra' => 'entity_field_extra',
+ 'entity_view' => 'entity_view',
+ 'fieldable_panels_pane' => 'fieldable_panels_pane',
+ 'views_panes' => 'views_panes',
+ 'other' => 'other',
+ 'token' => 0,
+ 'entity_form_field' => 0,
+ 'entity_field' => 0,
+ 'custom' => 0,
+ 'block' => 0,
+ 'menu_tree' => 0,
+ );
+ $export['panelizer_node:ocio_landing_page_default'] = $strongarm;
+
+ return $export;
+}
diff --git a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.module b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.module
index 3b53f7fc..08b83931 100644
--- a/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.module
+++ b/profiles/wcm_base/modules/custom/ocio_main_menu/ocio_main_menu.module
@@ -98,6 +98,17 @@ function ocio_main_menu_menu() {
'file' => 'menu.admin.inc',
);
+ $items['admin/help'] = array(
+ 'title' => 'Help',
+ 'description' => t('Documentation for using this site.'),
+ 'page callback' => 'drupal_goto',
+ 'page arguments' => array('https://it.osu.edu/assist/OCIODrupalDistribution/index.html'),
+ 'access arguments' => array('access administration pages'),
+ 'weight' => 50,
+ );
+
+ $items['admin/help']['options']['attributes']['target'] = '_blank';
+
return $items;
}
diff --git a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc b/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
index 679df27c..289f257b 100644
--- a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
+++ b/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.features.user_permission.inc
@@ -550,6 +550,69 @@ function ocio_permissions_user_default_permissions() {
'module' => 'panelizer',
);
+ // Exported permission: 'administer panelizer node ocio_landing_page breadcrumbs'.
+ $permissions['administer panelizer node ocio_landing_page breadcrumbs'] = array(
+ 'name' => 'administer panelizer node ocio_landing_page breadcrumbs',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'panelizer',
+ );
+
+ // Exported permission: 'administer panelizer node ocio_landing_page content'.
+ $permissions['administer panelizer node ocio_landing_page content'] = array(
+ 'name' => 'administer panelizer node ocio_landing_page content',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'panelizer',
+ );
+
+ // Exported permission: 'administer panelizer node ocio_landing_page context'.
+ $permissions['administer panelizer node ocio_landing_page context'] = array(
+ 'name' => 'administer panelizer node ocio_landing_page context',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'panelizer',
+ );
+
+ // Exported permission: 'administer panelizer node ocio_landing_page defaults'.
+ $permissions['administer panelizer node ocio_landing_page defaults'] = array(
+ 'name' => 'administer panelizer node ocio_landing_page defaults',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'panelizer',
+ );
+
+ // Exported permission: 'administer panelizer node ocio_landing_page layout'.
+ $permissions['administer panelizer node ocio_landing_page layout'] = array(
+ 'name' => 'administer panelizer node ocio_landing_page layout',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'panelizer',
+ );
+
+ // Exported permission: 'administer panelizer node ocio_landing_page overview'.
+ $permissions['administer panelizer node ocio_landing_page overview'] = array(
+ 'name' => 'administer panelizer node ocio_landing_page overview',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'panelizer',
+ );
+
+ // Exported permission: 'administer panelizer node ocio_landing_page settings'.
+ $permissions['administer panelizer node ocio_landing_page settings'] = array(
+ 'name' => 'administer panelizer node ocio_landing_page settings',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'panelizer',
+ );
+
// Exported permission: 'administer panelizer taxonomy_term panopoly_categories breadcrumbs'.
$permissions['administer panelizer taxonomy_term panopoly_categories breadcrumbs'] = array(
'name' => 'administer panelizer taxonomy_term panopoly_categories breadcrumbs',
@@ -1056,6 +1119,17 @@ function ocio_permissions_user_default_permissions() {
'module' => 'book',
);
+ // Exported permission: 'create ocio_landing_page content'.
+ $permissions['create ocio_landing_page content'] = array(
+ 'name' => 'create ocio_landing_page content',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
+ ),
+ 'module' => 'node',
+ );
+
// Exported permission: 'create url aliases'.
$permissions['create url aliases'] = array(
'name' => 'create url aliases',
@@ -1206,6 +1280,17 @@ function ocio_permissions_user_default_permissions() {
'module' => 'file_entity',
);
+ // Exported permission: 'delete any ocio_landing_page content'.
+ $permissions['delete any ocio_landing_page content'] = array(
+ 'name' => 'delete any ocio_landing_page content',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
+ ),
+ 'module' => 'node',
+ );
+
// Exported permission: 'delete any video files'.
$permissions['delete any video files'] = array(
'name' => 'delete any video files',
@@ -1429,6 +1514,17 @@ function ocio_permissions_user_default_permissions() {
'module' => 'file_entity',
);
+ // Exported permission: 'delete own ocio_landing_page content'.
+ $permissions['delete own ocio_landing_page content'] = array(
+ 'name' => 'delete own ocio_landing_page content',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
+ ),
+ 'module' => 'node',
+ );
+
// Exported permission: 'delete own video files'.
$permissions['delete own video files'] = array(
'name' => 'delete own video files',
@@ -1684,6 +1780,17 @@ function ocio_permissions_user_default_permissions() {
'module' => 'file_entity',
);
+ // Exported permission: 'edit any ocio_landing_page content'.
+ $permissions['edit any ocio_landing_page content'] = array(
+ 'name' => 'edit any ocio_landing_page content',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
+ ),
+ 'module' => 'node',
+ );
+
// Exported permission: 'edit any video files'.
$permissions['edit any video files'] = array(
'name' => 'edit any video files',
@@ -1912,6 +2019,17 @@ function ocio_permissions_user_default_permissions() {
'module' => 'file_entity',
);
+ // Exported permission: 'edit own ocio_landing_page content'.
+ $permissions['edit own ocio_landing_page content'] = array(
+ 'name' => 'edit own ocio_landing_page content',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
+ ),
+ 'module' => 'node',
+ );
+
// Exported permission: 'edit own video files'.
$permissions['edit own video files'] = array(
'name' => 'edit own video files',
@@ -2043,6 +2161,15 @@ function ocio_permissions_user_default_permissions() {
'module' => 'override_node_options',
);
+ // Exported permission: 'enter ocio_landing_page revision log entry'.
+ $permissions['enter ocio_landing_page revision log entry'] = array(
+ 'name' => 'enter ocio_landing_page revision log entry',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'override_node_options',
+ );
+
// Exported permission: 'enter web_form revision log entry'.
$permissions['enter web_form revision log entry'] = array(
'name' => 'enter web_form revision log entry',
@@ -2537,6 +2664,60 @@ function ocio_permissions_user_default_permissions() {
'module' => 'override_node_options',
);
+ // Exported permission: 'override ocio_landing_page authored by option'.
+ $permissions['override ocio_landing_page authored by option'] = array(
+ 'name' => 'override ocio_landing_page authored by option',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'override_node_options',
+ );
+
+ // Exported permission: 'override ocio_landing_page authored on option'.
+ $permissions['override ocio_landing_page authored on option'] = array(
+ 'name' => 'override ocio_landing_page authored on option',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'override_node_options',
+ );
+
+ // Exported permission: 'override ocio_landing_page promote to front page option'.
+ $permissions['override ocio_landing_page promote to front page option'] = array(
+ 'name' => 'override ocio_landing_page promote to front page option',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'override_node_options',
+ );
+
+ // Exported permission: 'override ocio_landing_page published option'.
+ $permissions['override ocio_landing_page published option'] = array(
+ 'name' => 'override ocio_landing_page published option',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'override_node_options',
+ );
+
+ // Exported permission: 'override ocio_landing_page revision option'.
+ $permissions['override ocio_landing_page revision option'] = array(
+ 'name' => 'override ocio_landing_page revision option',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'override_node_options',
+ );
+
+ // Exported permission: 'override ocio_landing_page sticky option'.
+ $permissions['override ocio_landing_page sticky option'] = array(
+ 'name' => 'override ocio_landing_page sticky option',
+ 'roles' => array(
+ 'administrator' => 'administrator',
+ ),
+ 'module' => 'override_node_options',
+ );
+
// Exported permission: 'override web_form authored by option'.
$permissions['override web_form authored by option'] = array(
'name' => 'override web_form authored by option',
diff --git a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info b/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info
index f874debf..4a8f0b9a 100644
--- a/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info
+++ b/profiles/wcm_base/modules/custom/ocio_permissions/ocio_permissions.info
@@ -1,5 +1,5 @@
name = OCIO Permissions
-description = Permissions specific to the OCIOpoly distribution.
+description = Permissions specific to the WCM distribution.
core = 7.x
package = OCIO Configuration
version = 7.x-1.0
@@ -117,6 +117,13 @@ features[user_permission][] = administer page manager
features[user_permission][] = administer pane access
features[user_permission][] = administer panelizer
features[user_permission][] = administer panelizer node book_page defaults
+features[user_permission][] = administer panelizer node ocio_landing_page breadcrumbs
+features[user_permission][] = administer panelizer node ocio_landing_page content
+features[user_permission][] = administer panelizer node ocio_landing_page context
+features[user_permission][] = administer panelizer node ocio_landing_page defaults
+features[user_permission][] = administer panelizer node ocio_landing_page layout
+features[user_permission][] = administer panelizer node ocio_landing_page overview
+features[user_permission][] = administer panelizer node ocio_landing_page settings
features[user_permission][] = administer panelizer taxonomy_term panopoly_categories breadcrumbs
features[user_permission][] = administer panelizer taxonomy_term panopoly_categories content
features[user_permission][] = administer panelizer taxonomy_term panopoly_categories context
@@ -169,6 +176,7 @@ features[user_permission][] = create fieldable text
features[user_permission][] = create fieldable video
features[user_permission][] = create files
features[user_permission][] = create new books
+features[user_permission][] = create ocio_landing_page content
features[user_permission][] = create url aliases
features[user_permission][] = create web_form content
features[user_permission][] = customize shortcut links
@@ -182,6 +190,7 @@ features[user_permission][] = delete any document files
features[user_permission][] = delete any faq content
features[user_permission][] = delete any featured_slide content
features[user_permission][] = delete any image files
+features[user_permission][] = delete any ocio_landing_page content
features[user_permission][] = delete any video files
features[user_permission][] = delete any web_form content
features[user_permission][] = delete fieldable basic_file
@@ -202,6 +211,7 @@ features[user_permission][] = delete own document files
features[user_permission][] = delete own faq content
features[user_permission][] = delete own featured_slide content
features[user_permission][] = delete own image files
+features[user_permission][] = delete own ocio_landing_page content
features[user_permission][] = delete own video files
features[user_permission][] = delete own web_form content
features[user_permission][] = delete own webform submissions
@@ -226,6 +236,7 @@ features[user_permission][] = edit any document files
features[user_permission][] = edit any faq content
features[user_permission][] = edit any featured_slide content
features[user_permission][] = edit any image files
+features[user_permission][] = edit any ocio_landing_page content
features[user_permission][] = edit any video files
features[user_permission][] = edit any web_form content
features[user_permission][] = edit fieldable basic_file
@@ -247,6 +258,7 @@ features[user_permission][] = edit own document files
features[user_permission][] = edit own faq content
features[user_permission][] = edit own featured_slide content
features[user_permission][] = edit own image files
+features[user_permission][] = edit own ocio_landing_page content
features[user_permission][] = edit own video files
features[user_permission][] = edit own web_form content
features[user_permission][] = edit own webform submissions
@@ -259,6 +271,7 @@ features[user_permission][] = enter book_page revision log entry
features[user_permission][] = enter calendar_entry revision log entry
features[user_permission][] = enter faq revision log entry
features[user_permission][] = enter featured_slide revision log entry
+features[user_permission][] = enter ocio_landing_page revision log entry
features[user_permission][] = enter web_form revision log entry
features[user_permission][] = execute php code
features[user_permission][] = export tablefield
@@ -308,6 +321,12 @@ features[user_permission][] = override featured_slide promote to front page opti
features[user_permission][] = override featured_slide published option
features[user_permission][] = override featured_slide revision option
features[user_permission][] = override featured_slide sticky option
+features[user_permission][] = override ocio_landing_page authored by option
+features[user_permission][] = override ocio_landing_page authored on option
+features[user_permission][] = override ocio_landing_page promote to front page option
+features[user_permission][] = override ocio_landing_page published option
+features[user_permission][] = override ocio_landing_page revision option
+features[user_permission][] = override ocio_landing_page sticky option
features[user_permission][] = override web_form authored by option
features[user_permission][] = override web_form authored on option
features[user_permission][] = override web_form promote to front page option
diff --git a/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.features.inc b/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.features.inc
index deb54bc8..fb1c8b29 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.features.inc
+++ b/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.features.inc
@@ -22,3 +22,46 @@ function ocio_user_directory_ctools_plugin_api($module = NULL, $api = NULL) {
function ocio_user_directory_views_api($module = NULL, $api = NULL) {
return array("api" => "3.0");
}
+
+/**
+ * Implements hook_image_default_styles().
+ */
+function ocio_user_directory_image_default_styles() {
+ $styles = array();
+
+ // Exported image style: user_picture.
+ $styles['user_picture'] = array(
+ 'label' => 'User Picture',
+ 'effects' => array(
+ 4 => array(
+ 'name' => 'manualcrop_crop_and_scale',
+ 'data' => array(
+ 'width' => 200,
+ 'height' => 286,
+ 'upscale' => 0,
+ 'respectminimum' => 1,
+ 'onlyscaleifcrop' => 0,
+ 'style_name' => 'user_picture',
+ ),
+ 'weight' => 1,
+ ),
+ ),
+ );
+
+ // Exported image style: user_picture_thumbnail.
+ $styles['user_picture_thumbnail'] = array(
+ 'label' => 'User Picture Thumbnail',
+ 'effects' => array(
+ 3 => array(
+ 'name' => 'image_scale_and_crop',
+ 'data' => array(
+ 'width' => 120,
+ 'height' => 172,
+ ),
+ 'weight' => 2,
+ ),
+ ),
+ );
+
+ return $styles;
+}
diff --git a/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.info b/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.info
index 6eaa871b..4db44aae 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.info
+++ b/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.info
@@ -35,6 +35,8 @@ features[field_instance][] = user-user-field_phone
features[field_instance][] = user-user-field_room_and_building
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[menu_links][] = main-menu_people:people
features[variable][] = field_bundle_settings_user__user
features[variable][] = realname_pattern
diff --git a/profiles/wcm_base/wcm_base.info b/profiles/wcm_base/wcm_base.info
index a8733aee..69bbdc98 100644
--- a/profiles/wcm_base/wcm_base.info
+++ b/profiles/wcm_base/wcm_base.info
@@ -94,6 +94,7 @@ dependencies[] = ocio_featured_slideshow
dependencies[] = ocio_field_bases
dependencies[] = ocio_front_page
dependencies[] = ocio_image_styles
+dependencies[] = ocio_landing_page
dependencies[] = ocio_main_menu
dependencies[] = ocio_media
dependencies[] = ocio_news
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index 842e91ec..d65f6bad 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -162,6 +162,12 @@ projects[ocio_image_styles][download][type] = "git"
projects[ocio_image_styles][download][url] = git@code.osu.edu:ocio_odee_web/ocio_image_styles.git
projects[ocio_image_styles][download][branch] = 7.x-1.x
+projects[ocio_landing_page][type] = module
+projects[ocio_landing_page][subdir] = custom
+projects[ocio_landing_page][download][type] = "git"
+projects[ocio_landing_page][download][url] = git@code.osu.edu:ocio_odee_web/ocio_landing_page.git
+projects[ocio_landing_page][download][branch] = 7.x-1.x
+
projects[ocio_main_menu][type] = module
projects[ocio_main_menu][subdir] = custom
projects[ocio_main_menu][download][type] = "git"
--
GitLab