From 01e3e73823886636357220f423af08e87af2eba6 Mon Sep 17 00:00:00 2001
From: Dave Lawrence
Date: Wed, 8 Feb 2012 15:19:05 -0500
Subject: Bug 533012 - add the ability to see all the administrative actions
performed by a user r=glob
---
template/en/default/account/profile-activity.html.tmpl | 2 +-
template/en/default/admin/users/edit.html.tmpl | 12 +++++++++---
template/en/default/admin/users/list.html.tmpl | 11 +++++++++++
template/en/default/global/user-error.html.tmpl | 2 ++
4 files changed, 23 insertions(+), 4 deletions(-)
(limited to 'template/en')
diff --git a/template/en/default/account/profile-activity.html.tmpl b/template/en/default/account/profile-activity.html.tmpl
index ee00875fe..aa6a63e85 100644
--- a/template/en/default/account/profile-activity.html.tmpl
+++ b/template/en/default/account/profile-activity.html.tmpl
@@ -35,7 +35,7 @@
#%]
[% title = BLOCK %]
- Account History for '[% otheruser.login FILTER html %]'
+ [% IF action == 'admin_activity' %]Admin[% ELSE %]Account[% END %] History for '[% otheruser.login FILTER html %]'
[% END %]
diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl
index 3efa4b8bf..010cacb73 100644
--- a/template/en/default/admin/users/edit.html.tmpl
+++ b/template/en/default/admin/users/edit.html.tmpl
@@ -116,9 +116,15 @@
[% INCLUDE listselectionhiddenfields %]
- or View Account History
+ [% IF editusers %], [% ELSE %] or [% END %]
+ View Account History
+ [% IF editusers %]
+ or View Admin History
+ [% END %]