diff options
Diffstat (limited to 'app/views/users')
-rw-r--r-- | app/views/users/_deletion_guidance.html.haml | 2 | ||||
-rw-r--r-- | app/views/users/calendar_activities.html.haml | 6 | ||||
-rw-r--r-- | app/views/users/show.html.haml | 34 | ||||
-rw-r--r-- | app/views/users/terms/index.html.haml | 2 |
4 files changed, 20 insertions, 24 deletions
diff --git a/app/views/users/_deletion_guidance.html.haml b/app/views/users/_deletion_guidance.html.haml index 0024801dbf6..507fe126acb 100644 --- a/app/views/users/_deletion_guidance.html.haml +++ b/app/views/users/_deletion_guidance.html.haml @@ -6,6 +6,6 @@ - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path("user/profile/account/delete_account", anchor: "associated-records") } = _('Certain user content will be moved to a system-wide "Ghost User" in order to maintain content for posterity. For further information, please refer to the %{link_start}user account deletion documentation.%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } - personal_projects_count = user.personal_projects.count - - unless personal_projects_count.zero? + - unless personal_projects_count == 0 %li = n_('%d personal project will be removed and cannot be restored.', '%d personal projects will be removed and cannot be restored.', personal_projects_count) % personal_projects_count diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml index a5197a9950b..2f44a57c388 100644 --- a/app/views/users/calendar_activities.html.haml +++ b/app/views/users/calendar_activities.html.haml @@ -1,12 +1,12 @@ %h4.prepend-top-20 - = _("Contributions for <strong>%{calendar_date}</strong>").html_safe % { calendar_date: @calendar_date.to_s(:medium) } + = html_escape(_("Contributions for %{calendar_date}")) % { calendar_date: tag.strong(@calendar_date.to_s(:medium)) } - if @events.any? %ul.bordered-list - @events.sort_by(&:created_at).each do |event| %li %span.light - %i.fa.fa-clock-o + = sprite_icon('clock', css_class: 'gl-vertical-align-text-bottom') = event.created_at.to_time.in_time_zone.strftime('%-I:%M%P') - if event.visible_to_user?(current_user) - if event.push_action? @@ -20,7 +20,7 @@ - if event.note? = link_to event.note_target.to_reference, event_note_target_url(event), class: 'has-tooltip', title: event.target_title - elsif event.target - = link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip', title: event.target_title + = link_to event.target.to_reference, [event.project, event.target], class: 'has-tooltip', title: event.target_title = s_('UserProfile|at') %strong diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index d2f7ff91f0d..e1d1df9de1a 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -14,7 +14,7 @@ = render layout: 'users/cover_controls' do - if @user == current_user = link_to profile_path, class: link_classes + 'btn btn-default has-tooltip', title: s_('UserProfile|Edit profile'), 'aria-label': 'Edit profile' do - = icon('pencil') + = sprite_icon('pencil') - elsif current_user - if @user.abuse_report %button{ class: link_classes + 'btn btn-danger mr-1', title: s_('UserProfile|Already reported for abuse'), @@ -25,8 +25,8 @@ 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: link_classes + 'btn btn-default has-tooltip', title: s_('UserProfile|Subscribe'), 'aria-label': 'Subscribe' do - = icon('rss') + = link_to user_path(@user, rss_url_options), class: link_classes + 'btn btn-svg btn-default has-tooltip', title: s_('UserProfile|Subscribe'), 'aria-label': 'Subscribe' do + = sprite_icon('rss', css_class: 'qa-rss-icon') - if current_user && current_user.admin? = 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 @@ -55,12 +55,12 @@ .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') + = sprite_icon('location', 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') + = sprite_icon('work', css_class: 'vertical-align-middle fgray') %span.vertical-align-middle = work_information(@user) .cover-desc.cgray.mb-1.mb-sm-2 @@ -84,7 +84,7 @@ = link_to @user.public_email, "mailto:#{@user.public_email}", class: 'text-link' - if @user.bio.present? .cover-desc.cgray - %p.profile-user-bio + .profile-user-bio = markdown(@user.bio_html) @@ -160,16 +160,12 @@ .loading.hide .spinner.spinner-md - - if profile_tabs.empty? - .row - .col-12 - .svg-content - = image_tag 'illustrations/profile_private_mode.svg' - .col-12.text-center - .text-content - %h4 - - if @user.blocked? - = s_('UserProfile|This user is blocked') - - else - = s_('UserProfile|This user has a private profile') - + - if profile_tabs.empty? + .svg-content + = image_tag 'illustrations/profile_private_mode.svg' + .text-content.text-center + %h4 + - if @user.blocked? + = s_('UserProfile|This user is blocked') + - else + = s_('UserProfile|This user has a private profile') diff --git a/app/views/users/terms/index.html.haml b/app/views/users/terms/index.html.haml index bc4861d6ae8..175fde1c862 100644 --- a/app/views/users/terms/index.html.haml +++ b/app/views/users/terms/index.html.haml @@ -9,7 +9,7 @@ = button_to accept_term_path(@term, redirect_params), class: 'btn btn-success gl-ml-3', data: { qa_selector: 'accept_terms_button' } do = _('Accept terms') - else - .pull-right + .float-right = link_to root_path, class: 'btn btn-success gl-ml-3' do = _('Continue') - if can?(current_user, :decline_terms, @term) |