Index: nodewords.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords.module,v retrieving revision 1.57.2.365 diff -u -p -r1.57.2.365 nodewords.module --- nodewords.module 1 Nov 2010 07:14:31 -0000 1.57.2.365 +++ nodewords.module 1 Nov 2010 07:28:14 -0000 @@ -357,6 +357,11 @@ function nodewords_detect_type_id($optio } } + // If nothing else has claimed this page, check if we're on the front page. + if (drupal_is_front_page() && $result['type'] == NODEWORDS_TYPE_DEFAULT) { + $result['type'] = NODEWORDS_TYPE_FRONTPAGE; + } + return $result; } @@ -873,6 +878,7 @@ function _nodewords_get_type_strings() { return array( NODEWORDS_TYPE_DEFAULT => t('default'), NODEWORDS_TYPE_ERRORPAGE => t('HTTP error page'), + NODEWORDS_TYPE_FRONTPAGE => t('front page'), NODEWORDS_TYPE_NODE => t('node'), NODEWORDS_TYPE_PAGE => t('custom page'), NODEWORDS_TYPE_TERM => t('taxonomy term'), Index: nodewords_admin/nodewords_admin.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_admin/Attic/nodewords_admin.module,v retrieving revision 1.1.2.12 diff -u -p -r1.1.2.12 nodewords_admin.module --- nodewords_admin/nodewords_admin.module 30 Jun 2010 16:27:47 -0000 1.1.2.12 +++ nodewords_admin/nodewords_admin.module 1 Nov 2010 07:28:14 -0000 @@ -98,25 +98,19 @@ function nodewords_admin_help($path, $ar * Implements hook_menu(). */ function nodewords_admin_menu() { - $admin_access = array('administer meta tags'); - $items = array(); - $items['admin/content/nodewords'] = array( 'title' => 'Meta tags', 'page callback' => 'drupal_get_form', 'page arguments' => array('nodewords_admin_settings_form'), 'description' => 'Configure HTML meta tags for all the content.', - 'access arguments' => $admin_access, + 'access arguments' => array('administer meta tags'), 'type' => MENU_NORMAL_ITEM, 'file' => 'nodewords_admin.admin.inc', ); - $items['admin/content/nodewords/settings'] = array( 'title' => 'General settings', - 'access arguments' => $admin_access, 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -1, - 'file' => 'nodewords_admin.admin.inc', + 'weight' => -10, ); $items['admin/content/nodewords/default'] = array( @@ -127,7 +121,7 @@ function nodewords_admin_menu() { 'type' => NODEWORDS_TYPE_DEFAULT, ) ), - 'access arguments' => $admin_access, + 'access arguments' => array('administer meta tags'), 'type' => MENU_LOCAL_TASK, 'file' => 'nodewords_admin.admin.inc', ); @@ -137,21 +131,30 @@ function nodewords_admin_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array( 'nodewords_admin_tags_edit_form', array( - 'type' => NODEWORDS_TYPE_ERRORPAGE, 'id' => 403, + 'type' => NODEWORDS_TYPE_FRONTPAGE, ) ), - 'access arguments' => $admin_access, + 'access arguments' => array('administer meta tags'), 'type' => MENU_LOCAL_TASK, 'file' => 'nodewords_admin.admin.inc', ); - + $items['admin/content/nodewords/meta-tags/front'] = array( + 'title' => 'Front page', + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -10, + ); $items['admin/content/nodewords/meta-tags/errorpage_403'] = array( 'title' => 'Error 403 page', - 'access arguments' => $admin_access, - 'type' => MENU_DEFAULT_LOCAL_TASK, + 'page callback' => 'drupal_get_form', + 'page arguments' => array( + 'nodewords_admin_tags_edit_form', array( + 'type' => NODEWORDS_TYPE_ERRORPAGE, 'id' => 403, + ) + ), + 'access arguments' => array('administer meta tags'), + 'type' => MENU_LOCAL_TASK, 'file' => 'nodewords_admin.admin.inc', ); - $items['admin/content/nodewords/meta-tags/errorpage_404'] = array( 'title' => 'Error 404 page', 'page callback' => 'drupal_get_form', @@ -160,7 +163,7 @@ function nodewords_admin_menu() { 'type' => NODEWORDS_TYPE_ERRORPAGE, 'id' => 404, ) ), - 'access arguments' => $admin_access, + 'access arguments' => array('administer meta tags'), 'type' => MENU_LOCAL_TASK, 'file' => 'nodewords_admin.admin.inc', ); Index: nodewords_basic/includes/nodewords_basic.nodewords.hooks.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_basic/includes/Attic/nodewords_basic.nodewords.hooks.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 nodewords_basic.nodewords.hooks.inc --- nodewords_basic/includes/nodewords_basic.nodewords.hooks.inc 11 Apr 2010 15:39:45 -0000 1.1.2.5 +++ nodewords_basic/includes/nodewords_basic.nodewords.hooks.inc 1 Nov 2010 07:28:14 -0000 @@ -26,6 +26,7 @@ function nodewords_basic_nodewords_tags_ 'context' => array( 'allowed' => array( NODEWORDS_TYPE_DEFAULT, + NODEWORDS_TYPE_FRONTPAGE, NODEWORDS_TYPE_NODE, NODEWORDS_TYPE_PAGE, NODEWORDS_TYPE_PAGER, @@ -94,6 +95,7 @@ function nodewords_basic_nodewords_tags_ 'allowed' => array( NODEWORDS_TYPE_DEFAULT, NODEWORDS_TYPE_ERRORPAGE, + NODEWORDS_TYPE_FRONTPAGE, NODEWORDS_TYPE_NODE, NODEWORDS_TYPE_PAGE, NODEWORDS_TYPE_PAGER, Index: nodewords_extra/includes/nodewords_extra.nodewords.hooks.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_extra/includes/Attic/nodewords_extra.nodewords.hooks.inc,v retrieving revision 1.1.2.10 diff -u -p -r1.1.2.10 nodewords_extra.nodewords.hooks.inc --- nodewords_extra/includes/nodewords_extra.nodewords.hooks.inc 30 Oct 2010 19:10:16 -0000 1.1.2.10 +++ nodewords_extra/includes/nodewords_extra.nodewords.hooks.inc 1 Nov 2010 07:28:14 -0000 @@ -16,6 +16,7 @@ function nodewords_extra_nodewords_tags_ 'context' => array( 'allowed' => array( NODEWORDS_TYPE_DEFAULT, + NODEWORDS_TYPE_FRONTPAGE, NODEWORDS_TYPE_NODE, NODEWORDS_TYPE_PAGE, ), @@ -33,6 +34,7 @@ function nodewords_extra_nodewords_tags_ 'context' => array( 'allowed' => array( NODEWORDS_TYPE_DEFAULT, + NODEWORDS_TYPE_FRONTPAGE, NODEWORDS_TYPE_NODE, NODEWORDS_TYPE_PAGE, ), @@ -50,6 +52,7 @@ function nodewords_extra_nodewords_tags_ 'context' => array( 'allowed' => array( NODEWORDS_TYPE_DEFAULT, + NODEWORDS_TYPE_FRONTPAGE, NODEWORDS_TYPE_NODE, NODEWORDS_TYPE_PAGE, ), @@ -77,6 +80,7 @@ function nodewords_extra_nodewords_tags_ 'context' => array( 'allowed' => array( NODEWORDS_TYPE_DEFAULT, + NODEWORDS_TYPE_FRONTPAGE, NODEWORDS_TYPE_PAGE, ), ), Index: nodewords_verification_tags/includes/nodewords_verification_tags.nodewords.hooks.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_verification_tags/includes/Attic/nodewords_verification_tags.nodewords.hooks.inc,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 nodewords_verification_tags.nodewords.hooks.inc --- nodewords_verification_tags/includes/nodewords_verification_tags.nodewords.hooks.inc 30 Oct 2010 19:19:00 -0000 1.1.2.6 +++ nodewords_verification_tags/includes/nodewords_verification_tags.nodewords.hooks.inc 1 Nov 2010 07:28:14 -0000 @@ -15,6 +15,7 @@ function nodewords_verification_tags_nod 'callback' => 'nodewords_verification_tags_alexa_verification_code', 'context' => array( 'allowed' => array( + NODEWORDS_TYPE_FRONTPAGE, NODEWORDS_TYPE_PAGE, ), ), @@ -29,6 +30,7 @@ function nodewords_verification_tags_nod 'callback' => 'nodewords_verification_tags_bing_webmaster_center', 'context' => array( 'allowed' => array( + NODEWORDS_TYPE_FRONTPAGE, NODEWORDS_TYPE_PAGE, ), ), @@ -43,6 +45,7 @@ function nodewords_verification_tags_nod 'callback' => 'nodewords_verification_tags_google_webmaster_tools', 'context' => array( 'allowed' => array( + NODEWORDS_TYPE_FRONTPAGE, NODEWORDS_TYPE_PAGE, ), ), @@ -57,6 +60,7 @@ function nodewords_verification_tags_nod 'callback' => 'nodewords_verification_tags_yahoo_site_explorer', 'context' => array( 'allowed' => array( + NODEWORDS_TYPE_FRONTPAGE, NODEWORDS_TYPE_PAGE, ), ), @@ -71,6 +75,7 @@ function nodewords_verification_tags_nod 'callback' => 'nodewords_verification_tags_yandex_webmaster_tools', 'context' => array( 'allowed' => array( + NODEWORDS_TYPE_FRONTPAGE, NODEWORDS_TYPE_PAGE, ), ),