Prtksxna has submitted this change and it was merged.
Change subject: Use protocol relative URLs for some links on Transparency
Report pages
......................................................................
Use protocol relative URLs for some links on Transparency Report pages
Some links on the Wikimedia Foundation Transparency Report have hard coded
"http:" as their protocol. I changed them to protocol relative links
(those start with "//"). The links with hard coded https are not changed
to protocol relative.
Change-Id: Id2b651cb64cf803bf87cb7d5e25ea350a944474f
---
M build/content.html
M build/faq.html
M build/index.html
M build/javascripts/content.js
M build/privacy.html
M locales/en.yml
M source/javascripts/content.js
M source/layouts/layout.erb
M source/localizable/content.html.erb
9 files changed, 33 insertions(+), 33 deletions(-)
Approvals:
Prtksxna: Verified; Looks good to me, approved
JanZerebecki: Looks good to me, but someone else must approve
diff --git a/build/content.html b/build/content.html
index f01f626..7a59750 100644
--- a/build/content.html
+++ b/build/content.html
@@ -75,7 +75,7 @@
<blockquote>
<p>We change people through conversation, not through censorship.</p>
<footer>
- <a href="http://commons.wikimedia.org/wiki/File:Jay-Z_2011.jpg";><img
src="/images/quote_jay.png"></a>
+ <a href="//commons.wikimedia.org/wiki/File:Jay-Z_2011.jpg"><img
src="/images/quote_jay.png"></a>
<p><a href='https://en.wikipedia.org/wiki/Jay-Z'>Jay
Z</a><small>Musician (<a
href='https://en.wikipedia.org/wiki/Decoded_%28book%29'>2010</a>)</small></p>
</footer>
</blockquote>
@@ -195,7 +195,7 @@
<h3>
The Classics<br><small>November 2013</small>
</h3>
- <p>A publishing company sent us a takedown request concerning four famous
works on <a href='https://wikisource.org/'>Wikisource</a>: French translations
of <a href='https://en.wikipedia.org/wiki/Jane_Austen'>Jane Austen's</a> <a
href='http://fr.wikisource.org/wiki/Les_Cinq_Filles_de_Mrs_Bennet'><em>Pride
and Prejudice</em></a> and <a
href='http://fr.wikisource.org/wiki/Persuasion'><em>Persuasion</em></a>, a
French translation of <a
href='https://en.wikipedia.org/wiki/Arthur_Conan_Doyle'>Arthur Conan
Doyle's</a> <a
href='https://fr.wikisource.org/wiki/Les_Aventures_de_Sherlock_Holmes'><em>The
Adventures of Sherlock Holmes</em></a>, and <a
href='https://en.wikipedia.org/wiki/Jean_de_la_Fontaine'>Jean de la
Fontaine’s</a> <a
href='http://fr.wikisource.org/wiki/Fables_de_La_Fontaine,_livres_I-III'><em>Fables</em></a>.
We immediately noticed the peculiarity with the request: all four original
works (and likely their French translations as well) were old enough to have
fallen into the <a href='https://en.wikipedia.org/wiki/Public_domain'>public
domain</a>. When we alerted the company to this point, it rescinded the
takedown notice.</p>
+ <p>A publishing company sent us a takedown request concerning four famous
works on <a href='https://wikisource.org/'>Wikisource</a>: French translations
of <a href='https://en.wikipedia.org/wiki/Jane_Austen'>Jane Austen's</a> <a
href='//fr.wikisource.org/wiki/Les_Cinq_Filles_de_Mrs_Bennet'><em>Pride and
Prejudice</em></a> and <a
href='//fr.wikisource.org/wiki/Persuasion'><em>Persuasion</em></a>, a French
translation of <a
href='https://en.wikipedia.org/wiki/Arthur_Conan_Doyle'>Arthur Conan
Doyle's</a> <a
href='https://fr.wikisource.org/wiki/Les_Aventures_de_Sherlock_Holmes'><em>The
Adventures of Sherlock Holmes</em></a>, and <a
href='https://en.wikipedia.org/wiki/Jean_de_la_Fontaine'>Jean de la
Fontaine’s</a> <a
href='//fr.wikisource.org/wiki/Fables_de_La_Fontaine,_livres_I-III'><em>Fables</em></a>.
We immediately noticed the peculiarity with the request: all four original
works (and likely their French translations as well) were old enough to have
fallen into the <a href='https://en.wikipedia.org/wiki/Public_domain'>public
domain</a>. When we alerted the company to this point, it rescinded the
takedown notice.</p>
</div>
</div>
@@ -265,16 +265,16 @@
<ul>
<li><a
href="https://meta.wikimedia.org/wiki/Wikimedia_Foundation_Transparency_Report";>Wiki
Version</a></li>
<li><a
href="/data/data_aug2014.ods">Download Data</a></li>
- <li><a
href="http://wikimediafoundation.org/wiki/Privacy_policy";>Privacy
Policy</a></li>
+ <li><a
href="//wikimediafoundation.org/wiki/Privacy_policy">Privacy Policy</a></li>
<li><a
href="https://meta.wikimedia.org/wiki/Data_retention_guidelines";>Data Retention
Guidelines</a></li>
</ul>
</div>
<div class="col-md-2">
<ul>
- <li><a
href="http://wikimediafoundation.org";>About Us</a></li>
+ <li><a
href="//wikimediafoundation.org">About Us</a></li>
<li><a
href="https://blog.wikimedia.org/";>Blog</a></li>
- <li><a
href="http://wikimediafoundation.org/wiki/Terms_of_Use";>Terms of Use</a></li>
+ <li><a
href="//wikimediafoundation.org/wiki/Terms_of_Use">Terms of Use</a></li>
</ul>
</div>
diff --git a/build/faq.html b/build/faq.html
index c73575b..cc64ac0 100644
--- a/build/faq.html
+++ b/build/faq.html
@@ -134,7 +134,7 @@
<a name="different_compare"></a>
<h2 class="question"><img src="/images/chevron.svg"><span>Why are
requests for user data calculated differently by WMF as compared to other
organizations?</span></h2>
- <div class="answer">In this transparency report, WMF has included all
types of requests for user information it receives, including governmental and
non-governmental requests as well as informal and formal requests. Other
organizations, particularly those appearing in the 'Compared to other
companies' graph in our report, only disclose requests originating from
governments. Please visit the transparency reports of <a
href='https://govtrequests.facebook.com/'>Facebook</a>, <a
href='http://www.google.com/transparencyreport/'>Google</a>, <a
href='https://transparency.twitter.com/'>Twitter</a>, and <a
href='https://www.linkedin.com/legal/transparency'>LinkedIn</a> for more detail
about the types of requests they receive.</div>
+ <div class="answer">In this transparency report, WMF has included all
types of requests for user information it receives, including governmental and
non-governmental requests as well as informal and formal requests. Other
organizations, particularly those appearing in the 'Compared to other
companies' graph in our report, only disclose requests originating from
governments. Please visit the transparency reports of <a
href='https://govtrequests.facebook.com/'>Facebook</a>, <a
href='//www.google.com/transparencyreport/'>Google</a>, <a
href='https://transparency.twitter.com/'>Twitter</a>, and <a
href='https://www.linkedin.com/legal/transparency'>LinkedIn</a> for more detail
about the types of requests they receive.</div>
<hr>
@@ -164,24 +164,24 @@
<a name="remove_content"></a>
<h2 class="question"><img src="/images/chevron.svg"><span>Does WMF ever
remove content?</span></h2>
- <div class="answer"><p>Absent the receipt of a legally valid <a
href='http://www.chillingeffects.org/dmca512/faq.cgi#QID130'>DMCA notice</a>,
the Wikimedia Foundation will generally only remove content in exceptional
circumstances.</p></div>
+ <div class="answer"><p>Absent the receipt of a legally valid <a
href='//www.chillingeffects.org/dmca512/faq.cgi#QID130'>DMCA notice</a>, the
Wikimedia Foundation will generally only remove content in exceptional
circumstances.</p></div>
<hr>
<a name="dmca_valid_proper"></a>
<h2 class="question"><img src="/images/chevron.svg"><span>What makes a
DMCA takedown notice 'valid' or 'proper'?</span></h2>
- <div class="answer"><p>The DMCA has several <a
href='https://en.wikipedia.org/wiki/Online_Copyright_Infringement_Liability_Limitation_Act#Notice_from_copyright_owner'>formal
requirements</a> for notices. However, our evaluation isn’t over when we
receive a notice that meets all of these requirements. We will also analyze the
copyright eligibility of the work being infringed, whether the allegedly
infringing material actually infringes, and whether the allegedly infringing
material is a <a href='https://en.wikipedia.org/wiki/Fair_use'>fair use</a> of
the requester’s work. For more information, see our <a
href='http://wikimediafoundation.org/wiki/DMCA_Policy'>DMCA
Policy</a>.</p></div>
+ <div class="answer"><p>The DMCA has several <a
href='https://en.wikipedia.org/wiki/Online_Copyright_Infringement_Liability_Limitation_Act#Notice_from_copyright_owner'>formal
requirements</a> for notices. However, our evaluation isn’t over when we
receive a notice that meets all of these requirements. We will also analyze the
copyright eligibility of the work being infringed, whether the allegedly
infringing material actually infringes, and whether the allegedly infringing
material is a <a href='https://en.wikipedia.org/wiki/Fair_use'>fair use</a> of
the requester’s work. For more information, see our <a
href='//wikimediafoundation.org/wiki/DMCA_Policy'>DMCA Policy</a>.</p></div>
<hr>
<a name="transparent_dmca"></a>
<h2 class="question"><img src="/images/chevron.svg"><span>How are you
transparent about particular DMCA removals besides in this transparency
report?</span></h2>
- <div class="answer"><p>We record every DMCA takedown request that
results in removal of content on <a
href='http://wikimediafoundation.org/wiki/Category:DMCA'>our website</a>. In
addition, every DMCA removal is submitted to the <a
href='http://www.chillingeffects.org/'>Chilling Effects Clearinghouse</a>
(Chilling Effects), a web archive managed by the <a
href='https://www.eff.org/'>Electronic Frontier Foundation</a> and several law
school clinics. By collecting takedown notices from a variety of sources,
Chilling Effects provides a large set of data for analysis and allows
recipients and senders of takedown notices to learn more about how the DMCA
operates in the current online environment.</p></div>
+ <div class="answer"><p>We record every DMCA takedown request that
results in removal of content on <a
href='//wikimediafoundation.org/wiki/Category:DMCA'>our website</a>. In
addition, every DMCA removal is submitted to the <a
href='//www.chillingeffects.org/'>Chilling Effects Clearinghouse</a> (Chilling
Effects), a web archive managed by the <a
href='https://www.eff.org/'>Electronic Frontier Foundation</a> and several law
school clinics. By collecting takedown notices from a variety of sources,
Chilling Effects provides a large set of data for analysis and allows
recipients and senders of takedown notices to learn more about how the DMCA
operates in the current online environment.</p></div>
<hr>
<a name="counter_notices"></a>
- <h2 class="question"><img src="/images/chevron.svg"><span>Did you
receive any <a
href='http://www.chillingeffects.org/question.cgi?QuestionID=132'>DMCA
counter-notices</a>?</span></h2>
+ <h2 class="question"><img src="/images/chevron.svg"><span>Did you
receive any <a
href='//www.chillingeffects.org/question.cgi?QuestionID=132'>DMCA
counter-notices</a>?</span></h2>
<div class="answer"><p>No, we did not receive any DMCA counter-notices
between July 2012 - July 2014</p></div>
<hr>
@@ -234,16 +234,16 @@
<ul>
<li><a
href="https://meta.wikimedia.org/wiki/Wikimedia_Foundation_Transparency_Report";>Wiki
Version</a></li>
<li><a
href="/data/data_aug2014.ods">Download Data</a></li>
- <li><a
href="http://wikimediafoundation.org/wiki/Privacy_policy";>Privacy
Policy</a></li>
+ <li><a
href="//wikimediafoundation.org/wiki/Privacy_policy">Privacy Policy</a></li>
<li><a
href="https://meta.wikimedia.org/wiki/Data_retention_guidelines";>Data Retention
Guidelines</a></li>
</ul>
</div>
<div class="col-md-2">
<ul>
- <li><a
href="http://wikimediafoundation.org";>About Us</a></li>
+ <li><a
href="//wikimediafoundation.org">About Us</a></li>
<li><a
href="https://blog.wikimedia.org/";>Blog</a></li>
- <li><a
href="http://wikimediafoundation.org/wiki/Terms_of_Use";>Terms of Use</a></li>
+ <li><a
href="//wikimediafoundation.org/wiki/Terms_of_Use">Terms of Use</a></li>
</ul>
</div>
diff --git a/build/index.html b/build/index.html
index 47d828c..2f3420a 100644
--- a/build/index.html
+++ b/build/index.html
@@ -49,7 +49,7 @@
<div class="col-md-12">
<p class="lead">
- <a target='_blank'
href='http://wikimediafoundation.org/wiki/Vision'>Our mission</a> is to provide
free access to the sum of all human knowledge. We believe that protecting user
privacy and defending against censorship are essential to the success of that
mission. Every year, we receive requests from governments, individuals, and
organizations to disclose information about our users or to delete or alter
content on our projects. Some are legitimate. Some are not.<br /> <br />The
purpose of this transparency report is to shed light on the requests we receive
and how we respond to them.
+ <a target='_blank'
href='//wikimediafoundation.org/wiki/Vision'>Our mission</a> is to provide free
access to the sum of all human knowledge. We believe that protecting user
privacy and defending against censorship are essential to the success of that
mission. Every year, we receive requests from governments, individuals, and
organizations to disclose information about our users or to delete or alter
content on our projects. Some are legitimate. Some are not.<br /> <br />The
purpose of this transparency report is to shed light on the requests we receive
and how we respond to them.
</p>
</div>
@@ -115,16 +115,16 @@
<ul>
<li><a
href="https://meta.wikimedia.org/wiki/Wikimedia_Foundation_Transparency_Report";>Wiki
Version</a></li>
<li><a
href="/data/data_aug2014.ods">Download Data</a></li>
- <li><a
href="http://wikimediafoundation.org/wiki/Privacy_policy";>Privacy
Policy</a></li>
+ <li><a
href="//wikimediafoundation.org/wiki/Privacy_policy">Privacy Policy</a></li>
<li><a
href="https://meta.wikimedia.org/wiki/Data_retention_guidelines";>Data Retention
Guidelines</a></li>
</ul>
</div>
<div class="col-md-2">
<ul>
- <li><a
href="http://wikimediafoundation.org";>About Us</a></li>
+ <li><a
href="//wikimediafoundation.org">About Us</a></li>
<li><a
href="https://blog.wikimedia.org/";>Blog</a></li>
- <li><a
href="http://wikimediafoundation.org/wiki/Terms_of_Use";>Terms of Use</a></li>
+ <li><a
href="//wikimediafoundation.org/wiki/Terms_of_Use">Terms of Use</a></li>
</ul>
</div>
diff --git a/build/javascripts/content.js b/build/javascripts/content.js
index 3bf687a..b0e56ea 100644
--- a/build/javascripts/content.js
+++ b/build/javascripts/content.js
@@ -419,7 +419,7 @@
.append( 'text' )
.on( 'click', function ( d ) {
if ( d.url !== "" ) {
- window.open( 'http://' + d.url
);
+ window.open( '//' + d.url );
}
} )
.attr( 'x', '-100' )
diff --git a/build/privacy.html b/build/privacy.html
index a532b41..031a50e 100644
--- a/build/privacy.html
+++ b/build/privacy.html
@@ -213,16 +213,16 @@
<ul>
<li><a
href="https://meta.wikimedia.org/wiki/Wikimedia_Foundation_Transparency_Report";>Wiki
Version</a></li>
<li><a
href="/data/data_aug2014.ods">Download Data</a></li>
- <li><a
href="http://wikimediafoundation.org/wiki/Privacy_policy";>Privacy
Policy</a></li>
+ <li><a
href="//wikimediafoundation.org/wiki/Privacy_policy">Privacy Policy</a></li>
<li><a
href="https://meta.wikimedia.org/wiki/Data_retention_guidelines";>Data Retention
Guidelines</a></li>
</ul>
</div>
<div class="col-md-2">
<ul>
- <li><a
href="http://wikimediafoundation.org";>About Us</a></li>
+ <li><a
href="//wikimediafoundation.org">About Us</a></li>
<li><a
href="https://blog.wikimedia.org/";>Blog</a></li>
- <li><a
href="http://wikimediafoundation.org/wiki/Terms_of_Use";>Terms of Use</a></li>
+ <li><a
href="//wikimediafoundation.org/wiki/Terms_of_Use">Terms of Use</a></li>
</ul>
</div>
diff --git a/locales/en.yml b/locales/en.yml
index 0f59fe0..37c2c68 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -21,7 +21,7 @@
home:
title: "Wikimedia Foundation"
title_two: "Transparency<br> Report"
- lead: "<a target='_blank'
href='http://wikimediafoundation.org/wiki/Vision'>Our mission</a> is to provide
free access to the sum of all human knowledge. We believe that protecting user
privacy and defending against censorship are essential to the success of that
mission. Every year, we receive requests from governments, individuals, and
organizations to disclose information about our users or to delete or alter
content on our projects. Some are legitimate. Some are not.<br /> <br />The
purpose of this transparency report is to shed light on the requests we receive
and how we respond to them."
+ lead: "<a target='_blank' href='//wikimediafoundation.org/wiki/Vision'>Our
mission</a> is to provide free access to the sum of all human knowledge. We
believe that protecting user privacy and defending against censorship are
essential to the success of that mission. Every year, we receive requests from
governments, individuals, and organizations to disclose information about our
users or to delete or alter content on our projects. Some are legitimate. Some
are not.<br /> <br />The purpose of this transparency report is to shed light
on the requests we receive and how we respond to them."
privacy: "Requests for <br/>User Data"
content: "Requests for Content Alteration & Takedown"
faq: "Frequently Asked<br/>Questions"
@@ -81,7 +81,7 @@
s_t_obama: "Obama & Mandela Meet<br><small>December 2013</small>"
s_s_obama: "<p>We received a takedown notice for a photo on <a
href='https://commons.wikimedia.org/'>Commons</a> of then-Senator <a
href='https://en.wikipedia.org/wiki/Barack_Obama'>Barack Obama’s</a> first
meeting with <a href='https://en.wikipedia.org/wiki/Nelson_Mandela'>Nelson
Mandela</a>. Because the photographer David Katz was a federal employee at the
time, the photo was believed to be in the <a
href='https://en.wikipedia.org/wiki/Copyright_status_of_work_by_the_U.S._government'>public
domain</a>. Katz argued the photo was not taken as part of his “official
duties” and thus not in the public domain. After an exhaustive factual
investigation, we could not find sufficient evidence that photography was one
of Katz’s official duties and therefore removed the image. <a
href='https://commons.wikimedia.org/wiki/Commons:Village_pump/Archive/2013/12#Update_to_Obama-Mandela_DMCA_takedown'>Read
more...</a></p>"
s_t_classic: "The Classics<br><small>November 2013</small>"
- s_s_classic: "<p>A publishing company sent us a takedown request
concerning four famous works on <a
href='https://wikisource.org/'>Wikisource</a>: French translations of <a
href='https://en.wikipedia.org/wiki/Jane_Austen'>Jane Austen's</a> <a
href='http://fr.wikisource.org/wiki/Les_Cinq_Filles_de_Mrs_Bennet'><em>Pride
and Prejudice</em></a> and <a
href='http://fr.wikisource.org/wiki/Persuasion'><em>Persuasion</em></a>, a
French translation of <a
href='https://en.wikipedia.org/wiki/Arthur_Conan_Doyle'>Arthur Conan
Doyle's</a> <a
href='https://fr.wikisource.org/wiki/Les_Aventures_de_Sherlock_Holmes'><em>The
Adventures of Sherlock Holmes</em></a>, and <a
href='https://en.wikipedia.org/wiki/Jean_de_la_Fontaine'>Jean de la
Fontaine’s</a> <a
href='http://fr.wikisource.org/wiki/Fables_de_La_Fontaine,_livres_I-III'><em>Fables</em></a>.
We immediately noticed the peculiarity with the request: all four original
works (and likely their French translations as well) were old enough to have
fallen into the <a href='https://en.wikipedia.org/wiki/Public_domain'>public
domain</a>. When we alerted the company to this point, it rescinded the
takedown notice.</p>"
+ s_s_classic: "<p>A publishing company sent us a takedown request
concerning four famous works on <a
href='https://wikisource.org/'>Wikisource</a>: French translations of <a
href='https://en.wikipedia.org/wiki/Jane_Austen'>Jane Austen's</a> <a
href='//fr.wikisource.org/wiki/Les_Cinq_Filles_de_Mrs_Bennet'><em>Pride and
Prejudice</em></a> and <a
href='//fr.wikisource.org/wiki/Persuasion'><em>Persuasion</em></a>, a French
translation of <a
href='https://en.wikipedia.org/wiki/Arthur_Conan_Doyle'>Arthur Conan
Doyle's</a> <a
href='https://fr.wikisource.org/wiki/Les_Aventures_de_Sherlock_Holmes'><em>The
Adventures of Sherlock Holmes</em></a>, and <a
href='https://en.wikipedia.org/wiki/Jean_de_la_Fontaine'>Jean de la
Fontaine’s</a> <a
href='//fr.wikisource.org/wiki/Fables_de_La_Fontaine,_livres_I-III'><em>Fables</em></a>.
We immediately noticed the peculiarity with the request: all four original
works (and likely their French translations as well) were old enough to have
fallen into the <a href='https://en.wikipedia.org/wiki/Public_domain'>public
domain</a>. When we alerted the company to this point, it rescinded the
takedown notice.</p>"
graph_where_from: "Where did these requests come from?"
graph_targeted_takedown: "Which Wikimedia projects were targeted?"
graph_dmca_requests: "DMCA requests received, and how we responded"
@@ -119,7 +119,7 @@
q_actually_affected: "What do you mean by user accounts actually affected?"
a_actually_affected: "<p>This number represents the number of unique user
accounts whose nonpublic information was disclosed as a result of WMF receiving
a valid request for user data. This number may not reflect the number of unique
individuals whose data was disclosed as a result of a valid request for user
data; if an individual has multiple accounts across all Wikimedia projects, and
we receive requests for more than one of these accounts, we record each user
account separately. As a result, this number might overestimate the number of
individuals implicated by user data requests.</p>"
q_different_compare: "Why are requests for user data calculated
differently by WMF as compared to other organizations?"
- a_different_compare: "In this transparency report, WMF has included all
types of requests for user information it receives, including governmental and
non-governmental requests as well as informal and formal requests. Other
organizations, particularly those appearing in the 'Compared to other
companies' graph in our report, only disclose requests originating from
governments. Please visit the transparency reports of <a
href='https://govtrequests.facebook.com/'>Facebook</a>, <a
href='http://www.google.com/transparencyreport/'>Google</a>, <a
href='https://transparency.twitter.com/'>Twitter</a>, and <a
href='https://www.linkedin.com/legal/transparency'>LinkedIn</a> for more detail
about the types of requests they receive."
+ a_different_compare: "In this transparency report, WMF has included all
types of requests for user information it receives, including governmental and
non-governmental requests as well as informal and formal requests. Other
organizations, particularly those appearing in the 'Compared to other
companies' graph in our report, only disclose requests originating from
governments. Please visit the transparency reports of <a
href='https://govtrequests.facebook.com/'>Facebook</a>, <a
href='//www.google.com/transparencyreport/'>Google</a>, <a
href='https://transparency.twitter.com/'>Twitter</a>, and <a
href='https://www.linkedin.com/legal/transparency'>LinkedIn</a> for more detail
about the types of requests they receive."
q_public_information_included: "Are requests for public information
included in requests for user data?"
a_public_information_included: "<p>No, any requests for purely publicly
available information are not included in this report.</p>"
q_improve_laws: "What is WMF doing to help improve laws related to
disclosure or surveillance of user information?"
@@ -129,12 +129,12 @@
q_im_being_sued: "Help! I'm being sued because of something I did on the
Wikimedia projects. What should I do?"
a_im_being_sued: "<p>Lawsuits against Wikimedia users are exceedingly
uncommon—most disputes about content are resolved by working with the user
community through community-driven processes. In fact, individuals and
organizations that sue over content they wish to remove from the public's eye
often end up causing that content to receive greater public attention as a
result of the lawsuit, a phenomenon known as the <a
href='https://en.wikipedia.org/wiki/Streisand_effect'>Streisand
Effect</a>.</p><p>In the unlikely event that you are the subject of a lawsuit,
it is highly recommended that you consult your own lawyer. There are a number
of organizations that fight on a user's behalf, like the <a
href='http://www.casp.net/'>California Anti-SLAPP Project</a> or the <a
href='https://www.eff.org/'>Electronic Frontier Foundation</a> (EFF). If you
need help finding an attorney, WMF may be able to put you in touch with some of
these organizations or help you secure an attorney at reduced or pro-bono
rates. Additionally, in rare cases, assistance may also be available under our
<a
href='https://meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Legal_Fees_Assistance_Program'>Legal
Fees Assistance Program</a> or <a
href='https://meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Legal_Policies#Defense_of_Contributors'>Defense
of Contributors Program</a>.</p>"
q_remove_content: "Does WMF ever remove content?"
- a_remove_content: "<p>Absent the receipt of a legally valid <a
href='http://www.chillingeffects.org/dmca512/faq.cgi#QID130'>DMCA notice</a>,
the Wikimedia Foundation will generally only remove content in exceptional
circumstances.</p>"
+ a_remove_content: "<p>Absent the receipt of a legally valid <a
href='//www.chillingeffects.org/dmca512/faq.cgi#QID130'>DMCA notice</a>, the
Wikimedia Foundation will generally only remove content in exceptional
circumstances.</p>"
q_dmca_valid_proper: "What makes a DMCA takedown notice 'valid' or
'proper'?"
- a_dmca_valid_proper: "<p>The DMCA has several <a
href='https://en.wikipedia.org/wiki/Online_Copyright_Infringement_Liability_Limitation_Act#Notice_from_copyright_owner'>formal
requirements</a> for notices. However, our evaluation isn’t over when we
receive a notice that meets all of these requirements. We will also analyze the
copyright eligibility of the work being infringed, whether the allegedly
infringing material actually infringes, and whether the allegedly infringing
material is a <a href='https://en.wikipedia.org/wiki/Fair_use'>fair use</a> of
the requester’s work. For more information, see our <a
href='http://wikimediafoundation.org/wiki/DMCA_Policy'>DMCA Policy</a>.</p>"
+ a_dmca_valid_proper: "<p>The DMCA has several <a
href='https://en.wikipedia.org/wiki/Online_Copyright_Infringement_Liability_Limitation_Act#Notice_from_copyright_owner'>formal
requirements</a> for notices. However, our evaluation isn’t over when we
receive a notice that meets all of these requirements. We will also analyze the
copyright eligibility of the work being infringed, whether the allegedly
infringing material actually infringes, and whether the allegedly infringing
material is a <a href='https://en.wikipedia.org/wiki/Fair_use'>fair use</a> of
the requester’s work. For more information, see our <a
href='//wikimediafoundation.org/wiki/DMCA_Policy'>DMCA Policy</a>.</p>"
q_transparent_dmca: "How are you transparent about particular DMCA
removals besides in this transparency report?"
- a_transparent_dmca: "<p>We record every DMCA takedown request that results
in removal of content on <a
href='http://wikimediafoundation.org/wiki/Category:DMCA'>our website</a>. In
addition, every DMCA removal is submitted to the <a
href='http://www.chillingeffects.org/'>Chilling Effects Clearinghouse</a>
(Chilling Effects), a web archive managed by the <a
href='https://www.eff.org/'>Electronic Frontier Foundation</a> and several law
school clinics. By collecting takedown notices from a variety of sources,
Chilling Effects provides a large set of data for analysis and allows
recipients and senders of takedown notices to learn more about how the DMCA
operates in the current online environment.</p>"
- q_counter_notices: "Did you receive any <a
href='http://www.chillingeffects.org/question.cgi?QuestionID=132'>DMCA
counter-notices</a>?"
+ a_transparent_dmca: "<p>We record every DMCA takedown request that results
in removal of content on <a
href='//wikimediafoundation.org/wiki/Category:DMCA'>our website</a>. In
addition, every DMCA removal is submitted to the <a
href='//www.chillingeffects.org/'>Chilling Effects Clearinghouse</a> (Chilling
Effects), a web archive managed by the <a
href='https://www.eff.org/'>Electronic Frontier Foundation</a> and several law
school clinics. By collecting takedown notices from a variety of sources,
Chilling Effects provides a large set of data for analysis and allows
recipients and senders of takedown notices to learn more about how the DMCA
operates in the current online environment.</p>"
+ q_counter_notices: "Did you receive any <a
href='//www.chillingeffects.org/question.cgi?QuestionID=132'>DMCA
counter-notices</a>?"
a_counter_notices: "<p>No, we did not receive any DMCA counter-notices
between July 2012 - July 2014</p>"
q_six_month: "Why is the information from July 2012 - June 2013 not
available in six-month increments like the information from July 2013 - June
2014?"
a_six_month: "<p>During the July 2012 - June 2013 period, we recorded
totals only for the entire period, rather than breaking the totals into
six-month terms. In order to provide a better comparison with other reporting
organizations, we changed the date ranges for our charts to line up with those
used by those organizations starting in July 2013.</p>"
diff --git a/source/javascripts/content.js b/source/javascripts/content.js
index 3bf687a..b0e56ea 100644
--- a/source/javascripts/content.js
+++ b/source/javascripts/content.js
@@ -419,7 +419,7 @@
.append( 'text' )
.on( 'click', function ( d ) {
if ( d.url !== "" ) {
- window.open( 'http://' + d.url
);
+ window.open( '//' + d.url );
}
} )
.attr( 'x', '-100' )
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 2c6752d..0626daa 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -63,16 +63,16 @@
<ul>
<li><a
href="https://meta.wikimedia.org/wiki/Wikimedia_Foundation_Transparency_Report";><%=
t('menu.wiki_version') %></a></li>
<li><a
href="/data/data_aug2014.ods"><%= t('menu.download_data') %></a></li>
- <li><a
href="http://wikimediafoundation.org/wiki/Privacy_policy";><%=
t('menu.privacy_policy') %></a></li>
+ <li><a
href="//wikimediafoundation.org/wiki/Privacy_policy"><%=
t('menu.privacy_policy') %></a></li>
<li><a
href="https://meta.wikimedia.org/wiki/Data_retention_guidelines";><%=
t('menu.data_retention_guidelines') %></a></li>
</ul>
</div>
<div class="col-md-2">
<ul>
- <li><a
href="http://wikimediafoundation.org";><%= t('menu.about_us') %></a></li>
+ <li><a
href="//wikimediafoundation.org"><%= t('menu.about_us') %></a></li>
<li><a
href="https://blog.wikimedia.org/";><%= t('menu.blog') %></a></li>
- <li><a
href="http://wikimediafoundation.org/wiki/Terms_of_Use";><%= t('menu.tou')
%></a></li>
+ <li><a
href="//wikimediafoundation.org/wiki/Terms_of_Use"><%= t('menu.tou') %></a></li>
</ul>
</div>
diff --git a/source/localizable/content.html.erb
b/source/localizable/content.html.erb
index 90ec1b2..e1a5e39 100644
--- a/source/localizable/content.html.erb
+++ b/source/localizable/content.html.erb
@@ -34,7 +34,7 @@
<blockquote>
<p><%= t('content.quote') %></p>
<footer>
- <a href="http://commons.wikimedia.org/wiki/File:Jay-Z_2011.jpg";><img
src="/images/quote_jay.png"></a>
+ <a href="//commons.wikimedia.org/wiki/File:Jay-Z_2011.jpg"><img
src="/images/quote_jay.png"></a>
<p><%= t('content.cite') %></p>
</footer>
</blockquote>
--
To view, visit https://gerrit.wikimedia.org/r/153026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2b651cb64cf803bf87cb7d5e25ea350a944474f
Gerrit-PatchSet: 10
Gerrit-Project: wikimedia/TransparencyReport
Gerrit-Branch: master
Gerrit-Owner: Chmarkine <chmark...@hotmail.com>
Gerrit-Reviewer: Chmarkine <chmark...@hotmail.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: MSyed <ms...@wikimedia.org>
Gerrit-Reviewer: Microchip08 <doug...@chippy.ch>
Gerrit-Reviewer: Prtksxna <psax...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![http://commons.wikimedia.org/wiki/File:Jay-Z_2011.jpg"](http://commons.wikimedia.org/wiki/File:Jay-Z_2011.jpg"){kind=link}