jenkins-bot has submitted this change and it was merged.
Change subject: Add collaboration question in application
......................................................................
Add collaboration question in application
Bug: T78611
Change-Id: I7c071d66886c2c0488b6560ca0aa4bcc89ee5475
---
A data/db/migrations/20141231-01-add-collaboration-ques.mysql
M data/db/schema.mysql
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/apply.html
M data/templates/review/view.html
M src/Wikimania/Scholarship/Forms/Apply.php
7 files changed, 25 insertions(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
Niharika29: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/data/db/migrations/20141231-01-add-collaboration-ques.mysql
b/data/db/migrations/20141231-01-add-collaboration-ques.mysql
new file mode 100644
index 0000000..07cef63
--- /dev/null
+++ b/data/db/migrations/20141231-01-add-collaboration-ques.mysql
@@ -0,0 +1,6 @@
+-- Add question on Collaborations
+-- Bug: T78611
+
+ALTER TABLE scholarships
+ ADD COLUMN collaboration TEXT
+ AFTER experience;
\ No newline at end of file
diff --git a/data/db/schema.mysql b/data/db/schema.mysql
index 54d7dad..15762ca 100644
--- a/data/db/schema.mysql
+++ b/data/db/schema.mysql
@@ -45,6 +45,7 @@
, involvement TEXT
, contribution TEXT
, experience TEXT
+ , collaboration TEXT
, wm05 TINYINT(1) DEFAULT NULL
, wm06 TINYINT(1) DEFAULT NULL
, wm07 TINYINT(1) DEFAULT NULL
diff --git a/data/i18n/en.json b/data/i18n/en.json
index b461fca..67181eb 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -50,6 +50,7 @@
"form-involvement-error": "Please explain your involvement with
Wikimedia projects.",
"form-contribution-error": "Please explain your involvement and
contributions in projects other than Wikimedia projects.",
"form-experience-error": "Please provide information about how you
share your experiences with the community.",
+ "form-collaboration-error": "Please provide information about your
collaborations with other Wikimedians or Wikimedia organizations",
"form-why-error": "Please state your interest in attending Wikimania.",
"form-willgetvisa-error": "To proceed, please agree to the visa
requirements.",
"form-willpayincidentals-error": "To proceed, please agree to the
scholarship terms and conditions.",
@@ -108,6 +109,7 @@
"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 lead 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.",
"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-interest": "Interest and involvement in Wikimania",
"form-attended": "Have you attended Wikimania before? If so, in what
year or years?",
@@ -272,6 +274,7 @@
"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-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-engagement": "Engagement with the Wikimedia movement",
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index d68a49c..e778eb2 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -46,6 +46,7 @@
"form-involvement-error": "Error message shown to user when user does not
enter details explaining involvement with Wikimedia project",
"form-contribution-error": "Error message shown to user when user does not
enter details explaining involvement in projects other that Wikimedia projects",
"form-experience-error": "Error message shown to the user when user does
not provide the means of sharing their experiences",
+ "form-collaboration-error": "Error message shown to the user when user
does not provide information about their most prized collaborations with other
Wikimedians",
"form-why-error": "Error message shown to user when user does not enter
reasons for attending Wikimania",
"form-willgetvisa-error": "Error message shown to user when the user does
not agree to visa terms",
"form-willpayincidentals-error": "Error message shown to user does not
agree to incidental cost terms",
@@ -100,6 +101,7 @@
"form-extent-explain": "Input label, followed by multi-line text box",
"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-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-goals a required field",
@@ -241,6 +243,7 @@
"review-view-involvement": "Report label",
"review-view-contrib-explain": "Report label",
"review-view-experience-explain": "Report label",
+ "review-view-collaboration-explain": "Report label",
"review-view-engagement": "Report label",
"review-view-presenter": "Report label",
"review-view-presentation-topic": "Report label.\n{{Identical|Topic}}",
diff --git a/data/templates/apply.html b/data/templates/apply.html
index 43c3198..267666d 100644
--- a/data/templates/apply.html
+++ b/data/templates/apply.html
@@ -121,6 +121,7 @@
{{ forms.textArea( ctx, 'form-extent-explain', 'involvement', {
'required':true } ) }}
{{ forms.textArea( ctx, 'form-contrib-explain', 'contribution', {
'required':true } ) }}
{{ forms.textArea( ctx, 'form-experience-explain', 'experience', {
'required':true } ) }}
+ {{ forms.textArea( ctx, 'form-collaboration-explain', 'collaboration', {
'required':true } ) }}
</fieldset>
<fieldset>
diff --git a/data/templates/review/view.html b/data/templates/review/view.html
index 1041ce0..e2578d7 100644
--- a/data/templates/review/view.html
+++ b/data/templates/review/view.html
@@ -147,6 +147,15 @@
<p>{{ wgLang.message( 'review-view-not-specified' ) }}</p>
{% endif %}
</div>
+
+ <div class="well well-sm">
+ <p><strong>{{ wgLang.message( 'review-view-collaboration-explain'
) }}</strong></p>
+ {% if schol.collaboration is not empty %}
+ <p style="white-space:pre-wrap">{{ schol.collaboration }}</p>
+ {% else %}
+ <p>{{ wgLang.message( 'review-view-not-specified' ) }}</p>
+ {% endif %}
+ </div>
</div>
</div>
diff --git a/src/Wikimania/Scholarship/Forms/Apply.php
b/src/Wikimania/Scholarship/Forms/Apply.php
index f07c147..90fff56 100644
--- a/src/Wikimania/Scholarship/Forms/Apply.php
+++ b/src/Wikimania/Scholarship/Forms/Apply.php
@@ -90,6 +90,7 @@
$this->requireString( 'involvement' );
$this->requireString( 'contribution' );
$this->requireString( 'experience' );
+ $this->requireString( 'collaboration' );
// Interest and involvement in Wikimania
$this->expectBool( 'wm05' );
@@ -241,7 +242,7 @@
'username', 'alt_users', 'project', 'project2',
'community',
'engage1', 'engage2', 'engage3', 'engage4', 'engage6',
'engage6', 'engage7', 'engage8', 'engage9', 'engage10',
- 'involvement', 'contribution', 'experience',
+ 'involvement', 'contribution', 'experience',
'collaboration',
'prev_scholar', 'goals', 'involvement', 'contribution',
'wm05', 'wm06', 'wm07', 'wm08', 'wm09', 'wm10', 'wm11',
'wm12', 'wm13', 'wm14',
'presentation', 'presentationTopic', 'howheard', 'why',
--
To view, visit https://gerrit.wikimedia.org/r/182189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c071d66886c2c0488b6560ca0aa4bcc89ee5475
Gerrit-PatchSet: 5
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Niharika29 <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Niharika29 <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
