1 files changed, 18 insertions, 30 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 33530ddd797..56ad25b00c2 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -70,22 +70,22 @@
         = @user.location
 
   %ul.nav-links.center
-    %li.active
-      = link_to "#activity", 'data-toggle' => 'tab' do
+    %li.activity-tab.active
+      = link_to user_calendar_activities_path, data: {target: 'div#activity', action: 'activity', toggle: 'tab'} do
         Activity
-    %li
-      = link_to "#groups", 'data-toggle' => 'tab' do
+    %li.groups-tab
+      = link_to user_groups_path, data: {target: 'div#groups', action: 'groups', toggle: 'tab'} do
         Groups
-    %li
-      = link_to "#contributed", 'data-toggle' => 'tab' do
+    %li.contributed-tab
+      = link_to user_contributed_projects_path, data: {target: 'div#contributed', action: 'contributed', toggle: 'tab'} do
         Contributed projects
-    %li
-      = link_to "#personal", 'data-toggle' => 'tab' do
+    %li.personal-tab
+      = link_to user_projects_path, data: {target: 'div#personal', action: 'personal', toggle: 'tab'} do
         Personal projects
 
 %div{ class: container_class }
   .tab-content
-    .tab-pane.active#activity
+    #activity.tab-pane.active
       .gray-content-block.white.second-block
         %div{ class: container_class }
           .user-calendar
@@ -93,32 +93,20 @@
               %i.fa.fa-spinner.fa-spin
         .user-calendar-activities
 
-
       .content_list
       = spinner
 
-    .tab-pane#groups
-      %ul.content-list.user-groups
-        %h4.center.light
-          %i.fa.fa-spinner.fa-spin
+    #groups.tab-pane
+      - # This tab is always loaded via AJAX
+
+    #contributed.tab-pane
+      - # This tab is always loaded via AJAX
 
-    .tab-pane#contributed
-      .contributed-projects
-        %h4.center.light
-          %i.fa.fa-spinner.fa-spin
+    #personal.tab-pane
+      - # This tab is always loaded via AJAX
 
-    .tab-pane#personal
-      .personal-projects
-        %h4.center.light
-          %i.fa.fa-spinner.fa-spin
+  .loading-status
+    = spinner
 
 :javascript
-  $('.nav-links').stickyTabs();
   $(".user-calendar").load("#{user_calendar_path}");
-  $(".user-groups").load("#{user_groups_path}");
-  $(".contributed-projects").load("#{user_contributed_projects_path}");
-  $(".personal-projects").load("#{user_projects_path}");
-
-  $("body").on("ajax:success", function(e, data, status, xhr) {
-    $(".personal-projects").html(xhr.responseText)
-  });