diff options
Diffstat (limited to 'app/views/profiles/preferences/show.html.haml')
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index b10d05efc4f..7f8858411ca 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -1,11 +1,11 @@ - page_title _('Preferences') - add_page_specific_style 'page_bundles/profiles/preferences' -- @content_class = "limit-container-width" unless fluid_layout - user_theme_id = Gitlab::Themes.for_user(@user).id - user_color_schema_id = Gitlab::ColorSchemes.for_user(@user).id - user_fields = { theme: user_theme_id, gitpod_enabled: @user.gitpod_enabled, sourcegraph_enabled: @user.sourcegraph_enabled }.to_json - @themes = Gitlab::Themes::available_themes.to_json - data_attributes = { themes: @themes, integration_views: integration_views.to_json, user_fields: user_fields, body_classes: Gitlab::Themes.body_classes, profile_preferences_path: profile_preferences_path } +- @force_desktop_expanded_sidebar = true - Gitlab::Themes.each do |theme| = stylesheet_link_tag "themes/#{theme.css_filename}" if theme.css_filename @@ -17,6 +17,9 @@ = s_('Preferences|Color theme') %p = s_('Preferences|Customize the color of GitLab.') + - if show_super_sidebar? + %p + = s_('Preferences|Note: You have the new navigation enabled, so only Dark Mode theme significantly changes GitLab\'s appearance.') .col-lg-8.application-theme .row - Gitlab::Themes.each do |theme| @@ -34,7 +37,7 @@ %h4.gl-mt-0 = s_('Preferences|Syntax highlighting theme') %p - = s_('Preferences|This setting allows you to customize the appearance of the syntax.') + = s_('Preferences|Customize the appearance of the syntax.') = succeed '.' do = link_to _('Learn more'), help_page_path('user/profile/preferences', anchor: 'syntax-highlighting-theme'), target: '_blank', rel: 'noopener noreferrer' .col-lg-8.syntax-theme @@ -66,7 +69,7 @@ %h4.gl-mt-0 = s_('Preferences|Behavior') %p - = s_('Preferences|This setting allows you to customize the behavior of the system layout and default views.') + = s_('Preferences|Customize the behavior of the system layout and default views.') = succeed '.' do = link_to _('Learn more'), help_page_path('user/profile/preferences', anchor: 'behavior'), target: '_blank', rel: 'noopener noreferrer' .col-lg-8 @@ -76,7 +79,7 @@ = f.select :layout, layout_choices, {}, class: 'gl-form-select custom-select' .form-text.text-muted = s_('Preferences|Choose between fixed (max. 1280px) and fluid (%{percentage}) application layout.').html_safe % { percentage: '100%' } - .js-listbox-input{ data: { label: s_('Preferences|Dashboard'), description: s_('Preferences|Choose what content you want to see by default on your dashboard.'), name: 'user[dashboard]', items: dashboard_choices.to_json, value: current_user.dashboard } } + .js-listbox-input{ data: { label: s_('Preferences|Homepage'), description: s_('Preferences|Choose what content you want to see by default on your homepage.'), name: 'user[dashboard]', items: dashboard_choices.to_json, value: current_user.dashboard } } = render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific @@ -137,21 +140,6 @@ = f.select :first_day_of_week, first_day_of_week_choices_with_default, {}, class: 'gl-form-select custom-select' .col-sm-12 %hr - - if Feature.enabled?(:vscode_web_ide, current_user) - .row.js-preferences-form.js-search-settings-section - .col-lg-4.profile-settings-sidebar#web-ide - %h4.gl-mt-0 - = s_('Preferences|Web IDE') - %p - = s_('Preferences|The Web IDE Beta is the default Web IDE experience.') - = link_to _('Learn more'), help_page_path('user/project/web_ide_beta/index.md'), target: '_blank', rel: 'noopener noreferrer' - .col-lg-8 - .form-group - = f.gitlab_ui_checkbox_component :use_legacy_web_ide, - s_('Preferences|Opt out of the Web IDE Beta'), - help_text: s_('Preferences|The Web IDE remains available alongside the Beta.') - .col-sm-12 - %hr .row.js-preferences-form.js-search-settings-section .col-lg-4.profile-settings-sidebar#time-preferences %h4.gl-mt-0 @@ -165,8 +153,21 @@ = f.gitlab_ui_checkbox_component :time_display_relative, s_('Preferences|Use relative times'), help_text: s_('Preferences|For example: 30 minutes ago.') - - if Feature.enabled?(:user_time_settings) + - if Feature.enabled?(:disable_follow_users, @user) + .row.js-preferences-form.js-search-settings-section + .col-sm-12 + %hr + .col-lg-4.profile-settings-sidebar#enabled_following + %h4.gl-mt-0 + = s_('Preferences|Enable follow users feature') + %p + = s_('Preferences|Turns on or off the ability to follow or be followed by other users.') + = succeed '.' do + = link_to _('Learn more'), help_page_path('user/profile/index', anchor: 'follow-users'), target: '_blank', rel: 'noopener noreferrer' + .col-lg-8 .form-group - = f.gitlab_ui_checkbox_component :time_format_in_24h, s_('Preferences|Display time in 24-hour format') + = f.gitlab_ui_checkbox_component :enabled_following, + s_('Preferences|Enable follow users') + #js-profile-preferences-app{ data: data_attributes } |