commit 14bf1d0a16d1515e3b1716350fddcb28ab0e0dca Author: Lee Rowlands Date: Sat Jun 15 13:43:52 2013 +1000 Patch 179 diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php index 9c982d2..4ef993b 100644 --- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php +++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php @@ -105,14 +105,14 @@ public function save(array $form, array &$form_state) { drupal_set_message(t('Device %label has been added.', array('%label' => $entity->label()))); watchdog('responsive_preview', 'Device %label has been added.', array('%label' => $entity->label()), WATCHDOG_NOTICE, l(t('Edit'), $uri['path'])); } - $form_state['redirect'] = 'admin/config/content/responsive_preview'; + $form_state['redirect'] = 'admin/config/content/responsive-preview'; } /** * {@inheritdoc} */ public function delete(array $form, array &$form_state) { - $form_state['redirect'] = 'admin/config/content/responsive_preview/manage/' . $this->entity->id() . '/delete'; + $form_state['redirect'] = 'admin/config/content/responsive-preview/manage/' . $this->entity->id() . '/delete'; } } diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php index 0413b09..8f98be5 100644 --- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php +++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php @@ -40,7 +40,7 @@ protected function getQuestion() { * {@inheritdoc} */ protected function getCancelPath() { - return 'admin/config/content/responsive_preview'; + return 'admin/config/content/responsive-preview'; } /** @@ -52,10 +52,10 @@ protected function getConfirmText() { /** * {@inheritdoc} - * @param \Drupal\responsive_preview\DeviceInterface $device + * @param \Drupal\responsive_preview\DeviceInterface $responsive_preview_device * The device being deleted. */ - public function buildForm(array $form, array &$form_state, DeviceInterface $device = NULL) { + public function buildForm(array $form, array &$form_state, DeviceInterface $responsive_preview_device = NULL) { $this->device = $device; return parent::buildForm($form, $form_state); } @@ -67,7 +67,7 @@ public function submitForm(array &$form, array &$form_state) { $this->device->delete(); watchdog('responsive_preview', 'Device %name has been deleted.', array('%name' => $this->device->label())); drupal_set_message(t('Device %name has been deleted.', array('%name' => $this->device->label()))); - $form_state['redirect'] = 'admin/config/content/responsive_preview'; + $form_state['redirect'] = 'admin/config/content/responsive-preview'; } } diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Core/Entity/Device.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Core/Entity/Device.php index 5abbde9..6792c49 100644 --- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Core/Entity/Device.php +++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Core/Entity/Device.php @@ -86,7 +86,7 @@ class Device extends ConfigEntityBase { */ public function uri() { return array( - 'path' => 'admin/config/content/responsive_preview/manage/' . $this->id(), + 'path' => 'admin/config/content/responsive-preview/manage/' . $this->id(), 'options' => array( 'entity_type' => $this->entityType, 'entity' => $this, diff --git a/core/modules/responsive_preview/responsive_preview.info.yml b/core/modules/responsive_preview/responsive_preview.info.yml index 291176a..5f9292e 100644 --- a/core/modules/responsive_preview/responsive_preview.info.yml +++ b/core/modules/responsive_preview/responsive_preview.info.yml @@ -4,4 +4,4 @@ description: 'Provides a component that previews a page in various device dimens package: Core version: VERSION core: 8.x -configure: admin/config/content/responsive_preview +configure: admin/config/content/responsive-preview diff --git a/core/modules/responsive_preview/responsive_preview.module b/core/modules/responsive_preview/responsive_preview.module index ddaa9e5..ac8b8a8 100644 --- a/core/modules/responsive_preview/responsive_preview.module +++ b/core/modules/responsive_preview/responsive_preview.module @@ -18,7 +18,7 @@ function responsive_preview_help($path, $arg) { $output .= '

' . t('To launch a preview, first click the toolbar tab with the small device icon. The tab has the title "@title". A list of devices will appear. Selecting a device name will launch a preview of the current page within the dimensions of that device.', array('@title' => t('Preview page layout'))) . '

'; $output .= '

' . t('To close the preview, click the close button signified visually by an x.') . '

'; return $output; - case 'admin/config/content/responsive_preview': + case 'admin/config/content/responsive-preview': $output = '

' . t('Configure the set and order of available devices on this page for responsive site preview. The list of devices is shown in a dropdown accessible from the toolbar tab with a small device icon.') . '

'; return $output; } @@ -28,26 +28,26 @@ function responsive_preview_help($path, $arg) { * Implements hook_menu(). */ function responsive_preview_menu() { - $items['admin/config/content/responsive_preview'] = array( + $items['admin/config/content/responsive-preview'] = array( 'title' => 'Responsive preview', 'description' => 'Configure device listings for content preview.', 'route_name' => 'responsive_preview_device_list', ); - $items['admin/config/content/responsive_preview/add'] = array( + $items['admin/config/content/responsive-preview/add'] = array( 'title' => 'Add preview device', 'route_name' => 'responsive_preview_device_add', 'type' => MENU_LOCAL_ACTION, 'weight' => 1, ); - $items['admin/config/content/responsive_preview/manage/%responsive_preview_device'] = array( + $items['admin/config/content/responsive-preview/manage/%responsive_preview_device'] = array( 'title' => 'Edit device', 'route_name' => 'responsive_preview_device_edit', ); - $items['admin/config/content/responsive_preview/manage/%responsive_preview_device/edit'] = array( + $items['admin/config/content/responsive-preview/manage/%responsive_preview_device/edit'] = array( 'title' => 'Edit', 'type' => MENU_DEFAULT_LOCAL_TASK, ); - $items['admin/config/content/responsive_preview/manage/%responsive_preview_device/delete'] = array( + $items['admin/config/content/responsive-preview/manage/%responsive_preview_device/delete'] = array( 'title' => 'Delete', 'route_name' => 'responsive_preview_device_delete', 'type' => MENU_LOCAL_TASK, diff --git a/core/modules/responsive_preview/responsive_preview.routing.yml b/core/modules/responsive_preview/responsive_preview.routing.yml index 6a89138..f8301c5 100644 --- a/core/modules/responsive_preview/responsive_preview.routing.yml +++ b/core/modules/responsive_preview/responsive_preview.routing.yml @@ -1,5 +1,5 @@ responsive_preview_device_list: - pattern: '/admin/config/content/responsive_preview' + pattern: '/admin/config/content/responsive-preview' defaults: _content: '\Drupal\Core\Entity\Controller\EntityListController::listing' entity_type: 'responsive_preview_device' @@ -7,28 +7,21 @@ responsive_preview_device_list: _permission: 'administer site configuration' responsive_preview_device_add: - pattern: '/admin/config/content/responsive_preview/add' + pattern: '/admin/config/content/responsive-preview/add' defaults: _entity_form: responsive_preview_device.add requirements: _permission: 'administer site configuration' responsive_preview_device_edit: - pattern: '/admin/config/content/responsive_preview/manage/{responsive_preview_device}' - defaults: - _entity_form: responsive_preview_device.edit - requirements: - _permission: 'administer site configuration' - -responsive_preview_device_edit_tab: - pattern: '/admin/config/content/responsive_preview/manage/{responsive_preview_device}/edit' + pattern: '/admin/config/content/responsive-preview/manage/{responsive_preview_device}' defaults: _entity_form: responsive_preview_device.edit requirements: _permission: 'administer site configuration' responsive_preview_device_delete: - pattern: '/admin/config/content/responsive_preview/manage/{responsive_preview_device}/delete' + pattern: '/admin/config/content/responsive-preview/manage/{responsive_preview_device}/delete' defaults: _form: '\Drupal\responsive_preview\Form\DeviceDelete' requirements: commit a38d688408828df63a28919f85c5990f55256fe6 Author: Lee Rowlands Date: Sat Jun 15 13:54:25 2013 +1000 Fix var name diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php index 8f98be5..6e79048 100644 --- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php +++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Form/DeviceDelete.php @@ -56,7 +56,7 @@ protected function getConfirmText() { * The device being deleted. */ public function buildForm(array $form, array &$form_state, DeviceInterface $responsive_preview_device = NULL) { - $this->device = $device; + $this->device = $responsive_preview_device; return parent::buildForm($form, $form_state); }