diff --git a/modules/features/dvg_ct_block/dvg_ct_block.features.field_base.inc b/modules/features/dvg_ct_block/dvg_ct_block.features.field_base.inc
index cb66f34..eab5c02 100644
--- a/modules/features/dvg_ct_block/dvg_ct_block.features.field_base.inc
+++ b/modules/features/dvg_ct_block/dvg_ct_block.features.field_base.inc
@@ -10,7 +10,7 @@
function dvg_ct_block_field_default_field_bases() {
$field_bases = array();
- // Exported field_base: 'field_block_body'
+ // Exported field_base: 'field_block_body'.
$field_bases['field_block_body'] = array(
'active' => 1,
'cardinality' => 2,
diff --git a/modules/features/dvg_ct_block/dvg_ct_block.features.field_instance.inc b/modules/features/dvg_ct_block/dvg_ct_block.features.field_instance.inc
index c846122..2b98075 100644
--- a/modules/features/dvg_ct_block/dvg_ct_block.features.field_instance.inc
+++ b/modules/features/dvg_ct_block/dvg_ct_block.features.field_instance.inc
@@ -10,7 +10,7 @@
function dvg_ct_block_field_default_field_instances() {
$field_instances = array();
- // Exported field_instance: 'node-block-field_alternate_keywords'
+ // Exported field_instance: 'node-block-field_alternate_keywords'.
$field_instances['node-block-field_alternate_keywords'] = array(
'bundle' => 'block',
'default_value' => NULL,
@@ -60,7 +60,7 @@ function dvg_ct_block_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-block-field_block_body'
+ // Exported field_instance: 'node-block-field_block_body'.
$field_instances['node-block-field_block_body'] = array(
'bundle' => 'block',
'default_value' => NULL,
@@ -111,7 +111,7 @@ function dvg_ct_block_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-block-field_body'
+ // Exported field_instance: 'node-block-field_body'.
$field_instances['node-block-field_body'] = array(
'bundle' => 'block',
'default_value' => NULL,
@@ -162,7 +162,7 @@ function dvg_ct_block_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-block-field_boost_keywords'
+ // Exported field_instance: 'node-block-field_boost_keywords'.
$field_instances['node-block-field_boost_keywords'] = array(
'bundle' => 'block',
'default_value' => NULL,
@@ -212,7 +212,7 @@ function dvg_ct_block_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-block-field_search_result'
+ // Exported field_instance: 'node-block-field_search_result'.
$field_instances['node-block-field_search_result'] = array(
'bundle' => 'block',
'default_value' => NULL,
diff --git a/modules/features/dvg_ct_block/dvg_ct_block.features.inc b/modules/features/dvg_ct_block/dvg_ct_block.features.inc
index cf504cf..bc81e12 100644
--- a/modules/features/dvg_ct_block/dvg_ct_block.features.inc
+++ b/modules/features/dvg_ct_block/dvg_ct_block.features.inc
@@ -8,9 +8,6 @@
* Implements hook_ctools_plugin_api().
*/
function dvg_ct_block_ctools_plugin_api($module = NULL, $api = NULL) {
- if ($module == "context" && $api == "context") {
- return array("version" => "3");
- }
if ($module == "field_group" && $api == "field_group") {
return array("version" => "1");
}
diff --git a/modules/features/dvg_ct_block/dvg_ct_block.field_group.inc b/modules/features/dvg_ct_block/dvg_ct_block.field_group.inc
index faebcac..df0bbdf 100644
--- a/modules/features/dvg_ct_block/dvg_ct_block.field_group.inc
+++ b/modules/features/dvg_ct_block/dvg_ct_block.field_group.inc
@@ -8,7 +8,7 @@
* Implements hook_field_group_info().
*/
function dvg_ct_block_field_group_info() {
- $export = array();
+ $field_groups = array();
$field_group = new stdClass();
$field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -36,7 +36,7 @@ function dvg_ct_block_field_group_info() {
),
),
);
- $export['group_basic_info|node|block|form'] = $field_group;
+ $field_groups['group_basic_info|node|block|form'] = $field_group;
$field_group = new stdClass();
$field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -65,7 +65,7 @@ function dvg_ct_block_field_group_info() {
),
),
);
- $export['group_content|node|block|form'] = $field_group;
+ $field_groups['group_content|node|block|form'] = $field_group;
$field_group = new stdClass();
$field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -92,7 +92,7 @@ function dvg_ct_block_field_group_info() {
),
),
);
- $export['group_group|node|block|form'] = $field_group;
+ $field_groups['group_group|node|block|form'] = $field_group;
$field_group = new stdClass();
$field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -122,7 +122,13 @@ function dvg_ct_block_field_group_info() {
),
),
);
- $export['group_search_and_follow|node|block|form'] = $field_group;
+ $field_groups['group_search_and_follow|node|block|form'] = $field_group;
- return $export;
+ // Translatables
+ // Included for use with string extractors like potx.
+ t('Basic info');
+ t('Content');
+ t('Group');
+ t('Search and Follow');
+ return $field_groups;
}
diff --git a/modules/features/dvg_ct_block/dvg_ct_block.info b/modules/features/dvg_ct_block/dvg_ct_block.info
index a9f130d..26b341d 100644
--- a/modules/features/dvg_ct_block/dvg_ct_block.info
+++ b/modules/features/dvg_ct_block/dvg_ct_block.info
@@ -1,7 +1,6 @@
name = Content Type: Block
core = 7.x
package = Drupal voor Gemeenten
-dependencies[] = context
dependencies[] = ctools
dependencies[] = dvg_global
dependencies[] = features
@@ -9,8 +8,6 @@ dependencies[] = field_group
dependencies[] = node
dependencies[] = strongarm
dependencies[] = text
-features[context][] = dvg_block
-features[ctools][] = context:context:3
features[ctools][] = field_group:field_group:1
features[ctools][] = strongarm:strongarm:1
features[features_api][] = api:2
diff --git a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.context.inc b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.context.inc
index efde4c3..9d559e3 100644
--- a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.context.inc
+++ b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.context.inc
@@ -29,9 +29,9 @@ function dvg_ct_menu_page_context_default_contexts() {
$context->reactions = array(
'block' => array(
'blocks' => array(
- 'menu_block-1' => array(
+ 'menu_block-_active' => array(
'module' => 'menu_block',
- 'delta' => '1',
+ 'delta' => '_active',
'region' => 'below_content',
'weight' => '-26',
),
diff --git a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.field_base.inc b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.field_base.inc
index 469c011..da8390a 100644
--- a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.field_base.inc
+++ b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.field_base.inc
@@ -10,7 +10,7 @@
function dvg_ct_menu_page_field_default_field_bases() {
$field_bases = array();
- // Exported field_base: 'field_external_url'
+ // Exported field_base: 'field_external_url'.
$field_bases['field_external_url'] = array(
'active' => 1,
'cardinality' => 1,
diff --git a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.field_instance.inc b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.field_instance.inc
index af15606..b752a9a 100644
--- a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.field_instance.inc
+++ b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.field_instance.inc
@@ -10,7 +10,7 @@
function dvg_ct_menu_page_field_default_field_instances() {
$field_instances = array();
- // Exported field_instance: 'node-menu_page-body'
+ // Exported field_instance: 'node-menu_page-body'.
$field_instances['node-menu_page-body'] = array(
'bundle' => 'menu_page',
'default_value' => NULL,
@@ -65,7 +65,7 @@ function dvg_ct_menu_page_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-menu_page-field_alternate_keywords'
+ // Exported field_instance: 'node-menu_page-field_alternate_keywords'.
$field_instances['node-menu_page-field_alternate_keywords'] = array(
'bundle' => 'menu_page',
'default_value' => NULL,
@@ -116,7 +116,7 @@ function dvg_ct_menu_page_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-menu_page-field_boost_keywords'
+ // Exported field_instance: 'node-menu_page-field_boost_keywords'.
$field_instances['node-menu_page-field_boost_keywords'] = array(
'bundle' => 'menu_page',
'default_value' => NULL,
@@ -167,7 +167,7 @@ function dvg_ct_menu_page_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-menu_page-field_menu_description'
+ // Exported field_instance: 'node-menu_page-field_menu_description'.
$field_instances['node-menu_page-field_menu_description'] = array(
'bundle' => 'menu_page',
'default_value' => NULL,
@@ -225,7 +225,7 @@ function dvg_ct_menu_page_field_default_field_instances() {
),
);
- // Exported field_instance: 'node-menu_page-field_search_result'
+ // Exported field_instance: 'node-menu_page-field_search_result'.
$field_instances['node-menu_page-field_search_result'] = array(
'bundle' => 'menu_page',
'default_value' => NULL,
diff --git a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.inc b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.inc
index d24b161..c473069 100644
--- a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.inc
+++ b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.inc
@@ -20,70 +20,6 @@ function dvg_ct_menu_page_ctools_plugin_api($module = NULL, $api = NULL) {
}
/**
- * Implements hook_menu_block_features_default().
- */
-function dvg_ct_menu_page_menu_block_features_default() {
- return array(
- 'menu_block__1' => array(
- 'parent' => '_active:0',
- 'title_link' => 0,
- 'admin_title' => 'Menu page Submenu',
- 'level' => 2,
- 'follow' => 'child',
- 'depth' => 0,
- 'expanded' => 0,
- 'sort' => 0,
- 'parent_mlid' => 0,
- 'menu_name' => '_active',
- 'delta' => 1,
- 'exported_to_code' => TRUE,
- ),
- 'menu_block__2' => array(
- 'parent' => 'menu-about:0',
- 'title_link' => 0,
- 'admin_title' => 'Menu page About menu Frontpage',
- 'level' => 1,
- 'follow' => 'child',
- 'depth' => 1,
- 'expanded' => 0,
- 'sort' => 0,
- 'parent_mlid' => 0,
- 'menu_name' => 'menu-about',
- 'delta' => 2,
- 'exported_to_code' => TRUE,
- ),
- 'menu_block__3' => array(
- 'parent' => 'menu-organization:0',
- 'title_link' => 0,
- 'admin_title' => 'Menu page Organization menu Frontpage',
- 'level' => 1,
- 'follow' => 'child',
- 'depth' => 1,
- 'expanded' => 0,
- 'sort' => 0,
- 'parent_mlid' => 0,
- 'menu_name' => 'menu-organization',
- 'delta' => 3,
- 'exported_to_code' => TRUE,
- ),
- 'menu_block__4' => array(
- 'parent' => 'menu-tasks:0',
- 'title_link' => 0,
- 'admin_title' => 'Menu page Tasks menu Frontpage',
- 'level' => 1,
- 'follow' => 'child',
- 'depth' => 1,
- 'expanded' => 0,
- 'sort' => 0,
- 'parent_mlid' => 0,
- 'menu_name' => 'menu-tasks',
- 'delta' => 4,
- 'exported_to_code' => TRUE,
- ),
- );
-}
-
-/**
* Implements hook_node_info().
*/
function dvg_ct_menu_page_node_info() {
diff --git a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.menu_custom.inc b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.menu_custom.inc
index afc1c08..d9e089e 100644
--- a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.menu_custom.inc
+++ b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.features.menu_custom.inc
@@ -36,6 +36,5 @@ function dvg_ct_menu_page_menu_default_menu_custom() {
t('The Organization menu contains links to pages related to the organization and administration.');
t('Tasks');
t('The Tasks menu contains links for Tasks and Guides.');
-
return $menus;
}
diff --git a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.field_group.inc b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.field_group.inc
index 51c00a7..fe6c7b3 100644
--- a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.field_group.inc
+++ b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.field_group.inc
@@ -8,7 +8,7 @@
* Implements hook_field_group_info().
*/
function dvg_ct_menu_page_field_group_info() {
- $export = array();
+ $field_groups = array();
$field_group = new stdClass();
$field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -37,7 +37,7 @@ function dvg_ct_menu_page_field_group_info() {
),
),
);
- $export['group_basicinfo|node|menu_page|form'] = $field_group;
+ $field_groups['group_basicinfo|node|menu_page|form'] = $field_group;
$field_group = new stdClass();
$field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -66,7 +66,7 @@ function dvg_ct_menu_page_field_group_info() {
),
),
);
- $export['group_content|node|menu_page|form'] = $field_group;
+ $field_groups['group_content|node|menu_page|form'] = $field_group;
$field_group = new stdClass();
$field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -93,7 +93,7 @@ function dvg_ct_menu_page_field_group_info() {
),
),
);
- $export['group_menu_page|node|menu_page|form'] = $field_group;
+ $field_groups['group_menu_page|node|menu_page|form'] = $field_group;
$field_group = new stdClass();
$field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -123,7 +123,13 @@ function dvg_ct_menu_page_field_group_info() {
),
),
);
- $export['group_search_and_follow|node|menu_page|form'] = $field_group;
+ $field_groups['group_search_and_follow|node|menu_page|form'] = $field_group;
- return $export;
+ // Translatables
+ // Included for use with string extractors like potx.
+ t('Basic info');
+ t('Content');
+ t('Menu page');
+ t('Search and Follow');
+ return $field_groups;
}
diff --git a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.info b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.info
index 19eaf9c..ecf3e9d 100644
--- a/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.info
+++ b/modules/features/dvg_ct_menu_page/dvg_ct_menu_page.info
@@ -3,6 +3,7 @@ core = 7.x
package = Drupal voor Gemeenten
dependencies[] = context
dependencies[] = ctools
+dependencies[] = dvg_ct_menu_page
dependencies[] = dvg_global
dependencies[] = features
dependencies[] = field_group
@@ -28,10 +29,6 @@ features[field_instance][] = node-menu_page-field_alternate_keywords
features[field_instance][] = node-menu_page-field_boost_keywords
features[field_instance][] = node-menu_page-field_menu_description
features[field_instance][] = node-menu_page-field_search_result
-features[menu_block][] = menu_block__1
-features[menu_block][] = menu_block__2
-features[menu_block][] = menu_block__3
-features[menu_block][] = menu_block__4
features[menu_custom][] = menu-about
features[menu_custom][] = menu-organization
features[menu_custom][] = menu-tasks
diff --git a/modules/features/dvg_global/dvg_global.context.inc b/modules/features/dvg_global/dvg_global.context.inc
index 10a9474..0bb04ac 100644
--- a/modules/features/dvg_global/dvg_global.context.inc
+++ b/modules/features/dvg_global/dvg_global.context.inc
@@ -26,12 +26,18 @@ function dvg_global_context_default_contexts() {
$context->reactions = array(
'block' => array(
'blocks' => array(
- 'menu_block-4' => array(
+ 'menu_block-menu-tasks' => array(
'module' => 'menu_block',
- 'delta' => '4',
+ 'delta' => 'menu-tasks',
'region' => 'content',
'weight' => '-10',
),
+ 'dvg_ct_block-dvg_ct_block_contact' => array(
+ 'module' => 'dvg_ct_block',
+ 'delta' => 'dvg_ct_block_contact',
+ 'region' => 'content',
+ 'weight' => '-9',
+ ),
'views-topical-frontpage_block' => array(
'module' => 'views',
'delta' => 'topical-frontpage_block',
@@ -44,9 +50,9 @@ function dvg_global_context_default_contexts() {
'region' => 'content',
'weight' => '-7',
),
- 'menu_block-2' => array(
+ 'menu_block-menu-about' => array(
'module' => 'menu_block',
- 'delta' => '2',
+ 'delta' => 'menu-about',
'region' => 'content',
'weight' => '-6',
),
@@ -56,9 +62,9 @@ function dvg_global_context_default_contexts() {
'region' => 'content',
'weight' => '-5',
),
- 'menu_block-3' => array(
+ 'menu_block-menu-organization' => array(
'module' => 'menu_block',
- 'delta' => '3',
+ 'delta' => 'menu-organization',
'region' => 'content',
'weight' => '-4',
),
diff --git a/modules/features/dvg_global/dvg_global.features.field_base.inc b/modules/features/dvg_global/dvg_global.features.field_base.inc
index bc67941..0792261 100644
--- a/modules/features/dvg_global/dvg_global.features.field_base.inc
+++ b/modules/features/dvg_global/dvg_global.features.field_base.inc
@@ -10,7 +10,7 @@
function dvg_global_field_default_field_bases() {
$field_bases = array();
- // Exported field_base: 'body'
+ // Exported field_base: 'body'.
$field_bases['body'] = array(
'active' => 1,
'cardinality' => 1,
@@ -31,7 +31,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'text_with_summary',
);
- // Exported field_base: 'field_alternate_keywords'
+ // Exported field_base: 'field_alternate_keywords'.
$field_bases['field_alternate_keywords'] = array(
'active' => 1,
'cardinality' => 1,
@@ -50,7 +50,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'text_long',
);
- // Exported field_base: 'field_body'
+ // Exported field_base: 'field_body'.
$field_bases['field_body'] = array(
'active' => 1,
'cardinality' => 1,
@@ -69,7 +69,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'text_long',
);
- // Exported field_base: 'field_boost_keywords'
+ // Exported field_base: 'field_boost_keywords'.
$field_bases['field_boost_keywords'] = array(
'active' => 1,
'cardinality' => 1,
@@ -88,7 +88,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'text_long',
);
- // Exported field_base: 'field_file_description'
+ // Exported field_base: 'field_file_description'.
$field_bases['field_file_description'] = array(
'active' => 1,
'cardinality' => 1,
@@ -109,7 +109,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'text',
);
- // Exported field_base: 'field_highlight'
+ // Exported field_base: 'field_highlight'.
$field_bases['field_highlight'] = array(
'active' => 1,
'cardinality' => 1,
@@ -134,7 +134,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'list_boolean',
);
- // Exported field_base: 'field_highlight_image'
+ // Exported field_base: 'field_highlight_image'.
$field_bases['field_highlight_image'] = array(
'active' => 1,
'cardinality' => 1,
@@ -156,7 +156,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'image',
);
- // Exported field_base: 'field_highlight_more_label'
+ // Exported field_base: 'field_highlight_more_label'.
$field_bases['field_highlight_more_label'] = array(
'active' => 1,
'cardinality' => 1,
@@ -177,7 +177,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'text',
);
- // Exported field_base: 'field_highlight_text'
+ // Exported field_base: 'field_highlight_text'.
$field_bases['field_highlight_text'] = array(
'active' => 1,
'cardinality' => 1,
@@ -196,7 +196,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'text_long',
);
- // Exported field_base: 'field_image'
+ // Exported field_base: 'field_image'.
$field_bases['field_image'] = array(
'active' => 1,
'cardinality' => 1,
@@ -218,7 +218,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'image',
);
- // Exported field_base: 'field_introduction'
+ // Exported field_base: 'field_introduction'.
$field_bases['field_introduction'] = array(
'active' => 1,
'cardinality' => 1,
@@ -237,7 +237,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'text_long',
);
- // Exported field_base: 'field_menu_description'
+ // Exported field_base: 'field_menu_description'.
$field_bases['field_menu_description'] = array(
'active' => 1,
'cardinality' => 1,
@@ -256,7 +256,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'text_long',
);
- // Exported field_base: 'field_menu_image'
+ // Exported field_base: 'field_menu_image'.
$field_bases['field_menu_image'] = array(
'active' => 1,
'cardinality' => 1,
@@ -278,7 +278,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'image',
);
- // Exported field_base: 'field_publication_date'
+ // Exported field_base: 'field_publication_date'.
$field_bases['field_publication_date'] = array(
'active' => 1,
'cardinality' => 1,
@@ -307,7 +307,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'date',
);
- // Exported field_base: 'field_referral_site'
+ // Exported field_base: 'field_referral_site'.
$field_bases['field_referral_site'] = array(
'active' => 1,
'cardinality' => 1,
@@ -326,7 +326,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'text_long',
);
- // Exported field_base: 'field_related_pages'
+ // Exported field_base: 'field_related_pages'.
$field_bases['field_related_pages'] = array(
'active' => 1,
'cardinality' => -1,
@@ -355,7 +355,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'link_field',
);
- // Exported field_base: 'field_search_result'
+ // Exported field_base: 'field_search_result'.
$field_bases['field_search_result'] = array(
'active' => 1,
'cardinality' => 1,
@@ -374,7 +374,7 @@ function dvg_global_field_default_field_bases() {
'type' => 'text_long',
);
- // Exported field_base: 'field_title_related_pages'
+ // Exported field_base: 'field_title_related_pages'.
$field_bases['field_title_related_pages'] = array(
'active' => 1,
'cardinality' => 1,
diff --git a/modules/features/dvg_global/dvg_global.features.menu_custom.inc b/modules/features/dvg_global/dvg_global.features.menu_custom.inc
index 42c7670..5a5b382 100644
--- a/modules/features/dvg_global/dvg_global.features.menu_custom.inc
+++ b/modules/features/dvg_global/dvg_global.features.menu_custom.inc
@@ -28,6 +28,5 @@ function dvg_global_menu_default_menu_custom() {
t('');
t('Social Media');
t('');
-
return $menus;
}
diff --git a/modules/features/dvg_global/dvg_global.info b/modules/features/dvg_global/dvg_global.info
index e5e692f..2ddd0f0 100644
--- a/modules/features/dvg_global/dvg_global.info
+++ b/modules/features/dvg_global/dvg_global.info
@@ -7,6 +7,7 @@ dependencies[] = date
dependencies[] = date_popup
dependencies[] = diff
dependencies[] = dvg_voc_related_pages_title
+dependencies[] = dvg_ct_block
dependencies[] = features
dependencies[] = functional_content
dependencies[] = i18n
diff --git a/modules/features/dvg_global/dvg_global.install b/modules/features/dvg_global/dvg_global.install
index a81de90..1df452c 100644
--- a/modules/features/dvg_global/dvg_global.install
+++ b/modules/features/dvg_global/dvg_global.install
@@ -67,3 +67,14 @@ function _dvg_global_add_ife_form_id($form_id) {
*/
function dvg_global_update_7008() {
}
+
+/**
+ * Delete obsolete menu blocks.
+ */
+function dvg_global_update_7009() {
+ $max = (module_exists('dvg_town_council')) ? 5 : 4;
+
+ for ($i = 1; $i <= $max; $i++) {
+ menu_block_delete($i);
+ }
+}
diff --git a/modules/features/dvg_global/dvg_global.module b/modules/features/dvg_global/dvg_global.module
index 3890469..571e432 100644
--- a/modules/features/dvg_global/dvg_global.module
+++ b/modules/features/dvg_global/dvg_global.module
@@ -86,6 +86,50 @@ function dvg_global_menu_alter(&$items) {
$items['user/%user/cancel']['access callback'] = 'dvg_global_user_cancel_access';
}
+/**
+ * Implements hook_menu_block_blocks().
+ *
+ * Provide menu blocks for the DvG menus.
+ */
+function dvg_global_menu_block_blocks() {
+ $blocks = array(
+ MENU_TREE__CURRENT_PAGE_MENU => array(
+ 'menu_name' => MENU_TREE__CURRENT_PAGE_MENU,
+ 'parent_mlid' => 0,
+ 'parent' => '_active:0',
+ 'title_link' => FALSE,
+ 'admin_title' => 'Active menu',
+ 'level' => 2,
+ 'depth' => 1,
+ ),
+ );
+
+ // Additional menus.
+ $menu_names = array(
+ 'menu-tasks',
+ 'menu-about',
+ 'menu-organization',
+ );
+ drupal_alter('dvg_global_menu_block_menu_names', $menu_names);
+
+ // Add menu blocks.
+ $menus = menu_get_menus();
+ foreach ($menu_names as $menu_name) {
+ $blocks[$menu_name] = array(
+ 'menu_name' => $menu_name,
+ 'parent_mlid' => 0,
+ 'title_link' => FALSE,
+ 'admin_title' => $menus[$menu_name],
+ 'level' => 1,
+ 'follow' => 0,
+ 'depth' => 1,
+ 'expanded' => FALSE,
+ 'sort' => FALSE,
+ );
+ }
+
+ return $blocks;
+}
/**
* Implements hook_language_negotiation_info().
diff --git a/modules/features/dvg_town_council/dvg_town_council.features.inc b/modules/features/dvg_town_council/dvg_town_council.features.inc
index 39f0481..88ac004 100644
--- a/modules/features/dvg_town_council/dvg_town_council.features.inc
+++ b/modules/features/dvg_town_council/dvg_town_council.features.inc
@@ -22,25 +22,3 @@ function dvg_town_council_ctools_plugin_api($module = NULL, $api = NULL) {
function dvg_town_council_views_api($module = NULL, $api = NULL) {
return array("api" => "3.0");
}
-
-/**
- * Implements hook_menu_block_features_default().
- */
-function dvg_town_council_menu_block_features_default() {
- return array(
- 'menu_block__5' => array(
- 'parent' => 'menu-town-council:0',
- 'title_link' => 0,
- 'admin_title' => 'Menu page Town council menu',
- 'level' => 1,
- 'follow' => 'child',
- 'depth' => 1,
- 'expanded' => 0,
- 'sort' => 0,
- 'parent_mlid' => 0,
- 'menu_name' => 'menu-town-council',
- 'delta' => 5,
- 'exported_to_code' => TRUE,
- ),
- );
-}
diff --git a/modules/features/dvg_town_council/dvg_town_council.features.menu_custom.inc b/modules/features/dvg_town_council/dvg_town_council.features.menu_custom.inc
index 9fc562a..f851678 100644
--- a/modules/features/dvg_town_council/dvg_town_council.features.menu_custom.inc
+++ b/modules/features/dvg_town_council/dvg_town_council.features.menu_custom.inc
@@ -20,6 +20,5 @@ function dvg_town_council_menu_default_menu_custom() {
// Included for use with string extractors like potx.
t('Town council');
t('');
-
return $menus;
}
diff --git a/modules/features/dvg_town_council/dvg_town_council.info b/modules/features/dvg_town_council/dvg_town_council.info
index c4fa152..49cc9b8 100644
--- a/modules/features/dvg_town_council/dvg_town_council.info
+++ b/modules/features/dvg_town_council/dvg_town_council.info
@@ -19,7 +19,6 @@ features[ctools][] = context:context:3
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
-features[menu_block][] = menu_block__5
features[menu_custom][] = menu-town-council
features[user_permission][] = dvg administer menu-town-council
features[variable][] = functional_content_config__town_council__block
diff --git a/modules/features/dvg_town_council/dvg_town_council.module b/modules/features/dvg_town_council/dvg_town_council.module
index 1a90e1e..94bd931 100644
--- a/modules/features/dvg_town_council/dvg_town_council.module
+++ b/modules/features/dvg_town_council/dvg_town_council.module
@@ -125,3 +125,10 @@ function dvg_town_council_menu_breadcrumb_alter(&$active_trail, $item) {
}
}
}
+
+/**
+ * Implements hook_dvg_global_menu_block_menu_names_alter().
+ */
+function dvg_town_council_dvg_global_menu_block_menu_names_alter(&$menu_names) {
+ $menu_names[] = 'menu-town-council';
+}