From 8a7910f36e9f040bde17ea356e677622c9daad27 Mon Sep 17 00:00:00 2001
From: Christian Lopez Espinola <penyaskito@computer.org>
Date: Tue, 26 Nov 2024 15:05:06 +0100
Subject: [PATCH] Issue #3487323: Move welcome menu links to dashboard, and
 adjusted to designs.

---
 .../config/dashboard.dashboard.welcome.yml    | 19 +++++-----
 .../welcome-10-add-content.yml}               |  4 +--
 .../welcome-20-add-content-type.yml}          |  6 ++--
 .../welcome-70-change-appearance.yml}         |  2 +-
 .../welcome-80-invite-others.yml}             |  4 +--
 recipes/drupal_cms_dashboard/recipe.yml       |  1 +
 .../welcome-03-extend-drupal.yml              | 36 -------------------
 7 files changed, 19 insertions(+), 53 deletions(-)
 rename recipes/{drupal_cms_starter/content/menu_link_content/welcome-02-add-content.yml => drupal_cms_dashboard/content/menu_link_content/welcome-10-add-content.yml} (89%)
 rename recipes/{drupal_cms_starter/content/menu_link_content/welcome-01-setup-account.yml => drupal_cms_dashboard/content/menu_link_content/welcome-20-add-content-type.yml} (82%)
 rename recipes/{drupal_cms_starter/content/menu_link_content/welcome-05-change-appearance.yml => drupal_cms_dashboard/content/menu_link_content/welcome-70-change-appearance.yml} (97%)
 rename recipes/{drupal_cms_starter/content/menu_link_content/welcome-04-invite-others.yml => drupal_cms_dashboard/content/menu_link_content/welcome-80-invite-others.yml} (90%)
 delete mode 100644 recipes/drupal_cms_starter/content/menu_link_content/welcome-03-extend-drupal.yml

diff --git a/recipes/drupal_cms_dashboard/config/dashboard.dashboard.welcome.yml b/recipes/drupal_cms_dashboard/config/dashboard.dashboard.welcome.yml
index 105d554b..23f15346 100644
--- a/recipes/drupal_cms_dashboard/config/dashboard.dashboard.welcome.yml
+++ b/recipes/drupal_cms_dashboard/config/dashboard.dashboard.welcome.yml
@@ -5,28 +5,29 @@ dependencies:
     - system.menu.welcome
   module:
     - layout_builder
-    - layout_discovery
+    - system
 id: welcome
 label: 'Welcome to your site'
 description: 'Presented to users when they complete the Drupal CMS install process.'
 layout:
   -
-    layout_id: layout_onecol
+    layout_id: layout_twocol_section
     layout_settings:
-      label: ''
+      label: 'Content and tasks'
       context_mapping: {  }
+      column_widths: 67-33
     components:
-      305a1b7e-9209-4e23-b8e8-2c5cc114c7e4:
-        uuid: 305a1b7e-9209-4e23-b8e8-2c5cc114c7e4
-        region: content
+      cb457c1c-83c2-4a79-a09e-2c64a8bf8fb8:
+        uuid: cb457c1c-83c2-4a79-a09e-2c64a8bf8fb8
+        region: second
         configuration:
           id: 'system_menu_block:welcome'
-          label: Welcome
-          label_display: '0'
+          label: 'Top tasks'
+          label_display: visible
           provider: system
           context_mapping: {  }
           level: 1
-          depth: 0
+          depth: 1
           expand_all_items: false
         weight: 0
         additional: {  }
diff --git a/recipes/drupal_cms_starter/content/menu_link_content/welcome-02-add-content.yml b/recipes/drupal_cms_dashboard/content/menu_link_content/welcome-10-add-content.yml
similarity index 89%
rename from recipes/drupal_cms_starter/content/menu_link_content/welcome-02-add-content.yml
rename to recipes/drupal_cms_dashboard/content/menu_link_content/welcome-10-add-content.yml
index 347b181e..30fdd1d4 100644
--- a/recipes/drupal_cms_starter/content/menu_link_content/welcome-02-add-content.yml
+++ b/recipes/drupal_cms_dashboard/content/menu_link_content/welcome-10-add-content.yml
@@ -10,7 +10,7 @@ default:
       value: true
   title:
     -
-      value: 'Create your first content page'
+      value: 'Create content'
   menu_name:
     -
       value: welcome
@@ -27,7 +27,7 @@ default:
       value: true
   weight:
     -
-      value: 2
+      value: 10
   expanded:
     -
       value: false
diff --git a/recipes/drupal_cms_starter/content/menu_link_content/welcome-01-setup-account.yml b/recipes/drupal_cms_dashboard/content/menu_link_content/welcome-20-add-content-type.yml
similarity index 82%
rename from recipes/drupal_cms_starter/content/menu_link_content/welcome-01-setup-account.yml
rename to recipes/drupal_cms_dashboard/content/menu_link_content/welcome-20-add-content-type.yml
index 67c9b75d..4baab8f5 100644
--- a/recipes/drupal_cms_starter/content/menu_link_content/welcome-01-setup-account.yml
+++ b/recipes/drupal_cms_dashboard/content/menu_link_content/welcome-20-add-content-type.yml
@@ -10,13 +10,13 @@ default:
       value: true
   title:
     -
-      value: 'Finish setting up your account'
+      value: 'Create content type'
   menu_name:
     -
       value: welcome
   link:
     -
-      uri: 'internal:/user/edit'
+      uri: 'internal:/admin/structure/types/add'
       title: ''
       options: {  }
   external:
@@ -27,7 +27,7 @@ default:
       value: true
   weight:
     -
-      value: 1
+      value: 20
   expanded:
     -
       value: false
diff --git a/recipes/drupal_cms_starter/content/menu_link_content/welcome-05-change-appearance.yml b/recipes/drupal_cms_dashboard/content/menu_link_content/welcome-70-change-appearance.yml
similarity index 97%
rename from recipes/drupal_cms_starter/content/menu_link_content/welcome-05-change-appearance.yml
rename to recipes/drupal_cms_dashboard/content/menu_link_content/welcome-70-change-appearance.yml
index 13db8aa5..2ce6905e 100644
--- a/recipes/drupal_cms_starter/content/menu_link_content/welcome-05-change-appearance.yml
+++ b/recipes/drupal_cms_dashboard/content/menu_link_content/welcome-70-change-appearance.yml
@@ -27,7 +27,7 @@ default:
       value: true
   weight:
     -
-      value: 6
+      value: 70
   expanded:
     -
       value: false
diff --git a/recipes/drupal_cms_starter/content/menu_link_content/welcome-04-invite-others.yml b/recipes/drupal_cms_dashboard/content/menu_link_content/welcome-80-invite-others.yml
similarity index 90%
rename from recipes/drupal_cms_starter/content/menu_link_content/welcome-04-invite-others.yml
rename to recipes/drupal_cms_dashboard/content/menu_link_content/welcome-80-invite-others.yml
index 7d0699c7..5238b291 100644
--- a/recipes/drupal_cms_starter/content/menu_link_content/welcome-04-invite-others.yml
+++ b/recipes/drupal_cms_dashboard/content/menu_link_content/welcome-80-invite-others.yml
@@ -10,7 +10,7 @@ default:
       value: true
   title:
     -
-      value: 'Invite and work with others'
+      value: 'Invite users'
   menu_name:
     -
       value: welcome
@@ -27,7 +27,7 @@ default:
       value: true
   weight:
     -
-      value: 4
+      value: 80
   expanded:
     -
       value: false
diff --git a/recipes/drupal_cms_dashboard/recipe.yml b/recipes/drupal_cms_dashboard/recipe.yml
index fe931492..2650baa3 100644
--- a/recipes/drupal_cms_dashboard/recipe.yml
+++ b/recipes/drupal_cms_dashboard/recipe.yml
@@ -3,6 +3,7 @@ type: Drupal CMS
 description: Installs and provides dashboards for authors.
 install:
   - dashboard
+  - menu_link_content
 config:
   strict: false
   actions:
diff --git a/recipes/drupal_cms_starter/content/menu_link_content/welcome-03-extend-drupal.yml b/recipes/drupal_cms_starter/content/menu_link_content/welcome-03-extend-drupal.yml
deleted file mode 100644
index d107e524..00000000
--- a/recipes/drupal_cms_starter/content/menu_link_content/welcome-03-extend-drupal.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-_meta:
-  version: '1.0'
-  entity_type: menu_link_content
-  uuid: 4fae6c3d-c874-4b53-81bc-7c1f9d8a6f5d
-  bundle: menu_link_content
-  default_langcode: en
-default:
-  enabled:
-    -
-      value: true
-  title:
-    -
-      value: 'Extend Drupal'
-  menu_name:
-    -
-      value: welcome
-  link:
-    -
-      uri: 'internal:/admin/modules/browse'
-      title: ''
-      options: {  }
-  external:
-    -
-      value: false
-  rediscover:
-    -
-      value: true
-  weight:
-    -
-      value: 3
-  expanded:
-    -
-      value: false
-  revision_translation_affected:
-    -
-      value: true
-- 
GitLab