From 2e6e3e13587ee526ba94faabd5551e67508518f5 Mon Sep 17 00:00:00 2001
From: dklawren <dklawren@users.noreply.github.com>
Date: Fri, 7 Sep 2018 06:04:50 -0400
Subject: Bug 1488292 - Remove MozReview extension from BMO code tree as
 MozReview is being decommissioned

---
 template/en/default/account/prefs/apikey.html.tmpl |  18 +-
 template/en/default/attachment/create.html.tmpl    |   1 -
 template/en/default/bug/edit.html.tmpl             | 195 ++++++++++-----------
 template/en/default/email/new-api-key.txt.tmpl     |   5 +-
 4 files changed, 102 insertions(+), 117 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/account/prefs/apikey.html.tmpl b/template/en/default/account/prefs/apikey.html.tmpl
index cdbee848b..c4b4074c1 100644
--- a/template/en/default/account/prefs/apikey.html.tmpl
+++ b/template/en/default/account/prefs/apikey.html.tmpl
@@ -34,25 +34,15 @@ here.</p>
     <th>Revoked</th>
   </tr>
 
-  [%# because mozreview api-keys only work for the mozreview api, we hide the
-    # key and prevent renaming #%]
   [% FOREACH api_key IN api_keys %]
     <tr[% IF api_key.revoked %] class="apikey_revoked bz_tui_hidden" style="display:none"[% END %]>
       <td>
-        [% IF api_key.is_mozreview %]
-          <i>hidden</i>
-        [% ELSE %]
-          [% api_key.api_key FILTER html %]
-        [% END %]
+        [% api_key.api_key FILTER html %]
       </td>
       <td>
-        [% IF api_key.is_mozreview %]
-            MozReview
-        [% ELSE %]
-          <input name="description_[% api_key.id FILTER html %]"
-            id="description_[% api_key.id FILTER html %]"
-            value="[% api_key.description FILTER html %]">
-        [% END %]
+        <input name="description_[% api_key.id FILTER html %]"
+          id="description_[% api_key.id FILTER html %]"
+          value="[% api_key.description FILTER html %]">
       </td>
       [% IF api_key.last_used %]
         <td>[% api_key.last_used FILTER time %]
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index f83a9f83a..5e996041c 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -39,7 +39,6 @@
   doc_section = "attachments.html"
 %]
 
-[%# BMO hook for displaying MozReview message %]
 [% Hook.process('before_form') %]
 
 <form name="entryform" method="post" action="attachment.cgi" enctype="multipart/form-data">
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 445e5fe0d..6a1edc163 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -110,27 +110,27 @@
   <table class="edit_form">
     <tr>
       [%# 1st Column %]
-      <td id="bz_show_bug_column_1" class="bz_show_bug_column">     
+      <td id="bz_show_bug_column_1" class="bz_show_bug_column">
         <table>
           [%# *** ID, product, component, status, resolution, Hardware, and  OS *** %]
           [% PROCESS section_status %]
-          
+
           [% PROCESS section_spacer %]
-          
+
           [% PROCESS section_details1 %]
-          
+
           [% PROCESS section_spacer %]
-          
+
           [%# *** severity, priority, version and milestone *** %]
-          [% PROCESS section_details2 %]            
-          
+          [% PROCESS section_details2 %]
+
           [%# *** assigned to and qa contact *** %]
           [% PROCESS section_people %]
-          
+
           [% PROCESS section_spacer %]
-          
+
           [% PROCESS section_url_keyword_whiteboard %]
-          
+
           [% PROCESS section_spacer %]
 
           [%# *** Dependencies and duplicates *** %]
@@ -138,7 +138,7 @@
 
           [% PROCESS section_dependson_blocks %]
 
-          [% IF user.id %]          
+          [% IF user.id %]
             <tr>
               <td colspan="2">
                 <span style="float:left">
@@ -187,7 +187,6 @@
 
   <table id="bz_big_form_parts" cellspacing="0" cellpadding="0"><tr>
   <td>
-    [%# BMO hook for adding MozReview table %]
     [% Hook.process("after_bug_data") %]
 
     [% IF user.is_timetracker %]
@@ -230,7 +229,7 @@
   [% ELSE %]
     [% PROCESS summon_comment_box %]
   [% END %]
-  
+
 
 </form>
 
@@ -242,35 +241,35 @@
   [%# That's the main table, which contains all editable fields. %]
   <div class="bz_alias_short_desc_container edit_form">
      <span class="last_comment_link">
-       <a href="#c[% bug.comments.size - 1 %]" 
+       <a href="#c[% bug.comments.size - 1 %]"
           accesskey="l"><b>L</b>ast Comment</a>
-     </span>      
+     </span>
      <a href="show_bug.cgi?id=[% bug.bug_id %]">
         [%-# %]<b>[% terms.Bug %]&nbsp;[% bug.bug_id FILTER html %]</b>
-     [%-# %]</a> -<span id="summary_alias_container" class="bz_default_hidden"> 
+     [%-# %]</a> -<span id="summary_alias_container" class="bz_default_hidden">
       [% IF Param("usebugaliases") %]
         [% IF bug.alias != "" %]
-          (<span id="alias_nonedit_display">[% bug.alias FILTER html %]</span>) 
+          (<span id="alias_nonedit_display">[% bug.alias FILTER html %]</span>)
         [% END %]
       [% END %]
       <span role="heading" aria-level="1" id="short_desc_nonedit_display">[% bug.short_desc FILTER quoteUrls(bug) FILTER wbr %]</span>
-      [% IF bug.check_can_change_field('short_desc', 0, 1) || 
+      [% IF bug.check_can_change_field('short_desc', 0, 1) ||
             bug.check_can_change_field('alias', 0, 1)  %]
         <small class="editme">(<a href="#" id="editme_action">edit</a>)</small>
       [% END %]
      </span>
-  
-       
+
+
     <div id="summary_alias_input">
-      <table id="summary"> 
+      <table id="summary">
         [% IF Param("usebugaliases") %]
           <tr>
-          [% IF bug.check_can_change_field('alias', 0, 1) %]      
+          [% IF bug.check_can_change_field('alias', 0, 1) %]
             <td>
-              <label 
-                for="alias" 
-                title="a name for the 
-                       [% terms.bug %] that can be used in place of its ID number, 
+              <label
+                for="alias"
+                title="a name for the
+                       [% terms.bug %] that can be used in place of its ID number,
                        [%%] e.g. when adding it to a list of dependencies"
                 >Alias</label>:</td><td>
           [% ELSIF bug.alias %]
@@ -281,12 +280,12 @@
           [% INCLUDE input inputname => "alias"
                      size => "40"
                      maxlength => "40"
-                     no_td => 1 
-                     %][% ")" IF NOT bug.check_can_change_field('alias', 0, 1) 
+                     no_td => 1
+                     %][% ")" IF NOT bug.check_can_change_field('alias', 0, 1)
                                   && bug.alias %]
           </td>
         </tr>
-        [% END %] 
+        [% END %]
         [%# *** Summary *** %]
         <tr>
           <td>
@@ -334,7 +333,7 @@
             value = bug.classification
             editable = bug.check_can_change_field('product', 0, 1) %]
     </tr>
-    [%###############%]    
+    [%###############%]
     [%#  Component  #%]
     [%###############%]
     <tr>
@@ -352,9 +351,9 @@
 
       [% PROCESS select selname => "version" %]
     </tr>
-    [%############%]    
+    [%############%]
     [%# PLATFORM #%]
-    [%############%]    
+    [%############%]
     <tr>
       <th class="field_label">
         <label for="rep_platform" accesskey="h">Platform</label>:
@@ -364,8 +363,8 @@
             bug = bug, field = bug_fields.rep_platform,
             no_tds = 1, value = bug.rep_platform
             editable = bug.check_can_change_field('rep_platform', 0, 1) %]
-       [%+ INCLUDE bug/field.html.tmpl 
-            bug = bug, field = bug_fields.op_sys, 
+       [%+ INCLUDE bug/field.html.tmpl
+            bug = bug, field = bug_fields.op_sys,
             no_tds = 1, value = bug.op_sys
             editable = bug.check_can_change_field('op_sys', 0, 1) %]
         [%# BMO - hook for hw/os detection from reporter %]
@@ -396,7 +395,7 @@
           [% END %]
         [% END %]
         [% IF bug.user.canedit || bug.user.isreporter %]
-          (<a href="#add_comment" 
+          (<a href="#add_comment"
               onclick="window.setTimeout(function() { document.getElementById('bug_status').focus(); }, 10)">edit</a>)
         [% END %]
       </span>
@@ -413,7 +412,7 @@
       [% INCLUDE input inputname => "status_whiteboard" size => "40" colspan => 2 %]
     </tr>
   [% END %]
-  
+
   [% IF use_keywords %]
     <tr>
       <th class="field_label">
@@ -468,7 +467,7 @@
         [% PROCESS select selname = "target_milestone" %]
       </tr>
     [% END %]
-  
+
 [% END %]
 
 [%############################################################################%]
@@ -488,7 +487,7 @@
               [% INCLUDE global/user.html.tmpl who = bug.assigned_to %]
               (<a href="#" id="bz_assignee_edit_action">edit</a>)
               [% IF bug.assigned_to.id != user.id %]
-                (<a title="Reassign to yourself" 
+                (<a title="Reassign to yourself"
                     href="#" id="bz_assignee_take_action">take</a>)
               [% END %]
             </span>
@@ -506,10 +505,10 @@
             <label id="set_default_assignee_label" for="set_default_assignee">Reset Assignee to default</label>
           </div>
           <script>
-           hideEditableField('bz_assignee_edit_container', 
-                             'bz_assignee_input', 
-                             'bz_assignee_edit_action', 
-                             'assigned_to', 
+           hideEditableField('bz_assignee_edit_container',
+                             'bz_assignee_input',
+                             'bz_assignee_edit_action',
+                             'assigned_to',
                              '[% bug.assigned_to.login FILTER js %]' );
            hideEditableField('bz_assignee_edit_container',
                              'bz_assignee_input',
@@ -517,7 +516,7 @@
                              'assigned_to',
                              '[% bug.assigned_to.login FILTER js %]',
                              '[% user.login FILTER js %]' );
-           initDefaultCheckbox('assignee');                  
+           initDefaultCheckbox('assignee');
           </script>
         [% ELSE %]
           [% INCLUDE global/user.html.tmpl who = bug.assigned_to %]
@@ -537,7 +536,7 @@
               [% INCLUDE global/user.html.tmpl who = bug.qa_contact %]
               (<a href="#" id="bz_qa_contact_edit_action">edit</a>)
               [% IF bug.qa_contact.id != user.id %]
-                (<a title="Change QA contact to yourself" 
+                (<a title="Change QA contact to yourself"
                     href="#" id="bz_qa_contact_take_action">take</a>)
               [% END %]
             </span>
@@ -556,15 +555,15 @@
             <label for="set_default_qa_contact" id="set_default_qa_contact_label">Reset QA Contact to default</label>
           </div>
           <script>
-            hideEditableField('bz_qa_contact_edit_container', 
-                              'bz_qa_contact_input', 
-                              'bz_qa_contact_edit_action', 
-                              'qa_contact', 
+            hideEditableField('bz_qa_contact_edit_container',
+                              'bz_qa_contact_input',
+                              'bz_qa_contact_edit_action',
+                              'qa_contact',
                               '[% bug.qa_contact.login FILTER js %]');
-            hideEditableField('bz_qa_contact_edit_container', 
-                              'bz_qa_contact_input', 
-                              'bz_qa_contact_take_action', 
-                              'qa_contact', 
+            hideEditableField('bz_qa_contact_edit_container',
+                              'bz_qa_contact_input',
+                              'bz_qa_contact_take_action',
+                              'qa_contact',
                               '[% bug.qa_contact.login FILTER js %]',
                               '[% user.login FILTER js %]');
             initDefaultCheckbox('qa_contact');
@@ -610,7 +609,7 @@
     %]
     <td>
       [% IF bug.check_can_change_field("bug_file_loc", 0, 1) %]
-        <span id="bz_url_edit_container" class="bz_default_hidden"> 
+        <span id="bz_url_edit_container" class="bz_default_hidden">
           <a href="[% bug.bug_file_loc FILTER html %]" target="_blank"
             rel="noreferrer" title="[% bug.bug_file_loc FILTER html %]"
             [% IF NOT is_safe_url(bug.bug_file_loc) %]
@@ -639,10 +638,10 @@
       </span>
       [% IF bug.check_can_change_field("bug_file_loc", 0, 1) %]
         <script>
-          hideEditableField('bz_url_edit_container', 
-                            'bz_url_input_area', 
-                            'bz_url_edit_action', 
-                            'bug_file_loc', 
+          hideEditableField('bz_url_edit_container',
+                            'bz_url_input_area',
+                            'bz_url_edit_action',
+                            'bug_file_loc',
                             "[% bug.bug_file_loc FILTER js %]");
         </script>
       [% END %]
@@ -678,20 +677,20 @@
 
 [% BLOCK section_dependson_blocks %]
   <tr>
-    [% INCLUDE dependencies 
+    [% INCLUDE dependencies
          field = bug_fields.dependson deps = bug.depends_on_obj %]
   </tr>
-  
+
   <tr>
-    [% INCLUDE dependencies 
+    [% INCLUDE dependencies
          field = bug_fields.blocked deps = bug.blocks_obj %]
-  
+
   <tr>
     <th>&nbsp;</th>
-  
+
     <td colspan="2" align="left" id="show_dependency_tree_or_graph">
       Show dependency <a href="showdependencytree.cgi?id=[% bug.bug_id %]&amp;hide_resolved=1">tree</a>
-  
+
       [% IF Param('webdotbase') %]
         /&nbsp;<a href="showdependencygraph.cgi?id=[% bug.bug_id %]">graph</a>
       [% END %]
@@ -721,7 +720,7 @@
       [% IF NOT emitted_description %]
         [% emitted_description = 1 %]
           <div id="bz_restrict_group_visibility_help">
-            <b>Only users in all of the selected groups can view this 
+            <b>Only users in all of the selected groups can view this
               [%+ terms.bug %]:</b>
              <p class="instructions">
                Unchecking all boxes makes this a more public [% terms.bug %].
@@ -730,7 +729,7 @@
       [% END %]
 
       [% IF group.ingroup %]
-        <input type="hidden" name="defined_groups" 
+        <input type="hidden" name="defined_groups"
                value="[% group.name FILTER html %]">
       [% END %]
 
@@ -745,20 +744,20 @@
 
     [% IF emitted_description %]
       [% IF NOT inallgroups %]
-        <p class="instructions">Only members of a group can change the 
+        <p class="instructions">Only members of a group can change the
           visibility of [% terms.abug %] for that group.</p>
       [% END %]
     [% END %]
 
     [% IF inagroup %]
       <div id="bz_enable_role_visibility_help">
-        <b>Users in the roles selected below can always view 
+        <b>Users in the roles selected below can always view
           this [% terms.bug %]:</b>
       </div>
       <div id="bz_enable_role_visibility">
         <div>
-          [% user_can_edit_accessible = 
-            bug.check_can_change_field("reporter_accessible", 0, 1) 
+          [% user_can_edit_accessible =
+            bug.check_can_change_field("reporter_accessible", 0, 1)
           %]
           [% IF user_can_edit_accessible %]
             <input type="hidden" name="defined_reporter_accessible" value="1">
@@ -770,8 +769,8 @@
           <label for="reporter_accessible">Reporter</label>
         </div>
         <div>
-          [% user_can_edit_accessible = 
-            bug.check_can_change_field("cclist_accessible", 0, 1) 
+          [% user_can_edit_accessible =
+            bug.check_can_change_field("cclist_accessible", 0, 1)
           %]
           [% IF user_can_edit_accessible %]
             <input type="hidden" name="defined_cclist_accessible" value="1">
@@ -809,7 +808,7 @@
      [% bug.creation_ts FILTER time("%Y-%m-%d %H:%M %Z") %] by [% INCLUDE global/user.html.tmpl who = bug.reporter %]
     </td>
   </tr>
-  
+
   <tr>
     <th class="field_label">
       Modified:
@@ -818,7 +817,7 @@
       [% bug.delta_ts FILTER time("%Y-%m-%d %H:%M %Z") %]
       (<a href="show_activity.cgi?id=[% bug.bug_id %]">[%# terms.Bug %]History</a>)
     </td>
-  
+
   </tr>
 [% END %]
 
@@ -844,10 +843,10 @@
                       || (!has_role
                           && user.settings.state_addselfcc.value == 'cc_unless_role') %]>
             <label for="addselfcc">Add me to CC list</label>
-            <br> 
+            <br>
           [% END %]
         [% END %]
-        [% bug.cc.size || 0  FILTER html %] 
+        [% bug.cc.size || 0  FILTER html %]
         [% IF bug.cc.size == 1 %]
           user
         [% ELSE %]
@@ -863,7 +862,7 @@
             (<a href="#" id="cc_edit_area_showhide">[% IF user.id %]edit[% ELSE %]show[% END %]</a>)
           [% IF user.id && bug.cc.size %]
             <br>
-            <ul class="cc_list_display"> 
+            <ul class="cc_list_display">
               [% FOREACH c = bug.cc %]
                 <li>[% c FILTER email FILTER html %]</li>
               [% END %]
@@ -912,11 +911,11 @@
         </div>
         [% IF user.id || bug.cc.size %]
           <script>
-            hideEditableField( 'cc_edit_area_showhide_container', 
-                               'cc_edit_area', 
-                               'cc_edit_area_showhide', 
-                               '', 
-                               '');  
+            hideEditableField( 'cc_edit_area_showhide_container',
+                               'cc_edit_area',
+                               'cc_edit_area_showhide',
+                               '',
+                               '');
           </script>
         [% END %]
       </td>
@@ -952,7 +951,7 @@
 [% BLOCK section_see_also %]
   [% IF Param('use_see_also') || bug.see_also.size %]
     <tr>
-      [% INCLUDE bug/field.html.tmpl 
+      [% INCLUDE bug/field.html.tmpl
            field    = bug_fields.see_also
            value    = bug.see_also
            editable = bug.check_can_change_field('see_also', 0, 1)
@@ -1011,7 +1010,7 @@
                     YAHOO.util.Dom.removeClass(rows[i], 'bz_default_hidden');
                 }
                 YAHOO.util.Event.preventDefault(e);
-            }); 
+            });
           </script>
         [% END %]
       </td>
@@ -1070,31 +1069,31 @@
   <td>
     <span id="[% field.name FILTER html %]_input_area">
       [% IF bug.check_can_change_field(field.name, 0, 1) %]
-        <input name="[% field.name FILTER html %]" 
+        <input name="[% field.name FILTER html %]"
                id="[% field.name FILTER html %]" class="text_input"
                value="[% bug.${field.name}.join(', ') FILTER html %]">
       [% END %]
     </span>
-    
+
     [% FOREACH dep_bug = deps %]
       [% dep_bug.id FILTER bug_link(dep_bug, use_alias => 1)
                     FILTER none %][% " " %]
     [% END %]
     [% IF bug.check_can_change_field(field.name, 0, 1) %]
-      <span id="[% field.name FILTER html %]_edit_container" 
+      <span id="[% field.name FILTER html %]_edit_container"
             class="edit_me bz_default_hidden">
         (<a href="#" id="[% field.name FILTER html %]_edit_action">edit</a>)
       </span>
       <script>
-        hideEditableField('[% field.name FILTER js %]_edit_container', 
-                          '[% field.name FILTER js %]_input_area', 
-                          '[% field.name FILTER js %]_edit_action', 
-                          '[% field.name FILTER js %]', 
+        hideEditableField('[% field.name FILTER js %]_edit_container',
+                          '[% field.name FILTER js %]_input_area',
+                          '[% field.name FILTER js %]_edit_action',
+                          '[% field.name FILTER js %]',
                           '[% bug.${field.name}.join(', ') FILTER js %]');
       </script>
     [% END %]
   </td>
-  
+
 [% END %]
 
 [%############################################################################%]
@@ -1160,7 +1159,7 @@
          [% INCLUDE bug/field.html.tmpl
            field = bug_fields.deadline, value = bug.deadline, no_tds = 1
            editable = bug.check_can_change_field('deadline', 0, 1) %]
-      </td>        
+      </td>
     </tr>
     <tr>
       <td colspan="7" class="bz_summarize_time">
@@ -1169,7 +1168,7 @@
         blocking this [% terms.bug %])</a>
       </td>
     </tr>
-  </table> 
+  </table>
 [% END %]
 
 [%############################################################################%]
@@ -1179,7 +1178,7 @@
 [% BLOCK comment_box %]
   <div id="add_comment" class="bz_section_additional_comments">
     [% IF user.id %]
-      <label for="comment" accesskey="c"><b>Additional 
+      <label for="comment" accesskey="c"><b>Additional
         <u>C</u>omments</b></label>:
 
       [% IF user.is_insider && bug.check_can_change_field('longdesc', 0, 1) %]
@@ -1240,7 +1239,7 @@
               before you can comment on or make changes to this [% terms.bug %].
             </fieldset>
           </td>
-        </tr> 
+        </tr>
       </table>
     [% END %]
   </div>
@@ -1267,7 +1266,7 @@
 
 [% BLOCK select %]
   <td>
-    [% IF bug.check_can_change_field(selname, 0, 1) 
+    [% IF bug.check_can_change_field(selname, 0, 1)
           AND bug.choices.${selname}.size > 1 %]
       <input type="hidden" id="[% selname %]_dirty">
       <select id="[% selname %]" name="[% selname %]">
@@ -1307,7 +1306,7 @@
         [% val FILTER html %]
       [% END %]
     [% END %]
-  [% IF no_td != 1 %]  
+  [% IF no_td != 1 %]
   </td>
   [% END %]
 [% END %]
@@ -1315,7 +1314,7 @@
 [% BLOCK commit_button %]
   [% IF user.id %]
     <div class="knob-buttons">
-      <input type="submit" value="Save Changes" 
+      <input type="submit" value="Save Changes"
              id="commit[% id FILTER css_class_quote %]">
     </div>
   [% END %]
diff --git a/template/en/default/email/new-api-key.txt.tmpl b/template/en/default/email/new-api-key.txt.tmpl
index aed904def..9ab13d90b 100644
--- a/template/en/default/email/new-api-key.txt.tmpl
+++ b/template/en/default/email/new-api-key.txt.tmpl
@@ -26,10 +26,7 @@ or update the key at the following URL:
 
 [%+ urlbase %]userprefs.cgi?tab=apikey
 
-[% IF new_key.app_id == Param('mozreview_app_id') %]
-This API key was automatically created by MozReview. If you did not recently log in to
-MozReview, please disable the key at the above URL, and change your password immediately.
-[% ELSIF new_key.app_id == Param('phabricator_app_id') %]
+[% IF new_key.app_id == Param('phabricator_app_id') %]
 This API key was automatically created by Mozilla's Phabricator instance. If you did not recently
 log in to Phabricator, please disable the key at the above URL, and change your password immediately.
 [% ELSE %]
-- 
cgit v1.2.3-24-g4f1b