Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #677562 by jhodgdon: massaging of block administration page help texts.

merge-requests/26/head
Dries Buytaert 2010-01-08 11:10:32 +00:00
parent 4b23d00e60
commit 3046a5452d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/block/block.admin.inc
View File

@ -324,7 +324,7 @@ function block_admin_configure($form, &$form_state, $module, $delta) {
'#title' => t('Show block for specific content types'), '#title' => t('Show block for specific content types'),
'#default_value' => $default_type_options, '#default_value' => $default_type_options,
'#options' => node_type_get_names(), '#options' => node_type_get_names(),
'#description' => t('Show this block only on pages that display content of the given type(s). If you select no types, there will be no type specific limitation.'), '#description' => t('Show this block only on pages that display content of the given type(s). If you select no types, there will be no type-specific limitation.'),
); );
// Per-role visibility. // Per-role visibility.

4
modules/block/block.module
View File

@ -31,7 +31,7 @@ function block_help($path, $arg) {
$output .= '</dl>'; $output .= '</dl>';
return $output; return $output;
case 'admin/structure/block/add': case 'admin/structure/block/add':
return '<p>' . 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 <a href="@blocks">Blocks administration page</a> to be visible.', array('@blocks' => url('admin/structure/block'))) . '</p>'; return '<p>' . t('Use this page to create a new custom block. New blocks are disabled by default; assign them to a region, on this page or the <a href="@blocks">Blocks administration page</a>, to make them visible.', array('@blocks' => url('admin/structure/block'))) . '</p>';
} }
if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg['2'] == 'block' && (empty($arg[3]) || $arg[3] == 'list')) { if ($arg[0] == 'admin' && $arg[1] == 'structure' && $arg['2'] == 'block' && (empty($arg[3]) || $arg[3] == 'list')) {
$demo_theme = !empty($arg[4]) ? $arg[4] : variable_get('theme_default', 'garland'); $demo_theme = !empty($arg[4]) ? $arg[4] : variable_get('theme_default', 'garland');
@ -414,7 +414,7 @@ function block_custom_block_form($edit = array()) {
'#title' => t('Block description'), '#title' => t('Block description'),
'#default_value' => $edit['info'], '#default_value' => $edit['info'],
'#maxlength' => 64, '#maxlength' => 64,
'#description' => t('A brief description of your block. Used on the <a href="@overview">blocks administration page</a>.', array('@overview' => url('admin/structure/block'))), '#description' => t('A brief description of your block. Used on the <a href="@overview">Blocks administration page</a>.', array('@overview' => url('admin/structure/block'))),
'#required' => TRUE, '#required' => TRUE,
'#weight' => -19, '#weight' => -19,
); );