Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions app/assets/css/main.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions app/assets/css/modules/_index.styl
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@
@import "./_navigation.styl"
@import "./_logo-pan.styl"
@import "./_clipboard.styl"
@import "./_flexbox.styl"
@import "./_oneTrust.styl"
@import "./_flexbox.styl"
96 changes: 0 additions & 96 deletions app/assets/css/modules/_oneTrust.styl

This file was deleted.

10 changes: 0 additions & 10 deletions app/assets/css/pages/_cookie.styl

This file was deleted.

1 change: 0 additions & 1 deletion app/assets/css/pages/_index.styl
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import "_community.styl"
@import "_cookie.styl"
@import "_code.styl"
@import "_documentation.styl"
@import "_all-releases.styl"
Expand Down
24 changes: 0 additions & 24 deletions app/assets/javascripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
})
20 changes: 0 additions & 20 deletions app/assets/javascripts/munchkin.js

This file was deleted.

6 changes: 0 additions & 6 deletions app/controllers/Application.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
29 changes: 0 additions & 29 deletions app/views/cookie.scala.html

This file was deleted.

40 changes: 1 addition & 39 deletions app/views/main.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,6 @@
<meta name="docsearch:tags" content="@{context.lang.language}" />
}

<!-- OneTrust Cookies Consent Notice (Production Standard, playframework.com, en-GB) start -->
<script src="https://cdn.cookielaw.org/scripttemplates/otSDKStub.js" type="text/javascript" charset="UTF-8" data-domain-script="f6af8492-c939-49d1-98d9-0b5cde6ce6d2" ></script>
@views.html.helper.script(Symbol("type") -> "text/javascript") {
function OptanonWrapper() {
//one trust inserts here
}
}
<!-- OneTrust Cookies Consent Notice (Production Standard, playframework.com, en-GB) end -->

<!--[if lt IE 9]>
<script src="@routes.Assets.versioned("lib/html5shiv/html5shiv.js")"></script>
<![endif]-->
Expand Down Expand Up @@ -173,37 +164,8 @@ <h3>Social networks</h3>
Play Framework is released under the Apache 2 License
</p>
</div>
<div class="lb-legal">
<p>
<a href="@routes.Application.cookie">Cookie Listing</a> |
<a class="optanon-toggle-display">Cookie Settings</a>
</p>
</div>

</footer>

<script type="text/plain" class="optanon-category-2" src="@routes.Assets.versioned("javascripts/autotrack.js")"></script>
<script type="text/plain" class="optanon-category-2">
(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','https://www.google-analytics.com/analytics.js','ga');

ga('require', 'linker');
ga('require', 'maxScrollTracker');
ga('require', 'eventTracker');
ga('require', 'outboundLinkTracker');

ga('create', 'UA-37989507-1', 'auto');
ga('send', 'pageview');

(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-W9TKHC7');
</script>

<script src="@routes.Assets.versioned("javascripts/munchkin.js")"></script>
<script src="@routes.Assets.versioned("javascripts/autotrack.js")"></script>
</body>
</html>
13 changes: 1 addition & 12 deletions app/views/widget.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -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;}
</style>
<script type="text/plain" class="optanon-category-2">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-37989507-1']);
_gaq.push(['_trackPageview']);

(function() {
  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</style>
2 changes: 1 addition & 1 deletion conf/routes
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down