From 2e078146d8a65eb280a519eb3f0ed80b82727172 Mon Sep 17 00:00:00 2001
From: twistor <twistor@473738.no-reply.drupal.org>
Date: Sat, 13 Aug 2011 23:19:47 -0500
Subject: [PATCH] Issue #1235394: Fixed menu paths violate UX standards and
could not use breadcrumbs.
---
feeds.module | 2 +-
feeds_ui/feeds_ui.admin.inc | 14 +++---
feeds_ui/feeds_ui.install | 13 +++++
feeds_ui/feeds_ui.module | 84 +++++++++++++++++++-------------
feeds_ui/feeds_ui.test | 28 +++++------
tests/feeds.test | 8 +--
tests/feeds_fetcher_file.test | 2 +-
tests/feeds_mapper_date.test | 2 +-
tests/feeds_mapper_file.test | 2 +-
tests/feeds_mapper_taxonomy.test | 2 +-
tests/feeds_processor_node.test | 6 +--
tests/feeds_processor_term.test | 4 +-
tests/feeds_processor_user.test | 2 +-
tests/feeds_scheduler.test | 8 +--
14 files changed, 103 insertions(+), 74 deletions(-)
create mode 100644 feeds_ui/feeds_ui.install
diff --git a/feeds.module b/feeds.module
index 39b180a8..543b24a0 100644
--- a/feeds.module
+++ b/feeds.module
@@ -871,7 +871,7 @@ function feeds_plugin($plugin, $id) {
}
$args = array('%plugin' => $plugin, '@id' => $id);
if (user_access('administer feeds')) {
- $args['@link'] = url('admin/structure/feeds/edit/' . $id);
+ $args['@link'] = url('admin/structure/feeds/' . $id);
drupal_set_message(t('Missing Feeds plugin %plugin. See <a href="@link">@id</a>. Check whether all required libraries and modules are installed properly.', $args), 'warning');
}
else {
diff --git a/feeds_ui/feeds_ui.admin.inc b/feeds_ui/feeds_ui.admin.inc
index 779b0706..325115f0 100644
--- a/feeds_ui/feeds_ui.admin.inc
+++ b/feeds_ui/feeds_ui.admin.inc
@@ -7,7 +7,7 @@
*/
/**
- * Introductory help for admin/structure/feeds/edit/config page
+ * Introductory help for admin/structure/feeds/%feeds_importer page
*/
function feeds_ui_edit_help() {
return t('
@@ -96,10 +96,10 @@ function feeds_ui_overview_form($form, &$form_status) {
if (!$importer->disabled) {
$importer_form['operations'] = array(
'#markup' =>
- l($edit, 'admin/structure/feeds/edit/' . $importer->id) . ' | ' .
- l(t('Export'), 'admin/structure/feeds/export/' . $importer->id) . ' | ' .
- l(t('Clone'), 'admin/structure/feeds/clone/' . $importer->id) .
- (empty($delete) ? '' : ' | ' . l($delete, 'admin/structure/feeds/delete/' . $importer->id)),
+ l($edit, 'admin/structure/feeds/' . $importer->id) . ' | ' .
+ l(t('Export'), 'admin/structure/feeds/' . $importer->id . '/export') . ' | ' .
+ l(t('Clone'), 'admin/structure/feeds/' . $importer->id . '/clone') .
+ (empty($delete) ? '' : ' | ' . l($delete, 'admin/structure/feeds/' . $importer->id . '/delete')),
);
}
else {
@@ -214,7 +214,7 @@ function feeds_ui_create_form_submit($form, &$form_state) {
else {
drupal_set_message(t('A clone of the @name configuration has been created.', array('@name' => $form['#from_importer']->config['name'])));
}
- $form_state['redirect'] = 'admin/structure/feeds/edit/' . $importer->id;
+ $form_state['redirect'] = 'admin/structure/feeds/' . $importer->id;
feeds_cache_clear();
}
@@ -277,7 +277,7 @@ function feeds_ui_edit_page($importer, $active = 'help', $plugin_key = '') {
$plugins = FeedsPlugin::all();
$config = $importer->config;
// Base path for changing the active container.
- $path = 'admin/structure/feeds/edit/' . $importer->id;
+ $path = 'admin/structure/feeds/' . $importer->id;
$active_container = array(
'class' => array('active-container'),
diff --git a/feeds_ui/feeds_ui.install b/feeds_ui/feeds_ui.install
new file mode 100644
index 00000000..bbe11f34
--- /dev/null
+++ b/feeds_ui/feeds_ui.install
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @file
+ * Install, uninstall, and update functions for the feeds_ui module.
+ */
+
+/**
+ * Empty update function to trigger a menu rebuild.
+ */
+function feeds_ui_update_7000() {
+ // Do nothing.
+}
diff --git a/feeds_ui/feeds_ui.module b/feeds_ui/feeds_ui.module
index 592d80c2..ba76d6fc 100644
--- a/feeds_ui/feeds_ui.module
+++ b/feeds_ui/feeds_ui.module
@@ -27,53 +27,57 @@ function feeds_ui_menu() {
'access arguments' => array('administer feeds'),
'file' => 'feeds_ui.admin.inc',
);
- $items['admin/structure/feeds/list'] = array(
- 'title' => 'List',
- 'type' => MENU_DEFAULT_LOCAL_TASK,
- );
$items['admin/structure/feeds/create'] = array(
- 'title' => 'New importer',
+ 'title' => 'Add importer',
'page callback' => 'drupal_get_form',
'page arguments' => array('feeds_ui_create_form'),
'access arguments' => array('administer feeds'),
'file' => 'feeds_ui.admin.inc',
- 'type' => MENU_LOCAL_TASK,
- 'weight' => 1,
+ 'type' => MENU_LOCAL_ACTION,
);
- $items['admin/structure/feeds/clone/%feeds_importer'] = array(
- 'title callback' => 'feed_ui_clone_title',
- 'title arguments' => array(4),
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('feeds_ui_create_form', 4),
+ $items['admin/structure/feeds/%feeds_importer'] = array(
+ 'title callback' => 'feeds_ui_importer_title',
+ 'title arguments' => array(3),
+ 'page callback' => 'feeds_ui_edit_page',
+ 'page arguments' => array(3),
'access arguments' => array('administer feeds'),
'file' => 'feeds_ui.admin.inc',
- 'type' => MENU_CALLBACK,
);
- $items['admin/structure/feeds/export/%feeds_importer'] = array(
- 'title callback' => 'feed_ui_title',
- 'title arguments' => array(4),
+ $items['admin/structure/feeds/%feeds_importer/edit'] = array(
+ 'title' => 'Edit',
+ 'page callback' => 'feeds_ui_edit_page',
+ 'page arguments' => array(3),
+ 'access arguments' => array('administer feeds'),
+ 'file' => 'feeds_ui.admin.inc',
+ 'type' => MENU_DEFAULT_LOCAL_TASK,
+ 'weight' => 1,
+ );
+ $items['admin/structure/feeds/%feeds_importer/export'] = array(
+ 'title' => 'Export',
'page callback' => 'drupal_get_form',
- 'page arguments' => array('feeds_ui_export_form', 4),
+ 'page arguments' => array('feeds_ui_export_form', 3),
'access arguments' => array('administer feeds'),
'file' => 'feeds_ui.admin.inc',
- 'type' => MENU_CALLBACK,
+ 'type' => MENU_LOCAL_TASK,
+ 'weight' => 2,
);
- $items['admin/structure/feeds/edit/%feeds_importer'] = array(
- 'title callback' => 'feed_ui_title',
- 'title arguments' => array(4),
- 'page callback' => 'feeds_ui_edit_page',
- 'page arguments' => array(4),
+ $items['admin/structure/feeds/%feeds_importer/clone'] = array(
+ 'title' => 'Clone',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('feeds_ui_create_form', 3),
'access arguments' => array('administer feeds'),
'file' => 'feeds_ui.admin.inc',
- 'type' => MENU_CALLBACK,
+ 'type' => MENU_LOCAL_TASK,
+ 'weight' => 3,
);
- $items['admin/structure/feeds/delete/%feeds_importer'] = array(
- 'title' => 'Delete configuration',
+ $items['admin/structure/feeds/%feeds_importer/delete'] = array(
+ 'title' => 'Delete',
'page callback' => 'drupal_get_form',
- 'page arguments' => array('feeds_ui_delete_form', 4),
+ 'page arguments' => array('feeds_ui_delete_form', 3),
'access arguments' => array('administer feeds'),
'file' => 'feeds_ui.admin.inc',
- 'type' => MENU_CALLBACK,
+ 'type' => MENU_LOCAL_TASK,
+ 'weight' => 4,
);
return $items;
}
@@ -107,15 +111,27 @@ function feeds_ui_theme() {
}
/**
- * Title callback.
+ * Implements hook_admin_menu_map().
*/
-function feed_ui_title($importer) {
- return t('Edit importer: @importer', array('@importer' => $importer->config['name']));
+function feeds_ui_admin_menu_map() {
+ // Add awareness to the administration menu of the various importers so they
+ // are included in the dropdown menu.
+ if (!user_access('administer feeds')) {
+ return;
+ }
+ $map['admin/structure/feeds/%feeds_importer'] = array(
+ 'parent' => 'admin/structure/feeds',
+ 'arguments' => array(
+ array('%feeds_importer' => feeds_enabled_importers()),
+ ),
+ );
+
+ return $map;
}
/**
- * Clone title callback.
+ * Title callback for importers.
*/
-function feed_ui_clone_title($importer) {
- return t('Clone importer: @importer', array('@importer' => $importer->config['name']));
+function feeds_ui_importer_title($importer) {
+ return t('@importer', array('@importer' => $importer->config['name']));
}
diff --git a/feeds_ui/feeds_ui.test b/feeds_ui/feeds_ui.test
index 2eb0b5fa..39da7658 100644
--- a/feeds_ui/feeds_ui.test
+++ b/feeds_ui/feeds_ui.test
@@ -29,7 +29,7 @@ class FeedsUIUserInterfaceTestCase extends FeedsWebTestCase {
$this->createImporterConfiguration('Test feed', 'test_feed');
// Assert UI elements.
- $this->drupalGet('admin/structure/feeds/edit/test_feed');
+ $this->drupalGet('admin/structure/feeds/test_feed');
$this->assertText('Basic settings');
$this->assertText('Fetcher');
$this->assertText('HTTP Fetcher');
@@ -38,43 +38,43 @@ class FeedsUIUserInterfaceTestCase extends FeedsWebTestCase {
$this->assertText('Processor');
$this->assertText('Node processor');
$this->assertText('Getting started');
- $this->assertRaw('admin/structure/feeds/edit/test_feed/settings');
- $this->assertRaw('admin/structure/feeds/edit/test_feed/settings/FeedsNodeProcessor');
- $this->assertRaw('admin/structure/feeds/edit/test_feed/fetcher');
- $this->assertRaw('admin/structure/feeds/edit/test_feed/parser');
- $this->assertRaw('admin/structure/feeds/edit/test_feed/processor');
+ $this->assertRaw('admin/structure/feeds/test_feed/settings');
+ $this->assertRaw('admin/structure/feeds/test_feed/settings/FeedsNodeProcessor');
+ $this->assertRaw('admin/structure/feeds/test_feed/fetcher');
+ $this->assertRaw('admin/structure/feeds/test_feed/parser');
+ $this->assertRaw('admin/structure/feeds/test_feed/processor');
$this->drupalGet('import');
$this->assertText('Basic page');
// Select some other plugins.
- $this->drupalGet('admin/structure/feeds/edit/test_feed');
+ $this->drupalGet('admin/structure/feeds/test_feed');
$this->clickLink('Change', 0);
$this->assertText('Select a fetcher');
$edit = array(
'plugin_key' => 'FeedsFileFetcher',
);
- $this->drupalPost('admin/structure/feeds/edit/test_feed/fetcher', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/test_feed/fetcher', $edit, 'Save');
$this->clickLink('Change', 1);
$this->assertText('Select a parser');
$edit = array(
'plugin_key' => 'FeedsCSVParser',
);
- $this->drupalPost('admin/structure/feeds/edit/test_feed/parser', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/test_feed/parser', $edit, 'Save');
$this->clickLink('Change', 2);
$this->assertText('Select a processor');
$edit = array(
'plugin_key' => 'FeedsUserProcessor',
);
- $this->drupalPost('admin/structure/feeds/edit/test_feed/processor', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/test_feed/processor', $edit, 'Save');
// Assert changed configuration.
$this->assertPlugins('test_feed', 'FeedsFileFetcher', 'FeedsCSVParser', 'FeedsUserProcessor');
// Delete importer.
- $this->drupalPost('admin/structure/feeds/delete/test_feed', array(), 'Delete');
+ $this->drupalPost('admin/structure/feeds/test_feed/delete', array(), 'Delete');
$this->drupalGet('import');
$this->assertNoText('Test feed');
@@ -87,10 +87,10 @@ class FeedsUIUserInterfaceTestCase extends FeedsWebTestCase {
'content_type' => 'page',
'import_period' => 3600,
);
- $this->drupalPost('admin/structure/feeds/edit/test_feed/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/test_feed/settings', $edit, 'Save');
// Assert results of change.
- $this->assertText('Edit importer: Syndication');
+ $this->assertText('Syndication feed');
$this->assertText('Your changes have been saved.');
$this->assertText('Attached to: Basic page');
$this->assertText('Periodic import: every 1 hour');
@@ -101,7 +101,7 @@ class FeedsUIUserInterfaceTestCase extends FeedsWebTestCase {
$edit = array(
'content_type' => 'article',
);
- $this->drupalPost('admin/structure/feeds/edit/test_feed/settings/FeedsNodeProcessor', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/test_feed/settings/FeedsNodeProcessor', $edit, 'Save');
$this->assertFieldByName('content_type', 'article');
// Create a feed node.
diff --git a/tests/feeds.test b/tests/feeds.test
index 40c6214a..3710e1c5 100644
--- a/tests/feeds.test
+++ b/tests/feeds.test
@@ -176,7 +176,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
public function createImporterConfiguration($name = 'Syndication', $id = 'syndication') {
// Create new feed configuration.
$this->drupalGet('admin/structure/feeds');
- $this->clickLink('New importer');
+ $this->clickLink('Add importer');
$edit = array(
'name' => $name,
'id' => $id,
@@ -204,7 +204,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
$edit = array(
'plugin_key' => $plugin_key,
);
- $this->drupalPost("admin/structure/feeds/edit/$id/$type", $edit, 'Save');
+ $this->drupalPost("admin/structure/feeds/$id/$type", $edit, 'Save');
// Assert actual configuration.
$config = unserialize(db_query("SELECT config FROM {feeds_importer} WHERE id = :id", array(':id' => $id))->fetchField());
@@ -223,7 +223,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
* The settings to set.
*/
public function setSettings($id, $plugin, $settings) {
- $this->drupalPost('admin/structure/feeds/edit/' . $id . '/settings/' . $plugin, $settings, 'Save');
+ $this->drupalPost('admin/structure/feeds/' . $id . '/settings/' . $plugin, $settings, 'Save');
$this->assertText('Your changes have been saved.');
}
@@ -388,7 +388,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
*/
public function addMappings($id, $mappings) {
- $path = 'admin/structure/feeds/edit/' . $id . '/mapping';
+ $path = 'admin/structure/feeds/' . $id . '/mapping';
// Iterate through all mappings and add the via the form.
foreach ($mappings as $i => $mapping) {
diff --git a/tests/feeds_fetcher_file.test b/tests/feeds_fetcher_file.test
index fa227d51..6431698f 100644
--- a/tests/feeds_fetcher_file.test
+++ b/tests/feeds_fetcher_file.test
@@ -28,7 +28,7 @@ class FeedsFileFetcherTestCase extends FeedsWebTestCase {
$edit = array(
'content_type' => '',
);
- $this->drupalPost('admin/structure/feeds/edit/node/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/node/settings', $edit, 'Save');
$this->setPlugin('node', 'FeedsFileFetcher');
$this->setPlugin('node', 'FeedsCSVParser');
$mappings = array(
diff --git a/tests/feeds_mapper_date.test b/tests/feeds_mapper_date.test
index 63d371bd..f9020e0f 100644
--- a/tests/feeds_mapper_date.test
+++ b/tests/feeds_mapper_date.test
@@ -67,7 +67,7 @@ class FeedsMapperDateTestCase extends FeedsMapperTestCase {
$edit = array(
'allowed_extensions' => 'rss2',
);
- $this->drupalPost('admin/structure/feeds/edit/daterss/settings/FeedsFileFetcher', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/daterss/settings/FeedsFileFetcher', $edit, 'Save');
// Import CSV file.
$this->importFile('daterss', $this->absolutePath() . '/tests/feeds/googlenewstz.rss2');
diff --git a/tests/feeds_mapper_file.test b/tests/feeds_mapper_file.test
index 599f1f7d..3f7664c7 100644
--- a/tests/feeds_mapper_file.test
+++ b/tests/feeds_mapper_file.test
@@ -88,7 +88,7 @@ class FeedsMapperFileTestCase extends FeedsMapperTestCase {
$edit = array(
'content_type' => '',
);
- $this->drupalPost('admin/structure/feeds/edit/node/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/node/settings', $edit, 'Save');
// Import.
$edit = array(
diff --git a/tests/feeds_mapper_taxonomy.test b/tests/feeds_mapper_taxonomy.test
index f83d2aa5..adc37cd5 100644
--- a/tests/feeds_mapper_taxonomy.test
+++ b/tests/feeds_mapper_taxonomy.test
@@ -78,7 +78,7 @@ class FeedsMapperTaxonomyTestCase extends FeedsMapperTestCase {
$edit = array(
'import_on_create' => FALSE,
);
- $this->drupalPost('admin/structure/feeds/edit/syndication/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/syndication/settings', $edit, 'Save');
$this->assertText('Do not import on submission');
$nid = $this->createFeedNode();
$terms = array('testterm1', 'testterm2', 'testterm3');
diff --git a/tests/feeds_processor_node.test b/tests/feeds_processor_node.test
index 7f999f9c..4db78aa8 100644
--- a/tests/feeds_processor_node.test
+++ b/tests/feeds_processor_node.test
@@ -227,7 +227,7 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$edit = array(
'content_type' => '',
);
- $this->drupalPost('admin/structure/feeds/edit/syndication_standalone/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/syndication_standalone/settings', $edit, 'Save');
$this->addMappings('syndication_standalone',
array(
array(
@@ -310,12 +310,12 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$this->drupalLogin($this->admin_user);
$edit = array('plugin_key' => 'FeedsFileFetcher');
- $this->drupalPost('admin/structure/feeds/edit/syndication_standalone/fetcher', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/syndication_standalone/fetcher', $edit, 'Save');
$edit = array(
'allowed_extensions' => 'rss2',
);
- $this->drupalPost('admin/structure/feeds/edit/syndication_standalone/settings/FeedsFileFetcher', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/syndication_standalone/settings/FeedsFileFetcher', $edit, 'Save');
// Create a feed node.
$edit = array(
diff --git a/tests/feeds_processor_term.test b/tests/feeds_processor_term.test
index 99422e18..ac8aa55f 100644
--- a/tests/feeds_processor_term.test
+++ b/tests/feeds_processor_term.test
@@ -42,7 +42,7 @@ class FeedsCSVtoTermsTest extends FeedsWebTestCase {
$edit = array(
'content_type' => '',
);
- $this->drupalPost('admin/structure/feeds/edit/term_import/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/term_import/settings', $edit, 'Save');
$edit = array(
'name' => 'Addams vocabulary',
@@ -53,7 +53,7 @@ class FeedsCSVtoTermsTest extends FeedsWebTestCase {
$edit = array(
'vocabulary' => 'addams',
);
- $this->drupalPost('admin/structure/feeds/edit/term_import/settings/FeedsTermProcessor', $edit, t('Save'));
+ $this->drupalPost('admin/structure/feeds/term_import/settings/FeedsTermProcessor', $edit, t('Save'));
// Import and assert.
$this->importFile('term_import', $this->absolutePath() . '/tests/feeds/users.csv');
diff --git a/tests/feeds_processor_user.test b/tests/feeds_processor_user.test
index 296bf408..0e486033 100644
--- a/tests/feeds_processor_user.test
+++ b/tests/feeds_processor_user.test
@@ -58,7 +58,7 @@ class FeedsCSVtoUsersTest extends FeedsWebTestCase {
$edit = array(
'content_type' => '',
);
- $this->drupalPost('admin/structure/feeds/edit/user_import/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/user_import/settings', $edit, 'Save');
// Create roles and assign one of them to the users to be imported.
$manager_rid = $this->drupalCreateRole(array('access content'), 'manager');
diff --git a/tests/feeds_scheduler.test b/tests/feeds_scheduler.test
index f1615b73..c60c461f 100644
--- a/tests/feeds_scheduler.test
+++ b/tests/feeds_scheduler.test
@@ -58,7 +58,7 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
$edit = array(
'import_on_create' => FALSE,
);
- $this->drupalPost('admin/structure/feeds/edit/syndication/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/syndication/settings', $edit, 'Save');
$this->assertText('Do not import on submission');
$nids = $this->createFeedNodes();
@@ -121,7 +121,7 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
$edit = array(
'import_period' => 0,
);
- $this->drupalPost('admin/structure/feeds/edit/syndication/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/syndication/settings', $edit, 'Save');
$this->assertText('Periodic import: as often as possible');
$this->drupalLogout();
@@ -191,7 +191,7 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
$this->assertEqual(count($nids), db_query("SELECT COUNT(*) FROM {job_schedule} WHERE type = 'syndication' AND name = 'feeds_source_import'")->fetchField());
$this->assertEqual(1, db_query("SELECT COUNT(*) FROM {job_schedule} WHERE type = 'syndication' AND name = 'feeds_importer_expire' AND id = 0")->fetchField());
- $this->drupalPost('admin/structure/feeds/delete/syndication', array(), t('Delete'));
+ $this->drupalPost('admin/structure/feeds/syndication/delete', array(), t('Delete'));
$this->assertEqual(0, db_query("SELECT COUNT(*) FROM {job_schedule} WHERE type = 'syndication' AND name = 'feeds_importer_expire' AND id = 0")->fetchField());
$this->assertEqual(count($nids), db_query("SELECT COUNT(*) FROM {job_schedule} WHERE type = 'syndication' AND name = 'feeds_source_import'")->fetchField());
}
@@ -206,7 +206,7 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
$edit = array(
'content_type' => '',
);
- $this->drupalPost('admin/structure/feeds/edit/node/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/node/settings', $edit, 'Save');
$this->setPlugin('node', 'FeedsFileFetcher');
$this->setPlugin('node', 'FeedsCSVParser');
$mappings = array(
--
GitLab