Bug 770855 - Permission error pages should instruct users how to get permissions

r=glob

4 files changed, 81 insertions, 0 deletions

diff --git a/extensions/BMO/template/en/default/hook/bug/comments-end.html.tmpl b/extensions/BMO/template/en/default/hook/bug/comments-end.html.tmpl
new file mode 100644
index 000000000..3bf18a515
--- /dev/null
+++ b/extensions/BMO/template/en/default/hook/bug/comments-end.html.tmpl
@@ -0,0 +1,20 @@
+[%# 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.
+  #%]
+
+[% IF user.id && comment.author.login_name == 'tbplbot@gmail.com' %]
+  [% has_tbpl_comment = 1 %]
+  <script>
+    var id = [% count FILTER none %];
+    tbpl_comment_ids.push(id);
+    YAHOO.util.Dom.addClass(comment, 'collapsed');
+    collapse_comment(
+      document.getElementById('comment_link_' + id),
+      document.getElementById('comment_text_' + id)
+    );
+  </script>
+[% END %]
diff --git a/extensions/BMO/template/en/default/hook/global/user-error-error_message.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error-error_message.html.tmpl
new file mode 100644
index 000000000..51f8e3d7d
--- /dev/null
+++ b/extensions/BMO/template/en/default/hook/global/user-error-error_message.html.tmpl
@@ -0,0 +1,15 @@
+[%# 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.
+  #%]
+
+[% IF error == 'illegal_change' || error == 'illegal_change_deps' %]
+  <p>
+    If you are attempting to confirm an unconfirmed [% terms.bug %] or edit the fields of a [% terms.bug %],
+    <a href="[% urlbase FILTER none %]page.cgi=get_permissions.html">find
+    out how to get the necessary permissions</a>.
+  </p>
+[% END %]
diff --git a/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl b/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl
new file mode 100644
index 000000000..b70aa488f
--- /dev/null
+++ b/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl
@@ -0,0 +1,44 @@
+[%# 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.
+  #%]
+
+[% PROCESS global/header.html.tmpl
+   title = "Upgrade Permissions"
+%]
+
+<h3>How to apply for upgraded permissions</h3>
+
+<p>
+  If you want <kbd>canconfirm</kbd>, email <a href="mailto:bmo-perms@mozilla.org">
+  bmo-perms@mozilla.org</a> the URLs of three good [% terms.bug %] reports you have filed.
+</p>
+
+<p>
+  If you want <kbd>editbugs</kbd>, email <a href="mailto:bmo-perms@mozilla.org">
+  bmo-perms@mozilla.org</a> either:
+  <ul>
+    <li>
+      The URLs of two [% terms.bugs %] to which you have attached patches 
+      or testcases; or
+    </li>
+    <li>
+      The URLs of the relevant comment on three [% terms.bugs %] which you 
+      wanted to change, but couldn't, and so added a comment instead.
+    </li>
+  </ul>
+</p>
+
+<p>
+  <kbd>editbugs</kbd> implies <kbd>canconfirm</kbd>; there's no need to apply for both. 
+</p>
+
+<p>
+  Don't forget to include your [% terms.Bugzilla %] ID if it's not the email address 
+  you are emailing from.
+</p>
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index b53840d36..f448ee4d4 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1795,6 +1795,8 @@
       [% error_message FILTER none %]
     [% END %]
   [% END %]
+
+  [% Hook.process('error_message') %]
 [% END %]
 
 [%# We only want HTML error messages for ERROR_MODE_WEBPAGE %]