Siddparmar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/300775
Change subject: user page updates
......................................................................
user page updates
Change-Id: Icff763234b28599934e64f3f4f1dbfcc17184c5c
---
M build/content.html
M build/fr/content.html
M build/fr/privacy.html
M build/privacy.html
M build/stylesheets/master.css
M locales/en.yml
M source/localizable/privacy.html.erb
M source/stylesheets/master.css.scss
8 files changed, 357 insertions(+), 232 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private
refs/changes/75/300775/1
diff --git a/build/content.html b/build/content.html
index 3f15807..1fd9bb5 100644
--- a/build/content.html
+++ b/build/content.html
@@ -139,7 +139,7 @@
<table>
<tr>
<td>Canada</td>
- <td>Politicians, Candidates, & Political
Parties</td>
+ <td>Politicians, candidates, & political
parties</td>
<td>1</td>
</tr>
<tr>
@@ -154,12 +154,12 @@
</tr>
<tr>
<td>Georgia</td>
- <td>Politicians, Candidates, & Political
Parties</td>
+ <td>Politicians, candidates, & political
parties</td>
<td>1</td>
</tr>
<tr>
<td>Turkey</td>
- <td>Government Agency</td>
+ <td>Government agency</td>
<td>1</td>
</tr>
<tr>
@@ -169,12 +169,12 @@
</tr>
<tr>
<td></td>
- <td>Politicians, Candidates, & Political
Parties</td>
+ <td>Politicians, candidates, & political
parties</td>
<td>1</td>
</tr>
<tr>
<td>United States</td>
- <td>Politicians, Candidates, & Political
Parties</td>
+ <td>Politicians, candidates, & political
parties</td>
<td>1</td>
</tr>
</table>
diff --git a/build/fr/content.html b/build/fr/content.html
index 6c67947..0eb4d59 100644
--- a/build/fr/content.html
+++ b/build/fr/content.html
@@ -139,7 +139,7 @@
<table>
<tr>
<td>Canada</td>
- <td>Politicians, Candidates, & Political
Parties</td>
+ <td>Politicians, candidates, & political
parties</td>
<td>1</td>
</tr>
<tr>
@@ -154,12 +154,12 @@
</tr>
<tr>
<td>Georgia</td>
- <td>Politicians, Candidates, & Political
Parties</td>
+ <td>Politicians, candidates, & political
parties</td>
<td>1</td>
</tr>
<tr>
<td>Turkey</td>
- <td>Government Agency</td>
+ <td>Government agency</td>
<td>1</td>
</tr>
<tr>
@@ -169,12 +169,12 @@
</tr>
<tr>
<td></td>
- <td>Politicians, Candidates, & Political
Parties</td>
+ <td>Politicians, candidates, & political
parties</td>
<td>1</td>
</tr>
<tr>
<td>United States</td>
- <td>Politicians, Candidates, & Political
Parties</td>
+ <td>Politicians, candidates, & political
parties</td>
<td>1</td>
</tr>
</table>
diff --git a/build/fr/privacy.html b/build/fr/privacy.html
index ef0a867..178b984 100644
--- a/build/fr/privacy.html
+++ b/build/fr/privacy.html
@@ -97,68 +97,102 @@
<p><a
href='https://fr.wikipedia.org/wiki/Oscar_Wilde'>Oscar Wilde</a>
<small>Écrivain et Poète (<a
href='https://fr.wikiquote.org/wiki/Oscar_Wilde'>1891</a>)</small></p>
</footer>
</blockquote>
+</div>
- <div class="story summary_table">
- <h3 id="summary">
- <small>Janvier – Juin 2016</small><br />
- Résumé
- </h3>
- <hr />
- <table>
- <tr class="highlight">
- <td>Nombre total de requêtes</td>
- <td>13</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#informal_non_government_requests">Requêtes
non-gouvernementales informelles</td>
- <td>7</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#informal_government_requests">Requêtes gouvernementales
informelles</a></td>
- <td>6</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#civil_subpoena">Assignations civiles</a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#criminal_subpoena">Assignations pénales</a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#administrative_subpoena">Assignations administratives</a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#search_warrant">Mandats de perquisition</a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#court_order">Ordonnances de tribunal</a></td>
- <td>0</td>
- </tr>
- <tr class="last">
- <td class="indent"><a
href="./faq.html#national_security_request">National Security Requests</a></td>
- <td>0</td>
- </tr>
- <tr class="highlight">
- <td>Informations fournies pour</td>
- <td>0</td>
- </tr>
- <tr class="highlight">
- <td>Comptes utilisateurs potentiellement
concernés</td>
- <td>14</td>
- </tr>
- <tr class="highlight">
- <td>Comptes utilisateurs réellement
concernés</td>
- <td>0</td>
- </tr>
- <tr class="highlight">
- <td>User Accounts Notified</td>
- <td>0</td>
- </tr>
- </table>
+<div class="col-md-12">
+
+ <div class="col-md-6">
+ <div class="story summary_table">
+ <h3 id="summary">
+ <small>Janvier – Juin 2016</small><br />
+ Résumé
+ </h3>
+ <hr />
+ <table>
+ <tr class="highlight">
+ <td>Nombre total de requêtes</td>
+ <td>13</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#informal_non_government_requests">Requêtes
non-gouvernementales informelles</td>
+ <td>7</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#informal_government_requests">Requêtes gouvernementales
informelles</a></td>
+ <td>6</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#civil_subpoena">Assignations civiles</a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#criminal_subpoena">Assignations pénales</a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#administrative_subpoena">Assignations administratives</a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#search_warrant">Mandats de perquisition</a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#court_order">Ordonnances de tribunal</a></td>
+ <td>0</td>
+ </tr>
+ <tr class="last">
+ <td class="indent"><a
href="./faq.html#national_security_request">National security requests</a></td>
+ <td>0</td>
+ </tr>
+ <tr class="highlight">
+ <td>Informations fournies pour</td>
+ <td>0</td>
+ </tr>
+ <tr class="highlight">
+ <td>Comptes utilisateurs
potentiellement concernés</td>
+ <td>14</td>
+ </tr>
+ <tr class="highlight">
+ <td>Comptes utilisateurs réellement
concernés</td>
+ <td>0</td>
+ </tr>
+ <tr class="highlight">
+ <td>User accounts Notified</td>
+ <td>0</td>
+ </tr>
+ </table>
+ </div>
</div>
+
+ <div class="col-md-6 info_type">
+
+ <h2 class="info_type__head">Type of information requested</h2>
+
+ <div class="col-md-6">
+ <section class="scorecard">
+ <h2>Janvier 2016 – Juin 2016</h2>
+ <dl>
+ <dt>Content requests</dt>
+ <dd>0</dd>
+ </dl>
+ </section>
+ </div>
+
+ <div class="col-md-6">
+ <section class="scorecard">
+ <h2>Janvier 2016 – Juin 2016</h2>
+ <dl>
+ <dt>Non-content requests</dt>
+ <dd>13</dd>
+ </dl>
+ </section>
+ </div>
+
+ <p>Most content information on the Wikimedia projects is the
public content of articles and project pages; “non-content” information refers
to information such as <a href="https://en.wikipedia.org/wiki/IP_address";>IP
addresses</a> or <a href="https://en.wikipedia.org/wiki/User_agent";>user
agent</a> information. The distinction comes from the <a
href="https://en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act";>Electronic
Communications Privacy Act</a>, or ECPA. Please see our <a
href="./faq.html">FAQ</a> for more information.</p>
+
+ </div>
+
</div>
<div class="col-md-12">
@@ -233,32 +267,32 @@
</tr>
<tr>
<td class="indent">Australia</td>
- <td>State Police</td>
+ <td>State police</td>
<td>1</td>
</tr>
<tr>
<td class="indent">France</td>
- <td>Local Police</td>
+ <td>Local police</td>
<td>1</td>
</tr>
<tr>
<td class="indent">Germany</td>
- <td>Local Police</td>
+ <td>Local police</td>
<td>1</td>
</tr>
<tr>
<td class="indent">India</td>
- <td>Local Police</td>
+ <td>Local police</td>
<td>1</td>
</tr>
<tr>
<td class="indent">Italy</td>
- <td>Judicial Police</td>
+ <td>Judicial police</td>
<td>1</td>
</tr>
<tr>
<td class="indent">United Kingdom</td>
- <td>Politicians, Candidates, & Political
Parties</td>
+ <td>Politicians, candidates, & political
parties</td>
<td>1</td>
</tr>
</table>
@@ -281,7 +315,7 @@
<div class="col-md-8">
<h2>Emergency Disclosures</h2>
- <p>On rare occasions, we become aware of concerning statements on the
Wikimedia projects, like a suicide threat or bomb threat. We take these
statements seriously and assess each one individually. As appropriate, we
contact the authorities to help resolve the issue.</p><p>The stories below are
real. They are also meant to be illustrative of the kinds of situations that
would warrant a possible voluntary disclosure of user information. Please note
that these specific stories may not have occurred during the precise time frame
that this transparency report covers. Some variables, such as the privacy of
our users, may require our postponing the reporting of certain stories.</p>
+ <p>We report two types of emergency disclosures, which happen on rare
occasions. First, the <a
href='https://en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act'>Electronic
Communications Privacy Act</a> provides an expedited process for law
enforcement to request user data from websites in cases of immediate threat to
life or limb. Such requests are also addressed in our <a
href='https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines#Emergency_Requests'>Requests
for User Information Procedures & Guidelines</a> and <a
href='https://wikimediafoundation.org/wiki/Privacy_policy#sharing'>Privacy
Policy</a>. Second, we proactively contact the authorities when we become aware
of troubling statements on the projects, such as suicide threats or bomb
threats. We take these statements seriously and assess each one individually,
contacting law enforcement as appropriate to help resolve the issue.</p> <p>The
stories below are real. They are also meant to be illustrative of the kinds of
situations that would warrant a possible emergency disclosure of user
information. Please note that these specific stories may not have occurred
during the precise time frame that this transparency report covers. Some
variables, such as the privacy of our users, may require our postponing the
reporting of certain stories.</p>
</div>
<div class="clear"></div>
diff --git a/build/privacy.html b/build/privacy.html
index 555a4d5..54b1f1e 100644
--- a/build/privacy.html
+++ b/build/privacy.html
@@ -68,7 +68,7 @@
<section class="scorecard">
<h2>Jan 2016 – Jun 2016</h2>
<dl>
- <dt>Total Number of Requests</dt>
+ <dt>Total user data requests</dt>
<dd>13</dd>
</dl>
</section>
@@ -97,68 +97,102 @@
<p><a
href='//en.wikipedia.org/wiki/Mary_Alice_Monroe'>Mary Alice
Monroe</a><small>Author (<a
href='//en.wikiquote.org/wiki/Mary_Alice_Monroe'>2012</a>)</small></p>
</footer>
</blockquote>
+</div>
- <div class="story summary_table">
- <h3 id="summary">
- <small>Jan – Jun 2016</small><br />
- Summary
- </h3>
- <hr />
- <table>
- <tr class="highlight">
- <td>Total Number of Requests</td>
- <td>13</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#informal_non_government_requests">Informal Non-Government
Requests</td>
- <td>7</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#informal_government_requests">Informal Government
Requests</a></td>
- <td>6</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#civil_subpoena">Civil Subpoenas</a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#criminal_subpoena">Criminal Subpoenas</a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#administrative_subpoena">Administrative Subpoenas</a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#search_warrant">Search Warrants</a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#court_order">Court Orders</a></td>
- <td>0</td>
- </tr>
- <tr class="last">
- <td class="indent"><a
href="./faq.html#national_security_request">National Security Requests</a></td>
- <td>0</td>
- </tr>
- <tr class="highlight">
- <td>Information produced</td>
- <td>0</td>
- </tr>
- <tr class="highlight">
- <td>User Accounts Potentially Affected</td>
- <td>14</td>
- </tr>
- <tr class="highlight">
- <td>User Accounts Actually Affected</td>
- <td>0</td>
- </tr>
- <tr class="highlight">
- <td>User Accounts Notified</td>
- <td>0</td>
- </tr>
- </table>
+<div class="col-md-12">
+
+ <div class="col-md-6">
+ <div class="story summary_table">
+ <h3 id="summary">
+ <small>Jan – Jun 2016</small><br />
+ Summary
+ </h3>
+ <hr />
+ <table>
+ <tr class="highlight">
+ <td>Total user data requests</td>
+ <td>13</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#informal_non_government_requests">Informal non-government
requests</td>
+ <td>7</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#informal_government_requests">Informal government
requests</a></td>
+ <td>6</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#civil_subpoena">Civil subpoenas</a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#criminal_subpoena">Criminal subpoenas</a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#administrative_subpoena">Administrative subpoenas</a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#search_warrant">Search warrants</a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#court_order">Court orders</a></td>
+ <td>0</td>
+ </tr>
+ <tr class="last">
+ <td class="indent"><a
href="./faq.html#national_security_request">National security requests</a></td>
+ <td>0</td>
+ </tr>
+ <tr class="highlight">
+ <td>Information produced</td>
+ <td>0</td>
+ </tr>
+ <tr class="highlight">
+ <td>User accounts potentially
affected</td>
+ <td>14</td>
+ </tr>
+ <tr class="highlight">
+ <td>User accounts actually affected</td>
+ <td>0</td>
+ </tr>
+ <tr class="highlight">
+ <td>User accounts Notified</td>
+ <td>0</td>
+ </tr>
+ </table>
+ </div>
</div>
+
+ <div class="col-md-6 info_type">
+
+ <h2 class="info_type__head">Type of information requested</h2>
+
+ <div class="col-md-6">
+ <section class="scorecard">
+ <h2>Jan 2016 – Jun 2016</h2>
+ <dl>
+ <dt>Content requests</dt>
+ <dd>0</dd>
+ </dl>
+ </section>
+ </div>
+
+ <div class="col-md-6">
+ <section class="scorecard">
+ <h2>Jan 2016 – Jun 2016</h2>
+ <dl>
+ <dt>Non-content requests</dt>
+ <dd>13</dd>
+ </dl>
+ </section>
+ </div>
+
+ <p>Most content information on the Wikimedia projects is the
public content of articles and project pages; “non-content” information refers
to information such as <a href="https://en.wikipedia.org/wiki/IP_address";>IP
addresses</a> or <a href="https://en.wikipedia.org/wiki/User_agent";>user
agent</a> information. The distinction comes from the <a
href="https://en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act";>Electronic
Communications Privacy Act</a>, or ECPA. Please see our <a
href="./faq.html">FAQ</a> for more information.</p>
+
+ </div>
+
</div>
<div class="col-md-12">
@@ -233,32 +267,32 @@
</tr>
<tr>
<td class="indent">Australia</td>
- <td>State Police</td>
+ <td>State police</td>
<td>1</td>
</tr>
<tr>
<td class="indent">France</td>
- <td>Local Police</td>
+ <td>Local police</td>
<td>1</td>
</tr>
<tr>
<td class="indent">Germany</td>
- <td>Local Police</td>
+ <td>Local police</td>
<td>1</td>
</tr>
<tr>
<td class="indent">India</td>
- <td>Local Police</td>
+ <td>Local police</td>
<td>1</td>
</tr>
<tr>
<td class="indent">Italy</td>
- <td>Judicial Police</td>
+ <td>Judicial police</td>
<td>1</td>
</tr>
<tr>
<td class="indent">United Kingdom</td>
- <td>Politicians, Candidates, & Political
Parties</td>
+ <td>Politicians, candidates, & political
parties</td>
<td>1</td>
</tr>
</table>
@@ -281,7 +315,7 @@
<div class="col-md-8">
<h2>Emergency Disclosures</h2>
- <p>On rare occasions, we become aware of concerning statements on the
Wikimedia projects, like a suicide threat or bomb threat. We take these
statements seriously and assess each one individually. As appropriate, we
contact the authorities to help resolve the issue.</p><p>The stories below are
real. They are also meant to be illustrative of the kinds of situations that
would warrant a possible voluntary disclosure of user information. Please note
that these specific stories may not have occurred during the precise time frame
that this transparency report covers. Some variables, such as the privacy of
our users, may require our postponing the reporting of certain stories.</p>
+ <p>We report two types of emergency disclosures, which happen on rare
occasions. First, the <a
href='https://en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act'>Electronic
Communications Privacy Act</a> provides an expedited process for law
enforcement to request user data from websites in cases of immediate threat to
life or limb. Such requests are also addressed in our <a
href='https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines#Emergency_Requests'>Requests
for User Information Procedures & Guidelines</a> and <a
href='https://wikimediafoundation.org/wiki/Privacy_policy#sharing'>Privacy
Policy</a>. Second, we proactively contact the authorities when we become aware
of troubling statements on the projects, such as suicide threats or bomb
threats. We take these statements seriously and assess each one individually,
contacting law enforcement as appropriate to help resolve the issue.</p> <p>The
stories below are real. They are also meant to be illustrative of the kinds of
situations that would warrant a possible emergency disclosure of user
information. Please note that these specific stories may not have occurred
during the precise time frame that this transparency report covers. Some
variables, such as the privacy of our users, may require our postponing the
reporting of certain stories.</p>
</div>
<div class="clear"></div>
diff --git a/build/stylesheets/master.css b/build/stylesheets/master.css
index 48a42cd..027a19c 100644
--- a/build/stylesheets/master.css
+++ b/build/stylesheets/master.css
@@ -3,7 +3,10 @@
.container { padding: 0; }
-.summary_table { width: 70%; }
+.info_type { padding: 0; }
+.info_type .info_type__head { margin-left: 5px; }
+.info_type .col-md-6 { padding: 0 5px; }
+.info_type p { clear: both; padding: 30px 5px 0 5px; }
.clear { clear: both; }
diff --git a/locales/en.yml b/locales/en.yml
index d21c1fe..a80f9d9 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -35,7 +35,7 @@
privacy:
title: "Requests for<br/>User Data"
- total_number_of_requests: "Total Number of Requests"
+ total_number_of_requests: "Total user data requests"
percentage_of_times_information_produced: "Percentage of Times Information
Produced"
lead: "<a
href='//meta.wikimedia.org/wiki/Wikimedia_Foundation_Guiding_Principles#Free_speech'>Freedom
of speech is essential</a> to the Wikimedia movement—our projects cannot
flourish in an ecosystem where individuals cannot speak freely. Our users trust
us to protect their identities against unlawful disclosure, and we take this
responsibility seriously."
intro: "<p>However, every year, governments, individuals, and corporations
ask us to disclose user data. Often, we have no nonpublic information to
disclose because we <a
href='//wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It'>collect
little nonpublic information</a> about users and retain that information for a
<a href='//meta.wikimedia.org/wiki/Data_retention_guidelines'>short period of
time</a>. But when we do have data, we carefully evaluate every request before
considering disclosure. If the requests do not meet our <a
href='//wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines'>standards</a>—if
they are overly broad, unclear, or irrelevant—we will push back on behalf of
our users.</p><p>If we must produce information due to a legally valid request,
we will <a
href='//wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines#Notifying_Our_Users_of_Your_Request'>notify
the affected user</a> before we disclose, if we are <a
href='./faq.html#nonpublic_personal_information'>legally permitted and have the
means</a> to do so. In certain cases, we may <a
href='./faq.html#my_personal_information'>help find assistance</a> for users to
fight an invalid request.</p><p>Below, you will find more information about the
requests for user data we receive.</p>"
@@ -46,29 +46,35 @@
compared_to_others: "Compared to other companies, we received relatively
few requests"
request_response: "Requests for user data, and how we responded"
information_produced: "Number of Times Information Produced"
- informal_non_govt: "Informal Non-Government Requests"
- informal_govt: "Informal Government Requests"
- civil_subpoenas: "Civil Subpoenas"
- criminal_subpoenas: "Criminal Subpoenas"
- administrative_subpoenas: "Administrative Subpoenas"
- search_warrants: "Search Warrants"
- court_orders: "Court Orders"
- national_security_requests: "National Security Requests"
- user_potentially_affected: "User Accounts Potentially Affected"
- user_actually_affected: "User Accounts Actually Affected"
- user_accounts_notified: "User Accounts Notified"
+ informal_non_govt: "Informal non-government requests"
+ informal_govt: "Informal government requests"
+ civil_subpoenas: "Civil subpoenas"
+ criminal_subpoenas: "Criminal subpoenas"
+ administrative_subpoenas: "Administrative subpoenas"
+ search_warrants: "Search warrants"
+ court_orders: "Court orders"
+ national_security_requests: "National security requests"
+ user_potentially_affected: "User accounts potentially affected"
+ user_actually_affected: "User accounts actually affected"
+ user_accounts_notified: "User accounts Notified"
total_requests: "Total requests"
information_produced: "Information produced"
information_was_produced: "Requests where information was produced"
+ content_requests: "Content requests"
+ non-content_requests: "Non-content requests"
bubble_graph_fineprint: "Due to the inconsistent release dates across
different organizations, comparison data for the period covered by this report
(January 2016 - July 2016) was not available, so we are presenting the
comparison data above for June 2015 - December 2015. Please also note that
figures for Wikimedia include additional types of requests for user data that
are not included in the other organizations' figures. See the <a
href='./faq.html#different_compare'>FAQ</a> for more details."
show_all: "Show All"
request_type: "Request Type"
information_produced_title: "Information Produced?"
by_country: "By Country"
graph_voluntary_disclosure: "Voluntary disclosures by type"
- voluntary_disclosures_title: "Emergency Disclosures"
- voluntary_disclosures_intro: "<p>On rare occasions, we become aware of
concerning statements on the Wikimedia projects, like a suicide threat or bomb
threat. We take these statements seriously and assess each one individually. As
appropriate, we contact the authorities to help resolve the issue.</p><p>The
stories below are real. They are also meant to be illustrative of the kinds of
situations that would warrant a possible voluntary disclosure of user
information. Please note that these specific stories may not have occurred
during the precise time frame that this transparency report covers. Some
variables, such as the privacy of our users, may require our postponing the
reporting of certain stories.</p>"
- total_number_of_voluntary_disclosures: "Total number of disclosures"
+ emergency_disclosures_title: "Emergency Disclosures"
+ emergency_disclosures_intro: "
+ <p>We report two types of emergency disclosures, which happen on rare
occasions. First, the <a
href='https://en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act'>Electronic
Communications Privacy Act</a> provides an expedited process for law
enforcement to request user data from websites in cases of immediate threat to
life or limb. Such requests are also addressed in our <a
href='https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines#Emergency_Requests'>Requests
for User Information Procedures & Guidelines</a> and <a
href='https://wikimediafoundation.org/wiki/Privacy_policy#sharing'>Privacy
Policy</a>. Second, we proactively contact the authorities when we become aware
of troubling statements on the projects, such as suicide threats or bomb
threats. We take these statements seriously and assess each one individually,
contacting law enforcement as appropriate to help resolve the issue.</p>
+ <p>The stories below are real. They are also meant to be illustrative of
the kinds of situations that would warrant a possible emergency disclosure of
user information. Please note that these specific stories may not have occurred
during the precise time frame that this transparency report covers. Some
variables, such as the privacy of our users, may require our postponing the
reporting of certain stories.</p>
+ "
+
+ total_number_of_emergency_disclosures: "Total number of disclosures"
story_emergency_title: "A Deadly Threat"
story_emergency_body: "The community shares threats with the Foundation
when they find them. When an anonymous poster made an alleged bomb threat, we
found that the edit was made from an <a
href='//en.wikipedia.org/wiki/IP_address'>IP address</a> that was near the
apparent threat location. As permitted by our privacy policy, we alerted local
police, passing on the IP address and details we had about the threat. The
police informed us they had located and arrested the person in question, who
allegedly had weapons available and reportedly confessed."
@@ -449,16 +455,16 @@
warrant: "Warrants"
court_orders: "Court Orders"
court_order: "Court Order"
- state_police: "State Police"
- local_police: "Local Police"
- federal_agency: "Federal Agency"
- government_agency: "Government Agency"
- federal_police: "Federal Police"
+ state_police: "State police"
+ local_police: "Local police"
+ federal_agency: "Federal agency"
+ government_agency: "Government agency"
+ federal_police: "Federal police"
executive_office: "Executive Office"
municipal_government: "Municipal Government"
doj: "DOJ"
uknmd: "U.K. Non-Ministerial Department"
- politicians_candidates: "Politicians, Candidates, & Political Parties"
+ politicians_candidates: "Politicians, candidates, & political parties"
ministry: "Ministry"
military: "Military"
university: "University (Asserting Governmental Rights)"
@@ -466,7 +472,7 @@
cps: "Crown Prosecution Service"
upa: "Unspecified Police Agency"
cjp: "City Judicial Police"
- jp: "Judicial Police"
+ jp: "Judicial police"
prosecutorial_agency: "Prosecutorial Agency"
former: "Former Government Official"
cons_emb: "Consulate or Embassy"
diff --git a/source/localizable/privacy.html.erb
b/source/localizable/privacy.html.erb
index 51ec771..d34c143 100644
--- a/source/localizable/privacy.html.erb
+++ b/source/localizable/privacy.html.erb
@@ -39,68 +39,102 @@
<p><%= t('privacy.cite') %></p>
</footer>
</blockquote>
+</div>
- <div class="story summary_table">
- <h3 id="summary">
- <small><%= t('dates.jan') %> – <%= t('dates.jun') %>
2016</small><br />
- <%= t('privacy.summary') %>
- </h3>
- <hr />
- <table>
- <tr class="highlight">
- <td><%= t('privacy.total_number_of_requests')
%></td>
- <td>13</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#informal_non_government_requests"><%=
t('privacy.informal_non_govt') %></td>
- <td>7</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#informal_government_requests"><%= t('privacy.informal_govt')
%></a></td>
- <td>6</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#civil_subpoena"><%= t('privacy.civil_subpoenas') %></a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#criminal_subpoena"><%= t('privacy.criminal_subpoenas')
%></a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#administrative_subpoena"><%=
t('privacy.administrative_subpoenas') %></a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#search_warrant"><%= t('privacy.search_warrants') %></a></td>
- <td>0</td>
- </tr>
- <tr>
- <td class="indent"><a
href="./faq.html#court_order"><%= t('privacy.court_orders') %></a></td>
- <td>0</td>
- </tr>
- <tr class="last">
- <td class="indent"><a
href="./faq.html#national_security_request"><%=
t('privacy.national_security_requests') %></a></td>
- <td>0</td>
- </tr>
- <tr class="highlight">
- <td><%= t('privacy.information_produced')
%></td>
- <td>0</td>
- </tr>
- <tr class="highlight">
- <td><%= t('privacy.user_potentially_affected')
%></td>
- <td>14</td>
- </tr>
- <tr class="highlight">
- <td><%= t('privacy.user_actually_affected')
%></td>
- <td>0</td>
- </tr>
- <tr class="highlight">
- <td><%= t('privacy.user_accounts_notified')
%></td>
- <td>0</td>
- </tr>
- </table>
+<div class="col-md-12">
+
+ <div class="col-md-6">
+ <div class="story summary_table">
+ <h3 id="summary">
+ <small><%= t('dates.jan') %> – <%=
t('dates.jun') %> 2016</small><br />
+ <%= t('privacy.summary') %>
+ </h3>
+ <hr />
+ <table>
+ <tr class="highlight">
+ <td><%=
t('privacy.total_number_of_requests') %></td>
+ <td>13</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#informal_non_government_requests"><%=
t('privacy.informal_non_govt') %></td>
+ <td>7</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#informal_government_requests"><%= t('privacy.informal_govt')
%></a></td>
+ <td>6</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#civil_subpoena"><%= t('privacy.civil_subpoenas') %></a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#criminal_subpoena"><%= t('privacy.criminal_subpoenas')
%></a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#administrative_subpoena"><%=
t('privacy.administrative_subpoenas') %></a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#search_warrant"><%= t('privacy.search_warrants') %></a></td>
+ <td>0</td>
+ </tr>
+ <tr>
+ <td class="indent"><a
href="./faq.html#court_order"><%= t('privacy.court_orders') %></a></td>
+ <td>0</td>
+ </tr>
+ <tr class="last">
+ <td class="indent"><a
href="./faq.html#national_security_request"><%=
t('privacy.national_security_requests') %></a></td>
+ <td>0</td>
+ </tr>
+ <tr class="highlight">
+ <td><%=
t('privacy.information_produced') %></td>
+ <td>0</td>
+ </tr>
+ <tr class="highlight">
+ <td><%=
t('privacy.user_potentially_affected') %></td>
+ <td>14</td>
+ </tr>
+ <tr class="highlight">
+ <td><%=
t('privacy.user_actually_affected') %></td>
+ <td>0</td>
+ </tr>
+ <tr class="highlight">
+ <td><%=
t('privacy.user_accounts_notified') %></td>
+ <td>0</td>
+ </tr>
+ </table>
+ </div>
</div>
+
+ <div class="col-md-6 info_type">
+
+ <h2 class="info_type__head">Type of information requested</h2>
+
+ <div class="col-md-6">
+ <section class="scorecard">
+ <h2><%= t('dates.jan') %> 2016 – <%=
t('dates.jun') %> 2016</h2>
+ <dl>
+ <dt><%= t('privacy.content_requests')
%></dt>
+ <dd>0</dd>
+ </dl>
+ </section>
+ </div>
+
+ <div class="col-md-6">
+ <section class="scorecard">
+ <h2><%= t('dates.jan') %> 2016 – <%=
t('dates.jun') %> 2016</h2>
+ <dl>
+ <dt><%=
t('privacy.non-content_requests') %></dt>
+ <dd>13</dd>
+ </dl>
+ </section>
+ </div>
+
+ <p>Most content information on the Wikimedia projects is the
public content of articles and project pages; “non-content” information refers
to information such as <a href="https://en.wikipedia.org/wiki/IP_address";>IP
addresses</a> or <a href="https://en.wikipedia.org/wiki/User_agent";>user
agent</a> information. The distinction comes from the <a
href="https://en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act";>Electronic
Communications Privacy Act</a>, or ECPA. Please see our <a
href="./faq.html">FAQ</a> for more information.</p>
+
+ </div>
+
</div>
<div class="col-md-12">
@@ -215,15 +249,15 @@
<section class="scorecard">
<h2><%= t('dates.jul') %> 2015 – <%= t('dates.dec') %> 2015</h2>
<dl>
- <dt><%= t('privacy.total_number_of_voluntary_disclosures') %></dt>
+ <dt><%= t('privacy.total_number_of_emergency_disclosures') %></dt>
<dd>12</dd>
</dl>
</section>
</div>
<div class="col-md-8">
- <h2><%= t('privacy.voluntary_disclosures_title') %></h2>
- <%= t('privacy.voluntary_disclosures_intro') %>
+ <h2><%= t('privacy.emergency_disclosures_title') %></h2>
+ <%= t('privacy.emergency_disclosures_intro') %>
</div>
<div class="clear"></div>
diff --git a/source/stylesheets/master.css.scss
b/source/stylesheets/master.css.scss
index 41e18ee..156a880 100644
--- a/source/stylesheets/master.css.scss
+++ b/source/stylesheets/master.css.scss
@@ -13,7 +13,21 @@
}
.summary_table {
- width: 70%;
+ // width: 70%;
+}
+
+.info_type {
+ padding: 0;
+ .info_type__head {
+ margin-left: 5px;
+ }
+ .col-md-6 {
+ padding: 0 5px;
+ }
+ p {
+ clear: both;
+ padding: 30px 5px 0 5px;
+ }
}
.clear {
--
To view, visit https://gerrit.wikimedia.org/r/300775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icff763234b28599934e64f3f4f1dbfcc17184c5c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Siddparmar <siddharth2par...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
