From 4a31a7882b161431c43132470a31ab0cfdd2b8c4 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Mon, 25 Apr 2016 07:44:57 -0400 Subject: [PATCH 1/5] Add DMCA route I also included the guidelines route to avoid future branch conflict. --- src/routes.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/routes.json b/src/routes.json index 3416549e1..da293f914 100644 --- a/src/routes.json +++ b/src/routes.json @@ -75,5 +75,17 @@ "name": "donate", "pattern": "^/info/donate", "redirect": "https://secure.donationpay.org/scratchfoundation/" + }, + { + "name": "guidelines", + "pattern": "^/community_guidelines$", + "view": "guidelines/guidelines", + "title": "Scratch Community Guidelines" + }, + { + "name": "dmca", + "pattern": "^/DMCA$", + "view": "dmca/dmca", + "title": "DMCA" } ] From c657a4b5f90570aa031185281ceed5e9fecb7945 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Mon, 25 Apr 2016 07:52:20 -0400 Subject: [PATCH 2/5] Squash and Merge --- src/views/dmca/dmca.jsx | 37 +++++++++++++++++++++++++++++++++++++ src/views/dmca/dmca.scss | 2 ++ src/views/dmca/l10n.json | 7 +++++++ 3 files changed, 46 insertions(+) create mode 100644 src/views/dmca/dmca.jsx create mode 100644 src/views/dmca/dmca.scss create mode 100644 src/views/dmca/l10n.json diff --git a/src/views/dmca/dmca.jsx b/src/views/dmca/dmca.jsx new file mode 100644 index 000000000..2cb629763 --- /dev/null +++ b/src/views/dmca/dmca.jsx @@ -0,0 +1,37 @@ +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 ( +
+ +

+
+

Copyright Agent / Mitchel Resnick

+

MIT Media Laboratory

+

77 Massachusetts Ave

+

Room E14-445A

+

Cambridge, MA 02139

+

Tel: (617) 253-9783

+
+

+
+

+
+

+
+

+ +
+ ); + } +}); + +render(, document.getElementById('app')); diff --git a/src/views/dmca/dmca.scss b/src/views/dmca/dmca.scss new file mode 100644 index 000000000..9431c95e6 --- /dev/null +++ b/src/views/dmca/dmca.scss @@ -0,0 +1,2 @@ +@import "../../colors"; +@import "../../typography"; diff --git a/src/views/dmca/l10n.json b/src/views/dmca/l10n.json new file mode 100644 index 000000000..784580a5a --- /dev/null +++ b/src/views/dmca/l10n.json @@ -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 children’s 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 children’s 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." +} From ac9717a095079da5b733aec5e3c0ef19a14d252d Mon Sep 17 00:00:00 2001 From: The_Grits Date: Mon, 25 Apr 2016 08:00:36 -0400 Subject: [PATCH 3/5] Whoops Seems like Travis would rather not have the guidelines route included --- src/routes.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/routes.json b/src/routes.json index da293f914..d4ce72b18 100644 --- a/src/routes.json +++ b/src/routes.json @@ -76,12 +76,6 @@ "pattern": "^/info/donate", "redirect": "https://secure.donationpay.org/scratchfoundation/" }, - { - "name": "guidelines", - "pattern": "^/community_guidelines$", - "view": "guidelines/guidelines", - "title": "Scratch Community Guidelines" - }, { "name": "dmca", "pattern": "^/DMCA$", From df8c036dafcdd1cf2e1f5cad1c2b2f77e4f5db35 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Tue, 26 Apr 2016 09:09:07 -0400 Subject: [PATCH 4/5] Edit spacing As per @mewtaylor 's suggestions on #435 --- src/views/dmca/dmca.jsx | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/views/dmca/dmca.jsx b/src/views/dmca/dmca.jsx index 2cb629763..9b8510d47 100644 --- a/src/views/dmca/dmca.jsx +++ b/src/views/dmca/dmca.jsx @@ -13,20 +13,15 @@ var Dmca = React.createClass({

-
-

Copyright Agent / Mitchel Resnick

-

MIT Media Laboratory

-

77 Massachusetts Ave

-

Room E14-445A

-

Cambridge, MA 02139

-

Tel: (617) 253-9783

-
+

Copyright Agent / Mitchel Resnick
+ MIT Media Laboratory
+ 77 Massachusetts Ave
+ Room E14-445A
+ Cambridge, MA 02139
+ Tel: (617) 253-9783

-

-

-

From 9ae31c132f69e3fbe43f55f5927660af0e972432 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Thu, 28 Apr 2016 09:18:26 -0400 Subject: [PATCH 5/5] Indent p element --- src/views/dmca/dmca.jsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/dmca/dmca.jsx b/src/views/dmca/dmca.jsx index 9b8510d47..5e2670310 100644 --- a/src/views/dmca/dmca.jsx +++ b/src/views/dmca/dmca.jsx @@ -13,12 +13,14 @@ var Dmca = React.createClass({

-

Copyright Agent / Mitchel Resnick
- MIT Media Laboratory
- 77 Massachusetts Ave
- Room E14-445A
- Cambridge, MA 02139
- Tel: (617) 253-9783

+

+ Copyright Agent / Mitchel Resnick
+ MIT Media Laboratory
+ 77 Massachusetts Ave
+ Room E14-445A
+ Cambridge, MA 02139
+ Tel: (617) 253-9783 +