From 5cc88fd55c94b5dc9a310ad5c5d87942d4154d3d Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Wed, 28 Jan 2015 16:20:19 +0000
Subject: Bug 1100382: backport upstream bug 1090727 to bmo/4.2 to support
 jquery in the global/header template, and update the header and footer to use
 jquery

---
 template/en/default/bug/edit.html.tmpl | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'template/en/default/bug')

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 8057e4d02..92e7bea70 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -275,7 +275,7 @@
           [% ELSE %]
             <td colspan="2">
           [% END %]
-          [% PROCESS input inputname => "alias" 
+          [% INCLUDE input inputname => "alias"
                      size => "40"
                      maxlength => "40"
                      no_td => 1 
@@ -290,7 +290,7 @@
             <label accesskey="s" for="short_desc"><u>S</u>ummary</label>:
           </td>
           <td>
-            [% PROCESS input inputname => "short_desc" size => "80" colspan => 2
+            [% INCLUDE input inputname => "short_desc" size => "80" colspan => 2
                              maxlength => 255 spellcheck => "true" no_td => 1 %]
           </td>
         </tr>
@@ -405,7 +405,7 @@
         accesskey = "w"
         desc_url  = "https://wiki.mozilla.org/BMO/Whiteboard"
       %]
-      [% PROCESS input inputname => "status_whiteboard" size => "40" colspan => 2 %]
+      [% INCLUDE input inputname => "status_whiteboard" size => "40" colspan => 2 %]
     </tr>
   [% END %]
   
@@ -607,7 +607,7 @@
         </span>
       [% END %]
       <span id="bz_url_input_area">
-        [% url_output =  PROCESS input no_td=1 inputname => "bug_file_loc" size => "40" colspan => 2 %]
+        [% url_output =  INCLUDE input no_td=1 inputname => "bug_file_loc" size => "40" colspan => 2 %]
         [% IF NOT bug.check_can_change_field("bug_file_loc", 0, 1)
               AND is_safe_url(bug.bug_file_loc) %]
           <a href="[% bug.bug_file_loc FILTER html %]"
@@ -1271,7 +1271,7 @@
   [% IF no_td != 1 %]
   <td[% " colspan=\"$colspan\"" IF colspan %]>
   [% END %]
-    [% val = value ? value : bug.$inputname %]
+    [% val = bug.$inputname %]
     [% IF bug.check_can_change_field(inputname, 0, 1) %]
        <input id="[% inputname %]" name="[% inputname %]" class="text_input"
               value="[% val FILTER html %]"[% " size=\"$size\"" IF size %]
@@ -1289,13 +1289,8 @@
   [% IF no_td != 1 %]  
   </td>
   [% END %]
-  [% no_td = 0 %]
-  [% maxlength = 0 %]
-  [% colspan = 0 %]
-  [% size = 0 %]
-  [% value = undef %]
-  [% spellcheck = undef %]
 [% END %]
+
 [% BLOCK commit_button %]
   [% IF user.id %]
     <div class="knob-buttons">
-- 
cgit v1.2.3-24-g4f1b