diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2016-08-05 07:28:39 +0200 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2016-08-05 07:28:39 +0200 |
| commit | 895c3c55dc960e226b8d5415a4533e5faf696a0a (patch) | |
| tree | 1fa8fad70b01f0df01d335ad18adfbcd6d6b8232 | |
| parent | 671d247eaad5536962201a942b9af6b26e02299d (diff) | |
| download | gitlab-ce-895c3c55dc960e226b8d5415a4533e5faf696a0a.tar.gz | |
Better presentation of member expiration.
| -rw-r--r-- | app/helpers/members_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index ec106418f2d..183d3b77a3f 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -42,4 +42,8 @@ module MembersHelper "Are you sure you want to leave the " \ "\"#{member_source.human_name}\" #{member_source.class.to_s.humanize(capitalize: false)}?" end + + def member_expires_soon?(member) + member.expires_at < 7.days.from_now + end end diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 88e9522b9cc..74af31f3252 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -60,8 +60,9 @@ - else Joined #{time_ago_with_tooltip(member.created_at)} - if member.expires? - %span.prepend-left-20 - Access expires #{member.expires_at.to_s(:medium)} + ยท + %span{ class: ("text-warning" if member_expires_soon?(member)) } + Expires in #{distance_of_time_in_words_to_now(member.expires_at)} - else = image_tag avatar_icon(member.invite_email, 40), class: "avatar s40", alt: '' |