diff options
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/_overview.html.haml | 4 | ||||
| -rw-r--r-- | app/views/users/calendar_activities.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/users/terms/index.html.haml | 27 |
4 files changed, 9 insertions, 27 deletions
diff --git a/app/views/users/_overview.html.haml b/app/views/users/_overview.html.haml index 0d904de9372..7e745efd069 100644 --- a/app/views/users/_overview.html.haml +++ b/app/views/users/_overview.html.haml @@ -2,14 +2,14 @@ .row.d-none.d-sm-flex .col-12.calendar-block.gl-my-3 - .user-calendar.light{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path, utc_offset: local_time_instance(@user.timezone).now.utc_offset } } + .user-calendar.light{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path, utc_offset: local_timezone_instance(@user.timezone).now.utc_offset } } .gl-spinner.gl-spinner-md.gl-my-8 .user-calendar-error.invisible = _('There was an error loading users activity calendar.') %a.js-retry-load{ href: '#' } = s_('UserProfile|Retry') .user-calendar-activities -- if @user.user_readme +- if @user.user_readme&.rich_viewer .row.justify-content-center .col-12.col-md-10.col-lg-8.gl-my-6 .gl-display-flex diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml index cffeb55597f..8da1aa09215 100644 --- a/app/views/users/calendar_activities.html.haml +++ b/app/views/users/calendar_activities.html.haml @@ -7,7 +7,7 @@ %li %span.light.js-localtime{ :data => { :datetime => event.created_at.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), :toggle => 'tooltip', :placement => 'top' } } = sprite_icon('clock', css_class: 'gl-vertical-align-text-bottom') - = event.created_at.to_time.in_time_zone(@user.timezone).strftime('%-I:%M%P') + = event.created_at.to_time.in_time_zone(local_timezone_instance(@user.timezone)).strftime('%-I:%M%P') - if event.visible_to_user?(current_user) - if event.push_action? #{event.action_name} #{event.ref_type} diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 522f0f771cd..ca276519758 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -2,8 +2,7 @@ - @hide_breadcrumbs = true - @no_container = true - page_title user_display_name(@user) -- page_description @user.bio -- header_title @user.name, user_path(@user) +- page_description @user.bio unless @user.blocked? || !@user.confirmed? - page_itemtype 'http://schema.org/Person' - link_classes = "flex-grow-1 mx-1 " diff --git a/app/views/users/terms/index.html.haml b/app/views/users/terms/index.html.haml index 92095e78f69..c461250fc9b 100644 --- a/app/views/users/terms/index.html.haml +++ b/app/views/users/terms/index.html.haml @@ -1,23 +1,6 @@ -- redirect_params = { redirect: @redirect } if @redirect -- accept_term_link = accept_term_path(@term, redirect_params) +- content_for :page_specific_javascripts do + = render "layouts/google_tag_manager_head" + = render "layouts/one_trust" += render "layouts/google_tag_manager_body" -- if Feature.enabled?(:terms_of_service_vue, current_user, default_enabled: :yaml) - #js-terms-of-service{ data: { terms_data: terms_data(@term, @redirect) } } -- else - .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_link, class: 'gl-button btn btn-confirm gl-ml-3', data: { qa_selector: 'accept_terms_button' } do - = _('Accept terms') - - else - .float-right - = link_to root_path, class: 'gl-button btn btn-confirm gl-ml-3' do - = _('Continue') - - if can?(current_user, :decline_terms, @term) - .float-right - = button_to decline_term_path(@term, redirect_params), class: 'gl-button btn btn-default gl-ml-3' do - = _('Decline and sign out') +#js-terms-of-service{ data: { terms_data: terms_data(@term, @redirect) } } |