From cbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 16 Mar 2020 12:09:12 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/admin/dashboard/index.html.haml | 2 +- app/views/help/ui.html.haml | 15 ++++----- app/views/profiles/show.html.haml | 2 +- app/views/users/_cover_controls.html.haml | 2 ++ app/views/users/_profile_basic_info.html.haml | 2 +- app/views/users/show.html.haml | 47 ++++++++++++++------------- 6 files changed, 37 insertions(+), 33 deletions(-) create mode 100644 app/views/users/_cover_controls.html.haml (limited to 'app/views') diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index f5f6175d3d8..68f761c75d8 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -99,7 +99,7 @@ %p GitLab Shell %span.float-right - = Gitlab::Shell.new.version + = Gitlab::Shell.version %p GitLab Workhorse %span.float-right diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 038befac420..d71650ae50c 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -1,5 +1,6 @@ - page_title "UI Development Kit", "Help" - lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed fermentum nisi sapien, non consequat lectus aliquam ultrices. Suspendisse sodales est euismod nunc condimentum, a consectetur diam ornare." +- link_classes = "flex-grow-1 mx-1 " .gitlab-ui-dev-kit %h1 GitLab UI development kit @@ -64,7 +65,12 @@ Cover block for profile page with avatar, name and description %code .cover-block .example - .cover-block + .cover-block.user-cover-block + = render layout: 'users/cover_controls' do + = link_to '#', class: link_classes + 'btn btn-default' do + = icon('pencil') + = link_to '#', class: link_classes + 'btn btn-default' do + = icon('rss') .avatar-holder = image_tag avatar_icon_for_email('admin@example.com', 90), class: "avatar s90", alt: '' .cover-title @@ -73,13 +79,6 @@ .cover-desc.cgray = lorem - .cover-controls - = link_to '#', class: 'btn btn-default' do - = icon('pencil') -   - = link_to '#', class: 'btn btn-default' do - = icon('rss') - %h2#lists Lists .lead diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 49533c18c8f..86e157ee042 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -90,7 +90,6 @@ .row = render 'profiles/name', form: f, user: @user = f.text_field :id, readonly: true, label: s_('Profiles|User ID'), wrapper: { class: 'col-md-3' } - = f.select :role, ::User.roles.keys.map { |role| [role.titleize, role] }, { prompt: _('Select your role') }, required: true, class: 'input-md' = render_if_exists 'profiles/email_settings', form: f = f.text_field :skype, class: 'input-md', placeholder: s_("Profiles|username") @@ -101,6 +100,7 @@ = f.text_field :location, readonly: true, help: s_("Profiles|Your location was automatically set based on your %{provider_label} account") % { provider_label: attribute_provider_label(:location) } - else = f.text_field :location, label: s_('Profiles|Location'), class: 'input-lg', placeholder: s_("Profiles|City, country") + = f.text_field :job_title, class: 'input-md' = f.text_field :organization, label: s_('Profiles|Organization'), class: 'input-md', help: s_("Profiles|Who you represent or work for") = f.text_area :bio, label: s_('Profiles|Bio'), rows: 4, maxlength: 250, help: s_("Profiles|Tell us about yourself in fewer than 250 characters") %hr diff --git a/app/views/users/_cover_controls.html.haml b/app/views/users/_cover_controls.html.haml new file mode 100644 index 00000000000..43278e9d232 --- /dev/null +++ b/app/views/users/_cover_controls.html.haml @@ -0,0 +1,2 @@ +.cover-controls.d-flex.px-2.pb-4.d-sm-block.p-sm-0 + = yield diff --git a/app/views/users/_profile_basic_info.html.haml b/app/views/users/_profile_basic_info.html.haml index af0a766bab0..c431a72d0e7 100644 --- a/app/views/users/_profile_basic_info.html.haml +++ b/app/views/users/_profile_basic_info.html.haml @@ -1,4 +1,4 @@ -%p +%p.mb-1.mb-sm-2.mt-2.mt-sm-3 %span.middle-dot-divider @#{@user.username} - if can?(current_user, :read_user_profile, @user) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 3c164588b13..9f5124afc16 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -4,30 +4,31 @@ - page_title @user.blocked? ? s_('UserProfile|Blocked user') : @user.name - page_description @user.bio - header_title @user.name, user_path(@user) +- link_classes = "flex-grow-1 mx-1 " = content_for :meta_tags do = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity") .user-profile .cover-block.user-cover-block{ class: [('border-bottom' if profile_tabs.empty?)] } - .cover-controls + = render layout: 'users/cover_controls' do - if @user == current_user - = link_to profile_path, class: 'btn btn-default has-tooltip', title: s_('UserProfile|Edit profile'), 'aria-label': 'Edit profile' do + = link_to profile_path, class: link_classes + 'btn btn-default has-tooltip', title: s_('UserProfile|Edit profile'), 'aria-label': 'Edit profile' do = icon('pencil') - elsif current_user - if @user.abuse_report - %button.btn.btn-danger{ title: s_('UserProfile|Already reported for abuse'), + %button{ class: link_classes + 'btn btn-danger mr-1', title: s_('UserProfile|Already reported for abuse'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } } = icon('exclamation-circle') - else - = link_to new_abuse_report_path(user_id: @user.id, ref_url: request.referrer), class: 'btn', + = link_to new_abuse_report_path(user_id: @user.id, ref_url: request.referrer), class: link_classes + 'btn', title: s_('UserProfile|Report abuse'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do = icon('exclamation-circle') - if can?(current_user, :read_user_profile, @user) - = link_to user_path(@user, rss_url_options), class: 'btn btn-default has-tooltip', title: s_('UserProfile|Subscribe'), 'aria-label': 'Subscribe' do + = link_to user_path(@user, rss_url_options), class: link_classes + 'btn btn-default has-tooltip', title: s_('UserProfile|Subscribe'), 'aria-label': 'Subscribe' do = icon('rss') - if current_user && current_user.admin? - = link_to [:admin, @user], class: 'btn btn-default', title: s_('UserProfile|View user in admin area'), + = link_to [:admin, @user], class: link_classes + 'btn btn-default', title: s_('UserProfile|View user in admin area'), data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = icon('users') @@ -51,10 +52,18 @@ = emoji_icon(@user.status.emoji) = markdown_field(@user.status, :message) = render "users/profile_basic_info" - .cover-desc.cgray - - unless @user.public_email.blank? - .profile-link-holder.middle-dot-divider - = link_to @user.public_email, "mailto:#{@user.public_email}", class: 'text-link' + .cover-desc.cgray.mb-1.mb-sm-2 + - unless @user.location.blank? + .profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline.mb-1.mb-sm-0 + = sprite_icon('location', size: 16, css_class: 'vertical-align-sub fgray') + %span.vertical-align-middle + = @user.location + - unless work_information(@user).blank? + .profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline + = sprite_icon('work', size: 16, css_class: 'vertical-align-middle fgray') + %span.vertical-align-middle + = work_information(@user) + .cover-desc.cgray.mb-1.mb-sm-2 - unless @user.skype.blank? .profile-link-holder.middle-dot-divider = link_to "skype:#{@user.skype}", title: "Skype" do @@ -64,24 +73,18 @@ = link_to linkedin_url(@user), title: "LinkedIn", target: '_blank', rel: 'noopener noreferrer nofollow' do = icon('linkedin-square') - unless @user.twitter.blank? - .profile-link-holder.middle-dot-divider + .profile-link-holder.middle-dot-divider-sm = link_to twitter_url(@user), title: "Twitter", target: '_blank', rel: 'noopener noreferrer nofollow' do = icon('twitter-square') - unless @user.website_url.blank? - .profile-link-holder.middle-dot-divider + .profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline.mt-1.mt-sm-0 = link_to @user.short_website_url, @user.full_website_url, class: 'text-link', target: '_blank', rel: 'me noopener noreferrer nofollow' - - unless @user.location.blank? - .profile-link-holder.middle-dot-divider - = sprite_icon('location', size: 16, css_class: 'vertical-align-sub') - = @user.location - - unless @user.organization.blank? - .profile-link-holder.middle-dot-divider - = sprite_icon('work', size: 16, css_class: 'vertical-align-sub') - = @user.organization - + - unless @user.public_email.blank? + .profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline.mt-1.mt-sm-0 + = link_to @user.public_email, "mailto:#{@user.public_email}", class: 'text-link' - if @user.bio.present? .cover-desc.cgray - %p.profile-user-bio + %p.profile-user-bio.font-italic = @user.bio - unless profile_tabs.empty? -- cgit v1.2.3