Index: modules/block/block.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v retrieving revision 1.54 diff -u -r1.54 block.admin.inc --- modules/block/block.admin.inc 31 Aug 2009 17:06:08 -0000 1.54 +++ modules/block/block.admin.inc 5 Sep 2009 18:11:05 -0000 @@ -495,6 +495,7 @@ // Store regions per theme for this block foreach ($form_state['values']['regions'] as $theme => $region) { + $assigned = TRUE; db_merge('block') ->key(array('theme' => $theme, 'delta' => $delta, 'module' => $form_state['values']['module'])) ->fields(array( @@ -506,6 +507,9 @@ } drupal_set_message(t('The block has been created.')); + if ($assigned) { + drupal_set_message(t('The block has not yet assigned to a region. Manage disabled blocks to move the new block to a region as demonstrated on this page. ')); + } cache_clear_all(); $form_state['redirect'] = 'admin/structure/block'; } @@ -551,7 +555,7 @@ global $theme_key; $block_regions = system_region_list($theme_key, REGIONS_VISIBLE); - $variables['block_regions'] = $block_regions + array(BLOCK_REGION_NONE => t('Disabled')); + $variables['block_regions'] = $block_regions + array(BLOCK_REGION_NONE => t('Disabled blocks')); foreach ($block_regions as $key => $value) { // Initialize an empty array for the region. Index: modules/block/block.module =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.module,v retrieving revision 1.373 diff -u -r1.373 block.module --- modules/block/block.module 31 Aug 2009 17:06:08 -0000 1.373 +++ modules/block/block.module 5 Sep 2009 18:11:05 -0000 @@ -30,9 +30,8 @@ $output .= '
' . t('For more information, see the online handbook entry for Block module.', array('@block' => 'http://drupal.org/handbook/modules/block/')) . '
'; return $output; case 'admin/structure/block': - $output = '' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the Save blocks button at the bottom of the page.') . '
'; - $output .= '' . t('Click the configure link next to each block to configure its specific title and visibility settings. Use the add block page to create a custom block.', array('@add-block' => url('admin/structure/block/add'))) . '
'; - return $output; + $output = '' . t('Assign blocks to appear in regions demonstrated on this page, as listed below. Drag and drop to rearrange their order. Changes appear after you save. ') . '
'; + $output .= '' . t('Click the configure link next to each block to configure settings. Manage disabled blocks at the bottom of this page. Add a custom block.', array('@add-block' => url('admin/structure/block/add'))) . '
'; return $output; case 'admin/structure/block/add': return '' . t('Use this page to create a new custom block. New blocks are disabled by default, and must be moved to a region on the blocks administration page to be visible.', array('@blocks' => url('admin/structure/block'))) . '
'; } @@ -207,7 +206,7 @@ if ($item['path'] == 'admin/structure/block') { $visible_regions = system_region_list($theme, REGIONS_VISIBLE); if (isset($visible_regions[$region])) { - $description = '