Merge branch 'TheGrits-patch-8' into develop

* TheGrits-patch-8:
  Indent p element
  Edit spacing
  Whoops
  Squash and Merge
  Add DMCA route
This commit is contained in:
Matthew Taylor 2016-05-03 10:23:59 -04:00
commit 4c72dd6d51
4 changed files with 49 additions and 0 deletions

View file

@ -79,6 +79,12 @@
"pattern": "^/info/donate/?", "pattern": "^/info/donate/?",
"redirect": "https://secure.donationpay.org/scratchfoundation/" "redirect": "https://secure.donationpay.org/scratchfoundation/"
}, },
{
"name": "dmca",
"pattern": "^/DMCA/?$",
"view": "dmca/dmca",
"title": "DMCA"
},
{ {
"name": "guidelines", "name": "guidelines",
"pattern": "^/community_guidelines$", "pattern": "^/community_guidelines$",

34
src/views/dmca/dmca.jsx Normal file
View file

@ -0,0 +1,34 @@
var React = require('react');
var FormattedMessage = require('react-intl').FormattedMessage;
var render = require('../../lib/render.jsx');
var Page = require('../../components/page/www/page.jsx');
var Box = require('../../components/box/box.jsx');
require('./dmca.scss');
var Dmca = React.createClass({
type: 'Dmca',
render: function () {
return (
<div className="inner">
<Box title={'DMCA'}>
<p><FormattedMessage id='dmca.intro' /></p>
<p>
Copyright Agent / Mitchel Resnick<br/>
MIT Media Laboratory<br/>
77 Massachusetts Ave<br/>
Room E14-445A<br/>
Cambridge, MA 02139<br/>
Tel: (617) 253-9783
</p>
<p><FormattedMessage id='dmca.llkresponse' /></p>
<p><FormattedMessage id='dmca.assessment' /></p>
<p><FormattedMessage id='dmca.eyetoeye' /></p>
<p><FormattedMessage id='dmca.afterfiling' /></p>
</Box>
</div>
);
}
});
render(<Page><Dmca /></Page>, document.getElementById('app'));

2
src/views/dmca/dmca.scss Normal file
View file

@ -0,0 +1,2 @@
@import "../../colors";
@import "../../typography";

7
src/views/dmca/l10n.json Normal file
View file

@ -0,0 +1,7 @@
{
"dmca.intro": "The Lifelong Kindergarten research group respects the intellectual property of others, as well as our users. If you believe that your work has been copied in a way that constitutes copyright infringement, please email copyright@scratch.mit.edu, or mail your complaint to the following:",
"dmca.llkresponse": "The Lifelong Kindergarten Group will promptly process and investigate notices of alleged infringement and will take appropriate actions under the Digital Millennium Copyright Act (“DMCA”) and other applicable intellectual property laws. Upon receipt of notices complying or substantially complying with the DMCA, the Lifelong Kindergarten Group may act expeditiously to remove or disable access to any material claimed to be infringing. Repeat infringers of third-party copyrights are subject to termination in appropriate circumstances.",
"dmca.assessment": "In assessing whether or not a Scratch user has violated your copyrights, please keep in mind that Scratch is an educational and not-for-profit initiative, seeking to aid childrens learning by providing the tools for them to learn and express themselves using digital technology. Please also keep in mind the “Fair Use” doctrine incorporated into the Copyright Act of 1976, 17 U.S.C. § 107.",
"dmca.eyetoeye": "We hope you also see Scratch not only as a good way of popularizing your creations/website but also as an opportunity to do something good for childrens education.",
"dmca.afterfiling": "If you choose to make a copyright infringement complaint, please note that we may post your notification, with personally identifiable information redacted, to a clearinghouse such as chillingeffects.org. Please also note that you may be liable for damages (including costs and attorneys fees) if you materially misrepresent that an activity is infringing your copyright."
}