diff options
7 files changed, 59 insertions, 7 deletions
diff --git a/extensions/BMO/template/en/default/bug/legal_disclaimer.html.tmpl b/extensions/BMO/template/en/default/bug/legal_disclaimer.html.tmpl new file mode 100644 index 000000000..754c0b31a --- /dev/null +++ b/extensions/BMO/template/en/default/bug/legal_disclaimer.html.tmpl @@ -0,0 +1,14 @@ +[%# 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. + #%] + +[% RETURN UNLESS bug.product == "Legal" %] + +<div id="legal_disclaimer"> + The material and information contained herein is Confidential and subject to + Attorney-Client Privilege and Work Product Doctrine. +</div> diff --git a/extensions/BMO/template/en/default/hook/bug/comments-comment_banner.html.tmpl b/extensions/BMO/template/en/default/hook/bug/comments-comment_banner.html.tmpl index 2ae367456..135e1cd95 100644 --- a/extensions/BMO/template/en/default/hook/bug/comments-comment_banner.html.tmpl +++ b/extensions/BMO/template/en/default/hook/bug/comments-comment_banner.html.tmpl @@ -1,10 +1,12 @@ -[%# *** Disclaimer for Legal bugs *** %] -[% IF bug.product == "Legal" %] - <div id="legal_disclaimer"> - The material and information contained herein is Confidential and - subject to Attorney-Client Privilege and Work Product Doctrine. - </div> -[% END %] +[%# 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 bug/legal_disclaimer.html.tmpl %] [%# Needed for collapsing TinderboxPushlog comments %] [% has_tbpl_comment = 0 %] diff --git a/extensions/BMO/template/en/default/hook/bug_modal/edit-after_modules.html.tmpl b/extensions/BMO/template/en/default/hook/bug_modal/edit-after_modules.html.tmpl new file mode 100644 index 000000000..0723eba01 --- /dev/null +++ b/extensions/BMO/template/en/default/hook/bug_modal/edit-after_modules.html.tmpl @@ -0,0 +1,9 @@ +[%# 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 bug/legal_disclaimer.html.tmpl %] diff --git a/extensions/BMO/template/en/default/hook/bug_modal/header-end.html.tmpl b/extensions/BMO/template/en/default/hook/bug_modal/header-end.html.tmpl new file mode 100644 index 000000000..bc8fa3c0d --- /dev/null +++ b/extensions/BMO/template/en/default/hook/bug_modal/header-end.html.tmpl @@ -0,0 +1,9 @@ +[%# 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. + #%] + +[% style_urls.push("extensions/BMO/web/styles/bug_modal.css") %] diff --git a/extensions/BMO/web/styles/bug_modal.css b/extensions/BMO/web/styles/bug_modal.css new file mode 100644 index 000000000..0c54ce64a --- /dev/null +++ b/extensions/BMO/web/styles/bug_modal.css @@ -0,0 +1,14 @@ +/* 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. */ + +#legal_disclaimer { + background: #fff; + color: #000; + padding: 10px; + border: 1px solid #ddd; + border-radius: 4px; +} diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index 61ba58546..75f4747ea 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -932,6 +932,8 @@ </div> [% END %] +[% Hook.process('after_modules') %] + [%# === comments === %] [% diff --git a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl index 9e3742ef8..6ba7ede8b 100644 --- a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl @@ -103,3 +103,5 @@ BUGZILLA.default_qa_contact = '[% bug.component_obj.default_qa_contact.login FILTER js %]'; [% END %] [% END %] + +[% Hook.process("end") %] |