diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceAccessController.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceAccessController.php index eacbc49..fbe8b7d 100644 --- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceAccessController.php +++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceAccessController.php @@ -24,12 +24,17 @@ class DeviceAccessController extends EntityAccessController { protected function checkAccess(EntityInterface $entity, $operation, $langcode, AccountInterface $account) { switch ($operation) { case 'update': - return user_access('administer site configuration', $account); - break; case 'delete': - return user_access('administer site configuration', $account); + return $account->hasPermission('administer site configuration'); break; } } + /** + * {@inheritdoc} + */ + protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) { + return $account->hasPermission('administer site configuration'); + } + } 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 58baf38..174c6e9 100644 --- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php +++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php @@ -21,18 +21,16 @@ class DeviceFormController extends EntityFormController { public function form(array $form, array &$form_state, EntityInterface $responsive_preview_device = NULL) { switch ($form_state['controller']->getOperation()) { case 'add': - drupal_set_title(t('Add device')); + $form['_title'] = $this->t('Add device'); break; case 'edit': - drupal_set_title(t('Edit device')); - break; - default: + $form['_title'] = $this->t('Edit device'); break; } $entity = $this->entity; $form['label'] = array( '#type' => 'textfield', - '#title' => t('Device name'), + '#title' => $this->t('Device name'), '#default_value' => $entity->label(), '#size' => 30, '#required' => TRUE, @@ -56,7 +54,7 @@ public function form(array $form, array &$form_state, EntityInterface $responsiv ); $form['dimensions']['width'] = array( '#type' => 'textfield', - '#title' => t('Width'), + '#title' => $this->t('Width'), '#default_value' => $dimensions['width'], '#field_suffix' => 'px', '#size' => 6, @@ -64,7 +62,7 @@ public function form(array $form, array &$form_state, EntityInterface $responsiv ); $form['dimensions']['height'] = array( '#type' => 'textfield', - '#title' => t('Height'), + '#title' => $this->t('Height'), '#default_value' => $dimensions['height'], '#field_suffix' => 'px', '#size' => 6, @@ -72,17 +70,17 @@ public function form(array $form, array &$form_state, EntityInterface $responsiv ); $form['dimensions']['dppx'] = array( '#type' => 'textfield', - '#title' => t('Dots per pixel (dppx)'), - '#description' => t('Size of a single dot in graphical representation. Classic desktop displays have 1dppx, typical modern smartphones and laptops have 2dppx or higher. For example Google Nexus 4 and iPhone 5 has 2dppx, while Google Nexus 7 has 1.325dppx and Samsung Galaxy S4 has 3dppx.'), + '#title' => $this->t('Dots per pixel (dppx)'), + '#description' => $this->t('Size of a single dot in graphical representation. Classic desktop displays have 1dppx, typical modern smartphones and laptops have 2dppx or higher. For example Google Nexus 4 and iPhone 5 has 2dppx, while Google Nexus 7 has 1.325dppx and Samsung Galaxy S4 has 3dppx.'), '#default_value' => $dimensions['dppx'], '#size' => 4, '#required' => TRUE, ); $form['orientation'] = array( '#type' => 'select', - '#title' => t('Default orientation'), + '#title' => $this->t('Default orientation'), '#default_value' => $entity->get('orientation'), - '#options' => array('portrait' => t('Portrait'), 'landscape' => t('Landscape')), + '#options' => array('portrait' => $this->t('Portrait'), 'landscape' => $this->t('Landscape')), ); $form['status'] = array( '#type' => 'value', @@ -106,12 +104,12 @@ public function save(array $form, array &$form_state) { $entity->set('label', trim($entity->label())); $uri = $entity->uri(); if ($entity->save() == SAVED_UPDATED) { - drupal_set_message(t('Device %label has been updated.', array('%label' => $entity->label()))); - watchdog('responsive_preview', 'Device %label has been updated.', array('%label' => $entity->label()), WATCHDOG_NOTICE, l(t('Edit'), $uri['path'])); + drupal_set_message($this->t('Device %label has been updated.', array('%label' => $entity->label()))); + watchdog('responsive_preview', 'Device %label has been updated.', array('%label' => $entity->label()), WATCHDOG_NOTICE, l($this->t('Edit'), $uri['path'])); } else { - 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'])); + drupal_set_message($this->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($this->t('Edit'), $uri['path'])); } $form_state['redirect'] = 'admin/config/content/responsive-preview'; } diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceListController.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceListController.php index 5da4bac..3e5ab38 100644 --- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceListController.php +++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceListController.php @@ -29,12 +29,12 @@ public function getFormID() { public function buildHeader() { $row = parent::buildHeader(); unset($row['operations']); - $row['label'] = t('Name'); - $row['status'] = t('Show in list'); - $row['dimensions'] = t('Dimensions'); + $row['label'] = $this->t('Name'); + $row['status'] = $this->t('Show in list'); + $row['dimensions'] = $this->t('Dimensions'); unset($row['id']); - $row['weight'] = t('Weight'); - $row['operations'] = t('Operations'); + $row['weight'] = $this->t('Weight'); + $row['operations'] = $this->t('Operations'); return $row; } @@ -55,7 +55,7 @@ public function buildRow(EntityInterface $entity) { ); $row['status'] = array( '#type' => 'checkbox', - '#title' => t('Show %title in list', array('%title' => $entity->label())), + '#title' => $this->t('Show %title in list', array('%title' => $entity->label())), '#title_display' => 'invisible', '#default_value' => $entity->get('status'), ); @@ -67,7 +67,7 @@ public function buildRow(EntityInterface $entity) { // Add weight column. $row['weight'] = array( '#type' => 'weight', - '#title' => t('Weight for @title', array('@title' => $entity->label())), + '#title' => $this->t('Weight for @title', array('@title' => $entity->label())), '#title_display' => 'invisible', '#default_value' => $entity->get('weight'), '#attributes' => array('class' => array('weight')), @@ -90,7 +90,7 @@ public function buildForm(array $form, array &$form_state) { $form['entities'] = array( '#type' => 'table', '#header' => $this->buildHeader(), - '#empty' => t('There is no @label yet.', array('@label' => $this->entityInfo['label'])), + '#empty' => $this->t('There is no @label yet.', array('@label' => $this->entityInfo['label'])), '#tabledrag' => array( array('order', 'sibling', 'weight'), ), @@ -103,7 +103,7 @@ public function buildForm(array $form, array &$form_state) { $form['actions']['#type'] = 'actions'; $form['actions']['submit'] = array( '#type' => 'submit', - '#value' => t('Save'), + '#value' => $this->t('Save'), '#button_type' => 'primary', ); @@ -133,6 +133,6 @@ public function submitForm(array &$form, array &$form_state) { } } - drupal_set_message(t('The device settings have been updated.')); + drupal_set_message($this->t('The device settings have been updated.')); } } diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Entity/Device.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Entity/Device.php index 41ee427..e22e56b 100644 --- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Entity/Device.php +++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Entity/Device.php @@ -32,7 +32,8 @@ * entity_keys = { * "id" = "id", * "uuid" = "uuid", - * "label" = "label" + * "label" = "label", + * "weight" = "weight" * } * ) */ diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Menu/LocalAction/AddDeviceLocalAction.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Menu/LocalAction/AddDeviceLocalAction.php deleted file mode 100644 index d40e4b3..0000000 --- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Menu/LocalAction/AddDeviceLocalAction.php +++ /dev/null @@ -1,24 +0,0 @@ - 'Responsive preview', 'description' => 'Configure device listings for content preview.', - 'route_name' => 'responsive_preview_device_list', + 'route_name' => 'responsive_preview.device.list', ); $items['admin/config/content/responsive-preview/add'] = array( - 'route_name' => 'responsive_preview_device_add', + 'route_name' => 'responsive_preview.device.add', 'type' => MENU_SIBLING_LOCAL_TASK, ); $items['admin/config/content/responsive-preview/manage/%responsive_preview_device'] = array( 'title' => 'Edit device', - 'route_name' => 'responsive_preview_device_edit', + 'route_name' => 'responsive_preview.device.edit', ); $items['admin/config/content/responsive-preview/manage/%responsive_preview_device/edit'] = array( 'title' => 'Edit', @@ -48,7 +48,7 @@ function responsive_preview_menu() { ); $items['admin/config/content/responsive-preview/manage/%responsive_preview_device/delete'] = array( 'title' => 'Delete', - 'route_name' => 'responsive_preview_device_delete', + 'route_name' => 'responsive_preview.device.delete', 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_INLINE, 'weight' => 10, diff --git a/core/modules/responsive_preview/responsive_preview.routing.yml b/core/modules/responsive_preview/responsive_preview.routing.yml index dcf7e63..1bc4b64 100644 --- a/core/modules/responsive_preview/responsive_preview.routing.yml +++ b/core/modules/responsive_preview/responsive_preview.routing.yml @@ -1,4 +1,4 @@ -responsive_preview_device_list: +responsive_preview.device.list: pattern: '/admin/config/content/responsive-preview' defaults: _content: '\Drupal\Core\Entity\Controller\EntityListController::listing' @@ -6,21 +6,21 @@ responsive_preview_device_list: requirements: _permission: 'administer site configuration' -responsive_preview_device_add: +responsive_preview.device.add: pattern: '/admin/config/content/responsive-preview/add' defaults: _entity_form: responsive_preview_device.add requirements: _permission: 'administer site configuration' -responsive_preview_device_edit: +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: +responsive_preview.device.delete: pattern: '/admin/config/content/responsive-preview/manage/{responsive_preview_device}/delete' defaults: _entity_form: responsive_preview_device.delete