Commit d1e46bf0 authored by metzlerd's avatar metzlerd
Browse files

UI cleanup.

parent b8fe34fa
......@@ -36,7 +36,7 @@ class FeedsForenaBlockFetcher extends FeedsFetcher {
// Just return a Block result if this is a Block.
$r = Frx::RepoMan();
$block = $source_config['source'];
$data = @$source_config['data'];
$data = @drupal_parse_info_format($source_config['data']);
if ($r->loadBlock($block)) {
return new FeedsForenaBlockFetcherResult($block, $data);
}
......@@ -53,13 +53,16 @@ class FeedsForenaBlockFetcher extends FeedsFetcher {
'#title' => 'Data Block',
'#required' => TRUE,
'#description' => t('Select an exising block.'),
'#default_value' => isset($source_config['source']) ? $source_config['source'] : '',
);
$form['data'] = array(
'#type' => 'textfield',
'#title' => t('Data block parameters as defined in the block. '),
'#description' => t('URL Parameters'),
'#type' => 'textarea',
'#title' => t('Parameters '),
'#description' => t('Specify one per line the key value pairs that will be used when fetching the data. The format
used is the same as in .info files.'),
'#default_value' => isset($source_config['data']) ? $source_config['data'] : '',
'#rows' => 20,
'#maxlength' => NULL,
'#required' => FALSE,
);
......
......@@ -72,7 +72,7 @@ class FeedsForenaXMLParser extends FeedsParser {
$form['xpath'] = array(
'#type' => 'textfield',
'#title' => t('XPath Expression'),
'#description' => t('The character that delimits fields in the CSV file.'),
'#description' => t('Specify an xpath expression that will be used to break up the data into feed items. When in doubt use * '),
'#default_value' => isset($source_config['xpath']) ? $source_config['xpath'] : '*',
);
return $form;
......@@ -96,7 +96,7 @@ class FeedsForenaXMLParser extends FeedsParser {
$form['xpath'] = array(
'#type' => 'textfield',
'#title' => t('XPath Expression'),
'#description' => t('Xpath to used to parse rows'),
'#description' => t('Specify an xpath expression that will be used to break up the data into feed items. When in doubt use * '),
'#default_value' => $this->config['xpath'],
);
return $form;
......
......@@ -7,7 +7,7 @@ function _forena_feeds_plugins() {
$info['FeedsForenaBlockFetcher'] = array(
'name' => 'Forena Block Fetcher',
'description' => 'Fetch any forena data as XML. Use with an XML Feed parser',
'description' => 'Fetch any forena data as XML. Use with an XML Feed parser such as the Forena XML Parser',
'handler' => array(
'parent' => 'FeedsFetcher',
'class' => 'FeedsForenaBlockFetcher',
......
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