diff options
author | Phil Hughes <me@iamphill.com> | 2016-04-28 11:03:14 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-05-16 12:22:17 +0100 |
commit | 93c0bb8041963d6677cc9c169a0e1e22221dd0cb (patch) | |
tree | b9b2d99c9f292ffdd3b2a1d1484090cc81ba8b6e /app/views/users | |
parent | bef5695a81af7a0afbb7ebe30d8ce344afe824f5 (diff) | |
download | gitlab-ce-93c0bb8041963d6677cc9c169a0e1e22221dd0cb.tar.gz |
Fixed issue with selected date not loading correctly
Added loading icon to selected date box
Diffstat (limited to 'app/views/users')
-rw-r--r-- | app/views/users/calendar_activities.html.haml | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml index 027a93a75fc..630d97e339d 100644 --- a/app/views/users/calendar_activities.html.haml +++ b/app/views/users/calendar_activities.html.haml @@ -1,23 +1,27 @@ %h4.prepend-top-20 - %span.light Contributions for + Contributions for %strong #{@calendar_date.to_s(:short)} -%ul.bordered-list - - @events.sort_by(&:created_at).each do |event| - %li - %span.light - %i.fa.fa-clock-o - = event.created_at.to_s(:time) - - if event.push? - #{event.action_name} #{event.ref_type} #{event.ref_name} - - else - = event_action_name(event) - - if event.target - %strong= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target] - - at - %strong - - if event.project - = link_to_project event.project +- if @events.any? + %ul.bordered-list + - @events.sort_by(&:created_at).each do |event| + %li + %span.light + %i.fa.fa-clock-o + = event.created_at.to_s(:time) + - if event.push? + #{event.action_name} #{event.ref_type} #{event.ref_name} - else - = event.project_name + = event_action_name(event) + - if event.target + %strong= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target] + + at + %strong + - if event.project + = link_to_project event.project + - else + = event.project_name +- else + %p + No contributions found for #{@calendar_date.to_s(:short)} |