From ae946251dd5268c8a0d078636b9ef237e03b7856 Mon Sep 17 00:00:00 2001 From: DjebbZ Date: Fri, 26 Aug 2011 11:39:19 +0100 Subject: [PATCH 1/3] Better labels for image and css files fields description : about leading and trailing slashes --- .../openlayers_ui/includes/openlayers_ui.maps.inc | 22 ++++++++++---------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/openlayers_ui/includes/openlayers_ui.maps.inc b/modules/openlayers_ui/includes/openlayers_ui.maps.inc index 6bd4f27..859ff82 100644 --- a/modules/openlayers_ui/includes/openlayers_ui.maps.inc +++ b/modules/openlayers_ui/includes/openlayers_ui.maps.inc @@ -107,11 +107,11 @@ function openlayers_ui_maps_form($form_state, $args = NULL, $map = FALSE, $edit $form['info']['image_path'] = array( '#type' => 'textfield', '#title' => t('Image Path'), - '#description' => t('The path to a directory for OpenLayers to look for UI - graphics. If blank, default graphics are used. Use either a Drupal path - (and the appropriate base path will be prepended), an absolute path - (such as !ab_example), or a full URL.', - array('!ab_example' => '/path/to/images/') + '#description' => t('The path to a directory of UI graphics. Leave blank for + default graphics. Use either relative path (without leading slash, + base path will be prepended, f. ex. "sites/all/themes/path/to/images"), + absolute path (with leading slash, path will start from sites root + directory, f. ex. "/path/to/images/") or a full URL. Always include trailing slash.' ), '#default_value' => !empty($defaults['image_path']) ? $defaults['image_path'] : '', @@ -120,12 +120,12 @@ function openlayers_ui_maps_form($form_state, $args = NULL, $map = FALSE, $edit $form['info']['css_path'] = array( '#type' => 'textfield', '#title' => t('CSS Path'), - '#description' => t('Path for where OpenLayers should look for its theme - CSS file. The default hosted OpenLayers URL is - http://openlayers.org/api/theme/default/style.css. Use either a Drupal path - (and the appropriate base path will be prepended), an absolute path - (such as !ab_example), or a full URL.', - array('!ab_example' => '/path/to/css/') + '#description' => t('The path to a directory of theme CSS file. The default + hosted OpenLayers URL is !link. Use either a Drupal path (without leading + slash, base path will be prepended, f. ex. "sites/all/themes/path/to/images"), + an absolute path (with leading slash, such as /path/to/css/), or a full URL. + Always include trailing slash.', + array('!link' => l('http://openlayers.org/api/theme/default/style.css', 'http://openlayers.org/api/theme/default/style.css')) ), '#default_value' => !empty($defaults['css_path']) ? $defaults['css_path'] : '', -- 1.7.4.1 From c26f5b28a02a630c3e35fd784be0abd5f5395e9e Mon Sep 17 00:00:00 2001 From: DjebbZ Date: Fri, 26 Aug 2011 11:43:45 +0100 Subject: [PATCH 2/3] Revert "Better labels for image and css files fields description : about leading and trailing slashes" This reverts commit ae946251dd5268c8a0d078636b9ef237e03b7856. --- .../openlayers_ui/includes/openlayers_ui.maps.inc | 22 ++++++++++---------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/openlayers_ui/includes/openlayers_ui.maps.inc b/modules/openlayers_ui/includes/openlayers_ui.maps.inc index 859ff82..6bd4f27 100644 --- a/modules/openlayers_ui/includes/openlayers_ui.maps.inc +++ b/modules/openlayers_ui/includes/openlayers_ui.maps.inc @@ -107,11 +107,11 @@ function openlayers_ui_maps_form($form_state, $args = NULL, $map = FALSE, $edit $form['info']['image_path'] = array( '#type' => 'textfield', '#title' => t('Image Path'), - '#description' => t('The path to a directory of UI graphics. Leave blank for - default graphics. Use either relative path (without leading slash, - base path will be prepended, f. ex. "sites/all/themes/path/to/images"), - absolute path (with leading slash, path will start from sites root - directory, f. ex. "/path/to/images/") or a full URL. Always include trailing slash.' + '#description' => t('The path to a directory for OpenLayers to look for UI + graphics. If blank, default graphics are used. Use either a Drupal path + (and the appropriate base path will be prepended), an absolute path + (such as !ab_example), or a full URL.', + array('!ab_example' => '/path/to/images/') ), '#default_value' => !empty($defaults['image_path']) ? $defaults['image_path'] : '', @@ -120,12 +120,12 @@ function openlayers_ui_maps_form($form_state, $args = NULL, $map = FALSE, $edit $form['info']['css_path'] = array( '#type' => 'textfield', '#title' => t('CSS Path'), - '#description' => t('The path to a directory of theme CSS file. The default - hosted OpenLayers URL is !link. Use either a Drupal path (without leading - slash, base path will be prepended, f. ex. "sites/all/themes/path/to/images"), - an absolute path (with leading slash, such as /path/to/css/), or a full URL. - Always include trailing slash.', - array('!link' => l('http://openlayers.org/api/theme/default/style.css', 'http://openlayers.org/api/theme/default/style.css')) + '#description' => t('Path for where OpenLayers should look for its theme + CSS file. The default hosted OpenLayers URL is + http://openlayers.org/api/theme/default/style.css. Use either a Drupal path + (and the appropriate base path will be prepended), an absolute path + (such as !ab_example), or a full URL.', + array('!ab_example' => '/path/to/css/') ), '#default_value' => !empty($defaults['css_path']) ? $defaults['css_path'] : '', -- 1.7.4.1 From d1ce5ab3e379b40f2891e5fb4a0b1334442920d2 Mon Sep 17 00:00:00 2001 From: DjebbZ Date: Fri, 26 Aug 2011 11:45:39 +0100 Subject: [PATCH 3/3] Better labels for image and css files fields description : about leading and trailing slashes --- .../openlayers_ui/includes/openlayers_ui.maps.inc | 22 ++++++++++---------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/openlayers_ui/includes/openlayers_ui.maps.inc b/modules/openlayers_ui/includes/openlayers_ui.maps.inc index 6bd4f27..c13c0ec 100644 --- a/modules/openlayers_ui/includes/openlayers_ui.maps.inc +++ b/modules/openlayers_ui/includes/openlayers_ui.maps.inc @@ -107,11 +107,11 @@ function openlayers_ui_maps_form($form_state, $args = NULL, $map = FALSE, $edit $form['info']['image_path'] = array( '#type' => 'textfield', '#title' => t('Image Path'), - '#description' => t('The path to a directory for OpenLayers to look for UI - graphics. If blank, default graphics are used. Use either a Drupal path - (and the appropriate base path will be prepended), an absolute path - (such as !ab_example), or a full URL.', - array('!ab_example' => '/path/to/images/') + '#description' => t('The path to a directory of UI graphics. Leave blank for + default graphics. Use either relative path (without leading slash, + base path will be prepended, f. ex. "sites/all/themes/path/to/images"), + absolute path (with leading slash, path will start from sites root + directory, f. ex. "/path/to/images/") or a full URL. Always include trailing slash.' ), '#default_value' => !empty($defaults['image_path']) ? $defaults['image_path'] : '', @@ -120,12 +120,12 @@ function openlayers_ui_maps_form($form_state, $args = NULL, $map = FALSE, $edit $form['info']['css_path'] = array( '#type' => 'textfield', '#title' => t('CSS Path'), - '#description' => t('Path for where OpenLayers should look for its theme - CSS file. The default hosted OpenLayers URL is - http://openlayers.org/api/theme/default/style.css. Use either a Drupal path - (and the appropriate base path will be prepended), an absolute path - (such as !ab_example), or a full URL.', - array('!ab_example' => '/path/to/css/') + '#description' => t('The path to a directory of theme CSS file. The default + hosted OpenLayers URL is !link. Use either a Drupal path (without leading + slash, base path will be prepended, f. ex. "sites/all/themes/path/to/css"), + an absolute path (with leading slash, such as /path/to/css/), or a full URL. + Always include trailing slash.', + array('!link' => l('http://openlayers.org/api/theme/default/style.css', 'http://openlayers.org/api/theme/default/style.css')) ), '#default_value' => !empty($defaults['css_path']) ? $defaults['css_path'] : '', -- 1.7.4.1