Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195225
Change subject: content:where_from: Add new data - Update locales - Update tabs
- Update flags
......................................................................
content:where_from: Add new data
- Update locales
- Update tabs
- Update flags
Change-Id: I7409882869de4268952b46c5ab8007c4cf798a16
---
M locales/en.yml
M source/data/where_from.csv
A source/images/flags_svg/cy.svg
A source/images/flags_svg/cz.svg
A source/images/flags_svg/gr.svg
A source/images/flags_svg/se.svg
A source/images/flags_svg/tr.svg
A source/images/flags_svg/ua.svg
M source/javascripts/content.js
M source/localizable/content.html.erb
10 files changed, 156 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private
refs/changes/25/195225/1
diff --git a/locales/en.yml b/locales/en.yml
index 1466bf7..7073dec 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -227,6 +227,15 @@
slovenia: "Slovenia"
peru: "Peru"
bangladesh: "Bangladesh"
+ china: "China"
+ czech_republic: "Czech Republic"
+ ukraine: "Ukraine"
+ greece: "Greece"
+ japan: "Japan"
+ sri_lanka: "Sri Lanka"
+ sweden: "Sweden"
+ turkey: "Turkey"
+ cyprus: "Cyprus"
english_wikipedia: "English Wikipedia"
wikimedia_commons: "Wikimedia Commons"
diff --git a/source/data/where_from.csv b/source/data/where_from.csv
index c318cf8..0dba5b5 100644
--- a/source/data/where_from.csv
+++ b/source/data/where_from.csv
@@ -61,4 +61,38 @@
Peru,1,0,janjun14
Pakistan,1,0,janjun14
Israel,1,0,janjun14
-Latvia,1,0,janjun14
\ No newline at end of file
+Latvia,1,0,janjun14
+USA,79,0,juldec14
+Germany,25,0,juldec14
+France,15,0,juldec14
+United Kingdom,9,0,juldec14
+Unknown,9,0,juldec14
+Brazil,6,0,juldec14
+Italy,6,0,juldec14
+Australia,5,0,juldec14
+India,4,0,juldec14
+South Korea,3,0,juldec14
+Canada,2,0,juldec14
+China,2,0,juldec14
+Czech Republic,2,0,juldec14
+Netherlands,2,0,juldec14
+Switzerland,2,0,juldec14
+Belgium,1,0,juldec14
+Bulgaria,1,0,juldec14
+Cyprus,1,0,juldec14
+Greece,1,0,juldec14
+Hong Kong,1,0,juldec14
+Israel,1,0,juldec14
+Japan,1,0,juldec14
+Malaysia,1,0,juldec14
+Mexico,1,0,juldec14
+New Zealand,1,0,juldec14
+Poland,1,0,juldec14
+Russia,1,0,juldec14
+Serbia,1,0,juldec14
+Slovenia,1,0,juldec14
+Spain,1,0,juldec14
+Sri Lanka,1,0,juldec14
+Sweden,1,0,juldec14
+Turkey,1,0,juldec14
+Ukraine,1,1,juldec14
diff --git a/source/images/flags_svg/cy.svg b/source/images/flags_svg/cy.svg
new file mode 100644
index 0000000..0f66bb2
--- /dev/null
+++ b/source/images/flags_svg/cy.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" standalone="yes"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<svg xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="1030" height="618" viewBox="0
0 1000 600">
+<rect fill="white" width="1000" height="600" />
+<path id="Cyprus" fill="#ed8000"
d="M427.656,185.589c0,7.68,0.96,8.64,1.44,10.08c0.48,1.44,1.08,27.839-2.88,35.04
+
c-3.96,7.201-11.76,11.28-14.88,12c-3.12,0.72-12.96-6.24-22.081-9.12c-9.12-2.88-8.64-2.4-12.479-2.4s-12.48,3.239-14.88,5.28
+
c-1.56-0.24-1.92-0.96-2.88,0c-0.959,0.96-4.8,4.8-5.76,7.2c-0.96,2.4-3.359,11.521-6.24,12.48
+
c-2.88,0.96-10.68,8.759-15.84,9.121c-5.159,0.36-3.72-0.24-7.2-0.48c-3.479-0.24-3.84-3.84-7.2-5.76
+
c-3.359-1.92-4.32-3.36-4.32-3.36s-0.96-3.84-2.4-3.84c-1.439,0-2.879,6.721-2.879,8.641s3.839,9.12,5.76,10.559
+
c1.92,1.44,1.92,10.081,0.96,12.48c-0.96,2.4,1.92,4.801,2.399,7.2c0.48,2.4-2.879,4.319-1.439,4.8
+
c1.439,0.479,3.36,3.359,3.36,6.24c0,2.88,7.2,3.84,8.64,6.72c1.44,2.88,1.92,7.68,2.4,10.561c0.48,2.88,2.16,1.56,2.399,8.64
+
c2.28,1.08,5.76,3.359,8.64,4.8c2.88,1.44,2.401,4.8,6.24,6.24c3.84,1.439,3.84,0,5.76,0.479c1.92,0.48-0.96,0.961,2.4,1.92
+
c3.361,0.96,4.8-0.479,7.681,0.96c2.88,1.44,4.32,4.801,6.24,5.761s10.08,3.359,10.56,3.84c0.48,0.479,5.76,2.4,6.72,2.4
+
c0.96,0,3.84-1.921,3.84-1.921s3.36,0.96,6.24,0c2.88-0.959,4.8-3.84,6.72-3.84s2.4,0.96,4.32,0.96
+
c1.92,0,4.799-0.96,4.799-0.96s4.32-0.96,7.68,0.96c3.36,1.921,11.04,11.041,11.04,14.881c0,3.839-0.479,5.76-0.479,5.76
+
s3.839-0.481,5.279,0.479c1.44,0.961,1.32-0.839,12,0.961c-0.72-2.641-11.04-10.08-1.44-20.641
+
c9.6-10.561,10.2-6.24,12.48-8.159c2.28-1.921,11.04-7.562,25.92-2.401c14.4-2.399,3.84-4.319,12-4.799
+
c1.44-0.601,4.201,0.119,7.201,0.96c0.96-1.801,3-3.48,6.24-2.881c0.6-1.68,4.559-3.96,8.639-4.319
+
c0.601-3.241,10.921-7.319,16.801-7.681c2.399-2.16,5.16-11.76,18.24-7.2c0.479-3.119,2.64-8.16,6.24-9.12
+
c0.72-6.479-1.682-19.561,4.8-24c6.479-5.88,12.6-4.561,23.52-4.319c7.44,1.56,11.04,7.199,13.439,7.68
+
c2.4,0.48,3.36,0.48,6.24-1.439c2.88-1.921-0.479-5.761,1.92-5.761c2.4,0,1.439,0.48,5.28,0c3.84-0.479,3.36-1.8,5.76-2.399
+
c3.841,1.921,8.16,0.479,10.08,1.92c1.921,1.439,2.16,1.319,6.24,1.92c1.439,2.399,5.279,2.399,5.279,2.399
+
s-2.879-0.96-1.919-2.399c0.96-1.44,0-5.761-1.921-7.681c-1.919-1.92-2.879-2.4-4.319-4.319
+
c-1.439-1.92,0.479-1.921-1.921-4.32c-2.399-2.4-7.679-4.8-9.119-7.68c-1.439-2.88-0.96-4.8-3.36-7.2
+
c-2.399-2.4-12-10.56-12.479-19.2s0.479-16.919,6.239-19.68c-0.24-5.04,0.961-5.76,6.24-8.64s5.762-0.96,9.12-0.96
+
c3.359,0,5.281,0.48,8.64-1.919c3.36-2.4,0.48-7.68,9.12-15.36c8.641-7.68,12-11.52,14.881-12c2.88-0.48,13.319-7.8,17.76-7.2
+
c3.12-3.719,6.24-8.16,10.08-11.04c3.84-2.88,8.161-2.88,10.08-5.28c1.92-2.4,1.439-6.721,7.2-10.561
+
c5.76-3.839,10.561-6.239,12.96-8.16c2.399-1.92,7.68-0.48,9.6-2.4c1.92-1.92,1.92-9.12,3.839-10.56
+
c1.921-1.44-6.239,3.36-10.559,5.28c-4.32,1.92-10.56,5.28-15.84,4.8s-2.401,2.879-5.28,3.84c-2.88,0.96-7.68,0.48-9.601,2.4
+
c-1.92,1.92-5.279,6.72-8.159,8.64c-2.881,1.919-4.32,1.44-7.2,2.88c-2.881,1.44-5.28,2.88-7.68,3.84
+
c-2.4,0.96-9.601,0.48-9.601,0.48s-6.24,8.16-9.12,11.04c-2.88,2.88-6.24,2.4-9.12,3.84c-2.88,1.439-27.36,17.28-44.159,19.68
+
c-16.801,2.399-9.121-1.44-14.4,0c-5.279,1.44-12.961,11.519-19.2,12c-6.24,0.48-8.16,0-9.6,0c-1.44,0-9.12,4.8-13.92,3.84
+
c-7.08,2.16-12.359,1.68-14.4,1.439c-2.04-0.239-5.76,2.4-11.04,0c-4.08-1.319-4.08,1.56-11.999-0.959
+
c-7.921-2.52-13.441,0.96-17.281-0.96c-3.84-1.92-3.36-3.36-6.24-3.36c-2.88,0-2.88,1.92-6.24,1.92
+
c-3.36,0-3.84-1.92-6.72-1.92c-2.88,0-6.24,1.92-10.56,1.44c-4.32-0.48-5.76-2.4-8.64-2.4
+ C443.496,192.309,427.656,185.589,427.656,185.589z" />
+<g fill="#006651">
+<path
d="M476.765,478.801c8.334-6,15.666-8,27-10c11.334-2,23.334-5.332,29.666-7
s-21.332,8-28.332,10C498.099,473.801,476.765,478.801,476.765,478.801z" />
+<path d="M522.432,461.133c-2.332-14.332,3.332-29.332,16.332-35.332
C541.764,436.133,532.432,453.801,522.432,461.133z" />
+<path d="M544.383,453.674c-6.951-11.873,4.814-27.188,13.432-34.697
C561.766,426.133,554.766,447.467,544.383,453.674z"/>
+<path d="M564.766,444.467c-7.432-10.182,1.332-28,10.666-35
C579.098,419.467,575.432,437.467,564.766,444.467z"/>
+<path d="M585.154,431.734c-6.723-9.602-2.055-24.602,7.611-34.268
C599.766,405.467,593.766,422.801,585.154,431.734z"/>
+<path d="M601.432,418.801c-5.666-9,1.334-30.668,10.334-36.668
C615.766,390.133,612.766,412.801,601.432,418.801z"/>
+<path d="M614.432,415.467c-1.666-13,21.002-27.334,30.334-27
C643.766,399.133,634.098,410.801,614.432,415.467z"/>
+<path d="M601.766,430.133c10.666-11,31.332-11,38.666-8.666
C638.432,427.801,614.1,441.799,601.766,430.133z"/>
+<path d="M587.098,441.133c15-4,24.668-7.334,33.668,2
C614.432,451.133,590.098,448.799,587.098,441.133z"/>
+<path d="M565.766,450.801c14.332-7.668,31.666,3.666,34.332,10.332
C584.098,467.801,565.434,452.469,565.766,450.801z"/>
+<path d="M546.098,461.801c13-5,28,1.668,34,9
C573.098,474.133,554.764,477.801,546.098,461.801z"/>
+<path d="M528.1,467.467c15-1.666,29.393,9.686,32.529,16.176
C541.432,485.467,534.1,479.801,528.1,467.467z"/>
+<path
d="M523.268,478.801c-8.334-6-15.666-8-27-10c-11.334-2-23.334-5.332-29.667-7
s21.333,8,28.333,10C501.934,473.801,523.268,478.801,523.268,478.801z"/>
+<path d="M477.6,461.133c2.333-14.332-3.332-29.332-16.333-35.332
C458.267,436.133,467.6,453.801,477.6,461.133z"/>
+<path d="M455.649,453.674c6.951-11.873-4.814-27.188-13.432-34.697
C438.266,426.133,445.266,447.467,455.649,453.674z"/>
+<path d="M435.266,444.467c7.432-10.182-1.332-28-10.666-35
C420.934,419.467,424.6,437.467,435.266,444.467z"/>
+<path d="M414.877,431.734c6.723-9.602,2.055-24.602-7.611-34.268
C400.266,405.467,406.266,422.801,414.877,431.734z"/>
+<path d="M398.6,418.801c5.666-9-1.334-30.668-10.334-36.668
C384.266,390.133,387.266,412.801,398.6,418.801z"/>
+<path d="M385.6,415.467c1.666-13-21.002-27.334-30.334-27
C356.266,399.133,365.934,410.801,385.6,415.467z"/>
+<path d="M398.266,430.133c-10.666-11-31.332-11-38.666-8.666
C361.6,427.801,385.932,441.799,398.266,430.133z"/>
+<path d="M412.934,441.133c-15-4-24.668-7.334-33.668,2
C385.6,451.133,409.934,448.799,412.934,441.133z"/>
+<path d="M434.266,450.801c-14.332-7.668-31.666,3.666-34.332,10.332
C415.934,467.801,434.598,452.469,434.266,450.801z"/>
+<path d="M453.934,461.801c-13-5-28,1.668-34,9
C426.934,474.133,445.268,477.801,453.934,461.801z"/>
+<path d="M471.933,467.467c-15-1.666-29.394,9.686-32.53,16.176
C458.6,485.467,465.933,479.801,471.933,467.467z"/>
+</g>
+</svg>
diff --git a/source/images/flags_svg/cz.svg b/source/images/flags_svg/cz.svg
new file mode 100644
index 0000000..c18c40a
--- /dev/null
+++ b/source/images/flags_svg/cz.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"; width="900" height="600">
+ <rect width="900" height="600" fill="#d7141a"/>
+ <rect width="900" height="300" fill="#fff"/>
+ <path d="M 450,300 0,0 V 600 z" fill="#11457e"/>
+</svg>
\ No newline at end of file
diff --git a/source/images/flags_svg/gr.svg b/source/images/flags_svg/gr.svg
new file mode 100644
index 0000000..e850ddf
--- /dev/null
+++ b/source/images/flags_svg/gr.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="600" height="400" viewBox="0 0 27 18"
xmlns="http://www.w3.org/2000/svg";>
+ <desc>Flag of Greece</desc>
+ <rect width="27" height="18" fill="#0d5eaf"/>
+ <path fill="none" stroke-width="2" stroke="white" d="M5,0V11 M0,5H10
M10,3H27 M10,7H27 M0,11H27 M0,15H27"/>
+</svg>
\ No newline at end of file
diff --git a/source/images/flags_svg/se.svg b/source/images/flags_svg/se.svg
new file mode 100644
index 0000000..521049b
--- /dev/null
+++ b/source/images/flags_svg/se.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg";
width="1600" height="1000" viewBox="0 0 16 10">
+<rect width="16" height="10" fill="#006aa7"/>
+<rect width="2" height="10" x="5" fill="#fecc00"/>
+<rect width="16" height="2" y="4" fill="#fecc00"/>
+</svg>
diff --git a/source/images/flags_svg/tr.svg b/source/images/flags_svg/tr.svg
new file mode 100644
index 0000000..30524de
--- /dev/null
+++ b/source/images/flags_svg/tr.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="1200" height="800">
+<rect width="1200" height="800" fill="#E30A17"/>
+<circle cx="425" cy="400" r="200" style="fill:#ffffff"/>
+<circle cx="475" cy="400" r="160" style="fill:#E30A17"/>
+<polygon style="fill:#ffffff"
+ points="583.334,400 764.235,458.779 652.431,304.894 652.431,495.106
764.235,341.221"/>
+</svg>
diff --git a/source/images/flags_svg/ua.svg b/source/images/flags_svg/ua.svg
new file mode 100644
index 0000000..8f4b0a4
--- /dev/null
+++ b/source/images/flags_svg/ua.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="1200" height="800">
+<rect width="1200" height="800" fill="#005BBB"/>
+<rect width="1200" height="400" y="400" fill="#FFD500"/>
+</svg>
\ No newline at end of file
diff --git a/source/javascripts/content.js b/source/javascripts/content.js
index 9744718..5fd0109 100644
--- a/source/javascripts/content.js
+++ b/source/javascripts/content.js
@@ -49,7 +49,13 @@
"Switzerland": "ch",
"Singapore": "sg",
"New Zealand": "nz",
- "Japan": "jp"
+ "Japan": "jp",
+ "Czech Republic": "cz",
+ "Sweden": "se",
+ "Turkey": "tr",
+ "Greece": "gr",
+ "Cyprus": "cy",
+ "Ukraine": "ua"
}
function requestsAndGranted( data, el, duration ) {
@@ -108,7 +114,6 @@
function makeGraph( data, current ) {
var data = getData( data, current );
-
data.sort( function ( a, b ) {
return b.requests - a.requests;
} )
@@ -166,6 +171,7 @@
.text( function ( d ) {
var id = '#t_';
id += d.key.replace( /\W+/g, ' '
).split( ' ' ).join( '_').toLowerCase();
+ if ($(id).size() === 0)console.log( id
);
return $( id ).val();
} )
.on( 'mouseover', function ( d ) {
@@ -335,7 +341,7 @@
$( function () {
d3.csv( '/data/where_from.csv', function ( error, data ) {
if ( error ) throw error;
- requestsAndGranted( data, 'where_from', 'juldec13' );
+ requestsAndGranted( data, 'where_from', 'juldec14' );
} );
d3.csv( '/data/targeted_takedown.csv', function ( error, data )
{
diff --git a/source/localizable/content.html.erb
b/source/localizable/content.html.erb
index 094b633..d0b2384 100644
--- a/source/localizable/content.html.erb
+++ b/source/localizable/content.html.erb
@@ -72,9 +72,10 @@
<h2><%= t('content.graph_where_from') %></h2>
<ul class="tabs">
<li><a class="where_from_tabs" id="where_from_all"
href="javascript: void(0);"><%= t('dates.all') %></a></li>
- <li><a class="active where_from_tabs"
id="where_from_jul12jun13" href="javascript: void(0);"><%= t('dates.jul') %>
2012 - <%= t('dates.jun') %> 2013</a></li>
+ <li><a class="where_from_tabs"
id="where_from_jul12jun13" href="javascript: void(0);"><%= t('dates.jul') %>
2012 - <%= t('dates.jun') %> 2013</a></li>
<li><a class="where_from_tabs" id="where_from_juldec13"
href="javascript: void(0);"><%= t('dates.jul') %> - <%= t('dates.dec') %>
2013</a></li>
<li><a class="where_from_tabs" id="where_from_janjun14"
href="javascript: void(0);"><%= t('dates.jan') %> - <%= t('dates.jun') %>
2014</a></li>
+ <li><a class="where_from_tabs active"
id="where_from_juldec14" href="javascript: void(0);"><%= t('dates.jul') %> -
<%= t('dates.dec') %> 2014</a></li>
</ul>
<div class="col-md-4" id="where_from_legend">
@@ -303,6 +304,15 @@
<input type="hidden" id="t_norway" value="<%= t('graph.norway') %>">
<input type="hidden" id="t_slovenia" value="<%= t('graph.slovenia') %>">
<input type="hidden" id="t_peru" value="<%= t('graph.peru') %>">
+<input type="hidden" id="t_china" value="<%= t('graph.china') %>">
+<input type="hidden" id="t_czech_republic" value="<%=
t('graph.czech_republic') %>">
+<input type="hidden" id="t_ukraine" value="<%= t('graph.ukraine') %>">
+<input type="hidden" id="t_greece" value="<%= t('graph.greece') %>">
+<input type="hidden" id="t_japan" value="<%= t('graph.japan') %>">
+<input type="hidden" id="t_sweden" value="<%= t('graph.sweden') %>">
+<input type="hidden" id="t_cyprus" value="<%= t('graph.cyprus') %>">
+<input type="hidden" id="t_turkey" value="<%= t('graph.turkey') %>">
+<input type="hidden" id="t_sri_lanka" value="<%= t('graph.sri_lanka') %>">
<input type="hidden" id="t_bangladesh" value="<%= t('graph.bangladesh') %>">
<input type="hidden" id="t_english_wikipedia" value="<%=
t('graph.english_wikipedia') %>">
--
To view, visit https://gerrit.wikimedia.org/r/195225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7409882869de4268952b46c5ab8007c4cf798a16
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
