Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225033
Change subject: Add data for privacy page
......................................................................
Add data for privacy page
Change-Id: Ia158a02a43145328fb1c599b63c300cda4bab315
---
M source/data/sum.csv
M source/javascripts/privacy.js
M source/localizable/privacy.html.erb
3 files changed, 18 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private
refs/changes/33/225033/1
diff --git a/source/data/sum.csv b/source/data/sum.csv
index 10a9379..65c9622 100644
--- a/source/data/sum.csv
+++ b/source/data/sum.csv
@@ -31,4 +31,14 @@
China,1,1,0,0,0,0,0,0,0,0,0,juldec14
India,1,1,0,0,0,0,0,0,0,0,0,juldec14
Israel,1,0,0,0,0,0,0,1,0,0,0,juldec14
-Slovenia,1,1,0,0,0,0,0,0,0,0,0,juldec14
\ No newline at end of file
+Slovenia,1,1,0,0,0,0,0,0,0,0,0,juldec14
+USA,8,7,0,0,0,1,0,0,0,0,0,janjun15
+Italy,4,2,0,0,0,0,0,1,0,1,0,janjun15
+Germany,3,2,0,0,0,0,0,0,0,1,0,janjun15
+France,2,2,0,0,0,0,0,0,0,0,0,janjun15
+United Kingdom,1,0,0,0,0,0,0,0,0,1,0,janjun15
+Australia,1,1,0,0,0,0,0,0,0,0,0,janjun15
+Russia,1,0,0,0,0,0,0,0,0,1,0,janjun15
+Canada,1,0,0,0,0,0,0,0,0,1,0,janjun15
+Netherlands,1,0,0,0,0,0,0,0,0,1,0,janjun15
+Unknown,1,1,0,0,0,0,0,0,0,0,0,janjun15
\ No newline at end of file
diff --git a/source/javascripts/privacy.js b/source/javascripts/privacy.js
index 42624a2..116d857 100644
--- a/source/javascripts/privacy.js
+++ b/source/javascripts/privacy.js
@@ -44,7 +44,8 @@
"Switzerland": "ch",
"Singapore": "sg",
"New Zealand": "nz",
- "Japan": "jp"
+ "Japan": "jp",
+ "Unknown": ""
}
/*---Requests---------*/
@@ -729,7 +730,7 @@
var ds = new Requests();
ds.init( data );
- ds.filters.duration = "juldec14";
+ ds.filters.duration = "janjun15";
var dispatch = d3.dispatch( 'filter', 'timerange' );
var tooltip = d3
.select( 'body' )
diff --git a/source/localizable/privacy.html.erb
b/source/localizable/privacy.html.erb
index 8e09643..c27b7cc 100644
--- a/source/localizable/privacy.html.erb
+++ b/source/localizable/privacy.html.erb
@@ -130,7 +130,8 @@
<li><a id="user_data_jul12jun13" class="user_data_tabs"
href="javascript: void(0);"><%= t('dates.jul') %> 2012 - <%= t('dates.jun') %>
2013</a></li>
<li><a id="user_data_juldec13" class="user_data_tabs"
href="javascript: void(0);"><%= t('dates.jul') %> - <%= t('dates.dec') %>
2013</a></li>
<li><a id="user_data_janjun14" class="user_data_tabs"
href="javascript: void(0);"><%= t('dates.jan') %> - <%= t('dates.jun') %>
2014</a></li>
- <li><a id="user_data_juldec14" class="user_data_tabs
active" href="javascript: void(0);"><%= t('dates.jul') %> - <%= t('dates.dec')
%> 2014</a></li>
+ <li><a id="user_data_juldec14" class="user_data_tabs"
href="javascript: void(0);"><%= t('dates.jul') %> - <%= t('dates.dec') %>
2014</a></li>
+ <li><a id="user_data_janjun15" class="user_data_tabs
active" href="javascript: void(0);"><%= t('dates.jan') %> - <%= t('dates.jun')
%> 2015</a></li>
</ul>
<div class="graph">
<div class="row">
@@ -293,6 +294,8 @@
<input type="hidden" id="t_slovenia" value="<%= t('graph.slovenia') %>">
<input type="hidden" id="t_china" value="<%= t('graph.china') %>">
<input type="hidden" id="t_united_kingdom" value="<%=
t('graph.united_kingdom') %>">
+<input type="hidden" id="t_australia" value="<%= t('graph.australia') %>">
+<input type="hidden" id="t_russia" value="<%= t('graph.russia') %>">
<input type="hidden" id="t_france" value="<%= t('graph.france') %>">
<input type="hidden" id="t_germany" value="<%= t('graph.germany') %>">
<input type="hidden" id="t_india" value="<%= t('graph.india') %>">
--
To view, visit https://gerrit.wikimedia.org/r/225033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia158a02a43145328fb1c599b63c300cda4bab315
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
