diff options
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/_cover_controls.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/_follow_user.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/_overview.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/_profile_basic_info.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/_view_user_in_admin_area.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 7 | ||||
| -rw-r--r-- | app/views/users/terms/index.html.haml | 4 |
7 files changed, 11 insertions, 10 deletions
diff --git a/app/views/users/_cover_controls.html.haml b/app/views/users/_cover_controls.html.haml index 43278e9d232..899a08c8a17 100644 --- a/app/views/users/_cover_controls.html.haml +++ b/app/views/users/_cover_controls.html.haml @@ -1,2 +1,2 @@ -.cover-controls.d-flex.px-2.pb-4.d-sm-block.p-sm-0 +.cover-controls.gl-display-flex.gl-gap-3.gl-pb-4 = yield diff --git a/app/views/users/_follow_user.html.haml b/app/views/users/_follow_user.html.haml index 3ee8c81496c..71f8a462cbf 100644 --- a/app/views/users/_follow_user.html.haml +++ b/app/views/users/_follow_user.html.haml @@ -7,5 +7,5 @@ = _('Unfollow') - else = form_tag user_follow_path(@user, :json), class: link_classes do - = render Pajamas::ButtonComponent.new(variant: :confirm, type: :submit, button_options: { class: 'gl-w-full', data: { qa_selector: 'follow_user_link', track_action: 'click_button', track_label: 'follow_from_profile' } }) do + = render Pajamas::ButtonComponent.new(variant: :confirm, type: :submit, button_options: { class: 'gl-w-full', data: { testid: 'follow-user-link', track_action: 'click_button', track_label: 'follow_from_profile' } }) do = _('Follow') diff --git a/app/views/users/_overview.html.haml b/app/views/users/_overview.html.haml index 0b76ed6c086..3649f72c956 100644 --- a/app/views/users/_overview.html.haml +++ b/app/views/users/_overview.html.haml @@ -33,7 +33,7 @@ %h4.gl-flex-grow-1 = Feature.enabled?(:security_auto_fix) && @user.bot? ? s_('UserProfile|Bot activity') : s_('UserProfile|Activity') = link_to s_('UserProfile|View all'), user_activity_path, class: "hide js-view-all" - .overview-content-list{ data: { href: user_activity_path, qa_selector: 'user_activity_content' } } + .overview-content-list{ data: { href: user_activity_path, testid: 'user-activity-content' } } = gl_loading_icon(size: 'md', css_class: 'loading') - unless Feature.enabled?(:security_auto_fix) && @user.bot? diff --git a/app/views/users/_profile_basic_info.html.haml b/app/views/users/_profile_basic_info.html.haml index fb9721028d5..6de9e80008e 100644 --- a/app/views/users/_profile_basic_info.html.haml +++ b/app/views/users/_profile_basic_info.html.haml @@ -5,6 +5,6 @@ - unless Feature.enabled?(:user_profile_overflow_menu_vue) = render 'middle_dot_divider', stacking: true do = s_('UserProfile|User ID: %{id}') % { id: @user.id } - = deprecated_clipboard_button(title: s_('UserProfile|Copy user ID'), text: @user.id) + = clipboard_button(title: s_('UserProfile|Copy user ID'), text: @user.id) = render 'middle_dot_divider', stacking: true do = s_('Member since %{date}') % { date: l(@user.created_at.to_date, format: :long) } diff --git a/app/views/users/_view_user_in_admin_area.html.haml b/app/views/users/_view_user_in_admin_area.html.haml index b13f22956f6..36b3c33d8ab 100644 --- a/app/views/users/_view_user_in_admin_area.html.haml +++ b/app/views/users/_view_user_in_admin_area.html.haml @@ -1,4 +1,4 @@ - if current_user && current_user.admin? = render Pajamas::ButtonComponent.new(href: [:admin, @user], icon: 'user', - button_options: { class: 'gl-flex-grow-1 gl-mx-1 has-tooltip', title: s_('UserProfile|View user in admin area'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } }) + button_options: { class: 'gl-flex-grow-1 has-tooltip', title: s_('UserProfile|View user in admin area'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } }) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index a2f6b3da746..0881c5bba54 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -5,6 +5,7 @@ - page_description @user.bio unless @user.blocked? || !@user.confirmed? - page_itemtype 'http://schema.org/Person' - add_page_specific_style 'page_bundles/profile' +- add_page_specific_style 'page_bundles/projects' - if show_super_sidebar? - @left_sidebar = true - @force_desktop_expanded_sidebar = true @@ -17,7 +18,7 @@ .cover-block.user-cover-block.gl-border-t.gl-border-b.gl-mt-n1 %div{ class: container_class } - if Feature.enabled?(:user_profile_overflow_menu_vue) - .cover-controls.d-flex.px-2.pb-4.d-sm-block.p-sm-0 + .cover-controls.gl-display-flex.gl-gap-3.gl-pb-4 = render 'users/follow_user' -# The following edit button is mutually exclusive to the follow user button, they won't be shown together - if @user == current_user @@ -32,14 +33,14 @@ - if @user == current_user = render Pajamas::ButtonComponent.new(href: profile_path, icon: 'pencil', - button_options: { class: 'gl-flex-grow-1 gl-mx-1 has-tooltip', title: s_('UserProfile|Edit profile'), 'aria-label': 'Edit profile', data: { toggle: 'tooltip', placement: 'bottom', container: 'body' }}) + button_options: { class: 'gl-flex-grow-1 has-tooltip', title: s_('UserProfile|Edit profile'), 'aria-label': 'Edit profile', data: { toggle: 'tooltip', placement: 'bottom', container: 'body' }}) - elsif current_user #js-report-abuse{ data: { report_abuse_path: add_category_abuse_reports_path, reported_user_id: @user.id, reported_from_url: user_url(@user) } } = render 'users/view_gpg_keys' - if can?(current_user, :read_user_profile, @user) = render Pajamas::ButtonComponent.new(href: user_path(@user, rss_url_options), icon: 'rss', - button_options: { class: 'gl-flex-grow-1 gl-mx-1 has-tooltip', title: s_('UserProfile|Subscribe'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' }}) + button_options: { class: 'gl-flex-grow-1 has-tooltip', title: s_('UserProfile|Subscribe'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' }}) = render 'users/view_user_in_admin_area' = render 'users/follow_user' diff --git a/app/views/users/terms/index.html.haml b/app/views/users/terms/index.html.haml index afe257c2fc2..9f7c17dad9a 100644 --- a/app/views/users/terms/index.html.haml +++ b/app/views/users/terms/index.html.haml @@ -1,7 +1,7 @@ - content_for :page_specific_javascripts do - = render "layouts/google_tag_manager_head" + = render_if_exists "layouts/google_tag_manager_head" = render "layouts/one_trust" = render "layouts/bizible" -= render "layouts/google_tag_manager_body" += render_if_exists "layouts/google_tag_manager_body" #js-terms-of-service{ data: { terms_data: terms_data(@term, @redirect) } } |