diff --git a/app/assets/css/main.styl b/app/assets/css/main.styl index 2e700244..ccfe3f0c 100755 --- a/app/assets/css/main.styl +++ b/app/assets/css/main.styl @@ -34,12 +34,6 @@ a[href="#"], a[href="#todo"], [todo] color: white font-size: 8px font-weight: bold - #optanon &, .optanon-alert-box-wrapper & - content: none - background: none - padding: 0 3px 0 0 - font-size: 13px - margin: 0 .vulnerability-warning font-weight: bold diff --git a/app/assets/css/modules/_index.styl b/app/assets/css/modules/_index.styl index dbdec608..53c08df3 100644 --- a/app/assets/css/modules/_index.styl +++ b/app/assets/css/modules/_index.styl @@ -8,5 +8,4 @@ @import "./_navigation.styl" @import "./_logo-pan.styl" @import "./_clipboard.styl" -@import "./_flexbox.styl" -@import "./_oneTrust.styl" \ No newline at end of file +@import "./_flexbox.styl" \ No newline at end of file diff --git a/app/assets/css/modules/_oneTrust.styl b/app/assets/css/modules/_oneTrust.styl deleted file mode 100644 index b3c584e8..00000000 --- a/app/assets/css/modules/_oneTrust.styl +++ /dev/null @@ -1,96 +0,0 @@ -body .optanon-alert-box-wrapper .optanon-alert-box-bottom-top - height: 20px -body .optanon-alert-box-wrapper .optanon-alert-box-bottom-padding - padding-bottom: 20px - -.optanon-cookie-policy-group-name - font-weight: 700 - -.cookie-warning - background: #6cc04a - display: inline-block - margin: 1rem 0 - padding: 1rem - font-weight: 700 - border-radius: 3px - text-align: center - p - color: white !important - font-size: 1rem !important - margin: 0 - - > a - border: 1px solid white - color: white - display: inline-block - padding: .25rem .5rem - text-decoration: none - margin: .25rem 1rem - &:hover - background: rgba(white, .6) - color: #6cc04a - small - color: white !important - font-size: .875rem !important -.flex-video - background-color: #f5f5f5 - text-align: center - .cookie-warning - background: transparent - padding: .5rem 2rem - margin: 2rem auto 0 auto - p - color: green !important - > a - display: block - margin: 1rem auto - max-width: 300px - border: 1px solid green - color: green - &:hover - background: green-dark - color: white - -//ontrust ccpa upgrades -body - #onetrust-pc-sdk .ot-switch - width: 45px !important - padding: 0 !important - #onetrust-pc-sdk .ot-switch-nob:before - transform: translateX(2px) - .onetrust-pc-dark-filter - background: rgba(0,0,0,.75) - #onetrust-button-group - display: flex !important - flex-direction: row-reverse !important - justify-content: flex-end !important - text-align: left !important - #onetrust-accept-btn-handler - opacity: 1 !important - transition: anime - outline: none !important - &:hover - background-color: green !important - border-color: green !important - transition: anime - #onetrust-pc-sdk #close-pc-btn-handler.ot-close-icon - outline: none !important - .ot-pc-footer-logo - display: none - #ot-sdk-cookie-policy, - #cookie-policy-description, - .ot-sdk-cookie-policy-group-desc - font-size: 1rem !important - line-height: 1.5 !important - margin-bottom: 1.0625rem !important - & p - font-size: 1rem !important - line-height: 1.5 !important - margin-bottom: 1.0625rem !important - #onetrust-pc-sdk .ot-cat-grp .ot-always-active - color: #6cc04a - #onetrust-pc-sdk .ot-tgl input:checked+.ot-switch .ot-switch-nob - border-color: #6cc04a - background-color: #d4e8cb - &:before - background-color: #6cc04a diff --git a/app/assets/css/pages/_cookie.styl b/app/assets/css/pages/_cookie.styl deleted file mode 100644 index 25393d47..00000000 --- a/app/assets/css/pages/_cookie.styl +++ /dev/null @@ -1,10 +0,0 @@ -.cookieListing - @extend .content-column - .button - height: auto - button: green - width: auto - display: inline-block - &:hover - text: no-underline - cursor: pointer \ No newline at end of file diff --git a/app/assets/css/pages/_index.styl b/app/assets/css/pages/_index.styl index d435f71d..123caad2 100644 --- a/app/assets/css/pages/_index.styl +++ b/app/assets/css/pages/_index.styl @@ -1,5 +1,4 @@ @import "_community.styl" -@import "_cookie.styl" @import "_code.styl" @import "_documentation.styl" @import "_all-releases.styl" diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 9ed2133d..a46d4561 100755 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -159,28 +159,4 @@ $(function(){ }).toggle(!!list.length); }); }) - - // This function handles analytics tracking for certain - // download links. - function trackDownload(selector, name) { - var downloadElements = $(selector); - downloadElements.click(function() { - var el = $(this) - var version = el.data("version"); - if (version) { - var label = name + "-" + version; - } else { - var label = name; - } - _gaq.push(["_trackEvent", "download", "click", label]); - return true; - }) - // Target downloads at an iframe so they don't unload this - // page. Unloading the page can interrupt Google Analytics - // and mess up our statistics. - downloadElements.attr('target', 'download-iframe'); - } - trackDownload(".downloadStandaloneLink", "standalone"); - trackDownload(".downloadDevelopmentLink", "development"); - trackDownload(".downloadPreviousLink", "previous"); }) \ No newline at end of file diff --git a/app/assets/javascripts/munchkin.js b/app/assets/javascripts/munchkin.js deleted file mode 100644 index 7ec0023a..00000000 --- a/app/assets/javascripts/munchkin.js +++ /dev/null @@ -1,20 +0,0 @@ -(function () { - var didInit = false; - function initMunchkin() { - if (didInit === false) { - didInit = true; - Munchkin.init('558-NCX-702'); - } - } - var s = document.createElement('script'); - s.type = 'text/javascript'; - s.async = true; - s.src = '//munchkin.marketo.net/munchkin.js'; - s.onreadystatechange = function () { - if (this.readyState == 'complete' || this.readyState == 'loaded') { - initMunchkin(); - } - }; - s.onload = initMunchkin; - document.getElementsByTagName('head')[0].appendChild(s); -})(); \ No newline at end of file diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala index bd015154..7212d818 100644 --- a/app/controllers/Application.scala +++ b/app/controllers/Application.scala @@ -182,12 +182,6 @@ class Application @Inject() ( ) } - def cookie = Action.async { implicit request => - Future.successful( - Ok(html.cookie()) - ) - } - // Deprecated links def movedTo(url: String, originalPath: String) = Action { MovedPermanently(url) diff --git a/app/views/cookie.scala.html b/app/views/cookie.scala.html deleted file mode 100644 index 47d6ab4a..00000000 --- a/app/views/cookie.scala.html +++ /dev/null @@ -1,29 +0,0 @@ -@import controllers.documentation.ReverseRouter -@(title: String = "Cookie Listing")(implicit requestHeader : RequestHeader, reverseRouter: ReverseRouter) - -@main(title, "cookieListing"){ -
-
-

- @title -

-
-
-
-
-

Your Privacy

-

When you visit any web site, it may store or retrieve information on your browser, mostly in the form of cookies. This information might be about you, your preferences or your device and is mostly used to make the site work as you expect it to. The information does not usually directly identify you, but it can give you a more personalised web experience.

-

Because we respect your right to privacy, you can choose not to allow some types of cookies. Below is a list of the cookies that get set on the playframework.com domain. Blocking some types of cookies may impact your experience of the site and the services we are able to offer.

-

COOKIE SETTINGS

-


-

Cookie Listing

- - - - -
- -
-} diff --git a/app/views/main.scala.html b/app/views/main.scala.html index 1561cc2f..a58310c8 100644 --- a/app/views/main.scala.html +++ b/app/views/main.scala.html @@ -29,15 +29,6 @@ } - - - @views.html.helper.script(Symbol("type") -> "text/javascript") { - function OptanonWrapper() { - //one trust inserts here - } - } - - @@ -173,37 +164,8 @@

Social networks

Play Framework is released under the Apache 2 License

- - - - - - + diff --git a/app/views/widget.scala.html b/app/views/widget.scala.html index eceba4b0..7fca4122 100644 --- a/app/views/widget.scala.html +++ b/app/views/widget.scala.html @@ -15,15 +15,4 @@ ul, li { list-style-type: none; } ul{color:#999;font-size:17px;position:relative;z-index:2;padding: 0;} ul{box-sizing:border-box;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;background:url(/assets/images/news.png) 10px center no-repeat;padding:19px 0 19px 60px;} - - + \ No newline at end of file diff --git a/conf/routes b/conf/routes index 7ecbe84f..681dfdce 100644 --- a/conf/routes +++ b/conf/routes @@ -12,7 +12,7 @@ GET /getting-started controllers GET /code controllers.Code.index GET /get-involved controllers.Application.getInvolved GET /sponsors controllers.Application.sponsors -GET /cookie controllers.Application.cookie +GET /cookie controllers.Application.movedTo(url="/", originalPath = "") GET /widget controllers.Application.widget(version: Option[String] ?= None) GET /changelog controllers.Application.changelog GET /conduct controllers.Application.conduct