aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2017-08-08 09:29:46 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2017-08-08 09:29:46 +0100
commitc2483a8b99ceb9e5b32df064f05293c7c5738a63 (patch)
tree0c43701bbf047758a8546e0a66bd8ee4cf4ee25a
parentb8c233fab49af1ab1cdfdda64e83fddac993cb94 (diff)
parent2a1b7aeeb1d8bfcde2429d38a65417f9939ea06c (diff)
Merge branch 'issues/forcouncils/208-shortlisted-tooltip'
-rw-r--r--CHANGELOG.md2
-rw-r--r--templates/web/base/report/_item.html4
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 842e7b311..813c6458f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
## Releases
* Unreleased
+ - Admin improvements:
+ - Highlight current shortlisted user in list tooltip.
- Bugfixes:
- Set up action scheduled field when report loaded. #1789
- Stop errors from JS validator due to form in form.
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index dc53e81aa..7a3530b1f 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -11,7 +11,9 @@
[% IF c.user.is_planned_report(problem) ~%]
name="shortlist-remove" title="[% loc('Remove from shortlist') %]" class="item-list__item__shortlist-remove"
[%~ ELSE ~%]
- name="shortlist-add" title="[% loc('Add to shortlist') %]" class="item-list__item__shortlist-[% IF problem.shortlisted_user %]take[% ELSE %]add[% END %]"
+ name="shortlist-add" title="[% IF problem.shortlisted_user %]
+ [%~ tprintf(loc('Shortlisted by %s'), problem.shortlisted_user.name) %]; [% END %]
+ [%~ loc('Add to shortlist') %]" class="item-list__item__shortlist-[% IF problem.shortlisted_user %]take[% ELSE %]add[% END %]"
[%~ END ~%]
>
[%~ END %]