From: Michael Kohler Date: Mon, 2 Mar 2020 19:29:33 +0000 (+0100) Subject: Bug 1619361 - Update Reps Application Form X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8871f1ee3baaa8b6547fcca2ff7ecf2925bc42bc;p=thirdparty%2Fbugzilla.git Bug 1619361 - Update Reps Application Form --- 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 c33202c81..8e8ae7362 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 @@ -18,74 +18,51 @@ #%] [% 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 %] 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 8f1244e9a..f9f341d08 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 @@ -35,7 +35,7 @@

If you have questions while completing this form, please contact the - Reps Council for assistance. + Reps Council for assistance.

@@ -58,79 +58,116 @@ - + + + + + + + + + + + - + - + - - + + - + - - - - - - + - + - - - + + + - - - + + + - + + + + + - + + + + + + + + + + - + - - + - - - - - - + - - - - + + - + - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + [% BLOCK activity_placeholder -%] + List some activities you organized or participated in and support this with links to blogposts/articles/events/etc + [%- END %] + + - + - + - +
+ +
-
+
- -
+ +
+ + + +
[% INCLUDE global/userselect.html.tmpl id => "cc" @@ -143,50 +180,47 @@
-
+
- + + + +
+
-
+
+ +
@@ -205,19 +239,52 @@ Tell us your goals and what you would be able to do as a Rep that you can't do right now [%- END %] -
+ +
+ +
+ +
+ +
  diff --git a/extensions/REMO/template/en/default/bug/create/created-mozreps.html.tmpl b/extensions/REMO/template/en/default/bug/create/created-mozreps.html.tmpl index 0199dcd6f..8c4535f73 100644 --- a/extensions/REMO/template/en/default/bug/create/created-mozreps.html.tmpl +++ b/extensions/REMO/template/en/default/bug/create/created-mozreps.html.tmpl @@ -35,9 +35,9 @@

    -
  • 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.
    • -
  • The application will be reviewed after you are endorsed and if it fits all requirements it will be placed in the mentorship queue.
    • -
  • Once a Rep mentor has a free slot, they will be assigned to do the final review.
    • +
  • 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.
    • +
  • The application will be reviewed after you are endorsed and all necessary information is provided.
    • +
  • The Reps Onboarding team will review your application and report back their decision.

diff --git a/extensions/REMO/web/js/moz_reps.js b/extensions/REMO/web/js/moz_reps.js index fa29f512a..083172c7d 100644 --- a/extensions/REMO/web/js/moz_reps.js +++ b/extensions/REMO/web/js/moz_reps.js @@ -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) { diff --git a/extensions/REMO/web/styles/moz_reps.css b/extensions/REMO/web/styles/moz_reps.css index 8947146d2..f4e4a7db9 100644 --- a/extensions/REMO/web/styles/moz_reps.css +++ b/extensions/REMO/web/styles/moz_reps.css @@ -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); +}