]> git.ipfire.org Git - thirdparty/bugzilla.git/commitdiff
Bug 1619361 - Update Reps Application Form
authorMichael Kohler <me@michaelkohler.info>
Mon, 2 Mar 2020 19:29:33 +0000 (20:29 +0100)
committerGitHub <noreply@github.com>
Mon, 2 Mar 2020 19:29:33 +0000 (14:29 -0500)
extensions/REMO/template/en/default/bug/create/comment-mozreps.txt.tmpl
extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl
extensions/REMO/template/en/default/bug/create/created-mozreps.html.tmpl
extensions/REMO/web/js/moz_reps.js
extensions/REMO/web/styles/moz_reps.css

index c33202c81b69179de8a18b019556b33c99155673..8e8ae7362b75b783ccef5792b62b167dc8930b54 100644 (file)
   #%]
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
+
 First Name:
 [%+ cgi.param('first_name') %]
 
 Last Name:
 [%+ cgi.param('last_name') %]
 
-Under 18 years old:
-[%+ IF cgi.param('underage') %]Yes[% ELSE %]No[% END %]
-
-Gender:
-[%+ cgi.param('gender') %]
-
 City:
 [%+ cgi.param('city') %]
 
 Country:
 [%+ cgi.param('country') %]
 
-Local Community:
-[% IF cgi.param('community') %]
-[%+ cgi.param('community') %]
-[% ELSE %]
--
-[% END %]
+[% IF cgi.param('languages') %]
+Languages:
+[%+ cgi.param('languages') %]
 
-IM:
-[% IF cgi.param('im') %]
-[%+ cgi.param('im') %]
-[% ELSE %]
--
 [% END %]
-
 Mozillians.org Account URL:
-[% IF cgi.param('mozillian') %]
 [%+ cgi.param('mozillian') %]
-[% ELSE %]
--
-[% END %]
 
 References:
-[% IF cgi.param('cc') %]
 [%+ cgi.param('cc').join(", ") %]
-[% END %]
 
-What are you currently doing at Mozilla?
-[% IF cgi.param('involved') %]
-[%+ cgi.param('involved') %]
-[% END %]
-
-When First Contributed:
-[% IF cgi.param('firstcontribute') %]
+First contributed to Mozilla:
 [%+ cgi.param('firstcontribute') %]
-[% ELSE %]
--
-[% END %]
 
-Languages Spoken:
-[%+ cgi.param('languages') %]
+In which area are you active in Mozilla?
+[%+ cgi.param('involved') %]
 
-How did you learn about Mozilla Reps:
+How did you learn about Mozilla Reps?
 [%+ cgi.param('learn') %]
 
-What motivates you most about joining Mozilla Reps:
+What motivates you most about joining Mozilla Reps?
 [%+ cgi.param('motivation') %]
 
-Comments:
+[% IF cgi.param('languages') %]
+Mission Driven Mozillians:
+[%+ cgi.param('mdm') %]
+
+[% END %]
+Activity:
+[%+ cgi.param('activity') %]
+
 [% IF cgi.param('comments') %]
+Comments:
 [%+ cgi.param('comments') %]
-[% ELSE %]
--
 [% END %]
index 8f1244e9ae5a7fd820b69cd4ad8afa721afaed85..f9f341d089e25383d57a95e211aa455166c83667 100644 (file)
@@ -35,7 +35,7 @@
 
 <p>
   If you have questions while completing this form, please contact the
-  <a href="mailto:reps-council@mozilla.org">Reps Council</a> for assistance.
+  <a href="mailto:reps-council@mozilla.com">Reps Council</a> for assistance.
 </p>
 
 <form method="post" action="[% basepath FILTER none %]post_bug.cgi" id="tmRequestForm">
   <input type="hidden" name="token" value="[% token FILTER html %]">
 
   <table id="reps-form">
-    <tr class="odd">
+    <tr>
+      <th><label for="first_time">Is this the first time you have applied for Reps?</label></th>
+      <td>
+        <select id="first_time">
+          <option value="Yes">Yes</option>
+          <option value="No">No</option>
+        </select>
+      </td>
+    </tr>
+
+    <tr id="prior_bug" style="display: none">
+      <th><label for="dependson">Please reference the previous [% terms.bug %] number: </label></th>
+      <td><input id="dependson" name="dependson" type="text" value=""></td>
+    </tr>
+
+    <tr>
       <th><label class="required" for="first_name">First Name:</label></th>
-      <td><input requuired id="first_name" name="first_name" size="40" placeholder="John"></td>
+      <td><input id="first_name" name="first_name" size="40" placeholder="John"></td>
     </tr>
 
-    <tr class="even">
+    <tr>
       <th><label class="required" for="last_name">Last Name:</label></th>
       <td><input id="last_name" name="last_name" size="40" placeholder="Doe"></td>
     </tr>
 
-    <tr class="odd">
-      <th><label for="underage">Are you under 18 years old?:</label></th>
+    <tr>
+      <th><label for="age">Are you 18 years or older?</label></th>
       <td>
-        <input type="checkbox" id="underage" name="underage" value="1"><br>
+        <select id="age">
+          <option value="No">No</option>
+          <option value="Yes">Yes</option>
+        </select>
       </td>
     </tr>
 
-    <tr id="underage_warning" class="odd" style="display: none">
+    <tr id="age_warning" style="display: none">
       <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
+        group for other contribution opportunities.
       </td>
     </tr>
 
-    <tr class="even">
-      <th><label class="required" for="gender">Gender:</label></th>
-      <td>
-        <select id="gender" name="gender">
-          <option value=""></option>
-          <option value="Male">Male</option>
-          <option value="Female">Female</option>
-          <option value="Other">Other</option>
-        </select>
-      </td>
-    </tr>
-
-    <tr class="odd">
+    <tr>
       <th><label class="required" for="city">City:</label></th>
       <td><input id="city" name="city" size="40" placeholder="Your city"></td>
     </tr>
 
-    <tr class="even">
+    <tr>
       <th><label class="required" for="country">Country:</label></th>
       <td><input id="country" name="country" size="40" placeholder="Your country"></td>
     </tr>
 
-    <tr class="odd">
-      <th><label for="community">Local Community you participate in:</label></th>
-      <td><input id="community" name="community" size="40" placeholder="Name of your community"></td>
+    <tr>
+      <th><label for="languages">Languages spoken:</label></th>
+      <td><input id="languages" name="languages" size="40"></td>
     </tr>
 
-    <tr class="even">
-      <th><label for="im">IM (specify service):</label></th>
-      <td><input id="im" name="im" size="40"></td>
+    <tr>
+      <th><label for="vouched" class="required">Do you have a vouched Mozillian account?</label></th>
+      <td>
+        <select id="vouched">
+          <option value="Yes">Yes</option>
+          <option value="No">No</option>
+        </select>
+      </td>
     </tr>
 
-    <tr class="odd">
+    <tr id="vouched_warning" style="display: none">
+      <td colspan="2">
+        You require a vouched Mozillians account to apply to the Reps Program.
+      </td>
+    </tr>
+
+    <tr>
       <th><label class="required" for="mozillian">Mozillians.org Account URL:</label></th>
       <td>
         <input type="url" id="mozillian" name="mozillian" size="40" placeholder="https://mozillians.org/u/name">
       </td>
     </tr>
 
-    <tr class="even">
+    <tr>
+      <th>
+        <label for="information">
+          Is your Mozillians account filled with the <a href="https://wiki.mozilla.org/Reps/Application_Process/Selection_Criteria" target="_blank">required information</a>?
+        </label>
+      </th>
+      <td>
+        <select id="information">
+          <option value="Yes">Yes</option>
+          <option value="No">No</option>
+        </select>
+      </td>
+    </tr>
+
+    <tr id="information_warning" style="display: none">
+      <td colspan="2">
+        Please fill out your Mozillians account according to the <a href="https://wiki.mozilla.org/Reps/Application_Process/Selection_Criteria" target="_blank">Selection Criteria</a>.
+      </td>
+    </tr>
+
+    <tr>
       <th colspan="2">
         <label class="required" for="cc">
-          Mozilla contributors who vouch your application:
+          Mozillians who vouch for your application. They need to add a comment to your application [% terms.bug %] why they endorse your application.
         </label>
       </th>
     </tr>
 
-    <tr class="even">
+    <tr>
       <td colspan="2">
         [% INCLUDE global/userselect.html.tmpl
            id       => "cc"
       </td>
     </tr>
 
-    <tr class="odd">
-      <th colspan="2">
-        <label class="required" for="involved">
-          What are you currently doing at Mozilla?
+    <tr>
+      <th>
+        <label class="required" for="firstcontribute">
+          When did you first start contributing to Mozilla?
         </label>
       </th>
-    </tr>
-
-    <tr class="odd">
-      <td colspan="2">
-        <textarea id="involved" name="involved" rows="4" placeholder="Add-ons,  l10n,  SUMO,  QA,  ..."></textarea>
+      <td>
+        <input name="firstcontribute" size="20" id="firstcontribute" value=""
+              onchange="updateCalendarFromField(this)">
+        <button type="button" class="calendar_button"
+                id="button_calendar_firstcontribute"
+                onclick="showCalendar('firstcontribute')">
+          <span>Calendar</span>
+        </button>
+        <div id="con_calendar_firstcontribute"></div>
+        <script [% script_nonce FILTER none %]>
+          createCalendar('firstcontribute')
+        </script>
       </td>
     </tr>
 
-    <tr class="even">
-      <th>
-        <label class="required" for="firstcontribute">
-          When did you first start contributing to Mozilla?
+    <tr>
+      <th colspan="2">
+        <label class="required" for="involved">
+          In which area are you active in Mozilla?
         </label>
       </th>
-      <td><input id="firstcontribute" name="firstcontribute" size="40"></td>
     </tr>
 
-    <tr class="odd">
-      <th><label class="required" for="languages">Languages Spoken:</label></th>
-      <td><input id="languages" name="languages" size="40"></td>
+    <tr>
+      <td colspan="2">
+        <textarea id="involved" name="involved" rows="4" placeholder="Add-ons, Localization,  SUMO, QA, etc."></textarea>
+      </td>
     </tr>
 
-    <tr class="even">
+    <tr>
       <th><label class="required" for="learn">How did you learn about Mozilla Reps?</label></th>
       <td><input id="learn" name="learn" size="40"></td>
     </tr>
 
-    <tr class="odd">
-      <th><label for="first_time">Is this the first time you have applied for Reps?</label></th>
-      <td><input type="checkbox" id="first_time" name="first_time" value="1" checked></td>
-    </tr>
-
-    <tr id="prior_bug" class="odd" style="display: none">
-      <th><label for="dependson">If you have already applied to the program in the past, please reference the [% terms.bug %] number: </label></th>
-      <td><input id="dependson" name="dependson" type="text" value=""></td>
-    </tr>
-
-    <tr class="even">
+    <tr>
       <th colspan="2">
         <label class="required" for="motivation">
           What motivates you most about joining Mozilla Reps?
       </th>
     </tr>
 
-    <tr class="even">
+    <tr>
       <td colspan="2">
         <textarea id="motivation" name="motivation" rows="4"
                   placeholder="[% INCLUDE motivation_placeholder FILTER html %]"></textarea>
       Tell us your goals and what you would be able to do as a Rep that you can't do right now
     [%- END %]
 
-    <tr class="odd">
+    <tr>
+      <th colspan="2">
+        <label for="mdm">
+          What are Mission Driven Mozillans?
+        </label>
+      </th>
+    </tr>
+
+    <tr>
+      <td colspan="2">
+        <textarea id="mdm" name="mdm" rows="4"></textarea>
+      </td>
+    </tr>
+
+    <tr>
+      <th colspan="2">
+        <label class="required" for="activity">
+          What have you done in the last 6 months for Mozilla?
+        </label>
+      </th>
+    </tr>
+
+    <tr>
+      <td colspan="2">
+        <textarea id="activity" name="activity" rows="8"
+                  placeholder="[% INCLUDE activity_placeholder FILTER html %]"></textarea>
+      </td>
+    </tr>
+
+    [% BLOCK activity_placeholder -%]
+      List some activities you organized or participated in and support this with links to blogposts/articles/events/etc
+    [%- END %]
+
+    <tr>
       <th colspan="2">
         <label for="comments">
-          Comments:
+          Do you want to add something we need to know?
         </label>
       </th>
     </tr>
 
-    <tr class="odd">
+    <tr>
       <td colspan="2"><textarea id="comments" name="comments" rows="4"></textarea></td>
     </tr>
 
-    <tr class="even">
+    <tr>
       <th>
         <label class="required" for="privacy">
           I have read the
       <td><input id="privacy" name="privacy" type="checkbox" value="1"></td>
     </tr>
 
-    <tr class="odd">
+    <tr>
       <td>&nbsp;</td>
       <td align="right">
         <button id="submit">Submit</button>
index 0199dcd6fbe4f5f3ef6cae558c59f2683525244a..8c4535f7343033ad88e5c3973d6939e16ee629c1 100644 (file)
@@ -35,9 +35,9 @@
 </p>
 
 <ul>
-  <li>The mozillians who vouched you should comment on the application [% terms.bug %] endorsing your application. Please contact them to make sure they endorse you, this is needed for your application to be complete.</li>
-  <li>The application will be reviewed after you are endorsed and if it fits all requirements it will be placed in the mentorship queue.</li>
-  <li>Once a Rep mentor has a free slot, they will be assigned to do the final review.</li>
+  <li>The Mozillians who vouched you should comment on the application [% terms.bug %] endorsing your application. Please contact them to make sure they endorse you, this is needed for your application to be complete.</li>
+  <li>The application will be reviewed after you are endorsed and all necessary information is provided.</li>
+  <li>The Reps Onboarding team will review your application and report back their decision.</li>
 </ul>
 
 <p>
index fa29f512a0612d7d80149014b7724df3ca5521d2..083172c7db7138998e4569f948d2ba1e1169eebb 100644 (file)
@@ -9,9 +9,8 @@ $(document).ready(function() {
     'use strict';
 
     var first_time = $("#first_time");
-    first_time.prop("checked", true);
     first_time.change(function(evt) {
-        if (!this.checked) {
+        if (this.value !== 'Yes') {
             $("#prior_bug").show();
             $("#prior_bug label").addClass("required");
         }
@@ -21,15 +20,37 @@ $(document).ready(function() {
         }
     }).change();
 
-    $("#underage").change(function(evt) {
-        if (this.checked) {
-            $('#underage_warning').show();
+    $("#age").change(function(evt) {
+        if (this.value === 'Yes') {
+            $('#age_warning').hide();
+            $('#submit').prop("disabled", false);
+        }
+        else {
+            $('#age_warning').show();
             $('#submit').prop("disabled", true);
         }
+    }).change();
+
+    $("#vouched").change(function(evt) {
+        if (this.value === 'Yes') {
+            $('#vouched_warning').hide();
+            $('#submit').prop("disabled", false);
+        }
         else {
-            $('#underage_warning').hide();
+            $('#vouched_warning').show();
+            $('#submit').prop("disabled", true);
+        }
+    }).change();
+
+    $("#information").change(function(evt) {
+        if (this.value === 'Yes') {
+            $('#information_warning').hide();
             $('#submit').prop("disabled", false);
         }
+        else {
+            $('#information_warning').show();
+            $('#submit').prop("disabled", true);
+        }
     }).change();
 
     $("#privacy").change(function(evt) {
index 8947146d2db8041d63aad819b541feea5f4a57d4..f4e4a7db9d34e4d48474206319241b15a7f43a10 100644 (file)
@@ -25,7 +25,7 @@
 }
 
 #reps-form textarea {
-  width: 590px;
+  width: 100%;
 }
 
 #reps-form textarea.small {
@@ -58,3 +58,9 @@ label.required:before {
 .yui-calcontainer {
   z-index: 2;
 }
+
+#age_warning,
+#vouched_warning,
+#information_warning {
+  color: var(--error-message-foreground-color);
+}