diff --git a/src/appengine/app.yaml b/src/appengine/app.yaml index 060e4265f..3418831da 100644 --- a/src/appengine/app.yaml +++ b/src/appengine/app.yaml @@ -105,6 +105,9 @@ handlers: - url: /downloads.html script: scripts.redirector.application +- url: /tools/download-editor.html + script: scripts.redirector.application + - url: /tools/download_archive.* script: scripts.redirector.application diff --git a/src/appengine/scripts/redirector.py b/src/appengine/scripts/redirector.py index 523e67a20..79e21406a 100644 --- a/src/appengine/scripts/redirector.py +++ b/src/appengine/scripts/redirector.py @@ -209,6 +209,8 @@ def trailing_slash(handler, *args, **kwargs): defaults={'_uri': '/polymer/upgrading-to-polymer-from-web-ui.html'}), Route('/docs/technical-overview/', RedirectHandler, defaults={'_uri': '/docs/dart-up-and-running/ch01.html'}), + Route('/tools/download-editor.html', RedirectHandler, + defaults={'_uri': '/tools/download.html'}), Route('/downloads.html', RedirectHandler, defaults={'_uri': '/tools/download.html'}), Route('/tools/download_archive/', RedirectHandler, diff --git a/src/site/_includes/header.html b/src/site/_includes/header.html index 37563a06a..c03298bc8 100644 --- a/src/site/_includes/header.html +++ b/src/site/_includes/header.html @@ -1,22 +1,6 @@ - {% if page.download_experiment %} - - - - {% endif %} diff --git a/src/site/tools/download-editor.markdown b/src/site/tools/download-editor.markdown deleted file mode 100644 index dc9c859fe..000000000 --- a/src/site/tools/download-editor.markdown +++ /dev/null @@ -1,63 +0,0 @@ ---- -layout: default -title: "Download Dart" -description: "The download bundles that support the Dart language." -has-permalinks: false -js: -- url: /js/download-info.js - defer: true ---- - -# Getting Dart Is Easy! - -
-
- -
-
- -
-
- -
-
- -## Download Dart - -{% for platform in site.custom.downloads.binaries %} -
-{% include downloads/_get_dart_editor.html %} - -## Or download just what you need {#dont-download-editor} - -{% capture partial %}downloads/_{{platform.os}}_section.html{% endcapture %}{% include {{partial}} %} -
- - -{% endfor %} - - - -
-### Pick an editor -
- -
-### Step 2: Pick an editor {#step-2-pick-an-editor-linux} -
- -
-### Step 2: Pick an editor {#step-2-pick-an-editor-mac} -
- -[Dart Editor](/tools/editor/) isn't your only choice. -The following plugins add Dart smarts to popular code editors. - -{% include downloads/_other_editors.markdown %} diff --git a/src/site/tools/download.markdown b/src/site/tools/download.markdown index 9e0e3792b..dc9c859fe 100644 --- a/src/site/tools/download.markdown +++ b/src/site/tools/download.markdown @@ -3,7 +3,6 @@ layout: default title: "Download Dart" description: "The download bundles that support the Dart language." has-permalinks: false -download_experiment: true js: - url: /js/download-info.js defer: true @@ -23,33 +22,18 @@ js: -
## Download Dart +{% for platform in site.custom.downloads.binaries %} +
{% include downloads/_get_dart_editor.html %} -## Or download just what you need {#windows-separate-download} -
+## Or download just what you need {#dont-download-editor} -
-First install Dart, and then choose your editor. -(Want a one-click download? -Skip to [Step 2](#step-2) and choose **Dart Editor**, -which includes Dart.) +{% capture partial %}downloads/_{{platform.os}}_section.html{% endcapture %}{% include {{partial}} %}
-
-First install Dart, and then choose your editor. -(Want a one-click download? -Skip to [Step 2](#step-2) and choose **Dart Editor**, -which includes Dart.) -
-{% for platform in site.custom.downloads.binaries %} -{% capture partial %}downloads/_{{platform.os}}_section.html{% endcapture %} -
-{% include {{partial}} %} -
{% endfor %} -
### Pick an editor - -[Dart Editor](/tools/editor/) isn't your only choice. -The following plugins add Dart smarts to popular code editors. - -{% include downloads/_other_editors.markdown %}
-{% include downloads/_step2_pick_an_editor.markdown %} +### Step 2: Pick an editor {#step-2-pick-an-editor-linux}
-{% include downloads/_step2_pick_an_editor.markdown %} -
+### Step 2: Pick an editor {#step-2-pick-an-editor-mac}
+ +[Dart Editor](/tools/editor/) isn't your only choice. +The following plugins add Dart smarts to popular code editors. + +{% include downloads/_other_editors.markdown %}