From 9e35006fb46a46f7d01cc7d05b4e639cc1dab0b8 Mon Sep 17 00:00:00 2001 From: Tristan Olive Date: Tue, 12 Nov 2013 13:51:20 -0500 Subject: [PATCH] Default site content Reorganized the auto creation of default site content, using Features only as a convenient wrapper for a configuration script. The UUID / node export / Features integration approach is too buggy to be usable, either creating duplicates of content nodes, displaying cryptic warnings, or being impossible to revert. This feature generates a default Help page, complete with menu link. (DBOINCP-3) --- .../default_site_content.features.inc | 11 ++++ .../default_site_content.info | 10 ++++ .../default_site_content.module | 57 +++++++++++++++++++ .../default_site_content.strongarm.inc | 17 ++++++ .../help_and_support.features.menu_links.inc | 33 ----------- .../help_and_support/help_and_support.info | 7 --- .../help_and_support/help_and_support.module | 3 - 7 files changed, 95 insertions(+), 43 deletions(-) create mode 100644 drupal/sites/all/features/default_site_content/default_site_content.features.inc create mode 100644 drupal/sites/all/features/default_site_content/default_site_content.info create mode 100644 drupal/sites/all/features/default_site_content/default_site_content.module create mode 100644 drupal/sites/all/features/default_site_content/default_site_content.strongarm.inc delete mode 100644 drupal/sites/all/features/help_and_support/help_and_support.features.menu_links.inc delete mode 100644 drupal/sites/all/features/help_and_support/help_and_support.info delete mode 100644 drupal/sites/all/features/help_and_support/help_and_support.module diff --git a/drupal/sites/all/features/default_site_content/default_site_content.features.inc b/drupal/sites/all/features/default_site_content/default_site_content.features.inc new file mode 100644 index 0000000000..cbfd3b02f1 --- /dev/null +++ b/drupal/sites/all/features/default_site_content/default_site_content.features.inc @@ -0,0 +1,11 @@ + 1); + } +} diff --git a/drupal/sites/all/features/default_site_content/default_site_content.info b/drupal/sites/all/features/default_site_content/default_site_content.info new file mode 100644 index 0000000000..588d367a19 --- /dev/null +++ b/drupal/sites/all/features/default_site_content/default_site_content.info @@ -0,0 +1,10 @@ +name = "Default site content" +description = "Creates basic pages, such as Help and About Us" +core = "6.x" +package = "Features" +version = "6.x-0.1" +project = "default_site_content" +dependencies[] = "boinc_standard" +dependencies[] = "strongarm" +features[ctools][] = "strongarm:strongarm:1" +features[variable][] = "boinc_default_site_content" diff --git a/drupal/sites/all/features/default_site_content/default_site_content.module b/drupal/sites/all/features/default_site_content/default_site_content.module new file mode 100644 index 0000000000..476d9f3775 --- /dev/null +++ b/drupal/sites/all/features/default_site_content/default_site_content.module @@ -0,0 +1,57 @@ + 'page', + 'title' => t('Help'), + 'uid' => 1, + 'status' => 1, // published + 'promote' => 0, // not promoted to front page + 'path' => 'help', + 'pathauto_perform_alias' => FALSE, + 'created' => time(), + 'changed' => time(), + 'comment' => 0, // disable comments + 'moderate' => 0, + 'body' => preg_replace('/>\s+<', + '

Use this page to provide help and support for your site\'s + visitors:

+ '), + 'sticky' => 0, + 'format' => 4, + //'teaser' => $teaser, + ); + $node = (object) $node; // node_save requires an object + node_save($node); + + $item = array( + 'link_path' => drupal_get_normal_path('help'), + 'link_title' => t('Help'), + 'menu_name' => 'primary-links', + 'weight' => 50, + ); + menu_link_save($item); + menu_cache_clear_all(); + + variable_set('boinc_default_site_content_init', 1); + } +} + +function default_site_content_disable() { + //menu_link_delete(NULL, drupal_get_normal_path('help')); + //menu_cache_clear_all(); +} diff --git a/drupal/sites/all/features/default_site_content/default_site_content.strongarm.inc b/drupal/sites/all/features/default_site_content/default_site_content.strongarm.inc new file mode 100644 index 0000000000..e8f67d0e71 --- /dev/null +++ b/drupal/sites/all/features/default_site_content/default_site_content.strongarm.inc @@ -0,0 +1,17 @@ +disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'boinc_default_site_content'; + $strongarm->value = 1; + $export['boinc_default_site_content'] = $strongarm; + + return $export; +} diff --git a/drupal/sites/all/features/help_and_support/help_and_support.features.menu_links.inc b/drupal/sites/all/features/help_and_support/help_and_support.features.menu_links.inc deleted file mode 100644 index 438fb9b91f..0000000000 --- a/drupal/sites/all/features/help_and_support/help_and_support.features.menu_links.inc +++ /dev/null @@ -1,33 +0,0 @@ - 'primary-links', - 'link_path' => 'http://boinc.berkeley.edu/help.php', - 'router_path' => '', - 'link_title' => 'Help', - 'options' => array( - 'attributes' => array( - 'title' => '', - ), - ), - 'module' => 'menu', - 'hidden' => '0', - 'external' => '1', - 'has_children' => '0', - 'expanded' => '0', - 'weight' => '-46', - ); - // Translatables - // Included for use with string extractors like potx. - t('Help'); - - - return $menu_links; -} diff --git a/drupal/sites/all/features/help_and_support/help_and_support.info b/drupal/sites/all/features/help_and_support/help_and_support.info deleted file mode 100644 index d723321e86..0000000000 --- a/drupal/sites/all/features/help_and_support/help_and_support.info +++ /dev/null @@ -1,7 +0,0 @@ -name = "Help and support" -description = "Menu link to BOINC help" -core = "6.x" -package = "Features" -dependencies[] = "features" -dependencies[] = "menu" -features[menu_links][] = "primary-links:http://boinc.berkeley.edu/help.php" diff --git a/drupal/sites/all/features/help_and_support/help_and_support.module b/drupal/sites/all/features/help_and_support/help_and_support.module deleted file mode 100644 index 5f07572084..0000000000 --- a/drupal/sites/all/features/help_and_support/help_and_support.module +++ /dev/null @@ -1,3 +0,0 @@ -