diff --git a/profiles/wcm_base/libraries/jquery.isotope/README.mdown b/profiles/wcm_base/libraries/jquery.isotope/README.mdown
index 2a05211a4d8aa7c0d882628c9ca308bcb9f376ce..e406703d74189bd6919c04962dee6bdd762b8a43 100644
--- a/profiles/wcm_base/libraries/jquery.isotope/README.mdown
+++ b/profiles/wcm_base/libraries/jquery.isotope/README.mdown
@@ -2,7 +2,7 @@
_Filter & sort magical layouts_
-See [isotopejs.com](http://isotopejs.com) for complete docs and demos.
+See [isotope.metafizzy.co](http://isotope.metafizzy.co) for complete docs and demos.
## Install
diff --git a/profiles/wcm_base/libraries/jquery.isotope/package.json b/profiles/wcm_base/libraries/jquery.isotope/package.json
index 9a5e189c5875be58bd4dabe832d0c8cc6dcc7013..e792bd1d71d03ad0052c8a03e86834bd81dc87f9 100644
--- a/profiles/wcm_base/libraries/jquery.isotope/package.json
+++ b/profiles/wcm_base/libraries/jquery.isotope/package.json
@@ -49,5 +49,6 @@
"filter",
"sort"
],
- "author": "Metafizzy"
+ "author": "Metafizzy",
+ "license": "GPL-3.0"
}
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 e4b3bb3357e10a649e5d01da8b3948f9b378c57b..bd506d7fd3b823ef3007eadd2dfee8b48dcc6fd5 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-04-27
-version = "7.x-1.1+2-dev"
-core = "7.x"
-project = "date_popup_authored"
-datestamp = "1430165022"
-
+dependencies[] = date_popup
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/PATCHES.txt b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/PATCHES.txt
index d3cb3cbe0bbbf06461785ccef832ff0ad1314c21..0030995f64b28bff429f39773128832095a629eb 100644
--- a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/PATCHES.txt
@@ -1,7 +1,9 @@
The following patches have been applied to this project:
- http://drupal.org/files/issues/fieldable_panels_panes-n2283263-5.patch
- http://www.drupal.org/files/issues/fieldable_panels_panes-n2256503-12-backport-fpp15.patch
-- https://www.drupal.org/files/issues/fieldable_panels_pane-avoid-reload-2415427-4.patch
+- http://www.drupal.org/files/issues/fieldable_panels_pane-avoid-reload-2415427-4.patch
- http://www.drupal.org/files/issues/2146479-admin-menu-map-conflict.patch
+- http://www.drupal.org/files/issues/fieldable_panels_panes-title-visibility-rules-2463965-1.patch
+- http://www.drupal.org/files/issues/fpp_rendering-2304921-1.patch
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable-panels-pane.tpl.php b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable-panels-pane.tpl.php
index 6b992b2f44387bb5f5aff6dce04eadc3375d1fe1..2c40a31fd98a77645f674e7a470b6d01b429283e 100644
--- a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable-panels-pane.tpl.php
+++ b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable-panels-pane.tpl.php
@@ -1,4 +1,4 @@
<div class="<?php print $classes; ?>"<?php print $attributes; ?>>
<?php print render($title_suffix); ?>
- <?php print $fields; ?>
+ <?php print render($content); ?>
</div>
diff --git a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.module b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.module
index 1bed6d09def06e841f2066aa3b5a6ed855102337..8799f3126250d9409794910fab4a4b7bcc8f0284 100644
--- a/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.module
+++ b/profiles/wcm_base/modules/contrib/fieldable_panels_panes/fieldable_panels_panes.module
@@ -677,11 +677,6 @@ function template_preprocess_fieldable_panels_pane(&$vars) {
// Make the field variables available with the appropriate language.
field_attach_preprocess('fieldable_panels_pane', $vars['elements']['#element'], $vars['content'], $vars);
- $vars['fields'] = '';
- foreach ($vars['content'] as $content) {
- $vars['fields'] .= render($content);
- }
-
$vars['theme_hook_suggestions'][] = 'fieldable_panels_pane__' . $vars['elements']['#element']->bundle;
}
@@ -690,7 +685,7 @@ function template_preprocess_fieldable_panels_pane(&$vars) {
*/
function fieldable_panels_panes_preprocess_panels_pane(&$vars) {
if ($vars['pane']->type == 'fieldable_panels_pane') {
- if (!empty($vars['content']['#fieldable_panels_pane'])) {
+ if (!empty($vars['content']['#fieldable_panels_pane']) && is_object($vars['content']['#fieldable_panels_pane'])) {
$entity = $vars['content']['#fieldable_panels_pane'];
if ($entity->link && !empty($vars['title'])) {
$vars['title'] = l($vars['title'], $entity->path);
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 a278cd5700dea91c8cfa6e8576cdfbbbf212d873..62f966f000faa309ae12ff5a2e6ec3c8c07d0ff7 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-04-27
-version = "7.x-2.0-alpha3+29-dev"
-core = "7.x"
-project = "file_entity"
-datestamp = "1430165017"
-
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 87808044311d864bcb7b98630eca02582e207af5..35eaf29c9a7851fc79c19d25ff9cd78cd7594af8 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-04-27
-version = "7.x-2.0-alpha3+29-dev"
-core = "7.x"
-project = "file_entity"
-datestamp = "1430165017"
-
diff --git a/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info b/profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info
index 1730f36b3bae480f0b5e4a17233267af6cc852ef..f0defad2c46c26897cbd8859c768016a84fb8416 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-04-27
-version = "7.x-1.4+109-dev"
-core = "7.x"
-project = "manualcrop"
-datestamp = "1430164950"
-
diff --git a/profiles/wcm_base/modules/contrib/media/media.info b/profiles/wcm_base/modules/contrib/media/media.info
index 9ca9d7ccf53fd116b6eca10bd8d28c92d6233469..41db09184664fe27d0a6e5da0020530dacbed1e9 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-04-27
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1430164927"
-
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 e5d24c6f28af0ecb3a1eebb87ecb3bd454be0f16..f930dbc095957093882506d7f09a97958c978ac7 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-04-27
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1430164927"
-
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 955094ea0bc7d3a36f9b938ab04e801f3f7a2a20..3ec8936c7ccf1d6c2fb8a4a66968f953d223c75d 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-04-27
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1430164927"
-
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 ca8822d9170055e623bebe1c56bf2500cac5102f..32c98d119ee2233e7aa56728dd5a99727c9d3043 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-04-27
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1430164927"
-
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 922eec6817dc584ce737ed26d3ba2f6e83af1381..93b8a3aa999603137d633e913676c049e03ee69c 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-04-27
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1430164927"
-
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 bf4cc1fcde42d26752cfd355c550aec0f70cf9ec..8fbbdbbd845b6783d9e858faab07b660c30a2792 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-04-27
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1430164927"
-
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 52f8f4b9553a6c0a13f82f15f5b6ed1056c67d4a..24022ad7868892076599e81ad06a82f33dffd81a 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-04-27
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1430164927"
-
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 502e487a3cb6bc3bb4a93a7af5f0b1a62302709f..de618c2e6b474333832e20d7ab483e7d7b8b4360 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-04-27
-version = "7.x-2.0-alpha3+98-dev"
-core = "7.x"
-project = "media"
-datestamp = "1430164927"
-
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 d4824ef70c5c06654f0357a0e2fa49253dbed3b0..49fd9edfa3a26f9b95bec076ddfd7c5fe0fbef23 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-04-27
-version = "7.x-2.0-rc4+9-dev"
-core = "7.x"
-project = "media_youtube"
-datestamp = "1430165018"
-
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/PATCHES.txt b/profiles/wcm_base/modules/contrib/radix_layouts/PATCHES.txt
new file mode 100644
index 0000000000000000000000000000000000000000..64378b10aa997180000c29571614fa5db162227c
--- /dev/null
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/PATCHES.txt
@@ -0,0 +1,4 @@
+The following patches have been applied to this project:
+- https://www.drupal.org/files/issues/radix_layouts-radix-label-2476709-1.patch
+
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bartlett/radix_bartlett.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bartlett/radix_bartlett.inc
index c4d85ff53382ba1ecae4cd54d139b789b4c25137..a9ba9d11b6eaaf91db4f921c6145f55e90827858 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bartlett/radix_bartlett.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bartlett/radix_bartlett.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Bartlett'),
+ 'title' => t('Bartlett'),
'icon' => 'radix-bartlett.png',
'category' => t('Radix'),
'theme' => 'radix_bartlett',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bartlett_flipped/radix_bartlett_flipped.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bartlett_flipped/radix_bartlett_flipped.inc
index 225a3779172e2fe97f6ca077619b019f5f55194c..caa5b7ca9a2f3aed09a8fd7f6757d6d3ceb1f7b3 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bartlett_flipped/radix_bartlett_flipped.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bartlett_flipped/radix_bartlett_flipped.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Bartlett Flipped'),
+ 'title' => t('Bartlett Flipped'),
'icon' => 'radix-bartlett-flipped.png',
'category' => t('Radix'),
'theme' => 'radix-bartlett_flipped',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_boxton/radix_boxton.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_boxton/radix_boxton.inc
index 0ebdd10ce7291d401f5f0592220207ce2ab1f4f7..6d04a68b4ba5885b347a3ce542b96b408d78a078 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_boxton/radix_boxton.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_boxton/radix_boxton.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Boxton'),
+ 'title' => t('Boxton'),
'icon' => 'radix-boxton.png',
'category' => t('Radix'),
'theme' => 'radix_boxton',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brenham/radix_brenham.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brenham/radix_brenham.inc
index 5b8eaafb09a764e7134082a36069c8dc89dd240b..ba6befab58db54585889e3e9861d15da551cac2c 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brenham/radix_brenham.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brenham/radix_brenham.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Brenham'),
+ 'title' => t('Brenham'),
'icon' => 'radix-brenham.png',
'category' => t('Radix'),
'theme' => 'radix_brenham',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brenham_flipped/radix_brenham_flipped.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brenham_flipped/radix_brenham_flipped.inc
index 47f65a396ef3f88c32b47177a53e17f0f30386b2..ba9cd493ffe0e70ba19929d3fcc939f172336971 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brenham_flipped/radix_brenham_flipped.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brenham_flipped/radix_brenham_flipped.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Brenham Flipped'),
+ 'title' => t('Brenham Flipped'),
'icon' => 'radix-brenham-flipped.png',
'category' => t('Radix'),
'theme' => 'radix_brenham_flipped',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brown/radix_brown.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brown/radix_brown.inc
index cf349780b569da04ad0f112b8aff6e0e5dc89314..168f77b909708f4b421f50741a9e4000c81c2dc8 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brown/radix_brown.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_brown/radix_brown.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Brown'),
+ 'title' => t('Brown'),
'icon' => 'radix-brown.png',
'category' => t('Radix'),
'theme' => 'radix_brown',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bryant/radix_bryant.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bryant/radix_bryant.inc
index cc77cf175797e2d37a1c2e22f97cbb53d4a4939c..abc493def786307ecaddeef146723b12e8ff3a09 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bryant/radix_bryant.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bryant/radix_bryant.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Bryant'),
+ 'title' => t('Bryant'),
'icon' => 'radix-bryant.png',
'category' => t('Radix'),
'theme' => 'radix_bryant',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bryant_flipped/radix_bryant_flipped.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bryant_flipped/radix_bryant_flipped.inc
index a80871429720d55a0804129851c485d0d6bf0fd1..74940322d8caaae463bd5de434d34c9a1f596fac 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bryant_flipped/radix_bryant_flipped.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_bryant_flipped/radix_bryant_flipped.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Bryant Flipped'),
+ 'title' => t('Bryant Flipped'),
'icon' => 'radix-bryant-flipped.png',
'category' => t('Radix'),
'theme' => 'radix_bryant_flipped',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_burr/radix_burr.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_burr/radix_burr.inc
index e1c58111c85cb4423864f46fd340303d2548da04..b2f1ffde0762eb4b75ddda3c6def9c19be255eb8 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_burr/radix_burr.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_burr/radix_burr.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Burr'),
+ 'title' => t('Burr'),
'icon' => 'radix-burr.png',
'category' => t('Radix'),
'theme' => 'radix_burr',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_burr_flipped/radix_burr_flipped.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_burr_flipped/radix_burr_flipped.inc
index d94740ec6887f2f2e4e7a8969086d5b5b438010c..46ee0a8d6d062258e5f404d4fe862e3654431b4a 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_burr_flipped/radix_burr_flipped.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_burr_flipped/radix_burr_flipped.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Burr Flipped'),
+ 'title' => t('Burr Flipped'),
'icon' => 'radix-burr-flipped.png',
'category' => t('Radix'),
'theme' => 'radix_burr_flipped',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_geary/radix_geary.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_geary/radix_geary.inc
index 20eca9344341e8da2f770119bf6ed400d114c634..42ff9640ab3e961cd121915cb0420cb9cebfaa34 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_geary/radix_geary.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_geary/radix_geary.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Geary'),
+ 'title' => t('Geary'),
'icon' => 'radix-geary.png',
'category' => t('Radix'),
'theme' => 'radix_geary',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_harris/radix_harris.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_harris/radix_harris.inc
index b1579a70630f3b6e1a399774ff9e86e5cff12908..9d6440d9bac26b1595f2968f65d1f9e42d4a80e8 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_harris/radix_harris.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_harris/radix_harris.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Harris'),
+ 'title' => t('Harris'),
'icon' => 'radix-harris.png',
'category' => t('Radix'),
'theme' => 'radix_harris',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_hewston/radix_hewston.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_hewston/radix_hewston.inc
index a5c517a8270a304fd905cc3732f0b5a603d66726..88b361553e79061997ed5cac4f9e4764a736cd95 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_hewston/radix_hewston.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_hewston/radix_hewston.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Hewston'),
+ 'title' => t('Hewston'),
'icon' => 'radix-hewston.png',
'category' => t('Radix'),
'theme' => 'radix_hewston',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_hewston_flipped/radix_hewston_flipped.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_hewston_flipped/radix_hewston_flipped.inc
index 695074706ea6388e589031c5843c0e906059d7f7..1e52a00a8ab5477e5854fb21414f771950545e2d 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_hewston_flipped/radix_hewston_flipped.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_hewston_flipped/radix_hewston_flipped.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Hewston Flipped'),
+ 'title' => t('Hewston Flipped'),
'icon' => 'radix-hewston-flipped.png',
'category' => t('Radix'),
'theme' => 'radix_hewston_flipped',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_mccoppin/radix_mccoppin.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_mccoppin/radix_mccoppin.inc
index 755e405c58ce32a8270ed1e3273e618c527e0e35..33a073cc8e73fb9b5e7b915343203e669e51557c 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_mccoppin/radix_mccoppin.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_mccoppin/radix_mccoppin.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix McCoppin'),
+ 'title' => t('McCoppin'),
'icon' => 'radix-mccoppin.png',
'category' => t('Radix'),
'theme' => 'radix_mccoppin',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_moscone/radix_moscone.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_moscone/radix_moscone.inc
index 031d78555c9b370dbeee26a4f6d597e711493387..6c9b1091a2922625144166177a93629e7d6ab0c9 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_moscone/radix_moscone.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_moscone/radix_moscone.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Moscone'),
+ 'title' => t('Moscone'),
'icon' => 'radix-moscone.png',
'category' => t('Radix'),
'theme' => 'radix_moscone',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_moscone_flipped/radix_moscone_flipped.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_moscone_flipped/radix_moscone_flipped.inc
index ced548283289e2c604ba405aab651006b2a01335..31242d3c3492601c15606b767255a322046f72cb 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_moscone_flipped/radix_moscone_flipped.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_moscone_flipped/radix_moscone_flipped.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Moscone Flipped'),
+ 'title' => t('Moscone Flipped'),
'icon' => 'radix-moscone-flipped.png',
'category' => t('Radix'),
'theme' => 'radix_moscone_flipped',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_phelan/radix_phelan.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_phelan/radix_phelan.inc
index 5c8d7aeda4f33528d2480ecbb55c478a12dd7e71..af1f4328afc43b259b371c5b19c5fb91ef8c8cf3 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_phelan/radix_phelan.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_phelan/radix_phelan.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Phelan'),
+ 'title' => t('Phelan'),
'icon' => 'radix-phelan.png',
'category' => t('Radix'),
'theme' => 'radix_phelan',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_pond/radix_pond.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_pond/radix_pond.inc
index e67509f40642d0f0096419ec39bc11d50faeaf6d..e2cf5e68e4f31c79a931aa84b6f13e016ece04b3 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_pond/radix_pond.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_pond/radix_pond.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Pond'),
+ 'title' => t('Pond'),
'icon' => 'radix-pond.png',
'category' => t('Radix'),
'theme' => 'radix_pond',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_rolph/radix_rolph.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_rolph/radix_rolph.inc
index e540ba364b73ca830d636e4953e58d312a2ea7bc..482b9def557f1732f1a254bd54d49218c70ff9d6 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_rolph/radix_rolph.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_rolph/radix_rolph.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Rolph'),
+ 'title' => t('Rolph'),
'icon' => 'radix-rolph.png',
'category' => t('Radix'),
'theme' => 'radix_rolph',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sanderson/radix_sanderson.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sanderson/radix_sanderson.inc
index b6b43b2afa71be2e2958419f302d3d26eba900a5..413c664bee02b7ae3dee0d846714c5eb6a8dda91 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sanderson/radix_sanderson.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sanderson/radix_sanderson.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Sanderson'),
+ 'title' => t('Sanderson'),
'icon' => 'radix-sanderson.png',
'category' => t('Radix'),
'theme' => 'radix_sanderson',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sanderson_flipped/radix_sanderson_flipped.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sanderson_flipped/radix_sanderson_flipped.inc
index 0819a26eccdda899eebd668443d3249469cccb7f..fd3cfe9cd7410aa2c853d4b7aee95d150ceaffe3 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sanderson_flipped/radix_sanderson_flipped.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sanderson_flipped/radix_sanderson_flipped.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Sanderson Flipped'),
+ 'title' => t('Sanderson Flipped'),
'icon' => 'radix-sanderson-flipped.png',
'category' => t('Radix'),
'theme' => 'radix_sanderson_flipped',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_selby/radix_selby.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_selby/radix_selby.inc
index 3695b0c16d107a941fac4c3cb8eec2c86cc7f23c..8ccc197cb9c3a6c51a9d81f84a697bb3fda91d42 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_selby/radix_selby.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_selby/radix_selby.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Selby'),
+ 'title' => t('Selby'),
'icon' => 'radix-selby.png',
'category' => t('Radix'),
'theme' => 'radix_selby',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_selby_flipped/radix_selby_flipped.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_selby_flipped/radix_selby_flipped.inc
index ffb77314399d0163f540cce7bbb8d6880ab012d2..90ee8e44daefd9266a73bb94d3472e6af626734d 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_selby_flipped/radix_selby_flipped.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_selby_flipped/radix_selby_flipped.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Selby Flipped'),
+ 'title' => t('Selby Flipped'),
'icon' => 'radix-selby-flipped.png',
'category' => t('Radix'),
'theme' => 'radix_selby_flipped',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sutro/radix_sutro.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sutro/radix_sutro.inc
index d42fae74d74ef3b8b059d06bfb98ac52b7bcbc37..8d107fbfa85fb1736de25840d9b1a4be4e2b761a 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sutro/radix_sutro.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sutro/radix_sutro.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Sutro'),
+ 'title' => t('Sutro'),
'icon' => 'radix-sutro.png',
'category' => t('Radix'),
'theme' => 'radix_sutro',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sutro_double/radix_sutro_double.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sutro_double/radix_sutro_double.inc
index af4a8d92ac459c680a30e6e90e4211662ab8256f..b60c09e8555ec18e99210cacffd9aeb76b4ef4a7 100644
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sutro_double/radix_sutro_double.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_sutro_double/radix_sutro_double.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Sutro Double'),
+ 'title' => t('Sutro Double'),
'icon' => 'radix-sutro-double.png',
'category' => t('Radix'),
'theme' => 'radix_sutro_double',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_taylor/radix_taylor.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_taylor/radix_taylor.inc
index fd8da3f1320eb722a31c4260271ea55ad0b428fe..e274d1ecacd380e508fc4421e0f21fc0f0ccda9e 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_taylor/radix_taylor.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_taylor/radix_taylor.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Taylor'),
+ 'title' => t('Taylor'),
'icon' => 'radix-taylor.png',
'category' => t('Radix'),
'theme' => 'radix_taylor',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_taylor_flipped/radix_taylor_flipped.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_taylor_flipped/radix_taylor_flipped.inc
index 8ce87a676e71c2a328e47b662ebd082313873555..b57a6068b65a929d14fcb353e2cea354c83dd8ce 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_taylor_flipped/radix_taylor_flipped.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_taylor_flipped/radix_taylor_flipped.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Taylor Flipped'),
+ 'title' => t('Taylor Flipped'),
'icon' => 'radix-taylor-flipped.png',
'category' => t('Radix'),
'theme' => 'radix_taylor_flipped',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_webb/radix_webb.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_webb/radix_webb.inc
index 95718d2abf3509840edc801cdaa142576e8f58e9..40e6c6974b85360bc1e96f3293f92131615ca8e4 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_webb/radix_webb.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_webb/radix_webb.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Webb'),
+ 'title' => t('Webb'),
'icon' => 'radix-webb.png',
'category' => t('Radix'),
'theme' => 'radix_webb',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_webb_flipped/radix_webb_flipped.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_webb_flipped/radix_webb_flipped.inc
index b99517542f20d62ae106a385aa7f18842aeea255..a244db73afd1c75132bcb20f314d7b3b0286233a 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_webb_flipped/radix_webb_flipped.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_webb_flipped/radix_webb_flipped.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Webb Flipped'),
+ 'title' => t('Webb Flipped'),
'icon' => 'radix-webb-flipped.png',
'category' => t('Radix'),
'theme' => 'radix_webb_flipped',
diff --git a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_whelan/radix_whelan.inc b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_whelan/radix_whelan.inc
index 37da3603dc53b2f753c8abdc1a21cc6ebcc9e459..c8d35f02669d1dce7fd6c46531ee1a06714c5404 100755
--- a/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_whelan/radix_whelan.inc
+++ b/profiles/wcm_base/modules/contrib/radix_layouts/plugins/layouts/radix_whelan/radix_whelan.inc
@@ -1,7 +1,7 @@
<?php
// Plugin definition
$plugin = array(
- 'title' => t('Radix Whelan'),
+ 'title' => t('Whelan'),
'icon' => 'radix-whelan.png',
'category' => t('Radix'),
'theme' => 'radix_whelan',
diff --git a/profiles/wcm_base/modules/contrib/views/PATCHES.txt b/profiles/wcm_base/modules/contrib/views/PATCHES.txt
index 264e521e0b10d314d0dea242de9db8f068c80a9e..5d9f8a35a694df498ead390ee77a6d017807a12f 100644
--- a/profiles/wcm_base/modules/contrib/views/PATCHES.txt
+++ b/profiles/wcm_base/modules/contrib/views/PATCHES.txt
@@ -1,4 +1,5 @@
The following patches have been applied to this project:
- http://drupal.org/files/views-exposed-sorts-2037469-1.patch
+- http://drupal.org/files/issues/views-ajax-nginx-1036962-71.patch
This file was automatically generated by Drush Make (http://drupal.org/project/drush).
\ No newline at end of file
diff --git a/profiles/wcm_base/modules/contrib/views/drush/views.drush.inc b/profiles/wcm_base/modules/contrib/views/drush/views.drush.inc
index dd8af1b683e2169ad3f483e923492e897efd940c..eb2ecc2f83f781a95ee2f595c09d080c29fa87d0 100644
--- a/profiles/wcm_base/modules/contrib/views/drush/views.drush.inc
+++ b/profiles/wcm_base/modules/contrib/views/drush/views.drush.inc
@@ -42,10 +42,14 @@ function views_drush_command() {
),
'bootstrap' => DRUSH_BOOTSTRAP_DRUPAL_FULL,
'aliases' => array('vr'),
+ 'options' => array(
+ 'all' => 'If provided, all views will be reverted.',
+ ),
'examples' => array(
'drush vr archive' => 'Reverts the "archive" view.',
'drush rln archive frontpage' => 'Reverts the "archive" and "frontpage" view.',
'drush vr' => 'Will present you with a list of overridden views to choose from, and an option to revert all overridden views.',
+ 'drush vr --all' => 'Will revert all overridden views.',
),
);
$items['views-dev'] = array(
@@ -126,15 +130,21 @@ function views_revert_views() {
}
}
- // Return early if there are no overridden views in the system.
+ // If there are no overridden views in the system, report it.
if (empty($overridden)) {
- return drush_set_error(dt('There are no overridden views in the system.'));
+ drush_log(dt('There are no overridden views in the system.'), 'ok');
}
- // If the user specified in the command the views to be overridden.
- if (!empty($viewnames)) {
+ // If the user provided the "--all" option, revert all views.
+ if (drush_get_option('all')) {
+ $i = views_revert_allviews($views);
+ }
+
+ // If the user specified a list of views on the CLI, revert those.
+ elseif (!empty($viewnames)) {
foreach ($viewnames as $key => $viewname) {
$is_overridden = key_exists($viewname, $overridden);
+
// Check if the provided view name is in the system
if ($viewname && !key_exists($viewname, $views)) {
drush_set_error(dt("'@viewname' view is not present in the system.", array('@viewname' => $viewname)));
@@ -144,18 +154,22 @@ function views_revert_views() {
drush_set_error(dt("The view specified '@viewname' is not overridden.", array('@viewname' => $viewname)));
}
// If the view is overriden, revert it.
- elseif ($is_overridden){
+ elseif ($is_overridden) {
views_revert_view($views[$viewname]);
$i++;
}
// We should never get here but well...
else {
- drush_set_error(dt("The view specified '@viewname' is not provided in code, and thus cannot be reverted.", array('@viewname' => $viewname)));
+ drush_set_error(dt(
+ "The view specified '@viewname' is not provided in code, and thus cannot be reverted.",
+ array('@viewname' => $viewname)
+ ));
}
}
}
- // The user did not specify any views in the command, prompt the user
+ // The user neither selected the "--all" option, nor provided a list of views to revert.
+ // Prompt the user.
else {
// list of choices for the user
$overridden['all'] = dt('Revert all overridden views'); // add a choice at the end
diff --git a/profiles/wcm_base/modules/contrib/views/handlers/views_handler_filter_date.inc b/profiles/wcm_base/modules/contrib/views/handlers/views_handler_filter_date.inc
index 4ef61b47ac7e2e1a09b14089c7d07d0931f27149..3831327435915cbd0e018b63618f7dadea2229f2 100644
--- a/profiles/wcm_base/modules/contrib/views/handlers/views_handler_filter_date.inc
+++ b/profiles/wcm_base/modules/contrib/views/handlers/views_handler_filter_date.inc
@@ -158,13 +158,11 @@ class views_handler_filter_date extends views_handler_filter_numeric {
}
function op_between($field) {
- $a = intval(strtotime($this->value['min'], 0));
- $b = intval(strtotime($this->value['max'], 0));
+ // Use the substitutions to ensure a consistent timestamp.
+ $query_substitutions = views_views_query_substitutions($this->view);
+ $a = intval(strtotime($this->value['min'], $query_substitutions['***CURRENT_TIME***']));
+ $b = intval(strtotime($this->value['max'], $query_substitutions['***CURRENT_TIME***']));
- if ($this->value['type'] == 'offset') {
- $a = '***CURRENT_TIME***' . sprintf('%+d', $a); // keep sign
- $b = '***CURRENT_TIME***' . sprintf('%+d', $b); // keep sign
- }
// This is safe because we are manually scrubbing the values.
// It is necessary to do it this way because $a and $b are formulas when using an offset.
$operator = strtoupper($this->operator);
@@ -172,10 +170,10 @@ class views_handler_filter_date extends views_handler_filter_numeric {
}
function op_simple($field) {
- $value = intval(strtotime($this->value['value'], 0));
- if (!empty($this->value['type']) && $this->value['type'] == 'offset') {
- $value = '***CURRENT_TIME***' . sprintf('%+d', $value); // keep sign
- }
+ // Use the substitutions to ensure a consistent timestamp.
+ $query_substitutions = views_views_query_substitutions($this->view);
+ $value = intval(strtotime($this->value['value'], $query_substitutions['***CURRENT_TIME***']));
+
// This is safe because we are manually scrubbing the value.
// It is necessary to do it this way because $value is a formula when using an offset.
$this->query->add_where_expression($this->options['group'], "$field $this->operator $value");
diff --git a/profiles/wcm_base/modules/contrib/views/includes/ajax.inc b/profiles/wcm_base/modules/contrib/views/includes/ajax.inc
index cd633605eb4c4b70334b5cdbbde713564d1a7b39..8b882d904bb94047fba7eb5bada678ca5b9d8c4b 100644
--- a/profiles/wcm_base/modules/contrib/views/includes/ajax.inc
+++ b/profiles/wcm_base/modules/contrib/views/includes/ajax.inc
@@ -53,7 +53,7 @@ function views_ajax() {
// Overwrite the destination.
// @see drupal_get_destination()
$origin_destination = $path;
- $query = drupal_http_build_query($_REQUEST);
+ $query = drupal_http_build_query(drupal_get_query_parameters());
if ($query != '') {
$origin_destination .= '?' . $query;
}
diff --git a/profiles/wcm_base/modules/contrib/views/includes/cache.inc b/profiles/wcm_base/modules/contrib/views/includes/cache.inc
index b74752f13aadf53b360c88250dd08a28e9404f64..98145c5a4968eaa846c5b24b2e72f0b1fa7d6b64 100644
--- a/profiles/wcm_base/modules/contrib/views/includes/cache.inc
+++ b/profiles/wcm_base/modules/contrib/views/includes/cache.inc
@@ -67,12 +67,11 @@ function _views_fetch_data($table = NULL, $move = TRUE, $reset = FALSE) {
}
else {
if (!$fully_loaded) {
- $data = views_cache_get('views_data', TRUE);
- if (!empty($data->data)) {
+ if ($data = views_cache_get('views_data', TRUE)) {
$cache = $data->data;
}
-
- if (empty($cache)) {
+ else {
+ // No cache entry, rebuild.
$cache = _views_fetch_data_build();
}
$fully_loaded = TRUE;
@@ -127,12 +126,25 @@ function _views_data_process_entity_types(&$data) {
function _views_fetch_plugin_data($type = NULL, $plugin = NULL, $reset = FALSE) {
static $cache = NULL;
if (!isset($cache) || $reset) {
- $start = microtime(TRUE);
- views_include('plugins');
- views_include_handlers();
-
- $cache = views_discover_plugins();
-
+ // Load necessary code once.
+ if (!isset($cache)) {
+ views_include('plugins');
+ views_include_handlers();
+ }
+ // Because plugin data contains translated strings, and as such can be
+ // expensive to build, the results are cached per language.
+ global $language;
+ $cache_key = 'views:plugin_data:' . $language->language;
+ if (!$reset) {
+ if ($cache = cache_get($cache_key)) {
+ $cache = $cache->data;
+ }
+ }
+ // If not available in the cache, build it and cache it.
+ if (!$cache) {
+ $cache = views_discover_plugins();
+ cache_set($cache_key, $cache);
+ }
}
if (!$type && !$plugin) {
diff --git a/profiles/wcm_base/modules/contrib/views/modules/comment/views_plugin_row_comment_rss.inc b/profiles/wcm_base/modules/contrib/views/modules/comment/views_plugin_row_comment_rss.inc
index d287b8e7aa948df51be5fa9d94e06d7a0ee7ffc7..e349590d909ae4e0b86288bd320a28276f6f2b89 100644
--- a/profiles/wcm_base/modules/contrib/views/modules/comment/views_plugin_row_comment_rss.inc
+++ b/profiles/wcm_base/modules/contrib/views/modules/comment/views_plugin_row_comment_rss.inc
@@ -107,7 +107,7 @@ class views_plugin_row_comment_rss extends views_plugin_row {
),
array(
'key' => 'dc:creator',
- 'value' => $comment->name,
+ 'value' => format_username($comment),
),
array(
'key' => 'guid',
diff --git a/profiles/wcm_base/modules/contrib/views/modules/node/views_plugin_row_node_rss.inc b/profiles/wcm_base/modules/contrib/views/modules/node/views_plugin_row_node_rss.inc
index 5da746b2b32e130c5b5f305af805fe4c4aa371c0..6671892502a97f1bd43b33dcc8f6b2581f7022ff 100644
--- a/profiles/wcm_base/modules/contrib/views/modules/node/views_plugin_row_node_rss.inc
+++ b/profiles/wcm_base/modules/contrib/views/modules/node/views_plugin_row_node_rss.inc
@@ -117,7 +117,7 @@ class views_plugin_row_node_rss extends views_plugin_row {
),
array(
'key' => 'dc:creator',
- 'value' => $node->name,
+ 'value' => format_username($node),
),
array(
'key' => 'guid',
diff --git a/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_cache.inc b/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_cache.inc
index 81f71bfbde7be9b66881e9146c633668d8593683..0dfc9114b057b77948ee6eb73a44e646bfecc1e1 100644
--- a/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_cache.inc
+++ b/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_cache.inc
@@ -206,14 +206,14 @@ class views_plugin_cache extends views_plugin {
// Slightly less simple for CSS:
$css = drupal_add_css();
$css_start = isset($this->storage['css']) ? $this->storage['css'] : array();
- $this->storage['css'] = $array_mapping_func($css, $css_start);
+ $this->storage['css'] = $this->assetDiff($css, $css_start, $array_mapping_func);
// Get javascript after/before views renders.
$js = drupal_add_js();
$js_start = isset($this->storage['js']) ? $this->storage['js'] : array();
// If there are any differences between the old and the new javascript then
// store them to be added later.
- $this->storage['js'] = $array_mapping_func($js, $js_start);
+ $this->storage['js'] = $this->assetDiff($js, $js_start, $array_mapping_func);
// Special case the settings key and get the difference of the data.
$settings = isset($js['settings']['data']) ? $js['settings']['data'] : array();
@@ -224,6 +224,38 @@ class views_plugin_cache extends views_plugin {
$this->storage['headers'] = $array_mapping_func(drupal_get_http_header(), $this->storage['headers']);
}
+ /**
+ * Computes the differences between two JS/CSS asset arrays.
+ *
+ * @param array $assets
+ * The current asset array.
+ * @param array $start_assets
+ * The original asset array.
+ * @param string $diff_function
+ * The function that should be used for computing the diff.
+ *
+ * @return array
+ * A CSS or JS asset array that contains all entries that are new/different
+ * in $assets.
+ */
+ protected function assetDiff(array $assets, array $start_assets, $diff_function) {
+ $diff = $diff_function($assets, $start_assets);
+
+ // Cleanup the resulting array since drupal_array_diff_assoc_recursive() can
+ // leave half populated arrays behind.
+ foreach ($diff as $key => $entry) {
+ // If only the weight was different we can remove this entry.
+ if (count($entry) == 1 && isset($entry['weight'])) {
+ unset($diff[$key]);
+ }
+ // If there are other differences we override with the latest entry.
+ elseif ($entry != $assets[$key]) {
+ $diff[$key] = $assets[$key];
+ }
+ }
+ return $diff;
+ }
+
/**
* Restore out of band data saved to cache. Copied from Panels.
*/
diff --git a/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_display.inc b/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_display.inc
index db124de0dd97072cfbfef5950af2b339a7d1dfc9..bc42db46c4a167d7012ac085a6131001fa9fa4ea 100644
--- a/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_display.inc
+++ b/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_display.inc
@@ -2140,7 +2140,7 @@ class views_plugin_display extends views_plugin {
'#default_value' => $pager['type'],
);
- $pager_plugin = views_fetch_plugin_data('pager', $pager['type'], array($this->view->base_table));
+ $pager_plugin = views_fetch_plugin_data('pager', $pager['type']);
if (!empty($pager_plugin['uses options'])) {
$form['markup'] = array(
'#prefix' => '<div class="form-item description">',
diff --git a/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_display_attachment.inc b/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_display_attachment.inc
index 91c8d1f9436a1e095eae60055873737b82b615fe..8608cfc8973adf3ab3ce154a27c9c84c393b947f 100644
--- a/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_display_attachment.inc
+++ b/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_display_attachment.inc
@@ -227,6 +227,8 @@ class views_plugin_display_attachment extends views_plugin_display {
$args = $this->get_option('inherit_arguments') ? $this->view->args : array();
$view->set_arguments($args);
+ $exposed_input = $this->get_option('inherit_exposed_filters') ? $this->view->exposed_input : array();
+ $view->set_exposed_input($exposed_input);
$view->set_display($this->display->id);
if ($this->get_option('inherit_pager')) {
$view->display_handler->use_pager = $this->view->display[$display_id]->handler->use_pager();
diff --git a/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_query_default.inc b/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_query_default.inc
index 8a15e8dce7169be9e7d95ecdd0e28f7c571e206d..5e0539c8a9c6b5b84dc8f921041a0a7902aae9be 100644
--- a/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_query_default.inc
+++ b/profiles/wcm_base/modules/contrib/views/plugins/views_plugin_query_default.inc
@@ -1322,6 +1322,10 @@ class views_plugin_query_default extends views_plugin_query {
if (count($this->having)) {
$this->has_aggregate = TRUE;
}
+ elseif (!$this->has_aggregate) {
+ // Allow 'GROUP BY' even no aggregation function has been set.
+ $this->has_aggregate = $this->view->display_handler->get_option('group_by');
+ }
if ($this->has_aggregate && (!empty($this->groupby) || !empty($non_aggregates))) {
$groupby = array_unique(array_merge($this->groupby, $non_aggregates));
foreach ($groupby as $field) {
diff --git a/profiles/wcm_base/modules/contrib/views/tests/handlers/views_handler_filter_date.test b/profiles/wcm_base/modules/contrib/views/tests/handlers/views_handler_filter_date.test
index 34ccba6676bcd232bd45c4768658f5f61cb93d0b..8b92ccb59fca6881f94ec1caa7e5e276f0b72419 100644
--- a/profiles/wcm_base/modules/contrib/views/tests/handlers/views_handler_filter_date.test
+++ b/profiles/wcm_base/modules/contrib/views/tests/handlers/views_handler_filter_date.test
@@ -50,6 +50,21 @@ class ViewsHandlerFilterDateTest extends ViewsSqlTest {
$this->assertIdenticalResultset($view, $expected_result, $this->map);
$view->destroy();
+ // Test "first day of" type of relative dates for simple operator.
+ $view->set_display('default');
+ $view->init_handlers();
+ $view->filter['created']->operator = '<';
+ $view->filter['created']->value['type'] = 'offset';
+ $view->filter['created']->value['value'] = 'last day of January 1970';
+ $view->execute_display('default');
+ $expected_result = array(
+ array('nid' => $this->nodes[0]->nid),
+ array('nid' => $this->nodes[1]->nid),
+ array('nid' => $this->nodes[2]->nid),
+ );
+ $this->assertIdenticalResultset($view, $expected_result, $this->map);
+ $view->destroy();
+
// Test offset for between operator.
$view->set_display('default');
$view->init_handlers();
@@ -63,6 +78,22 @@ class ViewsHandlerFilterDateTest extends ViewsSqlTest {
);
$this->assertIdenticalResultset($view, $expected_result, $this->map);
$view->destroy();
+
+ // Test "first day of" type of relative dates for between operator.
+ $view->set_display('default');
+ $view->init_handlers();
+ $view->filter['created']->operator = 'between';
+ $view->filter['created']->value['type'] = 'offset';
+ $view->filter['created']->value['max'] = 'last day of January 1970';
+ $view->filter['created']->value['min'] = 'first day of January 1970';
+ $view->execute_display('default');
+ $expected_result = array(
+ array('nid' => $this->nodes[0]->nid),
+ array('nid' => $this->nodes[1]->nid),
+ array('nid' => $this->nodes[2]->nid),
+ );
+ $this->assertIdenticalResultset($view, $expected_result, $this->map);
+ $view->destroy();
}
diff --git a/profiles/wcm_base/modules/contrib/views/tests/views_groupby.test b/profiles/wcm_base/modules/contrib/views/tests/views_groupby.test
index 718d8dc073cabe76af033d5f427963d173533c33..4e09256586fce9bffcc71157d735ef71ad48e558 100644
--- a/profiles/wcm_base/modules/contrib/views/tests/views_groupby.test
+++ b/profiles/wcm_base/modules/contrib/views/tests/views_groupby.test
@@ -108,11 +108,14 @@ class ViewsQueryGroupByTest extends ViewsSqlTest {
}
/**
- * @param $group_by
- * Which group_by function should be used, for example sum or count.
+ * @param string|null $group_by
+ * (optional) Which group_by function should be used, for example sum or
+ * count. If omitted, the aggregation is tested with no group function.
+ * @param array|null $values
+ * (optional) Expected values.
*/
- function GroupByTestHelper($group_by, $values) {
- // Create 2 nodes of type1 and 3 nodes of type2
+ function GroupByTestHelper($group_by = NULL, $values = NULL) {
+ // Create 4 nodes of type1 and 3 nodes of type2
$type1 = $this->drupalCreateContentType();
$type2 = $this->drupalCreateContentType();
@@ -136,6 +139,19 @@ class ViewsQueryGroupByTest extends ViewsSqlTest {
$output = $view->execute_display();
$this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
+
+ $results = array();
+ // There's no need for a function in order to have aggregation.
+ if (empty($group_by)) {
+ $types = array($type1->type, $type2->type);
+ $results = array_map(function ($item) { return $item->node_type; }, $view->result);
+ sort($types);
+ sort($results);
+ $this->assertIdentical($results, $types);
+ // Exit here with no aggregation function.
+ return;
+ }
+
// Group by nodetype to identify the right count.
foreach ($view->result as $item) {
$results[$item->node_type] = $item->nid;
@@ -144,7 +160,7 @@ class ViewsQueryGroupByTest extends ViewsSqlTest {
$this->assertEqual($results[$type2->type], $values[1]);
}
- function viewsGroupByViewHelper($group_by) {
+ function viewsGroupByViewHelper($group_by = NULL) {
$view = new view;
$view->name = 'group_by_count';
$view->description = '';
@@ -164,21 +180,27 @@ class ViewsQueryGroupByTest extends ViewsSqlTest {
$handler->display->display_options['pager']['type'] = 'some';
$handler->display->display_options['style_plugin'] = 'default';
$handler->display->display_options['row_plugin'] = 'fields';
- /* Field: Content: Nid */
- $handler->display->display_options['fields']['nid']['id'] = 'nid';
- $handler->display->display_options['fields']['nid']['table'] = 'node';
- $handler->display->display_options['fields']['nid']['field'] = 'nid';
- $handler->display->display_options['fields']['nid']['group_type'] = $group_by;
- $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
- $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
- $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
- $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
- $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
- $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
- $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
- $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
- $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
- $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+
+ // The test view has 2 fields ('nid' and 'type'). Don't add 'nid' when
+ // having no aggregation function. We just want to aggregate on node type.
+ if (!empty($group_by)) {
+ /* Field: Content: Nid */
+ $handler->display->display_options['fields']['nid']['id'] = 'nid';
+ $handler->display->display_options['fields']['nid']['table'] = 'node';
+ $handler->display->display_options['fields']['nid']['field'] = 'nid';
+ $handler->display->display_options['fields']['nid']['group_type'] = $group_by;
+ $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
+ $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
+ $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
+ $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
+ $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
+ $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
+ $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
+ $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
+ $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
+ $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+ }
+
/* Field: Content: Type */
$handler->display->display_options['fields']['type']['id'] = 'type';
$handler->display->display_options['fields']['type']['table'] = 'node';
@@ -218,6 +240,10 @@ class ViewsQueryGroupByTest extends ViewsSqlTest {
$this->GroupByTestHelper('max', array(4, 7));
}
+ function testGroupByNone() {
+ $this->GroupByTestHelper();
+ }
+
public function testGroupByCountOnlyFilters() {
// Check if GROUP BY and HAVING are included when a view
// Doesn't display SUM, COUNT, MAX... functions in SELECT statment
diff --git a/profiles/wcm_base/modules/contrib/views/tests/views_module.test b/profiles/wcm_base/modules/contrib/views/tests/views_module.test
index 6a27443a6fe47af8eff1f7ad15f9239c46fdad6b..e160964a90e9a5e85cf6e88bb15fb6ab771bb8ca 100644
--- a/profiles/wcm_base/modules/contrib/views/tests/views_module.test
+++ b/profiles/wcm_base/modules/contrib/views/tests/views_module.test
@@ -194,6 +194,30 @@ class ViewsModuleTest extends ViewsSqlTest {
$this->assertEqual(variable_get('views_test_views_data_count', 0), 1, 'Views data rebuilt once');
$this->assertFalse(drupal_static('_views_fetch_data_fully_loaded'), 'Views data is not fully loaded');
+
+ // Test if the cache consistency is ensured. There was an issue where
+ // calling _views_fetch_data() first with a table would prevent the function
+ // from properly rebuilt a missing the general cache entry.
+ // See https://www.drupal.org/node/2475669 for details.
+ // Make sure we start with a empty cache.
+ $this->resetStaticViewsDataCache();
+ cache_clear_all('*', 'cache_views', TRUE);
+
+ // Prime the static cache of _views_fetch_data() by calling it with a table
+ // first.
+ views_fetch_data('views_test');
+ // Now remove the general cache.
+ cache_clear_all('views_data:en', 'cache_views');
+ // Reset the static cache to see if fetches from the persistent cache
+ // properly rebuild the static cache.
+ $this->resetStaticViewsDataCache();
+ // Prime the static cache of _views_fetch_data() by calling it with a table
+ // first.
+ views_fetch_data('views_test');
+ // Fetch the general cache, which was deleted, an see if it is rebuild
+ // properly.
+ views_fetch_data();
+ $this->assertTrue(cache_get('views_data:en', 'cache_views'), 'Cache for all tables was properly rebuild.');
}
/**
diff --git a/profiles/wcm_base/modules/contrib/views/tests/views_test.info b/profiles/wcm_base/modules/contrib/views/tests/views_test.info
index b090daa1f51df3b82ef3756e461b8ca1feaeea26..a8e51a149ae4a036fe61724db639e1bdfa106f88 100644
--- a/profiles/wcm_base/modules/contrib/views/tests/views_test.info
+++ b/profiles/wcm_base/modules/contrib/views/tests/views_test.info
@@ -5,9 +5,9 @@ core = 7.x
dependencies[] = views
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-02-11
-version = "7.x-3.10"
+; Information added by Drupal.org packaging script on 2015-04-29
+version = "7.x-3.11"
core = "7.x"
project = "views"
-datestamp = "1423648085"
+datestamp = "1430321048"
diff --git a/profiles/wcm_base/modules/contrib/views/views.api.php b/profiles/wcm_base/modules/contrib/views/views.api.php
index 70c5dc83f1e2edd77c398a884b0ff776e916cf19..599d08eba990530c40c6afd8c8561c0a193e9764 100644
--- a/profiles/wcm_base/modules/contrib/views/views.api.php
+++ b/profiles/wcm_base/modules/contrib/views/views.api.php
@@ -1075,7 +1075,7 @@ function hook_views_query_alter(&$view, &$query) {
// Traverse through the 'where' part of the query.
foreach ($query->where as &$condition_group) {
foreach ($condition_group['conditions'] as &$condition) {
- // If this is the part of the query filtering on title, chang the
+ // If this is the part of the query filtering on title, change the
// condition to filter on node ID.
if ($condition['field'] == 'node.title') {
$condition = array(
diff --git a/profiles/wcm_base/modules/contrib/views/views.info b/profiles/wcm_base/modules/contrib/views/views.info
index 87b01b98e251d7ed27f6a5d0e256696d5e06b8d5..70832d11ae864e26a2af235b6cf8c94b906b929d 100644
--- a/profiles/wcm_base/modules/contrib/views/views.info
+++ b/profiles/wcm_base/modules/contrib/views/views.info
@@ -318,9 +318,9 @@ files[] = tests/views_cache.test
files[] = tests/views_view.test
files[] = tests/views_ui.test
-; Information added by Drupal.org packaging script on 2015-02-11
-version = "7.x-3.10"
+; Information added by Drupal.org packaging script on 2015-04-29
+version = "7.x-3.11"
core = "7.x"
project = "views"
-datestamp = "1423648085"
+datestamp = "1430321048"
diff --git a/profiles/wcm_base/modules/contrib/views/views_ui.info b/profiles/wcm_base/modules/contrib/views/views_ui.info
index d8be6e4d12bd6b042d430f17a8625836583b5f41..8667109452daec43774bd637a5743f2eb711576a 100644
--- a/profiles/wcm_base/modules/contrib/views/views_ui.info
+++ b/profiles/wcm_base/modules/contrib/views/views_ui.info
@@ -7,9 +7,9 @@ dependencies[] = views
files[] = views_ui.module
files[] = plugins/views_wizard/views_ui_base_views_wizard.class.php
-; Information added by Drupal.org packaging script on 2015-02-11
-version = "7.x-3.10"
+; Information added by Drupal.org packaging script on 2015-04-29
+version = "7.x-3.11"
core = "7.x"
project = "views"
-datestamp = "1423648085"
+datestamp = "1430321048"
diff --git a/profiles/wcm_base/modules/contrib/workbench/workbench.info b/profiles/wcm_base/modules/contrib/workbench/workbench.info
index 8bddd86e4187b370a8e779eb472c42983822a227..d7cbf84f6369778823ff812cc8a73b4f01b89ced 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-04-27
-version = "7.x-1.2"
-core = "7.x"
-project = "workbench"
-datestamp = "1430164979"
-
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 5f61459bee619c59f5b5b02dc70d7a027115ea49..9eed11b0890ef272579ddb4f41cb6ca4aaae667e 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-04-27
-version = "7.x-2.1"
-core = "7.x"
-project = "workbench_media"
-datestamp = "1430164980"
-
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 228325319c7e87a815a2e04fb86b1d52bcb72036..0f9e0139939f90f05138f37fdc695d018263dee7 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-04-27
-version = "7.x-1.4+6-dev"
-core = "7.x"
-project = "workbench_moderation"
-datestamp = "1430164981"
-
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 ce1ea10b47bd1408e4308f6f88011962671d9bb6..3f9939f1b620392b86995547bbcbb4b94258075d 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-04-27
-version = "7.x-1.4+6-dev"
-core = "7.x"
-project = "workbench_moderation"
-datestamp = "1430164981"
-
diff --git a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.features.menu_links.inc b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.features.menu_links.inc
new file mode 100644
index 0000000000000000000000000000000000000000..1b03d997789779237be03c82405d76d5a040d8a6
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.features.menu_links.inc
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @file
+ * ocio_faqs.features.menu_links.inc
+ */
+
+/**
+ * Implements hook_menu_default_menu_links().
+ */
+function ocio_faqs_menu_default_menu_links() {
+ $menu_links = array();
+
+ // Exported menu link: main-menu_faqs:faq
+ $menu_links['main-menu_faqs:faq'] = array(
+ 'menu_name' => 'main-menu',
+ 'link_path' => 'faq',
+ 'router_path' => 'faq',
+ 'link_title' => 'FAQs',
+ 'options' => array(
+ 'attributes' => array(
+ 'title' => '',
+ ),
+ 'identifier' => 'main-menu_faqs:faq',
+ ),
+ 'module' => 'menu',
+ 'hidden' => 1,
+ 'external' => 0,
+ 'has_children' => 0,
+ 'expanded' => 0,
+ 'weight' => -48,
+ 'customized' => 1,
+ );
+ // Translatables
+ // Included for use with string extractors like potx.
+ t('FAQs');
+
+
+ return $menu_links;
+}
diff --git a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.info b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.info
index 59a2fb87e7b00d0a9a635f8591552c0012d3867a..7c3041753bab5cb7b45a6bc82f6173af81df9217 100644
--- a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.info
+++ b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.info
@@ -7,6 +7,7 @@ project = ocio_faqs
dependencies[] = ctools
dependencies[] = draggableviews
dependencies[] = features
+dependencies[] = menu
dependencies[] = number
dependencies[] = ocio_field_bases
dependencies[] = override_node_options
@@ -19,6 +20,7 @@ features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
features[field_instance][] = node-faq-field_answer
+features[menu_links][] = main-menu_faqs:faq
features[node][] = faq
features[variable][] = date_popup_authored_format_faq
features[variable][] = menu_options_faq
@@ -29,3 +31,4 @@ features[variable][] = node_submitted_faq
features[variable][] = workbench_moderation_default_state_faq
features[views_view][] = faq
features_exclude[variable][field_bundle_settings_node__faq] = field_bundle_settings_node__faq
+features_exclude[dependencies][ocio_main_menu] = ocio_main_menu
diff --git a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.module b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.module
index fbc30ce515b8365c366ac8f71b570dd2e5e89393..3291315940e3ca0b7df4d4ac4020b2f3fd8e89f1 100644
--- a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.module
+++ b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.module
@@ -31,12 +31,13 @@ function ocio_faqs_form_views_form_faq_page_1_alter(&$form, &$form_state) {
'#default_value' => variable_get('ocio_faq_style', 0),
'#weight' => 100,
);
- $form['actions']['submit']['#submit'][] = 'ocio_faqs_form_submit';
+ $form['actions']['save-order']['#submit'][] = 'ocio_faqs_form_submit';
}
/*
* Submit callback, stores form variable on submit.
*/
+
function ocio_faqs_form_submit($form, &$form_state) {
variable_set('ocio_faq_style', $form_state['values']['ocio_faq_style']);
}
diff --git a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.views_default.inc b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.views_default.inc
index 1f93b51de116a176fd64238521a98c361319b6f9..dce538ae86e593e9b0b09288a19d32c5cb583001 100644
--- a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.views_default.inc
+++ b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.views_default.inc
@@ -109,7 +109,6 @@ function ocio_faqs_views_default_views() {
$handler->display->display_options['fields']['nothing']['alter']['text'] = '<a href="faq#main-content">Back to Top</a>';
$handler->display->display_options['fields']['nothing']['element_label_colon'] = FALSE;
$handler->display->display_options['path'] = 'faq';
- $handler->display->display_options['menu']['type'] = 'normal';
$handler->display->display_options['menu']['title'] = 'FAQs';
$handler->display->display_options['menu']['weight'] = '30';
$handler->display->display_options['menu']['name'] = 'main-menu';
@@ -331,7 +330,6 @@ function ocio_faqs_views_default_views() {
$handler->display->display_options['fields']['field_answer']['label'] = '';
$handler->display->display_options['fields']['field_answer']['element_label_colon'] = FALSE;
$handler->display->display_options['path'] = 'faq';
- $handler->display->display_options['menu']['type'] = 'normal';
$handler->display->display_options['menu']['title'] = 'FAQs';
$handler->display->display_options['menu']['weight'] = '30';
$handler->display->display_options['menu']['name'] = 'main-menu';
diff --git a/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.features.menu_links.inc b/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.features.menu_links.inc
new file mode 100644
index 0000000000000000000000000000000000000000..92538251bcda080f2b954f3df16bf01c6e91bc54
--- /dev/null
+++ b/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.features.menu_links.inc
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @file
+ * ocio_user_directory.features.menu_links.inc
+ */
+
+/**
+ * Implements hook_menu_default_menu_links().
+ */
+function ocio_user_directory_menu_default_menu_links() {
+ $menu_links = array();
+
+ // Exported menu link: main-menu_people:people
+ $menu_links['main-menu_people:people'] = array(
+ 'menu_name' => 'main-menu',
+ 'link_path' => 'people',
+ 'router_path' => 'people',
+ 'link_title' => 'People',
+ 'options' => array(
+ 'attributes' => array(
+ 'title' => '',
+ ),
+ 'identifier' => 'main-menu_people:people',
+ ),
+ 'module' => 'menu',
+ 'hidden' => 1,
+ 'external' => 0,
+ 'has_children' => 0,
+ 'expanded' => 0,
+ 'weight' => -47,
+ 'customized' => 1,
+ );
+ // Translatables
+ // Included for use with string extractors like potx.
+ t('People');
+
+
+ return $menu_links;
+}
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 d7eb9fc229d894490b8e0a107cd07c576c95945a..6eaa871b92d1c364d3e8430fda773822731a6981 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
@@ -4,10 +4,16 @@ core = 7.x
package = OCIO Features
version = 7.x-1.0
project = ocio_user_directory
+dependencies[] = ctools
dependencies[] = ds
+dependencies[] = features
+dependencies[] = image
+dependencies[] = menu
dependencies[] = ocio_field_bases
+dependencies[] = ocio_main_menu
dependencies[] = realname
dependencies[] = strongarm
+dependencies[] = text
dependencies[] = views
dependencies[] = views_isotope
features[ctools][] = ds:ds:1
@@ -29,6 +35,7 @@ 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[menu_links][] = main-menu_people:people
features[variable][] = field_bundle_settings_user__user
features[variable][] = realname_pattern
features[variable][] = user_cancel_method
@@ -71,4 +78,3 @@ features_exclude[field_base][field_user_photo] = field_user_photo
features_exclude[field_base][field_room_and_building] = field_room_and_building
features_exclude[field_base][field_street_address] = field_street_address
features_exclude[dependencies][options] = options
-mtime = 1422928302
diff --git a/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.views_default.inc b/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.views_default.inc
index 0572c6c3bc570a746422eec49e0ae207bb6d44c2..c8326ebaab38b253047d7cf431f4a4539c3ce9e0 100644
--- a/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.views_default.inc
+++ b/profiles/wcm_base/modules/custom/ocio_user_directory/ocio_user_directory.views_default.inc
@@ -56,7 +56,6 @@ function ocio_user_directory_views_default_views() {
/* Display: Page */
$handler = $view->new_display('page', 'Page', 'page');
$handler->display->display_options['path'] = 'people';
- $handler->display->display_options['menu']['type'] = 'normal';
$handler->display->display_options['menu']['title'] = 'People';
$handler->display->display_options['menu']['weight'] = '20';
$handler->display->display_options['menu']['name'] = 'main-menu';
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
index 6924ed5d02caf0d6a84351a96e58e42c8cf1eab5..a414a4527bd3fb1fbd0eaa5c7904ece1ae6188aa 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
@@ -1,3 +1,9 @@
+Panopoly Admin 7.x-1.21, 2015-04-29
+----------------------------
+- Clean up instances of deprecated panpoly_theme layouts.
+- Update Features module to version 2.5.
+- Hiding the Body field label breaks the summary toggle.
+
Panopoly Admin 7.x-1.20, 2015-03-25
----------------------------
- The alteration of node options may conflict with other forms.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly-admin.js b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly-admin.js
index 436fa522210bbaece08fe44f6619b58657af3fcc..9304da1a2502c7c82491a0e82701a8b4a8a725ea 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly-admin.js
+++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly-admin.js
@@ -5,13 +5,16 @@
*/
Drupal.behaviors.panopolyAdmin = {
attach: function (context, settings) {
+ // Make the permalink field full width.
var width = $('#node-edit #edit-title').width() - $('#node-edit .form-item-path-alias label').width() - $('#node-edit .form-item-path-alias .field-prefix').width() - 10;
$('#node-edit .form-item-path-alias input').css('width', width);
- if ($('#node-edit .form-item-body-und-0-value label').html() == 'Body <span class="form-required" title="This field is required.">*</span>') {
- $('#node-edit .form-item-body-und-0-value label').html('');
- $('#node-edit .form-item-body-und-0-value label').css('text-align', 'right');
- }
+ // Hide the body label in Javascript if requested, which allows the summary
+ // Javacript to continue working.
+ $('#node-edit .panopoly-admin-hide-body-label .form-item-body-und-0-value label', context)
+ .once('panopoly-admin-hide-body-label')
+ .wrapInner('<span class="element-invisible"></span>')
+ .css('text-align', 'right');
if ($('#node-edit .form-item-field-featured-image-und-0-alt label')) {
$('#node-edit .form-item-field-featured-image-und-0-alt label').html('Alt Text');
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
index e2869f9f9fdab252580e364d16f3d22468945c0e..67504e6ad600bd056557eb14e79de9af40c2acc9 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
@@ -39,9 +39,9 @@ features[page_manager_pages][] = panopoly_admin_pane_library
features[variable][] = jquery_update_jquery_version
features[variable][] = user_admin_role
-; Information added by Drupal.org packaging script on 2015-03-25
-version = "7.x-1.20"
+; Information added by Drupal.org packaging script on 2015-04-29
+version = "7.x-1.21"
core = "7.x"
project = "panopoly_admin"
-datestamp = "1427310484"
+datestamp = "1430338228"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.module b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.module
index a9cebec959fffe0eb35d309b9dfdb0035f002aba..004c4b4c9f295c8606164b600c066e59f96d5d93 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.module
+++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.module
@@ -176,6 +176,20 @@ function panopoly_admin_form_alter(&$form, &$form_state, $form_id) {
$form['body']['#attributes']['class'][] = 'clearfix';
}
+ // Hide the body label if it's 'Body' (which isn't terribly helpful) and the
+ // field is required.
+ if (!empty($form['body']['und'][0]['#required']) && $form['body']['und'][0]['#title'] == t('Body')) {
+ if ($form['body']['und'][0]['summary']['#type'] == 'textarea') {
+ // We can't just set '#title_display' to invisible because it'll break
+ // the summary Javascript. So, we just set a class which we'll use in
+ // our own Javascript to hide the label.
+ $form['body']['#attributes']['class'][] = 'panopoly-admin-hide-body-label';
+ }
+ else {
+ $form['body']['und'][0]['#title_display'] = 'invisible';
+ }
+ }
+
// Improve the publishing options by remove promote to front page and sticky
if (isset($form['options']) && !variable_get('panopoly_admin_front_page_and_sticky', 0)) {
$form['options']['promote']['#access'] = FALSE;
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.pages_default.inc b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.pages_default.inc
index 1e156b621a6c3e5f7a97e6b623cd54bcdefa904c..345c2d018f81396e0f75ba2cbf6d01fd21b46c58 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.pages_default.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.pages_default.inc
@@ -28,7 +28,7 @@ function panopoly_admin_default_page_manager_handlers() {
'relationships' => array(),
);
$display = new panels_display();
- $display->layout = 'burr_flipped';
+ $display->layout = 'radix_burr_flipped';
$display->layout_settings = array();
$display->panel_settings = array(
'style_settings' => array(
@@ -45,236 +45,236 @@ function panopoly_admin_default_page_manager_handlers() {
$display->uuid = '56f6d0a5-d0cb-4670-8442-80de25b84871';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-73569090-5f67-47b1-b6a5-634bc8104c2b';
- $pane->panel = 'contentmain';
- $pane->type = 'node_form_title';
- $pane->subtype = 'node_form_title';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_node_edit_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '73569090-5f67-47b1-b6a5-634bc8104c2b';
- $display->content['new-73569090-5f67-47b1-b6a5-634bc8104c2b'] = $pane;
- $display->panels['contentmain'][0] = 'new-73569090-5f67-47b1-b6a5-634bc8104c2b';
- $pane = new stdClass();
- $pane->pid = 'new-17fa67de-e033-46f2-bdd8-a138e91da0e4';
- $pane->panel = 'contentmain';
- $pane->type = 'node_form_path';
- $pane->subtype = 'node_form_path';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_node_edit_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '17fa67de-e033-46f2-bdd8-a138e91da0e4';
- $display->content['new-17fa67de-e033-46f2-bdd8-a138e91da0e4'] = $pane;
- $display->panels['contentmain'][1] = 'new-17fa67de-e033-46f2-bdd8-a138e91da0e4';
- $pane = new stdClass();
- $pane->pid = 'new-fb4920fb-24fa-425e-b6fc-958b5ccd2d52';
- $pane->panel = 'contentmain';
- $pane->type = 'form';
- $pane->subtype = 'form';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_node_edit_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = 'fb4920fb-24fa-425e-b6fc-958b5ccd2d52';
- $display->content['new-fb4920fb-24fa-425e-b6fc-958b5ccd2d52'] = $pane;
- $display->panels['contentmain'][2] = 'new-fb4920fb-24fa-425e-b6fc-958b5ccd2d52';
- $pane = new stdClass();
- $pane->pid = 'new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd';
- $pane->panel = 'sidebar';
- $pane->type = 'entity_form_field';
- $pane->subtype = 'node:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => '',
- 'formatter' => '',
- 'context' => 'argument_node_edit_1',
- 'override_title' => 1,
- 'override_title_text' => 'Featured image',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '373bd769-1e08-4ec5-85b6-0a1d2fc759fd';
- $display->content['new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd'] = $pane;
- $display->panels['sidebar'][0] = 'new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd';
- $pane = new stdClass();
- $pane->pid = 'new-51126c95-cf51-4ad6-a27a-11e4260d8023';
- $pane->panel = 'sidebar';
- $pane->type = 'entity_form_field';
- $pane->subtype = 'node:field_featured_categories';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => '',
- 'formatter' => '',
- 'context' => 'argument_node_edit_1',
- 'override_title' => 1,
- 'override_title_text' => 'Content category',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '51126c95-cf51-4ad6-a27a-11e4260d8023';
- $display->content['new-51126c95-cf51-4ad6-a27a-11e4260d8023'] = $pane;
- $display->panels['sidebar'][1] = 'new-51126c95-cf51-4ad6-a27a-11e4260d8023';
- $pane = new stdClass();
- $pane->pid = 'new-99f6c0bd-36fd-411b-9833-c0be0fab7548';
- $pane->panel = 'sidebar';
- $pane->type = 'panelizer_form_default';
- $pane->subtype = 'panelizer_form_default';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array();
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = '99f6c0bd-36fd-411b-9833-c0be0fab7548';
- $display->content['new-99f6c0bd-36fd-411b-9833-c0be0fab7548'] = $pane;
- $display->panels['sidebar'][2] = 'new-99f6c0bd-36fd-411b-9833-c0be0fab7548';
- $pane = new stdClass();
- $pane->pid = 'new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c';
- $pane->panel = 'sidebar';
- $pane->type = 'node_form_menu';
- $pane->subtype = 'node_form_menu';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_node_edit_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 3;
- $pane->locks = array();
- $pane->uuid = 'e38ab3a3-24d0-4ac2-900e-4ddb0248be0c';
- $display->content['new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c'] = $pane;
- $display->panels['sidebar'][3] = 'new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c';
- $pane = new stdClass();
- $pane->pid = 'new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d';
- $pane->panel = 'sidebar';
- $pane->type = 'node_form_publishing';
- $pane->subtype = 'node_form_publishing';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_node_edit_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 4;
- $pane->locks = array();
- $pane->uuid = '9176b962-e64f-44a6-8ebe-e03ebf0f6c3d';
- $display->content['new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d'] = $pane;
- $display->panels['sidebar'][4] = 'new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d';
- $pane = new stdClass();
- $pane->pid = 'new-6e4a98d8-3738-41b9-8c33-4b4c905c6834';
- $pane->panel = 'sidebar';
- $pane->type = 'node_form_author';
- $pane->subtype = 'node_form_author';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => array(),
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 5;
- $pane->locks = array();
- $pane->uuid = '6e4a98d8-3738-41b9-8c33-4b4c905c6834';
- $display->content['new-6e4a98d8-3738-41b9-8c33-4b4c905c6834'] = $pane;
- $display->panels['sidebar'][5] = 'new-6e4a98d8-3738-41b9-8c33-4b4c905c6834';
- $pane = new stdClass();
- $pane->pid = 'new-c0926cca-059c-4bb1-bccd-2838ec7a93f2';
- $pane->panel = 'sidebar';
- $pane->type = 'node_form_buttons';
- $pane->subtype = 'node_form_buttons';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => array(),
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 6;
- $pane->locks = array();
- $pane->uuid = 'c0926cca-059c-4bb1-bccd-2838ec7a93f2';
- $display->content['new-c0926cca-059c-4bb1-bccd-2838ec7a93f2'] = $pane;
- $display->panels['sidebar'][6] = 'new-c0926cca-059c-4bb1-bccd-2838ec7a93f2';
+ $pane = new stdClass();
+ $pane->pid = 'new-73569090-5f67-47b1-b6a5-634bc8104c2b';
+ $pane->panel = 'contentmain';
+ $pane->type = 'node_form_title';
+ $pane->subtype = 'node_form_title';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'argument_node_edit_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '73569090-5f67-47b1-b6a5-634bc8104c2b';
+ $display->content['new-73569090-5f67-47b1-b6a5-634bc8104c2b'] = $pane;
+ $display->panels['contentmain'][0] = 'new-73569090-5f67-47b1-b6a5-634bc8104c2b';
+ $pane = new stdClass();
+ $pane->pid = 'new-17fa67de-e033-46f2-bdd8-a138e91da0e4';
+ $pane->panel = 'contentmain';
+ $pane->type = 'node_form_path';
+ $pane->subtype = 'node_form_path';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'argument_node_edit_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '17fa67de-e033-46f2-bdd8-a138e91da0e4';
+ $display->content['new-17fa67de-e033-46f2-bdd8-a138e91da0e4'] = $pane;
+ $display->panels['contentmain'][1] = 'new-17fa67de-e033-46f2-bdd8-a138e91da0e4';
+ $pane = new stdClass();
+ $pane->pid = 'new-fb4920fb-24fa-425e-b6fc-958b5ccd2d52';
+ $pane->panel = 'contentmain';
+ $pane->type = 'form';
+ $pane->subtype = 'form';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'argument_node_edit_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = 'fb4920fb-24fa-425e-b6fc-958b5ccd2d52';
+ $display->content['new-fb4920fb-24fa-425e-b6fc-958b5ccd2d52'] = $pane;
+ $display->panels['contentmain'][2] = 'new-fb4920fb-24fa-425e-b6fc-958b5ccd2d52';
+ $pane = new stdClass();
+ $pane->pid = 'new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd';
+ $pane->panel = 'sidebar';
+ $pane->type = 'entity_form_field';
+ $pane->subtype = 'node:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => '',
+ 'formatter' => '',
+ 'context' => 'argument_node_edit_1',
+ 'override_title' => 1,
+ 'override_title_text' => 'Featured image',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '373bd769-1e08-4ec5-85b6-0a1d2fc759fd';
+ $display->content['new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd'] = $pane;
+ $display->panels['sidebar'][0] = 'new-373bd769-1e08-4ec5-85b6-0a1d2fc759fd';
+ $pane = new stdClass();
+ $pane->pid = 'new-51126c95-cf51-4ad6-a27a-11e4260d8023';
+ $pane->panel = 'sidebar';
+ $pane->type = 'entity_form_field';
+ $pane->subtype = 'node:field_featured_categories';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => '',
+ 'formatter' => '',
+ 'context' => 'argument_node_edit_1',
+ 'override_title' => 1,
+ 'override_title_text' => 'Content category',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '51126c95-cf51-4ad6-a27a-11e4260d8023';
+ $display->content['new-51126c95-cf51-4ad6-a27a-11e4260d8023'] = $pane;
+ $display->panels['sidebar'][1] = 'new-51126c95-cf51-4ad6-a27a-11e4260d8023';
+ $pane = new stdClass();
+ $pane->pid = 'new-99f6c0bd-36fd-411b-9833-c0be0fab7548';
+ $pane->panel = 'sidebar';
+ $pane->type = 'panelizer_form_default';
+ $pane->subtype = 'panelizer_form_default';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array();
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = '99f6c0bd-36fd-411b-9833-c0be0fab7548';
+ $display->content['new-99f6c0bd-36fd-411b-9833-c0be0fab7548'] = $pane;
+ $display->panels['sidebar'][2] = 'new-99f6c0bd-36fd-411b-9833-c0be0fab7548';
+ $pane = new stdClass();
+ $pane->pid = 'new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c';
+ $pane->panel = 'sidebar';
+ $pane->type = 'node_form_menu';
+ $pane->subtype = 'node_form_menu';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'argument_node_edit_1',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 3;
+ $pane->locks = array();
+ $pane->uuid = 'e38ab3a3-24d0-4ac2-900e-4ddb0248be0c';
+ $display->content['new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c'] = $pane;
+ $display->panels['sidebar'][3] = 'new-e38ab3a3-24d0-4ac2-900e-4ddb0248be0c';
+ $pane = new stdClass();
+ $pane->pid = 'new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d';
+ $pane->panel = 'sidebar';
+ $pane->type = 'node_form_publishing';
+ $pane->subtype = 'node_form_publishing';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'argument_node_edit_1',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 4;
+ $pane->locks = array();
+ $pane->uuid = '9176b962-e64f-44a6-8ebe-e03ebf0f6c3d';
+ $display->content['new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d'] = $pane;
+ $display->panels['sidebar'][4] = 'new-9176b962-e64f-44a6-8ebe-e03ebf0f6c3d';
+ $pane = new stdClass();
+ $pane->pid = 'new-6e4a98d8-3738-41b9-8c33-4b4c905c6834';
+ $pane->panel = 'sidebar';
+ $pane->type = 'node_form_author';
+ $pane->subtype = 'node_form_author';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => array(),
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 5;
+ $pane->locks = array();
+ $pane->uuid = '6e4a98d8-3738-41b9-8c33-4b4c905c6834';
+ $display->content['new-6e4a98d8-3738-41b9-8c33-4b4c905c6834'] = $pane;
+ $display->panels['sidebar'][5] = 'new-6e4a98d8-3738-41b9-8c33-4b4c905c6834';
+ $pane = new stdClass();
+ $pane->pid = 'new-c0926cca-059c-4bb1-bccd-2838ec7a93f2';
+ $pane->panel = 'sidebar';
+ $pane->type = 'node_form_buttons';
+ $pane->subtype = 'node_form_buttons';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => array(),
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 6;
+ $pane->locks = array();
+ $pane->uuid = 'c0926cca-059c-4bb1-bccd-2838ec7a93f2';
+ $display->content['new-c0926cca-059c-4bb1-bccd-2838ec7a93f2'] = $pane;
+ $display->panels['sidebar'][6] = 'new-c0926cca-059c-4bb1-bccd-2838ec7a93f2';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = 'new-fb4920fb-24fa-425e-b6fc-958b5ccd2d52';
$handler->conf['display'] = $display;
@@ -355,7 +355,7 @@ function panopoly_admin_default_page_manager_pages() {
'body_classes_to_add' => '',
);
$display = new panels_display();
- $display->layout = 'boxton';
+ $display->layout = 'radix_boxton';
$display->layout_settings = array();
$display->panel_settings = array(
'style_settings' => array(
@@ -373,25 +373,25 @@ function panopoly_admin_default_page_manager_pages() {
$display->uuid = '2a4bbcf3-712e-44e2-9fd8-270a2fd6e47d';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-c481f523-51bb-40ff-99d3-648dc19100a5';
- $pane->panel = 'contentmain';
- $pane->type = 'panels_layouts';
- $pane->subtype = 'panels_layouts';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array();
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = 'c481f523-51bb-40ff-99d3-648dc19100a5';
- $display->content['new-c481f523-51bb-40ff-99d3-648dc19100a5'] = $pane;
- $display->panels['contentmain'][0] = 'new-c481f523-51bb-40ff-99d3-648dc19100a5';
+ $pane = new stdClass();
+ $pane->pid = 'new-c481f523-51bb-40ff-99d3-648dc19100a5';
+ $pane->panel = 'contentmain';
+ $pane->type = 'panels_layouts';
+ $pane->subtype = 'panels_layouts';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array();
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'c481f523-51bb-40ff-99d3-648dc19100a5';
+ $display->content['new-c481f523-51bb-40ff-99d3-648dc19100a5'] = $pane;
+ $display->panels['contentmain'][0] = 'new-c481f523-51bb-40ff-99d3-648dc19100a5';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = '0';
$handler->conf['display'] = $display;
@@ -466,7 +466,7 @@ function panopoly_admin_default_page_manager_pages() {
'body_classes_to_add' => '',
);
$display = new panels_display();
- $display->layout = 'boxton';
+ $display->layout = 'radix_boxton';
$display->layout_settings = array();
$display->panel_settings = array(
'style_settings' => array(
@@ -484,44 +484,44 @@ function panopoly_admin_default_page_manager_pages() {
$display->uuid = '7f2efae5-50a7-4f07-b1f7-f8edc2dd9326';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-b63313b3-8b80-4161-a97d-78439cda58f9';
- $pane->panel = 'contentmain';
- $pane->type = 'landing_pages';
- $pane->subtype = 'landing_pages';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array();
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = 'b63313b3-8b80-4161-a97d-78439cda58f9';
- $display->content['new-b63313b3-8b80-4161-a97d-78439cda58f9'] = $pane;
- $display->panels['contentmain'][0] = 'new-b63313b3-8b80-4161-a97d-78439cda58f9';
- $pane = new stdClass();
- $pane->pid = 'new-a19a23d5-56e9-48a3-82f2-bbdf49d4b929';
- $pane->panel = 'contentmain';
- $pane->type = 'overridden_page_templates';
- $pane->subtype = 'overridden_page_templates';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array();
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = 'a19a23d5-56e9-48a3-82f2-bbdf49d4b929';
- $display->content['new-a19a23d5-56e9-48a3-82f2-bbdf49d4b929'] = $pane;
- $display->panels['contentmain'][1] = 'new-a19a23d5-56e9-48a3-82f2-bbdf49d4b929';
+ $pane = new stdClass();
+ $pane->pid = 'new-b63313b3-8b80-4161-a97d-78439cda58f9';
+ $pane->panel = 'contentmain';
+ $pane->type = 'landing_pages';
+ $pane->subtype = 'landing_pages';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array();
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'b63313b3-8b80-4161-a97d-78439cda58f9';
+ $display->content['new-b63313b3-8b80-4161-a97d-78439cda58f9'] = $pane;
+ $display->panels['contentmain'][0] = 'new-b63313b3-8b80-4161-a97d-78439cda58f9';
+ $pane = new stdClass();
+ $pane->pid = 'new-a19a23d5-56e9-48a3-82f2-bbdf49d4b929';
+ $pane->panel = 'contentmain';
+ $pane->type = 'overridden_page_templates';
+ $pane->subtype = 'overridden_page_templates';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array();
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = 'a19a23d5-56e9-48a3-82f2-bbdf49d4b929';
+ $display->content['new-a19a23d5-56e9-48a3-82f2-bbdf49d4b929'] = $pane;
+ $display->panels['contentmain'][1] = 'new-a19a23d5-56e9-48a3-82f2-bbdf49d4b929';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = '0';
$handler->conf['display'] = $display;
@@ -596,7 +596,7 @@ function panopoly_admin_default_page_manager_pages() {
'body_classes_to_add' => '',
);
$display = new panels_display();
- $display->layout = 'boxton';
+ $display->layout = 'radix_boxton';
$display->layout_settings = array();
$display->panel_settings = array(
'style_settings' => array(
@@ -614,25 +614,25 @@ function panopoly_admin_default_page_manager_pages() {
$display->uuid = '195ed3e8-b724-48fd-9057-9f5f54aa6a47';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-ad96a6eb-e0f3-44c3-b4ef-5d359f13c21a';
- $pane->panel = 'contentmain';
- $pane->type = 'general_panes';
- $pane->subtype = 'general_panes';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array();
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = 'ad96a6eb-e0f3-44c3-b4ef-5d359f13c21a';
- $display->content['new-ad96a6eb-e0f3-44c3-b4ef-5d359f13c21a'] = $pane;
- $display->panels['contentmain'][0] = 'new-ad96a6eb-e0f3-44c3-b4ef-5d359f13c21a';
+ $pane = new stdClass();
+ $pane->pid = 'new-ad96a6eb-e0f3-44c3-b4ef-5d359f13c21a';
+ $pane->panel = 'contentmain';
+ $pane->type = 'general_panes';
+ $pane->subtype = 'general_panes';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array();
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'ad96a6eb-e0f3-44c3-b4ef-5d359f13c21a';
+ $display->content['new-ad96a6eb-e0f3-44c3-b4ef-5d359f13c21a'] = $pane;
+ $display->panels['contentmain'][0] = 'new-ad96a6eb-e0f3-44c3-b4ef-5d359f13c21a';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = '0';
$handler->conf['display'] = $display;
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
index 6c50a279ee022ee43bf45298498fcdcd3a899fa0..e606774a3aafb87b85368357541c06d3e7aec21e 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
@@ -1,3 +1,16 @@
+Panopoly Core 7.x-1.21, 2015-04-29
+---------------------------
+- Update Views to version 3.11 for SA-CONTRIB-2015-103.
+- Clean up instances of deprecated panpoly_theme layouts.
+- Undefined index: default_filename in defaultconfig_defaultconfig_components()
+ (line 418.
+- Include views patch to fix destination query string on ajax calls from views.
+- Update token module to version 1.6.
+- Make theming FPPs sane.
+- Update to Drupal 7.36.
+- Update Features module to version 2.5.
+- Errors when viewing pages with fieldable panels panes with visibility rules.
+
Panopoly Core 7.x-1.20, 2015-03-25
---------------------------
- CHANGELOG.txt updates for 1.19 went wrong.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.features.field_base.inc b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.features.field_base.inc
index 1ad2266797dd4bb1f525f1780a63ca5cb5890f3d..491e9f49727950b4cb6fa754de8f2866fa196d1a 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.features.field_base.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.features.field_base.inc
@@ -17,14 +17,6 @@ function panopoly_core_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_featured_image',
- '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/panopoly/panopoly_core/panopoly_core.features.field_instance.inc b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.features.field_instance.inc
index afc463fb060c804685c79cb01a78dc41f6cd270c..5644f6f481fb99d06ff9a2f0c262e5e393928e9a 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.features.field_instance.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.features.field_instance.inc
@@ -10,7 +10,8 @@
function panopoly_core_field_default_field_instances() {
$field_instances = array();
- // Exported field_instance: 'taxonomy_term-panopoly_categories-field_featured_image'
+ // Exported field_instance:
+ // 'taxonomy_term-panopoly_categories-field_featured_image'
$field_instances['taxonomy_term-panopoly_categories-field_featured_image'] = array(
'bundle' => 'panopoly_categories',
'deleted' => 0,
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
index 1bd4f609479bbb7d491a71d55e570b41b05d5e5c..cba06c8627172f3aef58b86aa752544363d67d1a 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
@@ -72,9 +72,9 @@ features[variable][] = panelizer_taxonomy_term:panopoly_categories_allowed_layou
features[variable][] = panelizer_taxonomy_term:panopoly_categories_allowed_types_default
features[views_view][] = panopoly_taxonomy
-; Information added by Drupal.org packaging script on 2015-03-25
-version = "7.x-1.20"
+; Information added by Drupal.org packaging script on 2015-04-29
+version = "7.x-1.21"
core = "7.x"
project = "panopoly_core"
-datestamp = "1427310489"
+datestamp = "1430338256"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.install b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.install
index de0f16b893fc26bd367fe5241111d9a6482b0df6..02225301dbcad92565fe87be962733e1ce30c2d2 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.install
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.install
@@ -189,3 +189,24 @@ function panopoly_core_update_7102() {
}
variable_set('panels_page_allowed_layouts', serialize($allowed_layouts));
}
+
+/**
+ * Disown content types that belong to disabled modules.
+ */
+function panopoly_core_update_7103() {
+ $result = db_query("SELECT type, name, module FROM {node_type} WHERE module <> 'node'");
+ foreach ($result as $row) {
+ if (!module_exists($row->module)) {
+ db_update('node_type')
+ ->fields(array(
+ 'module' => 'node',
+ 'custom' => 1,
+ 'modified' => 1,
+ 'locked' => 0,
+ 'disabled' => 0,
+ ))
+ ->condition('type', $row->type)
+ ->execute();
+ }
+ }
+}
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make
index e37f38f42d9d7c0073a7ac2de7c4840e5e1e827f..b0187a89b37595ea4af31f95f9d3b6ad65dfc76a 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make
@@ -24,8 +24,10 @@ projects[fieldable_panels_panes][version] = 1.5
projects[fieldable_panels_panes][subdir] = contrib
projects[fieldable_panels_panes][patch][2283263] = http://drupal.org/files/issues/fieldable_panels_panes-n2283263-5.patch
projects[fieldable_panels_panes][patch][2256503] = http://www.drupal.org/files/issues/fieldable_panels_panes-n2256503-12-backport-fpp15.patch
-projects[fieldable_panels_panes][patch][2415427] = https://www.drupal.org/files/issues/fieldable_panels_pane-avoid-reload-2415427-4.patch
+projects[fieldable_panels_panes][patch][2415427] = http://www.drupal.org/files/issues/fieldable_panels_pane-avoid-reload-2415427-4.patch
projects[fieldable_panels_panes][patch][2146479] = http://www.drupal.org/files/issues/2146479-admin-menu-map-conflict.patch
+projects[fieldable_panels_panes][patch][2463965] = http://www.drupal.org/files/issues/fieldable_panels_panes-title-visibility-rules-2463965-1.patch
+projects[fieldable_panels_panes][patch][2304921] = http://www.drupal.org/files/issues/fpp_rendering-2304921-1.patch
projects[pm_existing_pages][version] = 1.4
projects[pm_existing_pages][subdir] = contrib
@@ -35,9 +37,10 @@ projects[fape][subdir] = contrib
; Views Magic
-projects[views][version] = 3.10
+projects[views][version] = 3.11
projects[views][subdir] = contrib
projects[views][patch][2037469] = http://drupal.org/files/views-exposed-sorts-2037469-1.patch
+projects[views][patch][1036962] = http://drupal.org/files/issues/views-ajax-nginx-1036962-71.patch
projects[views_autocomplete_filters][version] = 1.1
projects[views_autocomplete_filters][subdir] = contrib
@@ -55,7 +58,7 @@ projects[pathauto][version] = 1.2
projects[pathauto][subdir] = contrib
projects[pathauto][patch][936222] = http://drupal.org/files/issues/pathauto-persist-936222-195-pathauto-state.patch
-projects[token][version] = 1.5
+projects[token][version] = 1.6
projects[token][subdir] = contrib
projects[entity][version] = 1.6
@@ -87,7 +90,7 @@ projects[apps][version] = 1.0-beta20
projects[apps][subdir] = contrib
projects[apps][patch][2430915] = https://www.drupal.org/files/issues/apps-drush-default-apps-2430915-1.patch
-projects[features][version] = 2.3
+projects[features][version] = 2.5
projects[features][subdir] = contrib
projects[strongarm][version] = 2.0
@@ -99,6 +102,7 @@ projects[defaultconfig][patch][2042799] = http://drupal.org/files/default_config
projects[defaultconfig][patch][2043307] = http://drupal.org/files/defaultconfig_include_features_file.patch
projects[defaultconfig][patch][2008178] = http://drupal.org/files/defaultconfig-rebuild-filters-2008178-4_0.patch
projects[defaultconfig][patch][1861054] = http://drupal.org/files/fix-defaultconfig_rebuild_all.patch
+projects[defaultconfig][patch][1900574] = http://drupal.org/files/1900574.defaultconfig.undefinedindex_11.patch
projects[defaultcontent][version] = 1.0-alpha9
projects[defaultcontent][subdir] = contrib
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.panelizer.inc b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.panelizer.inc
index 8b8893b20a579fce8c293026c893840e10c8dd29..59ebfb8d669608548149cb5133450c9c45f38633 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.panelizer.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.panelizer.inc
@@ -45,102 +45,102 @@ function panopoly_core_panelizer_defaults() {
$display->uuid = 'f460f0ba-59f1-4d87-a78c-22fac4b91ce7';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-3386209f-d6b4-4941-ba89-a30ea33146ce';
- $pane->panel = 'contentmain';
- $pane->type = 'views_panes';
- $pane->subtype = 'panopoly_taxonomy-taxonomy_content';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'items_per_page' => '10',
- 'fields_override' => array(
- 'field_featured_image' => 1,
- 'title' => 1,
- 'created' => 1,
- 'name' => 0,
- 'body' => 1,
- ),
- 'exposed' => array(
- 'widget_title' => '',
- 'sort_by' => 'created',
- 'sort_order' => 'DESC',
- ),
- 'context' => array(
- 0 => 'panelizer',
- ),
- 'override_title' => '',
- 'override_title_text' => '',
- 'view_mode' => 'teaser',
- 'widget_title' => NULL,
- 'view_settings' => 'fields',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '3386209f-d6b4-4941-ba89-a30ea33146ce';
- $display->content['new-3386209f-d6b4-4941-ba89-a30ea33146ce'] = $pane;
- $display->panels['contentmain'][0] = 'new-3386209f-d6b4-4941-ba89-a30ea33146ce';
- $pane = new stdClass();
- $pane->pid = 'new-f32d7549-cba1-4344-ae23-9e90ac298e1a';
- $pane->panel = 'sidebar';
- $pane->type = 'entity_field';
- $pane->subtype = 'taxonomy_term:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'image_link' => '',
- 'image_style' => 'panopoly_image_featured',
- ),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = 'f32d7549-cba1-4344-ae23-9e90ac298e1a';
- $display->content['new-f32d7549-cba1-4344-ae23-9e90ac298e1a'] = $pane;
- $display->panels['sidebar'][0] = 'new-f32d7549-cba1-4344-ae23-9e90ac298e1a';
- $pane = new stdClass();
- $pane->pid = 'new-e910698d-eee1-4a4c-b721-cd47cca92681';
- $pane->panel = 'sidebar';
- $pane->type = 'term_description';
- $pane->subtype = 'term_description';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'panelizer',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = 'e910698d-eee1-4a4c-b721-cd47cca92681';
- $display->content['new-e910698d-eee1-4a4c-b721-cd47cca92681'] = $pane;
- $display->panels['sidebar'][1] = 'new-e910698d-eee1-4a4c-b721-cd47cca92681';
+ $pane = new stdClass();
+ $pane->pid = 'new-3386209f-d6b4-4941-ba89-a30ea33146ce';
+ $pane->panel = 'contentmain';
+ $pane->type = 'views_panes';
+ $pane->subtype = 'panopoly_taxonomy-taxonomy_content';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'items_per_page' => '10',
+ 'fields_override' => array(
+ 'field_featured_image' => 1,
+ 'title' => 1,
+ 'created' => 1,
+ 'name' => 0,
+ 'body' => 1,
+ ),
+ 'exposed' => array(
+ 'widget_title' => '',
+ 'sort_by' => 'created',
+ 'sort_order' => 'DESC',
+ ),
+ 'context' => array(
+ 0 => 'panelizer',
+ ),
+ 'override_title' => '',
+ 'override_title_text' => '',
+ 'view_mode' => 'teaser',
+ 'widget_title' => NULL,
+ 'view_settings' => 'fields',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '3386209f-d6b4-4941-ba89-a30ea33146ce';
+ $display->content['new-3386209f-d6b4-4941-ba89-a30ea33146ce'] = $pane;
+ $display->panels['contentmain'][0] = 'new-3386209f-d6b4-4941-ba89-a30ea33146ce';
+ $pane = new stdClass();
+ $pane->pid = 'new-f32d7549-cba1-4344-ae23-9e90ac298e1a';
+ $pane->panel = 'sidebar';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'taxonomy_term:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'image_link' => '',
+ 'image_style' => 'panopoly_image_featured',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'f32d7549-cba1-4344-ae23-9e90ac298e1a';
+ $display->content['new-f32d7549-cba1-4344-ae23-9e90ac298e1a'] = $pane;
+ $display->panels['sidebar'][0] = 'new-f32d7549-cba1-4344-ae23-9e90ac298e1a';
+ $pane = new stdClass();
+ $pane->pid = 'new-e910698d-eee1-4a4c-b721-cd47cca92681';
+ $pane->panel = 'sidebar';
+ $pane->type = 'term_description';
+ $pane->subtype = 'term_description';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'panelizer',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = 'e910698d-eee1-4a4c-b721-cd47cca92681';
+ $display->content['new-e910698d-eee1-4a4c-b721-cd47cca92681'] = $pane;
+ $display->panels['sidebar'][1] = 'new-e910698d-eee1-4a4c-b721-cd47cca92681';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = 'new-f32d7549-cba1-4344-ae23-9e90ac298e1a';
$panelizer->display = $display;
@@ -166,12 +166,13 @@ function panopoly_core_panelizer_defaults() {
$panelizer->link_to_entity = TRUE;
$panelizer->extra = '';
$display = new panels_display();
- $display->layout = 'flexible';
+ $display->layout = 'radix_boxton';
$display->layout_settings = array();
$display->panel_settings = array(
'style_settings' => array(
'default' => NULL,
'center' => NULL,
+ 'contentmain' => NULL,
),
);
$display->cache = array();
@@ -179,61 +180,61 @@ function panopoly_core_panelizer_defaults() {
$display->uuid = 'a68b2d24-77c7-4ad3-be84-7d8d537416ce';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-0c8d8fde-7a93-4242-bd92-f5810efb1b2a';
- $pane->panel = 'center';
- $pane->type = 'entity_field';
- $pane->subtype = 'taxonomy_term:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'image_link' => '',
- 'image_style' => 'panopoly_image_half',
- ),
- 'context' => 'panelizer',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '0c8d8fde-7a93-4242-bd92-f5810efb1b2a';
- $display->content['new-0c8d8fde-7a93-4242-bd92-f5810efb1b2a'] = $pane;
- $display->panels['center'][0] = 'new-0c8d8fde-7a93-4242-bd92-f5810efb1b2a';
- $pane = new stdClass();
- $pane->pid = 'new-2263de4c-477a-4889-b074-16ca4286ee86';
- $pane->panel = 'center';
- $pane->type = 'term_description';
- $pane->subtype = 'term_description';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'panelizer',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '2263de4c-477a-4889-b074-16ca4286ee86';
- $display->content['new-2263de4c-477a-4889-b074-16ca4286ee86'] = $pane;
- $display->panels['center'][1] = 'new-2263de4c-477a-4889-b074-16ca4286ee86';
+ $pane = new stdClass();
+ $pane->pid = 'new-0c8d8fde-7a93-4242-bd92-f5810efb1b2a';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'taxonomy_term:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'image_link' => '',
+ 'image_style' => 'panopoly_image_half',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '0c8d8fde-7a93-4242-bd92-f5810efb1b2a';
+ $display->content['new-0c8d8fde-7a93-4242-bd92-f5810efb1b2a'] = $pane;
+ $display->panels['contentmain'][0] = 'new-0c8d8fde-7a93-4242-bd92-f5810efb1b2a';
+ $pane = new stdClass();
+ $pane->pid = 'new-2263de4c-477a-4889-b074-16ca4286ee86';
+ $pane->panel = 'contentmain';
+ $pane->type = 'term_description';
+ $pane->subtype = 'term_description';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'panelizer',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '2263de4c-477a-4889-b074-16ca4286ee86';
+ $display->content['new-2263de4c-477a-4889-b074-16ca4286ee86'] = $pane;
+ $display->panels['contentmain'][1] = 'new-2263de4c-477a-4889-b074-16ca4286ee86';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = 'new-0c8d8fde-7a93-4242-bd92-f5810efb1b2a';
$panelizer->display = $display;
@@ -274,74 +275,74 @@ function panopoly_core_panelizer_defaults() {
$display->uuid = '8279fd0a-0c0a-491f-950b-fe73fff94d66';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-11bc2cac-aa66-4bf0-b5e2-52068a69b9c3';
- $pane->panel = 'column1';
- $pane->type = 'entity_field';
- $pane->subtype = 'taxonomy_term:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'image_style' => 'panopoly_image_featured',
- 'image_link' => 'content',
- ),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'view_mode' => NULL,
- 'widget_title' => NULL,
- 'items_per_page' => NULL,
- 'exposed' => array(
- 'sort_by' => NULL,
- 'sort_order' => NULL,
- ),
- 'use_pager' => NULL,
- 'pager_id' => NULL,
- 'offset' => NULL,
- 'link_to_view' => NULL,
- 'more_link' => NULL,
- 'path' => NULL,
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '11bc2cac-aa66-4bf0-b5e2-52068a69b9c3';
- $display->content['new-11bc2cac-aa66-4bf0-b5e2-52068a69b9c3'] = $pane;
- $display->panels['column1'][0] = 'new-11bc2cac-aa66-4bf0-b5e2-52068a69b9c3';
- $pane = new stdClass();
- $pane->pid = 'new-92686c6d-d579-4830-85a3-8e67e42b3ee7';
- $pane->panel = 'column2';
- $pane->type = 'term_description';
- $pane->subtype = 'term_description';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '92686c6d-d579-4830-85a3-8e67e42b3ee7';
- $display->content['new-92686c6d-d579-4830-85a3-8e67e42b3ee7'] = $pane;
- $display->panels['column2'][0] = 'new-92686c6d-d579-4830-85a3-8e67e42b3ee7';
+ $pane = new stdClass();
+ $pane->pid = 'new-11bc2cac-aa66-4bf0-b5e2-52068a69b9c3';
+ $pane->panel = 'column1';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'taxonomy_term:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'image_style' => 'panopoly_image_featured',
+ 'image_link' => 'content',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'view_mode' => NULL,
+ 'widget_title' => NULL,
+ 'items_per_page' => NULL,
+ 'exposed' => array(
+ 'sort_by' => NULL,
+ 'sort_order' => NULL,
+ ),
+ 'use_pager' => NULL,
+ 'pager_id' => NULL,
+ 'offset' => NULL,
+ 'link_to_view' => NULL,
+ 'more_link' => NULL,
+ 'path' => NULL,
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '11bc2cac-aa66-4bf0-b5e2-52068a69b9c3';
+ $display->content['new-11bc2cac-aa66-4bf0-b5e2-52068a69b9c3'] = $pane;
+ $display->panels['column1'][0] = 'new-11bc2cac-aa66-4bf0-b5e2-52068a69b9c3';
+ $pane = new stdClass();
+ $pane->pid = 'new-92686c6d-d579-4830-85a3-8e67e42b3ee7';
+ $pane->panel = 'column2';
+ $pane->type = 'term_description';
+ $pane->subtype = 'term_description';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '92686c6d-d579-4830-85a3-8e67e42b3ee7';
+ $display->content['new-92686c6d-d579-4830-85a3-8e67e42b3ee7'] = $pane;
+ $display->panels['column2'][0] = 'new-92686c6d-d579-4830-85a3-8e67e42b3ee7';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = 'new-11bc2cac-aa66-4bf0-b5e2-52068a69b9c3';
$panelizer->display = $display;
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
index 85f15f26a4c95ceaf724cfd32ed290704d624e18..1e5eb74bee6cd73eb0004ac2ef68455c0af7a74c 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
@@ -1,3 +1,8 @@
+Panopoly Magic 7.x-1.21, 2015-04-29
+----------------------------
+- Allow panopoly magic to affect other forms.
+- PHP notice when adding Image pane as an editor.
+
Panopoly Magic 7.x-1.20, 2015-03-25
----------------------------
- CHANGELOG.txt updates for 1.19 went wrong.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.api.php b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.api.php
new file mode 100644
index 0000000000000000000000000000000000000000..11602362984391bfefc989bebcec3fa43ad0ca8a
--- /dev/null
+++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.api.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @file
+ * Hooks provided by Panopoly Magic.
+ */
+
+/**
+ * @addtogroup panopoly Panopoly hooks
+ * @{
+ */
+
+/**
+ * Alter the list of forms to improve.
+ *
+ * @param &$form_ids
+ * The list of form ids for the forms that panopoly_magic will improve. Add or
+ * remove items from this list.
+ *
+ * @see https://www.drupal.org/node/2261061
+ */
+function hook_panopoly_magic_forms_to_improve_alter(&$form_ids) {
+ // If you added your own content type and want the extra form fields added to
+ // the fieldsets that panopoly_magic creates, you can add the form id of your
+ // settings form here.
+ $form_ids[] = 'my_module_widget_content_type_edit_form';
+}
+
+/**
+ * @}
+ */
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
index 0e89abd9bf23d6691acc972c894bede3ac5619ac..760bb69c293fd0d5fd757c2b7719a620ad6aff82 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
@@ -14,9 +14,9 @@ stylesheets[all][] = css/panopoly-magic.css
stylesheets[all][] = css/panopoly-modal.css
features[features_api][] = api:2
-; Information added by Drupal.org packaging script on 2015-03-25
-version = "7.x-1.20"
+; Information added by Drupal.org packaging script on 2015-04-29
+version = "7.x-1.21"
core = "7.x"
project = "panopoly_magic"
-datestamp = "1427310785"
+datestamp = "1430338685"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.module b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.module
index 142aed60124edb3e8e02a3d4f3cf7d64f194c300..833e77fac1c4ba1886312bd8215f2df332a24a40 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.module
+++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.module
@@ -212,13 +212,13 @@ function panopoly_magic_form_alter(&$form, &$form_state, $form_id) {
* Add a custom preview to the content type edit form and style edit form. This is applied in all cases, except for cases where
* we are customizing an entity (i.e. fieldable panels panes) because we cannot reliable regenerate a preview without saving.
*/
- $ids_to_alter = array(
+ $extra_form_ids_with_preview = array(
'panels_edit_style_settings_form',
'panels_edit_style_type_form',
'ctools_entity_field_content_type_formatter_options',
'ctools_entity_field_content_type_formatter_styles',
);
- if (variable_get('panopoly_magic_live_preview', 1) && (strpos($form_id, '_content_type_edit_form') || in_array($form_id, $ids_to_alter))) {
+ if (variable_get('panopoly_magic_live_preview', 1) && (strpos($form_id, '_content_type_edit_form') || in_array($form_id, $extra_form_ids_with_preview))) {
// Start the magic
$pane = $form_id == 'panels_edit_style_settings_form' ? $form_state['display']->content[$form_state['pid']] : $form_state['pane'];
@@ -452,6 +452,8 @@ function panopoly_magic_form_alter(&$form, &$form_state, $form_id) {
'panels_edit_style_settings_form'
);
+ drupal_alter('panopoly_magic_forms_to_improve', $forms_to_improve);
+
if (in_array($form_id, $forms_to_improve)) {
// Grab child elements and create the fieldset.
@@ -567,6 +569,10 @@ function panopoly_magic_form_post_render_preview($output, $form) {
*/
function panopoly_magic_render_fieldable_panels_pane_preview($type, $subtype, $conf, $keywords, $args, $context) {
$entity = $conf['fieldable_panels_pane'];
+ // Prevents PHP notice when not admin user (see issue #2463389).
+ if (!isset($entity->view_access)) {
+ $entity->view_access = NULL;
+ }
if ($entity && fieldable_panels_panes_access('view', $entity)) {
$settings = field_bundle_settings('fieldable_panels_pane', $entity->bundle);
$block = new stdClass();
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
index b5c57ec91640aebe882799ae590b5001e9c2a935..761f3fd51abc2c0dd9b0601b97a25f9b3a775b2f 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
@@ -1,3 +1,8 @@
+Panopoly Pages 7.x-1.21, 2015-04-29
+----------------------------
+- Clean up instances of deprecated panpoly_theme layouts.
+- Update Features module to version 2.5.
+
Panopoly Pages 7.x-1.20, 2015-03-25
----------------------------
- SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'rid' cannot be
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.features.field_base.inc b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.features.field_base.inc
index 0dfac66e49ff664677c97e2da7947293073403ea..c372345c8595ad6180ba863e848eaf4be57904c4 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.features.field_base.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.features.field_base.inc
@@ -19,14 +19,6 @@ function panopoly_pages_field_default_field_bases() {
0 => 'node',
),
'field_name' => 'body',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -46,14 +38,6 @@ function panopoly_pages_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_featured_categories',
- 'foreign keys' => array(
- 'tid' => array(
- 'columns' => array(
- 'tid' => 'tid',
- ),
- 'table' => 'taxonomy_term_data',
- ),
- ),
'indexes' => array(
'tid' => array(
0 => 'tid',
@@ -80,7 +64,6 @@ function panopoly_pages_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_featured_status',
- 'foreign keys' => array(),
'indexes' => array(
'value' => array(
0 => 'value',
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
index b32f2e5295f9d172982ea8d1250bea7fcbb822bf..2e9ac9cc533e67668f52f89af5ea17bb556930a6 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
@@ -67,9 +67,9 @@ features[variable][] = panelizer_node:panopoly_page_allowed_layouts_default
features[variable][] = panelizer_node:panopoly_page_allowed_types_default
features[variable][] = save_continue_panopoly_page
-; Information added by Drupal.org packaging script on 2015-03-25
-version = "7.x-1.20"
+; Information added by Drupal.org packaging script on 2015-04-29
+version = "7.x-1.21"
core = "7.x"
project = "panopoly_pages"
-datestamp = "1427310793"
+datestamp = "1430338689"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.pages_default.inc b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.pages_default.inc
index 667085f913db64b0f6f8a55c738689c2bf36b116..a46f09424270a366a0e308006c1a1b655478bfb2 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.pages_default.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.pages_default.inc
@@ -58,98 +58,98 @@ function panopoly_pages_default_page_manager_handlers() {
$display->uuid = 'f9b8005f-1975-4cf6-b683-96ee55f9f3bb';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-976a2d37-be63-4e79-b68e-a1f0046e2493';
- $pane->panel = 'contentmain';
- $pane->type = 'node_form_title';
- $pane->subtype = 'node_form_title';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_node_edit_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '976a2d37-be63-4e79-b68e-a1f0046e2493';
- $display->content['new-976a2d37-be63-4e79-b68e-a1f0046e2493'] = $pane;
- $display->panels['contentmain'][0] = 'new-976a2d37-be63-4e79-b68e-a1f0046e2493';
- $pane = new stdClass();
- $pane->pid = 'new-6cbb254d-cda4-45c6-9ee4-e54637d68e2b';
- $pane->panel = 'contentmain';
- $pane->type = 'node_form_path';
- $pane->subtype = 'node_form_path';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_node_edit_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '6cbb254d-cda4-45c6-9ee4-e54637d68e2b';
- $display->content['new-6cbb254d-cda4-45c6-9ee4-e54637d68e2b'] = $pane;
- $display->panels['contentmain'][1] = 'new-6cbb254d-cda4-45c6-9ee4-e54637d68e2b';
- $pane = new stdClass();
- $pane->pid = 'new-7ac7a702-b244-4d5f-9a69-62acf27fdb8c';
- $pane->panel = 'contentmain';
- $pane->type = 'node_form_menu';
- $pane->subtype = 'node_form_menu';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_node_edit_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = '7ac7a702-b244-4d5f-9a69-62acf27fdb8c';
- $display->content['new-7ac7a702-b244-4d5f-9a69-62acf27fdb8c'] = $pane;
- $display->panels['contentmain'][2] = 'new-7ac7a702-b244-4d5f-9a69-62acf27fdb8c';
- $pane = new stdClass();
- $pane->pid = 'new-5a76829f-fb2b-4f02-9983-55136e36205a';
- $pane->panel = 'contentmain';
- $pane->type = 'node_form_buttons';
- $pane->subtype = 'node_form_buttons';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => 'argument_node_edit_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 3;
- $pane->locks = array();
- $pane->uuid = '5a76829f-fb2b-4f02-9983-55136e36205a';
- $display->content['new-5a76829f-fb2b-4f02-9983-55136e36205a'] = $pane;
- $display->panels['contentmain'][3] = 'new-5a76829f-fb2b-4f02-9983-55136e36205a';
+ $pane = new stdClass();
+ $pane->pid = 'new-976a2d37-be63-4e79-b68e-a1f0046e2493';
+ $pane->panel = 'contentmain';
+ $pane->type = 'node_form_title';
+ $pane->subtype = 'node_form_title';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'argument_node_edit_1',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '976a2d37-be63-4e79-b68e-a1f0046e2493';
+ $display->content['new-976a2d37-be63-4e79-b68e-a1f0046e2493'] = $pane;
+ $display->panels['contentmain'][0] = 'new-976a2d37-be63-4e79-b68e-a1f0046e2493';
+ $pane = new stdClass();
+ $pane->pid = 'new-6cbb254d-cda4-45c6-9ee4-e54637d68e2b';
+ $pane->panel = 'contentmain';
+ $pane->type = 'node_form_path';
+ $pane->subtype = 'node_form_path';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'argument_node_edit_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '6cbb254d-cda4-45c6-9ee4-e54637d68e2b';
+ $display->content['new-6cbb254d-cda4-45c6-9ee4-e54637d68e2b'] = $pane;
+ $display->panels['contentmain'][1] = 'new-6cbb254d-cda4-45c6-9ee4-e54637d68e2b';
+ $pane = new stdClass();
+ $pane->pid = 'new-7ac7a702-b244-4d5f-9a69-62acf27fdb8c';
+ $pane->panel = 'contentmain';
+ $pane->type = 'node_form_menu';
+ $pane->subtype = 'node_form_menu';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'argument_node_edit_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = '7ac7a702-b244-4d5f-9a69-62acf27fdb8c';
+ $display->content['new-7ac7a702-b244-4d5f-9a69-62acf27fdb8c'] = $pane;
+ $display->panels['contentmain'][2] = 'new-7ac7a702-b244-4d5f-9a69-62acf27fdb8c';
+ $pane = new stdClass();
+ $pane->pid = 'new-5a76829f-fb2b-4f02-9983-55136e36205a';
+ $pane->panel = 'contentmain';
+ $pane->type = 'node_form_buttons';
+ $pane->subtype = 'node_form_buttons';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => 'argument_node_edit_1',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 3;
+ $pane->locks = array();
+ $pane->uuid = '5a76829f-fb2b-4f02-9983-55136e36205a';
+ $display->content['new-5a76829f-fb2b-4f02-9983-55136e36205a'] = $pane;
+ $display->panels['contentmain'][3] = 'new-5a76829f-fb2b-4f02-9983-55136e36205a';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = 'new-976a2d37-be63-4e79-b68e-a1f0046e2493';
$handler->conf['display'] = $display;
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.panelizer.inc b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.panelizer.inc
index 768120fb03d57847d867c76d14fb0c19fa902736..50899ee20dee2dbcaffd898a115a48aea4f27ee6 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.panelizer.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.panelizer.inc
@@ -30,7 +30,7 @@ function panopoly_pages_panelizer_defaults() {
$panelizer->link_to_entity = TRUE;
$panelizer->extra = array();
$display = new panels_display();
- $display->layout = 'boxton';
+ $display->layout = 'radix_boxton';
$display->layout_settings = array();
$display->panel_settings = array(
'style_settings' => array(
@@ -84,157 +84,157 @@ function panopoly_pages_panelizer_defaults() {
$display->uuid = '16346c80-6fcf-4cee-bf7a-9c0173fc2916';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'image_link' => 'content',
- 'image_style' => 'panopoly_image_half',
- ),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
- $display->content['new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1'] = $pane;
- $display->panels['contentmain'][0] = 'new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
- $pane = new stdClass();
- $pane->pid = 'new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:body';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'text_default',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'trim_length' => '250',
- ),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
- $display->content['new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b'] = $pane;
- $display->panels['contentmain'][1] = 'new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
- $pane = new stdClass();
- $pane->pid = 'new-f3bf9c22-9b22-41d2-a57e-110951093871';
- $pane->panel = 'contentmain';
- $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' => 'featured',
- 'identifier' => '',
- 'link' => TRUE,
- 'context' => 'panelizer',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_class' => 'link-wrapper',
- );
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = 'f3bf9c22-9b22-41d2-a57e-110951093871';
- $display->content['new-f3bf9c22-9b22-41d2-a57e-110951093871'] = $pane;
- $display->panels['contentmain'][2] = 'new-f3bf9c22-9b22-41d2-a57e-110951093871';
- $pane = new stdClass();
- $pane->pid = 'new-0a2c7b96-5f45-4e85-8e00-88fee50f4f71';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_featured_categories';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'inline',
- 'formatter' => 'taxonomy_term_reference_link',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 3;
- $pane->locks = array();
- $pane->uuid = '0a2c7b96-5f45-4e85-8e00-88fee50f4f71';
- $display->content['new-0a2c7b96-5f45-4e85-8e00-88fee50f4f71'] = $pane;
- $display->panels['contentmain'][3] = 'new-0a2c7b96-5f45-4e85-8e00-88fee50f4f71';
- $pane = new stdClass();
- $pane->pid = 'new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
- $pane->panel = 'sidebar';
- $pane->type = 'menu_tree';
- $pane->subtype = 'main-menu';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'menu_name' => 'main-menu',
- 'parent_mlid' => 'main-menu:0',
- 'title_link' => 0,
- 'admin_title' => '',
- 'level' => '2',
- 'follow' => 0,
- 'depth' => 0,
- 'expanded' => 1,
- 'sort' => 0,
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = 'c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
- $display->content['new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1'] = $pane;
- $display->panels['sidebar'][0] = 'new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
+ $pane = new stdClass();
+ $pane->pid = 'new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'image_link' => 'content',
+ 'image_style' => 'panopoly_image_half',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
+ $display->content['new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1'] = $pane;
+ $display->panels['contentmain'][0] = 'new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
+ $pane = new stdClass();
+ $pane->pid = 'new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:body';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'text_default',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'trim_length' => '250',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
+ $display->content['new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b'] = $pane;
+ $display->panels['contentmain'][1] = 'new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
+ $pane = new stdClass();
+ $pane->pid = 'new-f3bf9c22-9b22-41d2-a57e-110951093871';
+ $pane->panel = 'contentmain';
+ $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' => 'featured',
+ 'identifier' => '',
+ 'link' => TRUE,
+ 'context' => 'panelizer',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_class' => 'link-wrapper',
+ );
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = 'f3bf9c22-9b22-41d2-a57e-110951093871';
+ $display->content['new-f3bf9c22-9b22-41d2-a57e-110951093871'] = $pane;
+ $display->panels['contentmain'][2] = 'new-f3bf9c22-9b22-41d2-a57e-110951093871';
+ $pane = new stdClass();
+ $pane->pid = 'new-0a2c7b96-5f45-4e85-8e00-88fee50f4f71';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_featured_categories';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'inline',
+ 'formatter' => 'taxonomy_term_reference_link',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 3;
+ $pane->locks = array();
+ $pane->uuid = '0a2c7b96-5f45-4e85-8e00-88fee50f4f71';
+ $display->content['new-0a2c7b96-5f45-4e85-8e00-88fee50f4f71'] = $pane;
+ $display->panels['contentmain'][3] = 'new-0a2c7b96-5f45-4e85-8e00-88fee50f4f71';
+ $pane = new stdClass();
+ $pane->pid = 'new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
+ $pane->panel = 'sidebar';
+ $pane->type = 'menu_tree';
+ $pane->subtype = 'main-menu';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'menu_name' => 'main-menu',
+ 'parent_mlid' => 'main-menu:0',
+ 'title_link' => 0,
+ 'admin_title' => '',
+ 'level' => '2',
+ 'follow' => 0,
+ 'depth' => 0,
+ 'expanded' => 1,
+ 'sort' => 0,
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
+ $display->content['new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1'] = $pane;
+ $display->panels['sidebar'][0] = 'new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = 'new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
$panelizer->display = $display;
@@ -274,124 +274,124 @@ function panopoly_pages_panelizer_defaults() {
$display->uuid = '10c9e351-f69c-4629-b191-77b8b01f4f1c';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-e0d93093-20b4-42cd-bf23-6f2f487240a6';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'image_style' => 'panopoly_image_half',
- 'image_link' => '',
- ),
- 'context' => 'panelizer',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = 'e0d93093-20b4-42cd-bf23-6f2f487240a6';
- $display->content['new-e0d93093-20b4-42cd-bf23-6f2f487240a6'] = $pane;
- $display->panels['contentmain'][0] = 'new-e0d93093-20b4-42cd-bf23-6f2f487240a6';
- $pane = new stdClass();
- $pane->pid = 'new-74f82699-93ba-4b15-8bcf-e3bfa1894d40';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:body';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'text_default',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'panelizer',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '74f82699-93ba-4b15-8bcf-e3bfa1894d40';
- $display->content['new-74f82699-93ba-4b15-8bcf-e3bfa1894d40'] = $pane;
- $display->panels['contentmain'][1] = 'new-74f82699-93ba-4b15-8bcf-e3bfa1894d40';
- $pane = new stdClass();
- $pane->pid = 'new-96fb1bf5-7ac2-4566-9dae-876a363c71c9';
- $pane->panel = 'contentmain';
- $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' => 'default',
- 'identifier' => '',
- 'link' => TRUE,
- 'context' => 'panelizer',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_class' => 'link-wrapper',
- );
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = '96fb1bf5-7ac2-4566-9dae-876a363c71c9';
- $display->content['new-96fb1bf5-7ac2-4566-9dae-876a363c71c9'] = $pane;
- $display->panels['contentmain'][2] = 'new-96fb1bf5-7ac2-4566-9dae-876a363c71c9';
- $pane = new stdClass();
- $pane->pid = 'new-ade8f2e7-1173-418b-8f94-0a2d8f4cdb9d';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_featured_categories';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'inline',
- 'formatter' => 'taxonomy_term_reference_link',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'panelizer',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 3;
- $pane->locks = array();
- $pane->uuid = 'ade8f2e7-1173-418b-8f94-0a2d8f4cdb9d';
- $display->content['new-ade8f2e7-1173-418b-8f94-0a2d8f4cdb9d'] = $pane;
- $display->panels['contentmain'][3] = 'new-ade8f2e7-1173-418b-8f94-0a2d8f4cdb9d';
+ $pane = new stdClass();
+ $pane->pid = 'new-e0d93093-20b4-42cd-bf23-6f2f487240a6';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'image_style' => 'panopoly_image_half',
+ 'image_link' => '',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'e0d93093-20b4-42cd-bf23-6f2f487240a6';
+ $display->content['new-e0d93093-20b4-42cd-bf23-6f2f487240a6'] = $pane;
+ $display->panels['contentmain'][0] = 'new-e0d93093-20b4-42cd-bf23-6f2f487240a6';
+ $pane = new stdClass();
+ $pane->pid = 'new-74f82699-93ba-4b15-8bcf-e3bfa1894d40';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:body';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'text_default',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'panelizer',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '74f82699-93ba-4b15-8bcf-e3bfa1894d40';
+ $display->content['new-74f82699-93ba-4b15-8bcf-e3bfa1894d40'] = $pane;
+ $display->panels['contentmain'][1] = 'new-74f82699-93ba-4b15-8bcf-e3bfa1894d40';
+ $pane = new stdClass();
+ $pane->pid = 'new-96fb1bf5-7ac2-4566-9dae-876a363c71c9';
+ $pane->panel = 'contentmain';
+ $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' => 'default',
+ 'identifier' => '',
+ 'link' => TRUE,
+ 'context' => 'panelizer',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_class' => 'link-wrapper',
+ );
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = '96fb1bf5-7ac2-4566-9dae-876a363c71c9';
+ $display->content['new-96fb1bf5-7ac2-4566-9dae-876a363c71c9'] = $pane;
+ $display->panels['contentmain'][2] = 'new-96fb1bf5-7ac2-4566-9dae-876a363c71c9';
+ $pane = new stdClass();
+ $pane->pid = 'new-ade8f2e7-1173-418b-8f94-0a2d8f4cdb9d';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_featured_categories';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'inline',
+ 'formatter' => 'taxonomy_term_reference_link',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'panelizer',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 3;
+ $pane->locks = array();
+ $pane->uuid = 'ade8f2e7-1173-418b-8f94-0a2d8f4cdb9d';
+ $display->content['new-ade8f2e7-1173-418b-8f94-0a2d8f4cdb9d'] = $pane;
+ $display->panels['contentmain'][3] = 'new-ade8f2e7-1173-418b-8f94-0a2d8f4cdb9d';
$display->hide_title = PANELS_TITLE_NONE;
$display->title_pane = '0';
$panelizer->display = $display;
@@ -432,121 +432,121 @@ function panopoly_pages_panelizer_defaults() {
$display->uuid = '5b7d08f9-c351-427e-8015-14433221537b';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-af46907d-aa25-43db-995b-b38f9174221e';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'image_link' => 'content',
- 'image_style' => 'panopoly_image_half',
- ),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = 'af46907d-aa25-43db-995b-b38f9174221e';
- $display->content['new-af46907d-aa25-43db-995b-b38f9174221e'] = $pane;
- $display->panels['contentmain'][0] = 'new-af46907d-aa25-43db-995b-b38f9174221e';
- $pane = new stdClass();
- $pane->pid = 'new-1ee1b165-ebd0-4115-ad5e-49df79509f82';
- $pane->panel = 'contentmain';
- $pane->type = 'node_title';
- $pane->subtype = 'node_title';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'link' => 1,
- 'context' => 'panelizer',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '1ee1b165-ebd0-4115-ad5e-49df79509f82';
- $display->content['new-1ee1b165-ebd0-4115-ad5e-49df79509f82'] = $pane;
- $display->panels['contentmain'][1] = 'new-1ee1b165-ebd0-4115-ad5e-49df79509f82';
- $pane = new stdClass();
- $pane->pid = 'new-a71dc705-b195-439c-b47b-980d8c7fa155';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:body';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'text_summary_or_trimmed',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'trim_length' => '250',
- ),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = 'a71dc705-b195-439c-b47b-980d8c7fa155';
- $display->content['new-a71dc705-b195-439c-b47b-980d8c7fa155'] = $pane;
- $display->panels['contentmain'][2] = 'new-a71dc705-b195-439c-b47b-980d8c7fa155';
- $pane = new stdClass();
- $pane->pid = 'new-1d6308c6-817d-4465-ac63-fa7acca627aa';
- $pane->panel = 'contentmain';
- $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' => 'featured',
- 'identifier' => '',
- 'link' => TRUE,
- 'context' => 'panelizer',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_class' => 'link-wrapper',
- );
- $pane->extras = array();
- $pane->position = 3;
- $pane->locks = array();
- $pane->uuid = '1d6308c6-817d-4465-ac63-fa7acca627aa';
- $display->content['new-1d6308c6-817d-4465-ac63-fa7acca627aa'] = $pane;
- $display->panels['contentmain'][3] = 'new-1d6308c6-817d-4465-ac63-fa7acca627aa';
+ $pane = new stdClass();
+ $pane->pid = 'new-af46907d-aa25-43db-995b-b38f9174221e';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'image_link' => 'content',
+ 'image_style' => 'panopoly_image_half',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'af46907d-aa25-43db-995b-b38f9174221e';
+ $display->content['new-af46907d-aa25-43db-995b-b38f9174221e'] = $pane;
+ $display->panels['contentmain'][0] = 'new-af46907d-aa25-43db-995b-b38f9174221e';
+ $pane = new stdClass();
+ $pane->pid = 'new-1ee1b165-ebd0-4115-ad5e-49df79509f82';
+ $pane->panel = 'contentmain';
+ $pane->type = 'node_title';
+ $pane->subtype = 'node_title';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'link' => 1,
+ 'context' => 'panelizer',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '1ee1b165-ebd0-4115-ad5e-49df79509f82';
+ $display->content['new-1ee1b165-ebd0-4115-ad5e-49df79509f82'] = $pane;
+ $display->panels['contentmain'][1] = 'new-1ee1b165-ebd0-4115-ad5e-49df79509f82';
+ $pane = new stdClass();
+ $pane->pid = 'new-a71dc705-b195-439c-b47b-980d8c7fa155';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:body';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'text_summary_or_trimmed',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'trim_length' => '250',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = 'a71dc705-b195-439c-b47b-980d8c7fa155';
+ $display->content['new-a71dc705-b195-439c-b47b-980d8c7fa155'] = $pane;
+ $display->panels['contentmain'][2] = 'new-a71dc705-b195-439c-b47b-980d8c7fa155';
+ $pane = new stdClass();
+ $pane->pid = 'new-1d6308c6-817d-4465-ac63-fa7acca627aa';
+ $pane->panel = 'contentmain';
+ $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' => 'featured',
+ 'identifier' => '',
+ 'link' => TRUE,
+ 'context' => 'panelizer',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_class' => 'link-wrapper',
+ );
+ $pane->extras = array();
+ $pane->position = 3;
+ $pane->locks = array();
+ $pane->uuid = '1d6308c6-817d-4465-ac63-fa7acca627aa';
+ $display->content['new-1d6308c6-817d-4465-ac63-fa7acca627aa'] = $pane;
+ $display->panels['contentmain'][3] = 'new-1d6308c6-817d-4465-ac63-fa7acca627aa';
$display->hide_title = PANELS_TITLE_NONE;
$display->title_pane = '0';
$panelizer->display = $display;
@@ -585,97 +585,97 @@ function panopoly_pages_panelizer_defaults() {
$display->uuid = 'f76cbd0c-d182-4bd2-96f2-f1759b4e69d8';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-873d60d8-f80e-41c1-b89d-86ad219285e8';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'image_link' => 'content',
- 'image_style' => 'panopoly_image_quarter',
- ),
- 'context' => 'panelizer',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '873d60d8-f80e-41c1-b89d-86ad219285e8';
- $display->content['new-873d60d8-f80e-41c1-b89d-86ad219285e8'] = $pane;
- $display->panels['contentmain'][0] = 'new-873d60d8-f80e-41c1-b89d-86ad219285e8';
- $pane = new stdClass();
- $pane->pid = 'new-9363564d-7f96-4fa2-a1a5-5b0f5f60ce68';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:body';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'text_summary_or_trimmed',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'trim_length' => '600',
- ),
- 'context' => 'panelizer',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '9363564d-7f96-4fa2-a1a5-5b0f5f60ce68';
- $display->content['new-9363564d-7f96-4fa2-a1a5-5b0f5f60ce68'] = $pane;
- $display->panels['contentmain'][1] = 'new-9363564d-7f96-4fa2-a1a5-5b0f5f60ce68';
- $pane = new stdClass();
- $pane->pid = 'new-e7b29d80-ad23-4c5d-85fd-13f7a038e3d8';
- $pane->panel = 'contentmain';
- $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' => 'teaser',
- 'identifier' => '',
- 'link' => TRUE,
- 'context' => 'panelizer',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_class' => 'link-wrapper',
- );
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = 'e7b29d80-ad23-4c5d-85fd-13f7a038e3d8';
- $display->content['new-e7b29d80-ad23-4c5d-85fd-13f7a038e3d8'] = $pane;
- $display->panels['contentmain'][2] = 'new-e7b29d80-ad23-4c5d-85fd-13f7a038e3d8';
+ $pane = new stdClass();
+ $pane->pid = 'new-873d60d8-f80e-41c1-b89d-86ad219285e8';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'image_link' => 'content',
+ 'image_style' => 'panopoly_image_quarter',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '873d60d8-f80e-41c1-b89d-86ad219285e8';
+ $display->content['new-873d60d8-f80e-41c1-b89d-86ad219285e8'] = $pane;
+ $display->panels['contentmain'][0] = 'new-873d60d8-f80e-41c1-b89d-86ad219285e8';
+ $pane = new stdClass();
+ $pane->pid = 'new-9363564d-7f96-4fa2-a1a5-5b0f5f60ce68';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:body';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'text_summary_or_trimmed',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'trim_length' => '600',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '9363564d-7f96-4fa2-a1a5-5b0f5f60ce68';
+ $display->content['new-9363564d-7f96-4fa2-a1a5-5b0f5f60ce68'] = $pane;
+ $display->panels['contentmain'][1] = 'new-9363564d-7f96-4fa2-a1a5-5b0f5f60ce68';
+ $pane = new stdClass();
+ $pane->pid = 'new-e7b29d80-ad23-4c5d-85fd-13f7a038e3d8';
+ $pane->panel = 'contentmain';
+ $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' => 'teaser',
+ 'identifier' => '',
+ 'link' => TRUE,
+ 'context' => 'panelizer',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_class' => 'link-wrapper',
+ );
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = 'e7b29d80-ad23-4c5d-85fd-13f7a038e3d8';
+ $display->content['new-e7b29d80-ad23-4c5d-85fd-13f7a038e3d8'] = $pane;
+ $display->panels['contentmain'][2] = 'new-e7b29d80-ad23-4c5d-85fd-13f7a038e3d8';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = '0';
$panelizer->display = $display;
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
index 84cdac36757a9fd37ec1194a9ab5a82b7d553074..31e48e9ea73cc70eb2c719c3536beaae5b535384 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Search 7.x-1.21, 2015-04-29
+-----------------------------
+- Update Features module to version 2.5.
+
Panopoly Search 7.x-1.20, 2015-03-25
-----------------------------
- CHANGELOG.txt updates for 1.19 went wrong.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
index 7d52b694559af989d8b1a64403b4089f95f3cd56..8d2c27ac023867d7bc83110cdf06ab81e99ca2f9 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
@@ -53,9 +53,9 @@ features[variable][] = search_api_facets_search_ids
features[views_view][] = panopoly_database_search
features[views_view][] = panopoly_search
-; Information added by Drupal.org packaging script on 2015-03-25
-version = "7.x-1.20"
+; Information added by Drupal.org packaging script on 2015-04-29
+version = "7.x-1.21"
core = "7.x"
project = "panopoly_search"
-datestamp = "1427310796"
+datestamp = "1430338698"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.pages_default.inc b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.pages_default.inc
index 038c0a8920b64553ac98635b8938cd83822f9bf8..119b7934afb126f78b00e30e3c8596cdedc80d19 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.pages_default.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.pages_default.inc
@@ -97,111 +97,111 @@ function panopoly_search_default_page_manager_pages() {
$display->uuid = 'b369b7fe-466f-4e52-b315-5070800e6d63';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-15f4a1d6-8bf1-43cd-8ef3-a8b484aabe79';
- $pane->panel = 'contentmain';
- $pane->type = 'search_current';
- $pane->subtype = 'search_current';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'type' => 'node',
- 'form' => 'advanced',
- 'path_type' => 'default',
- 'path' => '',
- 'override_prompt' => FALSE,
- 'prompt' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '15f4a1d6-8bf1-43cd-8ef3-a8b484aabe79';
- $display->content['new-15f4a1d6-8bf1-43cd-8ef3-a8b484aabe79'] = $pane;
- $display->panels['contentmain'][0] = 'new-15f4a1d6-8bf1-43cd-8ef3-a8b484aabe79';
- $pane = new stdClass();
- $pane->pid = 'new-9315ef28-12fb-4ed8-a491-1c628e698406';
- $pane->panel = 'contentmain';
- $pane->type = 'search_box';
- $pane->subtype = 'search_box';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'type' => 'node',
- 'form' => 'simple',
- 'path_type' => 'default',
- 'path' => '',
- 'override_prompt' => 1,
- 'prompt' => '',
- 'context' => array(),
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '9315ef28-12fb-4ed8-a491-1c628e698406';
- $display->content['new-9315ef28-12fb-4ed8-a491-1c628e698406'] = $pane;
- $display->panels['contentmain'][1] = 'new-9315ef28-12fb-4ed8-a491-1c628e698406';
- $pane = new stdClass();
- $pane->pid = 'new-25ec26bf-8e25-4163-bf5c-406fed80259d';
- $pane->panel = 'contentmain';
- $pane->type = 'views_panes';
- $pane->subtype = 'panopoly_search-search_solr_results';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => array(
- 0 => 'argument_string_1',
- ),
- 'view_mode' => NULL,
- 'widget_title' => '',
- 'items_per_page' => NULL,
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = '25ec26bf-8e25-4163-bf5c-406fed80259d';
- $display->content['new-25ec26bf-8e25-4163-bf5c-406fed80259d'] = $pane;
- $display->panels['contentmain'][2] = 'new-25ec26bf-8e25-4163-bf5c-406fed80259d';
- $pane = new stdClass();
- $pane->pid = 'new-3d1478d7-0f89-424e-824f-82483bc89651';
- $pane->panel = 'sidebar';
- $pane->type = 'facet';
- $pane->subtype = 'facet';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => array(),
- 'override_title' => 1,
- 'override_title_text' => 'Filter by Type',
- 'delta' => 'Shb0Q1vWgCArrHrjHszTyhl2jaEhIjzW',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '3d1478d7-0f89-424e-824f-82483bc89651';
- $display->content['new-3d1478d7-0f89-424e-824f-82483bc89651'] = $pane;
- $display->panels['sidebar'][0] = 'new-3d1478d7-0f89-424e-824f-82483bc89651';
+ $pane = new stdClass();
+ $pane->pid = 'new-15f4a1d6-8bf1-43cd-8ef3-a8b484aabe79';
+ $pane->panel = 'contentmain';
+ $pane->type = 'search_current';
+ $pane->subtype = 'search_current';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'type' => 'node',
+ 'form' => 'advanced',
+ 'path_type' => 'default',
+ 'path' => '',
+ 'override_prompt' => FALSE,
+ 'prompt' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '15f4a1d6-8bf1-43cd-8ef3-a8b484aabe79';
+ $display->content['new-15f4a1d6-8bf1-43cd-8ef3-a8b484aabe79'] = $pane;
+ $display->panels['contentmain'][0] = 'new-15f4a1d6-8bf1-43cd-8ef3-a8b484aabe79';
+ $pane = new stdClass();
+ $pane->pid = 'new-9315ef28-12fb-4ed8-a491-1c628e698406';
+ $pane->panel = 'contentmain';
+ $pane->type = 'search_box';
+ $pane->subtype = 'search_box';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'type' => 'node',
+ 'form' => 'simple',
+ 'path_type' => 'default',
+ 'path' => '',
+ 'override_prompt' => 1,
+ 'prompt' => '',
+ 'context' => array(),
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '9315ef28-12fb-4ed8-a491-1c628e698406';
+ $display->content['new-9315ef28-12fb-4ed8-a491-1c628e698406'] = $pane;
+ $display->panels['contentmain'][1] = 'new-9315ef28-12fb-4ed8-a491-1c628e698406';
+ $pane = new stdClass();
+ $pane->pid = 'new-25ec26bf-8e25-4163-bf5c-406fed80259d';
+ $pane->panel = 'contentmain';
+ $pane->type = 'views_panes';
+ $pane->subtype = 'panopoly_search-search_solr_results';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => array(
+ 0 => 'argument_string_1',
+ ),
+ 'view_mode' => NULL,
+ 'widget_title' => '',
+ 'items_per_page' => NULL,
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = '25ec26bf-8e25-4163-bf5c-406fed80259d';
+ $display->content['new-25ec26bf-8e25-4163-bf5c-406fed80259d'] = $pane;
+ $display->panels['contentmain'][2] = 'new-25ec26bf-8e25-4163-bf5c-406fed80259d';
+ $pane = new stdClass();
+ $pane->pid = 'new-3d1478d7-0f89-424e-824f-82483bc89651';
+ $pane->panel = 'sidebar';
+ $pane->type = 'facet';
+ $pane->subtype = 'facet';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => array(),
+ 'override_title' => 1,
+ 'override_title_text' => 'Filter by Type',
+ 'delta' => 'Shb0Q1vWgCArrHrjHszTyhl2jaEhIjzW',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '3d1478d7-0f89-424e-824f-82483bc89651';
+ $display->content['new-3d1478d7-0f89-424e-824f-82483bc89651'] = $pane;
+ $display->panels['sidebar'][0] = 'new-3d1478d7-0f89-424e-824f-82483bc89651';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = '0';
$handler->conf['display'] = $display;
@@ -248,124 +248,124 @@ function panopoly_search_default_page_manager_pages() {
$display->uuid = '2d27c2cb-916a-4d51-8a64-9eba5a57a81e';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-2693d0e2-3b32-4ca3-87b6-fa2ccec54399';
- $pane->panel = 'contentmain';
- $pane->type = 'search_current';
- $pane->subtype = 'search_current';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'type' => 'node',
- 'form' => 'advanced',
- 'path_type' => 'default',
- 'path' => '',
- 'override_prompt' => FALSE,
- 'prompt' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '2693d0e2-3b32-4ca3-87b6-fa2ccec54399';
- $display->content['new-2693d0e2-3b32-4ca3-87b6-fa2ccec54399'] = $pane;
- $display->panels['contentmain'][0] = 'new-2693d0e2-3b32-4ca3-87b6-fa2ccec54399';
- $pane = new stdClass();
- $pane->pid = 'new-dbac3f16-6f98-43f5-a2b3-bb1b0dc363d9';
- $pane->panel = 'contentmain';
- $pane->type = 'search_box';
- $pane->subtype = 'search_box';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'type' => 'node',
- 'form' => 'simple',
- 'path_type' => 'default',
- 'path' => '',
- 'override_prompt' => 1,
- 'prompt' => '',
- 'context' => array(),
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = 'dbac3f16-6f98-43f5-a2b3-bb1b0dc363d9';
- $display->content['new-dbac3f16-6f98-43f5-a2b3-bb1b0dc363d9'] = $pane;
- $display->panels['contentmain'][1] = 'new-dbac3f16-6f98-43f5-a2b3-bb1b0dc363d9';
- $pane = new stdClass();
- $pane->pid = 'new-6e68b43e-ac55-4417-9705-64e3c639c681';
- $pane->panel = 'contentmain';
- $pane->type = 'views_panes';
- $pane->subtype = 'panopoly_database_search-search_database_results';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'view_mode' => 'teaser',
+ $pane = new stdClass();
+ $pane->pid = 'new-2693d0e2-3b32-4ca3-87b6-fa2ccec54399';
+ $pane->panel = 'contentmain';
+ $pane->type = 'search_current';
+ $pane->subtype = 'search_current';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'type' => 'node',
+ 'form' => 'advanced',
+ 'path_type' => 'default',
+ 'path' => '',
+ 'override_prompt' => FALSE,
+ 'prompt' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '2693d0e2-3b32-4ca3-87b6-fa2ccec54399';
+ $display->content['new-2693d0e2-3b32-4ca3-87b6-fa2ccec54399'] = $pane;
+ $display->panels['contentmain'][0] = 'new-2693d0e2-3b32-4ca3-87b6-fa2ccec54399';
+ $pane = new stdClass();
+ $pane->pid = 'new-dbac3f16-6f98-43f5-a2b3-bb1b0dc363d9';
+ $pane->panel = 'contentmain';
+ $pane->type = 'search_box';
+ $pane->subtype = 'search_box';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'type' => 'node',
+ 'form' => 'simple',
+ 'path_type' => 'default',
+ 'path' => '',
+ 'override_prompt' => 1,
+ 'prompt' => '',
+ 'context' => array(),
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = 'dbac3f16-6f98-43f5-a2b3-bb1b0dc363d9';
+ $display->content['new-dbac3f16-6f98-43f5-a2b3-bb1b0dc363d9'] = $pane;
+ $display->panels['contentmain'][1] = 'new-dbac3f16-6f98-43f5-a2b3-bb1b0dc363d9';
+ $pane = new stdClass();
+ $pane->pid = 'new-6e68b43e-ac55-4417-9705-64e3c639c681';
+ $pane->panel = 'contentmain';
+ $pane->type = 'views_panes';
+ $pane->subtype = 'panopoly_database_search-search_database_results';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'view_mode' => 'teaser',
+ 'widget_title' => '',
+ 'items_per_page' => '15',
+ 'context' => array(
+ 0 => 'argument_string_1',
+ ),
+ 'fields_override' => array(
+ 'field_featured_image' => 1,
+ 'title' => 1,
+ 'body' => 1,
+ ),
+ 'exposed' => array(
'widget_title' => '',
- 'items_per_page' => '15',
- 'context' => array(
- 0 => 'argument_string_1',
- ),
- 'fields_override' => array(
- 'field_featured_image' => 1,
- 'title' => 1,
- 'body' => 1,
- ),
- 'exposed' => array(
- 'widget_title' => '',
- ),
- 'override_title' => '',
- 'override_title_text' => '',
- 'view_settings' => 'fields',
- 'use_pager' => 1,
- 'pager_id' => '0',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = '6e68b43e-ac55-4417-9705-64e3c639c681';
- $display->content['new-6e68b43e-ac55-4417-9705-64e3c639c681'] = $pane;
- $display->panels['contentmain'][2] = 'new-6e68b43e-ac55-4417-9705-64e3c639c681';
- $pane = new stdClass();
- $pane->pid = 'new-44eb1f21-6415-4344-ae5a-45172ed2cb8c';
- $pane->panel = 'sidebar';
- $pane->type = 'facet';
- $pane->subtype = 'facet';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'context' => array(),
- 'override_title' => 1,
- 'override_title_text' => 'Filter by Type',
- 'delta' => '1Cpx6naJU4Y3YvKVc0vcLK7Yo0ahaN0l',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '44eb1f21-6415-4344-ae5a-45172ed2cb8c';
- $display->content['new-44eb1f21-6415-4344-ae5a-45172ed2cb8c'] = $pane;
- $display->panels['sidebar'][0] = 'new-44eb1f21-6415-4344-ae5a-45172ed2cb8c';
+ ),
+ 'override_title' => '',
+ 'override_title_text' => '',
+ 'view_settings' => 'fields',
+ 'use_pager' => 1,
+ 'pager_id' => '0',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = '6e68b43e-ac55-4417-9705-64e3c639c681';
+ $display->content['new-6e68b43e-ac55-4417-9705-64e3c639c681'] = $pane;
+ $display->panels['contentmain'][2] = 'new-6e68b43e-ac55-4417-9705-64e3c639c681';
+ $pane = new stdClass();
+ $pane->pid = 'new-44eb1f21-6415-4344-ae5a-45172ed2cb8c';
+ $pane->panel = 'sidebar';
+ $pane->type = 'facet';
+ $pane->subtype = 'facet';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'context' => array(),
+ 'override_title' => 1,
+ 'override_title_text' => 'Filter by Type',
+ 'delta' => '1Cpx6naJU4Y3YvKVc0vcLK7Yo0ahaN0l',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '44eb1f21-6415-4344-ae5a-45172ed2cb8c';
+ $display->content['new-44eb1f21-6415-4344-ae5a-45172ed2cb8c'] = $pane;
+ $display->panels['sidebar'][0] = 'new-44eb1f21-6415-4344-ae5a-45172ed2cb8c';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = '0';
$handler->conf['display'] = $display;
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.views_default.inc b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.views_default.inc
index b71aa386ea9ef81f0685ed6a32391b6b069a95b3..ae6ab7c2afb8f23a1d9db67ab1c5dc4029c227e1 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.views_default.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.views_default.inc
@@ -92,7 +92,7 @@ function panopoly_search_views_default_views() {
$handler->display->display_options['arguments']['search_api_views_fulltext']['default_argument_options']['argument'] = 'vegetables';
$handler->display->display_options['arguments']['search_api_views_fulltext']['summary']['format'] = 'default_summary';
$handler->display->display_options['arguments']['search_api_views_fulltext']['break_phrase'] = 0;
- /* Filter criterion: Indexed Content: Status */
+ /* Filter criterion: Indexed Node: Status */
$handler->display->display_options['filters']['status']['id'] = 'status';
$handler->display->display_options['filters']['status']['table'] = 'search_api_index_database_node_index';
$handler->display->display_options['filters']['status']['field'] = 'status';
@@ -210,7 +210,7 @@ function panopoly_search_views_default_views() {
$handler->display->display_options['arguments']['search_api_views_fulltext']['default_argument_options']['index'] = '2';
$handler->display->display_options['arguments']['search_api_views_fulltext']['summary']['format'] = 'default_summary';
$handler->display->display_options['arguments']['search_api_views_fulltext']['break_phrase'] = 0;
- /* Filter criterion: Indexed Content: Status */
+ /* Filter criterion: Indexed Node: Status */
$handler->display->display_options['filters']['status_1']['id'] = 'status_1';
$handler->display->display_options['filters']['status_1']['table'] = 'search_api_index_node_index';
$handler->display->display_options['filters']['status_1']['field'] = 'status';
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
index 6b44b89d755d7abec4af3448a7a5ce99a35764e1..c17d18e92152343cb6ac53f50c375395428a6c9b 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
@@ -1,3 +1,12 @@
+Panopoly Test 7.x-1.21, 2015-04-29
+---------------------------
+- Set human-readable names for all of Panopoly's image styles.
+- Clean up instances of deprecated panpoly_theme layouts.
+- Remove 'Radix' from the label of each of the layouts.
+- Page full of variables after changing layout.
+- Menu_rebuild removed, but not variable that tracked if had been done.
+- Update Features module to version 2.5.
+
Panopoly Test 7.x-1.20, 2015-03-25
---------------------------
- CHANGELOG.txt updates for 1.19 went wrong.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly-test.css b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly-test.css
new file mode 100644
index 0000000000000000000000000000000000000000..2a6b4b65c746300cb88ce99e8d625ddfe9f02677
--- /dev/null
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly-test.css
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * Some CSS hacks to Panopoly Test to work.
+ */
+
+/**
+ * Temporary hack until Issue #2427993 can be solved.
+ */
+#panels-layout-category-Radix-wrapper .layout-link div {
+ display: block !important;
+}
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.features.field_instance.inc b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.features.field_instance.inc
index cca7bc6b4c0ec9413298d4e9b46527a2cfcfb018..ddc2e5b0939d843c0f6aab8720cb1dd571d26b27 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.features.field_instance.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.features.field_instance.inc
@@ -60,7 +60,8 @@ function panopoly_test_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-panopoly_test_page-field_featured_categories'
+ // Exported field_instance:
+ // 'node-panopoly_test_page-field_featured_categories'
$field_instances['node-panopoly_test_page-field_featured_categories'] = array(
'bundle' => 'panopoly_test_page',
'default_value' => NULL,
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
index c8831d2ca832097b10363c0b03df27ae30dbaaf2..5bd02bdd21688a39b8c759a750228b3b7a3b9702 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
@@ -16,6 +16,7 @@ dependencies[] = taxonomy
dependencies[] = text
dependencies[] = views
dependencies[] = views_content
+stylesheets[all][] = panopoly-test.css
features[ctools][] = panelizer:panelizer:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
@@ -89,14 +90,16 @@ features[variable][] = panelizer_node:panopoly_test_landing_page_allowed_layouts
features[variable][] = panelizer_node:panopoly_test_landing_page_allowed_types_default
features[variable][] = panelizer_node:panopoly_test_landing_page_default
features[variable][] = panelizer_node:panopoly_test_page:page_manager_selection
+features[variable][] = panelizer_node:panopoly_test_page_allowed_layouts_default
+features[variable][] = panelizer_node:panopoly_test_page_allowed_types_default
features[views_view][] = panopoly_test_magic_view_modes
features_exclude[dependencies][panopoly_pages] = panopoly_pages
features_exclude[dependencies][panelizer] = panelizer
hidden = 1
-; Information added by Drupal.org packaging script on 2015-03-25
-version = "7.x-1.20"
+; Information added by Drupal.org packaging script on 2015-04-29
+version = "7.x-1.21"
core = "7.x"
project = "panopoly_test"
-datestamp = "1427310800"
+datestamp = "1430338711"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.panelizer.inc b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.panelizer.inc
index af2d96d20cdbc7fcab006de1116183b9e9ad5d54..4a80fbf7bb4a83040c372ef46ccd176345a87c93 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.panelizer.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.panelizer.inc
@@ -68,7 +68,7 @@ function panopoly_test_panelizer_defaults() {
$panelizer->link_to_entity = TRUE;
$panelizer->extra = '';
$display = new panels_display();
- $display->layout = 'bryant';
+ $display->layout = 'radix_bryant';
$display->layout_settings = array();
$display->panel_settings = array(
'style_settings' => array(
@@ -84,128 +84,128 @@ function panopoly_test_panelizer_defaults() {
$display->uuid = '16346c80-6fcf-4cee-bf7a-9c0173fc2916';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'image_link' => 'content',
- 'image_style' => 'panopoly_image_half',
- ),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
- $display->content['new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1'] = $pane;
- $display->panels['contentmain'][0] = 'new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
- $pane = new stdClass();
- $pane->pid = 'new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:body';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'text_default',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'trim_length' => '250',
- ),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
- $display->content['new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b'] = $pane;
- $display->panels['contentmain'][1] = 'new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
- $pane = new stdClass();
- $pane->pid = 'new-f3bf9c22-9b22-41d2-a57e-110951093871';
- $pane->panel = 'contentmain';
- $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' => 'featured',
- 'identifier' => '',
- 'link' => TRUE,
- 'context' => 'panelizer',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_class' => 'link-wrapper',
- );
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = 'f3bf9c22-9b22-41d2-a57e-110951093871';
- $display->content['new-f3bf9c22-9b22-41d2-a57e-110951093871'] = $pane;
- $display->panels['contentmain'][2] = 'new-f3bf9c22-9b22-41d2-a57e-110951093871';
- $pane = new stdClass();
- $pane->pid = 'new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
- $pane->panel = 'sidebar';
- $pane->type = 'menu_tree';
- $pane->subtype = 'main-menu';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'menu_name' => 'main-menu',
- 'parent_mlid' => 'main-menu:0',
- 'title_link' => 0,
- 'admin_title' => '',
- 'level' => '2',
- 'follow' => 0,
- 'depth' => 0,
- 'expanded' => 1,
- 'sort' => 0,
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = 'c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
- $display->content['new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1'] = $pane;
- $display->panels['sidebar'][0] = 'new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
+ $pane = new stdClass();
+ $pane->pid = 'new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'image_link' => 'content',
+ 'image_style' => 'panopoly_image_half',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
+ $display->content['new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1'] = $pane;
+ $display->panels['contentmain'][0] = 'new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
+ $pane = new stdClass();
+ $pane->pid = 'new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:body';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'text_default',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'trim_length' => '250',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
+ $display->content['new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b'] = $pane;
+ $display->panels['contentmain'][1] = 'new-59cafe99-f0a0-4a3a-a13f-8f108d69d18b';
+ $pane = new stdClass();
+ $pane->pid = 'new-f3bf9c22-9b22-41d2-a57e-110951093871';
+ $pane->panel = 'contentmain';
+ $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' => 'featured',
+ 'identifier' => '',
+ 'link' => TRUE,
+ 'context' => 'panelizer',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_class' => 'link-wrapper',
+ );
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = 'f3bf9c22-9b22-41d2-a57e-110951093871';
+ $display->content['new-f3bf9c22-9b22-41d2-a57e-110951093871'] = $pane;
+ $display->panels['contentmain'][2] = 'new-f3bf9c22-9b22-41d2-a57e-110951093871';
+ $pane = new stdClass();
+ $pane->pid = 'new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
+ $pane->panel = 'sidebar';
+ $pane->type = 'menu_tree';
+ $pane->subtype = 'main-menu';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'menu_name' => 'main-menu',
+ 'parent_mlid' => 'main-menu:0',
+ 'title_link' => 0,
+ 'admin_title' => '',
+ 'level' => '2',
+ 'follow' => 0,
+ 'depth' => 0,
+ 'expanded' => 1,
+ 'sort' => 0,
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
+ $display->content['new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1'] = $pane;
+ $display->panels['sidebar'][0] = 'new-c755a7a9-2c4c-4f7e-a0f7-fc3a3c87ddd1';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = 'new-34b4f35e-bc4b-4819-905c-6b6bf84bffe1';
$panelizer->display = $display;
@@ -244,127 +244,127 @@ function panopoly_test_panelizer_defaults() {
$display->uuid = '742e0840-b53b-4c71-8c79-3afd1c4e6c6e';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-a9d6fd53-ab5d-420b-925e-3d4f9f32bf17';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'image_link' => '',
- 'image_style' => '',
- ),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'override_title_heading' => 'h2',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = 'a9d6fd53-ab5d-420b-925e-3d4f9f32bf17';
- $display->content['new-a9d6fd53-ab5d-420b-925e-3d4f9f32bf17'] = $pane;
- $display->panels['contentmain'][0] = 'new-a9d6fd53-ab5d-420b-925e-3d4f9f32bf17';
- $pane = new stdClass();
- $pane->pid = 'new-628c321f-d9c9-4c85-8218-f1532aa3ed5e';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:body';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'text_default',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'override_title_heading' => 'h2',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '628c321f-d9c9-4c85-8218-f1532aa3ed5e';
- $display->content['new-628c321f-d9c9-4c85-8218-f1532aa3ed5e'] = $pane;
- $display->panels['contentmain'][1] = 'new-628c321f-d9c9-4c85-8218-f1532aa3ed5e';
- $pane = new stdClass();
- $pane->pid = 'new-c911e563-4be5-4005-b080-70f63356f95f';
- $pane->panel = 'contentmain';
- $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' => 'default',
- 'identifier' => '',
- 'link' => TRUE,
- 'context' => 'panelizer',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_class' => 'link-wrapper',
- );
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = 'c911e563-4be5-4005-b080-70f63356f95f';
- $display->content['new-c911e563-4be5-4005-b080-70f63356f95f'] = $pane;
- $display->panels['contentmain'][2] = 'new-c911e563-4be5-4005-b080-70f63356f95f';
- $pane = new stdClass();
- $pane->pid = 'new-b66aaba2-12c0-4fbb-b0ab-5d8114a78369';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_featured_categories';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'inline',
- 'formatter' => 'taxonomy_term_reference_link',
- 'delta_limit' => '0',
- 'delta_offset' => '0',
- 'delta_reversed' => 0,
- 'formatter_settings' => array(),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'override_title_heading' => 'h2',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 3;
- $pane->locks = array();
- $pane->uuid = 'b66aaba2-12c0-4fbb-b0ab-5d8114a78369';
- $display->content['new-b66aaba2-12c0-4fbb-b0ab-5d8114a78369'] = $pane;
- $display->panels['contentmain'][3] = 'new-b66aaba2-12c0-4fbb-b0ab-5d8114a78369';
+ $pane = new stdClass();
+ $pane->pid = 'new-a9d6fd53-ab5d-420b-925e-3d4f9f32bf17';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'image_link' => '',
+ 'image_style' => '',
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'override_title_heading' => 'h2',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'a9d6fd53-ab5d-420b-925e-3d4f9f32bf17';
+ $display->content['new-a9d6fd53-ab5d-420b-925e-3d4f9f32bf17'] = $pane;
+ $display->panels['contentmain'][0] = 'new-a9d6fd53-ab5d-420b-925e-3d4f9f32bf17';
+ $pane = new stdClass();
+ $pane->pid = 'new-628c321f-d9c9-4c85-8218-f1532aa3ed5e';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:body';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'text_default',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'override_title_heading' => 'h2',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '628c321f-d9c9-4c85-8218-f1532aa3ed5e';
+ $display->content['new-628c321f-d9c9-4c85-8218-f1532aa3ed5e'] = $pane;
+ $display->panels['contentmain'][1] = 'new-628c321f-d9c9-4c85-8218-f1532aa3ed5e';
+ $pane = new stdClass();
+ $pane->pid = 'new-c911e563-4be5-4005-b080-70f63356f95f';
+ $pane->panel = 'contentmain';
+ $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' => 'default',
+ 'identifier' => '',
+ 'link' => TRUE,
+ 'context' => 'panelizer',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_class' => 'link-wrapper',
+ );
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = 'c911e563-4be5-4005-b080-70f63356f95f';
+ $display->content['new-c911e563-4be5-4005-b080-70f63356f95f'] = $pane;
+ $display->panels['contentmain'][2] = 'new-c911e563-4be5-4005-b080-70f63356f95f';
+ $pane = new stdClass();
+ $pane->pid = 'new-b66aaba2-12c0-4fbb-b0ab-5d8114a78369';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_featured_categories';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'inline',
+ 'formatter' => 'taxonomy_term_reference_link',
+ 'delta_limit' => '0',
+ 'delta_offset' => '0',
+ 'delta_reversed' => 0,
+ 'formatter_settings' => array(),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'override_title_heading' => 'h2',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 3;
+ $pane->locks = array();
+ $pane->uuid = 'b66aaba2-12c0-4fbb-b0ab-5d8114a78369';
+ $display->content['new-b66aaba2-12c0-4fbb-b0ab-5d8114a78369'] = $pane;
+ $display->panels['contentmain'][3] = 'new-b66aaba2-12c0-4fbb-b0ab-5d8114a78369';
$display->hide_title = PANELS_TITLE_NONE;
$display->title_pane = 'new-628c321f-d9c9-4c85-8218-f1532aa3ed5e';
$panelizer->display = $display;
@@ -403,122 +403,122 @@ function panopoly_test_panelizer_defaults() {
$display->uuid = 'be546dbe-de6d-4e5c-9a27-3571573b18ca';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-4aaf93c9-afec-43f1-ac84-056daca83759';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'override_title_heading' => 'h2',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '4aaf93c9-afec-43f1-ac84-056daca83759';
- $display->content['new-4aaf93c9-afec-43f1-ac84-056daca83759'] = $pane;
- $display->panels['contentmain'][0] = 'new-4aaf93c9-afec-43f1-ac84-056daca83759';
- $pane = new stdClass();
- $pane->pid = 'new-2d87f171-b66f-417f-846a-17cdf8d4b185';
- $pane->panel = 'contentmain';
- $pane->type = 'node_title';
- $pane->subtype = 'node_title';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'link' => 1,
- 'markup' => 'none',
- 'id' => '',
- 'class' => '',
- 'context' => 'panelizer',
- 'override_title' => 1,
- 'override_title_text' => '',
- 'override_title_heading' => 'h2',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '2d87f171-b66f-417f-846a-17cdf8d4b185';
- $display->content['new-2d87f171-b66f-417f-846a-17cdf8d4b185'] = $pane;
- $display->panels['contentmain'][1] = 'new-2d87f171-b66f-417f-846a-17cdf8d4b185';
- $pane = new stdClass();
- $pane->pid = 'new-d01aaec3-a61f-4769-87be-b841ff568af1';
- $pane->panel = 'contentmain';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:body';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'text_summary_or_trimmed',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'override_title_heading' => 'h2',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = 'd01aaec3-a61f-4769-87be-b841ff568af1';
- $display->content['new-d01aaec3-a61f-4769-87be-b841ff568af1'] = $pane;
- $display->panels['contentmain'][2] = 'new-d01aaec3-a61f-4769-87be-b841ff568af1';
- $pane = new stdClass();
- $pane->pid = 'new-43dc2b41-4d88-4a68-a4cb-d9f3b062472d';
- $pane->panel = 'contentmain';
- $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' => 'featured',
- 'identifier' => '',
- 'link' => TRUE,
- 'context' => 'panelizer',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_class' => 'link-wrapper',
- );
- $pane->extras = array();
- $pane->position = 3;
- $pane->locks = array();
- $pane->uuid = '43dc2b41-4d88-4a68-a4cb-d9f3b062472d';
- $display->content['new-43dc2b41-4d88-4a68-a4cb-d9f3b062472d'] = $pane;
- $display->panels['contentmain'][3] = 'new-43dc2b41-4d88-4a68-a4cb-d9f3b062472d';
+ $pane = new stdClass();
+ $pane->pid = 'new-4aaf93c9-afec-43f1-ac84-056daca83759';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'override_title_heading' => 'h2',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '4aaf93c9-afec-43f1-ac84-056daca83759';
+ $display->content['new-4aaf93c9-afec-43f1-ac84-056daca83759'] = $pane;
+ $display->panels['contentmain'][0] = 'new-4aaf93c9-afec-43f1-ac84-056daca83759';
+ $pane = new stdClass();
+ $pane->pid = 'new-2d87f171-b66f-417f-846a-17cdf8d4b185';
+ $pane->panel = 'contentmain';
+ $pane->type = 'node_title';
+ $pane->subtype = 'node_title';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'link' => 1,
+ 'markup' => 'none',
+ 'id' => '',
+ 'class' => '',
+ 'context' => 'panelizer',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ 'override_title_heading' => 'h2',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '2d87f171-b66f-417f-846a-17cdf8d4b185';
+ $display->content['new-2d87f171-b66f-417f-846a-17cdf8d4b185'] = $pane;
+ $display->panels['contentmain'][1] = 'new-2d87f171-b66f-417f-846a-17cdf8d4b185';
+ $pane = new stdClass();
+ $pane->pid = 'new-d01aaec3-a61f-4769-87be-b841ff568af1';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:body';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'text_summary_or_trimmed',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'override_title_heading' => 'h2',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = 'd01aaec3-a61f-4769-87be-b841ff568af1';
+ $display->content['new-d01aaec3-a61f-4769-87be-b841ff568af1'] = $pane;
+ $display->panels['contentmain'][2] = 'new-d01aaec3-a61f-4769-87be-b841ff568af1';
+ $pane = new stdClass();
+ $pane->pid = 'new-43dc2b41-4d88-4a68-a4cb-d9f3b062472d';
+ $pane->panel = 'contentmain';
+ $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' => 'featured',
+ 'identifier' => '',
+ 'link' => TRUE,
+ 'context' => 'panelizer',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_class' => 'link-wrapper',
+ );
+ $pane->extras = array();
+ $pane->position = 3;
+ $pane->locks = array();
+ $pane->uuid = '43dc2b41-4d88-4a68-a4cb-d9f3b062472d';
+ $display->content['new-43dc2b41-4d88-4a68-a4cb-d9f3b062472d'] = $pane;
+ $display->panels['contentmain'][3] = 'new-43dc2b41-4d88-4a68-a4cb-d9f3b062472d';
$display->hide_title = PANELS_TITLE_NONE;
$display->title_pane = '0';
$panelizer->display = $display;
@@ -544,12 +544,13 @@ function panopoly_test_panelizer_defaults() {
$panelizer->link_to_entity = TRUE;
$panelizer->extra = array();
$display = new panels_display();
- $display->layout = 'flexible';
+ $display->layout = 'radix_boxton';
$display->layout_settings = array();
$display->panel_settings = array(
'style_settings' => array(
'default' => NULL,
'center' => NULL,
+ 'contentmain' => NULL,
),
);
$display->cache = array();
@@ -557,96 +558,96 @@ function panopoly_test_panelizer_defaults() {
$display->uuid = 'b249be91-2e59-4b92-80ac-256ea1c22000';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-1a29748d-961a-4c68-ac8a-fd0487599ea7';
- $pane->panel = 'center';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_featured_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'override_title_heading' => 'h2',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $pane->uuid = '1a29748d-961a-4c68-ac8a-fd0487599ea7';
- $display->content['new-1a29748d-961a-4c68-ac8a-fd0487599ea7'] = $pane;
- $display->panels['center'][0] = 'new-1a29748d-961a-4c68-ac8a-fd0487599ea7';
- $pane = new stdClass();
- $pane->pid = 'new-5a11a330-5d60-48a7-8990-70cdf1c5e76d';
- $pane->panel = 'center';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:body';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'hidden',
- 'formatter' => 'text_summary_or_trimmed',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'trim_length' => 600,
- ),
- 'context' => 'panelizer',
- 'override_title' => 0,
- 'override_title_text' => '',
- 'override_title_heading' => 'h2',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $pane->uuid = '5a11a330-5d60-48a7-8990-70cdf1c5e76d';
- $display->content['new-5a11a330-5d60-48a7-8990-70cdf1c5e76d'] = $pane;
- $display->panels['center'][1] = 'new-5a11a330-5d60-48a7-8990-70cdf1c5e76d';
- $pane = new stdClass();
- $pane->pid = 'new-81940446-a77c-4133-b348-71a49da13a8f';
- $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' => 'teaser',
- 'identifier' => '',
- 'link' => TRUE,
- 'context' => 'panelizer',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_class' => 'link-wrapper',
- );
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $pane->uuid = '81940446-a77c-4133-b348-71a49da13a8f';
- $display->content['new-81940446-a77c-4133-b348-71a49da13a8f'] = $pane;
- $display->panels['center'][2] = 'new-81940446-a77c-4133-b348-71a49da13a8f';
+ $pane = new stdClass();
+ $pane->pid = 'new-1a29748d-961a-4c68-ac8a-fd0487599ea7';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_featured_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'override_title_heading' => 'h2',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '1a29748d-961a-4c68-ac8a-fd0487599ea7';
+ $display->content['new-1a29748d-961a-4c68-ac8a-fd0487599ea7'] = $pane;
+ $display->panels['contentmain'][0] = 'new-1a29748d-961a-4c68-ac8a-fd0487599ea7';
+ $pane = new stdClass();
+ $pane->pid = 'new-5a11a330-5d60-48a7-8990-70cdf1c5e76d';
+ $pane->panel = 'contentmain';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:body';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'hidden',
+ 'formatter' => 'text_summary_or_trimmed',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'trim_length' => 600,
+ ),
+ 'context' => 'panelizer',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'override_title_heading' => 'h2',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '5a11a330-5d60-48a7-8990-70cdf1c5e76d';
+ $display->content['new-5a11a330-5d60-48a7-8990-70cdf1c5e76d'] = $pane;
+ $display->panels['contentmain'][1] = 'new-5a11a330-5d60-48a7-8990-70cdf1c5e76d';
+ $pane = new stdClass();
+ $pane->pid = 'new-81940446-a77c-4133-b348-71a49da13a8f';
+ $pane->panel = 'contentmain';
+ $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' => 'teaser',
+ 'identifier' => '',
+ 'link' => TRUE,
+ 'context' => 'panelizer',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_class' => 'link-wrapper',
+ );
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = '81940446-a77c-4133-b348-71a49da13a8f';
+ $display->content['new-81940446-a77c-4133-b348-71a49da13a8f'] = $pane;
+ $display->panels['contentmain'][2] = 'new-81940446-a77c-4133-b348-71a49da13a8f';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = 'new-1a29748d-961a-4c68-ac8a-fd0487599ea7';
$panelizer->display = $display;
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.strongarm.inc b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.strongarm.inc
index 63ddcc52c538d79ea95b4939c38a1d1976cbd5c2..dac5717d1b59788ac67313878b6a52536c520e30 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.strongarm.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.strongarm.inc
@@ -321,5 +321,19 @@ function panopoly_test_strongarm() {
$strongarm->value = 'node:panopoly_test_page:default';
$export['panelizer_node:panopoly_test_page:page_manager_selection'] = $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:panopoly_test_page_allowed_layouts_default';
+ $strongarm->value = 1;
+ $export['panelizer_node:panopoly_test_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:panopoly_test_page_allowed_types_default';
+ $strongarm->value = 1;
+ $export['panelizer_node:panopoly_test_page_allowed_types_default'] = $strongarm;
+
return $export;
}
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/tests/features/basic_ipe.feature b/profiles/wcm_base/modules/panopoly/panopoly_test/tests/features/basic_ipe.feature
new file mode 100644
index 0000000000000000000000000000000000000000..1908207fe3d0cafbc8a53077e4525aba3270a38e
--- /dev/null
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/tests/features/basic_ipe.feature
@@ -0,0 +1,18 @@
+Feature: Make basic changes with the IPE
+ In order to customize pages
+ As a site administrator
+ I need to be able to manipulate them with the IPE
+
+ Background:
+ Given I am logged in as a user with the "administrator" role
+ And Panopoly magic live previews are disabled
+ And I am viewing a "panopoly_test_page" node with the title "Testing title"
+
+ @api @javascript
+ Scenario: Change layout
+ When I change layout with the Panels IPE
+ And I click "Phelan"
+ And I press "Save" in the "CTools modal" region
+ And I wait for the Panels IPE to deactivate
+ Then I should see "Testing title"
+
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/tests/features/magic_form_improvements.feature b/profiles/wcm_base/modules/panopoly/panopoly_test/tests/features/magic_form_improvements.feature
index 871be6968363bf7e920ca5fa0919588a402acd79..219a8372c2ad3597e803638a6804829e7d71db70 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/tests/features/magic_form_improvements.feature
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/tests/features/magic_form_improvements.feature
@@ -17,16 +17,16 @@ Feature: Panopoly Magic improves the usability of forms (even without previews)
Then I should see "General Settings"
When I press the "Continue" button
Then I should see "General Settings"
- And the "Image style" select should be set to "panopoly_image_half"
+ And the "Image style" select should be set to "Half width (of the containing region - could upscale small images)"
And the "Link image to" select should be set to "Content"
# Check that changing the values actually stick per Issue #2443499
- When I select "panopoly_image_full" from "Image style"
+ When I select "Full width (of the containing region - could upscale small images)" from "Image style"
And I select "Nothing" from "Link image to"
And I press the "Finish" button
When I click "Settings" in the "Bryant Content" region
And I press the "Continue" button
Then I should see "General Settings"
- And the "Image style" select should be set to "panopoly_image_full"
+ And the "Image style" select should be set to "Full width (of the containing region - could upscale small images)"
And the "Link image to" select should be set to "Nothing"
# Need to close out the dialog and save the IPE to prevent following tests
# getting stuck!
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/tests/steps/panopoly_test.behat.inc b/profiles/wcm_base/modules/panopoly/panopoly_test/tests/steps/panopoly_test.behat.inc
index a5a4cf56bf4c050e3882187e139ff57220ba89c2..d3596f5638144b374e1cc16464244a2d74e3f8ed 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/tests/steps/panopoly_test.behat.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/tests/steps/panopoly_test.behat.inc
@@ -29,7 +29,6 @@ class TestSubContext extends BehatContext implements DrupalSubContextInterface {
return 'test';
}
- protected $menu_rebuilt = FALSE;
protected $private_path_overridden = FALSE;
/**
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/tests/steps/panopoly_test_panels.behat.inc b/profiles/wcm_base/modules/panopoly/panopoly_test/tests/steps/panopoly_test_panels.behat.inc
index f9d0951eccef22191900e8bfc605f9d50035beef..a2814124efd1e96774ef458e0d3574e71355dba5 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/tests/steps/panopoly_test_panels.behat.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/tests/steps/panopoly_test_panels.behat.inc
@@ -55,4 +55,14 @@ class PanelsSubContext extends BehatContext implements DrupalSubContextInterface
$this->waitForIPEtoActivate();
}
+ /**
+ * @When /^(?:|I )change layout with the Panels IPE$/
+ *
+ * Open 'Change layout' dialog if it's available on the current page.
+ */
+ public function changeLayoutIPE() {
+ $this->getSession()->getPage()->clickLink('Change layout');
+ $this->getSession()->wait(5000, 'jQuery(".panels-choose-layout").length === 0');
+ }
+
}
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
index a5562d844f601c29b549db407f9de92b8444deec..2e08c839b684b03b10a8400d7f153ed9765804cb 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Panopoly Theme 7.x-1.21, 2015-04-29
+----------------------------
+- Remove 'Radix' from the label of each of the layouts.
+
Panopoly Theme 7.x-1.20, 2015-03-25
----------------------------
- CHANGELOG.txt updates for 1.19 went wrong.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
index be183c0254d64139924f8be233f83d1ae7730a71..c029096fe5f9b4b8c106af1c348509c88d23a7a9 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
@@ -11,9 +11,9 @@ stylesheets[all][] = css/panopoly-accordian.css
stylesheets[all][] = css/panopoly-layouts.css
features[features_api][] = api:2
-; Information added by Drupal.org packaging script on 2015-03-25
-version = "7.x-1.20"
+; Information added by Drupal.org packaging script on 2015-04-29
+version = "7.x-1.21"
core = "7.x"
project = "panopoly_theme"
-datestamp = "1427310804"
+datestamp = "1430338715"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.make b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.make
index e02194c9e15e1f2a4257e6ea68d62de94ff33cf3..19a6c574cb3f2f983d703b620cc41ddcfa0e3108 100755
--- a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.make
+++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.make
@@ -6,6 +6,7 @@ core = 7.x
; Radix Layouts
projects[radix_layouts][version] = 3.3
projects[radix_layouts][subdir] = contrib
+projects[radix_layouts][patch][2476723] = https://www.drupal.org/files/issues/radix_layouts-radix-label-2476709-1.patch
; Summon the Power of Respond.js
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
index 0675bc9942b999c1a625a01a63951ca3bcde7b8f..1449b6313ffa0c0128a7a6b2c351b9b1210148c8 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
@@ -1,3 +1,11 @@
+Panopoly Widgets 7.x-1.21, 2015-04-29
+------------------------------
+- Update Features module to version 2.5.
+- Content Item widget initial preview is confusing.
+- Document names in the Media "Library" overflow outside of their boxes.
+- "File name" filter in Media "Library" loses focus after each keystroke.
+- Media browser tabs give little indication that a tab is selected.
+
Panopoly Widgets 7.x-1.20, 2015-03-25
------------------------------
- CHANGELOG.txt updates for 1.19 went wrong.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly-widgets-media-browser.css b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly-widgets-media-browser.css
new file mode 100644
index 0000000000000000000000000000000000000000..66ed05aeeb8f9eb642530dab2b29d87fee18c6e2
--- /dev/null
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly-widgets-media-browser.css
@@ -0,0 +1,23 @@
+/**
+ * @file
+ * Styles for the media browser.
+ */
+
+/**
+ * Fix weirdness with the tabs when combining the CSS from Seven, the jQuery UI
+ * theme from panopoly_core and the current theme.
+ *
+ * @see https://www.drupal.org/node/2458747
+ */
+#media-tabs-wrapper .ui-tabs-nav li,
+#media-tabs-wrapper .ui-tabs-nav li.ui-tabs-selected {
+ border: 0;
+ background: transparent;
+}
+#media-tabs-wrapper .ui-tabs-nav li.ui-tabs-selected a:link,
+#media-tabs-wrapper .ui-tabs-nav li.ui-tabs-selected a:visited {
+ background: white;
+}
+#media-tabs-wrapper .ui-tabs-nav li.ui-tabs-selected a:hover {
+ color: inherit;
+}
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.features.field_base.inc b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.features.field_base.inc
index 13fa2a77bd09369898c4a2928455508ece507ff8..871d9d0e045486bda1104efc1da6b07e039886b2 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.features.field_base.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.features.field_base.inc
@@ -17,14 +17,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_basic_file_file',
- 'foreign keys' => array(
- 'fid' => array(
- 'columns' => array(
- 'fid' => 'fid',
- ),
- 'table' => 'file_managed',
- ),
- ),
'indexes' => array(
'fid' => array(
0 => 'fid',
@@ -48,14 +40,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_basic_file_text',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -75,14 +59,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_basic_image_caption',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -102,14 +78,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_basic_image_image',
- 'foreign keys' => array(
- 'fid' => array(
- 'columns' => array(
- 'fid' => 'fid',
- ),
- 'table' => 'file_managed',
- ),
- ),
'indexes' => array(
'fid' => array(
0 => 'fid',
@@ -132,7 +100,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_basic_spotlight_duration',
- 'foreign keys' => array(),
'indexes' => array(),
'locked' => 0,
'module' => 'number',
@@ -148,14 +115,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_basic_spotlight_items',
- 'foreign keys' => array(
- 'fid' => array(
- 'columns' => array(
- 'fid' => 'fid',
- ),
- 'table' => 'file_managed',
- ),
- ),
'indexes' => array(
'fid' => array(
0 => 'fid',
@@ -178,7 +137,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_basic_spotlight_pager',
- 'foreign keys' => array(),
'indexes' => array(
'value' => array(
0 => 'value',
@@ -205,7 +163,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_basic_table_table',
- 'foreign keys' => array(),
'indexes' => array(),
'locked' => 0,
'module' => 'tablefield',
@@ -224,14 +181,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_basic_text_text',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -251,14 +200,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_map_address',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -280,14 +221,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_map_information',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
'indexes' => array(
'format' => array(
0 => 'format',
@@ -307,7 +240,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_quick_links_links',
- 'foreign keys' => array(),
'indexes' => array(),
'locked' => 0,
'module' => 'link',
@@ -337,14 +269,6 @@ function panopoly_widgets_field_default_field_bases() {
'deleted' => 0,
'entity_types' => array(),
'field_name' => 'field_video_file',
- '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/panopoly/panopoly_widgets/panopoly_widgets.features.field_instance.inc b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.features.field_instance.inc
index 304c1e987323a14029a56d32625c263acc093f9c..a7d503709f1cd6054dc01ce8048a5ed6430b1390 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.features.field_instance.inc
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.features.field_instance.inc
@@ -10,7 +10,8 @@
function panopoly_widgets_field_default_field_instances() {
$field_instances = array();
- // Exported field_instance: 'fieldable_panels_pane-basic_file-field_basic_file_file'
+ // Exported field_instance:
+ // 'fieldable_panels_pane-basic_file-field_basic_file_file'
$field_instances['fieldable_panels_pane-basic_file-field_basic_file_file'] = array(
'bundle' => 'basic_file',
'deleted' => 0,
@@ -46,7 +47,8 @@ function panopoly_widgets_field_default_field_instances() {
),
);
- // Exported field_instance: 'fieldable_panels_pane-basic_file-field_basic_file_text'
+ // Exported field_instance:
+ // 'fieldable_panels_pane-basic_file-field_basic_file_text'
$field_instances['fieldable_panels_pane-basic_file-field_basic_file_text'] = array(
'bundle' => 'basic_file',
'default_value' => NULL,
@@ -80,7 +82,8 @@ function panopoly_widgets_field_default_field_instances() {
),
);
- // Exported field_instance: 'fieldable_panels_pane-image-field_basic_image_caption'
+ // Exported field_instance:
+ // 'fieldable_panels_pane-image-field_basic_image_caption'
$field_instances['fieldable_panels_pane-image-field_basic_image_caption'] = array(
'bundle' => 'image',
'default_value' => NULL,
@@ -116,7 +119,8 @@ function panopoly_widgets_field_default_field_instances() {
),
);
- // Exported field_instance: 'fieldable_panels_pane-image-field_basic_image_image'
+ // Exported field_instance:
+ // 'fieldable_panels_pane-image-field_basic_image_image'
$field_instances['fieldable_panels_pane-image-field_basic_image_image'] = array(
'bundle' => 'image',
'deleted' => 0,
@@ -254,7 +258,8 @@ function panopoly_widgets_field_default_field_instances() {
),
);
- // Exported field_instance: 'fieldable_panels_pane-quick_links-field_quick_links_links'
+ // Exported field_instance:
+ // 'fieldable_panels_pane-quick_links-field_quick_links_links'
$field_instances['fieldable_panels_pane-quick_links-field_quick_links_links'] = array(
'bundle' => 'quick_links',
'default_value' => NULL,
@@ -303,7 +308,8 @@ function panopoly_widgets_field_default_field_instances() {
),
);
- // Exported field_instance: 'fieldable_panels_pane-spotlight-field_basic_spotlight_duration'
+ // Exported field_instance:
+ // 'fieldable_panels_pane-spotlight-field_basic_spotlight_duration'
$field_instances['fieldable_panels_pane-spotlight-field_basic_spotlight_duration'] = array(
'bundle' => 'spotlight',
'default_value' => NULL,
@@ -337,7 +343,8 @@ function panopoly_widgets_field_default_field_instances() {
),
);
- // Exported field_instance: 'fieldable_panels_pane-spotlight-field_basic_spotlight_items'
+ // Exported field_instance:
+ // 'fieldable_panels_pane-spotlight-field_basic_spotlight_items'
$field_instances['fieldable_panels_pane-spotlight-field_basic_spotlight_items'] = array(
'bundle' => 'spotlight',
'default_value' => NULL,
@@ -378,7 +385,8 @@ function panopoly_widgets_field_default_field_instances() {
),
);
- // Exported field_instance: 'fieldable_panels_pane-spotlight-field_basic_spotlight_pager'
+ // Exported field_instance:
+ // 'fieldable_panels_pane-spotlight-field_basic_spotlight_pager'
$field_instances['fieldable_panels_pane-spotlight-field_basic_spotlight_pager'] = array(
'bundle' => 'spotlight',
'default_value' => array(
@@ -412,7 +420,8 @@ function panopoly_widgets_field_default_field_instances() {
),
);
- // Exported field_instance: 'fieldable_panels_pane-table-field_basic_table_table'
+ // Exported field_instance:
+ // 'fieldable_panels_pane-table-field_basic_table_table'
$field_instances['fieldable_panels_pane-table-field_basic_table_table'] = array(
'bundle' => 'table',
'default_value' => array(
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
index 08f46247810987f9e8f19bff960f10110b52b76f..f4d5222a38745ea4b12ba52437ef27564ce5fd6f 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
@@ -116,9 +116,9 @@ features[file_display][] = video__teaser__media_youtube_image
features[file_display][] = video__teaser__media_youtube_video
features[views_view][] = panopoly_widgets_general_content
-; Information added by Drupal.org packaging script on 2015-03-25
-version = "7.x-1.20"
+; Information added by Drupal.org packaging script on 2015-04-29
+version = "7.x-1.21"
core = "7.x"
project = "panopoly_widgets"
-datestamp = "1427311095"
+datestamp = "1430338990"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.make b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.make
index 826955e43b4f6e60f451feab141b8917dff815e9..0398b34e24c555c31269e0d08249b00e7d60eb1e 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.make
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.make
@@ -33,6 +33,8 @@ projects[media][download][branch] = 7.x-2.x
projects[media][patch][2192981] = http://drupal.org/files/issues/media-restore-edit-button-2192981-13.patch
projects[media][patch][2126697] = http://drupal.org/files/issues/media-wysiwyg-alt-title-handling-2126697-27.patch
projects[media][patch][2308487] = http://drupal.org/files/issues/media-alt-title-double-encoded-2308487-1.patch
+projects[media][patch][2084287] = http://www.drupal.org/files/issues/media-file-name-focus-2084287-2.patch
+projects[media][patch][2421589] = http://www.drupal.org/files/issues/media-library-preview-overflow-2421589-2.patch
projects[media_youtube][version] = 2.x-dev
projects[media_youtube][subdir] = contrib
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.module b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.module
index 018958ff23c892cc59b8859fb776566d9d6da4cf..a8d9f4d2c5e65b3402cb4ec6b929e90187f2b8c9 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.module
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.module
@@ -19,6 +19,7 @@ function panopoly_widgets_init() {
if (arg(0) == 'media' && arg(1) == 'browser' && $GLOBALS['theme'] != 'seven') {
drupal_add_css(drupal_get_path('theme', 'seven') . '/reset.css', array('basename' => 'seven_reset', 'group' => CSS_THEME));
drupal_add_css(drupal_get_path('theme', 'seven') . '/style.css', array('basename' => 'seven_style', 'group' => CSS_THEME));
+ drupal_add_css(drupal_get_path('module', 'panopoly_widgets') . '/panopoly-widgets-media-browser.css', array('group' => CSS_THEME));
}
}
@@ -544,6 +545,20 @@ function _panopoly_widgets_is_title_shown($node, $view_mode) {
}
}
+/**
+ * Implements hook_views_pre_view().
+ */
+function panopoly_widgets_views_pre_view(&$view, &$display_id, &$args) {
+ if ($view->name == 'panopoly_widgets_general_content' && $display_id == 'piece_of_content') {
+ // If neither 'nid' or 'title' is set, then don't display anything. This is
+ // primarily for the live preview, which would otherwise default to the
+ // first node. See issue #2463395.
+ if (empty($view->exposed_input) || (empty($view->exposed_input['nid']) && empty($view->exposed_input['title']))) {
+ $view->executed = TRUE;
+ }
+ }
+}
+
/**
* Implements hook_views_post_execute().
*/
@@ -595,6 +610,11 @@ function panopoly_widgets_form_views_content_views_panes_content_type_edit_form_
if ($view->name == 'panopoly_widgets_general_content' && $view->current_display == 'piece_of_content') {
$exposed =& $form['exposed'];
+ // Set required on the form rather than the View because we need to allow
+ // either 'title' or 'nid' when actually rendering the View.
+ $exposed['filter-title']['#required'] = TRUE;
+ $exposed['filter-title']['title']['#required'] = TRUE;
+
// If the user updated panopoly_widgets, but hasn't run the update function
// panopoly_wigets_update_7012() yet, then bail out because this code can
// actually break this widget entirely.
diff --git a/profiles/wcm_base/wcm_base.info b/profiles/wcm_base/wcm_base.info
index 2d45afc356ef4921b6d3130ef39883ecfa9563c9..179d10f5a8879efe3c7f6506d681663be8863509 100644
--- a/profiles/wcm_base/wcm_base.info
+++ b/profiles/wcm_base/wcm_base.info
@@ -105,7 +105,6 @@ dependencies[] = ocio_news
dependencies[] = ocio_omega_settings
dependencies[] = ocio_panels_settings
dependencies[] = ocio_permissions
-dependencies[] = ocio_sample_content
dependencies[] = ocio_search
dependencies[] = ocio_simplesamlphp_auth
dependencies[] = ocio_siteinfo
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index 9990f00a831578efdaee4f35b0e6c03f5b8a6f2b..ecb3591ac87f457274bda6ed1185b17d0e1b209d 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -328,32 +328,32 @@ libraries[ocio_modernizr][download][branch] = 7.x-1.x
; The Panopoly Foundation
-projects[panopoly_core][version] = 1.20
+projects[panopoly_core][version] = 1.21
projects[panopoly_core][subdir] = panopoly
-projects[panopoly_theme][version] = 1.20
+projects[panopoly_theme][version] = 1.21
projects[panopoly_theme][subdir] = panopoly
-projects[panopoly_magic][version] = 1.20
+projects[panopoly_magic][version] = 1.21
projects[panopoly_magic][subdir] = panopoly
-projects[panopoly_widgets][version] = 1.20
+projects[panopoly_widgets][version] = 1.21
projects[panopoly_widgets][subdir] = panopoly
-projects[panopoly_admin][version] = 1.20
+projects[panopoly_admin][version] = 1.21
projects[panopoly_admin][subdir] = panopoly
; The Panopoly Toolset
-projects[panopoly_pages][version] = 1.20
+projects[panopoly_pages][version] = 1.21
projects[panopoly_pages][subdir] = panopoly
-projects[panopoly_search][version] = 1.20
+projects[panopoly_search][version] = 1.21
projects[panopoly_search][subdir] = panopoly
; For running the automated tests.
-projects[panopoly_test][version] = 1.20
+projects[panopoly_test][version] = 1.21
projects[panopoly_test][subdir] = panopoly