diff options
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/_middle_dot_divider.html.haml | 5 | ||||
| -rw-r--r-- | app/views/users/_profile_basic_info.html.haml | 6 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 53 | ||||
| -rw-r--r-- | app/views/users/terms/index.html.haml | 4 |
4 files changed, 41 insertions, 27 deletions
diff --git a/app/views/users/_middle_dot_divider.html.haml b/app/views/users/_middle_dot_divider.html.haml new file mode 100644 index 00000000000..540a200921f --- /dev/null +++ b/app/views/users/_middle_dot_divider.html.haml @@ -0,0 +1,5 @@ +- stacking = local_assigns.delete(:stacking) +- breakpoint = local_assigns.delete(:breakpoint) + +%div{ class: middle_dot_divider_classes(stacking, breakpoint), **local_assigns } + = yield diff --git a/app/views/users/_profile_basic_info.html.haml b/app/views/users/_profile_basic_info.html.haml index c431a72d0e7..3b0186e84e1 100644 --- a/app/views/users/_profile_basic_info.html.haml +++ b/app/views/users/_profile_basic_info.html.haml @@ -1,6 +1,6 @@ -%p.mb-1.mb-sm-2.mt-2.mt-sm-3 - %span.middle-dot-divider +.gl-text-gray-900.gl-mt-4 + = render 'middle_dot_divider' do @#{@user.username} - if can?(current_user, :read_user_profile, @user) - %span.middle-dot-divider + = render 'middle_dot_divider' do = s_('Member since %{date}') % { date: @user.created_at.to_date.to_s(:long) } diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 363909c54e2..20cbe08225e 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -2,7 +2,7 @@ - @hide_breadcrumbs = true - @no_container = true - page_title user_display_name(@user) -- page_description @user.bio_html +- page_description @user.bio - header_title @user.name, user_path(@user) - page_itemtype 'http://schema.org/Person' - link_classes = "flex-grow-1 mx-1 " @@ -26,6 +26,13 @@ = link_to new_abuse_report_path(user_id: @user.id, ref_url: request.referer), class: link_classes + 'btn gl-button btn-default btn-icon', title: s_('UserProfile|Report abuse'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do = sprite_icon('error') + - verified_gpg_keys = @user.gpg_keys.select(&:verified?) + - if verified_gpg_keys.any? + = link_to user_gpg_keys_path, + class: link_classes + 'btn btn-default btn-md gl-button btn-icon has-tooltip', + title: n_('View public GPG key', 'View public GPG keys', verified_gpg_keys.length), + data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do + = sprite_icon('key', css_class: 'gl-button-icon gl-icon') - if can?(current_user, :read_user_profile, @user) = link_to user_path(@user, rss_url_options), class: link_classes + 'btn gl-button btn-default btn-icon has-tooltip', title: s_('UserProfile|Subscribe'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do @@ -71,56 +78,56 @@ = emoji_icon(@user.status.emoji, class: 'gl-mr-2') = markdown_field(@user.status, :message) = render "users/profile_basic_info" - .cover-desc.cgray.mb-1.mb-sm-2 + .gl-text-gray-900.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{ itemprop: 'address', itemscope: true, itemtype: 'https://schema.org/PostalAddress' } + = render 'middle_dot_divider', stacking: true, itemprop: 'address', itemscope: true, itemtype: 'https://schema.org/PostalAddress' do = sprite_icon('location', css_class: 'fgray') %span{ itemprop: 'addressLocality' } = @user.location - .profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline.mb-1.mb-sm-0 + = render 'middle_dot_divider', stacking: true do = sprite_icon('clock', css_class: 'fgray') %span = local_time(@user.timezone) - unless work_information(@user).blank? - .profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline + = render 'middle_dot_divider', stacking: true do = sprite_icon('work', css_class: 'fgray') %span = work_information(@user, with_schema_markup: true) - .cover-desc.cgray.mb-1.mb-sm-2 + .gl-text-gray-900 - unless @user.skype.blank? - .profile-link-holder.middle-dot-divider - = link_to "skype:#{@user.skype}", title: "Skype" do + = render 'middle_dot_divider' do + = link_to "skype:#{@user.skype}", class: 'gl-hover-text-decoration-none', title: "Skype" do = sprite_icon('skype') - unless @user.linkedin.blank? - .profile-link-holder.middle-dot-divider - = link_to linkedin_url(@user), title: "LinkedIn", target: '_blank', rel: 'noopener noreferrer nofollow' do + = render 'middle_dot_divider' do + = link_to linkedin_url(@user), class: 'gl-hover-text-decoration-none', title: "LinkedIn", target: '_blank', rel: 'noopener noreferrer nofollow' do = sprite_icon('linkedin') - unless @user.twitter.blank? - .profile-link-holder.middle-dot-divider-sm - = link_to twitter_url(@user), title: "Twitter", target: '_blank', rel: 'noopener noreferrer nofollow' do + = render 'middle_dot_divider', breakpoint: 'sm' do + = link_to twitter_url(@user), class: 'gl-hover-text-decoration-none', title: "Twitter", target: '_blank', rel: 'noopener noreferrer nofollow' do = sprite_icon('twitter') - unless @user.website_url.blank? - .profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline.mt-1.mt-sm-0 + = render 'middle_dot_divider', stacking: true do - if Feature.enabled?(:security_auto_fix) && @user.bot? = sprite_icon('question', css_class: 'gl-text-blue-600') - = link_to @user.short_website_url, @user.full_website_url, class: 'text-link', target: '_blank', rel: 'me noopener noreferrer nofollow', itemprop: 'url' + = link_to @user.short_website_url, @user.full_website_url, target: '_blank', rel: 'me noopener noreferrer nofollow', itemprop: 'url' - 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', itemprop: 'email' - .cover-desc.gl-text-gray-900.gl-mb-2.mb-sm-2 + = render 'middle_dot_divider', stacking: true do + = link_to @user.public_email, "mailto:#{@user.public_email}", itemprop: 'email' + .gl-text-gray-900 = sprite_icon('users', css_class: 'gl-vertical-align-middle gl-text-gray-500') - .profile-link-holder.middle-dot-divider - = link_to user_followers_path, class: 'text-link' do + = render 'middle_dot_divider' do + = link_to user_followers_path do - count = @user.followers.count = n_('1 follower', '%{count} followers', count) % { count: count } - .profile-link-holder.middle-dot-divider - = link_to user_following_path, class: 'text-link', data: { qa_selector: 'following_link' } do + = render 'middle_dot_divider' do + = link_to user_following_path, data: { qa_selector: 'following_link' } do = @user.followees.count = _('following') - if @user.bio.present? - .cover-desc.cgray + .gl-text-gray-900 .profile-user-bio - = markdown(@user.bio_html) + = @user.bio - unless profile_tabs.empty? diff --git a/app/views/users/terms/index.html.haml b/app/views/users/terms/index.html.haml index 73d0f51f9ac..771ee693120 100644 --- a/app/views/users/terms/index.html.haml +++ b/app/views/users/terms/index.html.haml @@ -1,12 +1,14 @@ - redirect_params = { redirect: @redirect } if @redirect +- accept_term_link = accept_term_path(@term, redirect_params) .card-body.rendered-terms{ data: { qa_selector: 'terms_content' } } = markdown_field(@term, :terms) - if current_user + = render_if_exists 'devise/shared/form_phone_verification', accept_term_link: accept_term_link, inline: true .card-footer.footer-block.clearfix - if can?(current_user, :accept_terms, @term) .float-right - = button_to accept_term_path(@term, redirect_params), class: 'gl-button btn btn-confirm gl-ml-3', data: { qa_selector: 'accept_terms_button' } do + = button_to accept_term_link, class: 'gl-button btn btn-confirm gl-ml-3', data: { qa_selector: 'accept_terms_button' } do = _('Accept terms') - else .float-right |