diff --git a/core/modules/region/lib/Drupal/region/Tests/RegionTest.php b/core/modules/region/lib/Drupal/region/Tests/RegionTest.php index 815bfc5..981641e 100644 --- a/core/modules/region/lib/Drupal/region/Tests/RegionTest.php +++ b/core/modules/region/lib/Drupal/region/Tests/RegionTest.php @@ -76,12 +76,12 @@ public function testEditDefaultRegion() { )); $this->drupalLogin($admin_user); - $this->drupalGet('admin/structure/regions/region/body/edit'); + $this->drupalGet('admin/structure/regions/manage/body/edit'); $this->assertResponse(200); $this->assertPattern('!disabled="disabled"(.+)id="edit-id"(.+)value="body"!', 'Existing region name machine name field is disabled.'); $edit = array('label' => 'Page content'); - $this->drupalPost('admin/structure/regions/region/body/edit', $edit, t('Save')); + $this->drupalPost('admin/structure/regions/manage/body/edit', $edit, t('Save')); $this->assertText('Page content'); $this->assertNoText('Body'); $this->assertRaw(t('Region %label saved.', array('%label' => 'Page content'))); @@ -97,10 +97,10 @@ public function testDeleteDefaultRegion() { )); $this->drupalLogin($admin_user); - $this->drupalGet('admin/structure/regions/region/body/delete'); + $this->drupalGet('admin/structure/regions/manage/body/delete'); $this->assertResponse(200); - $this->drupalPost('admin/structure/regions/region/body/delete', array(), t('Delete')); + $this->drupalPost('admin/structure/regions/manage/body/delete', array(), t('Delete')); $this->assertRaw(t('Region %label has been deleted.', array('%label' => 'Body'))); $this->assertNoText('body'); } @@ -121,7 +121,7 @@ public function testNewRegion() { $this->assertRaw(t('Region %label saved.', array('%label' => 'Banner'))); $edit = array('label' => 'Highlight'); - $this->drupalPost('admin/structure/regions/region/banner/edit', $edit, t('Save')); + $this->drupalPost('admin/structure/regions/manage/banner/edit', $edit, t('Save')); $this->assertNoText('Banner'); $this->assertText('banner'); $this->assertRaw(t('Region %label saved.', array('%label' => 'Highlight'))); @@ -130,10 +130,10 @@ public function testNewRegion() { $this->drupalPost('admin/structure/regions/add', $edit, t('Save')); $this->assertText(t('The machine-readable name is already in use. It must be unique.')); - $this->drupalGet('admin/structure/regions/region/banner/edit'); + $this->drupalGet('admin/structure/regions/manage/banner/edit'); $this->assertPattern('!disabled="disabled"(.+)id="edit-id"(.+)value="banner"!', 'Existing region name machine name field is disabled.'); - $this->drupalPost('admin/structure/regions/region/banner/delete', array(), t('Delete')); + $this->drupalPost('admin/structure/regions/manage/banner/delete', array(), t('Delete')); $this->assertRaw(t('Region %label has been deleted.', array('%label' => 'Highlight'))); $this->assertNoText('banner'); } diff --git a/core/modules/region/region.module b/core/modules/region/region.module index d45bb5f..8bf35c7 100644 --- a/core/modules/region/region.module +++ b/core/modules/region/region.module @@ -28,7 +28,7 @@ function region_menu() { 'type' => MENU_LOCAL_ACTION, 'file' => 'region.admin.inc', ); - $items['admin/structure/regions/region/%region/edit'] = array( + $items['admin/structure/regions/manage/%region'] = array( 'title' => 'Edit region', 'page callback' => 'region_page_edit', 'page arguments' => array(4), @@ -37,13 +37,18 @@ function region_menu() { 'type' => MENU_CALLBACK, 'file' => 'region.admin.inc', ); - $items['admin/structure/regions/region/%region/delete'] = array( + $items['admin/structure/regions/manage/%region/edit'] = array( + 'title' => 'Edit', + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -100, + ); + $items['admin/structure/regions/manage/%region/delete'] = array( 'title' => 'Delete', 'page callback' => 'drupal_get_form', 'page arguments' => array('region_delete_confirm', 4), 'access callback' => 'user_access', 'access arguments' => array('administer regions'), - 'type' => MENU_CALLBACK, + 'type' => MENU_LOCAL_TASK, 'file' => 'region.admin.inc', ); return $items; @@ -96,7 +101,7 @@ function region_entity_info() { */ function region_uri(Region $region) { return array( - 'path' => 'admin/structure/regions/region/' . $region->id(), + 'path' => 'admin/structure/regions/manage/' . $region->id(), ); }