Commit 8cbdf98f authored by webchick's avatar webchick
Browse files

#556390 follow-up by David_Rothstein: String clean-up on block visibility settings.

parent 82c20e66
...@@ -275,14 +275,18 @@ function block_admin_configure($form, &$form_state, $module, $delta) { ...@@ -275,14 +275,18 @@ function block_admin_configure($form, &$form_state, $module, $delta) {
} }
else { else {
$options = array( $options = array(
t('On every page except those specified'), t('All pages except those listed'),
t('Show only on specified pages'), t('Only the listed pages'),
); );
$description = t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>')); $description = t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>'));
if (module_exists('php') && $access) { if (module_exists('php') && $access) {
$options[] = t('If the PHP code returns <code>TRUE</code> (PHP-mode, experts only)'); $options[] = t('Pages on which this PHP code returns <code>TRUE</code> (experts only)');
$description .= ' ' . t('If the PHP-mode is chosen, enter PHP code between %php. Note that executing incorrect PHP-code can break your Drupal site.', array('%php' => '<?php ?>')); $title = t('Pages or PHP code');
$description .= ' ' . t('If the PHP option is chosen, enter PHP code between %php. Note that executing incorrect PHP code can break your Drupal site.', array('%php' => '<?php ?>'));
}
else {
$title = t('Pages');
} }
$form['visibility']['path']['visibility'] = array( $form['visibility']['path']['visibility'] = array(
'#type' => 'radios', '#type' => 'radios',
...@@ -292,7 +296,7 @@ function block_admin_configure($form, &$form_state, $module, $delta) { ...@@ -292,7 +296,7 @@ function block_admin_configure($form, &$form_state, $module, $delta) {
); );
$form['visibility']['path']['pages'] = array( $form['visibility']['path']['pages'] = array(
'#type' => 'textarea', '#type' => 'textarea',
'#title' => t('Paths'), '#title' => '<span class="element-invisible">' . $title . '</span>',
'#default_value' => isset($block->pages) ? $block->pages : '', '#default_value' => isset($block->pages) ? $block->pages : '',
'#description' => $description, '#description' => $description,
); );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment