- {{#if this.step.title}}
-
{{this.step.title}}
- {{/if}}
+
+ {{bound-i18n "wizard.step-text"}}
+ {{bound-i18n "wizard.step" current=this.step.displayIndex total=this.wizard.totalSteps}}
+
-
- {{#if this.step.fields}}
-
- {{#if this.includeSidebar}}
-
- {{/if}}
-
- {{#each this.step.fields as |field|}}
- {{#unless field.show_in_sidebar}}
-
- {{/unless}}
- {{/each}}
+
+
+
+
+
-
-
diff --git a/app/assets/javascripts/wizard/addon/templates/wizard.hbs b/app/assets/javascripts/wizard/addon/templates/wizard.hbs
index 3821275f97..fca1e91349 100644
--- a/app/assets/javascripts/wizard/addon/templates/wizard.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/wizard.hbs
@@ -7,7 +7,5 @@
-
- {{outlet}}
-
+ {{outlet}}
Have fun!"
styling:
- title: "Look & Feel"
+ title: "Look and feel"
fields:
color_scheme:
label: "Color scheme"
@@ -5003,38 +5000,39 @@ en:
label: "Subcategories with Featured Topics"
branding:
- title: "Customize Logos"
+ title: "Community logo"
fields:
logo:
- label: "Primary Logo"
- description: "The logo at the top left of your site. Use a wide rectangular image with a height of 120 and an aspect ratio greater than 3:1"
+ label: "Primary logo"
+ description: "Recommended size: 600 x 200"
logo_small:
- label: "Square Logo"
- description: "A square version of your logo. Shown at the top left when scrolling down, and when sharing on social platforms. Ideally at least 512x512."
+ label: "Square logo"
+ description: "Recommended size: 512 x 512. Also used as the favicon and mobile home screen app icon."
corporate:
- title: "Your Organization"
+ title: "Your organization"
+ description: "The following information will be used in your Terms of Service and About pages. Feel free to skip if no company exists."
fields:
company_name:
- label: "Company Name"
- placeholder: "Example Organization"
- description: "Entered in your Terms of Service page. Feel free to skip if no company exists."
+ label: "Company name"
+ placeholder: "Acme Organization"
governing_law:
- label: "Governing Law"
+ label: "Governing law"
placeholder: "California law"
- description: "Entered in your Terms of Service page. Feel free to skip if no company exists."
contact_url:
- label: "Web Page"
+ label: "Web page"
placeholder: "https://www.example.com/contact-us"
- description: "General contact web page for you or your organization. Will be displayed on your about page."
city_for_disputes:
- label: "City for Disputes"
+ label: "City for disputes"
placeholder: "San Francisco, California"
- description: "Entered in your Terms of Service page. Feel free to skip if no company exists."
site_contact:
- label: "Automated Messages"
+ label: "Automated messages"
description: "All automated Discourse personal messages will be sent from this user, such as flag warnings and backup completion notices."
+ contact_email:
+ label: "Point of contact"
+ placeholder: "example@user.com"
+ description: "Email address of key contact responsible for this site. Used for critical notifications, and listed on your your about page for urgent matters."
invites:
title: "Invite Staff"
diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index a12dc4cafd..b7927fb6ed 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -12,10 +12,11 @@ class Wizard
@wizard.append_step('introduction') do |step|
step.banner = "welcome-illustration"
+ step.emoji = "wave"
+ step.description_vars = { base_path: Discourse.base_path }
step.add_field(id: 'title', type: 'text', required: true, value: SiteSetting.title == SiteSetting.defaults[:title] ? "" : SiteSetting.title)
step.add_field(id: 'site_description', type: 'text', required: false, value: SiteSetting.site_description)
- step.add_field(id: 'contact_email', type: 'text', required: true, value: SiteSetting.contact_email)
languages = step.add_field(id: 'default_locale',
type: 'dropdown',
@@ -30,7 +31,7 @@ class Wizard
updater.ensure_changed(:title)
if updater.errors.blank?
- updater.apply_settings(:title, :site_description, :contact_email)
+ updater.apply_settings(:title, :site_description)
end
old_locale = SiteSetting.default_locale
@@ -49,6 +50,7 @@ class Wizard
@wizard.append_step('privacy') do |step|
step.banner = "members-illustration"
+ step.emoji = "hugs"
step.add_field(
id: 'login_required',
type: 'checkbox',
@@ -98,9 +100,25 @@ class Wizard
@wizard.append_step('ready') do |step|
# no form on this page, just info.
step.banner = "finished-illustration"
+ step.emoji = "rocket"
+ end
+
+ @wizard.append_step('branding') do |step|
+ step.emoji = "framed_picture"
+ step.add_field(id: 'logo', type: 'image', value: SiteSetting.site_logo_url)
+ step.add_field(id: 'logo_small', type: 'image', value: SiteSetting.site_logo_small_url)
+
+ step.on_update do |updater|
+ if SiteSetting.site_logo_url != updater.fields[:logo] ||
+ SiteSetting.site_logo_small_url != updater.fields[:logo_small]
+ updater.apply_settings(:logo, :logo_small)
+ updater.refresh_required = true
+ end
+ end
end
@wizard.append_step('styling') do |step|
+ step.emoji = "art"
default_theme = Theme.find_by(id: SiteSetting.default_theme_id)
default_theme_override = SiteSetting.exists?(name: "default_theme_id")
@@ -205,34 +223,14 @@ class Wizard
end
end
- @wizard.append_step('branding') do |step|
- step.add_field(id: 'logo', type: 'image', value: SiteSetting.site_logo_url)
- step.add_field(id: 'logo_small', type: 'image', value: SiteSetting.site_logo_small_url)
-
- step.on_update do |updater|
- if SiteSetting.site_logo_url != updater.fields[:logo] ||
- SiteSetting.site_logo_small_url != updater.fields[:logo_small]
- updater.apply_settings(:logo, :logo_small)
- updater.refresh_required = true
- end
- end
- end
-
@wizard.append_step('corporate') do |step|
+ step.emoji = "briefcase"
step.description_vars = { base_path: Discourse.base_path }
step.add_field(id: 'company_name', type: 'text', value: SiteSetting.company_name)
step.add_field(id: 'governing_law', type: 'text', value: SiteSetting.governing_law)
step.add_field(id: 'contact_url', type: 'text', value: SiteSetting.contact_url)
step.add_field(id: 'city_for_disputes', type: 'text', value: SiteSetting.city_for_disputes)
-
- username = SiteSetting.site_contact_username
- username = Discourse.system_user.username if username.blank?
- contact = step.add_field(id: 'site_contact', type: 'dropdown', value: username)
-
- User.human_users.where(admin: true).pluck(:username).each do |c|
- contact.add_choice(c) unless reserved_usernames.include?(c.downcase)
- end
- contact.add_choice(Discourse.system_user.username)
+ step.add_field(id: 'contact_email', type: 'text', value: SiteSetting.contact_email)
step.on_update do |updater|
update_tos do |raw|
@@ -241,8 +239,9 @@ class Wizard
replace_setting_value(updater, raw, 'city_for_disputes')
end
- updater.apply_settings(:company_name, :governing_law, :city_for_disputes, :contact_url)
- updater.update_setting(:site_contact_username, updater.fields[:site_contact])
+ if updater.errors.blank?
+ updater.apply_settings(:company_name, :governing_law, :city_for_disputes, :contact_url, :contact_email)
+ end
end
end
diff --git a/lib/wizard/step.rb b/lib/wizard/step.rb
index 8ff56c3521..6e8fcdae89 100644
--- a/lib/wizard/step.rb
+++ b/lib/wizard/step.rb
@@ -3,7 +3,7 @@
class Wizard
class Step
attr_reader :id, :updater
- attr_accessor :index, :fields, :next, :previous, :banner, :disabled, :description_vars
+ attr_accessor :index, :fields, :next, :previous, :banner, :disabled, :description_vars, :emoji
def initialize(id)
@id = id
diff --git a/spec/lib/wizard/step_updater_spec.rb b/spec/lib/wizard/step_updater_spec.rb
index c6670b864a..6c56477abe 100644
--- a/spec/lib/wizard/step_updater_spec.rb
+++ b/spec/lib/wizard/step_updater_spec.rb
@@ -14,14 +14,12 @@ RSpec.describe Wizard::StepUpdater do
updater = wizard.create_updater('introduction',
title: 'new forum title',
site_description: 'neat place',
- default_locale: locale,
- contact_email: 'eviltrout@example.com')
+ default_locale: locale)
updater.update
expect(updater.success?).to eq(true)
expect(SiteSetting.title).to eq("new forum title")
expect(SiteSetting.site_description).to eq("neat place")
- expect(SiteSetting.contact_email).to eq("eviltrout@example.com")
expect(updater.refresh_required?).to eq(false)
expect(wizard.completed_steps?('introduction')).to eq(true)
end
@@ -331,13 +329,15 @@ RSpec.describe Wizard::StepUpdater do
company_name: 'ACME, Inc.',
governing_law: 'New Jersey law',
contact_url: 'http://example.com/custom-contact-url',
- city_for_disputes: 'Fairfield, New Jersey')
+ city_for_disputes: 'Fairfield, New Jersey',
+ contact_email: 'eviltrout@example.com')
updater.update
expect(updater).to be_success
expect(SiteSetting.company_name).to eq("ACME, Inc.")
expect(SiteSetting.governing_law).to eq("New Jersey law")
expect(SiteSetting.contact_url).to eq("http://example.com/custom-contact-url")
expect(SiteSetting.city_for_disputes).to eq("Fairfield, New Jersey")
+ expect(SiteSetting.contact_email).to eq("eviltrout@example.com")
# Should update the TOS topic
raw = Post.where(topic_id: SiteSetting.tos_topic_id, post_number: 1).pluck_first(:raw)
diff --git a/spec/lib/wizard/wizard_builder_spec.rb b/spec/lib/wizard/wizard_builder_spec.rb
index edb3352b72..6b638bca91 100644
--- a/spec/lib/wizard/wizard_builder_spec.rb
+++ b/spec/lib/wizard/wizard_builder_spec.rb
@@ -39,14 +39,11 @@ RSpec.describe Wizard::Builder do
fields = introduction_step.fields
title_field = fields.first
description_field = fields.second
- contact_email_field = fields.third
expect(title_field.id).to eq('title')
expect(title_field.value).to eq("")
expect(description_field.id).to eq('site_description')
expect(description_field.value).to eq("")
- expect(contact_email_field.id).to eq('contact_email')
- expect(contact_email_field.value).to eq("")
end
it 'should prefill overridden site setting values' do
@@ -57,14 +54,11 @@ RSpec.describe Wizard::Builder do
fields = introduction_step.fields
title_field = fields.first
description_field = fields.second
- contact_email_field = fields.third
expect(title_field.id).to eq('title')
expect(title_field.value).to eq("foobar")
expect(description_field.id).to eq('site_description')
expect(description_field.value).to eq("lorem ipsum")
- expect(contact_email_field.id).to eq('contact_email')
- expect(contact_email_field.value).to eq("foobar@example.com")
end
end
diff --git a/spec/requests/steps_controller_spec.rb b/spec/requests/steps_controller_spec.rb
index 44652fb6b1..ad5f1295b7 100644
--- a/spec/requests/steps_controller_spec.rb
+++ b/spec/requests/steps_controller_spec.rb
@@ -37,16 +37,15 @@ RSpec.describe StepsController do
it "updates properly if you are staff" do
put "/wizard/steps/introduction.json", params: {
- fields: { title: "FooBar", default_locale: SiteSetting.default_locale, contact_email: "eviltrout@example.com" }
+ fields: { title: "FooBar", default_locale: SiteSetting.default_locale }
}
expect(response.status).to eq(200)
- expect(SiteSetting.contact_email).to eq("eviltrout@example.com")
end
it "returns errors if the field has them" do
put "/wizard/steps/introduction.json", params: {
- fields: { contact_email: "not-an-email" }
+ fields: { title: "" }
}
expect(response.status).to eq(422)