From 5654aedd75b4bb77cdd88bd2613ac82793bb9812 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 18 May 2023 15:38:04 +0200
Subject: [PATCH] UX: Remove welcome topic admin tip and tweak copy (#21593)
The welcome topic user tip was for admins only, but in general, user
tips should be used for guiding new users through the features that
Discourse offers. For this reason, we decided to remove the user tip.
This commit also includes a few more copy tweaks to the welcome topic.
---
app/assets/javascripts/discourse/app/templates/topic.hbs | 8 --------
app/models/user.rb | 1 -
config/locales/client.en.yml | 4 ----
config/locales/server.en.yml | 8 ++++++--
config/site_settings.yml | 1 -
spec/requests/api/schemas/json/site_response.json | 3 ---
6 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index c14399e29cc..1e817eb528e 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -149,14 +149,6 @@
class="edit-topic"
title={{i18n "edit"}}
>{{d-icon "pencil-alt"}}</a>
-
- {{#if (eq this.siteSettings.welcome_topic_id this.model.id)}}
- <UserTip
- @id="welcome_topic"
- @selector=".edit-topic"
- @placement="bottom"
- />
- {{/if}}
{{/if}}
<PluginOutlet
diff --git a/app/models/user.rb b/app/models/user.rb
index 6c7a272746a..a5576cc1e4a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -355,7 +355,6 @@ class User < ActiveRecord::Base
post_menu: 3,
topic_notification_levels: 4,
suggested_topics: 5,
- welcome_topic: 6,
)
end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 26da12f9f39..47120bbe038 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1931,10 +1931,6 @@ en:
title: "Keep reading!"
content: "Here are some topics we think you might like to read next."
- welcome_topic:
- title: "Edit the welcome topic"
- content: "Help new members feel at home by customizing this topic to suit your community's needs."
-
loading: "Loading..."
errors:
prev_page: "while trying to load"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 47b4b3a8cc4..0a801ca3d0d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -680,8 +680,12 @@ en:
discourse_welcome_topic:
title: "Welcome to %{site_title}! :wave:"
body: |
- We are so glad you joined us. %{site_description}
-
+ We are so glad you joined us.
+
+ > ## %{site_title}
+ >
+ > %{site_description}
+
Here are some things you can do to get started:
:speaking_head: **Introduce yourself** by adding your picture and information about yourself and your interests to [your profile](%{base_path}/my/preferences/account). What is one thing you’d like to be asked about?
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 75c2e561b8a..4d3777c4a0c 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2491,7 +2491,6 @@ uncategorized:
welcome_topic_id:
default: -1
hidden: true
- client: true
admin_quick_start_topic_id:
default: -1
hidden: true
diff --git a/spec/requests/api/schemas/json/site_response.json b/spec/requests/api/schemas/json/site_response.json
index 3e215cc38f6..516b2bc2722 100644
--- a/spec/requests/api/schemas/json/site_response.json
+++ b/spec/requests/api/schemas/json/site_response.json
@@ -241,9 +241,6 @@
},
"suggested_topics": {
"type": "integer"
- },
- "welcome_topic": {
- "type": "integer"
}
},
"required": [