From 4d17d8c23a258aa43218a000bba9c917b9472232 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Thu, 12 Jan 2012 13:54:26 +0800 Subject: Bug 715424: add report showing emails in TheSchwartz's queue --- .../user-error-auth_failure_object.html.tmpl | 2 + .../en/default/hook/reports/menu-end.html.tmpl | 4 ++ .../en/default/pages/email_queue.html.tmpl | 53 ++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 extensions/BMO/template/en/default/pages/email_queue.html.tmpl (limited to 'extensions/BMO/template/en/default') diff --git a/extensions/BMO/template/en/default/hook/global/user-error-auth_failure_object.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error-auth_failure_object.html.tmpl index 067347f3b..0a674aa30 100644 --- a/extensions/BMO/template/en/default/hook/global/user-error-auth_failure_object.html.tmpl +++ b/extensions/BMO/template/en/default/hook/global/user-error-auth_failure_object.html.tmpl @@ -1,3 +1,5 @@ [% IF object == 'group_admins' %] the group administrators report +[% ELSIF object == 'email_queue' %] + the email queue status report [% END %] diff --git a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl index 6e8463020..846f12767 100644 --- a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl +++ b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl @@ -36,6 +36,10 @@ Group Admins - Group Admins Report +
  • + Email Queue - TheSchwartz queue +
  • [% END %] diff --git a/extensions/BMO/template/en/default/pages/email_queue.html.tmpl b/extensions/BMO/template/en/default/pages/email_queue.html.tmpl new file mode 100644 index 000000000..7afd083ac --- /dev/null +++ b/extensions/BMO/template/en/default/pages/email_queue.html.tmpl @@ -0,0 +1,53 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +[% INCLUDE global/header.html.tmpl + title = "Job Queue Status" + style_urls = [ "extensions/BMO/web/styles/reports.css" ] +%] + +[% IF jobs.size %] + +

    [% jobs.size FILTER none %] email(s) in the queue.

    + + + + + + + + + [% FOREACH job IN jobs %] + + + + + + + [% END %] +
    TimeError CountLast ErrorError Message
    [% time2str("%Y-%m-%d %H:%M:%S %Z", job.timestamp) FILTER html %][% job.error_count FILTER html %] + [% IF job.error_count %] + [% time2str("%Y-%m-%d %H:%M:%S %Z", job.error_time) FILTER html %] + [% ELSE %] + - + [% END %] + + [% IF job.error_count %] + [% job.error_message FILTER html %] + [% ELSE %] + - + [% END %] +
    + +[% ELSE %] + +

    The email queue is empty.

    + +[% END %] + +[% INCLUDE global/footer.html.tmpl %] -- cgit v1.2.3-24-g4f1b