Commit 88a42a83 authored by Doug Stull's avatar Doug Stull

Add homepage wording to user preferences

- for ease of understanding and linking.
parent 82678ecc
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
.col-sm-12 .col-sm-12
%hr %hr
.col-lg-4.profile-settings-sidebar .col-lg-4.profile-settings-sidebar#behavior
%h4.gl-mt-0 %h4.gl-mt-0
= s_('Preferences|Behavior') = s_('Preferences|Behavior')
%p %p
...@@ -51,8 +51,10 @@ ...@@ -51,8 +51,10 @@
= s_('Preferences|Choose between fixed (max. 1280px) and fluid (%{percentage}) application layout.').html_safe % { percentage: '100%' } = s_('Preferences|Choose between fixed (max. 1280px) and fluid (%{percentage}) application layout.').html_safe % { percentage: '100%' }
.form-group .form-group
= f.label :dashboard, class: 'label-bold' do = f.label :dashboard, class: 'label-bold' do
= s_('Preferences|Default dashboard') = s_('Preferences|Homepage content')
= f.select :dashboard, dashboard_choices, {}, class: 'select2' = f.select :dashboard, dashboard_choices, {}, class: 'select2'
.form-text.text-muted
= s_('Preferences|Choose what content you want to see on your homepage.')
= render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific = render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific
......
---
title: Update preferences for homepage/dashboard wording
merge_request: 39092
author:
type: changed
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
= _('Group overview content') = _('Group overview content')
= f.select :group_view, group_view_choices, {}, class: 'select2' = f.select :group_view, group_view_choices, {}, class: 'select2'
.form-text.text-muted .form-text.text-muted
= _('Choose what content you want to see on a group’s overview page') = _('Choose what content you want to see on a group’s overview page.')
...@@ -4748,7 +4748,7 @@ msgstr "" ...@@ -4748,7 +4748,7 @@ msgstr ""
msgid "Choose visibility level, enable/disable project features (issues, repository, wiki, snippets) and set permissions." msgid "Choose visibility level, enable/disable project features (issues, repository, wiki, snippets) and set permissions."
msgstr "" msgstr ""
msgid "Choose what content you want to see on a group’s overview page" msgid "Choose what content you want to see on a group’s overview page."
msgstr "" msgstr ""
msgid "Choose which repositories you want to connect and run CI/CD pipelines." msgid "Choose which repositories you want to connect and run CI/CD pipelines."
...@@ -18049,13 +18049,13 @@ msgstr "" ...@@ -18049,13 +18049,13 @@ msgstr ""
msgid "Preferences|Choose what content you want to see on a project’s overview page." msgid "Preferences|Choose what content you want to see on a project’s overview page."
msgstr "" msgstr ""
msgid "Preferences|Customize integrations with third party services." msgid "Preferences|Choose what content you want to see on your homepage."
msgstr "" msgstr ""
msgid "Preferences|Customize the appearance of the application header and navigation sidebar." msgid "Preferences|Customize integrations with third party services."
msgstr "" msgstr ""
msgid "Preferences|Default dashboard" msgid "Preferences|Customize the appearance of the application header and navigation sidebar."
msgstr "" msgstr ""
msgid "Preferences|Display time in 24-hour format" msgid "Preferences|Display time in 24-hour format"
...@@ -18067,6 +18067,9 @@ msgstr "" ...@@ -18067,6 +18067,9 @@ msgstr ""
msgid "Preferences|For example: 30 mins ago." msgid "Preferences|For example: 30 mins ago."
msgstr "" msgstr ""
msgid "Preferences|Homepage content"
msgstr ""
msgid "Preferences|Instead of all the files changed, show only one file at a time. To switch between files, use the file browser." msgid "Preferences|Instead of all the files changed, show only one file at a time. To switch between files, use the file browser."
msgstr "" msgstr ""
......
...@@ -20,6 +20,15 @@ RSpec.describe 'profiles/preferences/show' do ...@@ -20,6 +20,15 @@ RSpec.describe 'profiles/preferences/show' do
it 'has option for Render whitespace characters in the Web IDE' do it 'has option for Render whitespace characters in the Web IDE' do
expect(rendered).to have_unchecked_field('Render whitespace characters in the Web IDE') expect(rendered).to have_unchecked_field('Render whitespace characters in the Web IDE')
end end
it 'has an id for anchoring on behavior' do
expect(rendered).to have_css('#behavior')
end
it 'has helpful homepage setup guidance' do
expect(rendered).to have_field('Homepage content')
expect(rendered).to have_content('Choose what content you want to see on your homepage.')
end
end end
context 'sourcegraph' do context 'sourcegraph' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment