MSyed has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151539
Change subject: Added links to quotes And Minor style changes
......................................................................
Added links to quotes
And Minor style changes
Change-Id: If9e6bd2bb095a4c1ed91dbe6dedbef486e40a2fa
---
M locales/en.yml
M source/localizable/index.html.erb
M source/stylesheets/master.css.scss
3 files changed, 12 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport
refs/changes/39/151539/1
diff --git a/locales/en.yml b/locales/en.yml
index 5aa91be..399979c 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -25,7 +25,7 @@
content: "Requests for Content & Takedown"
faq: "Frequently Asked<br/>Questions"
quote: "Sunlight is said to be the best of disinfectants."
- cite: "Louis Brandeis<small>Former Associate Justice of the <br />Supreme
Court of the United States (1914)</small>"
+ cite: "<a href='https://en.wikipedia.org/wiki/Louis_Brandeis'>Louis
Brandeis</a><small>Former <a
href='https://en.wikipedia.org/wiki/Associate_Justice_of_the_Supreme_Court_of_the_United_States'>Associate
Justice</a> of the <br /><a
href='https://en.wikipedia.org/wiki/Supreme_Court_of_the_United_States'>Supreme
Court of the United States</a> (<a
href='https://en.wikiquote.org/wiki/Louis_Brandeis'>1914</a>)</small>"
privacy:
title: "Requests for<br/>User Data"
@@ -34,7 +34,7 @@
lead: "<a
href='https://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='https://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='https://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='https://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 notify the affected user before we disclose, if we are legally
permitted and have the means to do so. In certain cases, we may help find
assistance for users to fight an invalid request.</p><p>Below, you will find
more information about the requests for user data we receive.</p>"
quote: "Man is least himself when he talks in his own person. Give him a
mask, and he will tell you the truth."
- cite: "Oscar Wilde <small>Writer & Poet (1891)</small>"
+ cite: "<a href='https://en.wikipedia.org/wiki/Oscar_Wilde'>Oscar Wilde</a>
<small>Writer & Poet (<a
href='https://en.wikiquote.org/wiki/Oscar_Wilde'>1891</a>)</small>"
summary: "Summary"
compared_to_others: "Compared to other companies, we received relatively
few requests"
request_response: "Requests for user data, and how we responded"
@@ -62,7 +62,7 @@
lead: "<h2>Imagine a world in which <span class='blackout'>every single
human being can freely share in the sum of all knowledge.</span></h2>"
intro: "<p>The Wikimedia projects make up one of the world's largest
repositories of human knowledge. With that much information, someone is bound
to get upset by some of the content from time to time. While the vast majority
of content disputes are resolved by users themselves, in some extreme cases the
Wikimedia Foundation may receive a legal demand to override our
users.</p><p>The Wikimedia projects are yours, not ours. People just like you
from around the world write, upload, edit, and curate all of the content.
Therefore, we believe users should decide what belongs on Wikimedia projects
whenever legally possible.</p><p>Below, you will find more information about
the number of requests we receive, where they come from, and how they could
impact free knowledge. You can also learn more about how we fight for freedom
of speech through our user assistance programs in the <a
href='/faq#information'>FAQ</a>.</p>"
quote: "We change people through conversation, not through censorship."
- cite: "Jay Z<small>Musician (2010)</small>"
+ cite: "<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>"
story1_title: "French Intelligence Agency<br><small>March 2013</small>"
story1_body: "A <a
href='https://en.wikipedia.org/wiki/Direction_centrale_du_renseignement_int%C3%A9rieur'>French
intelligence agency</a> summoned a Wikipedia user to its offices, and
threatened him with severe criminal penalties if he did not use his
administrative rights to delete information about a <a
href='https://fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute'>military
base</a> from <a href='https://fr.wikipedia.org/'>French Wikipedia</a> that
the agency deemed classified. The supposedly classified information was
actually publicly available because the military had provided interviews and a
tour of the base to local reporters. We defended the user involved and fought
to keep the content up on Wikipedia. <a
href='https://meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Statement_on_France'>Read
more...</a>"
story2_title: "Monkey Selfie<br><small>January 2014</small>"
@@ -72,7 +72,7 @@
dmca_title: "DMCA Takedown Notices"
dmca_intro: "<p>The Wikimedia community is made up of creators,
collectors, and consumers of free knowledge. While most material appearing on
Wikimedia projects is in the <a
href='https://en.wikipedia.org/wiki/Public_domain'>public domain</a> or <a
href='https://en.wikipedia.org/wiki/Free_license'>freely licensed</a>, on
occasion, copyrighted material makes its way onto the projects.</p><p>The <a
href='https://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act'>Digital
Millennium Copyright Act</a> (DMCA) safe harbor provision requires us to remove
infringing material if we receive a proper takedown request. We thoroughly
evaluate each DMCA takedown request to ensure that it is valid. We only remove
allegedly infringing content when we believe that a request is valid and we are
transparent about that removal. If we do not believe a request to be valid, we
will push back as appropriate. To learn more about DMCA procedures, see our <a
href ='https://wikimediafoundation.org/wiki/DMCA_Policy'>DMCA
policy</a>.</p><p>Below, we provide information about the DMCA takedown notices
we have received in the past and how we responded to them.</p>"
quote2: "A well-functioning copyright law carefully balances the interests
of the public in access to expressive works and... the interests of copyright
owners in being compensated for uses of their works."
- cite2: "Pamela Samuelson<small>Director of Berkeley Center for Law &
Technology (2010)</small>"
+ cite2: "<a href='https://en.wikipedia.org/wiki/Pamela_Samuelson'>Pamela
Samuelson</a><small>Director of <a
href='http://www.law.berkeley.edu/bclt.htm'>Berkeley Center for Law &
Technology</a> (<a
href='http://btlj.org/data/articles/25_3/1175-1246%20CPP%20051811.pdf'>2010</a>)</small>"
s_t_babe_ruth: "Babe Ruth's Called Shot<br><small>March 2014</small>"
s_s_babe_ruth: "<p>A film shot by Matt Kandle at the <a
href='https://en.wikipedia.org/wiki/1932_World_Series'>1932 World Series</a>
provides evidence of <a href='https://en.wikipedia.org/wiki/Babe_Ruth'>Babe
Ruth's</a> famous “<a
href='https://en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot'>called
shot</a>,” in which he gestured to center field before hitting a home run to
the same location. The copyright owner sent us a DMCA takedown request
regarding a <a
href='https://en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot#mediaviewer/File:Ruth1932-1.jpg'>still
image</a> from the film used on <a href='https://en.wikipedia.org'>English
Wikipedia</a>. We declined to remove the image on the basis of <a
href='https://en.wikipedia.org/wiki/Fair_use'>fair use</a>, citing its
extraordinary value in illustrating the famous moment and the educational
purpose it serves.</p>"
s_t_obama: "Obama & Mandela Meet<br><small>December 2013</small>"
diff --git a/source/localizable/index.html.erb
b/source/localizable/index.html.erb
index 3b94922..a3012a9 100644
--- a/source/localizable/index.html.erb
+++ b/source/localizable/index.html.erb
@@ -42,9 +42,9 @@
</p>
</a>
</div>
-
-<div class="col-md-12">
-<blockquote>
+<div class="col-md-2"></div>
+<div class="col-md-10">
+<blockquote class="middle">
<p><%= t('home.quote') %></p>
<footer>
<img src="/images/quote_brandeis.png">
diff --git a/source/stylesheets/master.css.scss
b/source/stylesheets/master.css.scss
index 5be64e9..c87faac 100644
--- a/source/stylesheets/master.css.scss
+++ b/source/stylesheets/master.css.scss
@@ -262,6 +262,10 @@
width: 100%;
margin-bottom: 60px;
+ &.middle{
+ width: 85%;
+ }
+
p {
color: #000;
font: 26px/36px serif;
@@ -287,6 +291,7 @@
text-transform: none;
font-style: italic;
color: $black;
+ margin-top: 7px;
&:before {
content: '';
--
To view, visit https://gerrit.wikimedia.org/r/151539
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9e6bd2bb095a4c1ed91dbe6dedbef486e40a2fa
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport
Gerrit-Branch: master
Gerrit-Owner: MSyed <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits