Download page fixes for Mac OSX

i2p2www/pages/downloads/list.html

@@ -25,9 +25,9 @@ If you would like to try the latest experimental I2P projects, visit the <a href
 {% endtrans -%}-->
 <h3>{{ _('Getting Started') }}</h3>
 <h4>{% trans %}Basic Steps{% endtrans %}</h4>
-<p>{% trans %}For most platforms and systems, setting I2P installed and running will
-consist of up to three steps.{% endtrans %}</p>
-<ul>
+<p>{% trans %}Unless you are using Mac OSX, Android, or a Debian-based linux, the official install
+  process will take three steps:{% endtrans %}</p>
+<ol>
   <li><strong>{% trans %}Install Java: {% endtrans %}</strong>{% trans java='https://java.com/download/',
 openjdk='http://openjdk.java.net/install/',
 icedtea='http://icedtea.classpath.org/wiki/Main_Page',
@@ -45,13 +45,16 @@ PowerPC: <a href="{{ ibmsdk7 }}">IBM Java SE 7 or 8</a>)
 <br />
 <a href="{{ detectjre }}">Determine your installed Java version here</a>
 or type <tt>java -version</tt> at your command prompt.
-Only two platforms do not require Java to be installed before I2P is installed, those platforms are:{% endtrans %}</li>
+Currently three platforms do not require Java to be installed before I2P is installed, those platforms are:{% endtrans %}</li>
   <ul>
+    <li><strong>{% trans %}Android: {% endtrans %}</strong>{% trans %}Mac OSX packages now include a complete Java
+      Virtual Machine as part of the bundle, which is used only for I2P. This eliminates the need to install
+      a separate Java Virtual Machine.{% endtrans %}</li>
     <li><strong>{% trans %}Android: {% endtrans %}</strong>{% trans %}Android comes with a Java virtual machine
-as part of the platform, which I2P for Android uses. Therefore it is not necessary to install Java to use
-I2P for Android.{% endtrans %}</li>
+      as part of the platform, which I2P for Android uses. Therefore it is not necessary to install Java to use
+      I2P for Android.{% endtrans %}</li>
     <li><strong>{% trans %}Debian and Ubuntu: {% endtrans %}</strong>{% trans %}On Debian and Ubuntu when using
-a .deb package to install, the system will automatically install and configure a Java environment for you.{% endtrans %}</li>
+      a .deb package to install, the system will automatically install and configure a Java environment for you.{% endtrans %}</li>
   </ul>
   <li><strong>{% trans %}Install I2P: {% endtrans %}</strong>{% trans %}Once you have Java installed, you should
 run the I2P installer for your platform. This step applies to all systems.{% endtrans %}</li>
@@ -59,7 +62,7 @@ run the I2P installer for your platform. This step applies to all systems.{% end
 configure applications to use I2P. Many applications can use I2P, but the first application most people configure is a Web
 Browser for browsing I2P sites. Detailed instructions are available on the{% endtrans %}
 <a href="{{ site_url() }}about/browser-config">{% trans %}Browser Page{% endtrans %}</a>.</li>
-</ul><p>
+</ol><p>
 {% trans -%}
 Windows: Java 8 is recommended. Java 9 or higher may not work.
 {%- endtrans %}
@@ -118,11 +121,11 @@ I2P connections.</p>
 {% endcall %}
 
     <h5>{%- trans %}I2P for Mac OSX{%- endtrans %}</h5>
-{% call package('mac') %}
-    <h3>{% trans %}DMG Bundle{% endtrans %}</h3>
-    <p>I2P for Mac OSX is packaged using OSX's standard ".dmg" package type, which
+{% call package_outer('mac', "Mac OSX", 'images/download/mac-osx.png') %}
+    <h3>{% trans %}Download the I2P for Mac DMG Bundle{% endtrans %}</h3>
+    <p>{% trans i2pversion=ver() -%}I2P for Mac OSX is packaged using OSX's standard ".dmg" package type, which
     allows it to use Apple's built-in tools to securely, reliably, and easily
-    install the package.</p>
+    install the package. It does not require Java to be installed to use.{%- endtrans %}</p>
     <div class="file">
         <a class="default" href="{{ get_url('downloads_mac') }}">{% trans %}Mac OS DMG I2P Bundle{% endtrans %}</a>
     </div>

i2p2www/pages/downloads/macros

@@ -65,10 +65,10 @@
   {%- elif type == 'unix' -%}
     {%- set name     = 'Linux / BSD / Solaris' -%}
     {%- set icon     = 'images/download/freebsd-tux.png' -%}
+    {%- set filename = 'i2pinstall_%s.jar' -%}
+    {%- set signame  = 'i2pinstall_%s.jar.sig' -%}
+    {%- set hash     = i2pinstall_jar_hash -%}
   {%- endif -%}
-  {%- set filename = 'i2pinstall_%s.jar' -%}
-  {%- set signame  = 'i2pinstall_%s.jar.sig' -%}
-  {%- set hash     = i2pinstall_jar_hash -%}
 {%- endif -%}
 
 {%- set details = caller() -%}