Updated images, added win/osx install text. bug 814203

apps/firefox/templates/firefox/new-e.html

@@ -30,16 +30,32 @@ <h1 class="large">{{_('Different<br /> by design')}}</h1>
 
       <ol class="installation">
         <li>
-          <img src="{{ media('img/firefox/new/install1-mac.png') }}" />
-          {{_('Your download should begin automatically. If not, click here.')}}
+          {{ platform_img('img/firefox/new/install1.png', alt='Install: Step 1') }}
+          <strong>{{_('1')}}.</strong>
+          <span class="install-win">
+            {{_('Start the process by clicking Run.')}}
+          </span>
+          {{_('Your download should begin automatically. If not, <a id="%s" href="">click here</a>. It could take a few minutes, but it’s worth the wait.')|format('direct-download-link')}}
         </li>
         <li>
-          <img src="{{ media('img/firefox/new/install2-mac.png') }}" />
-          {{_('Drag the Firefox icon into your Applications folder as seen above.')}}
+          {{ platform_img('img/firefox/new/install2.png', alt='Install: Step 2') }}
+          <strong>{{_('2')}}.</strong>
+          <span class="install-osx">
+            {{_('When prompted, drag the Firefox icon into the image of your Applications folder.')}}
+          </span>
+          <span class="install-win">
+            {{_("Click Run to launch the Mozilla Firefox setup wizard. Then, just follow the steps (we've made the process as painless as possible).")}}
+          </span>
         </li>
         <li>
-          <img src="{{ media('img/firefox/new/install3-mac.png') }}" />
-          {{_("Drag the Firefox icon into your dock so it's always there. Enjoy!")}}
+          {{ platform_img('img/firefox/new/install3.png', alt='Install: Step 3') }}
+          <strong>{{_('3')}}.</strong>
+          <span class="install-osx">
+            {{_('Drag the Firefox icon from the Applications folder into the dock. Then, just click on Firefox whenever you want to use the web!')}}
+          </span>
+          <span class="install-win">
+            {{_('Now you’re ready to leap boldly into a new era of Web surfing. Double-click on the Firefox icon whenever you want to go online.')}}
+          </span>
         </li>
       </ol>
     </div> <!-- /#scene2 -->
@@ -72,6 +88,25 @@ <h1 class="large">{{_('Different<br /> by design')}}</h1>
 
 {% block email_form %}{% endblock %}
 
+{% block site_footer %}
+  <footer id="colophon">
+    <div class="row">
+      <ul class="primary">
+        <li><a href="{{ url('firefox.central') }}"><span>{{_('Tour')}}</span></a></li>
+        <li><a href="{{ url('firefox.features') }}"><span>{{_('Desktop')}}</span></a></li>
+        <li><a href="{{ url('firefox.fx') }}"><span>{{_('Mobile')}}</span></a></li>
+        <li><a href="https://addons.mozilla.org"><span>{{_('Add-ons')}}</span></a></li>
+        <li><a href="http://support.mozilla.org"><span>{{_('Support')}}</span></a></li>
+        <li><a href="{{ url('mozorg.about') }}"><span>{{_('About')}}</span></a></li>
+      </ul>
+      <ul class="secondary">
+        <li><a href="{{ url('privacy.index') }}">{{_('Privacy Policy')}}</a></li>
+        <li><a href="{{ php_url('/about/legal.html') }}">{{_('Legal Notices')}}</a></li>
+      </ul>
+    </div>
+  </footer>
+{% endblock %}
+
 {% block js %}
   {{ js('firefox_new') }}
 {% endblock  %}

apps/firefox/urls.py

@@ -32,10 +32,6 @@
     url('^firefox/sms/$', views.sms_send, name='firefox.sms'),
     page('firefox/sms/sent', 'firefox/mobile/sms-thankyou.html'),
     page('firefox/new', 'firefox/new.html'),
-    page('firefox/new-a', 'firefox/new-a.html'),
-    page('firefox/new-b', 'firefox/new-b.html'),
-    page('firefox/new-c', 'firefox/new-c.html'),
-    page('firefox/new-d', 'firefox/new-d.html'),
     page('firefox/new-e', 'firefox/new-e.html'),
     page('firefox/new-test', 'firefox/new-e.html'),
     page('firefox/organizations/faq', 'firefox/organizations/faq.html'),