jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394295 )
Change subject: Updates for the 2018 round of Wikimania
......................................................................
Updates for the 2018 round of Wikimania
Bug: T181072
Change-Id: Ic4b96d2a41a63a9c5c4a4a92d780a08b80738ad4
---
M .gitignore
A data/db/migrations/20171128-update-questions-2018.sql
M data/db/schema.mysql
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/apply.html
M data/templates/inc/forms.html
M data/templates/review/view.html
M src/Forms/Apply.php
9 files changed, 63 insertions(+), 55 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 86b037e..6a2dea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
.AppleDouble
.LSOverride
Icon
+.idea/
# Thumbnails
._*
diff --git a/data/db/migrations/20171128-update-questions-2018.sql
b/data/db/migrations/20171128-update-questions-2018.sql
new file mode 100644
index 0000000..2c08b58
--- /dev/null
+++ b/data/db/migrations/20171128-update-questions-2018.sql
@@ -0,0 +1,11 @@
+-- Alter schema for 2018 round questions
+
+-- Drop unused columns
+ALTER TABLE scholarships DROP COLUMN presentation;
+ALTER TABLE scholarships DROP COLUMN presentationTopic;
+
+-- Add new column for scholarship type
+ALTER TABLE scholarships
+ ADD COLUMN separatejury TINYINT(1) NOT NULL DEFAULT '0' AFTER chapteragree,
+ ADD COLUMN missingKnowledge TEXT DEFAULT NULL AFTER collaboration
+ ;
diff --git a/data/db/schema.mysql b/data/db/schema.mysql
index 4ad70a7..74523d9 100644
--- a/data/db/schema.mysql
+++ b/data/db/schema.mysql
@@ -16,6 +16,7 @@
id INT(11) NOT NULL AUTO_INCREMENT
, type ENUM('partial', 'full', 'either') DEFAULT NULL
, chapteragree TINYINT(1) NOT NULL DEFAULT '0'
+ , separatejury TINYINT(1) NOT NULL DEFAULT '0'
, fname VARCHAR(32) DEFAULT NULL
, lname VARCHAR(32) DEFAULT NULL
, email VARCHAR(64) DEFAULT NULL
@@ -52,11 +53,10 @@
, contribution TEXT
, experience TEXT
, collaboration TEXT
+ , missingKnowledge TEXT
, prev_scholar TINYINT(1) DEFAULT NULL
, last_year_scholar TINYINT(1) DEFAULT NULL
, reports TEXT
- , presentation TINYINT(1) DEFAULT NULL
- , presentationTopic TEXT
, willgetvisa TINYINT(1) NOT NULL DEFAULT '0'
, agreestotravelconditions TINYINT(1) NOT NULL DEFAULT '0'
, grantfortravelonly TINYINT(1) NOT NULL DEFAULT '0'
diff --git a/data/i18n/en.json b/data/i18n/en.json
index befead1..ca33215 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -7,8 +7,8 @@
]
},
"wikimania": "Wikimania",
- "wikimania-location-year": "Montréal, Canada 2017",
- "header-title": "Wikimania 2017 - Scholarship application",
+ "wikimania-location-year": "Cape Town, South Africa, 2018",
+ "header-title": "Wikimania 2018 - Scholarship application",
"nav-apply": "Apply",
"nav-faq": "FAQ",
@@ -27,16 +27,16 @@
"mock": "This is a mock scholarship application site only, use it just
for testing.",
- "not-open": "The 2017 Wikimania Scholarship process is not yet open.
For more information, see:\n<ul>\n<li><a
href=\"https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>About
Wikimania</a></li>\n<li><a
href=\"https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships\";>About
Scholarships</a></li>\n</ul>",
+ "not-open": "The 2018 Wikimania Scholarship process is not yet open.
For more information, see:\n<ul>\n<li><a
href=\"https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>About
Wikimania</a></li>\n<li><a
href=\"https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarships\";>About
Scholarships</a></li>\n</ul>",
- "deadline-passed": "<p>Scholarship application deadline was February
20, 23:59 UTC.</p>\n<p>We will notify applicants in April 2017 about the result
of their application.</p>\n<p>Please see the <a
href='https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships'>scholarships
page</a> on the wiki for more details.</p>",
+ "deadline-passed": "<p>Scholarship application deadline was February
20, 23:59 UTC.</p>\n<p>We will notify applicants in April 2018 about the result
of their application.</p>\n<p>Please see the <a
href='https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarships'>scholarships
page</a> on the wiki for more details.</p>",
- "form-intro": "<p>This is the application for sponsorship to attend <a
href=\"https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>Wikimania
2017</a>, the annual international conference centered on Wikimedia projects.
Awardees will receive a scholarship which will cover conference registration
fees, hotel, and roundtrip travel to Wikimania in Montréal, Quebec, Canada, Aug
9-13, 2017.</p>\n<p><b>Applications may be submitted in any language</b>, but
every applicant must <b>provide evidence of English language abilities</b> that
are at a level which would enable them to participate in Wikimania, a
conference which is primarily conducted in English. Sufficient English
abilities could be demonstrated in the application itself or
elsewhere.</p>\n<p>This is not a scholarship for university study. Applications
not obviously related to the conference will be discarded.</p>\n<p>Please
carefully consider your financial needs before applying for a scholarship to
attend Wikimania. There are limited funds available and many applicants do not
have the financial means to attend Wikimania without this opportunity. Thank
you.</p>\n<p>Please note that <strong>if you need more then 10 minutes to
complete this application, please draft your answers in a text editor</strong>,
reload this page and then copy-paste your answers into corresponding fields
before submitting. This application may give an error (\"Missing or invalid
CSRF token\") if it is open for more then 15 minutes before
submitting.</p>\n<p>The deadline to apply is <strong>February 20, 23:59
UTC</strong>.</p> ",
+ "form-intro": "<p>This is the application for sponsorship to attend <a
href=\"https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>Wikimania
2018</a>, the annual international conference centered on Wikimedia projects.
Awardees will receive a scholarship which will cover conference registration
fees, hotel, and roundtrip travel to Wikimania in Cape Town, South Africa, July
18-22, 2018.</p>\n<p><b>Applications may be submitted in any language</b>, but
every applicant must <b>provide evidence of English language abilities</b> that
are at a level which would enable them to participate in Wikimania, a
conference which is primarily conducted in English. Sufficient English
abilities could be demonstrated in the application itself or
elsewhere.</p>\n<p>This is not a scholarship for university study. Applications
not obviously related to the conference will be discarded.</p>\n<p>Please
carefully consider your financial needs before applying for a scholarship to
attend Wikimania. There are limited funds available and many applicants do not
have the financial means to attend Wikimania without this opportunity. Thank
you.</p>\n<p>Please note that <strong>if you need more then 10 minutes to
complete this application, please draft your answers in a text editor</strong>,
reload this page and then copy-paste your answers into corresponding fields
before submitting. This application may give an error (\"Missing or invalid
CSRF token\") if it is open for more then 15 minutes before
submitting.</p>\n<p>The deadline to apply is <strong>February 20, 23:59
UTC</strong>.</p> ",
- "form-intro-faq": "<a
href='https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships/FAQ'>Frequently
asked questions</a>",
+ "form-intro-faq": "<a
href='https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarships/FAQ'>Frequently
asked questions</a>",
"form-scholarship-type": "Type of Scholarship",
- "form-scholarship": "<p>This year for Wikimania 2017, the Wikimedia
Foundation will be offering Partial scholarships which will cover all
registration fees (which includes accommodation during Wikimania); however,
these partial scholarships will NOT cover travel or incidental expenses. In
contrast, Full scholarships will cover travel, registration and incidental
expenses.</p>\n Please indicate which type of Wikimania Foundation scholarship
are you applying for. Note that those who choose \"I am applying for a full
scholarship, but would be able to attend if awarded a partial scholarship.\"
will be considered according to the <a
href=\"https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships#Scholarship_details\";>selection
rules</a>.",
+ "form-scholarship": "<p>This year for Wikimania 2018, the Wikimedia
Foundation will be offering Partial scholarships which will cover all
registration fees (which includes accommodation during Wikimania); however,
these partial scholarships will NOT cover travel or incidental expenses. In
contrast, Full scholarships will cover travel, registration and incidental
expenses.</p>\n Please indicate which type of Wikimania Foundation scholarship
are you applying for. Note that those who choose \"I am applying for a full
scholarship, but would be able to attend if awarded a partial scholarship.\"
will be considered according to the <a
href=\"https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarships#Scholarship_details\";>selection
rules</a>.",
"form-scholarship-full": "I am applying for a Full scholarship.",
"form-scholarship-either": "I am applying for a full scholarship, but
would be able to attend if awarded a partial scholarship.",
"form-scholarship-partial": "I am applying for a Partial scholarship.",
@@ -48,7 +48,6 @@
"form-reports-error": "Please provide links to your previous
scholarship reports.",
"form-scholarship-error": "Please select the scholarship type",
"form-wmfAgreeGuardian-error": "Please enter your legal guardian's
name.",
- "form-presentationTopic-error": "Please enter your presentation title.",
"form-fname-error": "Please enter your first name.",
"form-lname-error": "Please enter your last name.",
"form-email-error": "Please enter your email address.",
@@ -110,7 +109,7 @@
"form-other-usernames": "(If applicable) Other Wikimedia usernames used
for editing:",
"form-multilingual-community": "I selected as my \"Most active
Wikimedia project\" Commons, Species, Data, Incubator, MediaWiki, or Tool Labs.
Therefore I cannot pick a language community.",
"form-engagement": "Please select all of the following that describe
how you have engaged in the Wikimedia movement.",
- "form-engagement-option1": "Active contributor to a Wikimedia project
(e.g. Wikipedia, Commons, Wikisource), with at least 50 contributions (edits)",
+ "form-engagement-option1": "Active contributor to a Wikimedia project
(e.g. Wikipedia, Commons, Wikisource, Wikidata)",
"form-engagement-option2": "Mediawiki code contributor, gadget or other
tool-builder for Wikimedia projects",
"form-engagement-option3": "Involvement in some form of Wikimedia
organization (Chapters, Thematic Organizations, User Groups)",
"form-engagement-option4": "Wikimedia Check User, Admin, Bureaucrat,
Steward, and/or OTRS (current or former)",
@@ -129,33 +128,34 @@
"form-community": "Primary language community on wiki:",
"form-active-project": "Most active Wikimedia project:",
"form-active-project2": "Second most active Wikimedia project (if
applicable):",
- "form-extent-explain": "Tell us about your involvement in your home
wiki or the broader Wikimedia movement. What have you built or contributed to
in order to improve your wiki or community? Have you led or organized any of
these activities?",
- "form-contrib-explain": "What’s something great that happened as a
result of these activities? This could be described either quantitatively or
qualitatively, and could impact either online or offline. Here are some <a
href=\"https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships#Relevant_experience\";>examples</a>
that might help.",
+ "form-extent-explain": "Tell us about your recent involvement in your
home wiki or the broader Wikimedia movement. What have you built or contributed
to in order to improve your wiki or community? Have you led or organized any of
these activities? Please indicate which of these activities took place in the
last 12 months.",
+ "form-contrib-explain": "What’s something great that happened as a
result of these activities? This could be described either quantitatively or
qualitatively, and could impact either online or offline. Here are some <a
href=\"https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarships#Relevant_experience\";>examples</a>
that might help.",
"form-experience-explain": "How do you usually share your experiences
(or things you’ve learned) with your community? Examples of on-wiki
summaries/reports, blog posts, meetup talks, etc. are welcome here.",
"form-collaboration-explain": "What collaborations with other
Wikimedians or Wikimedia organizations are you most proud of?",
+ "form-missing-knowledge-explain": "What knowledge matters to you that
is still missing in the Wikimedia movement? Who has been left out? What are
some ways you might participate at Wikimania to help address this?",
+
"form-interest": "Attendance and involvement in Wikimania",
"form-attended": "Have you attended Wikimania before? If so, in what
year or years?",
"form-prev-scholar": "Have you previously attended any Wikimania on a
WMF scholarship?",
"form-last-year-scholar": "In 2016, did you receive a WMF Scholarship
and attend Wikimania on that scholarship?",
"form-attending-reports": "Please provide the links to all of your
previous WMF Scholarship reports.",
- "form-presenter": "Will you submit or have you submitted a presentation
for Wikimania 2017? (<a
href=\"https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Submissions\";>Call
for Participation</a>)",
- "form-presentation-topic": "If you have submitted or will submit a
presentation, please provide a link to your presentation or proposal title:",
"form-agree": "Application agreement",
- "form-visa": "If I am awarded and accept a grant, I will be responsible
for obtaining a travel visa, if necessary, prior to travel to Montréal, Quebec
(Canada).",
+ "form-visa": "If I am awarded and accept a grant, I will be responsible
for obtaining a travel visa, if necessary, prior to travel to Cape Town, South
Africa.",
"form-travel-conditions": "If I am awarded and accept a grant, I agree
to use the travel booking service provided and paid for by the Wikimedia
Foundation.",
"form-travel-only": "If I am awarded and accept a grant, I agree to use
the grant exclusively for my travel expenses. I promise to reimburse the
Wikimedia Foundation for any unspent or improperly spent funds.",
"form-friendly-space": "If I am awarded and accept a grant, I agree to
abide by the Wikimedia Foundation <a
href=\"https://wikimediafoundation.org/wiki/Special:MyLanguage/Friendly_space_policy\";>Friendly
Space Policy</a>. If I am found in violation of this policy and asked to
leave, I agree to be responsible for any changes in my own travel expenses.",
"form-info-true": "I certify that all of the information provided with
my application is true and accurate to the best of my knowledge and belief. The
Wikimedia Foundation reserves the right to require me to pay back all or part
of the grant if any of the information I provide is found to be untrue or
inaccurate.",
"form-privacy": "Privacy",
- "form-review": "All information contained in this application will be
reviewed by the members of the <a
href=\"https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\";>Wikimania
Scholarship Committee</a>. All personal information will be held strictly
confidential by the Committee, and the <a
href=\"https://wikimediafoundation.org/\";>Wikimedia Foundation</a>.",
+ "form-review": "All information contained in this application will be
reviewed by the members of the <a
href=\"https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\";>Wikimania
Scholarship Committee</a>. All personal information will be held strictly
confidential by the Committee, and the <a
href=\"https://wikimediafoundation.org/\";>Wikimedia Foundation</a>.",
"form-chapteragree": "<p>Wikimedia movement organizations (Chapters,
Thematic organizations, and User Groups) also offer scholarships for Wikimania,
separate from the Wikimedia Foundation Scholarship Program. While this
application is submitted for a Wikimedia Foundation Scholarship, a Wikimedia
movement organization may request access to applications that are relevant to
their country or community, for the purpose of selecting and awarding their
own, independently awarded scholarships.</p> \n Please indicate whether or not
you would like your information shared with other, independent Wikimedia
movement organizations.",
+ "form-separatejury": "Some Wikimedia movement organizations proceed
with the results of the international Wikimania Scholarship Committee results,
some will create their own jury process. In the second case, do you intend to
apply for funding there, too? If so, we will work with the organisation in
question to arrange the best solution.",
"form-rights-heading": "Applicant Rights & Consent to Data Processing
and Transfer",
- "form-rights1": "I as an applicant for a Wikimedia Foundation ('WMF')
scholarship relating to my participation in the 2017 Wikimania conference
hosted in Montréal, Quebec (Canada), hereby acknowledge and affirmatively
consent to the following as a prerequisite to the consideration of my 2017
Wikimania scholarship application ('Application'):",
- "form-rights2":"(a) Any personal data or sensitive personal data that I
submit as part of or in relation to my Application (collectively 'my Data') may
be accessed and reviewed by: (i) WMF; (ii) members of a scholarship committee
made up of Wikimedia movement members, a representative list of which can be
found at: <a
href=\"https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\";>https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee</a>
('Scholarship Committee'); and if you indicated that you want to be considered
for a WM Chapter or WM Thematic Org scholarship, (iii) official Wikimedia
Chapters, a representative list of which can be found at: <a
href=\"https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters\";>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters</a>
('WM Chapters'), and official thematic organizations, a representative list of
which can be found at: <a
href=\"https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations\";>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations</a>
('WM Thematic Orgs'); for the purposes of evaluating my Application.",
+ "form-rights1": "I as an applicant for a Wikimedia Foundation ('WMF')
scholarship relating to my participation in the 2018 Wikimania conference
hosted in Cape Town (South Africa), hereby acknowledge and affirmatively
consent to the following as a prerequisite to the consideration of my 2018
Wikimania scholarship application ('Application'):",
+ "form-rights2":"(a) Any personal data or sensitive personal data that I
submit as part of or in relation to my Application (collectively 'my Data') may
be accessed and reviewed by: (i) WMF; (ii) members of a scholarship committee
made up of Wikimedia movement members, a representative list of which can be
found at: <a
href=\"https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\";>https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee</a>
('Scholarship Committee'); and if you indicated that you want to be considered
for a WM Chapter or WM Thematic Org scholarship, (iii) official Wikimedia
Chapters, a representative list of which can be found at: <a
href=\"https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters\";>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters</a>
('WM Chapters'), and official thematic organizations, a representative list of
which can be found at: <a
href=\"https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations\";>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations</a>
('WM Thematic Orgs'); for the purposes of evaluating my Application.",
"form-rights3":"(b) Any Data that I submit as a part of or in relation
to my Application may be collected, stored, used, modified, communicated,
archived, destroyed, or otherwise processed (collectively 'Processed' or
'Processing') by: (i) WMF; (ii) members of the Scholarship Committee; and if
you indicated that you want to be considered for a WM Chapter or WM Thematic
Org scholarship, (iii) WM Chapters and WM Thematic Orgs. My Data may be
retained by WMF until I request in writing to WMF that my Data be destroyed or
for as long as required by applicable law.",
"form-rights4":"(c) My Data may be transmitted to or from: (i) WMF in
the United States; (ii) members of the Scholarship Committee in the country
which they reside; and if you indicated that you want to be considered for a WM
Chapter or WM Thematic Org scholarship, (iii) WM Chapters and/or WM Thematic
Orgs in the country which the organizations are based.",
"form-wmfagree": "I agree to the statement of 'Applicant Rights &
Consent to Data Processing and Transfer'.",
@@ -296,6 +296,8 @@
"review-communities-count": "Scholarship count",
"review-view-scholarship-type": "Scholarship type:",
+ "review-view-chapteragree": "Share info with chapters?",
+ "review-view-separatejury": "Apply with independent orgs?",
"review-view-name": "Name:",
"review-view-email": "Email:",
"review-view-residence": "Residence:",
@@ -317,11 +319,10 @@
"review-view-last-year-scholar": "Scholarship in 2016?",
"review-view-attending-reports": "Previous scholarship reports",
"review-view-involvement": "What have you built or contributed to in
order to improve your wiki or community? Have you lead or organized any of
these activities?",
- "review-view-contrib-explain": "What’s something great that happened as
a result of these activities?",
+ "review-view-contrib-explain": "What’s something interesting that
happened as a result of these activities?",
"review-view-experience-explain": " How do you usually share your
experiences (or things you’ve learned) with your community? Examples of on-wiki
summaries/reports, blog posts, meetup talks, etc. are welcome here.",
"review-view-collaboration-explain": "What collaborations with other
Wikimedians or Wikimedia organizations are you most proud of?",
- "review-view-presenter": "Presentation?",
- "review-view-presentation-topic": "Topic:",
+ "review-view-missing-knowledge-explain": "What knowledge matters to you
that is still missing in the Wikimedia movement? Who has been left out? What
are some ways you might participate at Wikimania to help address this?",
"review-view-engagement": "Engagement with the Wikimedia movement",
"review-view-visa": "Will get visa?",
"review-view-travel-conditions": "Agrees to travel conditions?",
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index aec1f92..c5e748d 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -45,7 +45,6 @@
"form-reports-error": "Error message shown to user when user has been a
previous scholarship recepient and has not filled out their list of scholarship
reports",
"form-scholarship-error": "Error message shown to user when the user
does not choose a scholarship type.",
"form-wmfAgreeGuardian-error": "Error message shown to user when the
users age is less than 18 and guardian's details are not provided",
- "form-presentationTopic-error": "Error message shown to user when user
selects to give a presentation and presentation details are not provided",
"form-fname-error": "Error message shown to user when user does not
enter first name",
"form-lname-error": "Error message shown to user when user does not
enter last name",
"form-email-error": "Error message shown to user when user does not
enter email address",
@@ -124,13 +123,12 @@
"form-contrib-explain": "Input label, followed by multi-line text box",
"form-experience-explain": "Input label, followed by multi-line text
box",
"form-collaboration-explain": "Input label, followed by multi-line text
box",
+ "form-missing-knowledge-explain": "Input label, followed by multi-line
text box",
"form-interest": "Form section label",
"form-attended": "Input label, followed by multiple checkboxes labeled
with years (eg 2013, 2012)",
"form-prev-scholar": "Input label, followed by yes and no radio
buttons, makes form-attending-reports a required field",
"form-last-year-scholar": "Input label, followed by yes and no radio
buttons",
"form-attending-reports": "Input label, followed by a multi-line text
box",
- "form-presenter": "Input label, followed by yes and no radio buttons",
- "form-presentation-topic": "Input label, followed by text box",
"form-agree": "Form section label",
"form-visa": "Input label, preceeded by checkbox",
"form-travel-conditions": "Input label, preceeded by checkbox",
@@ -140,6 +138,7 @@
"form-privacy": "Form section label\n{{Identical|Privacy}}",
"form-review": "Static content in the application form",
"form-chapteragree": "Input label, followed by yes and no radio
buttons",
+ "form-separatejury": "Input label, followed by yes and no radio
buttons",
"form-rights-heading": "Static content in the application form",
"form-rights1": "Static content in the application form, contains legal
wording",
"form-rights2": "Static content in the application form, contains legal
wording",
@@ -262,6 +261,8 @@
"review-communities-globalns": "Table column header, global
north/south",
"review-communities-count": "Table column header, number of scholarship
applications received",
"review-view-scholarship-type": "Report label",
+ "review-view-chapteragree": "Report label",
+ "review-view-separatejury": "Report label",
"review-view-name": "Report label.\n{{Identical|Name}}",
"review-view-email": "Report label.\n{{Identical|E-mail}}",
"review-view-residence": "Report label.\n{{Identical|Residence}}",
@@ -286,8 +287,7 @@
"review-view-contrib-explain": "Report label",
"review-view-experience-explain": "Report label",
"review-view-collaboration-explain": "Report label",
- "review-view-presenter": "Report label",
- "review-view-presentation-topic": "Report label.\n{{Identical|Topic}}",
+ "review-view-missing-knowledge-explain": "Report label",
"review-view-engagement": "Report label",
"review-view-visa": "Report label",
"review-view-travel-conditions": "Report label",
diff --git a/data/templates/apply.html b/data/templates/apply.html
index 20c3234..c4d9a13 100644
--- a/data/templates/apply.html
+++ b/data/templates/apply.html
@@ -86,6 +86,7 @@
<legend>{{ 'form-scholarship-type'|message }}</legend>
{{ forms.i18nSelect( ctx, 'form-scholarship', 'type', {
'form-scholarship-partial': 'partial', 'form-scholarship-full': 'full',
'form-scholarship-either': 'either' }, { 'required':true, 'escape':false } ) }}
{{ forms.yesNo( ctx, 'form-chapteragree', 'chapteragree', {
'escape':false, 'required': true } ) }}
+ {{ forms.yesNo( ctx, 'form-separatejury', 'separatejury', {
'escape':false, 'required': true } ) }}
</fieldset>
<fieldset>
@@ -136,15 +137,14 @@
{{ forms.textArea( ctx, 'form-contrib-explain', 'contribution', {
'required':true, 'escape':false } ) }}
{{ forms.textArea( ctx, 'form-collaboration-explain', 'collaboration', {
'required':true } ) }}
{{ forms.textArea( ctx, 'form-experience-explain', 'experience', {
'required':true } ) }}
-</fieldset>
+ {{ forms.textArea( ctx, 'form-missing-knowledge-explain',
'missingKnowledge' ) }}
+ </fieldset>
<fieldset>
<legend>{{ 'form-interest'|message }}</legend>
{{ forms.yesNo( ctx, 'form-prev-scholar', 'prev_scholar', {
'required':true } ) }}
{{ forms.yesNo( ctx, 'form-last-year-scholar', 'last_year_scholar', {
'required':true } ) }}
{{ forms.textArea( ctx, 'form-attending-reports', 'reports' ) }}
- {{ forms.yesNo( ctx, 'form-presenter', 'presentation', { 'escape':false }
) }}
- {{ forms.text( ctx, 'form-presentation-topic', 'presentationTopic' ) }}
</fieldset>
<fieldset>
diff --git a/data/templates/inc/forms.html b/data/templates/inc/forms.html
index a8b2c7c..70e4d64 100644
--- a/data/templates/inc/forms.html
+++ b/data/templates/inc/forms.html
@@ -43,7 +43,7 @@
{% set opts = { 'required':false }|merge( opts ) %}
{% set value = ctx.form.get( name ) %}
{{ forms.startElement( ctx, mesg, name, opts ) }}
- <textarea class="form-control" id="{{ name }}" name="{{ name }}" cols="80"
rows="3" {{ opts['required'] ? 'required' }}>{{ value ?: '' }}</textarea>
+ <textarea class="form-control" id="{{ name }}" name="{{ name }}" cols="80"
rows="6" {{ opts['required'] ? 'required' }}>{{ value ?: '' }}</textarea>
{{ forms.endElement() }}
{% endmacro %}
diff --git a/data/templates/review/view.html b/data/templates/review/view.html
index c37bde5..4a995f2 100644
--- a/data/templates/review/view.html
+++ b/data/templates/review/view.html
@@ -29,9 +29,13 @@
</div>
<div id="scholarship_type" class="panel-collapse collapse in">
<div class="panel-body">
- <dl class="dl-horizontal">
+ <dl class="dl-horizontal wide">
<dt>{{ 'review-view-scholarship-type'|message }}</dt>
<dd>{{ schol.type }}</dd>
+ <dt>{{ 'review-view-chapteragree'|message }}</dt>
+ <dd>{{ helpers.yesNo( schol.chapteragree ) }}</dd>
+ <dt>{{ 'review-view-separatejury'|message }}</dt>
+ <dd>{{ helpers.yesNo( schol.separatejury ) }}</dd>
</dl>
</div>
</div>
@@ -181,7 +185,7 @@
{% else %}
<p>{{ 'review-view-not-specified'|message }}</p>
{% endif %}
- </div>
+ </div>
<div class="well well-sm">
<p><strong>{{ 'review-view-experience-explain'|message
}}</strong></p>
@@ -189,6 +193,15 @@
<p style="white-space:pre-wrap">{{ schol.experience }}</p>
{% else %}
<p>{{ 'review-view-not-specified'|message }}</p>
+ {% endif %}
+ </div>
+
+ <div class="well well-sm">
+ <p><strong>{{ 'review-view-missing-knowledge-explain'|message
}}</strong></p>
+ {% if schol.missingKnowledge is not empty %}
+ <p style="white-space:pre-wrap">{{ schol.missingKnowledge }}</p>
+ {% else %}
+ <p>{{ 'review-view-not-specified'|message }}</p>
{% endif %}
</div>
</div>
@@ -206,12 +219,6 @@
<div id="interest" class="panel-collapse collapse in">
<div class="panel-body">
<dl class="dl-horizontal">
- <dt>{{ 'review-view-presenter'|message }}</dt>
- <dd>{{ helpers.yesNo( schol.presentation ) }}</dd>
- {% if schol.presentation %}
- <dt>{{ 'review-view-presentation-topic'|message }}</dt>
- <dd>{{ schol.presentationTopic }}</dd>
- {% endif %}
<dt>{{ 'review-view-previous-scholar'|message }}</dt>
<dd>{{ helpers.yesNo( schol.prev_scholar ) }}</dd>
<dt>{{ 'review-view-last-year-scholar'|message }}</dt>
diff --git a/src/Forms/Apply.php b/src/Forms/Apply.php
index fcaf998..00cffda 100644
--- a/src/Forms/Apply.php
+++ b/src/Forms/Apply.php
@@ -53,6 +53,7 @@
// Scholarship type
$this->requireInArray( 'type', [ 'partial', 'full', 'either' ]
);
$this->requireBool( 'chapteragree' );
+ $this->requireBool( 'separatejury' );
// Contact information
$this->requireString( 'fname' );
@@ -99,16 +100,13 @@
$this->requireString( 'contribution' );
$this->requireString( 'experience' );
$this->requireString( 'collaboration' );
+ $this->expectString( 'missingKnowledge' );
// Interest and involvement in Wikimania
$this->requireBool( 'prev_scholar' );
$this->requireBool( 'last_year_scholar' );
$this->expectString( 'reports', [
'validate' => [ $this, 'validateReports' ],
- ] );
- $this->expectBool( 'presentation' );
- $this->expectString( 'presentationTopic', [
- 'validate' => [ $this, 'validatePresentationTopic' ],
] );
// Application agreement
@@ -134,16 +132,6 @@
*/
protected function validateGenderOther( $value ) {
return $this->get( 'gender' ) == 'o' ? (bool)$value : true;
- }
-
- /**
- * Validate that presentationTopic is provided if presentation is set.
- *
- * @param mixed $value Value of param
- * @return bool True if value is valid, false otherwise
- */
- protected function validatePresentationTopic( $value ) {
- return $this->get( 'presentation' ) ? (bool)$value : true;
}
/**
@@ -247,7 +235,7 @@
*/
public function save() {
$colnames = [
- 'type', 'chapteragree', 'fname', 'lname', 'email',
'residence',
+ 'type', 'chapteragree', 'separatejury', 'fname',
'lname', 'email', 'residence',
'haspassport', 'nationality', 'airport', 'languages',
'dob',
'gender', 'gender_other', 'occupation', 'areaofstudy',
@@ -257,7 +245,7 @@
'staff', 'staffOrg', 'board', 'boardOrg',
'involvement', 'contribution', 'experience',
'collaboration',
'prev_scholar', 'last_year_scholar', 'reports',
'involvement', 'contribution',
- 'presentation', 'presentationTopic',
+ 'missingKnowledge',
'willgetvisa', 'agreestotravelconditions',
'grantfortravelonly',
'agreestofriendlyspace', 'infotrue',
--
To view, visit https://gerrit.wikimedia.org/r/394295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4b96d2a41a63a9c5c4a4a92d780a08b80738ad4
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Niharika29 <nko...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Niharika29 <nko...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
