From ee26b4b86a6a334b9d280c1be38055b22eabf9d2 Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Mon, 4 Jul 2016 11:44:49 +0100
Subject: [PATCH] Issue #2409591 by pguillard, mayurjadhav, Artusamak,
 marcoscano, chris_h, ifrik, amateescu: Increase discoverability of view modes

---
 .../field_ui/src/Form/EntityDisplayFormBase.php      | 12 +++++++++++-
 .../field_ui/src/Form/EntityFormDisplayEditForm.php  | 12 ++++++++++++
 .../field_ui/src/Form/EntityViewDisplayEditForm.php  | 12 ++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
index cfa5c39ad9f5..20e1487b01b0 100644
--- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -205,10 +205,12 @@ public function form(array $form, FormStateInterface $form_state) {
         }
         $form['modes']['display_modes_custom'] = array(
           '#type' => 'checkboxes',
-          '#title' => $this->t('Use custom display settings for the following modes'),
+          '#title' => $this->t('Use custom display settings for the following @display_context modes', ['@display_context' => $this->displayContext]),
           '#options' => $display_mode_options,
           '#default_value' => $default,
         );
+        // Provide link to manage display modes.
+        $form['modes']['display_modes_link'] = $this->getDisplayModesLink();
       }
     }
 
@@ -790,6 +792,14 @@ abstract protected function getDisplayModes();
    */
   abstract protected function getDisplayModeOptions();
 
+  /**
+   * Returns a link to the form or view mode admin page.
+   *
+   * @return array
+   *   An array of a form element to be rendered as a link.
+   */
+  abstract protected function getDisplayModesLink();
+
   /**
    * Returns the region to which a row in the display overview belongs.
    *
diff --git a/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php b/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php
index 4e1de08fea0c..fa35828e246e 100644
--- a/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php
+++ b/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Field\PluginSettingsInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
+use Drupal\Core\Link;
 use Drupal\field_ui\FieldUI;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -75,6 +76,17 @@ protected function getDisplayModeOptions() {
     return $this->entityManager->getFormModeOptions($this->entity->getTargetEntityTypeId());
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDisplayModesLink() {
+    return [
+      '#type' => 'link',
+      '#title' => t('Manage form modes'),
+      '#url' => Url::fromRoute('entity.entity_form_mode.collection'),
+    ];
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php b/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
index 01b486b0c7aa..20cd9a27d0db 100644
--- a/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
+++ b/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Field\PluginSettingsInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
+use Drupal\Core\Link;
 use Drupal\field_ui\FieldUI;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -108,6 +109,17 @@ protected function getDisplayModeOptions() {
     return $this->entityManager->getViewModeOptions($this->entity->getTargetEntityTypeId());
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDisplayModesLink() {;
+    return [
+      '#type' => 'link',
+      '#title' => t('Manage view modes'),
+      '#url' => Url::fromRoute('entity.entity_view_mode.collection'),
+    ];
+  }
+
   /**
    * {@inheritdoc}
    */
-- 
GitLab