Bug 776806 - Further changes to the IT Request Bugzilla form

r=glob

1 files changed, 12 insertions, 18 deletions

diff --git a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
index 265c168a9..217b196d4 100644
--- a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
@@ -8,9 +8,6 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-[% USE date(format = '%Y%m%d') %]
-[% use_service_now = date.format(date.now) >= 20120723 %]
-
 [% inline_javascript = BLOCK %]
   function setsevdesc(theSelect) {
     var theValue = theSelect.options[theSelect.selectedIndex].value;
@@ -32,20 +29,25 @@
   [% END %]
   compdesc['invalid'] = '';
 
+  var serviceNowText = 'Use <a href="https://mozilla.service-now.com/">Service Now</a> to:<br>' +
+                       'Request an LDAP/E-mail/etc. account<br>' +
+                       'Desktop/Laptop/Printer/Phone/Tablet/License problem/order/request';
+
   function setcompdesc(theRadio) {
-    if (theRadio.id == 'componentmvd' [% ' && false' UNLESS use_service_now %]) {
+    if (theRadio.id == 'componentmvd') {
       [%# helpdesk issue/request %]
       document.getElementById('main_form').style.display = 'none';
       document.getElementById('service_now_form').style.display = '';
-      document.getElementById('compdescription').innerHTML =
-        'Use <a href="https://mozilla.service-now.com/">Service Now</a> to:<br>' +
-        'Request an LDAP/E-mail/etc. account<br>' +
-        'Desktop/Laptop/Printer/Phone/Tablet/License problem/order/request';
+      document.getElementById('compdescription').innerHTML = serviceNowText;
     } else {
       document.getElementById('main_form').style.display = '';
       document.getElementById('service_now_form').style.display = 'none';
       var theValue = theRadio.value;
-      document.getElementById('compdescription').innerHTML = compdesc[theValue];
+      var compDescText = compdesc[theValue];
+      if (theRadio.id == 'componentso') {
+        compDescText = compDescText + '<br><br>' + serviceNowText;   
+      }
+      document.getElementById('compdescription').innerHTML = compDescText;
     }
   }
 
@@ -118,16 +120,8 @@
     <tr>
       <td align="right"><strong>Request Type:</strong></td>
       <td style="white-space: nowrap;">
-        [% UNLESS use_service_now %]
-          <input type="radio" name="component" id="componentac" onclick="setcompdesc(this)" value="Server Operations: Account Requests">
-          <label for="componentac">Request an LDAP/E-mail/etc. account</label><br>
-        [% END %]
         <input type="radio" name="component" id="componentmvd" onclick="setcompdesc(this)" value="Server Operations: Desktop Issues">
-        [% IF use_service_now %]
-          <label for="componentmvd">Helpdesk issue/request</label><br>
-        [% ELSE %]
-          <label for="componentmvd">Desktop/Laptop/Printer/Phone/Tablet/License problem/order/request</label><br>
-        [% END %]
+        <label for="componentmvd">Desktop issue/request</label><br>
         <input type="radio" name="component" id="componenttbm" onclick="setcompdesc(this)" value="Server Operations: RelEng">
         <label for="componenttbm">Report a problem with a tinderbox machine</label><br>
         <input type="radio" name="component" id="componentwcp" onclick="setcompdesc(this)" value="Server Operations: Web Operations">