Niharika29 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/324736
Change subject: Show a prominent flag on review screen if applicant is a minor
......................................................................
Show a prominent flag on review screen if applicant is a minor
Bug: T151375
Change-Id: I283c379827a5b81ff59a167df72d7d19c110cd03
---
M data/templates/inc/helpers.html
M data/templates/review/view.html
M public/css/main.css
3 files changed, 15 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships
refs/changes/36/324736/1
diff --git a/data/templates/inc/helpers.html b/data/templates/inc/helpers.html
index 3691431..25ec4bc 100644
--- a/data/templates/inc/helpers.html
+++ b/data/templates/inc/helpers.html
@@ -22,7 +22,12 @@
{% endmacro %}
{% macro yearsOld( dob ) %}
-{{ date( dob ).diff( date( 'now' ) ).format( '%Y' ) }}
+ {% set date = date( dob ).diff( date( 'now' ) ).format( '%Y' ) %}
+ {% if date > 18 %}
+ ({{ date( dob ).diff( date( 'now' ) ).format( '%Y' ) }})
+ {% else %}
+ <span class="minority-badge"><strong>{{ date( dob ).diff( date( 'now' )
).format( '%Y' ) }}</strong></span>
+ {% endif %}
{% endmacro %}
{% macro gender( ctx, g ) %}
diff --git a/data/templates/review/view.html b/data/templates/review/view.html
index 3f56ffd..9002d31 100644
--- a/data/templates/review/view.html
+++ b/data/templates/review/view.html
@@ -79,7 +79,7 @@
<dt>{{ 'review-view-dateofbirth'|message }}</dt>
<dd>
{% if schol.dob is not empty %}
- {{ schol.dob }} ({{ helpers.yearsOld( schol.dob ) }})
+ {{ schol.dob }} {{ helpers.yearsOld( schol.dob ) }}
{% else %}
{{ 'review-view-not-specified'|message }}
{% endif %}
diff --git a/public/css/main.css b/public/css/main.css
index dd1edd3..880a575 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -119,3 +119,11 @@
a.sortable.sorted-desc {
background-image:
url(data:image/gif;base64,R0lGODlhBwAEAIABACMtMP///yH5BAEKAAEALAAAAAAHAAQAAAIIhA+BGWoNWSgAOw==);
}
+
+.minority-badge {
+ background-color: firebrick;
+ color: white;
+ font-size: 14px;
+ border-radius: 10px;
+ padding: 3px;
+}
--
To view, visit https://gerrit.wikimedia.org/r/324736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I283c379827a5b81ff59a167df72d7d19c110cd03
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Niharika29 <nihar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
