2 files changed, 55 insertions, 5 deletions

diff --git a/extensions/REMO/template/en/default/bug/create/comment-mozreps.txt.tmpl b/extensions/REMO/template/en/default/bug/create/comment-mozreps.txt.tmpl
index 29544d669..5e1275e0b 100644
--- a/extensions/REMO/template/en/default/bug/create/comment-mozreps.txt.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/comment-mozreps.txt.tmpl
@@ -50,6 +50,13 @@ IM:
 -
 [% END %]
 
+Mozillians.org Account:
+[% IF cgi.param('mozillian') %]
+[%+ cgi.param('mozillian') %]
+[% ELSE %]
+-
+[% END %]
+
 References:
 [% IF cgi.param('references') %]
 [%+ cgi.param('references') %]
@@ -64,6 +71,13 @@ Currently Involved with Mozilla:
 -
 [% END %]
 
+When First Contributed:
+[% IF cgi.param('firstcontribute') %]
+[%+ cgi.param('firstcontribute') %]
+[% ELSE %]
+-
+[% END %]
+
 Languages Spoken:
 [%+ cgi.param('languages') %]
 
diff --git a/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl
index 2a7be0ab2..bd918d803 100644
--- a/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl
@@ -53,6 +53,17 @@ function mandatory(ids) {
   return result;
 }
 
+function underageWarning (el) {
+  if (el.checked) {
+    Dom.removeClass('underage_warning', 'bz_default_hidden');
+    Dom.get('submit').disabled = true;
+  }
+  else {
+    Dom.addClass('underage_warning', 'bz_default_hidden');
+    Dom.get('submit').disabled = false;
+  }
+}
+
 function submitForm() {
   if (!mandatory([ 'first_name', 'last_name', 'sex', 'city', 'country',
                    'languages', 'learn', 'motivation', 'privacy' ])
@@ -104,7 +115,18 @@ function submitForm() {
 
 <tr class="odd">
   <th>Are you under 18 years old?:</th>
-  <td><input type="checkbox" id="underage" name="underage" value="1"></td>
+  <td>
+    <input type="checkbox" id="underage" name="underage" 
+           value="1" onclick="underageWarning(this);"><br>
+  </td>
+</tr>
+
+<tr id="underage_warning" class="odd bz_default_hidden">
+  <td colspan="2">
+    Mozilla Reps program is not currently accepting people under 18 years old.
+    Sorry for the inconvenience. In the meantime please check with your local Mozilla
+    group for other contribution opportunities
+  </td>
 </tr>
 
 <tr class="even">
@@ -139,28 +161,40 @@ function submitForm() {
 </tr>
 
 <tr class="odd">
+  <th>Mozillians.org Account:</th>
+  <td><input id="mozillian" name="mozillian" size="40"></td>
+</tr>
+
+<tr class="even">
   <th colspan="2">
     References:
   </th>
 </tr>
-<tr class="odd">
+<tr class="even">
   <td colspan="2">
     <textarea id="references" name="references" rows="4"
               placeholder="Add contact info of people referencing you."></textarea>
   </td>
 </tr>
 
-<tr class="even">
+<tr class="odd">
   <th colspan="2">
     How are you involved with Mozilla?
   </th>
 </tr>
-<tr class="even">
+<tr class="odd">
   <td colspan="2">
     <textarea id="involved" name="involved" rows="4" placeholder="Add-ons,  l10n,  SUMO,  QA,  ..."></textarea>
   </td>
 </tr>
 
+<tr class="even">
+  <th>
+    When did you first start contributing to Mozilla?
+  </th>
+  <td><input id="firstcontribute" name="firstcontribute" size="40"></td>
+</tr>
+
 <tr class="odd">
   <th>Languages Spoken:[% mandatory FILTER none %]</th>
   <td><input id="languages" name="languages" size="40"></td>
@@ -195,7 +229,9 @@ function submitForm() {
 
 <tr class="even">
   <td>&nbsp;</td>
-  <td align="right"><input type="submit" value="Submit" onclick="return submitForm()"></td>
+  <td align="right">
+    <input id="submit" type="submit" value="Submit" onclick="return submitForm()">
+  </td>
 </tr>
 
 </table>