diff options
| -rw-r--r-- | extensions/Review/web/js/badge.js | 18 | ||||
| -rw-r--r-- | skins/standard/global.css | 14 | ||||
| -rw-r--r-- | template/en/default/request/queue.json.tmpl | 4 |
3 files changed, 26 insertions, 10 deletions
diff --git a/extensions/Review/web/js/badge.js b/extensions/Review/web/js/badge.js index cff22dc40..d22ca4e57 100644 --- a/extensions/Review/web/js/badge.js +++ b/extensions/Review/web/js/badge.js @@ -82,14 +82,16 @@ Bugzilla.Review.Badge = class Badge { ? `attachment.cgi?id=${req.attach_id}&action=edit` : `show_bug.cgi?id=${req.bug_id}`; $li.setAttribute('role', 'none'); - $li.innerHTML = `<a href="${link}" role="menuitem" tabindex="-1" data-type="${req.type}"> - <img src="https://secure.gravatar.com/avatar/${md5(email)}?d=mm&size=64" alt=""> - <label><strong>${pretty_name.htmlEncode()}</strong> asked for your - ${(req.type === 'needinfo' ? 'info' : req.type)} ${(req.attach_id ? 'on' : '')} - ${(req.attach_id && req.ispatch ? (req.dup_count > 1 ? `${req.dup_count} patches` : 'a patch') : '')} - ${(req.attach_id && !req.ispatch ? (req.dup_count > 1 ? `${req.dup_count} files` : 'a file') : '')} - in <strong>Bug ${req.bug_id} – ${req.bug_summary.htmlEncode()}</strong>.</label> - <time datetime="${req.created}">${timeAgo(new Date(req.created))}</time></a>`; + $li.innerHTML = `<a href="${link}" role="menuitem" tabindex="-1" ` + + `class="${(req.restricted ? 'secure' : '')}" data-type="${req.type}">` + + `<img src="https://secure.gravatar.com/avatar/${md5(email)}?d=mm&size=64" alt="">` + + `<label><strong>${pretty_name.htmlEncode()}</strong> asked for your ` + + (req.type === 'needinfo' ? 'info' : req.type) + (req.attach_id ? ' on ' : '') + + (req.attach_id && req.ispatch ? (req.dup_count > 1 ? `${req.dup_count} patches` : 'a patch') : '') + + (req.attach_id && !req.ispatch ? (req.dup_count > 1 ? `${req.dup_count} files` : 'a file') : '') + + ' in ' + (req.restricted ? '<span class="icon" aria-label="secure"></span> ' : '') + + `<strong>Bug ${req.bug_id} – ${req.bug_summary.htmlEncode()}</strong>.</label>` + + `<time datetime="${req.created}">${timeAgo(new Date(req.created))}</time></a>`; $fragment.appendChild($li); }); diff --git a/skins/standard/global.css b/skins/standard/global.css index 48e4754ab..1677d3271 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -353,6 +353,10 @@ pointer-events: none; } + #header .dropdown-panel .notifications a { + overflow: hidden; + } + #header .dropdown-panel .notifications img { float: left; border-radius: 50%; @@ -379,6 +383,16 @@ color: #999; } + #header .dropdown-panel .notifications .secure .icon { + display: inline; + font-size: 16px; + vertical-align: text-bottom; + } + + #header .dropdown-panel .notifications .secure .icon::before { + content: '\E88D'; + } + #header .dropdown-panel .loading, #header .dropdown-panel .empty { display: flex; diff --git a/template/en/default/request/queue.json.tmpl b/template/en/default/request/queue.json.tmpl index ec0f0ef66..7f86072b4 100644 --- a/template/en/default/request/queue.json.tmpl +++ b/template/en/default/request/queue.json.tmpl @@ -8,7 +8,7 @@ [% RAWPERL %] my @display_columns = ( "requester", "requestee", "type", "status", "bug_id", "bug_summary", - "attach_id", "attach_summary", "ispatch", "created", "category" + "attach_id", "attach_summary", "ispatch", "created", "category", "restricted" ); my $requests = $stash->get('requests'); my $time_filter = $context->filter('time', [ '%Y-%m-%dT%H:%M:%SZ', 'UTC' ]); @@ -28,7 +28,7 @@ foreach my $request (@$requests) { elsif ( $column =~ /_id$/ ) { $val = $request->{$column} ? 0 + $request->{$column} : undef; } - elsif ( $column =~ /^is/ ) { + elsif ( $column =~ /^is/ or $column eq 'restricted' ) { $val = $request->{$column} ? \1 : \0; } else { |