diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-29 11:53:43 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-29 11:53:43 +0300 |
commit | a9288e554e55e843b95ab6f8109a4c610af64c83 (patch) | |
tree | 4076cf59b8191e318b93b4a74985053d351c7469 /app/views/users | |
parent | 6e1f9e746cb5dc555003b5398c46113ce83fceae (diff) |
Cleanup and make contribution calendar faster
Diffstat (limited to 'app/views/users')
-rw-r--r-- | app/views/users/_calendar.html.haml | 6 | ||||
-rw-r--r-- | app/views/users/_calendar_onclick.html.haml | 25 | ||||
-rw-r--r-- | app/views/users/show.html.haml | 4 |
3 files changed, 5 insertions, 30 deletions
diff --git a/app/views/users/_calendar.html.haml b/app/views/users/_calendar.html.haml index 70d5cca854d..b16a7305a32 100644 --- a/app/views/users/_calendar.html.haml +++ b/app/views/users/_calendar.html.haml @@ -1,9 +1,7 @@ #cal-heatmap.calendar - :javascript + :javascript new calendar( #{@timestamps.to_json}, #{@starting_year}, - #{@starting_month}, - '#{user_activities_path}' + #{@starting_month} ); -= render "calendar_onclick" diff --git a/app/views/users/_calendar_onclick.html.haml b/app/views/users/_calendar_onclick.html.haml deleted file mode 100644 index 1514b56bb23..00000000000 --- a/app/views/users/_calendar_onclick.html.haml +++ /dev/null @@ -1,25 +0,0 @@ -#calendar_commit_activity.calendar_commit_activity - %h4.activity_title Commit Activity: - - #loading_commits - %section.text-center - %h3 - %i.icon-spinner.icon-spin - - #calendar_onclick_placeholder.calendar_onclick_placeholder - %span.calendar_onclick_second.calendar_onclick_second - - if @timestamps.empty? - %span.calendar_activity_summary - %strong> #{@user.username} - has no activity - - else - %span.calendar_activity_summary - %strong> #{@user.username} - 's last commit was on - %span.commit_date #{@last_commit_date} - - %hr.calendar_onclick_hr - -:javascript - $("#loading_commits").hide(); - diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 0d214d31607..c248a280475 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -18,8 +18,10 @@ %h4 Groups: = render 'groups', groups: @groups %hr + %h4 Calendar: - = render 'calendar' + %div= render 'calendar' + %hr %h4 User Activity: |