From f7f8b7266aac8fc5f71af1a791f5b2e1f36e834e Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 15 Nov 2016 15:27:38 -0800 Subject: [PATCH 1/2] recommend sbt, not Activator and remove all mention of Activator from the site (well, except from some old release announcements) --- _layouts/downloadpage.html | 16 +++++----------- contribute/documentation.md | 8 -------- contribute/index.md | 2 +- .../_posts/2016-03-08-release-notes-2.11.8.md | 1 - resources/css/main.css | 13 +------------ resources/js/main.js | 19 ------------------- 6 files changed, 7 insertions(+), 52 deletions(-) diff --git a/_layouts/downloadpage.html b/_layouts/downloadpage.html index e4c9d0ad7..d550691b1 100644 --- a/_layouts/downloadpage.html +++ b/_layouts/downloadpage.html @@ -29,18 +29,12 @@
2

- Get started with Lightbend Activator + Get started with sbt
- Lightbend Activator is a browser-based or command-line
- tool that helps developers get started with Scala. -

- - Download - -  Lightbend Activator - -

Need help installing?

-
+ sbt is a popular build tool for Scala projects.
+ With sbt, you don't need to download and install Scala.
+ Just set scalaVersion in your build definition,
+ and sbt will retrieve that version.

diff --git a/contribute/documentation.md b/contribute/documentation.md index 6b5c81a0f..b49957115 100644 --- a/contribute/documentation.md +++ b/contribute/documentation.md @@ -7,7 +7,6 @@ title: Documentation Contributions There are several ways you can help out with the improvement of Scala documentation. These include: * API Documentation in Scaladoc -* Code examples and tutorials in activator templates. * Guides, Overviews, Tutorials, Cheat Sheets and more on the docs.scala-lang.org site * Updating scala-lang.org @@ -28,13 +27,6 @@ Please *follow the issue submission process closely* to help prevent duplicate i [submit new Scaladoc](./scala-standard-library-api-documentation.html) without creating an issue, but please look to see if there is an issue already submitted for your task and claim it if there is. If not, please post your intention to work on a specific scaladoc task on scala-internals so that people know what you are doing. -### Examples/Tutorials in Activator Templates - -[Lightbend Activator](https://www.lightbend.com/community/core-tools/activator-and-sbt) -is a tool based on SBT, with a UI mode that is ideal for code based tutorials, overviews and walk-throughs. To contribute an example in activator, you can fork an existing template, edit it, add a tutorial, upload it to github and then submit the github project into the template repository. It's the fastest way to produce a working code example with tutorial. - -Please see [Contributing an Activator Template](https://www.lightbend.com/activator/template/contribute) for more details. - ### The Main Scala Documentation Site [docs.scala-lang.org](https://wiki.scala-lang.org/) houses the primary source of written, non-API documentation for Scala. It's a github project that you can fork and submit pull requests from. It includes: diff --git a/contribute/index.md b/contribute/index.md index 925e83248..0a1e2fbae 100644 --- a/contribute/index.md +++ b/contribute/index.md @@ -27,7 +27,7 @@ Coordination of contribution efforts takes place on the

Documentation

-

Scaladoc (API), Activator templates, +

Scaladoc (API), docs.scala-lang.org and scala-lang.org.

diff --git a/news/_posts/2016-03-08-release-notes-2.11.8.md b/news/_posts/2016-03-08-release-notes-2.11.8.md index eb7c7136b..d90121f81 100644 --- a/news/_posts/2016-03-08-release-notes-2.11.8.md +++ b/news/_posts/2016-03-08-release-notes-2.11.8.md @@ -47,7 +47,6 @@ Scala releases are available through a variety of channels, including (but not l * Download a distribution from [scala-lang.org](http://scala-lang.org/download/2.11.8.html) * Bump the `scalaVersion` setting in your SBT-based project * Obtain JARs via [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.scala-lang%22%20AND%20v%3A%222.11.8%22) -* Try the [Hello Scala 2.11 template](https://www.lightbend.com/activator/template/hello-scala-2_11) in [Lightbend Activator](https://www.lightbend.com/activator/download) ### Scala 2.11 Notes diff --git a/resources/css/main.css b/resources/css/main.css index 460ee1ad0..feae58310 100755 --- a/resources/css/main.css +++ b/resources/css/main.css @@ -254,8 +254,7 @@ a.brand { padding-left: 20px; margin-right: 0; } -#download-button .icon, -#download-button .activator .icon { +#download-button .icon { width: 26px; height: 26px; margin: 7px; @@ -272,13 +271,6 @@ a.brand { -o-transform: translateX(0); transform: translateX(0); } -#download-button:hover.activator span { - -webkit-transform: translateX(24px); - -moz-transform: translateX(24px); - -ms-transform: translateX(24px); - -o-transform: translateX(24px); - transform: translateX(24px); -} /* Ideally, we would have only this: #download-button:hover .icon { @@ -311,9 +303,6 @@ a.brand { #download-button.unix:hover .icon { background-position: -52px -26px; } -#download-button.activator .icon { - background-position: 0 -26px; -} #getting-started-popup { position: fixed; diff --git a/resources/js/main.js b/resources/js/main.js index ca9e8d2b2..a3eba5a3a 100755 --- a/resources/js/main.js +++ b/resources/js/main.js @@ -187,30 +187,11 @@ function styleCode() { $(document).ready(function() { - // get the most up-to-date version of activator - $.getJSON("https://activator-prod.herokuapp.com/latest?callback=?", function(data) { - // update the page with the latest values - if (data.version != undefined) { - var activatorLink = $("#download-button.activator") - activatorLink.prop("href", "http://downloads.lightbend.com/typesafe-activator/" + data.version + "/typesafe-activator-" + data.version + ".zip") - } - }) - var os = getOS(); if (os == "Unknown OS") os = "UNIX"; var osLabel = os.replace(/\s/g, '').toLowerCase(); - // Removing the automatic download on the front page in favor of a - // link to the download page so people can see that activator is also - // a valid download choice. - // $("#main-download-button").each(function() { - // var unixLink = "{{ site.scala_maindownload_unix }}", - // windowsLink = "{{ site.scala_maindownload_windows }}", - // link = (os == "Windows") ? windowsLink : unixLink; - // $(this).attr("href", link).addClass(osLabel); - // }); - // Do not do any of the following if we're not on a download page // Otherwise a TypeError is raised and disables all other scripts on the page if ($("#download-button").length == 0) From 05a0ff55f504fa5431ccc2af3102e038919345ce Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 15 Nov 2016 17:10:52 -0800 Subject: [PATCH 2/2] link to sbt landing page (in response to reviewer feedback) --- _layouts/downloadpage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/downloadpage.html b/_layouts/downloadpage.html index d550691b1..d29e4fc04 100644 --- a/_layouts/downloadpage.html +++ b/_layouts/downloadpage.html @@ -29,7 +29,7 @@
2

- Get started with sbt + Get started with sbt
sbt is a popular build tool for Scala projects.
With sbt, you don't need to download and install Scala.