Prtksxna has submitted this change and it was merged. Change subject: Content changes ......................................................................
Content changes Added content page's content. First pass Deleted dmca erb Cleaned up other pages Change-Id: I277f7d17c546908be3e553b0e35e3318852ae62b --- A source/content.html.erb D source/dmca.html.erb M source/index.html.erb M source/privacy.html.erb 4 files changed, 74 insertions(+), 5 deletions(-) Approvals: Prtksxna: Verified; Looks good to me, approved diff --git a/source/content.html.erb b/source/content.html.erb new file mode 100644 index 0000000..1173643 --- /dev/null +++ b/source/content.html.erb @@ -0,0 +1,73 @@ +<div class="jumbotron"> + <h1> + <small>Content</small><br> + <span class="blue"> + Requests for<br> + Alterations & Takedown + </span> + </h1> +</div> + +<div class="col-md-3"> + <section class="scorecard"> + <h2>Scorecard</h2> + <dl> + <dt>Number of requests complied</dt> + <dd>0</dd> + </dl> + </section> + + <br><br><br><br><br><br><br><br><br><br><br><br><br><br> + + <section class="scorecard"> + <h2>Scorecard</h2> + <dl> + <dt>Percentage of DMCA Takedown Requests Complied</dt> + <dd>38.4%</dd> + </dl> + </section> +</div> + +<div class="col-md-9"> + <h2>Imagine a world in which every single human being can freely share in the sum of all knowledge.</h2> + <p> + The Wikimedia projects make up the world's largest repository of human knowledge. With that much freely available information, someone is bound to get upset by some of the content from time to time. Every year, we receive requests to remove or change material that has been posted onto a Wikimedia project. + </p> + + <p> + But 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. + </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 defense of user programs in the FAQ. + </p> + + <blockquote> + <p>We change people through conversation, not through censorship.</p> + <footer> + <img src="http://lorempixel.com/100/100/people/";> + <p>Jay Z, Musician (2010)</p> + </footer> + </blockquote> + + <h2>DMCA Takedown Notices</h2> + <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 public domain or openly licensed, occasionally copyrighted material makes it way onto the projects. + </p> + <p> + The Wikimedia Foundation is obligated under the Digital Millenium Copyright Act (DMCA) to remove copyright-infringing material upon receipt of a proper takedown request. When we receive a DMCA takedown request, we thoroughly evaluate the request to ensure that it is valid. If we believe it is, we remove the allegedly infringing content and we are transparent about that removal. If we do not believe it is valid, we will push back as appropriate. To learn more about DMCA procedures, see our DMCA policy. + </p> + <p> + Below, we have provided information about the DMCA takedown notices we have received in the past and how we responded to them. + </p> + <blockquote> + <p>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.</p> + <footer> + <img src="http://lorempixel.com/100/100/people/";> + <p>Pamuela Samuelson, UC Berkeley Professor of Law & Co-Director of Berkeley Center for Law & Technology (2010)</p> + </footer> + </blockquote> +</div> + +<div class="clear"></div> +<br><br><br><br><br><br> diff --git a/source/dmca.html.erb b/source/dmca.html.erb deleted file mode 100644 index c514278..0000000 --- a/source/dmca.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<div class="container"> - <h1>DMCA</h1> -</div> diff --git a/source/index.html.erb b/source/index.html.erb index ec19e6c..9929df0 100644 --- a/source/index.html.erb +++ b/source/index.html.erb @@ -27,7 +27,7 @@ </div> <div class="col-md-4"> - <a href="takedown/" class="story"> + <a href="content/" class="story"> <h3><small>Section</small><br>Content Alteration & Takedown</h3> <hr/> <p> diff --git a/source/privacy.html.erb b/source/privacy.html.erb index c0dfdf3..78e4afc 100644 --- a/source/privacy.html.erb +++ b/source/privacy.html.erb @@ -18,7 +18,6 @@ </section> </div> - <div class="col-md-9"> <p class="lead"> Sed dapibus diam quam. <span class="blackout">Phasellus lacus metusvenenatis eu ligula volutpat, venenatis faucibus ante.</span> -- To view, visit https://gerrit.wikimedia.org/r/148292 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I277f7d17c546908be3e553b0e35e3318852ae62b Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/TransparencyReport Gerrit-Branch: master Gerrit-Owner: MSyed <[email protected]> Gerrit-Reviewer: Prtksxna <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
