Resolve "Add new "Overview" tab on user profile page"

2 files changed, 55 insertions, 15 deletions

diff --git a/app/views/users/_overview.html.haml b/app/views/users/_overview.html.haml
new file mode 100644
index 00000000000..f8b3754840d
--- /dev/null
+++ b/app/views/users/_overview.html.haml
@@ -0,0 +1,32 @@
+.row
+  .col-md-12.col-lg-6
+    .calendar-block
+      .content-block.hide-bottom-border
+        %h4
+          = s_('UserProfile|Activity')
+        .user-calendar.d-none.d-sm-block.text-left{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path, utc_offset: Time.zone.utc_offset } }
+          %h4.center.light
+            %i.fa.fa-spinner.fa-spin
+        .user-calendar-activities.d-none.d-sm-block
+
+    - if can?(current_user, :read_cross_project)
+      .activities-block
+        .content-block
+          %h5.prepend-top-10
+            = s_('UserProfile|Recent contributions')
+          .overview-content-list{ data: { href: user_path } }
+            .center.light.loading
+              %i.fa.fa-spinner.fa-spin
+        .prepend-top-10
+          = link_to s_('UserProfile|View all'), user_activity_path, class: "hide js-view-all"
+
+  .col-md-12.col-lg-6
+    .projects-block
+      .content-block
+        %h4
+          = s_('UserProfile|Personal projects')
+        .overview-content-list{ data: { href: user_projects_path } }
+          .center.light.loading
+            %i.fa.fa-spinner.fa-spin
+      .prepend-top-10
+        = link_to s_('UserProfile|View all'), user_projects_path, class: "hide js-view-all"
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 7a38d290915..d6c8420b744 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -12,22 +12,22 @@
   .cover-block.user-cover-block.top-area
     .cover-controls
       - if @user == current_user
-        = link_to profile_path, class: 'btn btn-default has-tooltip', title: 'Edit profile', 'aria-label': 'Edit profile' do
+        = link_to profile_path, class: '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: 'Already reported for abuse',
+          %button.btn.btn-danger{ 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',
-            title: 'Report abuse', data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
+            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: 'Subscribe', 'aria-label': 'Subscribe' do
+        = link_to user_path(@user, rss_url_options), class: '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: 'View user in admin area',
+        = link_to [:admin, @user], class: 'btn btn-default', title: s_('UserProfile|View user in admin area'),
           data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
           = icon('users')
 
@@ -51,7 +51,7 @@
               @#{@user.username}
             - if can?(current_user, :read_user_profile, @user)
               %span.middle-dot-divider
-                Member since #{@user.created_at.to_date.to_s(:long)}
+                = s_('Member since %{date}') % { date: @user.created_at.to_date.to_s(:long) }
 
         .cover-desc
           - unless @user.public_email.blank?
@@ -91,32 +91,40 @@
         .fade-left= icon('angle-left')
         .fade-right= icon('angle-right')
         %ul.nav-links.user-profile-nav.scrolling-tabs.nav.nav-tabs
+          - if profile_tab?(:overview)
+            %li.js-overview-tab
+              = link_to user_path, data: { target: 'div#js-overview', action: 'overview', toggle: 'tab' } do
+                = s_('UserProfile|Overview')
           - if profile_tab?(:activity)
             %li.js-activity-tab
-              = link_to user_path, data: { target: 'div#activity', action: 'activity', toggle: 'tab' } do
-                Activity
+              = link_to user_activity_path, data: { target: 'div#activity', action: 'activity', toggle: 'tab' } do
+                = s_('UserProfile|Activity')
           - if profile_tab?(:groups)
             %li.js-groups-tab
               = link_to user_groups_path, data: { target: 'div#groups', action: 'groups', toggle: 'tab', endpoint: user_groups_path(format: :json) } do
-                Groups
+                = s_('UserProfile|Groups')
           - if profile_tab?(:contributed)
             %li.js-contributed-tab
               = link_to user_contributed_projects_path, data: { target: 'div#contributed', action: 'contributed', toggle: 'tab', endpoint: user_contributed_projects_path(format: :json) } do
-                Contributed projects
+                = s_('UserProfile|Contributed projects')
           - if profile_tab?(:projects)
             %li.js-projects-tab
               = link_to user_projects_path, data: { target: 'div#projects', action: 'projects', toggle: 'tab', endpoint: user_projects_path(format: :json) } do
-                Personal projects
+                = s_('UserProfile|Personal projects')
           - if profile_tab?(:snippets)
             %li.js-snippets-tab
               = link_to user_snippets_path, data: { target: 'div#snippets', action: 'snippets', toggle: 'tab', endpoint: user_snippets_path(format: :json) } do
-                Snippets
+                = s_('UserProfile|Snippets')
 
   %div{ class: container_class }
     .tab-content
+      - if profile_tab?(:overview)
+        #js-overview.tab-pane
+          = render "users/overview"
+
       - if profile_tab?(:activity)
         #activity.tab-pane
-          .row-content-block.calender-block.white.second-block.d-none.d-sm-block
+          .row-content-block.calendar-block.white.second-block.d-none.d-sm-block
             .user-calendar{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path, utc_offset: Time.zone.utc_offset } }
               %h4.center.light
                 %i.fa.fa-spinner.fa-spin
@@ -124,7 +132,7 @@
 
           - if can?(current_user, :read_cross_project)
             %h4.prepend-top-20
-              Most Recent Activity
+              = s_('UserProfile|Most Recent Activity')
             .content_list{ data: { href: user_path } }
             = spinner
 
@@ -155,4 +163,4 @@
       .col-12.text-center
         .text-content
           %h4
-            This user has a private profile
+            = s_('UserProfile|This user has a private profile')