From b3a64aaebed643aae2fe9a344dd5005d408a5a21 Mon Sep 17 00:00:00 2001 From: Daniel Compton Date: Fri, 17 Mar 2017 08:16:24 +1300 Subject: [PATCH] Add DMCA page --- resources/dmca.html | 45 +++++++++++++++++++++++++ resources/public/stylesheets/screen.css | 12 +++++++ src/clojars/web.clj | 4 +++ src/clojars/web/common.clj | 5 +-- 4 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 resources/dmca.html diff --git a/resources/dmca.html b/resources/dmca.html new file mode 100644 index 00000000..291b357c --- /dev/null +++ b/resources/dmca.html @@ -0,0 +1,45 @@ +
+ + + + +

If material on Clojars infringes your copyright, please send a notice to + or write:

+
+    Software Freedom Conservancy Inc.
+    Attn: Copyright Agent
+    137 Montague St Ste 380
+    Brooklyn, NY 11201-3548
+    USA
+  
+ +

You can phone Conservancy at +1 (212) 461 3245.

+ +

Please ensure that your notice identifies the copyrighted work being infringed; the Clojars package(s) that + infringe those copyrights; and contact information for the copyright holder or their agent filing the complaint. + Please note that all infringement notices will be forwarded to the Lumen + Database for publication and analysis.

+ +

Account Termination Policy for Repeat Infringers

+ +

Clojars will terminate any account that infringes other parties' copyrights three times in a rolling 365-day + window. An infringement occurs when:

+ + + +

Clojars may also terminate accounts when it determines the account holder has engaged in willful or egregious + infringement, negatively impacting the service.

+ +
diff --git a/resources/public/stylesheets/screen.css b/resources/public/stylesheets/screen.css index 1380cb54..ad74dc00 100644 --- a/resources/public/stylesheets/screen.css +++ b/resources/public/stylesheets/screen.css @@ -589,3 +589,15 @@ pre.error-id { text-align: center; margin-top: 10px; } + +.raw-text p, .raw-text li, .raw-text ul { + margin-bottom: 14px; +} + +.raw-text ul { + padding-left: 40px; +} + +.raw-text li { + list-style-type: initial; +} diff --git a/src/clojars/web.clj b/src/clojars/web.clj index 54646635..a8265bc2 100644 --- a/src/clojars/web.clj +++ b/src/clojars/web.clj @@ -76,6 +76,10 @@ (try-account #(html-doc "Security" {:account %} (raw (slurp (io/resource "security.html")))))) + (GET "/dmca" [] + (try-account + #(html-doc "DMCA" {:account %} + (raw (slurp (io/resource "dmca.html")))))) session/routes (group/routes db) (artifact/routes db reporter stats) diff --git a/src/clojars/web/common.clj b/src/clojars/web/common.clj index b7b63f78..8b21af0a 100644 --- a/src/clojars/web/common.clj +++ b/src/clojars/web/common.clj @@ -30,6 +30,7 @@ (link-to "https://github.com/clojars/clojars-web/wiki/Contact" "contact") (link-to "https://github.com/clojars/clojars-web" "code") (link-to "/security" "security") + (link-to "/dmca" "DMCA") (link-to "https://github.com/clojars/clojars-web/wiki/" "help") [:div.sponsors [:div.row @@ -72,13 +73,13 @@ [:footer.row])) (defn google-analytics-js [] - [:script "(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + [:script (raw "(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', 'UA-51806851-1', 'clojars.org'); - ga('send', 'pageview');"]) + ga('send', 'pageview');")]) (defn typekit-js [] [:script "try{Typekit.load({async:true});}catch(e){}"])