diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index 408a8051fe2..3ba280e583a 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -1748,4 +1748,4 @@ div.busyOverlay { .g-icon__dot-circle:before { border: 0.25em solid currentColor; border-radius: 100px; -} +} \ No newline at end of file diff --git a/app/assets/v2/css/dashboard.css b/app/assets/v2/css/dashboard.css index c04ab81c0e2..b7b3db5d685 100644 --- a/app/assets/v2/css/dashboard.css +++ b/app/assets/v2/css/dashboard.css @@ -269,3 +269,9 @@ body { .btn-expand-token:focus { color: #007bff; } + +.expired-icon { + font-size: 15px; + padding-right: 0.5em; + vertical-align: text-bottom; +} \ No newline at end of file diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js index 5eaa84b9f75..8e0466401ac 100644 --- a/app/assets/v2/js/shared.js +++ b/app/assets/v2/js/shared.js @@ -1139,6 +1139,7 @@ function renderBountyRowsFromResults(results, renderForExplorer) { result['action'] = result['url']; result['title'] = result['title'] ? result['title'] : result['github_url']; result['p'] = projectType + (result['experience_level'] ? (result['experience_level'] + ' ') : ''); + result['expired'] = ''; if (result['status'] === 'done') { result['p'] += 'Done'; @@ -1163,19 +1164,21 @@ function renderBountyRowsFromResults(results, renderForExplorer) { } else if (isExpired) { const timeAgo = timeDifference(dateNow, dateExpires, true); - result['p'] += ('Expired ' + timeAgo + ' ago'); + result['expired'] += ('Expired ' + timeAgo + ' ago'); } else { const openedWhen = timeDifference(dateNow, new Date(result['web3_created']), true); if (isInfinite) { - const expiredExpires = 'Never expires'; + const expiredExpires = 'Never expires'; - result['p'] += ('Opened ' + openedWhen + ' ago, ' + expiredExpires); + result['p'] += ('Opened ' + openedWhen + ' ago'); + result['expired'] += (expiredExpires); } else { const timeLeft = timeDifference(dateNow, dateExpires); const expiredExpires = dateNow < dateExpires ? 'Expires' : 'Expired'; - result['p'] += ('Opened ' + openedWhen + ' ago, ' + expiredExpires + ' ' + timeLeft + ''); + result['p'] += ('Opened ' + openedWhen + ' ago'); + result['expired'] += (expiredExpires + ' ' + timeLeft); } } diff --git a/app/dashboard/templates/shared/bounty-popover.html b/app/dashboard/templates/shared/bounty-popover.html index e4a022b3219..0d0a76ee7eb 100644 --- a/app/dashboard/templates/shared/bounty-popover.html +++ b/app/dashboard/templates/shared/bounty-popover.html @@ -44,6 +44,9 @@ [[/for]] [[/if]] +
+ [[if expired !== ""]][[/if]][[:expired]] +
[[if activities.length]]