diff --git a/core/modules/path/lib/Drupal/path/Controller/PathController.php b/core/modules/path/lib/Drupal/path/Controller/PathController.php
index dc7e7fe..be106e9 100644
--- a/core/modules/path/lib/Drupal/path/Controller/PathController.php
+++ b/core/modules/path/lib/Drupal/path/Controller/PathController.php
@@ -149,7 +149,7 @@ public function adminOverview($alias = NULL) {
'#theme' => 'table',
'#header' => $header,
'#rows' => $rows,
- '#empty' => $this->t('No URL aliases available. Add URL alias.', array('@link' => $this->urlGenerator()->generate('path.add'))),
+ '#empty' => $this->t('No URL aliases available. Add URL alias.', array('@link' => $this->urlGenerator()->generate('path.admin_add'))),
);
$build['path_pager'] = array('#theme' => 'pager');
diff --git a/core/modules/path/lib/Drupal/path/Form/EditForm.php b/core/modules/path/lib/Drupal/path/Form/EditForm.php
index 588e743..75c1f70 100644
--- a/core/modules/path/lib/Drupal/path/Form/EditForm.php
+++ b/core/modules/path/lib/Drupal/path/Form/EditForm.php
@@ -81,7 +81,8 @@ public function getFormID() {
*/
public function buildForm(array $form, array &$form_state, $pid = NULL) {
$path_alias = $this->path->load(array('pid' => $pid));
- $form['#title'] = $path_alias['alias'];
+ // If we do not have an alias yet we are adding a new one.
+ $form['#title'] = !empty($path_alias) ? $path_alias['alias'] : $this->t('Add alias');
$form['source'] = array(
'#type' => 'textfield',
'#title' => $this->t('Existing system path'),
diff --git a/core/modules/path/path.local_actions.yml b/core/modules/path/path.local_actions.yml
index 277dc30..9c58984 100644
--- a/core/modules/path/path.local_actions.yml
+++ b/core/modules/path/path.local_actions.yml
@@ -1,5 +1,5 @@
-path.add:
- route_name: path.add
+path.admin_add:
+ route_name: path.admin_add
title: 'Add alias'
appears_on:
- - path.overview
+ - path.admin_overview
diff --git a/core/modules/path/path.local_tasks.yml b/core/modules/path/path.local_tasks.yml
new file mode 100644
index 0000000..15e1990
--- /dev/null
+++ b/core/modules/path/path.local_tasks.yml
@@ -0,0 +1,9 @@
+path.admin_overview_tab:
+ route_name: path.admin_overview
+ title: 'URL aliases'
+ tab_root_id: path.admin_overview_tab
+
+path.admin_add_tab:
+ route_name: path.admin_add
+ title: 'Add alias'
+ tab_root_id: path.admin_overview_tab
diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 47c7bff..62a28d1 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -61,23 +61,6 @@ function path_menu() {
'route_name' => 'path.admin_overview',
'weight' => -5,
);
- $items['admin/config/search/path/list'] = array(
- 'title' => 'List',
- 'type' => MENU_DEFAULT_LOCAL_TASK,
- );
- $items['admin/config/search/path/edit/%'] = array(
- 'title' => 'Edit alias',
- 'route_name' => 'path.admin_edit',
- );
- $items['admin/config/search/path/delete/%'] = array(
- 'title' => 'Delete alias',
- 'route_name' => 'path.delete',
- );
- $items['admin/config/search/path/add'] = array(
- 'route_name' => 'path.admin_add',
- 'type' => MENU_SIBLING_LOCAL_TASK,
- 'weight' => 1,
- );
return $items;
}
diff --git a/core/modules/path/path.routing.yml b/core/modules/path/path.routing.yml
index 607e4fe..b45063d 100644
--- a/core/modules/path/path.routing.yml
+++ b/core/modules/path/path.routing.yml
@@ -3,14 +3,12 @@ path.admin_overview:
defaults:
_title: 'URL aliases'
_content: '\Drupal\path\Controller\PathController::adminOverview'
- keys: NULL
requirements:
_permission: 'administer url aliases'
path.admin_add:
path: '/admin/config/search/path/add'
defaults:
- _title: 'Add alias'
_form: '\Drupal\path\Form\EditForm'
requirements:
_permission: 'administer url aliases'
@@ -25,7 +23,6 @@ path.admin_delete:
path.admin_edit:
path: '/admin/config/search/path/edit/{pid}'
defaults:
- _title: 'Edit alias'
_form: '\Drupal\path\Form\EditForm'
requirements:
_permission: 'administer url aliases'